From 1545790cdbe0cefde96794558f3c77b0c9bf4e99 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Wed, 20 May 2026 14:44:57 -0700 Subject: [PATCH] cloud: publish beta with explicit tunel address --- plugins/cloud/package-lock.json | 171 +++++++------------------------- plugins/cloud/package.json | 2 +- plugins/cloud/src/main.ts | 5 +- 3 files changed, 40 insertions(+), 138 deletions(-) diff --git a/plugins/cloud/package-lock.json b/plugins/cloud/package-lock.json index fe29b1141..f17ec4322 100644 --- a/plugins/cloud/package-lock.json +++ b/plugins/cloud/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/cloud", - "version": "0.2.51", + "version": "0.2.52", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/cloud", - "version": "0.2.51", + "version": "0.2.52", "dependencies": { "@eneris/push-receiver": "^4.3.0", "@scrypted/common": "file:../../common", @@ -34,9 +34,13 @@ "typescript": "^5.5.3" }, "devDependencies": { - "@types/node": "^20.11.0", + "@types/node": "^20.19.11", "monaco-editor": "^0.50.0", - "ts-node": "^10.9.2" + "ts-node": "^10.9.2", + "tslib": "^2.8.1" + }, + "peerDependencies": { + "@scrypted/types": "^0.5.55" } }, "../../common/node_modules/@scrypted/sdk": { @@ -78,38 +82,48 @@ }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.3.69", + "version": "0.5.59", "license": "ISC", "dependencies": { - "@babel/preset-typescript": "^7.26.0", + "@babel/preset-typescript": "^7.27.1", + "@rollup/plugin-commonjs": "^28.0.9", + "@rollup/plugin-json": "^6.1.0", + "@rollup/plugin-node-resolve": "^16.0.1", + "@rollup/plugin-terser": "^0.4.4", + "@rollup/plugin-typescript": "^12.3.0", + "@rollup/plugin-virtual": "^3.0.2", + "@scrypted/auth-fetch": "^1.0.5", "adm-zip": "^0.5.16", - "axios": "^1.7.7", - "babel-loader": "^9.2.1", + "babel-loader": "^10.0.0", "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", + "openai": "^6.1.0", "raw-loader": "^4.0.2", "rimraf": "^6.0.1", + "rollup": "^4.52.5", "tmp": "^0.2.3", - "ts-loader": "^9.5.1", - "typescript": "^5.5.4", - "webpack": "^5.95.0", + "ts-loader": "^9.5.4", + "tslib": "^2.8.1", + "typescript": "^5.9.3", + "webpack": "^5.99.9", "webpack-bundle-analyzer": "^4.10.2" }, "bin": { - "scrypted-changelog": "bin/scrypted-changelog.js", - "scrypted-debug": "bin/scrypted-debug.js", - "scrypted-deploy": "bin/scrypted-deploy.js", - "scrypted-deploy-debug": "bin/scrypted-deploy-debug.js", - "scrypted-package-json": "bin/scrypted-package-json.js", - "scrypted-setup-project": "bin/scrypted-setup-project.js", - "scrypted-webpack": "bin/scrypted-webpack.js" + "scrypted-changelog": "bin/cli.js", + "scrypted-debug": "bin/cli.js", + "scrypted-deploy": "bin/cli.js", + "scrypted-deploy-debug": "bin/cli.js", + "scrypted-package-json": "bin/cli.js", + "scrypted-setup-project": "bin/cli.js", + "scrypted-webpack": "bin/cli.js" }, "devDependencies": { - "@types/node": "^22.8.1", - "@types/stringify-object": "^4.0.5", - "stringify-object": "^3.3.0", + "@types/adm-zip": "^0.5.8", + "@types/ncp": "^2.0.8", + "@types/node": "^24.9.2", + "@types/tmp": "^0.2.6", "ts-node": "^10.9.2", - "typedoc": "^0.26.10" + "typedoc": "^0.28.14" } }, "../../sdk/node_modules/@babel/code-frame": { @@ -748,13 +762,6 @@ "undici-types": "~6.20.0" } }, - "../../sdk/node_modules/@types/stringify-object": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@types/stringify-object/-/stringify-object-4.0.5.tgz", - "integrity": "sha512-TzX5V+njkbJ8iJ0mrj+Vqveep/1JBH4SSA3J2wYrE1eUrOhdsjTBCb0kao4EquSQ8KgPpqY4zSVP2vCPWKBElg==", - "dev": true, - "license": "MIT" - }, "../../sdk/node_modules/@types/unist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", @@ -1045,22 +1052,6 @@ "dev": true, "license": "Python-2.0" }, - "../../sdk/node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" - }, - "../../sdk/node_modules/axios": { - "version": "1.7.9", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", - "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", - "license": "MIT", - "dependencies": { - "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", - "proxy-from-env": "^1.1.0" - } - }, "../../sdk/node_modules/babel-loader": { "version": "9.2.1", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.2.1.tgz", @@ -1239,17 +1230,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "license": "MIT" }, - "../../sdk/node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, "../../sdk/node_modules/comma-separated-tokens": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz", @@ -1321,14 +1301,6 @@ } } }, - "../../sdk/node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "engines": { - "node": ">=0.4.0" - } - }, "../../sdk/node_modules/dequal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", @@ -1541,25 +1513,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "../../sdk/node_modules/follow-redirects": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", - "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, "../../sdk/node_modules/foreground-child": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", @@ -1576,19 +1529,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "../../sdk/node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, "../../sdk/node_modules/gensync": { "version": "1.0.0-beta.2", "license": "MIT", @@ -1597,11 +1537,6 @@ "node": ">=6.9.0" } }, - "../../sdk/node_modules/get-own-enumerable-property-symbols": { - "version": "3.0.2", - "dev": true, - "license": "ISC" - }, "../../sdk/node_modules/glob": { "version": "11.0.0", "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz", @@ -1738,22 +1673,6 @@ "node": ">=0.12.0" } }, - "../../sdk/node_modules/is-obj": { - "version": "1.0.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "../../sdk/node_modules/is-regexp": { - "version": "1.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "../../sdk/node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -2250,11 +2169,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "../../sdk/node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, "../../sdk/node_modules/punycode": { "version": "2.1.1", "license": "MIT", @@ -2620,19 +2534,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "../../sdk/node_modules/stringify-object": { - "version": "3.3.0", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "get-own-enumerable-property-symbols": "^3.0.0", - "is-obj": "^1.0.1", - "is-regexp": "^1.0.0" - }, - "engines": { - "node": ">=4" - } - }, "../../sdk/node_modules/strip-ansi": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", diff --git a/plugins/cloud/package.json b/plugins/cloud/package.json index b35d136b2..ed960f01d 100644 --- a/plugins/cloud/package.json +++ b/plugins/cloud/package.json @@ -52,5 +52,5 @@ "@types/node": "^22.10.1", "ts-node": "^10.9.2" }, - "version": "0.2.51" + "version": "0.2.52" } diff --git a/plugins/cloud/src/main.ts b/plugins/cloud/src/main.ts index 48b7d0afc..37ae385f8 100644 --- a/plugins/cloud/src/main.ts +++ b/plugins/cloud/src/main.ts @@ -29,6 +29,7 @@ const { deviceManager, endpointManager, systemManager } = sdk; export const DEFAULT_SENDER_ID = '827888101440'; const SCRYPTED_SERVER = localStorage.getItem('scrypted-server') || 'home.scrypted.app'; +const SCRYPTED_TUNNEL_SERVER = localStorage.getItem('scrypted-server') || 'tunnel.scrypted.app'; const SCRYPTED_SERVER_PORT = 4001; const SCRYPTED_CLOUD_MESSAGE_PATH = '/_punch/cloudmessage'; @@ -847,7 +848,7 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings, const query = qsparse(url.searchParams); if (query.registration_secret === this.storageSettings.values.registrationSecret) { res.writeHead(200); - this.serverCallback(port, SCRYPTED_SERVER_PORT, SCRYPTED_SERVER); + this.serverCallback(port, SCRYPTED_SERVER_PORT, SCRYPTED_TUNNEL_SERVER); } else { res.writeHead(401); @@ -950,7 +951,7 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings, return; backoff = Date.now(); const { address } = message; - const [serverHost, serverPort] = address?.split(':') || [SCRYPTED_SERVER, SCRYPTED_SERVER_PORT]; + const [serverHost, serverPort] = address?.split(':') || [SCRYPTED_TUNNEL_SERVER, SCRYPTED_SERVER_PORT]; this.serverCallback(port, Number(serverPort), serverHost); } });