@mega-yfue/eufy-sdk 0.5.0-beta.51 → 0.5.0-beta.53

package/dist/client/eufy-mega.d.ts

@@ -454,8 +454,9 @@ export declare class EufyMega extends EventEmitter {
      *
      * Side-effect: registers `eufy_home_tuya` devices with the Tuya command router so
      * the command dispatcher can resolve a eufy SN → Tuya devId without a separate lookup.
-     * The Tuya id is extracted from the device's raw cloud record (`tuya_uuid`, `tuya_virtual_id`,
-     * `tuya_device_id`, or `virtualId` fields — whichever is non-empty).
+     * The Tuya id is the first non-empty `tuya_uuid`, `tuya_virtual_id`, `tuya_device_id` or
+     * `virtualId` on the raw cloud record, else the device's serial: the app keys its Tuya device by
+     * the eufy device id, and a record that carries none of those fields is read under its serial.
      *
      * A partial cloud outage still resolves, with the devices that answered plus the ones already known — but a
      * session the cloud has rejected REJECTS, with {@link SessionExpiredError}. An empty list would be
@@ -790,6 +791,10 @@ export declare class EufyMega extends EventEmitter {
     /**
      * Subscribe the devices on one credential scope; a failing subscribe is reported, not fatal (one
      * unreachable device must not stop the rest of the roster from coming up).
+     *
+     * A Tuya clean-line device's DPs are also read from the Tuya cloud, whether or not its subscribe
+     * succeeded: the cloud read is a separate plane, and the broker can refuse a subscribe for a device
+     * whose DPs the Tuya cloud still serves.
      */
     private subscribeMqttDevices;
     /**

package/dist/index.js

@@ -7769,6 +7769,12 @@ var ARMING_CMD = {
   SET_ALL_ACTION: 1255
 };
 var DEVICE_NOTIFY_FLAG = 8;
+var STANDALONE_ACTION_MODELS = /* @__PURE__ */ new Set(["T8170", "T8171"]);
+var STANDALONE_READ_MODELS = /* @__PURE__ */ new Set([...STANDALONE_ACTION_MODELS, "T8400", "T8442", "T8410"]);
+function ownAction(read, mode) {
+  const value = Number(read(`${mode}Action`)?.value);
+  return Number.isInteger(value) && value >= 0 ? value : void 0;
+}
 function actionTable(read, mode) {
   const value = read(`${mode}ActionTable`)?.value;
   return value && typeof value === "object" && Array.isArray(value.devices) ? value : void 0;
@@ -7811,6 +7817,13 @@ function alarmDelayCommand(mode, config, ctx) {
   };
   return setJsonRaw(ARMING_CMD.SET_ALL_ACTION, data, ctx, STATION_CHANNEL2);
 }
+function ownTable(read, mode, channel) {
+  const flags = ownAction(read, mode);
+  if (flags === void 0)
+    return void 0;
+  const wire = ARMING_MODE_WIRE[mode];
+  return { mode_id: wire, devices: [{ device_channel: channel, action: wire << 24 | flags }] };
+}
 var ACTION_TABLE_LAG_MS = 15e3;
 function withDeviceNotification(table, channel, on) {
   if (!table?.devices.some((d) => d.device_channel === channel))
@@ -7879,25 +7892,29 @@ var ARMING_MEMBERS = {
   /**
    * Whether the device on `channel` sends a push notification in `mode`: its {@link DEVICE_NOTIFY_FLAG}
    * in the action table the station reports for that mode. `undefined` where the station reports no table
-   * or the table does not list `channel`. A device's channel is `EufyDevice.channel`.
+   * or the table does not list `channel`. A standalone camera answers from its own 1225/1239/1148 flags,
+   * for its own channel only. A device's channel is `EufyDevice.channel`.
    */
-  deviceNotification: method(({ read }) => (mode, channel) => {
-    const action = actionTable(read, mode)?.devices.find((d) => d.device_channel === channel)?.action;
+  deviceNotification: method(({ ctx, read }) => (mode, channel) => {
+    const action = ctx.model === "T8010" ? actionTable(read, mode)?.devices.find((d) => d.device_channel === channel)?.action : channel === ctx.channel ? ownAction(read, mode) : void 0;
     return typeof action === "number" ? (action & DEVICE_NOTIFY_FLAG) !== 0 : void 0;
-  }, "Whether the device on a channel sends a push notification in a guard mode (home/away).", (ctx) => ctx.model === "T8010"),
+  }, "Whether the device on a channel sends a push notification in a guard mode (home/away/custom1).", (ctx) => ctx.model === "T8010" || STANDALONE_READ_MODELS.has(ctx.model ?? "")),
   /**
    * Turn the push notification of the device on `channel` on or off in `mode` (cmd
    * {@link ARMING_CMD.SET_ALL_ACTION}): the station's reported table written back with that one flag
-   * changed. Rejects, sending nothing, where the table does not list `channel`. A write builds on the last
-   * one sent for that mode until the station reports a table observed 15 s after it, so a second write does
-   * not revert it; a write whose dispatch rejects is not built on.
+   * changed. A standalone camera is sent a one-entry `{mode_id, devices}` table built from its own flags,
+   * for its own channel only. Rejects, sending nothing, where the table does not list `channel`. A write
+   * builds on the last one sent for that mode until the device reports a table (`${mode}Action` on a
+   * standalone camera) observed 15 s after it, so a second write does not revert it; a write whose dispatch
+   * rejects is not built on.
    */
   setDeviceNotification: method(({ ctx, sink, read }) => {
     const sent2 = /* @__PURE__ */ new Map();
     return (mode, channel, on) => {
       const last = sent2.get(mode);
-      const observed = read(`${mode}ActionTable`)?.ts ?? 0;
-      const base = last && observed < last.at + ACTION_TABLE_LAG_MS ? last.table : actionTable(read, mode);
+      const reported = ctx.model === "T8010" ? `${mode}ActionTable` : `${mode}Action`;
+      const observed = read(reported)?.ts ?? 0;
+      const base = last && observed < last.at + ACTION_TABLE_LAG_MS ? last.table : ctx.model === "T8010" ? actionTable(read, mode) : ownTable(read, mode, ctx.channel);
       const table = withDeviceNotification(base, channel, on);
       if (!table) {
         return Promise.reject(new Error(`arming: no ${mode} action table lists channel ${channel} [${describeDevice(ctx)}]`));
@@ -7913,7 +7930,7 @@ var ARMING_MEMBERS = {
         throw err;
       });
     };
-  }, "Turn the push notification of the device on a channel on or off in a guard mode (home/away).", (ctx) => ctx.model === "T8010")
+  }, "Turn the push notification of the device on a channel on or off in a guard mode (home/away/custom1).", (ctx) => ctx.model === "T8010" || STANDALONE_ACTION_MODELS.has(ctx.model ?? ""))
 };
 function decodeAlarmPhase(signal) {
   const type = signal.source === "push" ? signal.payload?.["type"] : void 0;
@@ -11544,7 +11561,7 @@ var SECURITY_PARAMS = {
   1148: {
     name: "custom1Action",
     type: "number",
-    provenance: "apk"
+    provenance: "verified"
   },
   1149: {
     name: "custom2Action",
@@ -11759,7 +11776,7 @@ var SECURITY_PARAMS = {
   1225: {
     name: "homeAction",
     type: "number",
-    provenance: "apk"
+    provenance: "verified"
   },
   1229: {
     name: "param1229",
@@ -25525,11 +25542,11 @@ function buildPublishDpsAction(devId, gwId, dps) {
     postData: JSON.stringify({ gwId, devId, dps: JSON.stringify(dps) })
   };
 }
-function buildGetDeviceDpsAction(devId, dpCacheType = 1) {
+function buildGetDeviceDpsAction(devId) {
   return {
-    a: "smartlife.m.device.cache.dp.get",
-    v: "2.0",
-    postData: JSON.stringify({ devId, dpCacheType })
+    a: "smartlife.m.device.dp.get",
+    v: "1.0",
+    postData: JSON.stringify({ devId })
   };
 }
 function buildUsernameTokenGetAction(countryCode, username) {
@@ -25685,11 +25702,12 @@ var TuyaClient = class {
     return { sid: result.sid, uid: result.uid };
   }
   /**
-   * READ/dump a device's cached data-points (`smartlife.m.device.cache.dp.get`).
-   * Builds the request without needing a working signer; the signer is only exercised on send.
+   * READ a device's current data-points (`smartlife.m.device.dp.get`). The envelope's `result` is a
+   * flat `{ "<dpId>": value }` map. Builds the request without needing a working signer; the signer is
+   * only exercised on send.
    */
-  async getDeviceDps(devId, dpCacheType) {
-    return this.call(buildGetDeviceDpsAction(devId, dpCacheType));
+  async getDeviceDps(devId) {
+    return this.call(buildGetDeviceDpsAction(devId));
   }
   /**
    * CONTROL: publish data-points to a device (`smartlife.m.device.dp.publish`). `dps` is
@@ -25780,9 +25798,9 @@ var TuyaCommandRouter = class {
   /** Promise that resolves once Tuya login has completed. Reset by {@link bind}. */
   loginOnce = null;
   /**
-   * eufy SN → Tuya device ids, populated by the facade via {@link registerDevice}.
-   * The facade extracts the Tuya id from the `raw` device record fields (`tuya_uuid`,
-   * `tuya_virtual_id`, `tuya_device_id`, `virtualId`) and registers it once the device list loads.
+   * eufy SN → Tuya device ids, populated via {@link registerDevice} once the device list loads.
+   * The Tuya id is the record's first non-empty `tuya_uuid` / `tuya_virtual_id` / `tuya_device_id` /
+   * `virtualId`, or the device's serial when the record carries none of them.
    */
   snMap = /* @__PURE__ */ new Map();
   constructor(config = {}) {
@@ -25804,10 +25822,10 @@ var TuyaCommandRouter = class {
     this.loginOnce = null;
   }
   /**
-   * Register a eufy SN → Tuya devId mapping. Called by the facade for each `eufy_home_tuya`
-   * device after the cloud device list loads. The facade extracts the Tuya id from the device's
-   * raw record (`tuya_uuid` / `tuya_virtual_id` / `tuya_device_id` / `virtualId` fields).
-   * `gwId` defaults to `devId` — standalone devices share the two.
+   * Register a eufy SN → Tuya devId mapping for an `eufy_home_tuya` device. `devId` is the record's
+   * first non-empty `tuya_uuid` / `tuya_virtual_id` / `tuya_device_id` / `virtualId`, or the device's
+   * serial when the record carries none of them. `gwId` defaults to `devId` — standalone devices
+   * share the two.
    */
   registerDevice(sn, devId, gwId = devId) {
     this.snMap.set(sn, { devId, gwId });
@@ -25831,13 +25849,9 @@ var TuyaCommandRouter = class {
     return this.loginOnce;
   }
   /**
-   * Fetch a device's cached DPs from the Tuya cloud (`smartlife.m.device.cache.dp.get`) and deliver
-   * the raw DP map to the caller. Used for initial state hydration after MQTT subscribe — gets the
-   * last-known state without waiting for the first realtime push.
-   *
-   * The response shape from `getDeviceDps` is not yet pinned from a live capture. The defensive
-   * extraction tries both `result.dps` (a nested map) and bare `result` (a flat map), and returns
-   * `null` when neither yields a non-empty record.
+   * Read a device's current DPs from the Tuya cloud (`smartlife.m.device.dp.get`) and answer the DP
+   * map: the reply's flat `result`, kept to integer DP keys with scalar values. Answers `null` for an
+   * unregistered device, a failed reply, or a reply with no DPs.
    */
   async fetchDps(sn) {
     const ids = this.snMap.get(sn);
@@ -25847,12 +25861,8 @@ var TuyaCommandRouter = class {
     const res = await this.client.getDeviceDps(ids.devId);
     if (!res.success || !res.result)
       return null;
-    const nested = res.result.dps;
-    if (nested && typeof nested === "object" && !Array.isArray(nested) && Object.keys(nested).length > 0) {
-      return nested;
-    }
-    const flat = parseTuyaDpEvent(res.result);
-    return flat ? flat : null;
+    const dps = parseTuyaDpEvent(res.result);
+    return dps ? dps : null;
   }
   /**
    * Route an `aiot-dp` {@link Command} to the Tuya REST API.
@@ -25871,7 +25881,7 @@ var TuyaCommandRouter = class {
     await this.ensureLoggedIn();
     const ids = this.snMap.get(sn);
     if (!ids) {
-      throw new Error(`TuyaCommandRouter: no Tuya device id registered for ${sn}. Ensure getDevices() was called and the cloud record includes a tuya_uuid / tuya_virtual_id field.`);
+      throw new Error(`TuyaCommandRouter: no Tuya device id registered for ${sn}. Ensure getDevices() was called; it registers every eufy_home_tuya device under its Tuya id or its serial.`);
     }
     await this.client.publishDps(ids.devId, ids.gwId, { [cmd.dp]: cmd.value }, { allowUnverified: this.allowUnverified });
   }
@@ -28679,8 +28689,9 @@ var EufyMega = class extends EventEmitter13 {
    *
    * Side-effect: registers `eufy_home_tuya` devices with the Tuya command router so
    * the command dispatcher can resolve a eufy SN → Tuya devId without a separate lookup.
-   * The Tuya id is extracted from the device's raw cloud record (`tuya_uuid`, `tuya_virtual_id`,
-   * `tuya_device_id`, or `virtualId` fields — whichever is non-empty).
+   * The Tuya id is the first non-empty `tuya_uuid`, `tuya_virtual_id`, `tuya_device_id` or
+   * `virtualId` on the raw cloud record, else the device's serial: the app keys its Tuya device by
+   * the eufy device id, and a record that carries none of those fields is read under its serial.
    *
    * A partial cloud outage still resolves, with the devices that answered plus the ones already known — but a
    * session the cloud has rejected REJECTS, with {@link SessionExpiredError}. An empty list would be
@@ -28692,9 +28703,7 @@ var EufyMega = class extends EventEmitter13 {
       if (dev.category !== "eufy_home_tuya")
         continue;
       const raw = dev.raw ?? {};
-      const devId = tuyaDevIdFrom(raw);
-      if (devId)
-        this.tuya.registerDevice(dev.sn, devId);
+      this.tuya.registerDevice(dev.sn, tuyaDevIdFrom(raw) ?? dev.sn);
     }
     return devices;
   }
@@ -29362,21 +29371,25 @@ var EufyMega = class extends EventEmitter13 {
   /**
    * Subscribe the devices on one credential scope; a failing subscribe is reported, not fatal (one
    * unreachable device must not stop the rest of the roster from coming up).
+   *
+   * A Tuya clean-line device's DPs are also read from the Tuya cloud, whether or not its subscribe
+   * succeeded: the cloud read is a separate plane, and the broker can refuse a subscribe for a device
+   * whose DPs the Tuya cloud still serves.
    */
   async subscribeMqttDevices(scope, transport) {
     for (const d of this.getMqttDevices().filter((dev) => mqttScopeFor(dev) === scope)) {
       try {
         await transport.subscribeDevice(d);
         await this.sendRealtimeInit(d.sn);
-        if (d.category === "eufy_home_tuya") {
-          this.tuya.fetchDps(d.sn).then((dps) => {
-            if (dps)
-              this.tuyaDpRouter.deliver(d.sn, dps);
-          }).catch((e) => this.reportError(e));
-        }
       } catch (e) {
         this.reportError(e);
       }
+      if (d.category === "eufy_home_tuya") {
+        this.tuya.fetchDps(d.sn).then((dps) => {
+          if (dps)
+            this.tuyaDpRouter.deliver(d.sn, dps);
+        }).catch((e) => this.reportError(e));
+      }
     }
   }
   /**