zen-fs-config 0.3.13 → 0.3.14

package/dist/index.js

@@ -422,38 +422,44 @@ registerBackend("GitHub", async (options) => {
 });
 registerBackend("Gitee", async (options) => {
   const zenGitee = await import("zen-fs-gitee");
-  const { GiteeAPI } = await import("zen-fs-gitee/dist/gitee-api.js");
-  const originalGetTree = GiteeAPI.prototype.getTree;
-  GiteeAPI.prototype.getTree = async function(recursive = true) {
+  const { GiteeFS } = zenGitee;
+  const origInit = GiteeFS.prototype.init;
+  const patched = /* @__PURE__ */ new WeakSet();
+  GiteeFS.prototype.init = async function() {
+    let firstErr;
     try {
-      return await originalGetTree.call(this, recursive);
+      return await origInit.call(this);
     } catch (err) {
       if (!err.message?.includes("404") && !err.message?.includes("Tree not found")) {
         throw err;
       }
+      firstErr = err;
     }
-    console.log(`[Gitee] getTree failed with branch="${this.branch}", resolving to SHA...`);
-    const baseUrl = this.baseUrl || "https://gitee.com/api/v5";
-    const sep = "?";
-    const auth = `access_token=${this.token}`;
-    const branchUrl = `${baseUrl}/repos/${this.owner}/${this.repo}/branches/${this.branch}${sep}${auth}`;
+    if (patched.has(this)) throw firstErr;
+    patched.add(this);
+    console.log(`[Gitee] init failed with branch="${this.api.branch}", resolving to SHA...`);
+    const baseUrl = this.api.baseUrl || "https://gitee.com/api/v5";
+    const auth = `access_token=${this.api.token}`;
+    const branchUrl = `${baseUrl}/repos/${this.api.owner}/${this.api.repo}/branches/${this.api.branch}?${auth}`;
     const branchRes = await fetch(branchUrl);
-    if (!branchRes.ok) throw new Error(`Gitee: branch "${this.branch}" not found (${branchRes.status})`);
+    if (!branchRes.ok) throw new Error(`Gitee: branch "${this.api.branch}" not found (${branchRes.status})`);
     const branchData = await branchRes.json();
     const commitSha = branchData.commit?.sha;
-    if (!commitSha) throw new Error(`Gitee: could not get commit SHA for branch "${this.branch}"`);
-    const commitUrl = `${baseUrl}/repos/${this.owner}/${this.repo}/git/commits/${commitSha}${sep}${auth}`;
+    if (!commitSha) throw new Error(`Gitee: could not get commit SHA for branch "${this.api.branch}"`);
+    const commitUrl = `${baseUrl}/repos/${this.api.owner}/${this.api.repo}/git/commits/${commitSha}?${auth}`;
     const commitRes = await fetch(commitUrl);
     if (!commitRes.ok) throw new Error(`Gitee: commit ${commitSha} not found (${commitRes.status})`);
     const commitData = await commitRes.json();
     const treeSha = commitData.tree?.sha;
     if (!treeSha) throw new Error(`Gitee: could not get tree SHA from commit ${commitSha}`);
-    console.log(`[Gitee] Resolved branch="${this.branch}" \u2192 commit=${commitSha.slice(0, 8)} \u2192 tree=${treeSha.slice(0, 8)}`);
-    const treeUrl = `${baseUrl}/repos/${this.owner}/${this.repo}/git/trees/${treeSha}${sep}recursive=${recursive ? 1 : 0}&${auth}`;
-    const treeRes = await fetch(treeUrl);
-    if (!treeRes.ok) throw new Error(`Gitee: tree ${treeSha} not found (${treeRes.status})`);
-    const treeData = await treeRes.json();
-    return treeData.tree || [];
+    const realBranch = this.api.branch;
+    this.api.branch = treeSha;
+    console.log(`[Gitee] Resolved branch="${realBranch}" \u2192 commit=${commitSha.slice(0, 8)} \u2192 tree=${treeSha.slice(0, 8)}`);
+    try {
+      return await origInit.call(this);
+    } finally {
+      this.api.branch = realBranch;
+    }
   };
   return wrapZenFSFileSystem({
     backend: zenGitee.Gitee,

package/dist/index.mjs

@@ -375,38 +375,44 @@ registerBackend("GitHub", async (options) => {
 });
 registerBackend("Gitee", async (options) => {
   const zenGitee = await import("zen-fs-gitee");
-  const { GiteeAPI } = await import("zen-fs-gitee/dist/gitee-api.js");
-  const originalGetTree = GiteeAPI.prototype.getTree;
-  GiteeAPI.prototype.getTree = async function(recursive = true) {
+  const { GiteeFS } = zenGitee;
+  const origInit = GiteeFS.prototype.init;
+  const patched = /* @__PURE__ */ new WeakSet();
+  GiteeFS.prototype.init = async function() {
+    let firstErr;
     try {
-      return await originalGetTree.call(this, recursive);
+      return await origInit.call(this);
     } catch (err) {
       if (!err.message?.includes("404") && !err.message?.includes("Tree not found")) {
         throw err;
       }
+      firstErr = err;
     }
-    console.log(`[Gitee] getTree failed with branch="${this.branch}", resolving to SHA...`);
-    const baseUrl = this.baseUrl || "https://gitee.com/api/v5";
-    const sep = "?";
-    const auth = `access_token=${this.token}`;
-    const branchUrl = `${baseUrl}/repos/${this.owner}/${this.repo}/branches/${this.branch}${sep}${auth}`;
+    if (patched.has(this)) throw firstErr;
+    patched.add(this);
+    console.log(`[Gitee] init failed with branch="${this.api.branch}", resolving to SHA...`);
+    const baseUrl = this.api.baseUrl || "https://gitee.com/api/v5";
+    const auth = `access_token=${this.api.token}`;
+    const branchUrl = `${baseUrl}/repos/${this.api.owner}/${this.api.repo}/branches/${this.api.branch}?${auth}`;
     const branchRes = await fetch(branchUrl);
-    if (!branchRes.ok) throw new Error(`Gitee: branch "${this.branch}" not found (${branchRes.status})`);
+    if (!branchRes.ok) throw new Error(`Gitee: branch "${this.api.branch}" not found (${branchRes.status})`);
     const branchData = await branchRes.json();
     const commitSha = branchData.commit?.sha;
-    if (!commitSha) throw new Error(`Gitee: could not get commit SHA for branch "${this.branch}"`);
-    const commitUrl = `${baseUrl}/repos/${this.owner}/${this.repo}/git/commits/${commitSha}${sep}${auth}`;
+    if (!commitSha) throw new Error(`Gitee: could not get commit SHA for branch "${this.api.branch}"`);
+    const commitUrl = `${baseUrl}/repos/${this.api.owner}/${this.api.repo}/git/commits/${commitSha}?${auth}`;
     const commitRes = await fetch(commitUrl);
     if (!commitRes.ok) throw new Error(`Gitee: commit ${commitSha} not found (${commitRes.status})`);
     const commitData = await commitRes.json();
     const treeSha = commitData.tree?.sha;
     if (!treeSha) throw new Error(`Gitee: could not get tree SHA from commit ${commitSha}`);
-    console.log(`[Gitee] Resolved branch="${this.branch}" \u2192 commit=${commitSha.slice(0, 8)} \u2192 tree=${treeSha.slice(0, 8)}`);
-    const treeUrl = `${baseUrl}/repos/${this.owner}/${this.repo}/git/trees/${treeSha}${sep}recursive=${recursive ? 1 : 0}&${auth}`;
-    const treeRes = await fetch(treeUrl);
-    if (!treeRes.ok) throw new Error(`Gitee: tree ${treeSha} not found (${treeRes.status})`);
-    const treeData = await treeRes.json();
-    return treeData.tree || [];
+    const realBranch = this.api.branch;
+    this.api.branch = treeSha;
+    console.log(`[Gitee] Resolved branch="${realBranch}" \u2192 commit=${commitSha.slice(0, 8)} \u2192 tree=${treeSha.slice(0, 8)}`);
+    try {
+      return await origInit.call(this);
+    } finally {
+      this.api.branch = realBranch;
+    }
   };
   return wrapZenFSFileSystem({
     backend: zenGitee.Gitee,

package/package.json

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