zen-fs-config 0.5.40 → 0.5.41

package/dist/{backend-registry-ZFTXH537.mjs → backend-registry-RBKWNJZI.mjs}

@@ -9,7 +9,7 @@ import {
   registerBackend,
   unregisterBackend,
   wrapZenFSFileSystem
-} from "./chunk-NSEXSKVW.mjs";
+} from "./chunk-S2S3XBK2.mjs";
 export {
   createBackend,
   getAccountFields,

package/dist/{chunk-NSEXSKVW.mjs → chunk-S2S3XBK2.mjs}

@@ -277,9 +277,9 @@ registerBackend("GitHub", async (options) => {
 registerBackend("Gitee", async (options) => {
   const _gt = await importOptionalBackend("zen-fs-gitee");
   const Gitee = _gt?.Gitee ?? _gt?.default;
-  if (typeof Gitee !== "function") {
+  if (!Gitee || typeof Gitee !== "function" && typeof Gitee.create !== "function") {
     throw new Error(
-      `Backend package "zen-fs-gitee" loaded, but its Gitee export is not a constructor (typeof=${typeof Gitee}). Load its UMD bundle so it exposes the global "ZenFSGitee".`
+      `Backend package "zen-fs-gitee" loaded, but its Gitee export is not a usable backend (typeof=${typeof Gitee}). Load its UMD bundle so it exposes the global "ZenFSGitee".`
     );
   }
   return wrapZenFSFileSystem({
@@ -306,6 +306,39 @@ registerBackend("Gitee", async (options) => {
   // identity = the Git repo location
   identityFields: ["owner", "repo", "branch", "baseUrl"]
 });
+async function resolveRemoteStorageHref(href) {
+  const raw = String(href ?? "").trim();
+  if (!raw) throw new Error("RemoteStorage href is required.");
+  if (/^[a-z][a-z0-9+.-]*:\/\//i.test(raw)) return raw.replace(/\/+$/, "");
+  const match = raw.match(/^(?:acct:)?([^@/]+)@([^@/]+)$/);
+  if (!match) {
+    throw new Error(
+      `RemoteStorage href "${raw}" is neither an absolute URL nor a user address (user@domain).`
+    );
+  }
+  const user = match[1];
+  const domain = match[2];
+  const webfingerUrl = `https://${domain}/.well-known/webfinger?resource=acct:${encodeURIComponent(user)}@${encodeURIComponent(domain)}`;
+  let response;
+  try {
+    response = await globalThis.fetch(webfingerUrl, {
+      headers: { Accept: "application/jrd+json, application/json" }
+    });
+  } catch (err) {
+    throw new Error(
+      `RemoteStorage WebFinger request failed (${webfingerUrl}): ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+  if (!response.ok) {
+    throw new Error(`RemoteStorage WebFinger lookup failed (HTTP ${response.status}): ${webfingerUrl}`);
+  }
+  const jrd = await response.json();
+  const link = (jrd?.links ?? []).find(
+    (item) => item && item.rel === "http://tools.ietf.org/id/draft-dejong-remotestorage" && item.href
+  );
+  if (!link) throw new Error(`WebFinger response has no RemoteStorage link: ${webfingerUrl}`);
+  return String(link.href).replace(/\/+$/, "");
+}
 registerBackend("RemoteStorage", async (options) => {
   const _rs = await importOptionalBackend("zen-fs-remotestoragejs");
   const RemoteStorageFileSystem = _rs?.RemoteStorageFileSystem ?? _rs?.default ?? (typeof _rs === "function" ? _rs : void 0);
@@ -315,7 +348,7 @@ registerBackend("RemoteStorage", async (options) => {
     );
   }
   return new RemoteStorageFileSystem({
-    href: options.href,
+    href: await resolveRemoteStorageHref(options.href),
     token: options.token,
     basePath: options.basePath || void 0,
     preciseMtime: true,
@@ -326,7 +359,7 @@ registerBackend("RemoteStorage", async (options) => {
   label: "RemoteStorage",
   icon: "\u{1F4E1}",
   fields: [
-    { key: "href", label: "User Address (href)", type: "text", placeholder: "user@5apps.com", required: true },
+    { key: "href", label: "User Address / Storage URL (href)", type: "text", placeholder: "user@5apps.com \u6216 https://storage.5apps.com/user", required: true },
     { key: "token", label: "Bearer Token", type: "password", placeholder: "rs-xxxxxxxx", required: true },
     { key: "basePath", label: "Base Path", type: "text", placeholder: "/zen-fs-config/" }
   ],

package/dist/index.js

@@ -215,6 +215,39 @@ async function importOptionalBackend(pkg) {
     );
   }
 }
+async function resolveRemoteStorageHref(href) {
+  const raw = String(href ?? "").trim();
+  if (!raw) throw new Error("RemoteStorage href is required.");
+  if (/^[a-z][a-z0-9+.-]*:\/\//i.test(raw)) return raw.replace(/\/+$/, "");
+  const match = raw.match(/^(?:acct:)?([^@/]+)@([^@/]+)$/);
+  if (!match) {
+    throw new Error(
+      `RemoteStorage href "${raw}" is neither an absolute URL nor a user address (user@domain).`
+    );
+  }
+  const user = match[1];
+  const domain = match[2];
+  const webfingerUrl = `https://${domain}/.well-known/webfinger?resource=acct:${encodeURIComponent(user)}@${encodeURIComponent(domain)}`;
+  let response;
+  try {
+    response = await globalThis.fetch(webfingerUrl, {
+      headers: { Accept: "application/jrd+json, application/json" }
+    });
+  } catch (err) {
+    throw new Error(
+      `RemoteStorage WebFinger request failed (${webfingerUrl}): ${err instanceof Error ? err.message : String(err)}`
+    );
+  }
+  if (!response.ok) {
+    throw new Error(`RemoteStorage WebFinger lookup failed (HTTP ${response.status}): ${webfingerUrl}`);
+  }
+  const jrd = await response.json();
+  const link = (jrd?.links ?? []).find(
+    (item) => item && item.rel === "http://tools.ietf.org/id/draft-dejong-remotestorage" && item.href
+  );
+  if (!link) throw new Error(`WebFinger response has no RemoteStorage link: ${webfingerUrl}`);
+  return String(link.href).replace(/\/+$/, "");
+}
 var registry, metadataRegistry, inMemoryCounter, _memCache, OPTIONAL_BACKEND_GLOBALS;
 var init_backend_registry = __esm({
   "src/backend-registry.ts"() {
@@ -326,9 +359,9 @@ var init_backend_registry = __esm({
     registerBackend("Gitee", async (options) => {
       const _gt = await importOptionalBackend("zen-fs-gitee");
       const Gitee = _gt?.Gitee ?? _gt?.default;
-      if (typeof Gitee !== "function") {
+      if (!Gitee || typeof Gitee !== "function" && typeof Gitee.create !== "function") {
         throw new Error(
-          `Backend package "zen-fs-gitee" loaded, but its Gitee export is not a constructor (typeof=${typeof Gitee}). Load its UMD bundle so it exposes the global "ZenFSGitee".`
+          `Backend package "zen-fs-gitee" loaded, but its Gitee export is not a usable backend (typeof=${typeof Gitee}). Load its UMD bundle so it exposes the global "ZenFSGitee".`
         );
       }
       return wrapZenFSFileSystem({
@@ -364,7 +397,7 @@ var init_backend_registry = __esm({
         );
       }
       return new RemoteStorageFileSystem({
-        href: options.href,
+        href: await resolveRemoteStorageHref(options.href),
         token: options.token,
         basePath: options.basePath || void 0,
         preciseMtime: true,
@@ -375,7 +408,7 @@ var init_backend_registry = __esm({
       label: "RemoteStorage",
       icon: "\u{1F4E1}",
       fields: [
-        { key: "href", label: "User Address (href)", type: "text", placeholder: "user@5apps.com", required: true },
+        { key: "href", label: "User Address / Storage URL (href)", type: "text", placeholder: "user@5apps.com \u6216 https://storage.5apps.com/user", required: true },
         { key: "token", label: "Bearer Token", type: "password", placeholder: "rs-xxxxxxxx", required: true },
         { key: "basePath", label: "Base Path", type: "text", placeholder: "/zen-fs-config/" }
       ],
@@ -1418,6 +1451,12 @@ function identityOptions(type, options) {
   for (const f of fields) {
     if (options && options[f] !== void 0) subset[f] = options[f];
   }
+  if (type === "Gitee" || type === "GitHub") {
+    const defaultEndpoint = type === "Gitee" ? "https://gitee.com/api/v5" : "https://api.github.com";
+    const raw = options && options.baseUrl;
+    const value = typeof raw === "string" && raw.trim() !== "" ? raw : defaultEndpoint;
+    subset["baseUrl"] = value.replace(/\/+$/, "");
+  }
   return subset;
 }
 function backendDedupKey(desc) {
@@ -2808,10 +2847,15 @@ var ConfigRepo = class {
     }
     const descPath = this.appDataGroupFilePath(id);
     try {
-      await this.cachedFS.unlink(descPath);
-    } catch {
+      await this.deleteFile(descPath);
+    } catch (err) {
+      log2.log(`[ConfigRepo] removeAppDataGroup: deleteFile failed for "${id}":`, err);
+      try {
+        await this.cachedFS.unlink(descPath);
+      } catch {
+      }
+      await this.unlinkVersionSidecar(this.cachedFS, descPath);
     }
-    await this.unlinkVersionSidecar(this.cachedFS, descPath);
     log2.log(`[ConfigRepo] removeAppDataGroup: "${id}" removed`);
   }
   async listAccountBackends() {
@@ -3194,12 +3238,25 @@ async function connect(appId, options = {}) {
       onConflict: options.onConflict,
       syncPollIntervalMs: options.syncPollIntervalMs
     });
-    const dataGroup2 = await repo2.createAppDataGroup("default", []);
+    const appDataGroups2 = [];
+    const descriptors2 = await repo2.listAppDataGroups();
+    for (const d of descriptors2) {
+      try {
+        appDataGroups2.push(await repo2.getAppDataGroup(d.id));
+      } catch (err) {
+        log3(`connect: failed to load app data group "${d.id}":`, err);
+      }
+    }
+    let dataGroup2 = appDataGroups2[0];
+    if (!dataGroup2) {
+      dataGroup2 = await repo2.createAppDataGroup("default", []);
+      appDataGroups2.push(dataGroup2);
+    }
     return {
       groupType: options.groupType ?? "config-sync",
       repo: repo2,
       dataGroup: dataGroup2,
-      appDataGroups: [dataGroup2]
+      appDataGroups: appDataGroups2
     };
   }
   const { type, options: backendOptions } = options.backendInfo;

package/dist/index.mjs

@@ -9,7 +9,7 @@ import {
   registerBackend,
   unregisterBackend,
   wrapZenFSFileSystem
-} from "./chunk-NSEXSKVW.mjs";
+} from "./chunk-S2S3XBK2.mjs";
 
 // src/config-repo.ts
 import {
@@ -351,7 +351,7 @@ function registerFolderBackend() {
       const pathMod = await import("path");
       const dir = options.path;
       const store = new FolderStore({ path: dir, label: options.label, fs, pathMod });
-      return (await import("./backend-registry-ZFTXH537.mjs")).wrapZenFSFileSystem({ backend: FolderBackend, path: dir, label: options.label });
+      return (await import("./backend-registry-RBKWNJZI.mjs")).wrapZenFSFileSystem({ backend: FolderBackend, path: dir, label: options.label });
     },
     {
       type: "Folder",
@@ -911,6 +911,12 @@ function identityOptions(type, options) {
   for (const f of fields) {
     if (options && options[f] !== void 0) subset[f] = options[f];
   }
+  if (type === "Gitee" || type === "GitHub") {
+    const defaultEndpoint = type === "Gitee" ? "https://gitee.com/api/v5" : "https://api.github.com";
+    const raw = options && options.baseUrl;
+    const value = typeof raw === "string" && raw.trim() !== "" ? raw : defaultEndpoint;
+    subset["baseUrl"] = value.replace(/\/+$/, "");
+  }
   return subset;
 }
 function backendDedupKey(desc) {
@@ -2301,10 +2307,15 @@ var ConfigRepo = class {
     }
     const descPath = this.appDataGroupFilePath(id);
     try {
-      await this.cachedFS.unlink(descPath);
-    } catch {
+      await this.deleteFile(descPath);
+    } catch (err) {
+      log2.log(`[ConfigRepo] removeAppDataGroup: deleteFile failed for "${id}":`, err);
+      try {
+        await this.cachedFS.unlink(descPath);
+      } catch {
+      }
+      await this.unlinkVersionSidecar(this.cachedFS, descPath);
     }
-    await this.unlinkVersionSidecar(this.cachedFS, descPath);
     log2.log(`[ConfigRepo] removeAppDataGroup: "${id}" removed`);
   }
   async listAccountBackends() {
@@ -2686,12 +2697,25 @@ async function connect(appId, options = {}) {
       onConflict: options.onConflict,
       syncPollIntervalMs: options.syncPollIntervalMs
     });
-    const dataGroup2 = await repo2.createAppDataGroup("default", []);
+    const appDataGroups2 = [];
+    const descriptors2 = await repo2.listAppDataGroups();
+    for (const d of descriptors2) {
+      try {
+        appDataGroups2.push(await repo2.getAppDataGroup(d.id));
+      } catch (err) {
+        log3(`connect: failed to load app data group "${d.id}":`, err);
+      }
+    }
+    let dataGroup2 = appDataGroups2[0];
+    if (!dataGroup2) {
+      dataGroup2 = await repo2.createAppDataGroup("default", []);
+      appDataGroups2.push(dataGroup2);
+    }
     return {
       groupType: options.groupType ?? "config-sync",
       repo: repo2,
       dataGroup: dataGroup2,
-      appDataGroups: [dataGroup2]
+      appDataGroups: appDataGroups2
     };
   }
   const { type, options: backendOptions } = options.backendInfo;

package/dist/zen-fs-config.js

@@ -24528,6 +24528,39 @@ var ZenFSConfig = (() => {
       );
     }
   }
+  async function resolveRemoteStorageHref(href) {
+    const raw = String(href ?? "").trim();
+    if (!raw) throw new Error("RemoteStorage href is required.");
+    if (/^[a-z][a-z0-9+.-]*:\/\//i.test(raw)) return raw.replace(/\/+$/, "");
+    const match = raw.match(/^(?:acct:)?([^@/]+)@([^@/]+)$/);
+    if (!match) {
+      throw new Error(
+        `RemoteStorage href "${raw}" is neither an absolute URL nor a user address (user@domain).`
+      );
+    }
+    const user = match[1];
+    const domain = match[2];
+    const webfingerUrl = `https://${domain}/.well-known/webfinger?resource=acct:${encodeURIComponent(user)}@${encodeURIComponent(domain)}`;
+    let response;
+    try {
+      response = await globalThis.fetch(webfingerUrl, {
+        headers: { Accept: "application/jrd+json, application/json" }
+      });
+    } catch (err2) {
+      throw new Error(
+        `RemoteStorage WebFinger request failed (${webfingerUrl}): ${err2 instanceof Error ? err2.message : String(err2)}`
+      );
+    }
+    if (!response.ok) {
+      throw new Error(`RemoteStorage WebFinger lookup failed (HTTP ${response.status}): ${webfingerUrl}`);
+    }
+    const jrd = await response.json();
+    const link5 = (jrd?.links ?? []).find(
+      (item) => item && item.rel === "http://tools.ietf.org/id/draft-dejong-remotestorage" && item.href
+    );
+    if (!link5) throw new Error(`WebFinger response has no RemoteStorage link: ${webfingerUrl}`);
+    return String(link5.href).replace(/\/+$/, "");
+  }
   var registry, metadataRegistry, inMemoryCounter, _memCache, OPTIONAL_BACKEND_GLOBALS;
   var init_backend_registry = __esm({
     "src/backend-registry.ts"() {
@@ -24639,9 +24672,9 @@ var ZenFSConfig = (() => {
       registerBackend("Gitee", async (options) => {
         const _gt = await importOptionalBackend("zen-fs-gitee");
         const Gitee = _gt?.Gitee ?? _gt?.default;
-        if (typeof Gitee !== "function") {
+        if (!Gitee || typeof Gitee !== "function" && typeof Gitee.create !== "function") {
           throw new Error(
-            `Backend package "zen-fs-gitee" loaded, but its Gitee export is not a constructor (typeof=${typeof Gitee}). Load its UMD bundle so it exposes the global "ZenFSGitee".`
+            `Backend package "zen-fs-gitee" loaded, but its Gitee export is not a usable backend (typeof=${typeof Gitee}). Load its UMD bundle so it exposes the global "ZenFSGitee".`
           );
         }
         return wrapZenFSFileSystem({
@@ -24677,7 +24710,7 @@ var ZenFSConfig = (() => {
           );
         }
         return new RemoteStorageFileSystem({
-          href: options.href,
+          href: await resolveRemoteStorageHref(options.href),
           token: options.token,
           basePath: options.basePath || void 0,
           preciseMtime: true,
@@ -24688,7 +24721,7 @@ var ZenFSConfig = (() => {
         label: "RemoteStorage",
         icon: "\u{1F4E1}",
         fields: [
-          { key: "href", label: "User Address (href)", type: "text", placeholder: "user@5apps.com", required: true },
+          { key: "href", label: "User Address / Storage URL (href)", type: "text", placeholder: "user@5apps.com \u6216 https://storage.5apps.com/user", required: true },
           { key: "token", label: "Bearer Token", type: "password", placeholder: "rs-xxxxxxxx", required: true },
           { key: "basePath", label: "Base Path", type: "text", placeholder: "/zen-fs-config/" }
         ],
@@ -27351,6 +27384,12 @@ var ZenFSConfig = (() => {
     for (const f of fields) {
       if (options && options[f] !== void 0) subset[f] = options[f];
     }
+    if (type === "Gitee" || type === "GitHub") {
+      const defaultEndpoint = type === "Gitee" ? "https://gitee.com/api/v5" : "https://api.github.com";
+      const raw = options && options.baseUrl;
+      const value = typeof raw === "string" && raw.trim() !== "" ? raw : defaultEndpoint;
+      subset["baseUrl"] = value.replace(/\/+$/, "");
+    }
     return subset;
   }
   function backendDedupKey(desc) {
@@ -28741,10 +28780,15 @@ var ZenFSConfig = (() => {
       }
       const descPath = this.appDataGroupFilePath(id);
       try {
-        await this.cachedFS.unlink(descPath);
-      } catch {
+        await this.deleteFile(descPath);
+      } catch (err2) {
+        log6.log(`[ConfigRepo] removeAppDataGroup: deleteFile failed for "${id}":`, err2);
+        try {
+          await this.cachedFS.unlink(descPath);
+        } catch {
+        }
+        await this.unlinkVersionSidecar(this.cachedFS, descPath);
       }
-      await this.unlinkVersionSidecar(this.cachedFS, descPath);
       log6.log(`[ConfigRepo] removeAppDataGroup: "${id}" removed`);
     }
     async listAccountBackends() {
@@ -29127,12 +29171,25 @@ var ZenFSConfig = (() => {
         onConflict: options.onConflict,
         syncPollIntervalMs: options.syncPollIntervalMs
       });
-      const dataGroup2 = await repo2.createAppDataGroup("default", []);
+      const appDataGroups2 = [];
+      const descriptors2 = await repo2.listAppDataGroups();
+      for (const d of descriptors2) {
+        try {
+          appDataGroups2.push(await repo2.getAppDataGroup(d.id));
+        } catch (err2) {
+          log7(`connect: failed to load app data group "${d.id}":`, err2);
+        }
+      }
+      let dataGroup2 = appDataGroups2[0];
+      if (!dataGroup2) {
+        dataGroup2 = await repo2.createAppDataGroup("default", []);
+        appDataGroups2.push(dataGroup2);
+      }
       return {
         groupType: options.groupType ?? "config-sync",
         repo: repo2,
         dataGroup: dataGroup2,
-        appDataGroups: [dataGroup2]
+        appDataGroups: appDataGroups2
       };
     }
     const { type, options: backendOptions } = options.backendInfo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-fs-config",
-  "version": "0.5.40",
+  "version": "0.5.41",
   "description": "Distributed config management library built on ZenFS, zen-fs-cache, and zen-fs-sync",
   "main": "dist/index.js",
   "module": "dist/index.mjs",