@dxos/echo-db 2.33.9-dev.7d11f506 → 2.33.9-dev.b6f4ca19

package/package.json

@@ -1,31 +1,35 @@
 {
   "name": "@dxos/echo-db",
-  "version": "2.33.9-dev.7d11f506",
+  "version": "2.33.9-dev.b6f4ca19",
   "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.7d11f506",
-    "@dxos/codec-protobuf": "2.33.9-dev.7d11f506",
-    "@dxos/credentials": "2.33.9-dev.7d11f506",
-    "@dxos/crypto": "2.33.9-dev.7d11f506",
-    "@dxos/debug": "2.33.9-dev.7d11f506",
-    "@dxos/echo-protocol": "2.33.9-dev.7d11f506",
-    "@dxos/feed-store": "2.33.9-dev.7d11f506",
-    "@dxos/mesh-protocol": "2.33.9-dev.7d11f506",
-    "@dxos/model-factory": "2.33.9-dev.7d11f506",
-    "@dxos/network-manager": "2.33.9-dev.7d11f506",
-    "@dxos/object-model": "2.33.9-dev.7d11f506",
-    "@dxos/protocol-plugin-presence": "2.33.9-dev.7d11f506",
-    "@dxos/protocol-plugin-replicator": "2.33.9-dev.7d11f506",
-    "@dxos/protocols": "2.33.9-dev.7d11f506",
-    "@dxos/random-access-multi-storage": "2.33.9-dev.7d11f506",
-    "@dxos/util": "2.33.9-dev.7d11f506",
+    "@dxos/async": "2.33.9-dev.b6f4ca19",
+    "@dxos/codec-protobuf": "2.33.9-dev.b6f4ca19",
+    "@dxos/credentials": "2.33.9-dev.b6f4ca19",
+    "@dxos/crypto": "2.33.9-dev.b6f4ca19",
+    "@dxos/debug": "2.33.9-dev.b6f4ca19",
+    "@dxos/echo-protocol": "2.33.9-dev.b6f4ca19",
+    "@dxos/feed-store": "2.33.9-dev.b6f4ca19",
+    "@dxos/mesh-protocol": "2.33.9-dev.b6f4ca19",
+    "@dxos/model-factory": "2.33.9-dev.b6f4ca19",
+    "@dxos/network-manager": "2.33.9-dev.b6f4ca19",
+    "@dxos/object-model": "2.33.9-dev.b6f4ca19",
+    "@dxos/protocol-plugin-presence": "2.33.9-dev.b6f4ca19",
+    "@dxos/protocol-plugin-replicator": "2.33.9-dev.b6f4ca19",
+    "@dxos/protocols": "2.33.9-dev.b6f4ca19",
+    "@dxos/random-access-multi-storage": "2.33.9-dev.b6f4ca19",
+    "@dxos/util": "2.33.9-dev.b6f4ca19",
+    "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.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';

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 {

package/src/protocol/authenticator.test.ts

@@ -5,21 +5,18 @@
 import expect from 'expect';
 import { it as test } from 'mocha';
 
-import { createAuthMessage, createKeyAdmitMessage, createPartyGenesisMessage, Keyring, KeyType } from '@dxos/credentials';
+import { createAuthMessage, createEnvelopeMessage, createFeedAdmitMessage, createKeyAdmitMessage, createPartyGenesisMessage, Keyring, KeyType, wrapMessage } from '@dxos/credentials';
 
 import { PartyProcessor } from '../pipeline';
 import { createAuthenticator } from './authenticator';
-import { CredentialsSigner } from './credentials-signer';
+import { createTestIdentityCredentials } from './identity-credentials';
 
 describe('authenticator', () => {
-  // TODO(dmaretskyi): Figure out how credentials work and if this test makes sense.
-  test.skip('authenticates admitted peer', async () => {
+  test('authenticates party creator', async () => {
     const keyring = new Keyring();
+    const identity = await createTestIdentityCredentials(keyring);
     const partyKey = await keyring.createKeyRecord({ type: KeyType.PARTY });
-    const identityKey = await keyring.createKeyRecord({ type: KeyType.IDENTITY });
-    const deviceKey = await keyring.createKeyRecord({ type: KeyType.DEVICE });
-    const feedKey = await keyring.createKeyRecord({ type: KeyType.FEED });
-    const signer = CredentialsSigner.createDirectDeviceSigner(keyring);
+    const feedKey = await keyring.createKeyRecord({ type: KeyType.PARTY });
 
     const partyProcessor = new PartyProcessor(partyKey.publicKey);
     await partyProcessor.processMessage({
@@ -27,16 +24,106 @@ describe('authenticator', () => {
         keyring,
         partyKey,
         feedKey.publicKey,
-        identityKey
+        partyKey
       ),
       meta: {} as any
     });
+    await partyProcessor.processMessage({
+      data: createEnvelopeMessage(
+        identity.keyring,
+        partyKey.publicKey,
+        wrapMessage(identity.identityGenesis),
+        [partyKey]
+      ),
+      meta: {} as any
+    });
+    await partyProcessor.processMessage({
+      data: createFeedAdmitMessage(
+        keyring,
+        partyKey.publicKey,
+        feedKey.publicKey,
+        [identity.deviceKeyChain]
+      ),
+      meta: {} as any
+    });
+
+    const authenticator = createAuthenticator(partyProcessor, identity.createCredentialsSigner(), null as any);
+
+    //
+    // This test follows the same party creation routing as party factory.
+    // Oddly, it does not admit the device key to the party.
+    // This means that authentication is actually done using the signature created using the feed key.
+    //
+
+    // Does not authenticate without the feed key.
+    {
+      const credential = createAuthMessage(
+        keyring,
+        partyKey.publicKey,
+        identity.identityKey,
+        identity.deviceKey
+      );
+      expect(await authenticator.authenticate(credential.payload)).toEqual(false);
+    }
+
+    // Does authenticate with the feed key.
+    {
+      const credential = createAuthMessage(
+        keyring,
+        partyKey.publicKey,
+        identity.identityKey,
+        identity.deviceKey,
+        feedKey.publicKey
+      );
+      expect(await authenticator.authenticate(credential.payload)).toEqual(true);
+    }
+  });
+
+  test('authenticates another identity', async () => {
+    const keyring = new Keyring();
+    const identity = await createTestIdentityCredentials(keyring);
+    const partyKey = await keyring.createKeyRecord({ type: KeyType.PARTY });
+    const feedKey = await keyring.createKeyRecord({ type: KeyType.PARTY });
+
+    const partyProcessor = new PartyProcessor(partyKey.publicKey);
+    await partyProcessor.processMessage({
+      data: createPartyGenesisMessage(
+        keyring,
+        partyKey,
+        feedKey.publicKey,
+        partyKey
+      ),
+      meta: {} as any
+    });
+    await partyProcessor.processMessage({
+      data: createEnvelopeMessage(
+        identity.keyring,
+        partyKey.publicKey,
+        wrapMessage(identity.identityGenesis),
+        [partyKey]
+      ),
+      meta: {} as any
+    });
+    await partyProcessor.processMessage({
+      data: createFeedAdmitMessage(
+        keyring,
+        partyKey.publicKey,
+        feedKey.publicKey,
+        [identity.deviceKeyChain]
+      ),
+      meta: {} as any
+    });
+
+    const authenticator = createAuthenticator(partyProcessor, identity.createCredentialsSigner(), null as any);
+
+    const identity2 = await createTestIdentityCredentials(keyring);
+
     await partyProcessor.processMessage({
       data: createKeyAdmitMessage(
         keyring,
         partyKey.publicKey,
-        identityKey,
-        [partyKey, identityKey]
+        identity2.identityKey,
+        [identity.deviceKeyChain]
       ),
       meta: {} as any
     });
@@ -44,20 +131,18 @@ describe('authenticator', () => {
       data: createKeyAdmitMessage(
         keyring,
         partyKey.publicKey,
-        deviceKey,
-        [identityKey, deviceKey]
+        identity2.deviceKey,
+        [identity.deviceKeyChain]
       ),
       meta: {} as any
     });
 
-    const authenticator = createAuthenticator(partyProcessor, signer, null as any);
     const credential = createAuthMessage(
       keyring,
       partyKey.publicKey,
-      identityKey,
-      deviceKey
+      identity2.identityKey,
+      identity2.deviceKey
     );
-
     expect(await authenticator.authenticate(credential.payload)).toEqual(true);
   });
 });

package/src/snapshots/snapshot-store.ts

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

package/src/testing/testing-factories.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Model } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';