@yoooclaw/phone-notifications 1.6.1 → 1.6.2

package/dist/index.js

@@ -2233,7 +2233,7 @@ var require_websocket = __commonJS({
     var http = __require("http");
     var net = __require("net");
     var tls = __require("tls");
-    var { randomBytes, createHash } = __require("crypto");
+    var { randomBytes, createHash: createHash2 } = __require("crypto");
     var { Duplex, Readable } = __require("stream");
     var { URL: URL2 } = __require("url");
     var PerMessageDeflate = require_permessage_deflate();
@@ -2893,7 +2893,7 @@ var require_websocket = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash("sha1").update(key + GUID).digest("base64");
+        const digest = createHash2("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -3260,7 +3260,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter = __require("events");
     var http = __require("http");
     var { Duplex } = __require("stream");
-    var { createHash } = __require("crypto");
+    var { createHash: createHash2 } = __require("crypto");
     var extension = require_extension();
     var PerMessageDeflate = require_permessage_deflate();
     var subprotocol = require_subprotocol();
@@ -3561,7 +3561,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash("sha1").update(key + GUID).digest("base64");
+        const digest = createHash2("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -4093,9 +4093,11 @@ import {
   rmSync,
   constants
 } from "fs";
+import { createHash } from "crypto";
 import { join as join4 } from "path";
 var NOTIFICATION_DIR_NAME = "notifications";
 var ID_INDEX_DIR_NAME = ".ids";
+var CONTENT_KEY_INDEX_DIR_NAME = ".keys";
 function getStateFallbackNotificationDir(stateDir) {
   return join4(stateDir, "plugins", "phone-notifications", NOTIFICATION_DIR_NAME);
 }
@@ -4131,56 +4133,75 @@ var NotificationStorage = class {
     this.logger = logger;
     this.dir = dir;
     this.idIndexDir = join4(dir, ID_INDEX_DIR_NAME);
+    this.contentKeyIndexDir = join4(dir, CONTENT_KEY_INDEX_DIR_NAME);
     this.resolveDisplayName = resolveDisplayName;
   }
   dir;
   idIndexDir;
+  contentKeyIndexDir;
   idCache = /* @__PURE__ */ new Map();
+  contentKeyCache = /* @__PURE__ */ new Map();
+  dateWriteChains = /* @__PURE__ */ new Map();
   resolveDisplayName;
   async init() {
     mkdirSync4(this.dir, { recursive: true });
     mkdirSync4(this.idIndexDir, { recursive: true });
+    mkdirSync4(this.contentKeyIndexDir, { recursive: true });
   }
   async ingest(items) {
+    const result = {
+      received: items.length,
+      ingested: 0,
+      dedupedById: 0,
+      dedupedByContent: 0,
+      invalid: 0
+    };
     for (const n of items) {
-      await this.writeNotification(n);
+      const outcome = await this.writeNotification(n);
+      result[outcome] += 1;
     }
     this.prune();
+    return result;
   }
   async writeNotification(n) {
     const ts = new Date(n.timestamp);
     if (Number.isNaN(ts.getTime())) {
       this.logger.warn(`\u5FFD\u7565\u975E\u6CD5 timestamp \u7684\u901A\u77E5: ${n.id}`);
-      return;
+      return "invalid";
     }
     const dateKey = this.formatDate(ts);
     const filePath = join4(this.dir, `${dateKey}.json`);
     const normalizedId = typeof n.id === "string" ? n.id.trim() : "";
-    if (normalizedId && this.hasNotificationId(dateKey, normalizedId)) {
-      return;
-    }
-    const appName = typeof n.app === "string" && n.app ? n.app : "Unknown";
-    const appDisplayName = this.resolveDisplayName ? await this.resolveDisplayName(appName) : appName;
-    const entry = {
-      appName,
-      appDisplayName,
+    const entry = this.buildStoredNotification(n);
+    return this.withDateWriteLock(dateKey, async () => {
+      if (normalizedId && this.hasNotificationId(dateKey, normalizedId)) {
+        return "dedupedById";
+      }
+      if (this.hasNotificationContentKey(dateKey, filePath, entry)) {
+        return "dedupedByContent";
+      }
+      const appDisplayName = this.resolveDisplayName ? await this.resolveDisplayName(entry.appName) : entry.appName;
+      const storedEntry = {
+        ...entry,
+        appDisplayName
+      };
+      const arr = this.readStoredNotifications(filePath);
+      arr.push(storedEntry);
+      writeFileSync4(filePath, JSON.stringify(arr, null, 2), "utf-8");
+      if (normalizedId) {
+        this.recordNotificationId(dateKey, normalizedId);
+      }
+      this.recordNotificationContentKey(dateKey, filePath, storedEntry);
+      return "ingested";
+    });
+  }
+  buildStoredNotification(n) {
+    return {
+      appName: typeof n.app === "string" && n.app ? n.app : "Unknown",
       title: typeof n.title === "string" ? n.title : "",
       content: this.buildContent(n),
       timestamp: n.timestamp
     };
-    let arr = [];
-    if (existsSync4(filePath)) {
-      try {
-        arr = JSON.parse(readFileSync4(filePath, "utf-8"));
-      } catch {
-        arr = [];
-      }
-    }
-    arr.push(entry);
-    writeFileSync4(filePath, JSON.stringify(arr, null, 2), "utf-8");
-    if (normalizedId) {
-      this.recordNotificationId(dateKey, normalizedId);
-    }
   }
   buildContent(n) {
     const body = n.body?.trim();
@@ -4224,9 +4245,44 @@ var NotificationStorage = class {
     this.idCache.set(dateKey, ids);
     return ids;
   }
+  getContentKeyIndexPath(dateKey) {
+    return join4(this.contentKeyIndexDir, `${dateKey}.keys`);
+  }
+  getContentKeySet(dateKey, filePath) {
+    const cached = this.contentKeyCache.get(dateKey);
+    if (cached) {
+      return cached;
+    }
+    const keyPath = this.getContentKeyIndexPath(dateKey);
+    const keys = /* @__PURE__ */ new Set();
+    if (existsSync4(keyPath)) {
+      const lines = readFileSync4(keyPath, "utf-8").split(/\r?\n/);
+      for (const line of lines) {
+        const key = line.trim();
+        if (key) {
+          keys.add(key);
+        }
+      }
+    } else if (existsSync4(filePath)) {
+      for (const item of this.readStoredNotifications(filePath)) {
+        keys.add(this.buildNotificationContentKey(item));
+      }
+      if (keys.size > 0) {
+        writeFileSync4(keyPath, `${Array.from(keys).join("\n")}
+`, "utf-8");
+      }
+    }
+    this.contentKeyCache.set(dateKey, keys);
+    return keys;
+  }
   hasNotificationId(dateKey, id) {
     return this.getIdSet(dateKey).has(id);
   }
+  hasNotificationContentKey(dateKey, filePath, entry) {
+    return this.getContentKeySet(dateKey, filePath).has(
+      this.buildNotificationContentKey(entry)
+    );
+  }
   recordNotificationId(dateKey, id) {
     const ids = this.getIdSet(dateKey);
     if (ids.has(id)) {
@@ -4236,12 +4292,55 @@ var NotificationStorage = class {
 `, "utf-8");
     ids.add(id);
   }
+  recordNotificationContentKey(dateKey, filePath, entry) {
+    const keys = this.getContentKeySet(dateKey, filePath);
+    const key = this.buildNotificationContentKey(entry);
+    if (keys.has(key)) {
+      return;
+    }
+    appendFileSync(this.getContentKeyIndexPath(dateKey), `${key}
+`, "utf-8");
+    keys.add(key);
+  }
+  buildNotificationContentKey(entry) {
+    return createHash("sha256").update(entry.appName).update("").update(entry.title).update("").update(entry.content).digest("hex");
+  }
+  readStoredNotifications(filePath) {
+    if (!existsSync4(filePath)) {
+      return [];
+    }
+    try {
+      const parsed = JSON.parse(readFileSync4(filePath, "utf-8"));
+      return Array.isArray(parsed) ? parsed : [];
+    } catch {
+      return [];
+    }
+  }
+  async withDateWriteLock(dateKey, task) {
+    const previous = this.dateWriteChains.get(dateKey) ?? Promise.resolve();
+    let release;
+    const current = new Promise((resolve) => {
+      release = resolve;
+    });
+    const chain = previous.then(() => current);
+    this.dateWriteChains.set(dateKey, chain);
+    await previous;
+    try {
+      return await task();
+    } finally {
+      release();
+      if (this.dateWriteChains.get(dateKey) === chain) {
+        this.dateWriteChains.delete(dateKey);
+      }
+    }
+  }
   prune() {
     const retentionDays = this.config.retentionDays ?? 30;
     const cutoffMs = Date.now() - retentionDays * 24 * 60 * 60 * 1e3;
     const cutoffDate = this.formatDate(new Date(cutoffMs));
     this.pruneDataFiles(cutoffDate);
     this.pruneIdIndex(cutoffDate);
+    this.pruneContentKeyIndex(cutoffDate);
   }
   /** Remove expired .json, legacy .md files, and legacy date directories */
   pruneDataFiles(cutoffDate) {
@@ -4275,8 +4374,24 @@ var NotificationStorage = class {
     } catch {
     }
   }
+  /** Remove expired .keys index files */
+  pruneContentKeyIndex(cutoffDate) {
+    try {
+      for (const entry of readdirSync(this.contentKeyIndexDir, { withFileTypes: true })) {
+        if (!entry.isFile()) continue;
+        const match = /^(\d{4}-\d{2}-\d{2})\.keys$/.exec(entry.name);
+        if (match && match[1] < cutoffDate) {
+          rmSync(join4(this.contentKeyIndexDir, entry.name), { force: true });
+          this.contentKeyCache.delete(match[1]);
+        }
+      }
+    } catch {
+    }
+  }
   async close() {
     this.idCache.clear();
+    this.contentKeyCache.clear();
+    this.dateWriteChains.clear();
   }
 };
 
@@ -6350,6 +6465,15 @@ function trimToUndefined(value) {
   const trimmed = value.trim();
   return trimmed || void 0;
 }
+function createEmptyIngestResult() {
+  return {
+    received: 0,
+    ingested: 0,
+    dedupedById: 0,
+    dedupedByContent: 0,
+    invalid: 0
+  };
+}
 function resolveLocalGatewayAuth(params) {
   const envGatewayToken = trimToUndefined(process.env.OPENCLAW_GATEWAY_TOKEN) ?? trimToUndefined(process.env.CLAWDBOT_GATEWAY_TOKEN);
   const envGatewayPassword = trimToUndefined(process.env.OPENCLAW_GATEWAY_PASSWORD) ?? trimToUndefined(process.env.CLAWDBOT_GATEWAY_PASSWORD);
@@ -6448,10 +6572,8 @@ var index_default = {
         const { items } = params;
         if (Array.isArray(items)) {
           const filtered = filterNotifications(items);
-          if (filtered.length) {
-            await storage.ingest(filtered);
-          }
-          respond(true, { ingested: filtered.length });
+          const result = filtered.length ? await storage.ingest(filtered) : createEmptyIngestResult();
+          respond(true, result);
         } else {
           respond(false, null, {
             code: "INVALID_PARAMS",
@@ -6629,11 +6751,9 @@ var index_default = {
           return;
         }
         const filtered = filterNotifications(body.notifications);
-        if (filtered.length) {
-          await storage.ingest(filtered);
-        }
+        const result = filtered.length ? await storage.ingest(filtered) : createEmptyIngestResult();
         res.writeHead(200, { "Content-Type": "application/json" });
-        res.end(JSON.stringify({ ok: true, ingested: filtered.length }));
+        res.end(JSON.stringify({ ok: true, ...result }));
       }
     });
     logger.info("HTTP \u901A\u77E5\u7AEF\u70B9\u5DF2\u6CE8\u518C: POST /notifications");