From ad15fe33245fc8d9be7bc72ab0ed8e1d92a3c317 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Tue, 3 Sep 2024 17:20:39 -0700 Subject: [PATCH] cloud: update deps --- plugins/cloud/package-lock.json | 38 ++++++++++++++++----------------- plugins/cloud/package.json | 6 +++--- plugins/cloud/src/push.ts | 20 +++++++++++------ 3 files changed, 36 insertions(+), 28 deletions(-) diff --git a/plugins/cloud/package-lock.json b/plugins/cloud/package-lock.json index 090ebb674e..16b0590583 100644 --- a/plugins/cloud/package-lock.json +++ b/plugins/cloud/package-lock.json @@ -1,14 +1,14 @@ { "name": "@scrypted/cloud", - "version": "0.2.36", + "version": "0.2.37", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/cloud", - "version": "0.2.36", + "version": "0.2.37", "dependencies": { - "@eneris/push-receiver": "^4.1.6", + "@eneris/push-receiver": "^4.2.0", "@scrypted/common": "file:../../common", "@scrypted/sdk": "file:../../sdk", "bpmux": "^8.2.1", @@ -21,7 +21,7 @@ "@types/http-proxy": "^1.17.15", "@types/ip": "^1.1.3", "@types/nat-upnp": "^1.1.5", - "@types/node": "^22.1.0", + "@types/node": "^22.5.2", "ts-node": "^10.9.2" } }, @@ -79,7 +79,7 @@ }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.3.50", + "version": "0.3.61", "license": "ISC", "dependencies": { "@babel/preset-typescript": "^7.24.7", @@ -2416,14 +2416,14 @@ } }, "node_modules/@eneris/push-receiver": { - "version": "4.1.6", - "resolved": "https://registry.npmjs.org/@eneris/push-receiver/-/push-receiver-4.1.6.tgz", - "integrity": "sha512-M5EZK7s3AujCuWDrqbEHeVRyyeK145hs1FtWkrOKtEbD0lSZgLfhoHIr09adc+hvcNDOAy8awVh/64XsprWVLw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@eneris/push-receiver/-/push-receiver-4.2.0.tgz", + "integrity": "sha512-OGc4dUcy9yvKTIShOpBVHsYGEC7qRo6JNRRlsL7kaa3/uJSJyRoLOUdKsTqH8q76qldViXb8mEdOzCGv8wwK4A==", "dependencies": { "http_ece": "^1.2.1", "jsonwebtoken": "^9.0.2", "long": "^5.2.3", - "protobufjs": "^7.3.2" + "protobufjs": "^7.3.3" }, "engines": { "node": ">=20" @@ -2568,11 +2568,11 @@ } }, "node_modules/@types/node": { - "version": "22.1.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.1.0.tgz", - "integrity": "sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw==", + "version": "22.5.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.2.tgz", + "integrity": "sha512-acJsPTEqYqulZS/Yp/S3GgeE6GZ0qYODUR8aVr/DkhHQ8l9nd4j5x1/ZJy9/gHrRlFMqkO6i0I3E27Alu4jjPg==", "dependencies": { - "undici-types": "~6.13.0" + "undici-types": "~6.19.2" } }, "node_modules/acorn": { @@ -2813,9 +2813,9 @@ "link": true }, "node_modules/protobufjs": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", - "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.4.0.tgz", + "integrity": "sha512-mRUWCc3KUU4w1jU8sGxICXH/gNS94DvI1gxqDvBzhj1JpcsimQkYiOJfwsPUykUI5ZaspFbSgmBLER8IrQ3tqw==", "hasInstallScript": true, "dependencies": { "@protobufjs/aspromise": "^1.1.2", @@ -2932,9 +2932,9 @@ } }, "node_modules/undici-types": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.13.0.tgz", - "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==" + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==" }, "node_modules/v8-compile-cache-lib": { "version": "3.0.1", diff --git a/plugins/cloud/package.json b/plugins/cloud/package.json index 8041b60df2..30dfe7b24f 100644 --- a/plugins/cloud/package.json +++ b/plugins/cloud/package.json @@ -37,7 +37,7 @@ ] }, "dependencies": { - "@eneris/push-receiver": "^4.1.6", + "@eneris/push-receiver": "^4.2.0", "@scrypted/common": "file:../../common", "@scrypted/sdk": "file:../../sdk", "bpmux": "^8.2.1", @@ -50,8 +50,8 @@ "@types/http-proxy": "^1.17.15", "@types/ip": "^1.1.3", "@types/nat-upnp": "^1.1.5", - "@types/node": "^22.1.0", + "@types/node": "^22.5.2", "ts-node": "^10.9.2" }, - "version": "0.2.36" + "version": "0.2.37" } diff --git a/plugins/cloud/src/push.ts b/plugins/cloud/src/push.ts index 580b22635a..ee41122397 100644 --- a/plugins/cloud/src/push.ts +++ b/plugins/cloud/src/push.ts @@ -29,11 +29,14 @@ export class PushManager extends EventEmitter { const instance = new PushReceiver({ ...savedConfig, firebase: { - messagingSenderId: senderId, - projectId: 'scrypted-app', - apiKey: 'AIzaSyDI0bgFuVPIqKZoNpB-iTOU7ijIeepxOXE', - appId: '1:827888101440:web:6ff9f8ada107e9cc0097a5', - } , + apiKey: "AIzaSyDI0bgFuVPIqKZoNpB-iTOU7ijIeepxOXE", + authDomain: "scrypted-app.firebaseapp.com", + databaseURL: "https://scrypted-app.firebaseio.com", + projectId: "scrypted-app", + storageBucket: "scrypted-app.appspot.com", + messagingSenderId: "827888101440", + appId: "1:827888101440:web:6ff9f8ada107e9cc0097a5" + }, heartbeatIntervalMs: 15 * 60 * 1000, }); @@ -57,7 +60,12 @@ export class PushManager extends EventEmitter { this.emit('message', message.data); }); - await instance.connect(); + try { + await instance.connect(); + } + catch (e) { + console.error('failed to connect to push server', e); + } return savedConfig.credentials?.fcm?.token || deferred.promise; })();