@bobfrankston/mailx 1.0.291 → 1.0.292

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.291",
+  "version": "1.0.292",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.7",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.24",
-    "@bobfrankston/msger": "^0.1.324",
+    "@bobfrankston/msger": "^0.1.325",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -86,7 +86,7 @@
       "@bobfrankston/iflow-node": "^0.1.7",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.24",
-      "@bobfrankston/msger": "^0.1.324",
+      "@bobfrankston/msger": "^0.1.325",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-settings/cloud.d.ts

@@ -16,7 +16,10 @@
  * Dropbox (removed 2026-04-06): Never implemented — placeholder only.
  *   Would need Dropbox OAuth app, token management, and Dropbox API v2 calls.
  */
-/** Find the app-owned "mailx" folder, or create it. Returns folder ID. */
+/** Find the settings folder on GDrive, or create a flat "mailx" folder.
+ *  Supports nested paths from config (e.g. "home/.mailx") by walking each
+ *  segment. Falls back to the folderId in config if set, so a stale ID that
+ *  points to the wrong folder gets corrected on next lookup. */
 export declare function gDriveFindOrCreateFolder(): Promise<string | null>;
 export type CloudProvider = "gdrive" | "google" | "local";
 export interface CloudFile {

package/packages/mailx-settings/cloud.js

@@ -50,7 +50,10 @@ const GDRIVE_TOKEN_DIR = path.join(SETTINGS_DIR, "tokens", "gdrive");
 // drive.file: app can only see files it created. Safe, publishable without security audit.
 // All machines sharing the same OAuth client ID see the same files.
 const GDRIVE_SCOPES = "https://www.googleapis.com/auth/drive.file";
-const GDRIVE_FOLDER_NAME = "mailx";
+/** Default folder name when config.path isn't set. The actual folder name
+ *  is taken from pendingCloudConfig.path or readLocalConfig().sharedDir.path
+ *  so each user can use their own convention (e.g. "home/.mailx"). */
+const GDRIVE_FOLDER_NAME_DEFAULT = "mailx";
 // ── Token helpers ──
 async function getGoogleDriveToken() {
     const creds = findGoogleCredentials();
@@ -99,39 +102,85 @@ async function getGoogleDriveToken() {
     }
 }
 // ── Google Drive API (folder-ID based) ──
-/** Find the app-owned "mailx" folder, or create it. Returns folder ID. */
+/** Find a single folder by name, optionally inside a parent. */
+async function gDriveFindFolder(token, name, parentId) {
+    let query = `name='${name}' and mimeType='application/vnd.google-apps.folder' and trashed=false`;
+    if (parentId)
+        query += ` and '${parentId}' in parents`;
+    const res = await fetch(`https://www.googleapis.com/drive/v3/files?q=${encodeURIComponent(query)}&fields=files(id,name)`, {
+        headers: { Authorization: `Bearer ${token}` },
+    });
+    if (!res.ok) {
+        console.error(`  [cloud] gdrive folder search '${name}': ${res.status} ${res.statusText}`);
+        return null;
+    }
+    const data = await res.json();
+    return data.files?.[0]?.id || null;
+}
+/** Find the settings folder on GDrive, or create a flat "mailx" folder.
+ *  Supports nested paths from config (e.g. "home/.mailx") by walking each
+ *  segment. Falls back to the folderId in config if set, so a stale ID that
+ *  points to the wrong folder gets corrected on next lookup. */
 export async function gDriveFindOrCreateFolder() {
     const token = await getGoogleDriveToken();
     if (!token)
         return null;
+    // Read path from config — supports nested like "home/.mailx"
+    let cfgEntry = null;
     try {
-        // Search for existing folder (created by this OAuth client)
-        const query = `name='${GDRIVE_FOLDER_NAME}' and mimeType='application/vnd.google-apps.folder' and trashed=false`;
-        const res = await fetch(`https://www.googleapis.com/drive/v3/files?q=${encodeURIComponent(query)}&fields=files(id,name)`, {
-            headers: { Authorization: `Bearer ${token}` },
-        });
-        if (!res.ok) {
-            console.error(`  [cloud] gdrive folder search: ${res.status} ${res.statusText}`);
-            return null;
-        }
-        const data = await res.json();
-        if (data.files?.[0]) {
-            console.log(`  [cloud] Found existing '${GDRIVE_FOLDER_NAME}' folder: ${data.files[0].id}`);
-            return data.files[0].id;
+        const cfgPath = path.join(SETTINGS_DIR, "config.jsonc");
+        if (fs.existsSync(cfgPath)) {
+            const raw = fs.readFileSync(cfgPath, "utf-8").replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
+            cfgEntry = JSON.parse(raw).sharedDir;
         }
-        // Create folder
-        const createRes = await fetch("https://www.googleapis.com/drive/v3/files", {
-            method: "POST",
-            headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
-            body: JSON.stringify({ name: GDRIVE_FOLDER_NAME, mimeType: "application/vnd.google-apps.folder" }),
-        });
-        if (!createRes.ok) {
-            console.error(`  [cloud] gdrive folder create: ${createRes.status} ${createRes.statusText}`);
-            return null;
+    }
+    catch { /* ignore */ }
+    const cfgPath = (typeof cfgEntry === "object" && cfgEntry?.path) ? cfgEntry.path : GDRIVE_FOLDER_NAME_DEFAULT;
+    const segments = cfgPath.split(/[/\\]/).filter(Boolean);
+    try {
+        // Walk nested path segments: "home/.mailx" → find "home", then ".mailx" inside it
+        let parentId;
+        for (let i = 0; i < segments.length; i++) {
+            const seg = segments[i];
+            const found = await gDriveFindFolder(token, seg, parentId);
+            if (found) {
+                console.log(`  [cloud] Found folder '${seg}': ${found}${parentId ? ` (in ${parentId})` : ""}`);
+                parentId = found;
+            }
+            else if (i === segments.length - 1) {
+                // Last segment missing — create it (don't create intermediate folders)
+                const body = { name: seg, mimeType: "application/vnd.google-apps.folder" };
+                if (parentId)
+                    body.parents = [parentId];
+                const createRes = await fetch("https://www.googleapis.com/drive/v3/files", {
+                    method: "POST",
+                    headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" },
+                    body: JSON.stringify(body),
+                });
+                if (!createRes.ok) {
+                    console.error(`  [cloud] gdrive folder create '${seg}': ${createRes.status}`);
+                    return null;
+                }
+                const created = await createRes.json();
+                console.log(`  [cloud] Created '${seg}' folder: ${created.id}`);
+                parentId = created.id;
+            }
+            else {
+                // Intermediate segment missing — can't create the whole tree
+                console.error(`  [cloud] gdrive path '${cfgPath}': intermediate folder '${seg}' not found`);
+                // Fall back to flat search for the leaf name
+                const leafId = await gDriveFindFolder(token, segments[segments.length - 1]);
+                if (leafId) {
+                    console.log(`  [cloud] Fallback: found '${segments[segments.length - 1]}' at root: ${leafId}`);
+                    return leafId;
+                }
+                return null;
+            }
         }
-        const created = await createRes.json();
-        console.log(`  [cloud] Created '${GDRIVE_FOLDER_NAME}' folder: ${created.id}`);
-        return created.id;
+        if (parentId)
+            return parentId;
+        // Shouldn't reach here, but safety
+        return null;
     }
     catch (e) {
         console.error(`  [cloud] gdrive folder setup: ${e.message}`);