@mega-yfue/eufy-sdk 0.6.0-beta.5 → 0.6.0-beta.7

package/dist/index.js

@@ -16201,6 +16201,9 @@ function traceLiveStart(logger, trace, source) {
   logger.debug(LIVE_TRACE_MESSAGE, source === void 0 ? trace : { ...trace, source });
 }
 
+// dist/transport/p2p/level2-settle.js
+var LEVEL2_SETTLE_MS = 8e3;
+
 // dist/transport/p2p/p2p-session.js
 var LOCAL_LOOKUP_PORT = 32108;
 var HEARTBEAT_MS = 5e3;
@@ -17777,7 +17780,7 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
     });
     const body = Buffer.concat([
       buildCommandHeader(this.seqNumber, CMD_SET_PAYLOAD),
-      buildStringCommandPayload(value, channel, this.level1Key, 1)
+      this.databasePayload(value, channel)
     ]);
     this.seqNumber = this.seqNumber + 1 & 65535;
     this.logger.debug(`[p2p] ${this.cfg.stationSn} requestImage ${filePath}`);
@@ -17815,12 +17818,20 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
     });
     const body = Buffer.concat([
       buildCommandHeader(this.seqNumber, CMD_SET_PAYLOAD),
-      buildStringCommandPayload(value, channel, this.level1Key, 1)
+      this.databasePayload(value, channel)
     ]);
     this.seqNumber = this.seqNumber + 1 & 65535;
     this.logger.debug(`[p2p] ${this.cfg.stationSn} queryDatabase ${table} ch=${channel}`);
     this.send(this.connectAddress, RequestMessageType.DATA, body);
   }
+  /**
+   * The `CMD_SET_PAYLOAD` payload of a database read or stored-image request: the JSON level-1 encrypted, or
+   * in the clear with header bytes from {@link nextClearCommandBytes} on a session that {@link sendsInTheClear}
+   * and holds no level-2 key.
+   */
+  databasePayload(value, channel) {
+    return !this.level2Key && this.sendsInTheClear() ? buildRawCommandPayload(Buffer.from(value, "utf-8"), channel, 0, this.nextClearCommandBytes(), 0) : buildStringCommandPayload(value, channel, this.level1Key, 1);
+  }
   /**
    * Standard "give me the whole table" query params the eufy app uses for a direct
    * `CMD_DATABASE` read (inner `cmd 10000`). `count` bounds the row count.
@@ -17893,10 +17904,15 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
    *
    * One read at a time per session: while one is accumulating, every {@link queryDatabase} on the
    * session throws, so a second reply cannot land in this buffer.
+   *
+   * The query's framing follows the cipher the gateway-info reply names, so on a session still negotiating
+   * its level-2 key the query waits for that to settle, up to {@link LEVEL2_SETTLE_MS} from connect.
    */
   async readDatabase(table, opts = {}) {
     if (opts.signal?.aborted)
       throw new Error("readDatabase: aborted");
+    if (this.level2Pending)
+      await abortable(this.awaitLevel2Key(LEVEL2_SETTLE_MS, "session"), opts.signal);
     this.queryDatabase(table, {
       accountId: opts.accountId,
       innerCmd: opts.innerCmd,
@@ -18199,6 +18215,8 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
         } catch {
         }
       }
+    } else if (header.commandId === CMD_DATABASE && this.sendsInTheClear()) {
+      this.emit("dbChunk", { stationSn: this.cfg.stationSn, text: payload.toString("latin1") });
     }
     const frame = {
       ...header,
@@ -20550,14 +20568,20 @@ var SharedLiveSource = class {
   }
   /**
    * Handle a consumer leaving. When the last one detaches (1→0), release the station-session user via
-   * {@link SharedLiveSourceOptions.onIdle} (its own longer idle timer then arms) and arm the stream's
-   * linger teardown.
+   * {@link SharedLiveSourceOptions.onIdle} (its own longer idle timer then arms) and, while a stream is
+   * still running, arm its linger teardown.
+   *
+   * A source that ended its own stream ends its consumers before tearing down, and a Readable consumer
+   * detaches only once it has reached EOF — after that teardown. The source is then already `stopped`,
+   * with its session claim released, and stays so: lingering would make the owner hand it out again
+   * instead of building a source that holds a session.
    */
   onDetach(consumer) {
     this.consumers.delete(consumer);
     if (this.consumers.size === 0 && !this.disposed) {
       this.opts.onIdle?.();
-      this.arm();
+      if (this.stream)
+        this.arm();
     }
   }
   /** Refcount hit zero — arm the linger teardown. A new attach in the window cancels it. */
@@ -22030,7 +22054,6 @@ function stationChannels(devices) {
 // dist/transport/p2p/command-router.js
 var DIRECT_CMD_SENDS = 5;
 var LEVEL2_GRACE_MS = 25e3;
-var LEVEL2_SETTLE_MS = 8e3;
 var KEEP_LEVEL1_SESSION_MODELS = /* @__PURE__ */ new Set(["T8423"]);
 var P2P_STATION_WAITS = {
   connect: CONNECT_TIMEOUT_MS,