diff --git a/plugins/ring/.vscode/launch.json b/plugins/ring/.vscode/launch.json index 03660e3c2..0c868d0cf 100644 --- a/plugins/ring/.vscode/launch.json +++ b/plugins/ring/.vscode/launch.json @@ -17,7 +17,7 @@ "sourceMaps": true, "localRoot": "${workspaceFolder}/out", "remoteRoot": "/plugin/", - "type": "pwa-node" + "type": "node" } ] } \ No newline at end of file diff --git a/plugins/ring/.vscode/settings.json b/plugins/ring/.vscode/settings.json index 44d4d203f..77ccdbd6d 100644 --- a/plugins/ring/.vscode/settings.json +++ b/plugins/ring/.vscode/settings.json @@ -1,4 +1,4 @@ { - "scrypted.debugHost": "koushik-ubuntu", + "scrypted.debugHost": "127.0.0.1", } \ No newline at end of file diff --git a/plugins/ring/package-lock.json b/plugins/ring/package-lock.json index f150700ff..7f3a92054 100644 --- a/plugins/ring/package-lock.json +++ b/plugins/ring/package-lock.json @@ -1,18 +1,19 @@ { "name": "@scrypted/ring", - "version": "0.0.88", + "version": "0.0.90", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/ring", - "version": "0.0.88", + "version": "0.0.90", "dependencies": { "@koush/ring-client-api": "file:../../external/ring-client-api", "@scrypted/common": "file:../../common", "@scrypted/sdk": "file:../../sdk", "@types/node": "^16.6.1", - "axios": "^0.24.0" + "axios": "^0.24.0", + "rxjs": "^7.5.5" }, "optionalDependencies": { "got": "11.8.2", @@ -108,21 +109,22 @@ }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.1.4", + "version": "0.2.48", "license": "ISC", "dependencies": { - "@babel/preset-typescript": "^7.16.7", - "@scrypted/types": "^0.0.96", + "@babel/preset-typescript": "^7.18.6", "adm-zip": "^0.4.13", "axios": "^0.21.4", - "babel-loader": "^8.2.3", + "babel-loader": "^9.1.0", "babel-plugin-const-enum": "^1.1.0", - "esbuild": "^0.13.8", + "esbuild": "^0.15.9", "ncp": "^2.0.0", "raw-loader": "^4.0.2", "rimraf": "^3.0.2", "tmp": "^0.2.1", - "webpack": "^5.74.0", + "ts-loader": "^9.4.2", + "typescript": "^4.9.4", + "webpack": "^5.75.0", "webpack-bundle-analyzer": "^4.5.0" }, "bin": { @@ -135,11 +137,11 @@ "scrypted-webpack": "bin/scrypted-webpack.js" }, "devDependencies": { - "@types/node": "^16.11.1", + "@types/node": "^18.11.18", "@types/stringify-object": "^4.0.0", "stringify-object": "^3.3.0", "ts-node": "^10.4.0", - "typedoc": "^0.23.15" + "typedoc": "^0.23.21" } }, "../sdk": { @@ -626,6 +628,14 @@ "lowercase-keys": "^2.0.0" } }, + "node_modules/rxjs": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", + "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/socket.io-client": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.5.0.tgz", @@ -646,9 +656,9 @@ } }, "node_modules/socket.io-parser": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", - "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.3.tgz", + "integrity": "sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==", "optional": true, "dependencies": { "component-emitter": "~1.3.0", @@ -662,6 +672,11 @@ "integrity": "sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==", "optional": true }, + "node_modules/tslib": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" + }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -765,23 +780,24 @@ "@scrypted/sdk": { "version": "file:../../sdk", "requires": { - "@babel/preset-typescript": "^7.16.7", - "@scrypted/types": "^0.0.96", - "@types/node": "^16.11.1", + "@babel/preset-typescript": "^7.18.6", + "@types/node": "^18.11.18", "@types/stringify-object": "^4.0.0", "adm-zip": "^0.4.13", "axios": "^0.21.4", - "babel-loader": "^8.2.3", + "babel-loader": "^9.1.0", "babel-plugin-const-enum": "^1.1.0", - "esbuild": "^0.13.8", + "esbuild": "^0.15.9", "ncp": "^2.0.0", "raw-loader": "^4.0.2", "rimraf": "^3.0.2", "stringify-object": "^3.3.0", "tmp": "^0.2.1", + "ts-loader": "^9.4.2", "ts-node": "^10.4.0", - "typedoc": "^0.23.15", - "webpack": "^5.74.0", + "typedoc": "^0.23.21", + "typescript": "^4.9.4", + "webpack": "^5.75.0", "webpack-bundle-analyzer": "^4.5.0" } }, @@ -1175,6 +1191,14 @@ "lowercase-keys": "^2.0.0" } }, + "rxjs": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz", + "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==", + "requires": { + "tslib": "^2.1.0" + } + }, "socket.io-client": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.5.0.tgz", @@ -1195,9 +1219,9 @@ } }, "socket.io-parser": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz", - "integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.3.tgz", + "integrity": "sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==", "optional": true, "requires": { "component-emitter": "~1.3.0", @@ -1211,6 +1235,11 @@ "integrity": "sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==", "optional": true }, + "tslib": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", + "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", diff --git a/plugins/ring/package.json b/plugins/ring/package.json index ced96257e..173cb42d1 100644 --- a/plugins/ring/package.json +++ b/plugins/ring/package.json @@ -25,6 +25,7 @@ "DeviceProvider", "Settings" ], + "babel": true, "pluginDependencies": [ "@scrypted/prebuffer-mixin", "@scrypted/snapshot", @@ -36,11 +37,12 @@ "@scrypted/common": "file:../../common", "@scrypted/sdk": "file:../../sdk", "@types/node": "^16.6.1", - "axios": "^0.24.0" + "axios": "^0.24.0", + "rxjs": "^7.5.5" }, "optionalDependencies": { "got": "11.8.2", "socket.io-client": "^2.4.0" }, - "version": "0.0.88" + "version": "0.0.90" } diff --git a/plugins/ring/src/main.ts b/plugins/ring/src/main.ts index 93fae777d..e1da48075 100644 --- a/plugins/ring/src/main.ts +++ b/plugins/ring/src/main.ts @@ -11,9 +11,10 @@ import { RtcpReceiverInfo, RtcpRrPacket } from '../../../external/werift/package import { RtpPacket } from '../../../external/werift/packages/rtp/src/rtp/rtp'; import { ProtectionProfileAes128CmHmacSha1_80 } from '../../../external/werift/packages/rtp/src/srtp/const'; import { SrtcpSession } from '../../../external/werift/packages/rtp/src/srtp/srtcp'; -import { Location, isStunMessage, RtpDescription, SipSession, BasicPeerConnection, CameraData, clientApi, generateUuid, RingBaseApi, RingCamera, RingRestClient, rxjs, SimpleWebRtcSession, StreamingSession } from './ring-client-api'; +import { Location, isStunMessage, RtpDescription, SipSession, BasicPeerConnection, CameraData, clientApi, generateUuid, RingBaseApi, RingCamera, RingRestClient, SimpleWebRtcSession, StreamingSession } from './ring-client-api'; import { encodeSrtpOptions, getPayloadType, getSequenceNumber, isRtpMessagePayloadType } from './srtp-utils'; import { LocationMode } from '@koush/ring-client-api'; +import rxjs from '../../../external/ring-client-api/node_modules/rxjs'; const STREAM_TIMEOUT = 120000; const { deviceManager, mediaManager, systemManager } = sdk; diff --git a/plugins/ring/src/ring-client-api.ts b/plugins/ring/src/ring-client-api.ts index f4a50df46..afb0f7435 100644 --- a/plugins/ring/src/ring-client-api.ts +++ b/plugins/ring/src/ring-client-api.ts @@ -9,4 +9,3 @@ export { BasicPeerConnection } from '@koush/ring-client-api/api/streaming/peer-c export { SimpleWebRtcSession } from '@koush/ring-client-api/api/streaming/simple-webrtc-session'; export { StreamingSession } from '@koush/ring-client-api/api/streaming/streaming-session'; export { generateUuid } from '@koush/ring-client-api/api/util'; -export * as rxjs from '@koush/ring-client-api/node_modules/rxjs'; diff --git a/plugins/ring/tsconfig.json b/plugins/ring/tsconfig.json index 0dca70a7c..53cbd0f18 100644 --- a/plugins/ring/tsconfig.json +++ b/plugins/ring/tsconfig.json @@ -1,8 +1,9 @@ { "compilerOptions": { + "module": "commonjs", + "target": "ES2021", "resolveJsonModule": true, "moduleResolution": "Node16", - "target": "esnext", "esModuleInterop": true, }, "include": [