code cleanup

This commit is contained in:
IrosTheBeggar 2024-12-21 10:40:01 -05:00
parent dd8dc84a07
commit 63d4d5eb02
3 changed files with 132 additions and 113 deletions

227
package-lock.json generated
View File

@ -41,7 +41,7 @@
"mstream": "cli-boot-wrapper.js"
},
"devDependencies": {
"electron-builder": "25.0.5"
"electron-builder": "25.1.8"
},
"engines": {
"node": ">=10.16.0"
@ -163,9 +163,9 @@
}
},
"node_modules/@electron/notarize": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.3.2.tgz",
"integrity": "sha512-zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg==",
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz",
"integrity": "sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==",
"dev": true,
"dependencies": {
"debug": "^4.1.1",
@ -225,9 +225,9 @@
}
},
"node_modules/@electron/rebuild": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.6.0.tgz",
"integrity": "sha512-zF4x3QupRU3uNGaP5X1wjpmcjfw1H87kyqZ00Tc3HvriV+4gmOGuvQjGNkrJuXdsApssdNyVwLsy+TaeTGGcVw==",
"version": "3.6.1",
"resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.6.1.tgz",
"integrity": "sha512-f6596ZHpEq/YskUd8emYvOUne89ij8mQgjYFA5ru25QwbrRO+t1SImofdDv7kKOuWCmVOuU5tvfkbgGxIl3E/w==",
"dev": true,
"dependencies": {
"@malept/cross-spawn-promise": "^2.0.0",
@ -1597,15 +1597,12 @@
}
},
"node_modules/agent-base": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
"integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
"dev": true,
"dependencies": {
"debug": "4"
},
"engines": {
"node": ">= 6.0.0"
"node": ">= 14"
}
},
"node_modules/agentkeepalive": {
@ -1688,41 +1685,44 @@
"integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="
},
"node_modules/app-builder-bin": {
"version": "5.0.0-alpha.7",
"resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.7.tgz",
"integrity": "sha512-ww2mK4ITUvqisnqOuUWAeHzokpPidyZ7a0ZkwW+V7sF5/Pdi2OldkRjAWqEzn6Xtmj3SLVT84as4wB59A6jJ4g==",
"version": "5.0.0-alpha.10",
"resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz",
"integrity": "sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw==",
"dev": true
},
"node_modules/app-builder-lib": {
"version": "25.0.5",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-25.0.5.tgz",
"integrity": "sha512-rxgxMx1f7I4ZAP0jA5+5iB7X6x6MJvGF7GauRzQBnIVihwXX2HOiAE7yenyY9Ry5YAiH47MnCxdq413Wq6XOcQ==",
"version": "25.1.8",
"resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-25.1.8.tgz",
"integrity": "sha512-pCqe7dfsQFBABC1jeKZXQWhGcCPF3rPCXDdfqVKjIeWBcXzyC1iOWZdfFhGl+S9MyE/k//DFmC6FzuGAUudNDg==",
"dev": true,
"dependencies": {
"@develar/schema-utils": "~2.6.5",
"@electron/notarize": "2.3.2",
"@electron/notarize": "2.5.0",
"@electron/osx-sign": "1.3.1",
"@electron/rebuild": "3.6.0",
"@electron/rebuild": "3.6.1",
"@electron/universal": "2.0.1",
"@malept/flatpak-bundler": "^0.4.0",
"@types/fs-extra": "9.0.13",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.9",
"builder-util": "25.0.3",
"builder-util-runtime": "9.2.5",
"builder-util": "25.1.7",
"builder-util-runtime": "9.2.10",
"chromium-pickle-js": "^0.2.0",
"config-file-ts": "0.2.8-rc1",
"debug": "^4.3.4",
"dotenv": "^16.4.5",
"dotenv-expand": "^11.0.6",
"ejs": "^3.1.8",
"electron-publish": "25.0.3",
"electron-publish": "25.1.7",
"form-data": "^4.0.0",
"fs-extra": "^10.1.0",
"hosted-git-info": "^4.1.0",
"is-ci": "^3.0.0",
"isbinaryfile": "^5.0.0",
"js-yaml": "^4.1.0",
"json5": "^2.2.3",
"lazy-val": "^1.0.5",
"minimatch": "^10.0.0",
"read-config-file": "6.4.0",
"resedit": "^1.7.0",
"sanitize-filename": "^1.6.3",
"semver": "^7.3.8",
@ -1733,8 +1733,8 @@
"node": ">=14.0.0"
},
"peerDependencies": {
"dmg-builder": "25.0.5",
"electron-builder-squirrel-windows": "25.0.5"
"dmg-builder": "25.1.8",
"electron-builder-squirrel-windows": "25.1.8"
}
},
"node_modules/aproba": {
@ -2098,22 +2098,22 @@
"integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
},
"node_modules/builder-util": {
"version": "25.0.3",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-25.0.3.tgz",
"integrity": "sha512-eH5c1ukdY2xjtFQWQ6jlzEuXuqcuAVc3UQ6V6fdYu9Kg3CkDbCR82Mox42uaJDmee9WXSbP/88cOworFdOHPhw==",
"version": "25.1.7",
"resolved": "https://registry.npmjs.org/builder-util/-/builder-util-25.1.7.tgz",
"integrity": "sha512-7jPjzBwEGRbwNcep0gGNpLXG9P94VA3CPAZQCzxkFXiV2GMQKlziMbY//rXPI7WKfhsvGgFXjTcXdBEwgXw9ww==",
"dev": true,
"dependencies": {
"@types/debug": "^4.1.6",
"7zip-bin": "~5.2.0",
"app-builder-bin": "5.0.0-alpha.7",
"app-builder-bin": "5.0.0-alpha.10",
"bluebird-lst": "^1.0.9",
"builder-util-runtime": "9.2.5",
"builder-util-runtime": "9.2.10",
"chalk": "^4.1.2",
"cross-spawn": "^7.0.3",
"debug": "^4.3.4",
"fs-extra": "^10.1.0",
"http-proxy-agent": "^5.0.0",
"https-proxy-agent": "^5.0.1",
"http-proxy-agent": "^7.0.0",
"https-proxy-agent": "^7.0.0",
"is-ci": "^3.0.0",
"js-yaml": "^4.1.0",
"source-map-support": "^0.5.19",
@ -2122,10 +2122,9 @@
}
},
"node_modules/builder-util-runtime": {
"version": "9.2.5",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.5.tgz",
"integrity": "sha512-HjIDfhvqx/8B3TDN4GbABQcgpewTU4LMRTQPkVpKYV3lsuxEJoIfvg09GyWTNmfVNSUAYf+fbTN//JX4TH20pg==",
"dev": true,
"version": "9.2.10",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz",
"integrity": "sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw==",
"dependencies": {
"debug": "^4.3.4",
"sax": "^1.2.4"
@ -2902,14 +2901,14 @@
}
},
"node_modules/dmg-builder": {
"version": "25.0.5",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-25.0.5.tgz",
"integrity": "sha512-ocnZV44ZqInoSFaY54fF7BlCtw+WtbrjyPrkBhaB+Ztn7GPKjmFgRbIKytifJ8h9Cib8jdFRMgjCUtkU45Y6DA==",
"version": "25.1.8",
"resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-25.1.8.tgz",
"integrity": "sha512-NoXo6Liy2heSklTI5OIZbCgXC1RzrDQsZkeEwXhdOro3FT1VBOvbubvscdPnjVuQ4AMwwv61oaH96AbiYg9EnQ==",
"dev": true,
"dependencies": {
"app-builder-lib": "25.0.5",
"builder-util": "25.0.3",
"builder-util-runtime": "9.2.5",
"app-builder-lib": "25.1.8",
"builder-util": "25.1.7",
"builder-util-runtime": "9.2.10",
"fs-extra": "^10.1.0",
"iconv-lite": "^0.6.2",
"js-yaml": "^4.1.0"
@ -3037,20 +3036,19 @@
}
},
"node_modules/electron-builder": {
"version": "25.0.5",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-25.0.5.tgz",
"integrity": "sha512-Uj5LFRbUqNiVajsgqcwlKe+CHtwubK3hcoJsW5C2YiWodej2mmxM+LrTqga0rrWWHVMNmrcmGcS/WHpKwy6KEw==",
"version": "25.1.8",
"resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-25.1.8.tgz",
"integrity": "sha512-poRgAtUHHOnlzZnc9PK4nzG53xh74wj2Jy7jkTrqZ0MWPoHGh1M2+C//hGeYdA+4K8w4yiVCNYoLXF7ySj2Wig==",
"dev": true,
"dependencies": {
"app-builder-lib": "25.0.5",
"builder-util": "25.0.3",
"builder-util-runtime": "9.2.5",
"app-builder-lib": "25.1.8",
"builder-util": "25.1.7",
"builder-util-runtime": "9.2.10",
"chalk": "^4.1.2",
"dmg-builder": "25.0.5",
"dmg-builder": "25.1.8",
"fs-extra": "^10.1.0",
"is-ci": "^3.0.0",
"lazy-val": "^1.0.5",
"read-config-file": "6.4.0",
"simple-update-notifier": "2.0.0",
"yargs": "^17.6.2"
},
@ -3063,15 +3061,15 @@
}
},
"node_modules/electron-builder-squirrel-windows": {
"version": "25.0.5",
"resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-25.0.5.tgz",
"integrity": "sha512-N2U7LGSdt4hmEhjEeIV2XJbjj2YIrTL6enfsGKfOhGTpL6GEejUmT3gjdKUqKBS5+NBx0GWhnEwD3MpO2P6Nfg==",
"version": "25.1.8",
"resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-25.1.8.tgz",
"integrity": "sha512-2ntkJ+9+0GFP6nAISiMabKt6eqBB0kX1QqHNWFWAXgi0VULKGisM46luRFpIBiU3u/TDmhZMM8tzvo2Abn3ayg==",
"dev": true,
"peer": true,
"dependencies": {
"app-builder-lib": "25.0.5",
"app-builder-lib": "25.1.8",
"archiver": "^5.3.1",
"builder-util": "25.0.3",
"builder-util": "25.1.7",
"fs-extra": "^10.1.0"
}
},
@ -3305,14 +3303,14 @@
}
},
"node_modules/electron-publish": {
"version": "25.0.3",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-25.0.3.tgz",
"integrity": "sha512-wSGm+TFK2lArswIFBPLuIRHbo945s3MCvG5y1xVC57zL/PsrElUkaGH2ERtRrcKNpaDNq77rDA9JnMJhAFJjUg==",
"version": "25.1.7",
"resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-25.1.7.tgz",
"integrity": "sha512-+jbTkR9m39eDBMP4gfbqglDd6UvBC7RLh5Y0MhFSsc6UkGHj9Vj9TWobxevHYMMqmoujL11ZLjfPpMX+Pt6YEg==",
"dev": true,
"dependencies": {
"@types/fs-extra": "^9.0.11",
"builder-util": "25.0.3",
"builder-util-runtime": "9.2.5",
"builder-util": "25.1.7",
"builder-util-runtime": "9.2.10",
"chalk": "^4.1.2",
"fs-extra": "^10.1.0",
"lazy-val": "^1.0.5",
@ -3334,18 +3332,6 @@
"tiny-typed-emitter": "^2.1.0"
}
},
"node_modules/electron-updater/node_modules/builder-util-runtime": {
"version": "9.2.10",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz",
"integrity": "sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw==",
"dependencies": {
"debug": "^4.3.4",
"sax": "^1.2.4"
},
"engines": {
"node": ">=12.0.0"
}
},
"node_modules/emoji-regex": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@ -4225,17 +4211,16 @@
}
},
"node_modules/http-proxy-agent": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
"version": "7.0.2",
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
"integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
"dev": true,
"dependencies": {
"@tootallnate/once": "2",
"agent-base": "6",
"debug": "4"
"agent-base": "^7.1.0",
"debug": "^4.3.4"
},
"engines": {
"node": ">= 6"
"node": ">= 14"
}
},
"node_modules/http-signature": {
@ -4266,16 +4251,16 @@
}
},
"node_modules/https-proxy-agent": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
"version": "7.0.6",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
"integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
"dev": true,
"dependencies": {
"agent-base": "6",
"agent-base": "^7.1.2",
"debug": "4"
},
"engines": {
"node": ">= 6"
"node": ">= 14"
}
},
"node_modules/humanize-ms": {
@ -5334,6 +5319,45 @@
"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
}
},
"node_modules/make-fetch-happen/node_modules/agent-base": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
"dev": true,
"dependencies": {
"debug": "4"
},
"engines": {
"node": ">= 6.0.0"
}
},
"node_modules/make-fetch-happen/node_modules/http-proxy-agent": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
"integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
"dev": true,
"dependencies": {
"@tootallnate/once": "2",
"agent-base": "6",
"debug": "4"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/make-fetch-happen/node_modules/https-proxy-agent": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
"integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
"dev": true,
"dependencies": {
"agent-base": "6",
"debug": "4"
},
"engines": {
"node": ">= 6"
}
},
"node_modules/make-fetch-happen/node_modules/lru-cache": {
"version": "7.18.3",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
@ -6478,23 +6502,6 @@
"read-binary-file-arch": "cli.js"
}
},
"node_modules/read-config-file": {
"version": "6.4.0",
"resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.4.0.tgz",
"integrity": "sha512-uB5QOBeF84PT61GlV11OTV4jUGHAO3iDEOP6v9ygxhG6Bs9PLg7WsjNT6mtIX2G+x8lJTr4ZWNeG6LDTKkNf2Q==",
"dev": true,
"dependencies": {
"config-file-ts": "0.2.8-rc1",
"dotenv": "^16.4.5",
"dotenv-expand": "^11.0.6",
"js-yaml": "^4.1.0",
"json5": "^2.2.3",
"lazy-val": "^1.0.5"
},
"engines": {
"node": ">=12.0.0"
}
},
"node_modules/readable-stream": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.6.0.tgz",
@ -7089,6 +7096,18 @@
"node": ">= 10"
}
},
"node_modules/socks-proxy-agent/node_modules/agent-base": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
"dev": true,
"dependencies": {
"debug": "4"
},
"engines": {
"node": ">= 6.0.0"
}
},
"node_modules/source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",

View File

@ -119,6 +119,6 @@
"ws": "^8.18.0"
},
"devDependencies": {
"electron-builder": "25.0.5"
"electron-builder": "25.1.8"
}
}

View File

@ -390,12 +390,12 @@ function testSSL(jsonLoad) {
}
exports.setSSL = async (cert, key) => {
const sslObj = { key, cert };
await testSSL(sslObj);
const loadConfig = await this.loadFile(config.configFile);
loadConfig.ssl = sslObj;
await this.saveFile(loadConfig, config.configFile);
config.program.ssl = sslObj;
mStreamServer.reboot();
const sslObj = { key, cert };
await testSSL(sslObj);
const loadConfig = await this.loadFile(config.configFile);
loadConfig.ssl = sslObj;
await this.saveFile(loadConfig, config.configFile);
config.program.ssl = sslObj;
mStreamServer.reboot();
}