@mega-yfue/eufy-sdk 0.2.0-beta.3 → 0.2.0-beta.4

package/dist/index.js

@@ -16417,10 +16417,12 @@ var LiveStream = class extends EventEmitter3 {
       if (!this.listening || this.kaTimer)
         return;
       if (this.opts.reassertWanted?.() === false) {
+        this.trace({ phase: "channel-silent", silentMs: stallMs, outcome: "declined" });
         this.logger.debug(`[live ch${this.channel}] no own media for ${stallMs}ms, and its owner does not want this channel re-asserted \u2014 staying quiet`);
         this.armStallWatch();
         return;
       }
+      this.trace({ phase: "channel-silent", silentMs: stallMs, outcome: "reasserted" });
       this.logger.debug(`[live ch${this.channel}] no own media for ${stallMs}ms \u2014 re-asserting this camera's channel`);
       this.sendStart();
       this.kaTimer = setInterval(() => this.sendStart(), keepAliveMs);
@@ -16641,10 +16643,12 @@ async function captureSnapshotFromShared(source, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 2e4;
   const collectMs = opts.collectMs ?? 1500;
   const skip = opts.skipKeyframes ?? 1;
+  opts.signal?.throwIfAborted();
   const consumer = source.attach();
   const primed = consumer.primed;
+  let burst;
   try {
-    const burst = await new Promise((resolve, reject) => {
+    burst = await new Promise((resolve, reject) => {
       const bufs = [];
       let sets = source.parameterSets;
       let codec = "h264";
@@ -16679,6 +16683,10 @@ async function captureSnapshotFromShared(source, opts = {}) {
         cleanup();
         reject(new LiveSnapshotUnavailableError("source-failed", `source ended before a keyframe (state: ${source.state})`));
       };
+      const onAbandoned = () => {
+        cleanup();
+        reject(opts.signal?.reason);
+      };
       const cleanup = () => {
         clearTimeout(timer);
         if (settle)
@@ -16686,19 +16694,21 @@ async function captureSnapshotFromShared(source, opts = {}) {
         consumer.off("video", onVideo);
         consumer.off("error", onError);
         consumer.off("stop", onStop);
+        opts.signal?.removeEventListener("abort", onAbandoned);
       };
       consumer.on("video", onVideo);
       consumer.on("error", onError);
       consumer.on("stop", onStop);
-    });
-    return await annexbToJpeg(primeForDecode(burst.h264, burst.sets, burst.codec), {
-      logger: opts.logger ?? noopLogger,
-      level: opts.ffmpegLevel,
-      executable: opts.ffmpegPath
+      opts.signal?.addEventListener("abort", onAbandoned, { once: true });
     });
   } finally {
     consumer.detach();
   }
+  return annexbToJpeg(primeForDecode(burst.h264, burst.sets, burst.codec), {
+    logger: opts.logger ?? noopLogger,
+    level: opts.ffmpegLevel,
+    executable: opts.ffmpegPath
+  });
 }
 async function recordClip(session, seconds, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 2e4;
@@ -19271,12 +19281,12 @@ var P2PCommandRouter = class _P2PCommandRouter {
     return {
       snapshotLive: async (opts) => {
         const source = await this.sharedLiveSourceFor(sn, opts ?? {});
-        return abortable(captureSnapshotFromShared(source, {
+        return captureSnapshotFromShared(source, {
           ...opts,
           logger: this.deps.logger ?? noopLogger,
           ffmpegLevel: this.deps.ffmpegLogLevel,
           ffmpegPath: this.deps.ffmpegPath
-        }), opts?.signal);
+        });
       },
       live: async (opts) => {
         const source = await this.sharedLiveSourceFor(sn, opts);