@deeplake/hivemind 0.7.75 → 0.7.77

package/hermes/bundle/graph-pull-worker.js

@@ -1094,12 +1094,39 @@ import { createHash as createHash2 } from "node:crypto";
 import { mkdirSync as mkdirSync6, renameSync as renameSync3, writeFileSync as writeFileSync5 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
 import { dirname as dirname3, join as join8 } from "node:path";
+
+// dist/src/graph/resolve/cross-file.js
+import { posix } from "node:path";
+
+// dist/src/graph/snapshot.js
 function graphsRoot() {
   return process.env.HIVEMIND_GRAPHS_HOME ?? join8(homedir5(), ".hivemind", "graphs");
 }
 function repoDir(repoKey) {
   return join8(graphsRoot(), repoKey);
 }
+function computeSnapshotSha256(snapshot) {
+  const stable = {
+    directed: snapshot.directed,
+    multigraph: snapshot.multigraph,
+    graph: snapshot.graph,
+    nodes: snapshot.nodes,
+    links: snapshot.links
+  };
+  return createHash2("sha256").update(canonicalJSON(stable)).digest("hex");
+}
+function canonicalJSON(value) {
+  return JSON.stringify(value, (_key, v) => {
+    if (v !== null && typeof v === "object" && !Array.isArray(v)) {
+      const sorted = {};
+      for (const k of Object.keys(v).sort()) {
+        sorted[k] = v[k];
+      }
+      return sorted;
+    }
+    return v;
+  });
+}
 
 // dist/src/graph/deeplake-pull.js
 function workTreeIdFor(cwd) {
@@ -1141,8 +1168,20 @@ async function pullSnapshot(cwd, deps = {}) {
   if (cloudPayload === null) {
     return errorOutcome("SELECT cloud row", new Error("invalid snapshot_jsonb payload"));
   }
+  let parsedSnapshot;
+  try {
+    parsedSnapshot = JSON.parse(cloudPayload);
+  } catch (err) {
+    return errorOutcome("parse cloud snapshot", err);
+  }
+  if (parsedSnapshot === null || typeof parsedSnapshot !== "object") {
+    return errorOutcome("parse cloud snapshot", new Error("snapshot not an object"));
+  }
+  if (!Array.isArray(parsedSnapshot.nodes) || !Array.isArray(parsedSnapshot.links)) {
+    return errorOutcome("parse cloud snapshot", new Error("snapshot missing nodes/links arrays"));
+  }
   if (cloudSha256 !== "") {
-    const computedSha = createHash3("sha256").update(cloudPayload).digest("hex");
+    const computedSha = computeSnapshotSha256(parsedSnapshot);
     if (cloudSha256 !== computedSha) {
       return errorOutcome("SELECT cloud row", new Error(`snapshot_sha256 mismatch (expected ${cloudSha256}, got ${computedSha})`));
     }