@dxos/echo-db 2.33.9-dev.e605934d → 2.33.9-dev.eb69ac10

package/package.json

@@ -1,31 +1,35 @@
 {
   "name": "@dxos/echo-db",
-  "version": "2.33.9-dev.e605934d",
+  "version": "2.33.9-dev.eb69ac10",
   "description": "ECHO database.",
   "license": "MIT",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
+  "browser": {
+    "node:assert": "assert"
+  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.33.9-dev.e605934d",
-    "@dxos/codec-protobuf": "2.33.9-dev.e605934d",
-    "@dxos/credentials": "2.33.9-dev.e605934d",
-    "@dxos/crypto": "2.33.9-dev.e605934d",
-    "@dxos/debug": "2.33.9-dev.e605934d",
-    "@dxos/echo-protocol": "2.33.9-dev.e605934d",
-    "@dxos/feed-store": "2.33.9-dev.e605934d",
-    "@dxos/mesh-protocol": "2.33.9-dev.e605934d",
-    "@dxos/model-factory": "2.33.9-dev.e605934d",
-    "@dxos/network-manager": "2.33.9-dev.e605934d",
-    "@dxos/object-model": "2.33.9-dev.e605934d",
-    "@dxos/protocol-plugin-presence": "2.33.9-dev.e605934d",
-    "@dxos/protocol-plugin-replicator": "2.33.9-dev.e605934d",
-    "@dxos/protocols": "2.33.9-dev.e605934d",
-    "@dxos/random-access-multi-storage": "2.33.9-dev.e605934d",
-    "@dxos/util": "2.33.9-dev.e605934d",
+    "@dxos/async": "2.33.9-dev.eb69ac10",
+    "@dxos/codec-protobuf": "2.33.9-dev.eb69ac10",
+    "@dxos/credentials": "2.33.9-dev.eb69ac10",
+    "@dxos/crypto": "2.33.9-dev.eb69ac10",
+    "@dxos/debug": "2.33.9-dev.eb69ac10",
+    "@dxos/echo-protocol": "2.33.9-dev.eb69ac10",
+    "@dxos/feed-store": "2.33.9-dev.eb69ac10",
+    "@dxos/mesh-protocol": "2.33.9-dev.eb69ac10",
+    "@dxos/model-factory": "2.33.9-dev.eb69ac10",
+    "@dxos/network-manager": "2.33.9-dev.eb69ac10",
+    "@dxos/object-model": "2.33.9-dev.eb69ac10",
+    "@dxos/protocol-plugin-presence": "2.33.9-dev.eb69ac10",
+    "@dxos/protocol-plugin-replicator": "2.33.9-dev.eb69ac10",
+    "@dxos/protocols": "2.33.9-dev.eb69ac10",
+    "@dxos/random-access-multi-storage": "2.33.9-dev.eb69ac10",
+    "@dxos/util": "2.33.9-dev.eb69ac10",
+    "assert": "^2.0.0",
     "base-x": "~3.0.9",
     "buffer-json-encoding": "^1.0.2",
     "debug": "^4.3.3",

package/src/api/result-set.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Event, ReadOnlyEvent } from '@dxos/async';
 

package/src/echo.test.ts

@@ -2,10 +2,10 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
 import expect from 'expect';
 import { it as test } from 'mocha';
+import assert from 'node:assert';
 
 import { latch, promiseTimeout, waitForCondition } from '@dxos/async';
 import {
@@ -374,7 +374,7 @@ describe('ECHO', () => {
 
   }).timeout(10_000);
 
-  test.skip('3 devices', async () => {
+  test('3 devices', async () => {
     const a = await setup({ createProfile: true });
     const b = await setup();
 

package/src/echo.ts

@@ -2,9 +2,9 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
 import memdown from 'memdown';
+import assert from 'node:assert';
 
 import { synchronized } from '@dxos/async';
 import { Keyring, KeyStore, SecretProvider } from '@dxos/credentials';

package/src/halo/halo-factory.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import {
   createDeviceInfoMessage,

package/src/halo/halo-party.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Event, synchronized } from '@dxos/async';
 import { timed } from '@dxos/debug';

package/src/halo/halo.ts

@@ -2,8 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { synchronized } from '@dxos/async';
 import { KeyRecord, Keyring, KeyType, SecretProvider } from '@dxos/credentials';

package/src/halo/identity-manager.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Event, synchronized, waitForCondition } from '@dxos/async';
 import { Filter, KeyRecord, Keyring, KeyType, SecretProvider } from '@dxos/credentials';

package/src/halo/identity.ts

@@ -2,8 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Filter, KeyChain, KeyRecord, Keyring, KeyType, SignedMessage, Signer } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';

package/src/halo/preferences.ts

@@ -2,9 +2,9 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import stableStringify from 'json-stable-stringify';
 import defaultsDeep from 'lodash.defaultsdeep';
+import assert from 'node:assert';
 
 import { Event } from '@dxos/async';
 import { raise } from '@dxos/debug';

package/src/invitations/greeting-initiator.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { waitForEvent } from '@dxos/async';
 import {

package/src/invitations/greeting-responder.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Event, waitForCondition } from '@dxos/async';
 import {

package/src/invitations/halo-recovery-initiator.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { waitForEvent } from '@dxos/async';
 import {

package/src/invitations/invitation-descriptor.ts

@@ -2,9 +2,9 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import base from 'base-x';
 import stableStringify from 'json-stable-stringify';
+import assert from 'node:assert';
 
 import { ripemd160 } from '@dxos/crypto';
 import { SwarmKey } from '@dxos/echo-protocol';

package/src/invitations/invitation-factory.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { createPartyInvitationMessage, Message as HaloMessage } from '@dxos/credentials';
 import { FeedWriter } from '@dxos/echo-protocol';

package/src/invitations/offline-invitation-claimer.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { waitForEvent } from '@dxos/async';
 import {

package/src/packlets/database/data-mirror.ts

@@ -2,8 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { failUndefined } from '@dxos/debug';
 import { DataService } from '@dxos/echo-protocol';

package/src/packlets/database/data-service-host.ts

@@ -2,8 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Stream } from '@dxos/codec-protobuf';
 import { failUndefined, raise } from '@dxos/debug';

package/src/packlets/database/data-service-router.ts

@@ -2,8 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Stream } from '@dxos/codec-protobuf';
 import { raise } from '@dxos/debug';

package/src/packlets/database/database-backend.ts

@@ -2,8 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { DatabaseSnapshot, DataService, EchoEnvelope, FeedWriter, PartyKey } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';

package/src/packlets/database/database.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Event, synchronized } from '@dxos/async';
 import { ItemID, ItemType } from '@dxos/echo-protocol';

package/src/packlets/database/item-demuxer.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Event } from '@dxos/async';
 import { failUndefined } from '@dxos/debug';

package/src/packlets/database/item-manager.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Event, trigger } from '@dxos/async';
 import { createId } from '@dxos/crypto';

package/src/packlets/database/link.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { ItemID, ItemType } from '@dxos/echo-protocol';
 import { Model, StateManager } from '@dxos/model-factory';

package/src/packlets/database/selection/result.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Event } from '@dxos/async';
 

package/src/parties/data-party.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { synchronized, Event } from '@dxos/async';
 import { timed } from '@dxos/debug';

package/src/parties/party-factory.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import {
   createEnvelopeMessage,

package/src/parties/party-manager.test.ts

@@ -4,10 +4,10 @@
 
 /* eslint-disable jest/no-conditional-expect */
 
-import assert from 'assert';
 import debug from 'debug';
 import expect from 'expect';
 import { it as test } from 'mocha';
+import assert from 'node:assert';
 
 import { latch } from '@dxos/async';
 import {

package/src/parties/party-manager.ts

@@ -2,9 +2,9 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
 import unionWith from 'lodash.unionwith';
+import assert from 'node:assert';
 
 import { Event, synchronized } from '@dxos/async';
 import { SecretProvider } from '@dxos/credentials';

package/src/parties/party-preferences.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { PARTY_TITLE_PROPERTY, DataParty } from '.';
 import { Preferences } from '../halo/preferences';

package/src/pipeline/feed-muxer.test.ts

@@ -128,7 +128,8 @@ describe('FeedMuxer', () => {
     await pipeline.outboundEchoStream!.write({
       itemId: '123',
       genesis: {
-        itemType: 'foo'
+        itemType: 'foo',
+        modelType: 'bar'
       }
     });
 
@@ -138,7 +139,8 @@ describe('FeedMuxer', () => {
     expect((echoMessages[0] as any).data).toEqual({
       itemId: '123',
       genesis: {
-        itemType: 'foo'
+        itemType: 'foo',
+        modelType: 'bar'
       }
     });
   });

package/src/pipeline/feed-muxer.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Event } from '@dxos/async';
 import { Message as HaloMessage } from '@dxos/credentials';

package/src/pipeline/message-selector.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { MessageSelector } from '@dxos/echo-protocol';
 

package/src/pipeline/metadata-store.ts

@@ -2,8 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { synchronized } from '@dxos/async';
 import { failUndefined } from '@dxos/debug';
@@ -25,13 +25,15 @@ export interface AddPartyOptions {
   genesisFeed: PublicKey
 }
 
+const emptyEchoMetadata = (): EchoMetadata => ({
+  version: STORAGE_VERSION,
+  parties: [],
+  created: new Date(),
+  updated: new Date()
+});
+
 export class MetadataStore {
-  private _metadata: EchoMetadata = {
-    version: STORAGE_VERSION,
-    parties: [],
-    created: new Date(),
-    updated: new Date()
-  };
+  private _metadata: EchoMetadata = emptyEchoMetadata();
 
   constructor (
     private readonly _directory: Directory
@@ -56,19 +58,26 @@ export class MetadataStore {
   async load (): Promise<void> {
     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;
       }
+      // Loading file size from first 4 bytes.
+      const dataSize = fromBytesInt32(await file.read(0, 4));
+      log(`Load: data size ${dataSize}`);
+
+      // Sanity check.
+      {
+        if (fileLength < dataSize + 4) {
+          throw new Error('Metadata storage is corrupted');
+        }
+      }
 
-      const data = await file.read(0, size);
+      const data = await file.read(4, dataSize);
       this._metadata = schema.getCodecForType('dxos.echo.metadata.EchoMetadata').decode(data);
     } catch (err: any) {
-      if (err.code === 'ENOENT') {
-        return;
-      } else {
-        throw err;
-      }
+      log(`Error loading metadata: ${err}`);
+      this._metadata = emptyEchoMetadata();
     } finally {
       await file.close();
     }
@@ -87,22 +96,14 @@ export class MetadataStore {
 
     try {
       const encoded = Buffer.from(schema.getCodecForType('dxos.echo.metadata.EchoMetadata').encode(data));
-      await file.write(0, encoded);
 
-      // Truncate the rest of the file.
-      {
-        const { size } = await file.stat();
-        if (size > encoded.length) {
-          await file.truncate(encoded.length, size);
-        }
-      }
+      // Saving file size at first 4 bytes.
+      log(`Save: data size ${encoded.length}`);
+      await file.write(0, toBytesInt32(encoded.length));
+
+      // Saving data.
+      await file.write(4, encoded);
 
-      // Sanity check.
-      const { size } = await file.stat();
-      if (size !== encoded.length) {
-        console.log('SANITY!');
-      }
-      assert(size === encoded.length);
     } finally {
       await file.close();
     }
@@ -196,3 +197,11 @@ export class MetadataStore {
     await this._save();
   }
 }
+
+const toBytesInt32 = (num: number) => {
+  const buf = Buffer.alloc(4);
+  buf.writeInt32LE(num, 0);
+  return buf;
+};
+
+const fromBytesInt32 = (buf: Buffer) => buf.readInt32LE(0);

package/src/pipeline/party-feed-provider.ts

@@ -2,8 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Event, synchronized } from '@dxos/async';
 import { Keyring, KeyType } from '@dxos/credentials';

package/src/pipeline/party-pipeline.ts

@@ -2,7 +2,7 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { synchronized } from '@dxos/async';
 import { KeyType, Message as HaloMessage } from '@dxos/credentials';

package/src/pipeline/party-processor.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { Event } from '@dxos/async';
 import {