@mega-yfue/eufy-sdk 0.5.0-beta.83 → 0.5.0-beta.84

package/dist/index.js

@@ -16227,10 +16227,6 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
    * change (the level-2 key arrived after an initial level-1 start), otherwise sends the 1139 nudge.
    */
   liveStartedChannels = /* @__PURE__ */ new Map();
-  /** The `cipher_id` this connection's `CMD_GATEWAYINFO` reply named, once its negotiation has read it. */
-  gatewayCipherId;
-  /** The `n` of the last `[0x01, n]` header this connection sent in the clear — see {@link nextClearCommandBytes}. */
-  clearCommandCount = 0;
   unackedLiveStarts = /* @__PURE__ */ new Map();
   liveStartRetransmitTimer;
   logger;
@@ -16428,7 +16424,6 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
     this.level2Negotiating = true;
     const generation = this.connectionGeneration;
     const cipherId = gatewayInfoCipherId(gwPayload);
-    this.gatewayCipherId = cipherId;
     this.trace({ phase: "level2-negotiating", cipherId });
     void (async () => {
       try {
@@ -16535,8 +16530,6 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
       this.level2Pending = this.cfg.resolveCipherKey !== void 0;
       this.level2Negotiating = false;
       this.level2Reprompted = false;
-      this.gatewayCipherId = void 0;
-      this.clearCommandCount = 0;
     }
     const socket = dgram.createSocket("udp4");
     this.socket = socket;
@@ -16827,7 +16820,7 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
       this.sendMediaPayloadLevel2(CMD_START_REALTIME_MEDIA, channel, accountId, {});
       return;
     }
-    const want = this.level2Key ? "l2" : this.sendsInTheClear() ? "clear" : "l1";
+    const want = this.level2Key ? "l2" : "l1";
     if (opts?.force) {
       for (const pending of this.unackedLiveStarts.values())
         if (pending.channel === channel)
@@ -16857,17 +16850,8 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
    * `video_type` is 12, and `transaction` is the millisecond timestamp as a string. The device answers a
    * start carrying these values with a keyframe; `encryptkey` is the modulus it RSA-wraps each keyframe's
    * AES media key with (unwrapped by {@link decodeVideoFrame}).
-   *
-   * With `clearMsgId`, the body of a start sent in the clear: `{accountId, encryptkey, msg_id, streamtype: 1}`
-   * only, `msg_id` being `clearMsgId`, which changes from one start to the next.
    */
-  startLiveJson(channel, accountId, clearMsgId) {
-    if (clearMsgId !== void 0) {
-      return Buffer.from(JSON.stringify({
-        commandType: CMD_START_LIVE,
-        data: { accountId, encryptkey: this.rsaModulus(), msg_id: clearMsgId, streamtype: 1 }
-      }), "utf-8");
-    }
+  startLiveJson(channel, accountId) {
     const now2 = Date.now();
     return Buffer.from(JSON.stringify({
       commandType: CMD_START_LIVE,
@@ -16898,31 +16882,25 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
    * (GCM, signCode 8, frame type 10) when the session has a negotiated key, else level-1 (AES-128-ECB,
    * signCode 1, frame type 11) — chosen by the session key, not the device family. The camera RSA-wraps
    * each keyframe's AES media key with the `encryptkey` modulus (unwrapped by {@link decodeVideoFrame}).
-   * A session that {@link sendsInTheClear} sends it unencrypted instead: signCode 0, frame type 0, header
-   * bytes `[0x01, n]` from {@link nextClearCommandBytes}, and `n` as the body's `msg_id`.
    */
   sendStartLiveOwnSession(channel, accountId) {
     if (!this.connectAddress)
       return;
+    const plain = this.startLiveJson(channel, accountId);
     let payload;
     let signCode;
     let magic;
     let frameType;
     if (this.level2Key) {
-      const enc2 = this.encryptLevel2(this.startLiveJson(channel, accountId));
+      const enc2 = this.encryptLevel2(plain);
       if (!enc2)
         return;
       payload = enc2;
       signCode = 8;
       magic = [8, 0];
       frameType = START_LIVE_FRAME_TYPE_L2;
-    } else if (this.sendsInTheClear()) {
-      magic = this.nextClearCommandBytes();
-      payload = this.startLiveJson(channel, accountId, magic[1]);
-      signCode = 0;
-      frameType = 0;
     } else {
-      payload = encryptP2PData(paddingP2PData(this.startLiveJson(channel, accountId)), this.level1Key);
+      payload = encryptP2PData(paddingP2PData(plain), this.level1Key);
       signCode = 1;
       magic = [1, 0];
       frameType = START_LIVE_FRAME_TYPE_L1;
@@ -16942,21 +16920,6 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
     this.armLiveStartRetransmit();
     this.send(this.connectAddress, RequestMessageType.DATA, data);
   }
-  /**
-   * Whether this session's own-session start and stop go in the clear: its `CMD_GATEWAYINFO` reply named
-   * `cipher_id` 0.
-   */
-  sendsInTheClear() {
-    return this.gatewayCipherId === 0;
-  }
-  /**
-   * Header bytes 10-11 of this connection's next command sent in the clear: `[0x01, n]`, with `n` counting
-   * those commands from 1 and never 0. A retransmit repeats its `n`, and the device's reply echoes it.
-   */
-  nextClearCommandBytes() {
-    this.clearCommandCount = this.clearCommandCount % 255 + 1;
-    return [1, this.clearCommandCount];
-  }
   /**
    * Repeat unacknowledged own-session live starts until the device takes one. Runs only while a start is
    * outstanding.
@@ -17119,8 +17082,6 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
    *    `uint32`, the same 4-byte body as the attached talkback frames. The app sends this frame on closing
    *    an own-session camera's live view; the camera stops streaming on it within a second, and keeps
    *    streaming through the 1350-wrapped form.
-   *  - own-session on a session that {@link sendsInTheClear}: the same 4-byte body unencrypted, signCode 0,
-   *    header bytes from {@link nextClearCommandBytes}.
    *  - without a level-2 key: the bare 1004 command.
    */
   stopLiveMedia(channel = STATION_CHANNEL3, accountId = "", homeBaseAttached = false) {
@@ -17133,19 +17094,12 @@ var P2PSession = class _P2PSession extends EventEmitter2 {
       clearInterval(this.liveStartRetransmitTimer);
       this.liveStartRetransmitTimer = void 0;
     }
-    const body = Buffer.allocUnsafe(4);
-    body.writeUInt32LE(channel >>> 0, 0);
     if (this.level2Key && !homeBaseAttached) {
+      const body = Buffer.allocUnsafe(4);
+      body.writeUInt32LE(channel >>> 0, 0);
       this.sendRawLevel2Bytes(body, channel, CMD_STOP_REALTIME_MEDIA, 8);
     } else if (this.level2Key) {
       this.sendMediaPayloadLevel2(CMD_STOP_REALTIME_MEDIA, channel, accountId, {});
-    } else if (!homeBaseAttached && this.sendsInTheClear() && this.connectAddress) {
-      const data = Buffer.concat([
-        buildCommandHeader(this.seqNumber, CMD_STOP_REALTIME_MEDIA),
-        buildRawCommandPayload(body, channel, 0, this.nextClearCommandBytes(), 0)
-      ]);
-      this.seqNumber = this.seqNumber + 1 & 65535;
-      this.send(this.connectAddress, RequestMessageType.DATA, data);
     } else {
       this.sendCommand(CMD_STOP_REALTIME_MEDIA, channel);
     }