client: update

koush · Mar 21, 2024 · 857cc65 · 857cc65
1 parent 776356f
commit 857cc65
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 31 deletions.
diff --git a/packages/client/package-lock.json b/packages/client/package-lock.json
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -13,14 +13,14 @@
   "license": "ISC",
   "devDependencies": {
     "@types/ip": "^1.1.3",
-    "@types/node": "^20.10.8",
+    "@types/node": "^20.11.30",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.3"
   },
   "dependencies": {
-    "@scrypted/types": "^0.3.15",
+    "@scrypted/types": "^0.3.27",
     "engine.io-client": "^6.5.3",
-    "follow-redirects": "^1.15.4",
+    "follow-redirects": "^1.15.6",
     "rimraf": "^5.0.5"
   }
 }
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
@@ -1,4 +1,4 @@
-import { MediaObjectOptions, RTCConnectionManagement, RTCSignalingSession, ScryptedStatic } from "@scrypted/types";
+import { MediaObjectCreateOptions, RTCConnectionManagement, RTCSignalingSession, ScryptedStatic } from "@scrypted/types";
 import * as eio from 'engine.io-client';
 import { SocketOptions } from 'engine.io-client';
 import { Deferred } from "../../../common/src/deferred";
@@ -316,28 +316,32 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
             }
         }
 
-        // the alternate urls must have a valid response.
-        const loginCheckPromises = [...urlsToCheck].map(async baseUrl => {
-            const loginCheck = await checkScryptedClientLogin({
-                baseUrl,
-                previousLoginResult: options?.previousLoginResult,
-            });
-
+        function validateLoginResult(loginCheck: Awaited<ReturnType<typeof checkScryptedClientLogin>>) {
             if (loginCheck.error || loginCheck.redirect)
-                throw new Error('login error');
+                throw new ScryptedClientLoginError(loginCheck);
 
             if (!loginCheck.authorization || !loginCheck.username || !loginCheck.queryToken) {
                 console.error(loginCheck);
                 throw new Error('malformed login result');
             }
 
             return loginCheck;
+        }
+
+        // the alternate urls must have a valid response.
+        const loginCheckPromises = [...urlsToCheck].map(baseUrl => {
+            return checkScryptedClientLogin({
+                baseUrl,
+                previousLoginResult: options?.previousLoginResult,
+            })
+                .then(validateLoginResult);
         });
 
         const baseUrlCheck = checkScryptedClientLogin({
             baseUrl,
             previousLoginResult: options?.previousLoginResult,
-        });
+        })
+            .then(validateLoginResult);
         loginCheckPromises.push(baseUrlCheck);
 
         let loginCheck: Awaited<ReturnType<typeof checkScryptedClientLogin>>;
@@ -687,7 +691,7 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
         } = scrypted;
         console.log('api attached', Date.now() - start);
 
-        mediaManager.createMediaObject = async<T extends MediaObjectOptions>(data: any, mimeType: string, options: T) => {
+        mediaManager.createMediaObject = async<T extends MediaObjectCreateOptions>(data: any, mimeType: string, options: T) => {
             return new MediaObject(mimeType, data, options) as any;
         }
 
@@ -866,6 +870,8 @@ export async function connectScryptedClient(options: ScryptedClientOptions): Pro
                 cloudAddress,
             },
             connectRPCObject,
+            fork: undefined,
+            connect: undefined,
         }
 
         socket.on('close', () => {