diff --git a/plugins/ring/.vscode/settings.json b/plugins/ring/.vscode/settings.json index 77ccdbd6d..44d4d203f 100644 --- a/plugins/ring/.vscode/settings.json +++ b/plugins/ring/.vscode/settings.json @@ -1,4 +1,4 @@ { - "scrypted.debugHost": "127.0.0.1", + "scrypted.debugHost": "koushik-ubuntu", } \ No newline at end of file diff --git a/plugins/ring/package-lock.json b/plugins/ring/package-lock.json index 7f3a92054..bbc78fc35 100644 --- a/plugins/ring/package-lock.json +++ b/plugins/ring/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/ring", - "version": "0.0.90", + "version": "0.0.91", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/ring", - "version": "0.0.90", + "version": "0.0.91", "dependencies": { "@koush/ring-client-api": "file:../../external/ring-client-api", "@scrypted/common": "file:../../common", diff --git a/plugins/ring/package.json b/plugins/ring/package.json index 173cb42d1..e4c407cbe 100644 --- a/plugins/ring/package.json +++ b/plugins/ring/package.json @@ -44,5 +44,5 @@ "got": "11.8.2", "socket.io-client": "^2.4.0" }, - "version": "0.0.90" + "version": "0.0.91" } diff --git a/plugins/ring/src/main.ts b/plugins/ring/src/main.ts index e1da48075..93fae777d 100644 --- a/plugins/ring/src/main.ts +++ b/plugins/ring/src/main.ts @@ -11,10 +11,9 @@ 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, SimpleWebRtcSession, StreamingSession } from './ring-client-api'; +import { Location, isStunMessage, RtpDescription, SipSession, BasicPeerConnection, CameraData, clientApi, generateUuid, RingBaseApi, RingCamera, RingRestClient, rxjs, 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 afb0f7435..f4a50df46 100644 --- a/plugins/ring/src/ring-client-api.ts +++ b/plugins/ring/src/ring-client-api.ts @@ -9,3 +9,4 @@ 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';