godprotocol 1.2.21 → 1.2.23

package/Objects/Manager.js

@@ -482,7 +482,10 @@ class Manager {
 
     address = `${acc}/${address}`;
 
-    let folder = await this.ds.folder(address, { account: acc });
+    let folder = await this.ds.folder(address, {
+      account: acc,
+      indexes: options.indexes,
+    });
 
     return folder;
   };

package/Objects/Oracle.js

@@ -205,25 +205,26 @@ class Oracle extends Handlers {
       let conf_repos = conf ? this.repo_object(conf.repositories, account) : [];
       let reps = await this.merge_repos(
         conf_repos,
-        await this.filter_repos(path)
+        await this.filter_repos(`.oracle/${path}`)
       );
+      conf = {
+        ...conf,
+        content,
+        repositories: reps.map((r) => r.repo._id || r.repo.get_id()),
+      };
 
-      await this.set_to_repos(
-        `.oracle/${path}`,
-        JSON.stringify({
-          ...conf,
-          content,
-          repositories: reps.map((r) => r.repo._id || r.repo.get_id()),
-        }),
-        { repos: reps }
-      );
+      this.configs[sli] = conf;
+
+      await this.set_to_repos(`.oracle/${path}`, JSON.stringify(conf), {
+        repos: reps,
+      });
     } else {
       conf = await this.get_config(address, true);
 
       let conf_repos = conf ? this.repo_object(conf.repositories, account) : [];
       let reps = await this.merge_repos(
         conf_repos,
-        await this.filter_repos(path)
+        await this.filter_repos(`.storage/${path}`)
       );
       await this.set_to_repos(`.storage/${path}`, content, { repos: reps });
     }
@@ -243,7 +244,7 @@ class Oracle extends Handlers {
       let conf_repos = conf ? this.repo_object(conf.repositories, account) : [];
       let reps = await this.merge_repos(
         conf_repos,
-        await this.filter_repos(path)
+        await this.filter_repos(`.storage/${path}`)
       );
 
       content = await this.get_from_repos(`.storage/${path}`, { repos: reps });

package/Objects/Repository.js

@@ -15,6 +15,7 @@ class Repository {
       obj.username = this.owner;
       obj.repo = this.repo;
       obj._id = `${this.owner}/${this.repo}`;
+      obj.branch = this.branch;
     }
 
     return obj;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "godprotocol",
-  "version": "1.2.21",
+  "version": "1.2.23",
   "description": "A distributed computing environment",
   "main": "Index.js",
   "scripts": {

package/repos/github.js

@@ -1,97 +1,185 @@
-import Repository from '../Objects/Repository.js'
+import Repository from "../Objects/Repository.js";
 
-class Github extends Repository{
-  constructor({ key, username, repo }) {
-    super('github')
-    
-    this.base_url = 'https://api.github.com';
+class Github extends Repository {
+  constructor({ key, username, repo, branch }) {
+    super("github");
+
+    this.base_url = "https://api.github.com";
     this.auth_token = key;
     this.owner = username;
     this.repo = repo;
+    this.branch = branch || "master";
   }
 
   // Headers for API calls
   get_headers = () => ({
     Authorization: `Bearer ${this.auth_token}`,
-    Accept: 'application/vnd.github.v3+json',
+    Accept: "application/vnd.github.v3+json",
   });
 
   // Write (create or update) a file
-  write_file = async (file_path, content, options={}) => {
-    const url = `${this.base_url}/repos/${this.owner}/${this.repo}/contents/${file_path}`;
-    let sha = null, exists;
+  write_file = async (file_path, content, options = {}) => {
+    let url = `${this.base_url}/repos/${this.owner}/${this.repo}/contents/${file_path}`;
+    let sha = null,
+      exists;
 
     // Check if file exists, get its SHA
-    try{
+    try {
       exists = await this.file_exists(file_path);
-      
+
       if (exists) {
-        const res = await fetch(url, { headers: this.get_headers() });
+        let res = await fetch(url, { headers: this.get_headers() });
         if (res.ok) {
-          const data = await res.json();
+          let data = await res.json();
           sha = data.sha;
         }
       }
-      if (options.just_exists) return exists
-    }catch(e){
-      console.log(e.message)
-      return 
+      if (options.just_exists) return exists;
+    } catch (e) {
+      console.log(e.message);
+      return;
     }
 
     // Build payload
     let body;
-    try{
+    try {
       body = {
-      message: exists ? 'Update file' : 'Create file',
-      content: Buffer.from(content).toString('base64'),
-      ...(sha && { sha }),
-    };
-    }catch(e){
+        message: exists ? "Update file" : "Create file",
+        content: Buffer.from(content).toString("base64"),
+        ...(sha && { sha }),
+      };
+    } catch (e) {}
 
-    }
-
-    try{
-      const response = await fetch(url, {
-        method: 'PUT',
+    try {
+      let response = await fetch(url, {
+        method: "PUT",
         headers: this.get_headers(),
         body: JSON.stringify(body),
       });
 
       return response.json();
-    }catch(e){
-      console.log(e.message)
+    } catch (e) {
+      console.log(e.message);
     }
-    
   };
 
   // Read a file
   read_file = async (file_path) => {
-    const url = `${this.base_url}/repos/${this.owner}/${this.repo}/contents/${file_path}`;
+    let url = `${this.base_url}/repos/${this.owner}/${this.repo}/contents/${file_path}`;
 
     let response;
-    try{
-      response = await fetch(url, { headers: this.get_headers() })
+    try {
+      response = await fetch(url, { headers: this.get_headers() });
 
       if (!response.ok) return null;
 
-      const fileData = await response.json();
-      return Buffer.from(fileData.content, 'base64').toString('utf-8');
-    }catch(e){
-      console.log(e.message)
+      let fileData = await response.json();
+      return Buffer.from(fileData.content, "base64").toString("utf-8");
+    } catch (e) {
+      console.log(e.message);
       return;
     }
   };
 
   // Check if file exists
   file_exists = async (file_path) => {
-    const url = `${this.base_url}/repos/${this.owner}/${this.repo}/contents/${file_path}`;
+    let url = `${this.base_url}/repos/${this.owner}/${this.repo}/contents/${file_path}`;
     try {
-      const response = await fetch(url, { headers: this.get_headers() });
+      let response = await fetch(url, { headers: this.get_headers() });
       return response.ok;
     } catch {
       return false;
     }
   };
+
+  // --- Delete File ---
+  delete_file = async (file_path, message = "Delete file") => {
+    let url = `${this.base_url}/repos/${this.owner}/${this.repo}/contents/${file_path}`;
+
+    try {
+      let res = await fetch(url, { headers: this.get_headers() });
+      if (!res.ok) throw new Error("File not found");
+      let data = await res.json();
+      let sha = data.sha;
+
+      let body = { message, sha };
+
+      let del = await fetch(url, {
+        method: "DELETE",
+        headers: this.get_headers(),
+        body: JSON.stringify(body),
+      });
+
+      if (!del.ok) {
+        let err = await del.text();
+        throw new Error(`Failed to delete file: ${err}`);
+      }
+
+      return await del.json();
+    } catch (e) {
+      console.log(e.message);
+      return null;
+    }
+  };
+
+  delete_folder = async (folder_path, message = "Delete folder") => {
+    let headers = this.get_headers();
+
+    // 1️⃣ Get the latest commit SHA
+    let refUrl = `${this.base_url}/repos/${this.owner}/${this.repo}/git/ref/heads/${this.branch}`;
+    let refRes = await fetch(refUrl, { headers });
+    let refData = await refRes.json();
+    let commitSha = refData.object.sha;
+
+    // 2️⃣ Get the tree of that commit
+    let commitUrl = `${this.base_url}/repos/${this.owner}/${this.repo}/git/commits/${commitSha}`;
+    let commitRes = await fetch(commitUrl, { headers });
+    let commitData = await commitRes.json();
+    let treeSha = commitData.tree.sha;
+
+    // 3️⃣ Get the full tree (recursive)
+    let treeUrl = `${this.base_url}/repos/${this.owner}/${this.repo}/git/trees/${treeSha}?recursive=1`;
+    let treeRes = await fetch(treeUrl, { headers });
+    let treeData = await treeRes.json();
+
+    // 4️⃣ Filter out the folder you want to delete
+    let filtered = treeData.tree.filter((t) => !t.path.startsWith(folder_path));
+
+    // 5️⃣ Create a new tree without that folder
+    let newTreeRes = await fetch(
+      `${this.base_url}/repos/${this.owner}/${this.repo}/git/trees`,
+      {
+        method: "POST",
+        headers,
+        body: JSON.stringify({ tree: filtered }),
+      }
+    );
+    let newTreeData = await newTreeRes.json();
+
+    // 6️⃣ Create a new commit pointing to the new tree
+    let newCommitRes = await fetch(
+      `${this.base_url}/repos/${this.owner}/${this.repo}/git/commits`,
+      {
+        method: "POST",
+        headers,
+        body: JSON.stringify({
+          message,
+          tree: newTreeData.sha,
+          parents: [commitSha],
+        }),
+      }
+    );
+    let newCommitData = await newCommitRes.json();
+
+    // 7️⃣ Update the branch ref
+    await fetch(refUrl, {
+      method: "PATCH",
+      headers,
+      body: JSON.stringify({ sha: newCommitData.sha }),
+    });
+
+    return { success: true, message: "Folder deleted via new commit" };
+  };
 }
 
 export default Github;