@apocaliss92/nodelink-js 0.2.3 → 0.2.5

package/dist/cli/rtsp-server.cjs

@@ -2389,14 +2389,6 @@ var init_BaichuanVideoStream = __esm({
               this.profile,
               { variant: this.variant, client: this.client }
             );
-            if (this.client.getTransport?.() === "udp") {
-              await startPromise;
-            } else {
-              await Promise.race([
-                startPromise,
-                new Promise((resolve) => setTimeout(resolve, 400))
-              ]);
-            }
             const updateActiveMsgNum = () => {
               try {
                 const getMsgNum = this.api.getActiveVideoMsgNumWithVariant;
@@ -2406,6 +2398,15 @@ var init_BaichuanVideoStream = __esm({
               }
             };
             updateActiveMsgNum();
+            if (this.client.getTransport?.() === "udp") {
+              await startPromise;
+            } else {
+              await Promise.race([
+                startPromise,
+                new Promise((resolve) => setTimeout(resolve, 400))
+              ]);
+            }
+            updateActiveMsgNum();
             void startPromise.then(() => updateActiveMsgNum()).catch((e) => {
               const err = e instanceof Error ? e : new Error(String(e));
               this.emitSafeError(err);
@@ -7242,8 +7243,24 @@ var crypto = __toESM(require("crypto"), 1);
 // src/rfc/helpers.ts
 init_BaichuanVideoStream();
 async function* createNativeStream(api, channel, profile, options) {
+  let client = options?.client;
+  let dedicatedRelease;
+  if (!client) {
+    const variantSuffix = options?.variant && options.variant !== "default" ? `:${options.variant}` : "";
+    const sessionKey = `live:native${variantSuffix}:ch${channel}:${profile}`;
+    try {
+      api.logger?.info?.(`[createNativeStream] acquiring dedicated session  key=${sessionKey}`);
+      const session = await api.createDedicatedSession(sessionKey);
+      client = session.client;
+      dedicatedRelease = session.release;
+      api.logger?.info?.(`[createNativeStream] dedicated session acquired  key=${sessionKey}`);
+    } catch (e) {
+      api.logger?.warn?.(`[createNativeStream] dedicated session failed, using shared client: ${e instanceof Error ? e.message : e}`);
+      client = api.client;
+    }
+  }
   const videoStream = new BaichuanVideoStream({
-    client: api.client,
+    client,
     api,
     channel,
     profile,
@@ -7257,9 +7274,15 @@ async function* createNativeStream(api, channel, profile, options) {
   let closed = false;
   const onError = (_error) => {
     closed = true;
+    api.logger?.warn?.(
+      `[createNativeStream] stream error \u2192 closed  channel=${channel} profile=${profile} error=${_error?.message ?? _error}`
+    );
   };
   const onClose = () => {
     closed = true;
+    api.logger?.warn?.(
+      `[createNativeStream] stream close \u2192 closed  channel=${channel} profile=${profile}`
+    );
   };
   try {
     videoStream.on("error", onError);
@@ -7370,6 +7393,10 @@ async function* createNativeStream(api, channel, profile, options) {
     }
     videoStream.removeListener("error", onError);
     videoStream.removeListener("close", onClose);
+    if (dedicatedRelease) {
+      dedicatedRelease().catch(() => {
+      });
+    }
   }
 }
 
@@ -7609,6 +7636,8 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events2.E
   tcpRtpFraming;
   active = false;
   flow;
+  deviceId;
+  dedicatedSessionRelease;
   // Authentication
   authCredentials = [];
   requireAuth;
@@ -7775,6 +7804,7 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events2.E
     this.path = options.path ?? `/stream/${this.profile}`;
     this.logger = options.logger ?? console;
     this.tcpRtpFraming = options.tcpRtpFraming ?? "rfc4571";
+    this.deviceId = options.deviceId;
     this.authCredentials = options.credentials ?? [];
     this.requireAuth = options.requireAuth ?? this.authCredentials.length > 0;
     const transport = this.api.client.getTransport();
@@ -9160,14 +9190,31 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events2.E
     this.firstAudioPromise = new Promise((resolve) => {
       this.firstAudioResolve = resolve;
     });
+    let dedicatedClient;
+    const variantSuffix = this.variant && this.variant !== "default" ? `:${this.variant}` : "";
+    const deviceIdPart = this.deviceId ?? "rtsp-server";
+    const sessionKey = `live:${deviceIdPart}:ch${this.channel}:${this.profile}${variantSuffix}`;
+    try {
+      const session = await this.api.createDedicatedSession(sessionKey, this.logger);
+      dedicatedClient = session.client;
+      this.dedicatedSessionRelease = session.release;
+      this.logger.info(
+        `[rebroadcast] dedicated session acquired  sessionKey=${sessionKey}`
+      );
+    } catch (e) {
+      this.logger.warn(
+        `[rebroadcast] failed to acquire dedicated session, falling back to shared socket: ${e}`
+      );
+    }
     this.logger.info(
-      `[rebroadcast] native stream starting  profile=${this.profile} channel=${this.channel} clients=${this.connectedClients.size}`
+      `[rebroadcast] native stream starting  profile=${this.profile} channel=${this.channel} clients=${this.connectedClients.size} dedicated=${!!dedicatedClient}`
     );
     await this.flow.startKeepAlive(this.api);
     this.nativeFanout = new NativeStreamFanout({
       maxQueueItems: 200,
       createSource: () => createNativeStream(this.api, this.channel, this.profile, {
-        variant: this.variant
+        variant: this.variant,
+        ...dedicatedClient ? { client: dedicatedClient } : {}
       }),
       onFrame: (frame) => {
         if (frame.audio) {
@@ -9225,6 +9272,12 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events2.E
         this.firstFrameResolve = null;
         this.nativeFanout = null;
         this.prebuffer = [];
+        if (this.dedicatedSessionRelease) {
+          const release = this.dedicatedSessionRelease;
+          this.dedicatedSessionRelease = void 0;
+          release().catch(() => {
+          });
+        }
         this.logger.info(
           `[rebroadcast] native stream ended (camera sleeping or connection lost)  profile=${this.profile} channel=${this.channel} clients=${this.connectedClients.size}`
         );
@@ -9294,6 +9347,14 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events2.E
       await fanout.stop();
     }
     this.prebuffer = [];
+    if (this.dedicatedSessionRelease) {
+      const release = this.dedicatedSessionRelease;
+      this.dedicatedSessionRelease = void 0;
+      try {
+        await release();
+      } catch {
+      }
+    }
     if (this.tempStreamGenerator) {
       try {
         await this.tempStreamGenerator.return(void 0);
@@ -9303,14 +9364,22 @@ var BaichuanRtspServer = class _BaichuanRtspServer extends import_node_events2.E
     }
   }
   /**
-   * Remove a client and stop native stream if no clients remain.
+   * Remove a client and schedule native stream stop if no clients remain.
+   * Uses a grace period so rapid reconnects (e.g. Frigate polling) reuse the running stream
+   * and benefit from the prebuffer instead of waiting for a fresh keyframe.
    */
   removeClient(clientId) {
     if (this.connectedClients.has(clientId)) {
       this.connectedClients.delete(clientId);
       this.emit("clientDisconnected", clientId);
       if (this.connectedClients.size === 0) {
-        void this.stopNativeStream();
+        this.clearNoClientAutoStopTimer();
+        this.noClientAutoStopTimer = setTimeout(() => {
+          if (this.connectedClients.size === 0) {
+            void this.stopNativeStream();
+          }
+        }, 3e4);
+        this.noClientAutoStopTimer?.unref?.();
       }
     }
   }