@bobfrankston/mailx-imap 0.1.49 → 0.1.51

package/index.js

@@ -3039,7 +3039,13 @@ export class ImapManager extends EventEmitter {
                             console.log(`  [api] ${accountId}: flags synced UID ${action.uid}`);
                         }
                         else if ((action.action === "delete" || action.action === "trash") && api.trashMessage) {
-                            await api.trashMessage(folder.path, action.uid);
+                            // Pass the stored Gmail message id (provider_id) so
+                            // the provider doesn't fall back to its capped
+                            // list-and-hash search — that search misses any
+                            // message past the most-recent ~1000 in a large
+                            // mailbox, fails, and the deletion un-happens.
+                            const env = this.db.getMessageByUid(accountId, action.uid);
+                            await api.trashMessage(folder.path, action.uid, env?.providerId);
                             console.log(`  [api] ${accountId}: trashed UID ${action.uid} from ${folder.path}`);
                         }
                         else if (action.action === "move" && api.moveMessage) {
@@ -3050,7 +3056,8 @@ export class ImapManager extends EventEmitter {
                                 this.db.completeSyncAction(action.id);
                                 continue;
                             }
-                            await api.moveMessage(folder.path, action.uid, target.path);
+                            const env = this.db.getMessageByUid(accountId, action.uid);
+                            await api.moveMessage(folder.path, action.uid, target.path, env?.providerId);
                             console.log(`  [api] ${accountId}: moved UID ${action.uid} ${folder.path} → ${target.path}`);
                         }
                         else {
@@ -4309,16 +4316,20 @@ export class ImapManager extends EventEmitter {
                 const res = await fetch(url, {
                     headers: { Authorization: `Bearer ${token}` },
                 });
-                if (res.status === 410) {
-                    // Sync token expired (Google retains tokens for ~7 days).
-                    // Drop the stored token and recurse for a full sync — the
-                    // in-flight guard is on syncGoogleContacts (the public
-                    // wrapper), not Impl, so recursion is safe.
-                    this.db.setKv("contacts", accountId, null);
-                    return this.syncGoogleContactsImpl(accountId);
-                }
                 if (!res.ok) {
                     const err = await res.text();
+                    // Expired sync token. The People API returns HTTP 400
+                    // FAILED_PRECONDITION with reason EXPIRED_SYNC_TOKEN
+                    // (older docs / older behavior said 410 — handle both
+                    // by inspecting the body). The documented recovery is:
+                    // drop the token and re-call WITHOUT it (full sync).
+                    // The `syncToken` guard prevents infinite recursion if a
+                    // tokenless full sync itself somehow returns this.
+                    if (syncToken && /EXPIRED_SYNC_TOKEN|sync token is expired/i.test(err)) {
+                        console.log(`  [contacts] ${accountId}: sync token expired — clearing for full resync`);
+                        this.db.setKv("contacts", accountId, null);
+                        return this.syncGoogleContactsImpl(accountId);
+                    }
                     console.error(`  [contacts] API error for ${accountId}: ${res.status} ${err}`);
                     return changed;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-imap",
-  "version": "0.1.49",
+  "version": "0.1.51",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@bobfrankston/mailx-types": "^0.1.14",
+    "@bobfrankston/mailx-types": "^0.1.15",
     "@bobfrankston/mailx-settings": "^0.1.17",
     "@bobfrankston/mailx-store": "^0.1.28",
     "@bobfrankston/iflow-direct": "^0.1.50",
@@ -37,7 +37,7 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/mailx-types": "^0.1.14",
+      "@bobfrankston/mailx-types": "^0.1.15",
       "@bobfrankston/mailx-settings": "^0.1.17",
       "@bobfrankston/mailx-store": "^0.1.28",
       "@bobfrankston/iflow-direct": "^0.1.50",