@dxos/client 2.33.8-dev.c77ba621 → 2.33.9-dev.2637427f

package/package.json

@@ -1,30 +1,27 @@
 {
   "name": "@dxos/client",
-  "version": "2.33.8-dev.c77ba621",
+  "version": "2.33.9-dev.2637427f",
   "license": "MIT",
   "author": "DXOS.org",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
+  "browser": {
+    "./dist/src/index.js": "./dist/browser.js",
+    "node:assert": "assert"
+  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.33.8-dev.c77ba621",
-    "@dxos/codec-protobuf": "2.33.8-dev.c77ba621",
-    "@dxos/config": "2.33.8-dev.c77ba621",
-    "@dxos/credentials": "2.33.8-dev.c77ba621",
-    "@dxos/crypto": "2.33.8-dev.c77ba621",
-    "@dxos/debug": "2.33.8-dev.c77ba621",
-    "@dxos/echo-db": "2.33.8-dev.c77ba621",
-    "@dxos/echo-protocol": "2.33.8-dev.c77ba621",
-    "@dxos/feed-store": "2.33.8-dev.c77ba621",
-    "@dxos/model-factory": "2.33.8-dev.c77ba621",
-    "@dxos/network-manager": "2.33.8-dev.c77ba621",
-    "@dxos/object-model": "2.33.8-dev.c77ba621",
-    "@dxos/protocols": "2.33.8-dev.c77ba621",
-    "@dxos/rpc": "2.33.8-dev.c77ba621",
-    "@dxos/util": "2.33.8-dev.c77ba621",
+    "@dxos/async": "2.33.9-dev.2637427f",
+    "@dxos/codec-protobuf": "2.33.9-dev.2637427f",
+    "@dxos/config": "2.33.9-dev.2637427f",
+    "@dxos/debug": "2.33.9-dev.2637427f",
+    "@dxos/model-factory": "2.33.9-dev.2637427f",
+    "@dxos/protocols": "2.33.9-dev.2637427f",
+    "@dxos/rpc": "2.33.9-dev.2637427f",
+    "@dxos/util": "2.33.9-dev.2637427f",
     "abstract-leveldown": "~7.0.0",
     "assert": "^2.0.0",
     "debug": "^4.3.3",
@@ -37,12 +34,20 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
+    "@dxos/credentials": "2.33.9-dev.2637427f",
+    "@dxos/crypto": "2.33.9-dev.2637427f",
+    "@dxos/echo-db": "2.33.9-dev.2637427f",
+    "@dxos/echo-protocol": "2.33.9-dev.2637427f",
     "@dxos/eslint-plugin": "~1.0.34",
-    "@dxos/protocols-toolchain": "2.33.7",
-    "@dxos/random-access-multi-storage": "2.33.8-dev.c77ba621",
-    "@dxos/testutils": "2.33.7",
+    "@dxos/feed-store": "2.33.9-dev.2637427f",
+    "@dxos/network-manager": "2.33.9-dev.2637427f",
+    "@dxos/object-model": "2.33.9-dev.2637427f",
+    "@dxos/protocols-toolchain": "2.33.8",
+    "@dxos/random-access-multi-storage": "2.33.9-dev.2637427f",
+    "@dxos/testutils": "2.33.8",
+    "@koush/wrtc": "^0.5.3",
     "@types/debug": "^4.1.7",
-    "@types/jest": "^26.0.7",
+    "@types/jest": "^28.1.6",
     "@types/level-js": "~4.0.1",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/memdown": "^3.0.0",
@@ -52,6 +57,7 @@
     "@types/uuid": "~8.3.3",
     "eslint": "^7.12.1",
     "expect": "~27.0.2",
+    "jsonify": "^0.0.0",
     "mocha": "~8.4.0",
     "typescript": "^4.7.2",
     "wait-for-expect": "^3.0.2"
@@ -60,12 +66,21 @@
     "access": "public"
   },
   "toolchain": {
+    "bundlePackages": [
+      "@dxos/credentials",
+      "@dxos/crypto",
+      "@dxos/echo-db",
+      "@dxos/echo-protocol",
+      "@dxos/feed-store",
+      "@dxos/network-manager",
+      "@dxos/object-model"
+    ],
     "testingFramework": "mocha"
   },
   "scripts": {
     "prebuild": "node -p \"'export const DXOS_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" > src/version.ts",
-    "build": "npm run prebuild && toolchain build",
-    "build:test": "toolchain build:test",
+    "build": "npm run prebuild && toolchain bundle:library",
+    "build:test": "toolchain build:test --bundle",
     "lint": "toolchain lint",
     "test": "toolchain test"
   }

package/src/api/client.test.ts

@@ -2,19 +2,19 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import expect from 'expect';
 import { it as test } from 'mocha';
+import assert from 'node:assert';
 import waitForExpect from 'wait-for-expect';
 
 import { sleep, waitForCondition } from '@dxos/async';
 import { ConfigObject } from '@dxos/config';
-import { generateSeedPhrase, keyPairFromSeedPhrase } from '@dxos/crypto';
+import { generateSeedPhrase, keyPairFromSeedPhrase } from '@dxos/credentials';
 import { throwUnhandledRejection } from '@dxos/debug';
 import { InvitationDescriptor } from '@dxos/echo-db';
-import { Timeframe } from '@dxos/echo-protocol';
 import { TestModel } from '@dxos/model-factory';
 import { ObjectModel } from '@dxos/object-model';
+import { Timeframe } from '@dxos/protocols';
 import { createBundledRpcServer, createLinkedPorts } from '@dxos/rpc';
 import { afterTest } from '@dxos/testutils';
 

package/src/api/client.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import debug from 'debug';
+import assert from 'node:assert';
 
 import { synchronized } from '@dxos/async';
 import { Config, ConfigObject } from '@dxos/config';
@@ -65,10 +65,10 @@ export class Client {
   private readonly _options: ClientOptions;
   private readonly _mode: Runtime.Client.Mode;
 
+  private _initialized = false;
   private _serviceProvider!: ClientServiceProvider;
   private _halo!: HaloProxy;
   private _echo!: EchoProxy;
-  private _initialized = false;
 
   // TODO(burdon): Expose some kind of stable ID (e.g., from HALO).
 

package/src/api/invitations/invitation-proxy.ts

@@ -2,7 +2,7 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Event, trigger } from '@dxos/async';
 import { Stream } from '@dxos/codec-protobuf';

package/src/api/invitations/invitation-request.ts

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

package/src/api/proxies/echo-proxy.ts

@@ -2,7 +2,7 @@
 // Copyright 2021 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Event, latch } from '@dxos/async';
 import { failUndefined } from '@dxos/debug';
@@ -54,8 +54,8 @@ export class EchoProxy implements Echo {
     private readonly _serviceProvider: ClientServiceProvider,
     private readonly _haloProxy: HaloProxy
   ) {
-    this._modelFactory =
-      _serviceProvider instanceof ClientServiceHost ? _serviceProvider.echo.modelFactory : new ModelFactory();
+    this._modelFactory = _serviceProvider instanceof ClientServiceHost
+      ? _serviceProvider.echo.modelFactory : new ModelFactory();
 
     this._modelFactory.registerModel(ObjectModel); // Register object-model by default.
   }

package/src/api/proxies/halo-proxy.ts

@@ -3,7 +3,7 @@
 //
 
 import { Event } from '@dxos/async';
-import { DeviceInfo, KeyRecord } from '@dxos/credentials';
+import { DeviceInfo, keyPairFromSeedPhrase, KeyRecord } from '@dxos/credentials';
 import { Contact, CreateProfileOptions, InvitationDescriptor, PartyMember, ResultSet } from '@dxos/echo-db';
 import { PublicKey } from '@dxos/protocols';
 import { SubscriptionGroup } from '@dxos/util';
@@ -90,11 +90,29 @@ export class HaloProxy implements Halo {
   }
 
   /**
-   * Create Profile. Add Identity key if public and secret key are provided. Then initializes profile with given username.
-   * If not public and secret key are provided it relies on keyring to contain an identity key.
+   * Create Profile.
+   * Add Identity key if public and secret key are provided.
+   * Then initializes profile with given username.
+   * If no public and secret key or seedphrase are provided it relies on keyring to contain an identity key.
+   * Seedphrase must not be specified with existing keys.
    * @returns User profile info.
    */
-  async createProfile ({ publicKey, secretKey, username }: CreateProfileOptions = {}): Promise<Profile> {
+  async createProfile ({
+    publicKey,
+    secretKey,
+    username,
+    seedphrase
+  }: CreateProfileOptions = {}): Promise<Profile> {
+    if (seedphrase && (publicKey || secretKey)) {
+      throw new Error('Seedphrase must not be specified with existing keys');
+    }
+
+    if (seedphrase) {
+      const keyPair = keyPairFromSeedPhrase(seedphrase);
+      publicKey = keyPair.publicKey;
+      secretKey = keyPair.secretKey;
+    }
+
     this._profile = await this._serviceProvider.services.ProfileService.createProfile({ publicKey, secretKey, username });
     return this._profile;
   }

package/src/index.ts

@@ -2,8 +2,11 @@
 // Copyright 2020 DXOS.org
 //
 
+export { generateSeedPhrase } from '@dxos/credentials';
+
 export {
   PARTY_ITEM_TYPE, // TODO(burdon): Remove?
+  TYPE_SCHEMA,
   Entity,
   Item,
   Link,
@@ -15,7 +18,11 @@ export {
   InvitationDescriptorType,
   OpenProgress,
   PartyMember,
-  ResultSet
+  ResultSet,
+  Schema,
+  SchemaDef,
+  SchemaField,
+  SchemaRef
 } from '@dxos/echo-db';
 
 export {
@@ -24,13 +31,18 @@ export {
 } from '@dxos/echo-protocol';
 
 export {
-  ObjectModel
+  ObjectModel,
+  OrderedList
 } from '@dxos/object-model';
 
-export * as proto from './proto/gen';
+// TODO(wittjosiah): Remove.
+export {
+  NetworkManager
+} from '@dxos/network-manager';
 
 export * from './api';
 export * from './devtools';
+export * from './proto';
 export * from './services';
 export * from './util';
 export * from './version';

package/src/proto/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+export * as proto from './gen';
+export * from './gen/dxos/halo/keys';

package/src/proto/substitutions.ts

@@ -4,9 +4,8 @@
 
 import { anySubstitutions, timestampSubstitutions } from '@dxos/codec-protobuf';
 import { codec, Message } from '@dxos/credentials';
-import { timeframeSubstitutions } from '@dxos/echo-protocol';
 import type { ConnectionEvent } from '@dxos/network-manager';
-import { publicKeySubstitutions } from '@dxos/protocols';
+import { publicKeySubstitutions, timeframeSubstitutions } from '@dxos/protocols';
 
 export default {
   ...timestampSubstitutions,

package/src/services/impl/halo.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 
 import { Stream } from '@dxos/codec-protobuf';
 import { ECHO } from '@dxos/echo-db';
@@ -47,6 +47,8 @@ export class HaloService implements IHaloService {
     assert(await this.echo.halo.keyring.getKey(request.keyRecord.publicKey), 'Key not inserted correctly.');
   }
 
+  // TODO(burdon): subscribeToContacts or just query/contacts with subscription object.
+  //  ResultSet vs Stream?
   subscribeContacts (): Stream<Contacts> {
     if (this.echo.halo.identity) {
       return resultSetToStream(this.echo.halo.queryContacts(), (contacts): Contacts => ({ contacts }));

package/src/services/impl/party.ts

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

package/src/services/impl/profile.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import assert from 'assert';
+import assert from 'node:assert';
 import { v4 } from 'uuid';
 
 import { latch } from '@dxos/async';
@@ -30,6 +30,7 @@ import { CreateServicesOpts, InviteeInvitation, InviteeInvitations } from './typ
 export class ProfileService implements IProfileService {
   private inviteeInvitations: InviteeInvitations = new Map();
 
+  // TODO(burdon): Pass in HALO.
   constructor (
     private readonly echo: ECHO
   ) {}

package/src/services/impl/types.ts

@@ -3,10 +3,10 @@
 //
 
 import { Config } from '@dxos/config';
-import { KeyRecord } from '@dxos/credentials';
 import { ECHO } from '@dxos/echo-db';
 
 import { SignRequest, SignResponse } from '../../proto/gen/dxos/client';
+import { KeyRecord } from '../../proto/gen/dxos/halo/keys';
 
 /**
  * Signer plugin.

package/src/services/services.test.ts

@@ -2,8 +2,8 @@
 // Copyright 2020 DXOS.org
 //
 
-import assert from 'assert';
 import { it as test } from 'mocha';
+import assert from 'node:assert';
 
 import { latch } from '@dxos/async';
 import { RpcClosedError } from '@dxos/rpc';

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "2.33.6";
+export const DXOS_VERSION = "2.33.8";