@mega-yfue/eufy-sdk 0.3.0-beta.4 → 0.3.0-beta.6

package/dist/index.js

@@ -23816,24 +23816,35 @@ function readNullTerminated(buf) {
 function nonemptyString(value) {
   return typeof value === "string" && value.trim().length > 0;
 }
-function normalizePushEvent(raw) {
-  const env = raw.payload ?? {};
-  let inner = env.payload ?? env;
-  if (typeof inner === "string") {
-    try {
-      inner = JSON.parse(inner);
-    } catch {
-      inner = void 0;
+function payloadLevels(env) {
+  const levels = [env];
+  for (let level = env; level.payload != null; ) {
+    let next = level.payload;
+    if (typeof next === "string") {
+      try {
+        next = JSON.parse(next);
+      } catch {
+        next = void 0;
+      }
     }
+    level = typeof next === "object" && next ? next : {};
+    levels.push(level);
   }
-  const p = typeof inner === "object" && inner ? inner : {};
+  return levels;
+}
+function normalizePushEvent(raw) {
+  const env = raw.payload ?? {};
+  const levels = payloadLevels(env);
+  const p = levels[levels.length - 1];
+  const deepestFirst = [...levels].reverse();
+  const deviceClaims = deepestFirst.map((l) => l.device_sn).filter(nonemptyString);
+  const levelStations = deepestFirst.map((l) => l.station_sn).filter(nonemptyString);
+  const stationClaims = nonemptyString(p.s) ? [...levelStations, p.s] : levelStations;
   const eventType = p.event_type ?? p.a;
   const url = nonemptyString(p.pic_url) ? p.pic_url : nonemptyString(p.thumbnail) ? p.thumbnail : void 0;
   let thumbnailCandidate;
   if (url) {
-    const deviceClaims = [p.device_sn, env.device_sn].filter(nonemptyString);
     const deviceSn = deviceClaims[0];
-    const stationClaims = [p.station_sn, env.station_sn, p.s].filter(nonemptyString);
     const stationSn = stationClaims[0];
     thumbnailCandidate = {
       url,
@@ -23844,8 +23855,8 @@ function normalizePushEvent(raw) {
     };
   }
   return {
-    deviceSn: p.device_sn ?? env.device_sn ?? p.s,
-    stationSn: p.station_sn ?? env.station_sn,
+    deviceSn: deviceClaims[0] ?? (nonemptyString(p.s) ? p.s : void 0),
+    stationSn: levelStations[0],
     eventType,
     thumbnailUrl: p.pic_url ?? p.thumbnail,
     thumbnailCandidate,
@@ -23985,6 +23996,13 @@ var PushClient = class _PushClient extends EventEmitter8 {
     }
     this.socket?.destroy();
   }
+  /**
+   * Decode one MCS `DataMessageStanza` into a {@link RawPushMessage} and the normalised event.
+   *
+   * `payload` carries the whole app_data envelope, with its `payload` entry (base64 of NUL-terminated
+   * JSON) parsed in place: the envelope's own keys, `device_sn` and `station_sn` among them, sit beside
+   * that entry.
+   */
   handleDataMessage(object) {
     if (object?.persistentId)
       this.persistentIds.push(object.persistentId);
@@ -24009,7 +24027,7 @@ var PushClient = class _PushClient extends EventEmitter8 {
       persistentId: object?.persistentId,
       ttl: object?.ttl,
       sent: object?.sent,
-      payload: data.payload ?? data
+      payload: data
     };
     this.emit("message", raw);
     const event = normalizePushEvent(raw);