@bobfrankston/gcards 0.1.32 → 0.1.34

package/gcards.ts

@@ -179,7 +179,16 @@ interface DeletedIndex {
 function loadDeleted(paths: UserPaths): DeletedIndex {
     if (fs.existsSync(paths.deletedFile)) {
         try {
-            return parseJsonc(fs.readFileSync(paths.deletedFile, 'utf-8'));
+            const parsed = parseJsonc(fs.readFileSync(paths.deletedFile, 'utf-8'));
+            if (!parsed || typeof parsed !== 'object') {
+                console.warn(`Warning: ${paths.deletedFile} is not a valid object, returning empty deleted index`);
+                return { deleted: {} };
+            }
+            if (!parsed.deleted || typeof parsed.deleted !== 'object') {
+                console.warn(`Warning: ${paths.deletedFile} missing or invalid deleted field, initializing empty`);
+                parsed.deleted = {};
+            }
+            return parsed as DeletedIndex;
         } catch (e: any) {
             throw new Error(`Failed to parse ${paths.deletedFile}: ${e.message}`);
         }
@@ -228,7 +237,16 @@ interface PhotosIndex {
 function loadPhotos(paths: UserPaths): PhotosIndex {
     if (fs.existsSync(paths.photosFile)) {
         try {
-            return parseJsonc(fs.readFileSync(paths.photosFile, 'utf-8'));
+            const parsed = parseJsonc(fs.readFileSync(paths.photosFile, 'utf-8'));
+            if (!parsed || typeof parsed !== 'object') {
+                console.warn(`Warning: ${paths.photosFile} is not a valid object, returning empty photos index`);
+                return { photos: {} };
+            }
+            if (!parsed.photos || typeof parsed.photos !== 'object') {
+                console.warn(`Warning: ${paths.photosFile} missing or invalid photos field, initializing empty`);
+                parsed.photos = {};
+            }
+            return parsed as PhotosIndex;
         } catch (e: any) {
             throw new Error(`Failed to parse ${paths.photosFile}: ${e.message}`);
         }
@@ -1262,20 +1280,20 @@ async function pushContacts(user: string, options: { yes: boolean; verbose: bool
             await sleep(1500);  // Google tightened limits - need ~1.5s between ops
         } catch (error: any) {
             const fileName = path.basename(change.filePath);
-            const errorMsg = `${fileName}: ${error.message}`;
+            const errorMsg = `${change.displayName} (${fileName}): ${error.message}`;
             console.log(` ERROR: ${error.message}`);
             problems.push(errorMsg);
             errorCount++;
 
             // Check for etag mismatch - needs resync
             if (error.message?.includes('FAILED_PRECONDITION') || error.message?.includes('etag')) {
-                console.log(`    → Contact changed on Google. Run 'gcards sync' then retry.`);
+                console.log(`    → ${change.displayName} changed on Google. Run 'gcards sync' then retry.`);
                 continue;
             }
 
             // Check for 404 - contact deleted on server, remove locally
             if (error.message?.includes('404') || error.message?.includes('NOT_FOUND')) {
-                console.log(`    → Contact deleted on Google. Removing local copy.`);
+                console.log(`    → ${change.displayName} deleted on Google. Removing local copy.`);
                 // Move to deleted folder
                 if (fs.existsSync(change.filePath)) {
                     const id = path.basename(change.filePath, '.json');

package/glib/gutils.ts

@@ -84,7 +84,17 @@ export function ensureUserDir(user: string): void {
 export function loadIndex(paths: UserPaths): ContactIndex {
     if (fs.existsSync(paths.indexFile)) {
         try {
-            return parseJsonc(fs.readFileSync(paths.indexFile, 'utf-8'));
+            const parsed = parseJsonc(fs.readFileSync(paths.indexFile, 'utf-8'));
+            // Ensure contacts field exists
+            if (!parsed || typeof parsed !== 'object') {
+                console.warn(`Warning: ${paths.indexFile} is not a valid object, returning empty index`);
+                return { contacts: {}, lastSync: '' };
+            }
+            if (!parsed.contacts || typeof parsed.contacts !== 'object') {
+                console.warn(`Warning: ${paths.indexFile} missing or invalid contacts field, initializing empty`);
+                parsed.contacts = {};
+            }
+            return parsed as ContactIndex;
         } catch (e: any) {
             throw new Error(`Failed to parse ${paths.indexFile}: ${e.message}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/gcards",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "Google Contacts cleanup and management tool",
   "type": "module",
   "main": "gcards.ts",