From aabd6d89854f97a3f0af95bca363e8d2a0db6fc2 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Thu, 14 Sep 2023 11:04:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 84 +++++++++---------- package.json | 12 +-- publish/changeLog.md | 4 + src/main/modules/sync/client/client.ts | 4 +- src/main/modules/sync/server/server/server.ts | 4 +- 5 files changed, 56 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index 06c8d17b..1db79c1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,14 +16,14 @@ "comlink": "~4.3.1", "crypto-js": "^4.1.1", "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", "font-list": "^1.5.1", "iconv-lite": "^0.6.3", "image-size": "^1.0.2", "jschardet": "^3.0.0", "long": "^5.2.3", - "message2call": "^0.1.2", + "message2call": "^0.1.3", "music-metadata": "^8.1.4", "needle": "github:lyswhut/needle#93299ac841b7e9a9f82ca7279b88aaaeda404060", "node-id3": "^0.2.6", @@ -46,10 +46,10 @@ "@tsconfig/recommended": "^1.0.2", "@types/better-sqlite3": "^7.6.4", "@types/needle": "^3.2.0", - "@types/tunnel": "^0.0.3", + "@types/tunnel": "^0.0.4", "@types/ws": "8.5.4", "@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", "browserslist": "^4.21.10", "chalk": "^4.1.2", @@ -60,11 +60,11 @@ "css-loader": "^6.8.1", "css-minimizer-webpack-plugin": "^5.0.1", "del": "^6.1.1", - "electron": "^22.3.23", + "electron": "^22.3.24", "electron-builder": "^24.6.4", "electron-debug": "^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", "eslint": "^8.49.0", "eslint-config-standard": "^17.1.0", @@ -3096,9 +3096,9 @@ } }, "node_modules/@types/tunnel": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz", - "integrity": "sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==", + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.4.tgz", + "integrity": "sha512-bQgDBL5XiqrrPUaZd9bZ2esOXcU4GTmgg0n6LHDqoMJezO3VFRZsW8qN6Gp64/LAmjtzNU3iAHBfV3Z2ht5DSg==", "dev": true, "dependencies": { "@types/node": "*" @@ -3490,9 +3490,9 @@ "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==" }, "node_modules/@vue/language-plugin-pug": { - "version": "1.8.10", - "resolved": "https://registry.npmjs.org/@vue/language-plugin-pug/-/language-plugin-pug-1.8.10.tgz", - "integrity": "sha512-UBoWXnNk0+5L/eIhfC9Jn8VcL905arkS80TBPCxvLLI0mL0wSNZcH93mp4HmFw9EO8s6RnpGYmPNXPiDLyI9/A==", + "version": "1.8.11", + "resolved": "https://registry.npmjs.org/@vue/language-plugin-pug/-/language-plugin-pug-1.8.11.tgz", + "integrity": "sha512-b5GgfkLhnGaD99aAQYo29qis/aCEMwxzeoEb1x2sR96yu7h71eqEBrlvgr6q4zg1QaNA8a7qztDRhypGrQrHvQ==", "dev": true, "dependencies": { "@volar/source-map": "~1.10.0", @@ -6837,9 +6837,9 @@ } }, "node_modules/electron": { - "version": "22.3.23", - "resolved": "https://registry.npmjs.org/electron/-/electron-22.3.23.tgz", - "integrity": "sha512-2p6NsLFPfM2RmgATchjKZKBUP3O6NxQMWOrHt9W5U2GRtfI8qWlicUR1wnh5D1VLt4c1YsjvpF6dct+1JNRubA==", + "version": "22.3.24", + "resolved": "https://registry.npmjs.org/electron/-/electron-22.3.24.tgz", + "integrity": "sha512-wnGsShoRVk1Jmgr7h/jZK9bI5UwMF88sdQ5c8z2j2N8B9elhF/jKDFjwDXUrY1Y0xzAskOP0tYIDE+UbUM4byQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -6995,9 +6995,9 @@ } }, "node_modules/electron-log": { - "version": "5.0.0-beta.28", - "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.0-beta.28.tgz", - "integrity": "sha512-gVkQxxYQfV3nmx4zw4lsxWdzdaqJhK+OyBNOU3GGwjhtApbH7KQTWgr8sZcowEk0D6ksj+UbvaHOaU1HTaClzA==", + "version": "5.0.0-beta.29", + "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.0-beta.29.tgz", + "integrity": "sha512-d7/HhqBYQIKPGsKmQC/jOtdElzD6v4/rO/S6D/I1cFgeAiZZrs2N8IlY/36sHe52MBt3PBMTw05FBCY5QcKzEQ==", "engines": { "electron": ">= 13", "node": ">= 14" @@ -7066,9 +7066,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.513", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.513.tgz", - "integrity": "sha512-cOB0xcInjm+E5qIssHeXJ29BaUyWpMyFKT5RB3bsLENDheCja0wMkHJyiPl0NBE/VzDI7JDuNEQWhe6RitEUcw==", + "version": "1.4.520", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.520.tgz", + "integrity": "sha512-Frfus2VpYADsrh1lB3v/ft/WVFlVzOIm+Q0p7U7VqHI6qr7NWHYKe+Wif3W50n7JAFoBsWVsoU0+qDks6WQ60g==", "dev": true }, "node_modules/electron-updater": { @@ -10930,9 +10930,9 @@ } }, "node_modules/message2call": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/message2call/-/message2call-0.1.2.tgz", - "integrity": "sha512-jUYYyrVwhd5PWKtQXp1qTKKMxllm3lRZ/Vka1pzSZ0zT957YY6c4Vg1mp3YXsU7cukrZkjXXvQJrteJwBzrKsQ==" + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/message2call/-/message2call-0.1.3.tgz", + "integrity": "sha512-jOOPKWTE5LMfuxz8D1o186ex+kJl7FgRz033Z371kvyfZDyCn+qhtrsIvgf4kPUf4zYAWM2SU4GFWbA7F2U+Ag==" }, "node_modules/methods": { "version": "1.1.2", @@ -19860,9 +19860,9 @@ } }, "@types/tunnel": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz", - "integrity": "sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==", + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.4.tgz", + "integrity": "sha512-bQgDBL5XiqrrPUaZd9bZ2esOXcU4GTmgg0n6LHDqoMJezO3VFRZsW8qN6Gp64/LAmjtzNU3iAHBfV3Z2ht5DSg==", "dev": true, "requires": { "@types/node": "*" @@ -20149,9 +20149,9 @@ "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==" }, "@vue/language-plugin-pug": { - "version": "1.8.10", - "resolved": "https://registry.npmjs.org/@vue/language-plugin-pug/-/language-plugin-pug-1.8.10.tgz", - "integrity": "sha512-UBoWXnNk0+5L/eIhfC9Jn8VcL905arkS80TBPCxvLLI0mL0wSNZcH93mp4HmFw9EO8s6RnpGYmPNXPiDLyI9/A==", + "version": "1.8.11", + "resolved": "https://registry.npmjs.org/@vue/language-plugin-pug/-/language-plugin-pug-1.8.11.tgz", + "integrity": "sha512-b5GgfkLhnGaD99aAQYo29qis/aCEMwxzeoEb1x2sR96yu7h71eqEBrlvgr6q4zg1QaNA8a7qztDRhypGrQrHvQ==", "dev": true, "requires": { "@volar/source-map": "~1.10.0", @@ -22710,9 +22710,9 @@ } }, "electron": { - "version": "22.3.23", - "resolved": "https://registry.npmjs.org/electron/-/electron-22.3.23.tgz", - "integrity": "sha512-2p6NsLFPfM2RmgATchjKZKBUP3O6NxQMWOrHt9W5U2GRtfI8qWlicUR1wnh5D1VLt4c1YsjvpF6dct+1JNRubA==", + "version": "22.3.24", + "resolved": "https://registry.npmjs.org/electron/-/electron-22.3.24.tgz", + "integrity": "sha512-wnGsShoRVk1Jmgr7h/jZK9bI5UwMF88sdQ5c8z2j2N8B9elhF/jKDFjwDXUrY1Y0xzAskOP0tYIDE+UbUM4byQ==", "dev": true, "requires": { "@electron/get": "^2.0.0", @@ -22849,9 +22849,9 @@ } }, "electron-log": { - "version": "5.0.0-beta.28", - "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.0-beta.28.tgz", - "integrity": "sha512-gVkQxxYQfV3nmx4zw4lsxWdzdaqJhK+OyBNOU3GGwjhtApbH7KQTWgr8sZcowEk0D6ksj+UbvaHOaU1HTaClzA==" + "version": "5.0.0-beta.29", + "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.0.0-beta.29.tgz", + "integrity": "sha512-d7/HhqBYQIKPGsKmQC/jOtdElzD6v4/rO/S6D/I1cFgeAiZZrs2N8IlY/36sHe52MBt3PBMTw05FBCY5QcKzEQ==" }, "electron-publish": { "version": "24.5.0", @@ -22907,9 +22907,9 @@ } }, "electron-to-chromium": { - "version": "1.4.513", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.513.tgz", - "integrity": "sha512-cOB0xcInjm+E5qIssHeXJ29BaUyWpMyFKT5RB3bsLENDheCja0wMkHJyiPl0NBE/VzDI7JDuNEQWhe6RitEUcw==", + "version": "1.4.520", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.520.tgz", + "integrity": "sha512-Frfus2VpYADsrh1lB3v/ft/WVFlVzOIm+Q0p7U7VqHI6qr7NWHYKe+Wif3W50n7JAFoBsWVsoU0+qDks6WQ60g==", "dev": true }, "electron-updater": { @@ -25808,9 +25808,9 @@ "dev": true }, "message2call": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/message2call/-/message2call-0.1.2.tgz", - "integrity": "sha512-jUYYyrVwhd5PWKtQXp1qTKKMxllm3lRZ/Vka1pzSZ0zT957YY6c4Vg1mp3YXsU7cukrZkjXXvQJrteJwBzrKsQ==" + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/message2call/-/message2call-0.1.3.tgz", + "integrity": "sha512-jOOPKWTE5LMfuxz8D1o186ex+kJl7FgRz033Z371kvyfZDyCn+qhtrsIvgf4kPUf4zYAWM2SU4GFWbA7F2U+Ag==" }, "methods": { "version": "1.1.2", diff --git a/package.json b/package.json index 5176374b..93a2ce89 100644 --- a/package.json +++ b/package.json @@ -216,10 +216,10 @@ "@tsconfig/recommended": "^1.0.2", "@types/better-sqlite3": "^7.6.4", "@types/needle": "^3.2.0", - "@types/tunnel": "^0.0.3", + "@types/tunnel": "^0.0.4", "@types/ws": "8.5.4", "@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", "browserslist": "^4.21.10", "chalk": "^4.1.2", @@ -230,11 +230,11 @@ "css-loader": "^6.8.1", "css-minimizer-webpack-plugin": "^5.0.1", "del": "^6.1.1", - "electron": "^22.3.23", + "electron": "^22.3.24", "electron-builder": "^24.6.4", "electron-debug": "^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", "eslint": "^8.49.0", "eslint-config-standard": "^17.1.0", @@ -279,14 +279,14 @@ "comlink": "~4.3.1", "crypto-js": "^4.1.1", "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", "font-list": "^1.5.1", "iconv-lite": "^0.6.3", "image-size": "^1.0.2", "jschardet": "^3.0.0", "long": "^5.2.3", - "message2call": "^0.1.2", + "message2call": "^0.1.3", "music-metadata": "^8.1.4", "needle": "github:lyswhut/needle#93299ac841b7e9a9f82ca7279b88aaaeda404060", "node-id3": "^0.2.6", diff --git a/publish/changeLog.md b/publish/changeLog.md index 120b2068..6adf4722 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -4,3 +4,7 @@ ### 修复 - 修复 v2.4.0 的默认数据库版本号不对导致首次安装该版本的用户无法再次启动软件的问题 + +### 其他 + +- 更新 electron 到 v22.3.24 diff --git a/src/main/modules/sync/client/client.ts b/src/main/modules/sync/client/client.ts index a26e3ea3..97dbeb27 100644 --- a/src/main/modules/sync/client/client.ts +++ b/src/main/modules/sync/client/client.ts @@ -214,7 +214,7 @@ export const connect = (urlInfo: LX.Sync.Client.UrlInfo, keyInfo: LX.Sync.Client client?.close(SYNC_CLOSE_CODE.failed) return } - message2read.onMessage(syncData) + message2read.message(syncData) }).catch((error) => { log.error('decrypt msg error: ', error) client?.close(SYNC_CLOSE_CODE.failed) @@ -253,7 +253,7 @@ export const connect = (urlInfo: LX.Sync.Client.UrlInfo, keyInfo: LX.Sync.Client } closeEvents = [] disconnected = true - message2read.onDestroy() + message2read.destroy() switch (code) { case SYNC_CLOSE_CODE.normal: // case SYNC_CLOSE_CODE.failed: diff --git a/src/main/modules/sync/server/server/server.ts b/src/main/modules/sync/server/server/server.ts index 1c113032..3e28e031 100644 --- a/src/main/modules/sync/server/server/server.ts +++ b/src/main/modules/sync/server/server/server.ts @@ -210,7 +210,7 @@ const handleStartServer = async(port = 9527, ip = '0.0.0.0') => await new Promis socket.close(SYNC_CLOSE_CODE.failed) return } - msg2call.onMessage(syncData) + msg2call.message(syncData) }).catch(err => { log.error('decrypt message error:', err) log.error(err.message) @@ -226,7 +226,7 @@ const handleStartServer = async(port = 9527, ip = '0.0.0.0') => await new Promis } closeEvents = [] disconnected = true - msg2call.onDestroy() + msg2call.destroy() if (socket.isReady) { log.info('deconnection', socket.userInfo.name, socket.keyInfo.deviceName) // events = {}