github
/
lx-music-desktop
mirror of https://github.com/lyswhut/lx-music-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

更新依赖

pull/1583/head
lyswhut 2023-09-14 11:04:58 +08:00
parent 94dccae48a
commit aabd6d8985
5 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
package-lock.json generated
View File

@ -16,14 +16,14 @@
"comlink": "~4.3.1", "comlink": "~4.3.1",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"electron-font-manager": "github:lyswhut/electron-font-manager#6d2f5ecf850c4fe34812b9394913680462ee0dae", "electron-font-manager": "github:lyswhut/electron-font-manager#6d2f5ecf850c4fe34812b9394913680462ee0dae",
"electron-log": "^5.0.0-beta.28", "electron-log": "^5.0.0-beta.29",
"electron-store": "^8.1.0", "electron-store": "^8.1.0",
"font-list": "^1.5.1", "font-list": "^1.5.1",
"iconv-lite": "^0.6.3", "iconv-lite": "^0.6.3",
"image-size": "^1.0.2", "image-size": "^1.0.2",
"jschardet": "^3.0.0", "jschardet": "^3.0.0",
"long": "^5.2.3", "long": "^5.2.3",
"message2call": "^0.1.2", "message2call": "^0.1.3",
"music-metadata": "^8.1.4", "music-metadata": "^8.1.4",
"needle": "github:lyswhut/needle#93299ac841b7e9a9f82ca7279b88aaaeda404060", "needle": "github:lyswhut/needle#93299ac841b7e9a9f82ca7279b88aaaeda404060",
"node-id3": "^0.2.6", "node-id3": "^0.2.6",
@ -46,10 +46,10 @@
"@tsconfig/recommended": "^1.0.2", "@tsconfig/recommended": "^1.0.2",
"@types/better-sqlite3": "^7.6.4", "@types/better-sqlite3": "^7.6.4",
"@types/needle": "^3.2.0", "@types/needle": "^3.2.0",
"@types/tunnel": "^0.0.3", "@types/tunnel": "^0.0.4",
"@types/ws": "8.5.4", "@types/ws": "8.5.4",
"@volar/vue-language-plugin-pug": "^1.6.5", "@volar/vue-language-plugin-pug": "^1.6.5",
"@vue/language-plugin-pug": "^1.8.10", "@vue/language-plugin-pug": "^1.8.11",
"babel-loader": "^9.1.3", "babel-loader": "^9.1.3",
"browserslist": "^4.21.10", "browserslist": "^4.21.10",
"chalk": "^4.1.2", "chalk": "^4.1.2",
@ -60,11 +60,11 @@
"css-loader": "^6.8.1", "css-loader": "^6.8.1",
"css-minimizer-webpack-plugin": "^5.0.1", "css-minimizer-webpack-plugin": "^5.0.1",
"del": "^6.1.1", "del": "^6.1.1",
"electron": "^22.3.23", "electron": "^22.3.24",
"electron-builder": "^24.6.4", "electron-builder": "^24.6.4",
"electron-debug": "^3.2.0", "electron-debug": "^3.2.0",
"electron-devtools-installer": "^3.2.0", "electron-devtools-installer": "^3.2.0",
"electron-to-chromium": "^1.4.513", "electron-to-chromium": "^1.4.520",
"electron-updater": "^6.1.4", "electron-updater": "^6.1.4",
"eslint": "^8.49.0", "eslint": "^8.49.0",
"eslint-config-standard": "^17.1.0", "eslint-config-standard": "^17.1.0",
@ -3096,9 +3096,9 @@
} }
}, },
"node_modules/@types/tunnel": { "node_modules/@types/tunnel": {
"version": "0.0.3", "version": "0.0.4",
"resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz", "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.4.tgz",
"integrity": "sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==", "integrity": "sha512-bQgDBL5XiqrrPUaZd9bZ2esOXcU4GTmgg0n6LHDqoMJezO3VFRZsW8qN6Gp64/LAmjtzNU3iAHBfV3Z2ht5DSg==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@types/node": "*" "@types/node": "*"
@ -3490,9 +3490,9 @@
"integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==" "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
}, },
"node_modules/@vue/language-plugin-pug": { "node_modules/@vue/language-plugin-pug": {
"version": "1.8.10", "version": "1.8.11",
"resolved": "https://registry.npmjs.org/@vue/language-plugin-pug/-/language-plugin-pug-1.8.10.tgz", "resolved": "https://registry.npmjs.org/@vue/language-plugin-pug/-/language-plugin-pug-1.8.11.tgz",
"integrity": "sha512-UBoWXnNk0+5L/eIhfC9Jn8VcL905arkS80TBPCxvLLI0mL0wSNZcH93mp4HmFw9EO8s6RnpGYmPNXPiDLyI9/A==", "integrity": "sha512-b5GgfkLhnGaD99aAQYo29qis/aCEMwxzeoEb1x2sR96yu7h71eqEBrlvgr6q4zg1QaNA8a7qztDRhypGrQrHvQ==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@volar/source-map": "~1.10.0", "@volar/source-map": "~1.10.0",
@ -6837,9 +6837,9 @@
} }
}, },
"node_modules/electron": { "node_modules/electron": {
"version": "22.3.23", "version": "22.3.24",
"resolved": "https://registry.npmjs.org/electron/-/electron-22.3.23.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-22.3.24.tgz",
"integrity": "sha512-2p6NsLFPfM2RmgATchjKZKBUP3O6NxQMWOrHt9W5U2GRtfI8qWlicUR1wnh5D1VLt4c1YsjvpF6dct+1JNRubA==", "integrity": "sha512-wnGsShoRVk1Jmgr7h/jZK9bI5UwMF88sdQ5c8z2j2N8B9elhF/jKDFjwDXUrY1Y0xzAskOP0tYIDE+UbUM4byQ==",
"dev": true, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
@ -6995,9 +6995,9 @@
} }
}, },
"node_modules/electron-log": { "node_modules/electron-log": {
"version": "5.0.0-beta.28", "version": "5.0.0-beta.29",
"resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.0-beta.28.tgz", "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.0-beta.29.tgz",
"integrity": "sha512-gVkQxxYQfV3nmx4zw4lsxWdzdaqJhK+OyBNOU3GGwjhtApbH7KQTWgr8sZcowEk0D6ksj+UbvaHOaU1HTaClzA==", "integrity": "sha512-d7/HhqBYQIKPGsKmQC/jOtdElzD6v4/rO/S6D/I1cFgeAiZZrs2N8IlY/36sHe52MBt3PBMTw05FBCY5QcKzEQ==",
"engines": { "engines": {
"electron": ">= 13", "electron": ">= 13",
"node": ">= 14" "node": ">= 14"
@ -7066,9 +7066,9 @@
} }
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.4.513", "version": "1.4.520",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.513.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.520.tgz",
"integrity": "sha512-cOB0xcInjm+E5qIssHeXJ29BaUyWpMyFKT5RB3bsLENDheCja0wMkHJyiPl0NBE/VzDI7JDuNEQWhe6RitEUcw==", "integrity": "sha512-Frfus2VpYADsrh1lB3v/ft/WVFlVzOIm+Q0p7U7VqHI6qr7NWHYKe+Wif3W50n7JAFoBsWVsoU0+qDks6WQ60g==",
"dev": true "dev": true
}, },
"node_modules/electron-updater": { "node_modules/electron-updater": {
@ -10930,9 +10930,9 @@
} }
}, },
"node_modules/message2call": { "node_modules/message2call": {
"version": "0.1.2", "version": "0.1.3",
"resolved": "https://registry.npmjs.org/message2call/-/message2call-0.1.2.tgz", "resolved": "https://registry.npmjs.org/message2call/-/message2call-0.1.3.tgz",
"integrity": "sha512-jUYYyrVwhd5PWKtQXp1qTKKMxllm3lRZ/Vka1pzSZ0zT957YY6c4Vg1mp3YXsU7cukrZkjXXvQJrteJwBzrKsQ==" "integrity": "sha512-jOOPKWTE5LMfuxz8D1o186ex+kJl7FgRz033Z371kvyfZDyCn+qhtrsIvgf4kPUf4zYAWM2SU4GFWbA7F2U+Ag=="
}, },
"node_modules/methods": { "node_modules/methods": {
"version": "1.1.2", "version": "1.1.2",
@ -19860,9 +19860,9 @@
} }
}, },
"@types/tunnel": { "@types/tunnel": {
"version": "0.0.3", "version": "0.0.4",
"resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz", "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.4.tgz",
"integrity": "sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==", "integrity": "sha512-bQgDBL5XiqrrPUaZd9bZ2esOXcU4GTmgg0n6LHDqoMJezO3VFRZsW8qN6Gp64/LAmjtzNU3iAHBfV3Z2ht5DSg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "*" "@types/node": "*"
@ -20149,9 +20149,9 @@
"integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==" "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
}, },
"@vue/language-plugin-pug": { "@vue/language-plugin-pug": {
"version": "1.8.10", "version": "1.8.11",
"resolved": "https://registry.npmjs.org/@vue/language-plugin-pug/-/language-plugin-pug-1.8.10.tgz", "resolved": "https://registry.npmjs.org/@vue/language-plugin-pug/-/language-plugin-pug-1.8.11.tgz",
"integrity": "sha512-UBoWXnNk0+5L/eIhfC9Jn8VcL905arkS80TBPCxvLLI0mL0wSNZcH93mp4HmFw9EO8s6RnpGYmPNXPiDLyI9/A==", "integrity": "sha512-b5GgfkLhnGaD99aAQYo29qis/aCEMwxzeoEb1x2sR96yu7h71eqEBrlvgr6q4zg1QaNA8a7qztDRhypGrQrHvQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@volar/source-map": "~1.10.0", "@volar/source-map": "~1.10.0",
@ -22710,9 +22710,9 @@
} }
}, },
"electron": { "electron": {
"version": "22.3.23", "version": "22.3.24",
"resolved": "https://registry.npmjs.org/electron/-/electron-22.3.23.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-22.3.24.tgz",
"integrity": "sha512-2p6NsLFPfM2RmgATchjKZKBUP3O6NxQMWOrHt9W5U2GRtfI8qWlicUR1wnh5D1VLt4c1YsjvpF6dct+1JNRubA==", "integrity": "sha512-wnGsShoRVk1Jmgr7h/jZK9bI5UwMF88sdQ5c8z2j2N8B9elhF/jKDFjwDXUrY1Y0xzAskOP0tYIDE+UbUM4byQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^2.0.0", "@electron/get": "^2.0.0",
@ -22849,9 +22849,9 @@
} }
}, },
"electron-log": { "electron-log": {
"version": "5.0.0-beta.28", "version": "5.0.0-beta.29",
"resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.0-beta.28.tgz", "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.0-beta.29.tgz",
"integrity": "sha512-gVkQxxYQfV3nmx4zw4lsxWdzdaqJhK+OyBNOU3GGwjhtApbH7KQTWgr8sZcowEk0D6ksj+UbvaHOaU1HTaClzA==" "integrity": "sha512-d7/HhqBYQIKPGsKmQC/jOtdElzD6v4/rO/S6D/I1cFgeAiZZrs2N8IlY/36sHe52MBt3PBMTw05FBCY5QcKzEQ=="
}, },
"electron-publish": { "electron-publish": {
"version": "24.5.0", "version": "24.5.0",
@ -22907,9 +22907,9 @@
} }
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.4.513", "version": "1.4.520",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.513.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.520.tgz",
"integrity": "sha512-cOB0xcInjm+E5qIssHeXJ29BaUyWpMyFKT5RB3bsLENDheCja0wMkHJyiPl0NBE/VzDI7JDuNEQWhe6RitEUcw==", "integrity": "sha512-Frfus2VpYADsrh1lB3v/ft/WVFlVzOIm+Q0p7U7VqHI6qr7NWHYKe+Wif3W50n7JAFoBsWVsoU0+qDks6WQ60g==",
"dev": true "dev": true
}, },
"electron-updater": { "electron-updater": {
@ -25808,9 +25808,9 @@
"dev": true "dev": true
}, },
"message2call": { "message2call": {
"version": "0.1.2", "version": "0.1.3",
"resolved": "https://registry.npmjs.org/message2call/-/message2call-0.1.2.tgz", "resolved": "https://registry.npmjs.org/message2call/-/message2call-0.1.3.tgz",
"integrity": "sha512-jUYYyrVwhd5PWKtQXp1qTKKMxllm3lRZ/Vka1pzSZ0zT957YY6c4Vg1mp3YXsU7cukrZkjXXvQJrteJwBzrKsQ==" "integrity": "sha512-jOOPKWTE5LMfuxz8D1o186ex+kJl7FgRz033Z371kvyfZDyCn+qhtrsIvgf4kPUf4zYAWM2SU4GFWbA7F2U+Ag=="
}, },
"methods": { "methods": {
"version": "1.1.2", "version": "1.1.2",

12
package.json
View File

@ -216,10 +216,10 @@
"@tsconfig/recommended": "^1.0.2", "@tsconfig/recommended": "^1.0.2",
"@types/better-sqlite3": "^7.6.4", "@types/better-sqlite3": "^7.6.4",
"@types/needle": "^3.2.0", "@types/needle": "^3.2.0",
"@types/tunnel": "^0.0.3", "@types/tunnel": "^0.0.4",
"@types/ws": "8.5.4", "@types/ws": "8.5.4",
"@volar/vue-language-plugin-pug": "^1.6.5", "@volar/vue-language-plugin-pug": "^1.6.5",
"@vue/language-plugin-pug": "^1.8.10", "@vue/language-plugin-pug": "^1.8.11",
"babel-loader": "^9.1.3", "babel-loader": "^9.1.3",
"browserslist": "^4.21.10", "browserslist": "^4.21.10",
"chalk": "^4.1.2", "chalk": "^4.1.2",
@ -230,11 +230,11 @@
"css-loader": "^6.8.1", "css-loader": "^6.8.1",
"css-minimizer-webpack-plugin": "^5.0.1", "css-minimizer-webpack-plugin": "^5.0.1",
"del": "^6.1.1", "del": "^6.1.1",
"electron": "^22.3.23", "electron": "^22.3.24",
"electron-builder": "^24.6.4", "electron-builder": "^24.6.4",
"electron-debug": "^3.2.0", "electron-debug": "^3.2.0",
"electron-devtools-installer": "^3.2.0", "electron-devtools-installer": "^3.2.0",
"electron-to-chromium": "^1.4.513", "electron-to-chromium": "^1.4.520",
"electron-updater": "^6.1.4", "electron-updater": "^6.1.4",
"eslint": "^8.49.0", "eslint": "^8.49.0",
"eslint-config-standard": "^17.1.0", "eslint-config-standard": "^17.1.0",
@ -279,14 +279,14 @@
"comlink": "~4.3.1", "comlink": "~4.3.1",
"crypto-js": "^4.1.1", "crypto-js": "^4.1.1",
"electron-font-manager": "github:lyswhut/electron-font-manager#6d2f5ecf850c4fe34812b9394913680462ee0dae", "electron-font-manager": "github:lyswhut/electron-font-manager#6d2f5ecf850c4fe34812b9394913680462ee0dae",
"electron-log": "^5.0.0-beta.28", "electron-log": "^5.0.0-beta.29",
"electron-store": "^8.1.0", "electron-store": "^8.1.0",
"font-list": "^1.5.1", "font-list": "^1.5.1",
"iconv-lite": "^0.6.3", "iconv-lite": "^0.6.3",
"image-size": "^1.0.2", "image-size": "^1.0.2",
"jschardet": "^3.0.0", "jschardet": "^3.0.0",
"long": "^5.2.3", "long": "^5.2.3",
"message2call": "^0.1.2", "message2call": "^0.1.3",
"music-metadata": "^8.1.4", "music-metadata": "^8.1.4",
"needle": "github:lyswhut/needle#93299ac841b7e9a9f82ca7279b88aaaeda404060", "needle": "github:lyswhut/needle#93299ac841b7e9a9f82ca7279b88aaaeda404060",
"node-id3": "^0.2.6", "node-id3": "^0.2.6",

4
publish/changeLog.md
View File

@ -4,3 +4,7 @@
### 修复 ### 修复
- 修复 v2.4.0 的默认数据库版本号不对导致首次安装该版本的用户无法再次启动软件的问题 - 修复 v2.4.0 的默认数据库版本号不对导致首次安装该版本的用户无法再次启动软件的问题
### 其他
- 更新 electron 到 v22.3.24

4
src/main/modules/sync/client/client.ts
View File

@ -214,7 +214,7 @@ export const connect = (urlInfo: LX.Sync.Client.UrlInfo, keyInfo: LX.Sync.Client
client?.close(SYNC_CLOSE_CODE.failed) client?.close(SYNC_CLOSE_CODE.failed)
return return
} }
message2read.onMessage(syncData) message2read.message(syncData)
}).catch((error) => { }).catch((error) => {
log.error('decrypt msg error: ', error) log.error('decrypt msg error: ', error)
client?.close(SYNC_CLOSE_CODE.failed) client?.close(SYNC_CLOSE_CODE.failed)
@ -253,7 +253,7 @@ export const connect = (urlInfo: LX.Sync.Client.UrlInfo, keyInfo: LX.Sync.Client
} }
closeEvents = [] closeEvents = []
disconnected = true disconnected = true
message2read.onDestroy() message2read.destroy()
switch (code) { switch (code) {
case SYNC_CLOSE_CODE.normal: case SYNC_CLOSE_CODE.normal:
// case SYNC_CLOSE_CODE.failed: // case SYNC_CLOSE_CODE.failed:

4
src/main/modules/sync/server/server/server.ts
View File

@ -210,7 +210,7 @@ const handleStartServer = async(port = 9527, ip = '0.0.0.0') => await new Promis
socket.close(SYNC_CLOSE_CODE.failed) socket.close(SYNC_CLOSE_CODE.failed)
return return
} }
msg2call.onMessage(syncData) msg2call.message(syncData)
}).catch(err => { }).catch(err => {
log.error('decrypt message error:', err) log.error('decrypt message error:', err)
log.error(err.message) log.error(err.message)
@ -226,7 +226,7 @@ const handleStartServer = async(port = 9527, ip = '0.0.0.0') => await new Promis
} }
closeEvents = [] closeEvents = []
disconnected = true disconnected = true
msg2call.onDestroy() msg2call.destroy()
if (socket.isReady) { if (socket.isReady) {
log.info('deconnection', socket.userInfo.name, socket.keyInfo.deviceName) log.info('deconnection', socket.userInfo.name, socket.keyInfo.deviceName)
// events = {} // events = {}