ring-client-api 13.2.0-beta.0 → 13.2.0-beta.2

package/lib/rest-client.js

@@ -55,7 +55,10 @@ async function responseToError(response) {
     }
     return error;
 }
-async function requestWithRetry(requestOptions) {
+async function requestWithRetry(requestOptions, retryCount = 0) {
+    if (typeof fetch !== 'function') {
+        throw new Error(`Your current NodeJS version (${process.version}) is too old to support this plugin.  Please upgrade to the latest LTS version of NodeJS.`);
+    }
     try {
         if (requestOptions.json || requestOptions.responseType === 'json') {
             requestOptions.headers = {
@@ -110,13 +113,18 @@ async function requestWithRetry(requestOptions) {
     }
     catch (e) {
         if (!e.response && !requestOptions.allowNoResponse) {
-            (0, util_1.logError)(`Failed to reach Ring server at ${requestOptions.url}.  ${e.message}.  Trying again in 5 seconds...`);
-            if (e.message.includes('NGHTTP2_ENHANCE_YOUR_CALM')) {
-                (0, util_1.logError)(`There is a known issue with your current NodeJS version (${process.version}).  Please see https://github.com/dgreif/ring/wiki/NGHTTP2_ENHANCE_YOUR_CALM-Error for details`);
+            if (retryCount > 0) {
+                let detailedError = `Error: ${e.message}`;
+                detailedError += e.cause?.message ? `, Cause: ${e.cause.message}` : '';
+                detailedError += e.cause?.code ? `, Code: ${e.cause.code}` : '';
+                (0, util_1.logError)(`Retry #${retryCount} failed to reach Ring server at ${requestOptions.url}.  ${detailedError}.  Trying again in 5 seconds...`);
+                if (e.message.includes('NGHTTP2_ENHANCE_YOUR_CALM')) {
+                    (0, util_1.logError)(`There is a known issue with your current NodeJS version (${process.version}).  Please see https://github.com/dgreif/ring/wiki/NGHTTP2_ENHANCE_YOUR_CALM-Error for details`);
+                }
+                (0, util_1.logDebug)(e);
             }
-            (0, util_1.logDebug)(e);
             await (0, util_1.delay)(5000);
-            return requestWithRetry(requestOptions);
+            return requestWithRetry(requestOptions, retryCount + 1);
         }
         throw e;
     }
@@ -355,6 +363,7 @@ class RingRestClient {
                     authorization: `Bearer ${authTokenResponse.access_token}`,
                     hardware_id: hardwareId,
                     'User-Agent': 'android:com.ringapp',
+                    Connection: 'close',
                 },
             });
         }

package/lib/streaming/peer-connection.js

@@ -99,7 +99,9 @@ class WeriftPeerConnection extends subscribed_1.Subscribed {
             });
         });
         this.pc.onIceCandidate.subscribe((iceCandidate) => {
-            this.onIceCandidate.next(iceCandidate);
+            if (iceCandidate) {
+                this.onIceCandidate.next(iceCandidate);
+            }
         });
         pc.iceConnectionStateChange.subscribe(() => {
             (0, util_1.logInfo)(`iceConnectionStateChange: ${pc.iceConnectionState}`);

package/lib/streaming/streaming-messages.d.ts

@@ -35,6 +35,17 @@ interface NotificationMessage {
         text: string;
     } & SessionBody;
 }
+interface CameraStartedMessage {
+    method: 'camera_started';
+    body: SessionBody;
+}
+interface StreamInfoMessage {
+    method: 'stream_info';
+    body: SessionBody & {
+        transcoding: boolean;
+        transcoding_reason: 'codec_mismatch' | string;
+    };
+}
 declare enum CloseReasonCode {
     NormalClose = 0,
     AuthenticationFailed = 5,
@@ -49,5 +60,5 @@ interface CloseMessage {
         };
     } & SessionBody;
 }
-export type IncomingMessage = AnswerMessage | IceCandidateMessage | SessionCreatedMessage | SessionStartedMessage | PongMessage | CloseMessage | NotificationMessage;
+export type IncomingMessage = AnswerMessage | IceCandidateMessage | SessionCreatedMessage | SessionStartedMessage | PongMessage | CloseMessage | NotificationMessage | CameraStartedMessage | StreamInfoMessage;
 export {};

package/lib/streaming/webrtc-connection.js

@@ -164,6 +164,10 @@ class WebrtcConnection extends subscribed_1.Subscribed {
                 (0, util_1.logError)(message.body);
                 this.callEnded();
                 return;
+            case 'camera_started':
+            case 'stream_info':
+                // ignore these messages as we don't use them
+                return;
         }
         (0, util_1.logError)('UNKNOWN MESSAGE');
         (0, util_1.logError)(message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ring-client-api",
-  "version": "13.2.0-beta.0",
+  "version": "13.2.0-beta.2",
   "description": "Unofficial API for Ring doorbells, cameras, security alarm system and smart lighting",
   "main": "lib/index.js",
   "exports": {
@@ -18,29 +18,29 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@eneris/push-receiver": "4.2.0",
-    "@homebridge/camera-utils": "^2.2.6",
+    "@eneris/push-receiver": "4.3.0",
+    "@homebridge/camera-utils": "^2.2.7",
     "colors": "1.4.0",
     "debug": "^4.3.7",
     "json-bigint": "^1.0.0",
     "rxjs": "^7.8.1",
     "socket.io-client": "^2.5.0",
     "systeminformation": "^5.23.5",
-    "uuid": "^10.0.0",
-    "werift": "0.19.4",
+    "uuid": "^11.0.3",
+    "werift": "0.20.1",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/debug": "4.1.12",
-    "@types/jest": "29.5.13",
+    "@types/jest": "29.5.14",
     "@types/json-bigint": "^1.0.4",
-    "@types/node": "22.7.5",
+    "@types/node": "22.9.0",
     "@types/socket.io-client": "1.4.36",
     "@types/uuid": "10.0.0",
-    "@types/ws": "^8.5.12",
+    "@types/ws": "^8.5.13",
     "eslint-config-shared": "*",
     "jest": "29.7.0",
-    "msw": "^2.4.10",
+    "msw": "^2.6.4",
     "ts-jest": "29.2.5",
     "tsconfig": "*",
     "typescript": "5.6.3"