@bobfrankston/gcards 0.1.18 → 0.1.20

package/gcards.code-workspace

@@ -0,0 +1,33 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "../../../projects/OAuth/OauthSupport"
+		}
+	],
+	"settings": {
+		"workbench.colorTheme": "Visual Studio 2019 Dark",
+		"workbench.colorCustomizations": {
+			"activityBar.activeBackground": "#0ae04a",
+			"activityBar.background": "#0ae04a",
+			"activityBar.foreground": "#15202b",
+			"activityBar.inactiveForeground": "#15202b99",
+			"activityBarBadge.background": "#9266f8",
+			"activityBarBadge.foreground": "#15202b",
+			"commandCenter.border": "#e7e7e799",
+			"sash.hoverBorder": "#0ae04a",
+			"statusBar.background": "#08af3a",
+			"statusBar.foreground": "#e7e7e7",
+			"statusBarItem.hoverBackground": "#0ae04a",
+			"statusBarItem.remoteBackground": "#08af3a",
+			"statusBarItem.remoteForeground": "#e7e7e7",
+			"titleBar.activeBackground": "#08af3a",
+			"titleBar.activeForeground": "#e7e7e7",
+			"titleBar.inactiveBackground": "#08af3a99",
+			"titleBar.inactiveForeground": "#e7e7e799"
+		},
+		"peacock.color": "#08af3a"
+	}
+}

package/gcards.ts

@@ -79,7 +79,9 @@ function cleanupEscapeHandler(): void {
         process.stdin.pause();
         process.stdin.removeAllListeners('data');
     }
-    process.stdin.unref();  // Allow Node to exit even if stdin is open
+    if (typeof process.stdin.unref === 'function') {
+        process.stdin.unref();  // Allow Node to exit even if stdin is open
+    }
 }
 
 async function getAccessToken(user: string, writeAccess = false, forceRefresh = false): Promise<string> {
@@ -297,8 +299,15 @@ async function fetchContactsWithRetry(
     });
 
     if (response.status === 410) {
-        console.log('Sync token expired, performing full sync...');
-        return fetchContactsWithRetry(accessToken, undefined, pageToken, 0);
+        throw new Error('SYNC_TOKEN_EXPIRED');
+    }
+
+    if (response.status === 400) {
+        const text = await response.text();
+        if (text.includes('EXPIRED_SYNC_TOKEN')) {
+            throw new Error('SYNC_TOKEN_EXPIRED');
+        }
+        throw new Error(`API error: ${response.status} ${text}`);
     }
 
     if (response.status === 429) {
@@ -391,12 +400,30 @@ async function syncContacts(user: string, options: { full: boolean; verbose: boo
     let deleted = 0;
     let conflicts = 0;
     let pageNum = 0;
+    let hasMore = true;
 
-    do {
+    while (hasMore) {
         pageNum++;
         process.stdout.write(`\rFetching page ${pageNum}... (${totalProcessed} contacts so far)`);
 
-        const response = await fetchContactsWithRetry(accessToken, syncToken || undefined, pageToken);
+        let response: GoogleConnectionsResponse;
+        try {
+            response = await fetchContactsWithRetry(accessToken, syncToken || undefined, pageToken);
+        } catch (err) {
+            if (err instanceof Error && err.message === 'SYNC_TOKEN_EXPIRED') {
+                console.log('\nSync token expired, restarting with full sync...');
+                syncToken = null;
+                pageToken = undefined;
+                pageNum = 0;
+                totalProcessed = 0;
+                added = 0;
+                updated = 0;
+                deleted = 0;
+                conflicts = 0;
+                continue;
+            }
+            throw err;
+        }
 
         if (response.connections) {
             for (const person of response.connections) {
@@ -520,7 +547,9 @@ async function syncContacts(user: string, options: { full: boolean; verbose: boo
             console.log('\n\nStopped by user. Progress saved.');
             break;
         }
-    } while (pageToken);
+
+        hasMore = !!pageToken;
+    }
 
     const activeContacts = Object.keys(index.contacts).length;
     const tombstones = Object.keys(deletedIndex.deleted).length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/gcards",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "Google Contacts cleanup and management tool",
   "type": "module",
   "main": "gcards.ts",
@@ -17,7 +17,8 @@
     "prerelease:local": "git add -A && (git diff-index --quiet HEAD || git commit -m \"Pre-release commit\")",
     "preversion": "npm run check && git add -A",
     "postversion": "git push && git push --tags",
-    "release": "npm whoami && npm run prerelease:local && npm version patch && npm publish --access public"
+    "release": "npm whoami && npm run prerelease:local && npm version patch && npm publish --access public",
+    "installer": "npm run release && npm install -g @bobfrankston/gcards"
   },
   "keywords": [
     "google",