@apocaliss92/scrypted-reolink-native 0.4.5 → 0.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@apocaliss92/scrypted-reolink-native",
-   "version": "0.4.5",
+   "version": "0.4.6",
    "description": "Use any reolink camera with Scrypted, even older/unsupported models without HTTP protocol support",
    "author": "@apocaliss92",
    "license": "Apache",

package/src/baichuan-base.ts

@@ -467,11 +467,11 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
       this.errorListener = undefined;
     }
 
-    // Close connection if still connected
+    // Close connection best-effort.
+    // Don't rely on isSocketConnected(): if the local socket state is inconsistent,
+    // skipping close can leave a "ghost" session on the device.
     try {
-      if (api.client.isSocketConnected()) {
-        await api.close();
-      }
+      await api.close();
     } catch {
       // ignore
     }
@@ -799,133 +799,8 @@ export abstract class BaseBaichuanClass extends ScryptedDeviceBase {
         ? await (this as any).ensureClient()
         : await this.ensureBaichuanClient();
 
-      logger.log("[Sessions] Fetching active user sessions from device...");
-
-      const sessions = await api.getOnlineUserList();
-
-      // Get current socket session ID if available
-      let socketSessionId: string | undefined;
-      try {
-        socketSessionId = api.client.getSocketSessionId();
-      } catch {
-        // getSocketSessionId might not be available on all clients
-      }
-
-      // Format sessions as array of readable strings
-      const sessionStrings: string[] = [];
-
-      // Add header with timestamp and socket session ID
-      const timestamp = new Date().toLocaleString();
-      sessionStrings.push(`Last updated: ${timestamp}`);
-      if (socketSessionId) {
-        sessionStrings.push(`Current socket session ID: ${socketSessionId}`);
-      }
-      sessionStrings.push(""); // Empty line separator
-
-      // Parse sessions data (handle different response formats)
-      let sessionCount = 0;
-      const parseSessions = (data: any, prefix: string = ""): void => {
-        if (Array.isArray(data)) {
-          data.forEach((session: any, index: number) => {
-            sessionCount++;
-            const sessionInfo = formatSessionInfo(session, index + 1);
-            sessionStrings.push(sessionInfo);
-          });
-        } else if (data && typeof data === "object") {
-          // Handle nested objects
-          for (const [key, value] of Object.entries(data)) {
-            if (Array.isArray(value)) {
-              value.forEach((session: any, index: number) => {
-                sessionCount++;
-                const sessionInfo = formatSessionInfo(session, index + 1, key);
-                sessionStrings.push(sessionInfo);
-              });
-            } else if (value && typeof value === "object") {
-              parseSessions(value, prefix ? `${prefix}.${key}` : key);
-            } else {
-              // Single session object
-              sessionCount++;
-              const sessionInfo = formatSessionInfo(data, 1);
-              sessionStrings.push(sessionInfo);
-              return; // Only process once
-            }
-          }
-        }
-      };
-
-      // Helper function to format session info as readable string
-      const formatSessionInfo = (
-        session: any,
-        index: number,
-        group?: string,
-      ): string => {
-        const parts: string[] = [];
-
-        if (group) {
-          parts.push(`[${group}]`);
-        }
-        parts.push(`Session ${index}:`);
-
-        // Extract common fields
-        if (session.userName !== undefined) {
-          parts.push(`User: ${session.userName}`);
-        }
-        if (session.user !== undefined) {
-          parts.push(`User: ${session.user}`);
-        }
-        if (session.ip !== undefined) {
-          parts.push(`IP: ${session.ip}`);
-        }
-        if (session.ipAddress !== undefined) {
-          parts.push(`IP: ${session.ipAddress}`);
-        }
-        if (session.port !== undefined) {
-          parts.push(`Port: ${session.port}`);
-        }
-        if (session.sessionId !== undefined) {
-          parts.push(`Session ID: ${session.sessionId}`);
-        }
-        if (session.id !== undefined) {
-          parts.push(`ID: ${session.id}`);
-        }
-        if (session.loginTime !== undefined) {
-          parts.push(`Login Time: ${session.loginTime}`);
-        }
-        if (session.time !== undefined) {
-          parts.push(`Time: ${session.time}`);
-        }
-        if (session.status !== undefined) {
-          parts.push(`Status: ${session.status}`);
-        }
-
-        // If no common fields found, show all fields
-        if (parts.length === (group ? 2 : 1)) {
-          const allFields = Object.entries(session)
-            .map(([key, value]) => `${key}: ${value}`)
-            .join(", ");
-          parts.push(allFields);
-        }
-
-        return parts.join(" | ");
-      };
-
-      parseSessions(sessions);
-
-      // If no sessions found, add a message
-      if (sessionCount === 0) {
-        sessionStrings.push("No active sessions found");
-      }
-
-      // Update the setting with the formatted session strings
-      // Note: storageSettings must be defined in subclasses
+      const sessionStrings = await api.getOnlineUserSessionsForUi();
       (this as any).storageSettings.values.userSessions = sessionStrings;
-
-      logger.log(`[Sessions] Retrieved ${sessionCount} active session(s)`);
-      if (socketSessionId) {
-        logger.debug(
-          `[Sessions] Current socket session ID: ${socketSessionId}`,
-        );
-      }
     } catch (e) {
       const errorMsg = e?.message || String(e);
       logger.error(`[Sessions] Failed to fetch user sessions: ${errorMsg}`);

package/src/camera.ts

@@ -1264,148 +1264,7 @@ export class ReolinkCamera
    * Refresh the list of active user sessions from the device
    */
   async refreshUserSessionsList(): Promise<void> {
-    const logger = this.getBaichuanLogger();
-
-    try {
-      const api = await this.ensureClient();
-
-      logger.log("[Sessions] Fetching active user sessions from device...");
-
-      const sessions = await api.getOnlineUserList();
-
-      // Get current socket session ID if available
-      let socketSessionId: string | undefined;
-      try {
-        socketSessionId = api.client.getSocketSessionId();
-      } catch {
-        // getSocketSessionId might not be available on all clients
-      }
-
-      // Format sessions as array of readable strings
-      const sessionStrings: string[] = [];
-
-      // Add header with timestamp and socket session ID
-      const timestamp = new Date().toLocaleString();
-      sessionStrings.push(`Last updated: ${timestamp}`);
-      if (socketSessionId) {
-        sessionStrings.push(`Current socket session ID: ${socketSessionId}`);
-      }
-      sessionStrings.push(""); // Empty line separator
-
-      // Parse sessions data (handle different response formats)
-      let sessionCount = 0;
-      const parseSessions = (data: any, prefix: string = ""): void => {
-        if (Array.isArray(data)) {
-          data.forEach((session: any, index: number) => {
-            sessionCount++;
-            const sessionInfo = formatSessionInfo(session, index + 1);
-            sessionStrings.push(sessionInfo);
-          });
-        } else if (data && typeof data === "object") {
-          // Handle nested objects
-          for (const [key, value] of Object.entries(data)) {
-            if (Array.isArray(value)) {
-              value.forEach((session: any, index: number) => {
-                sessionCount++;
-                const sessionInfo = formatSessionInfo(session, index + 1, key);
-                sessionStrings.push(sessionInfo);
-              });
-            } else if (value && typeof value === "object") {
-              parseSessions(value, prefix ? `${prefix}.${key}` : key);
-            } else {
-              // Single session object
-              sessionCount++;
-              const sessionInfo = formatSessionInfo(data, 1);
-              sessionStrings.push(sessionInfo);
-              return; // Only process once
-            }
-          }
-        }
-      };
-
-      // Helper function to format session info as readable string
-      const formatSessionInfo = (
-        session: any,
-        index: number,
-        group?: string,
-      ): string => {
-        const parts: string[] = [];
-
-        if (group) {
-          parts.push(`[${group}]`);
-        }
-        parts.push(`Session ${index}:`);
-
-        // Extract common fields
-        if (session.userName !== undefined) {
-          parts.push(`User: ${session.userName}`);
-        }
-        if (session.user !== undefined) {
-          parts.push(`User: ${session.user}`);
-        }
-        if (session.ip !== undefined) {
-          parts.push(`IP: ${session.ip}`);
-        }
-        if (session.ipAddress !== undefined) {
-          parts.push(`IP: ${session.ipAddress}`);
-        }
-        if (session.port !== undefined) {
-          parts.push(`Port: ${session.port}`);
-        }
-        if (session.sessionId !== undefined) {
-          parts.push(`Session ID: ${session.sessionId}`);
-        }
-        if (session.id !== undefined) {
-          parts.push(`ID: ${session.id}`);
-        }
-        if (session.loginTime !== undefined) {
-          parts.push(`Login Time: ${session.loginTime}`);
-        }
-        if (session.time !== undefined) {
-          parts.push(`Time: ${session.time}`);
-        }
-        if (session.status !== undefined) {
-          parts.push(`Status: ${session.status}`);
-        }
-
-        // If no common fields found, show all fields
-        if (parts.length === (group ? 2 : 1)) {
-          const allFields = Object.entries(session)
-            .map(([key, value]) => `${key}: ${value}`)
-            .join(", ");
-          parts.push(allFields);
-        }
-
-        return parts.join(" | ");
-      };
-
-      parseSessions(sessions);
-
-      // If no sessions found, add a message
-      if (sessionCount === 0) {
-        sessionStrings.push("No active sessions found");
-      }
-
-      // Update the setting with the formatted session strings
-      this.storageSettings.values.userSessions = sessionStrings;
-
-      logger.log(`[Sessions] Retrieved ${sessionCount} active session(s)`);
-      if (socketSessionId) {
-        logger.debug(
-          `[Sessions] Current socket session ID: ${socketSessionId}`,
-        );
-      }
-    } catch (e) {
-      const errorMsg = e?.message || String(e);
-      logger.error(`[Sessions] Failed to fetch user sessions: ${errorMsg}`);
-
-      // Update setting with error message
-      this.storageSettings.values.userSessions = [
-        `Error fetching sessions: ${errorMsg}`,
-        `Timestamp: ${new Date().toLocaleString()}`,
-      ];
-      throw e;
-    }
+    return super.refreshUserSessionsList();
   }
 
   /**

package/src/nvr.ts

@@ -120,8 +120,7 @@ export class ReolinkNativeNvrDevice
           this.debugLogsResetTimeout = setTimeout(async () => {
             this.debugLogsResetTimeout = undefined;
             try {
-              this.baichuanApi = undefined;
-              this.ensureClientPromise = undefined;
+              await this.cleanupBaichuanApi();
               await this.ensureBaichuanClient();
             } catch (e) {
               logger.warn(
@@ -600,9 +599,21 @@ export class ReolinkNativeNvrDevice
       channel: entry.rtspChannel,
       uid,
     });
-    await baichuanApi.login();
-    const { capabilities, objects, presets } =
-      await baichuanApi.getDeviceCapabilities(entry.rtspChannel);
+    let capabilities: any;
+    let objects: any;
+    let presets: any;
+    try {
+      await baichuanApi.login();
+      ({ capabilities, objects, presets } =
+        await baichuanApi.getDeviceCapabilities(entry.rtspChannel));
+    } finally {
+      // Ensure the temporary socket used for adoption is not leaked.
+      try {
+        await baichuanApi.close({ reason: "adoptDevice" });
+      } catch {
+        // ignore
+      }
+    }
     const { interfaces, type } = getDeviceInterfaces({
       capabilities,
       logger: this.getBaichuanLogger(),

package/src/stream-utils.ts

@@ -420,7 +420,7 @@ export class StreamManager {
         ? Boolean(compositeApis) && !(this.opts.sharedConnection ?? false)
         : !(this.opts.sharedConnection ?? false);
 
-      let created: any;
+      let created: Rfc4571TcpServer;
       try {
         const compositeOptions = isComposite
           ? options.compositeOptions