@dxos/client-services 0.1.13 → 0.1.14

package/dist/{src → types/src}/packlets/vault/worker-runtime.d.ts

@@ -1,7 +1,7 @@
 import { Config } from '@dxos/config';
 import { RpcPort } from '@dxos/rpc';
 import { MaybePromise } from '@dxos/util';
-export type CreateSessionParams = {
+export declare type CreateSessionParams = {
     appPort: RpcPort;
     systemPort: RpcPort;
 };

package/dist/types/src/packlets/vault/worker-runtime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-runtime.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-runtime.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAM1C,oBAAY,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF;;;;GAIG;AACH,qBAAa,aAAa;IAUtB,OAAO,CAAC,QAAQ,CAAC,eAAe;IATlC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqC;IACvE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA4B;IACrD,OAAO,CAAC,qBAAqB,CAAC,CAAgB;IAC9C,OAAO,CAAC,eAAe,CAAsB;IAC7C,OAAO,CAAC,OAAO,CAAU;gBAIN,eAAe,EAAE,MAAM,YAAY,CAAC,MAAM,CAAC;IAGxD,KAAK;IAsBL,IAAI;IAKV;;OAEG;IACG,aAAa,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,mBAAmB;IA0BhE;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAmBzB"}

package/dist/{src → types/src}/packlets/vault/worker-session.d.ts

@@ -3,7 +3,7 @@ import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { RpcPort } from '@dxos/rpc';
 import { Callback } from '@dxos/util';
 import { ClientServicesHost } from '../services';
-export type WorkerSessionParams = {
+export declare type WorkerSessionParams = {
     getServices: () => Promise<ClientServicesHost>;
     systemPort: RpcPort;
     appPort: RpcPort;

package/dist/types/src/packlets/vault/worker-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-session.d.ts","sourceRoot":"","sources":["../../../../../src/packlets/vault/worker-session.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAoC,OAAO,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAuC,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGtF,oBAAY,mBAAmB,GAAG;IAChC,WAAW,EAAE,MAAM,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC/C,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IACxC,OAAO,CAAC,EAAE;QACR,iBAAiB,EAAE,MAAM,CAAC;KAC3B,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA+B;IAC1D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiB;IAC/C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoC;IACjE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA8C;IACvE,OAAO,CAAC,eAAe,CAAC,CAAiB;IAEzC,SAAgB,OAAO,iBAAsB,QAAQ,IAAI,CAAC,EAAI;IAGvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,aAAa,CAAC,EAAE,aAAa,CAAC;gBAEzB,EACV,WAAW,EACX,UAAU,EACV,OAAO,EACP,OAEC,EACF,EAAE,mBAAmB;IAmDhB,IAAI;IAuBJ,KAAK;CAcZ"}

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
-  "main": "dist/src/index.js",
+  "main": "dist/lib/node/index.cjs",
   "browser": {
-    "node:assert": "assert"
+    "./dist/lib/node/index.cjs": "./dist/lib/browser/index.mjs",
+    "./dist/lib/node/packlets/testing/index.cjs": "./dist/lib/browser/packlets/testing/index.mjs"
   },
-  "types": "dist/src/index.d.ts",
+  "types": "dist/types/src/index.d.ts",
   "files": [
     "testing.d.ts",
     "testing.js",
@@ -19,41 +20,42 @@
   ],
   "dependencies": {
     "abstract-leveldown": "~7.0.0",
-    "assert": "^2.0.0",
     "base-x": "~3.0.9",
     "jsondown": "dxos/jsondown#main",
     "level-js": "^5.0.2",
     "memdown": "^5.1.0",
-    "@dxos/async": "0.1.13",
-    "@dxos/codec-protobuf": "0.1.13",
-    "@dxos/config": "0.1.13",
-    "@dxos/credentials": "0.1.13",
-    "@dxos/crypto": "0.1.13",
-    "@dxos/debug": "0.1.13",
-    "@dxos/echo-db": "0.1.13",
-    "@dxos/errors": "0.1.13",
-    "@dxos/feed-store": "0.1.13",
-    "@dxos/keyring": "0.1.13",
-    "@dxos/keys": "0.1.13",
-    "@dxos/log": "0.1.13",
-    "@dxos/messaging": "0.1.13",
-    "@dxos/model-factory": "0.1.13",
-    "@dxos/network-manager": "0.1.13",
-    "@dxos/object-model": "0.1.13",
-    "@dxos/protocol-plugin-rpc": "0.1.13",
-    "@dxos/protocols": "0.1.13",
-    "@dxos/random-access-storage": "0.1.13",
-    "@dxos/rpc": "0.1.13",
-    "@dxos/text-model": "0.1.13",
-    "@dxos/timeframe": "0.1.13",
-    "@dxos/util": "0.1.13"
+    "@dxos/async": "0.1.14",
+    "@dxos/codec-protobuf": "0.1.14",
+    "@dxos/config": "0.1.14",
+    "@dxos/context": "0.1.14",
+    "@dxos/credentials": "0.1.14",
+    "@dxos/crypto": "0.1.14",
+    "@dxos/debug": "0.1.14",
+    "@dxos/echo-db": "0.1.14",
+    "@dxos/errors": "0.1.14",
+    "@dxos/feed-store": "0.1.14",
+    "@dxos/keyring": "0.1.14",
+    "@dxos/keys": "0.1.14",
+    "@dxos/log": "0.1.14",
+    "@dxos/messaging": "0.1.14",
+    "@dxos/model-factory": "0.1.14",
+    "@dxos/network-manager": "0.1.14",
+    "@dxos/node-std": "0.1.14",
+    "@dxos/object-model": "0.1.14",
+    "@dxos/protocol-plugin-rpc": "0.1.14",
+    "@dxos/protocols": "0.1.14",
+    "@dxos/random-access-storage": "0.1.14",
+    "@dxos/rpc": "0.1.14",
+    "@dxos/teleport": "0.1.14",
+    "@dxos/text-model": "0.1.14",
+    "@dxos/timeframe": "0.1.14",
+    "@dxos/util": "0.1.14"
   },
   "devDependencies": {
     "@types/level-js": "~4.0.1",
     "@types/memdown": "^3.0.0",
     "@types/readable-stream": "^2.3.9",
-    "@dxos/signal": "0.1.13",
-    "@dxos/testutils": "0.1.13"
+    "@dxos/signal": "0.1.14"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/devtools/devtools.ts

@@ -39,6 +39,7 @@ import {
 
 import { ServiceContext } from '../services';
 import { subscribeToFeedBlocks, subscribeToFeeds } from './feeds';
+import { subscribeToKeyringKeys } from './keys';
 import { subscribeToNetworkStatus, subscribeToSignalTrace, subscribeToSwarmInfo } from './network';
 import { subscribeToSpaces } from './spaces';
 
@@ -83,7 +84,7 @@ export class DevtoolsServiceImpl implements DevtoolsHost {
   }
 
   subscribeToKeyringKeys(request: SubscribeToKeyringKeysRequest): Stream<SubscribeToKeyringKeysResponse> {
-    throw new Error();
+    return subscribeToKeyringKeys({ keyring: this.params.context.keyring });
   }
 
   subscribeToCredentialMessages(

package/src/packlets/devtools/keys.ts

@@ -0,0 +1,19 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+import { Stream } from '@dxos/codec-protobuf';
+import { Keyring } from '@dxos/keyring';
+import { SubscribeToKeyringKeysResponse } from '@dxos/protocols/proto/dxos/devtools/host';
+
+export const subscribeToKeyringKeys = ({ keyring }: { keyring: Keyring }) =>
+  new Stream<SubscribeToKeyringKeysResponse>(({ next }) => {
+    const update = () => {
+      next({
+        keys: keyring.list()
+      });
+    };
+    const unsubscribe = keyring.keysUpdate.on(update);
+    update();
+    return unsubscribe;
+  });

package/src/packlets/identity/authenticator.test.ts

@@ -2,22 +2,19 @@
 // Copyright 2022 DXOS.org
 //
 
-import assert from 'assert';
 import expect from 'expect';
+import assert from 'node:assert';
 
 import { createCredentialSignerWithKey } from '@dxos/credentials';
 import { Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
+import { describe, test } from '@dxos/test';
 import { ComplexSet } from '@dxos/util';
 
 import { createHaloAuthProvider, createHaloAuthVerifier } from './authenticator';
 
-describe('identity/authenticator', function () {
-  it('verifies credentials', async function () {
-    if (mochaExecutor.environment !== 'nodejs') {
-      this.skip();
-    }
-
+describe('identity/authenticator', () => {
+  test('verifies credentials', async () => {
     const keyring = new Keyring();
     const deviceKey = await keyring.createKey();
     const signer = createCredentialSignerWithKey(keyring, deviceKey);
@@ -28,5 +25,5 @@ describe('identity/authenticator', function () {
     const credential = await authProvider(nonce);
     assert(credential);
     expect(await authVerifier(nonce, credential)).toBeTruthy();
-  });
+  }).onlyEnvironments('nodejs');
 });

package/src/packlets/identity/identity-manager.test.ts

@@ -11,12 +11,12 @@ import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging
 import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { createStorage, Storage, StorageType } from '@dxos/random-access-storage';
-import { afterTest } from '@dxos/testutils';
+import { describe, test, afterTest } from '@dxos/test';
 
 import { createDefaultModelFactory } from '../services';
 import { IdentityManager } from './identity-manager';
 
-describe('identity/identity-manager', function () {
+describe('identity/identity-manager', () => {
   const setupPeer = async ({
     signalContext = new MemorySignalManagerContext(),
     storage = createStorage({ type: StorageType.RAM })
@@ -58,7 +58,7 @@ describe('identity/identity-manager', function () {
     };
   };
 
-  it('creates identity', async function () {
+  test('creates identity', async () => {
     const { identityManager } = await setupPeer();
     await identityManager.open();
     afterTest(() => identityManager.close());
@@ -67,7 +67,7 @@ describe('identity/identity-manager', function () {
     expect(identity).to.exist;
   });
 
-  it('reload from storage', async function () {
+  test('reload from storage', async () => {
     const storage = createStorage({ type: StorageType.RAM });
 
     const peer1 = await setupPeer({ storage });
@@ -86,7 +86,7 @@ describe('identity/identity-manager', function () {
     // TODO(dmaretskyi): Check that identity is "alive" (space is working and can write mutations).
   });
 
-  it('admit another device', async function () {
+  test('admit another device', async () => {
     const signalContext = new MemorySignalManagerContext();
 
     const peer1 = await setupPeer({ signalContext });

package/src/packlets/identity/identity-manager.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Event } from '@dxos/async';
 import { CredentialGenerator } from '@dxos/credentials';
@@ -144,13 +144,13 @@ export class IdentityManager {
   }
 
   /**
-   * Accept an existing identity. Expects it's device key to be authorized.
+   * Accept an existing identity. Expects it's device key to be authorized (now or later).
    */
   async acceptIdentity(params: JoinIdentityParams) {
     log('accepting identity', { params });
     assert(!this._identity, 'Identity already exists.');
 
-    const identity = await this._constructIdentity({
+    const identityRecord: IdentityRecord = {
       identityKey: params.identityKey,
       deviceKey: await this._keyring.createKey(),
       haloSpace: {
@@ -159,10 +159,12 @@ export class IdentityManager {
         writeControlFeedKey: await this._keyring.createKey(),
         writeDataFeedKey: await this._keyring.createKey()
       }
-    });
+    };
+    const identity = await this._constructIdentity(identityRecord);
 
     await identity.open();
     this._identity = identity;
+    await this._metadataStore.setIdentityRecord(identityRecord);
     this.stateUpdate.emit();
     return identity;
   }

package/src/packlets/identity/identity.test.ts

@@ -14,7 +14,7 @@ import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
 import { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { AdmittedFeed } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { createStorage, StorageType } from '@dxos/random-access-storage';
-import { afterTest } from '@dxos/testutils';
+import { describe, test, afterTest } from '@dxos/test';
 
 import { createDefaultModelFactory } from '../services';
 import { createHaloAuthProvider, createHaloAuthVerifier } from './authenticator';
@@ -22,8 +22,8 @@ import { Identity } from './identity';
 
 const modelFactory = createDefaultModelFactory();
 
-describe('identity/identity', function () {
-  it('create', async function () {
+describe('identity/identity', () => {
+  test('create', async () => {
     const keyring = new Keyring();
     const identityKey = await keyring.createKey();
     const deviceKey = await keyring.createKey();
@@ -116,7 +116,7 @@ describe('identity/identity', function () {
     expect(await verifyCredential(credential)).toEqual({ kind: 'pass' });
   });
 
-  it('two devices', async function () {
+  test('two devices', async () => {
     const signalContext = new MemorySignalManagerContext();
 
     let spaceKey: PublicKey;

package/src/packlets/identity/identity.ts

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

package/src/packlets/invitations/encoder.test.ts

@@ -6,11 +6,12 @@ import { expect } from 'chai';
 
 import { PublicKey } from '@dxos/keys';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
+import { describe, test } from '@dxos/test';
 
 import { InvitationEncoder } from './encoder';
 
-describe('Invitation utils', function () {
-  it('encodes and decodes an invitation', function () {
+describe('Invitation utils', () => {
+  test('encodes and decodes an invitation', () => {
     const invitation: Invitation = {
       swarmKey: PublicKey.random()
     };

package/src/packlets/invitations/halo-invitations-handler.test.ts

@@ -2,14 +2,14 @@
 // Copyright 2022 DXOS.org
 //
 
-import assert from 'assert';
 import { expect } from 'chai';
+import assert from 'node:assert';
 
 import { asyncChain, Trigger } from '@dxos/async';
 import { raise } from '@dxos/debug';
 import { PublicKey } from '@dxos/keys';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { afterTest } from '@dxos/testutils';
+import { describe, test, afterTest } from '@dxos/test';
 
 import { ServiceContext } from '../services';
 import { createPeers, createServiceContext } from '../testing';
@@ -19,8 +19,8 @@ const closeAfterTest = async (peer: ServiceContext) => {
   return peer;
 };
 
-describe('services/halo', function () {
-  it('creates identity', async function () {
+describe('services/halo', () => {
+  test('creates identity', async () => {
     const peer = createServiceContext();
     await peer.open();
     afterTest(() => peer.close());
@@ -29,7 +29,7 @@ describe('services/halo', function () {
     expect(identity).not.to.be.undefined;
   });
 
-  it('creates and accepts invitation', async function () {
+  test('creates and accepts invitation', async () => {
     const [host, guest] = await asyncChain<ServiceContext>([closeAfterTest])(createPeers(2));
 
     const identity1 = await host.createIdentity();