@bobfrankston/mailx-imap 0.1.111 → 0.1.113

package/index.js

@@ -1307,7 +1307,7 @@ export class ImapManager extends EventEmitter {
         return dbFolders;
     }
     /** Store a batch of messages to DB immediately — used by onChunk for incremental sync */
-    async storeMessages(accountId, folderId, folder, msgs, highestUid) {
+    async storeMessages(accountId, folderId, folder, msgs, highestUid, liveServerUids) {
         // Chunked transactions: better-sqlite3 is synchronous and an open
         // transaction blocks every other query on the same DB. A 1881-row
         // INBOX sync inside ONE transaction locked the connection for ~1.5 s
@@ -1384,6 +1384,7 @@ export class ImapManager extends EventEmitter {
                         cc: toEmailAddresses(msg.cc || []),
                         flags, size: msg.size || 0, hasAttachments, preview, bodyPath,
                         exclusive: true, // IMAP path → one folder per message
+                        liveServerUids,
                     },
                     ftsBody,
                 });
@@ -1581,7 +1582,10 @@ export class ImapManager extends EventEmitter {
             const chunk = toFetch.slice(i, i + BACKFILL_CHUNK_SIZE);
             try {
                 const got = await client.fetchMessages(folderPath, chunk.join(","), { source: false });
-                recoveredCount += await this.storeMessages(accountId, folderId, folder, got, 0);
+                // Pass the server's live UID list so move-detect can tell a
+                // duplicate delivery (both uids live in this folder) from a
+                // real move — see upsertMessage.liveServerUids.
+                recoveredCount += await this.storeMessages(accountId, folderId, folder, got, 0, new Set(serverUids));
             }
             catch (e) {
                 console.error(`  ${folderPath}: backfill chunk ${i}-${i + chunk.length} failed (${e?.message || e}) — keeping ${recoveredCount} so far, resuming next cycle`);
@@ -5724,10 +5728,11 @@ export class ImapManager extends EventEmitter {
         // Compare after the debounce window and only emit on a real change.
         const normalize = (s) => s.replace(/^\uFEFF/, "").replace(/\r\n/g, "\n").replace(/[ \t\r\n]+$/, "");
         const lastContent = new Map();
-        for (const filename of files) {
+        const watched = new Set();
+        const watchOne = (filename) => {
             const full = path.join(configDir, filename);
             if (!fs.existsSync(full))
-                continue;
+                return false;
             try {
                 lastContent.set(filename, normalize(fs.readFileSync(full, "utf-8")));
             }
@@ -5769,11 +5774,16 @@ export class ImapManager extends EventEmitter {
                     }, 500));
                 });
                 this.configWatchers.push(watcher);
+                watched.add(filename);
+                return true;
             }
             catch (e) {
                 console.error(`  [watch] Failed to watch ${filename}: ${e.message}`);
+                return false;
             }
-        }
+        };
+        for (const filename of files)
+            watchOne(filename);
         // GDrive has no push/watch for arbitrary Drive files, so edits on
         // another device (or via Drive web) never fire fs.watch locally.
         // Poll the cloud copies of the replicated-to-cloud config files
@@ -5824,6 +5834,14 @@ export class ImapManager extends EventEmitter {
                     }
                     fs.writeFileSync(localPath, cloudContent);
                     console.log(`  [cloud-poll] ${filename} updated from cloud copy`);
+                    // A file that didn't exist at startup never got an
+                    // fs.watch (watchOne skipped it), so the write above
+                    // fires nothing and the cloud edit would be applied to
+                    // disk but never loaded. Register the watcher now and
+                    // emit configChanged directly for this first change.
+                    if (!watched.has(filename) && watchOne(filename)) {
+                        this.emit("configChanged", filename);
+                    }
                 }
                 catch (e) {
                     console.log(`  [cloud-poll] ${filename} check skipped: ${e?.message || e}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.111",
+  "version": "0.1.113",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,13 +9,13 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@bobfrankston/mailx-types": "^0.1.21",
-    "@bobfrankston/mailx-settings": "^0.1.32",
-    "@bobfrankston/mailx-store": "^0.1.56",
+    "@bobfrankston/mailx-types": "^0.1.22",
+    "@bobfrankston/mailx-settings": "^0.1.33",
+    "@bobfrankston/mailx-store": "^0.1.58",
     "@bobfrankston/iflow-direct": "^0.1.56",
     "@bobfrankston/tcp-transport": "^0.1.7",
     "@bobfrankston/smtp-direct": "^0.1.9",
-    "@bobfrankston/mailx-sync": "^0.1.25",
+    "@bobfrankston/mailx-sync": "^0.1.27",
     "@bobfrankston/oauthsupport": "^1.0.33"
   },
   "repository": {
@@ -37,13 +37,13 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/mailx-types": "^0.1.21",
-      "@bobfrankston/mailx-settings": "^0.1.32",
-      "@bobfrankston/mailx-store": "^0.1.56",
+      "@bobfrankston/mailx-types": "^0.1.22",
+      "@bobfrankston/mailx-settings": "^0.1.33",
+      "@bobfrankston/mailx-store": "^0.1.58",
       "@bobfrankston/iflow-direct": "^0.1.56",
       "@bobfrankston/tcp-transport": "^0.1.7",
       "@bobfrankston/smtp-direct": "^0.1.9",
-      "@bobfrankston/mailx-sync": "^0.1.25",
+      "@bobfrankston/mailx-sync": "^0.1.27",
       "@bobfrankston/oauthsupport": "^1.0.33"
     }
   }