@dxos/client 2.33.9-dev.b6f4ca19 → 2.33.9-dev.d0ae5f95

package/dist/browser.js

@@ -93512,15 +93512,16 @@ var require_metadata_store = __commonJS({
     var protocols_1 = require("@dxos/protocols");
     exports.STORAGE_VERSION = 1;
     var log3 = (0, debug_1.default)("dxos:snapshot-store");
+    var emptyEchoMetadata = () => ({
+      version: exports.STORAGE_VERSION,
+      parties: [],
+      created: new Date(),
+      updated: new Date()
+    });
     var MetadataStore = class {
       constructor(_directory) {
         this._directory = _directory;
-        this._metadata = {
-          version: exports.STORAGE_VERSION,
-          parties: [],
-          created: new Date(),
-          updated: new Date()
-        };
+        this._metadata = emptyEchoMetadata();
       }
       get version() {
         var _a;
@@ -93533,18 +93534,22 @@ var require_metadata_store = __commonJS({
       async load() {
         const file = this._directory.createOrOpen("EchoMetadata");
         try {
-          const { size } = await file.stat();
-          if (size === 0) {
+          const { size: fileLength } = await file.stat();
+          if (fileLength < 4) {
             return;
           }
-          const data = await file.read(0, size);
+          const dataSize = fromBytesInt32(await file.read(0, 4));
+          log3(`Load: data size ${dataSize}`);
+          {
+            if (fileLength < dataSize + 4) {
+              throw new Error("Metadata storage is corrupted");
+            }
+          }
+          const data = await file.read(4, dataSize);
           this._metadata = echo_protocol_1.schema.getCodecForType("dxos.echo.metadata.EchoMetadata").decode(data);
         } catch (err) {
-          if (err.code === "ENOENT") {
-            return;
-          } else {
-            throw err;
-          }
+          log3(`Error loading metadata: ${err}`);
+          this._metadata = emptyEchoMetadata();
         } finally {
           await file.close();
         }
@@ -93560,18 +93565,9 @@ var require_metadata_store = __commonJS({
         const file = this._directory.createOrOpen("EchoMetadata");
         try {
           const encoded = Buffer.from(echo_protocol_1.schema.getCodecForType("dxos.echo.metadata.EchoMetadata").encode(data));
-          await file.write(0, encoded);
-          {
-            const { size: size2 } = await file.stat();
-            if (size2 > encoded.length) {
-              await file.truncate(encoded.length, size2);
-            }
-          }
-          const { size } = await file.stat();
-          if (size !== encoded.length) {
-            console.log("SANITY!");
-          }
-          (0, node_assert_1.default)(size === encoded.length);
+          log3(`Save: data size ${encoded.length}`);
+          await file.write(0, toBytesInt32(encoded.length));
+          await file.write(4, encoded);
         } finally {
           await file.close();
         }
@@ -93648,6 +93644,12 @@ var require_metadata_store = __commonJS({
       async_1.synchronized
     ], MetadataStore.prototype, "_save", null);
     exports.MetadataStore = MetadataStore;
+    var toBytesInt32 = (num) => {
+      const buf = Buffer.alloc(4);
+      buf.writeInt32LE(num, 0);
+      return buf;
+    };
+    var fromBytesInt32 = (buf) => buf.readInt32LE(0);
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client",
-  "version": "2.33.9-dev.b6f4ca19",
+  "version": "2.33.9-dev.d0ae5f95",
   "license": "MIT",
   "author": "DXOS.org",
   "main": "dist/src/index.js",
@@ -14,14 +14,14 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.33.9-dev.b6f4ca19",
-    "@dxos/codec-protobuf": "2.33.9-dev.b6f4ca19",
-    "@dxos/config": "2.33.9-dev.b6f4ca19",
-    "@dxos/debug": "2.33.9-dev.b6f4ca19",
-    "@dxos/model-factory": "2.33.9-dev.b6f4ca19",
-    "@dxos/protocols": "2.33.9-dev.b6f4ca19",
-    "@dxos/rpc": "2.33.9-dev.b6f4ca19",
-    "@dxos/util": "2.33.9-dev.b6f4ca19",
+    "@dxos/async": "2.33.9-dev.d0ae5f95",
+    "@dxos/codec-protobuf": "2.33.9-dev.d0ae5f95",
+    "@dxos/config": "2.33.9-dev.d0ae5f95",
+    "@dxos/debug": "2.33.9-dev.d0ae5f95",
+    "@dxos/model-factory": "2.33.9-dev.d0ae5f95",
+    "@dxos/protocols": "2.33.9-dev.d0ae5f95",
+    "@dxos/rpc": "2.33.9-dev.d0ae5f95",
+    "@dxos/util": "2.33.9-dev.d0ae5f95",
     "abstract-leveldown": "~7.0.0",
     "assert": "^2.0.0",
     "debug": "^4.3.3",
@@ -34,16 +34,16 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@dxos/credentials": "2.33.9-dev.b6f4ca19",
-    "@dxos/crypto": "2.33.9-dev.b6f4ca19",
-    "@dxos/echo-db": "2.33.9-dev.b6f4ca19",
-    "@dxos/echo-protocol": "2.33.9-dev.b6f4ca19",
+    "@dxos/credentials": "2.33.9-dev.d0ae5f95",
+    "@dxos/crypto": "2.33.9-dev.d0ae5f95",
+    "@dxos/echo-db": "2.33.9-dev.d0ae5f95",
+    "@dxos/echo-protocol": "2.33.9-dev.d0ae5f95",
     "@dxos/eslint-plugin": "~1.0.34",
-    "@dxos/feed-store": "2.33.9-dev.b6f4ca19",
-    "@dxos/network-manager": "2.33.9-dev.b6f4ca19",
-    "@dxos/object-model": "2.33.9-dev.b6f4ca19",
+    "@dxos/feed-store": "2.33.9-dev.d0ae5f95",
+    "@dxos/network-manager": "2.33.9-dev.d0ae5f95",
+    "@dxos/object-model": "2.33.9-dev.d0ae5f95",
     "@dxos/protocols-toolchain": "2.33.8",
-    "@dxos/random-access-multi-storage": "2.33.9-dev.b6f4ca19",
+    "@dxos/random-access-multi-storage": "2.33.9-dev.d0ae5f95",
     "@dxos/testutils": "2.33.8",
     "@koush/wrtc": "^0.5.3",
     "@types/debug": "^4.1.7",