From 0dfc41864e92328df966868162a6fceafd0ebe42 Mon Sep 17 00:00:00 2001 From: ZHAO Xudong Date: Thu, 19 Sep 2024 16:06:39 +0800 Subject: [PATCH] Code sync --- package-lock.json | 269 +++++++--------------------------- package.json | 8 +- src/app/server/session-rdp.js | 2 +- src/app/server/sync.js | 2 +- 4 files changed, 59 insertions(+), 222 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8711ef5..25cd70d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,18 @@ { "name": "electerm-web", - "version": "2.39.119", + "version": "2.40.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "electerm-web", - "version": "2.39.119", + "version": "2.40.1", "hasInstallScript": true, "license": "MIT", "dependencies": { - "@electerm/electerm-locales": "2.0.1", + "@electerm/electerm-locales": "2.0.3", "@electerm/electerm-themes": "^1.0.1", + "@electerm/rdpjs": "^1.0.0", "@yetzt/nedb": "1.8.0", "axios": "^1.7.3", "dayjs": "1.11.9", @@ -36,7 +37,6 @@ "nanoid": "3.1.31", "node-bash": "5.0.1", "node-pty": "^1.1.0-beta14", - "node-rdpjs-2": "^0.3.5", "os-locale-s": "1.0.8", "pug": "3.0.2", "serialport": "10.4.0", @@ -51,7 +51,7 @@ }, "devDependencies": { "@ant-design/icons": "5.2.6", - "@electerm/electerm-react": "^1.39.119", + "@electerm/electerm-react": "^1.40.2", "@electerm/electerm-resource": "1.3.7", "@electerm/strip-ansi": "^1.0.0", "@novnc/novnc": "^1.4.0", @@ -684,14 +684,14 @@ } }, "node_modules/@electerm/electerm-locales": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@electerm/electerm-locales/-/electerm-locales-2.0.1.tgz", - "integrity": "sha512-DJRToxWdPAcFRkShc+Mhnh50ib6ETgb5pidC63CfNugkKxM27Mn2okMf8XF3sl5KeBCUvoN4rDSvc90Pltj8aw==" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@electerm/electerm-locales/-/electerm-locales-2.0.3.tgz", + "integrity": "sha512-qgH8MvDIy4gq76Q89wZpuMXHLdVquoaWEX0acHeumq08DBvsHqXbrgII50WAte3cOxkzFLrf6ZKMRqHsE9d1DA==" }, "node_modules/@electerm/electerm-react": { - "version": "1.39.119", - "resolved": "https://registry.npmjs.org/@electerm/electerm-react/-/electerm-react-1.39.119.tgz", - "integrity": "sha512-9ncPEL56ZC0xSoOZBtmJ0L6DS8K0N2oPa/NlOGT7OiG5mUf1cLWcWwxl+EZRQmNcwieE4IINpkAB1e8RzfMRxA==", + "version": "1.40.2", + "resolved": "https://registry.npmjs.org/@electerm/electerm-react/-/electerm-react-1.40.2.tgz", + "integrity": "sha512-kECytqtOgqKNZ1qU1VLax5mRx4zlW7sYA0DlNn7i5VQmP41sfuQ/Mdl/sckVmWgVgxzp6VLxUpEq1bFqR0JtBw==", "dev": true, "engines": { "node": ">=18.0.0" @@ -711,6 +711,14 @@ "node": ">=18.0.0" } }, + "node_modules/@electerm/rdpjs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@electerm/rdpjs/-/rdpjs-1.0.0.tgz", + "integrity": "sha512-QVmqezPJzC/+b2a6UHg7/uBdfFf/4nTN8Zif/FXapOsk+NQgm3B5jcRmW14bm9qWtOdkscj+A90sSSoFjPTruQ==", + "dependencies": { + "node-forge": "^1.3.1" + } + }, "node_modules/@electerm/strip-ansi": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@electerm/strip-ansi/-/strip-ansi-1.0.0.tgz", @@ -2321,23 +2329,6 @@ "esbuild": ">=0.17" } }, - "node_modules/bunyan": { - "version": "1.8.15", - "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz", - "integrity": "sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==", - "engines": [ - "node >=0.10.0" - ], - "bin": { - "bunyan": "bin/bunyan" - }, - "optionalDependencies": { - "dtrace-provider": "~0.8", - "moment": "^2.19.3", - "mv": "~2", - "safe-json-stringify": "~1" - } - }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -2985,19 +2976,6 @@ "url": "https://github.com/motdotla/dotenv?sponsor=1" } }, - "node_modules/dtrace-provider": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz", - "integrity": "sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==", - "hasInstallScript": true, - "optional": true, - "dependencies": { - "nan": "^2.14.0" - }, - "engines": { - "node": ">=0.10" - } - }, "node_modules/ecdsa-sig-formatter": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", @@ -5978,7 +5956,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "devOptional": true, + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -6034,7 +6012,9 @@ "version": "2.30.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", + "dev": true, "optional": true, + "peer": true, "engines": { "node": "*" } @@ -6083,60 +6063,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "node_modules/mv": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", - "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==", - "optional": true, - "dependencies": { - "mkdirp": "~0.5.1", - "ncp": "~2.0.0", - "rimraf": "~2.4.0" - }, - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/mv/node_modules/glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==", - "optional": true, - "dependencies": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - } - }, - "node_modules/mv/node_modules/mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "optional": true, - "dependencies": { - "minimist": "^1.2.6" - }, - "bin": { - "mkdirp": "bin/cmd.js" - } - }, - "node_modules/mv/node_modules/rimraf": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==", - "optional": true, - "dependencies": { - "glob": "^6.0.1" - }, - "bin": { - "rimraf": "bin.js" - } - }, "node_modules/mz": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", @@ -6170,15 +6096,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/ncp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==", - "optional": true, - "bin": { - "ncp": "bin/ncp" - } - }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -6200,6 +6117,14 @@ "child-shell": "^5.0.0" } }, + "node_modules/node-forge": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", + "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", + "engines": { + "node": ">= 6.13.0" + } + }, "node_modules/node-gyp-build": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", @@ -6219,18 +6144,6 @@ "nan": "^2.17.0" } }, - "node_modules/node-rdpjs-2": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/node-rdpjs-2/-/node-rdpjs-2-0.3.5.tgz", - "integrity": "sha512-ABgNbpbJlX2S4SZnsyoUd1MXINLq2y2hbrOXcoxn/NMl4/7uhM/JmXKublF3AooOgRCVKlXiefUVCIMSG/mNZw==", - "dependencies": { - "bunyan": "^1.8.12", - "lodash.isnumber": "^3.0.3" - }, - "engines": { - "node": ">=8.5.0" - } - }, "node_modules/node-releases": { "version": "2.0.14", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", @@ -8220,12 +8133,6 @@ } ] }, - "node_modules/safe-json-stringify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz", - "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==", - "optional": true - }, "node_modules/safe-regex-test": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", @@ -10857,14 +10764,14 @@ "dev": true }, "@electerm/electerm-locales": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@electerm/electerm-locales/-/electerm-locales-2.0.1.tgz", - "integrity": "sha512-DJRToxWdPAcFRkShc+Mhnh50ib6ETgb5pidC63CfNugkKxM27Mn2okMf8XF3sl5KeBCUvoN4rDSvc90Pltj8aw==" + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@electerm/electerm-locales/-/electerm-locales-2.0.3.tgz", + "integrity": "sha512-qgH8MvDIy4gq76Q89wZpuMXHLdVquoaWEX0acHeumq08DBvsHqXbrgII50WAte3cOxkzFLrf6ZKMRqHsE9d1DA==" }, "@electerm/electerm-react": { - "version": "1.39.119", - "resolved": "https://registry.npmjs.org/@electerm/electerm-react/-/electerm-react-1.39.119.tgz", - "integrity": "sha512-9ncPEL56ZC0xSoOZBtmJ0L6DS8K0N2oPa/NlOGT7OiG5mUf1cLWcWwxl+EZRQmNcwieE4IINpkAB1e8RzfMRxA==", + "version": "1.40.2", + "resolved": "https://registry.npmjs.org/@electerm/electerm-react/-/electerm-react-1.40.2.tgz", + "integrity": "sha512-kECytqtOgqKNZ1qU1VLax5mRx4zlW7sYA0DlNn7i5VQmP41sfuQ/Mdl/sckVmWgVgxzp6VLxUpEq1bFqR0JtBw==", "dev": true }, "@electerm/electerm-resource": { @@ -10878,6 +10785,14 @@ "resolved": "https://registry.npmjs.org/@electerm/electerm-themes/-/electerm-themes-1.0.1.tgz", "integrity": "sha512-Xx9SW+iXad/LODpeEK79Hs7z3AFergW/oFbVMZY/Wa2XCtcxhb8iEjrCLSkPX/wWjpq28Wm2nrJGChAls2mXMg==" }, + "@electerm/rdpjs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@electerm/rdpjs/-/rdpjs-1.0.0.tgz", + "integrity": "sha512-QVmqezPJzC/+b2a6UHg7/uBdfFf/4nTN8Zif/FXapOsk+NQgm3B5jcRmW14bm9qWtOdkscj+A90sSSoFjPTruQ==", + "requires": { + "node-forge": "^1.3.1" + } + }, "@electerm/strip-ansi": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@electerm/strip-ansi/-/strip-ansi-1.0.0.tgz", @@ -11978,17 +11893,6 @@ "load-tsconfig": "^0.2.3" } }, - "bunyan": { - "version": "1.8.15", - "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.15.tgz", - "integrity": "sha512-0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==", - "requires": { - "dtrace-provider": "~0.8", - "moment": "^2.19.3", - "mv": "~2", - "safe-json-stringify": "~1" - } - }, "bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -12457,15 +12361,6 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==" }, - "dtrace-provider": { - "version": "0.8.8", - "resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz", - "integrity": "sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==", - "optional": true, - "requires": { - "nan": "^2.14.0" - } - }, "ecdsa-sig-formatter": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", @@ -14607,7 +14502,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "devOptional": true + "dev": true }, "minipass": { "version": "5.0.0", @@ -14647,7 +14542,9 @@ "version": "2.30.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", - "optional": true + "dev": true, + "optional": true, + "peer": true }, "morgan": { "version": "1.10.0", @@ -14689,50 +14586,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, - "mv": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", - "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==", - "optional": true, - "requires": { - "mkdirp": "~0.5.1", - "ncp": "~2.0.0", - "rimraf": "~2.4.0" - }, - "dependencies": { - "glob": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", - "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==", - "optional": true, - "requires": { - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "2 || 3", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "optional": true, - "requires": { - "minimist": "^1.2.6" - } - }, - "rimraf": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", - "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==", - "optional": true, - "requires": { - "glob": "^6.0.1" - } - } - } - }, "mz": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", @@ -14760,12 +14613,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "ncp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", - "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==", - "optional": true - }, "negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -14784,6 +14631,11 @@ "child-shell": "^5.0.0" } }, + "node-forge": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", + "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==" + }, "node-gyp-build": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz", @@ -14797,15 +14649,6 @@ "nan": "^2.17.0" } }, - "node-rdpjs-2": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/node-rdpjs-2/-/node-rdpjs-2-0.3.5.tgz", - "integrity": "sha512-ABgNbpbJlX2S4SZnsyoUd1MXINLq2y2hbrOXcoxn/NMl4/7uhM/JmXKublF3AooOgRCVKlXiefUVCIMSG/mNZw==", - "requires": { - "bunyan": "^1.8.12", - "lodash.isnumber": "^3.0.3" - } - }, "node-releases": { "version": "2.0.14", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", @@ -16208,12 +16051,6 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" }, - "safe-json-stringify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz", - "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==", - "optional": true - }, "safe-regex-test": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", diff --git a/package.json b/package.json index f028e23..db44296 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electerm-web", - "version": "2.39.119", + "version": "2.40.1", "description": "Running electerm in as web app", "main": "src/app/app.js", "type": "module", @@ -47,7 +47,7 @@ "preferGlobal": true, "devDependencies": { "@ant-design/icons": "5.2.6", - "@electerm/electerm-react": "^1.39.119", + "@electerm/electerm-react": "^1.40.2", "@electerm/electerm-resource": "1.3.7", "@electerm/strip-ansi": "^1.0.0", "@novnc/novnc": "^1.4.0", @@ -93,8 +93,9 @@ "zmodem-ts": "^1.0.4" }, "dependencies": { - "@electerm/electerm-locales": "2.0.1", + "@electerm/electerm-locales": "2.0.3", "@electerm/electerm-themes": "^1.0.1", + "@electerm/rdpjs": "^1.0.0", "@yetzt/nedb": "1.8.0", "axios": "^1.7.3", "dayjs": "1.11.9", @@ -119,7 +120,6 @@ "nanoid": "3.1.31", "node-bash": "5.0.1", "node-pty": "^1.1.0-beta14", - "node-rdpjs-2": "^0.3.5", "os-locale-s": "1.0.8", "pug": "3.0.2", "serialport": "10.4.0", diff --git a/src/app/server/session-rdp.js b/src/app/server/session-rdp.js index ab5f9b8..2eff9ff 100644 --- a/src/app/server/session-rdp.js +++ b/src/app/server/session-rdp.js @@ -3,7 +3,7 @@ */ import _ from 'lodash' import log from '../common/log.js' -import rdp from 'node-rdpjs-2' +import rdp from '@electerm/rdpjs' import { TerminalBase } from './session-base.js' import { isDev } from '../common/runtime-constants.js' diff --git a/src/app/server/sync.js b/src/app/server/sync.js index 3111857..b9d3992 100644 --- a/src/app/server/sync.js +++ b/src/app/server/sync.js @@ -46,7 +46,7 @@ const dist = { async function doSync (type, func, args, token, proxy) { const argsArr = [...args] const inst = new dist[type](token) - if (type === 'cloud') { + if (type === 'cloud' && func === 'getOne') { argsArr[0] = '' } const agent = createProxyAgent(proxy)