Compare commits

..

No commits in common. "437765f79f3851081097c6ed934af6d828981073" and "201e44fb3875aee507ddd5fc634b34383b372cb8" have entirely different histories.

4 changed files with 21 additions and 23 deletions

1
.npmrc
View File

@ -1 +0,0 @@
@unlock-music:registry=https://git.unlock-music.dev/api/packages/um/npm/

35
package-lock.json generated
View File

@ -1,17 +1,17 @@
{ {
"name": "unlock-music", "name": "unlock-music",
"version": "1.10.7", "version": "1.10.6",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "unlock-music", "name": "unlock-music",
"version": "1.10.7", "version": "1.10.6",
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/preset-typescript": "^7.16.5", "@babel/preset-typescript": "^7.16.5",
"@unlock-music/joox-crypto": "^0.0.1", "@unlock-music/joox-crypto": "^0.0.1-R5",
"@xhacker/kgmwasm": "^1.0.0", "@xhacker/kgmwasm": "^1.0.0",
"@xhacker/qmcwasm": "^1.0.0", "@xhacker/qmcwasm": "^1.0.0",
"base64-js": "^1.5.1", "base64-js": "^1.5.1",
@ -3484,12 +3484,11 @@
"dev": true "dev": true
}, },
"node_modules/@unlock-music/joox-crypto": { "node_modules/@unlock-music/joox-crypto": {
"version": "0.0.1", "version": "0.0.1-R5",
"resolved": "https://git.unlock-music.dev/api/packages/um/npm/%40unlock-music%2Fjoox-crypto/-/0.0.1/joox-crypto-0.0.1.tgz", "resolved": "https://registry.npmjs.org/@unlock-music/joox-crypto/-/joox-crypto-0.0.1-R5.tgz",
"integrity": "sha512-bj7UcA4/KSqK07PPmoRYJ+3s4h3P45RGUVAMspptMYXobhVkDlB1ArTYNlyIlrF/P0EMy7JkfEdOgUz0nD7EAg==", "integrity": "sha512-+FhGT4bjzfb1Q7dAwHps/XqbqXrRA6Qg7pkDPzyXfeRmQocAySQ/dekojxkaFBf7ZX5ToIAopwxkKZ5NFt5bFw==",
"license": "MIT",
"dependencies": { "dependencies": {
"crypto-js": "^4.2.0" "crypto-js": "^4.1.1"
}, },
"bin": { "bin": {
"joox-decrypt": "joox-decrypt" "joox-decrypt": "joox-decrypt"
@ -6730,9 +6729,9 @@
} }
}, },
"node_modules/crypto-js": { "node_modules/crypto-js": {
"version": "4.2.0", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
}, },
"node_modules/css-color-names": { "node_modules/css-color-names": {
"version": "0.0.4", "version": "0.0.4",
@ -23654,11 +23653,11 @@
"dev": true "dev": true
}, },
"@unlock-music/joox-crypto": { "@unlock-music/joox-crypto": {
"version": "0.0.1", "version": "0.0.1-R5",
"resolved": "https://git.unlock-music.dev/api/packages/um/npm/%40unlock-music%2Fjoox-crypto/-/0.0.1/joox-crypto-0.0.1.tgz", "resolved": "https://registry.npmjs.org/@unlock-music/joox-crypto/-/joox-crypto-0.0.1-R5.tgz",
"integrity": "sha512-bj7UcA4/KSqK07PPmoRYJ+3s4h3P45RGUVAMspptMYXobhVkDlB1ArTYNlyIlrF/P0EMy7JkfEdOgUz0nD7EAg==", "integrity": "sha512-+FhGT4bjzfb1Q7dAwHps/XqbqXrRA6Qg7pkDPzyXfeRmQocAySQ/dekojxkaFBf7ZX5ToIAopwxkKZ5NFt5bFw==",
"requires": { "requires": {
"crypto-js": "^4.2.0" "crypto-js": "^4.1.1"
} }
}, },
"@vue/babel-helper-vue-jsx-merge-props": { "@vue/babel-helper-vue-jsx-merge-props": {
@ -26298,9 +26297,9 @@
} }
}, },
"crypto-js": { "crypto-js": {
"version": "4.2.0", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz",
"integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
}, },
"css-color-names": { "css-color-names": {
"version": "0.0.4", "version": "0.0.4",

View File

@ -1,8 +1,8 @@
{ {
"name": "unlock-music", "name": "unlock-music",
"version": "1.10.7", "version": "1.10.6",
"ext_build": 0, "ext_build": 0,
"updateInfo": "修正 joox 在远程获取 API 信息出错时不能正确回退到本地元信息获取的错误。", "updateInfo": "修正文件过小的情况下酷狗 / QQ解密错误问题",
"license": "MIT", "license": "MIT",
"description": "Unlock encrypted music file in browser.", "description": "Unlock encrypted music file in browser.",
"repository": { "repository": {
@ -21,7 +21,7 @@
}, },
"dependencies": { "dependencies": {
"@babel/preset-typescript": "^7.16.5", "@babel/preset-typescript": "^7.16.5",
"@unlock-music/joox-crypto": "^0.0.1", "@unlock-music/joox-crypto": "^0.0.1-R5",
"@xhacker/kgmwasm": "^1.0.0", "@xhacker/kgmwasm": "^1.0.0",
"@xhacker/qmcwasm": "^1.0.0", "@xhacker/qmcwasm": "^1.0.0",
"base64-js": "^1.5.1", "base64-js": "^1.5.1",

View File

@ -55,7 +55,7 @@ export async function extractQQMusicMeta(
if (id && id !== '0') { if (id && id !== '0') {
try { try {
return await fetchMetadataFromSongId(id, ext, musicMeta, musicBlob); return fetchMetadataFromSongId(id, ext, musicMeta, musicBlob);
} catch (e) { } catch (e) {
console.warn('在线获取曲目信息失败,回退到本地 meta 提取', e); console.warn('在线获取曲目信息失败,回退到本地 meta 提取', e);
} }