From 16a39ac76ad41c2e96ad3184afa6ac89135706d9 Mon Sep 17 00:00:00 2001 From: Alex Leeds Date: Tue, 7 Mar 2023 10:51:25 -0500 Subject: [PATCH] ring: update ring api client (#605) --- plugins/ring/package-lock.json | 83 +++++------------------------ plugins/ring/package.json | 4 +- plugins/ring/src/ring-client-api.ts | 28 +++++----- 3 files changed, 29 insertions(+), 86 deletions(-) diff --git a/plugins/ring/package-lock.json b/plugins/ring/package-lock.json index c6445915b..cd969096d 100644 --- a/plugins/ring/package-lock.json +++ b/plugins/ring/package-lock.json @@ -1,17 +1,17 @@ { "name": "@scrypted/ring", - "version": "0.0.96", + "version": "0.0.97", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@scrypted/ring", - "version": "0.0.96", + "version": "0.0.97", "dependencies": { "@koush/ring-client-api": "file:../../external/ring-client-api", "@scrypted/common": "file:../../common", "@scrypted/sdk": "file:../../sdk", - "@types/node": "^16.9.0", + "@types/node": "^18.14.5", "axios": "^1.3.4", "rxjs": "^7.8.0" }, @@ -36,77 +36,20 @@ } }, "../../external/ring-client-api": { - "version": "11.0.4", - "funding": [ - { - "type": "paypal", - "url": "https://www.paypal.me/dustingreif" - }, - { - "type": "github", - "url": "https://github.com/sponsors/dgreif" - } - ], - "license": "MIT", + "name": "ring", "workspaces": [ - "homebridge-ui" + "packages/*" ], - "dependencies": { - "@eneris/push-receiver": "../push-receiver", - "@homebridge/camera-utils": "^2.1.1", - "@homebridge/plugin-ui-utils": "^0.0.19", - "@types/socket.io-client": "1.4.36", - "colors": "^1.4.0", - "debug": "^4.3.4", - "got": "^11.8.3", - "rxjs": "^7.5.5", - "sdp": "^3.0.3", - "socket.io-client": "^2.4.0", - "stun": "^2.1.0", - "systeminformation": "^5.11.15", - "uuid": "^8.3.2", - "werift": "0.15.4", - "ws": "^8.7.0" - }, - "bin": { - "ring-auth-cli": "ring-auth-cli.js", - "ring-device-data-cli": "ring-device-data-cli.js" - }, "devDependencies": { - "@swc-node/register": "^1.5.1", - "@types/debug": "4.1.7", - "@types/jest": "27.5.1", - "@types/node": "17.0.36", - "@types/uuid": "8.3.4", - "@types/ws": "^8.5.3", - "@typescript-eslint/eslint-plugin": "5.26.0", - "@typescript-eslint/parser": "5.26.0", - "concurrently": "^7.2.1", - "conventional-github-releaser": "3.1.5", - "dotenv": "16.0.1", - "esbuild": "^0.14.42", - "eslint": "8.16.0", - "eslint-config-prettier": "8.5.0", - "eslint-plugin-jest": "26.4.2", - "eslint-plugin-prettier": "4.0.0", - "express": "4.18.1", - "homebridge": "1.4.1", - "jest": "28.1.0", - "prettier": "2.6.2", - "reflect-metadata": "0.1.13", - "rimraf": "3.0.2", - "standard-version": "9.5.0", - "ts-jest": "28.0.3", - "typescript": "4.7.2" - }, - "engines": { - "homebridge": ">=1.4.0", - "node": "^16" + "@changesets/changelog-github": "^0.4.8", + "@changesets/cli": "^2.26.0", + "@swc-node/register": "^1.6.2", + "turbo": "^1.8.2" } }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.2.70", + "version": "0.2.71", "license": "ISC", "dependencies": { "@babel/preset-typescript": "^7.18.6", @@ -205,9 +148,9 @@ } }, "node_modules/@types/node": { - "version": "16.18.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.12.tgz", - "integrity": "sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw==" + "version": "18.14.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.5.tgz", + "integrity": "sha512-CRT4tMK/DHYhw1fcCEBwME9CSaZNclxfzVMe7GsO6ULSwsttbj70wSiX6rZdIjGblu93sTJxLdhNIT85KKI7Qw==" }, "node_modules/@types/responselike": { "version": "1.0.0", diff --git a/plugins/ring/package.json b/plugins/ring/package.json index 6551f43b9..50397cb6d 100644 --- a/plugins/ring/package.json +++ b/plugins/ring/package.json @@ -36,7 +36,7 @@ "@koush/ring-client-api": "file:../../external/ring-client-api", "@scrypted/common": "file:../../common", "@scrypted/sdk": "file:../../sdk", - "@types/node": "^16.9.0", + "@types/node": "^18.14.5", "axios": "^1.3.4", "rxjs": "^7.8.0" }, @@ -44,5 +44,5 @@ "got": "11.8.6", "socket.io-client": "^2.5.0" }, - "version": "0.0.96" + "version": "0.0.97" } diff --git a/plugins/ring/src/ring-client-api.ts b/plugins/ring/src/ring-client-api.ts index 5e9769420..82665603c 100644 --- a/plugins/ring/src/ring-client-api.ts +++ b/plugins/ring/src/ring-client-api.ts @@ -1,14 +1,14 @@ -export { RingBaseApi } from '@koush/ring-client-api/api/api'; -export { Location } from '@koush/ring-client-api/api/location'; -export { clientApi, RingRestClient } from '@koush/ring-client-api/api/rest-client'; -export { RingCamera } from '@koush/ring-client-api/api/ring-camera'; -export { CameraData, LocationMode } from '@koush/ring-client-api/api/ring-types'; -export { isStunMessage, RtpDescription } from '@koush/ring-client-api/api/rtp-utils'; -export { SipSession } from '@koush/ring-client-api/api/sip-session'; -export { BasicPeerConnection } from '@koush/ring-client-api/api/streaming/peer-connection'; -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 { RingDeviceType, RingDeviceData } from '@koush/ring-client-api/api/ring-types'; -export { RingDevice } from '@koush/ring-client-api/api/ring-device'; -export * as rxjs from '@koush/ring-client-api/node_modules/rxjs'; +export { RingBaseApi } from '@koush/ring-client-api/packages/ring-client-api/api'; +export { Location } from '@koush/ring-client-api/packages/ring-client-api/location'; +export { clientApi, RingRestClient } from '@koush/ring-client-api/packages/ring-client-api/rest-client'; +export { RingCamera } from '@koush/ring-client-api/packages/ring-client-api/ring-camera'; +export { CameraData, LocationMode } from '@koush/ring-client-api/packages/ring-client-api/ring-types'; +export { isStunMessage, RtpDescription } from '@koush/ring-client-api/packages/ring-client-api/rtp-utils'; +export { SipSession } from '@koush/ring-client-api/packages/ring-client-api/sip-session'; +export { BasicPeerConnection } from '@koush/ring-client-api/packages/ring-client-api/streaming/peer-connection'; +export { SimpleWebRtcSession } from '@koush/ring-client-api/packages/ring-client-api/streaming/simple-webrtc-session'; +export { StreamingSession } from '@koush/ring-client-api/packages/ring-client-api/streaming/streaming-session'; +export { generateUuid } from '@koush/ring-client-api/packages/ring-client-api/util'; +export { RingDeviceType, RingDeviceData } from '@koush/ring-client-api/packages/ring-client-api/ring-types'; +export { RingDevice } from '@koush/ring-client-api/packages/ring-client-api/ring-device'; +export * as rxjs from '@koush/ring-client-api/node_modules/rxjs'; \ No newline at end of file