@dxos/client 2.29.1 → 2.29.2-dev.f64f2a6f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client",
-  "version": "2.29.1",
+  "version": "2.29.2-dev.f64f2a6f",
   "license": "MIT",
   "author": "DXOS.org",
   "main": "dist/src/index.js",
@@ -9,26 +9,32 @@
     "dist",
     "src"
   ],
+  "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",
+    "lint": "toolchain lint",
+    "test": "toolchain test"
+  },
   "dependencies": {
-    "@dxos/async": "2.29.1",
-    "@dxos/codec-protobuf": "2.29.1",
-    "@dxos/config": "2.29.1",
-    "@dxos/credentials": "2.29.1",
-    "@dxos/crypto": "2.29.1",
-    "@dxos/debug": "2.29.1",
-    "@dxos/echo-db": "2.29.1",
-    "@dxos/echo-protocol": "2.29.1",
-    "@dxos/feed-store": "2.29.1",
-    "@dxos/model-factory": "2.29.1",
-    "@dxos/network-manager": "2.29.1",
-    "@dxos/object-model": "2.29.1",
-    "@dxos/protocols": "2.29.1",
-    "@dxos/rpc": "2.29.1",
-    "@dxos/util": "2.29.1",
+    "@dxos/async": "workspace:*",
+    "@dxos/codec-protobuf": "workspace:*",
+    "@dxos/config": "workspace:*",
+    "@dxos/credentials": "workspace:*",
+    "@dxos/crypto": "workspace:*",
+    "@dxos/debug": "workspace:*",
+    "@dxos/echo-db": "workspace:*",
+    "@dxos/echo-protocol": "workspace:*",
+    "@dxos/feed-store": "workspace:*",
+    "@dxos/model-factory": "workspace:*",
+    "@dxos/network-manager": "workspace:*",
+    "@dxos/object-model": "workspace:*",
+    "@dxos/protocols": "workspace:*",
+    "@dxos/rpc": "workspace:*",
+    "@dxos/util": "workspace:*",
     "@polkadot/keyring": "6.11.1",
     "@polkadot/util": "6.11.1",
     "@polkadot/util-crypto": "6.11.1",
-    "@wirelineio/registry-client": "~1.1.0-beta.3",
     "abstract-leveldown": "~7.0.0",
     "assert": "^2.0.0",
     "debug": "^4.3.3",
@@ -42,9 +48,9 @@
   },
   "devDependencies": {
     "@dxos/eslint-plugin": "~1.0.27",
-    "@dxos/protocols-toolchain": "2.29.1",
-    "@dxos/random-access-multi-storage": "2.29.1",
-    "@dxos/testutils": "2.29.1",
+    "@dxos/protocols-toolchain": "workspace:*",
+    "@dxos/random-access-multi-storage": "workspace:*",
+    "@dxos/testutils": "workspace:*",
     "@types/debug": "^4.1.7",
     "@types/jest": "^26.0.7",
     "@types/level-js": "~4.0.1",
@@ -64,13 +70,5 @@
   },
   "toolchain": {
     "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",
-    "lint": "toolchain lint",
-    "test": "toolchain test"
-  },
-  "readme": "# @dxos/client\n\n[![js-semistandard-style](https://img.shields.io/badge/code%20style-semistandard-brightgreen.svg?style=flat-square)](https://github.com/standard/semistandard)\n[![standard-readme compliant](https://img.shields.io/badge/readme%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)\n\nDescription...\n\n## Install\n\n## Usage\n\n...\n\n## Contributing\n\nPRs accepted.\n\n## License\n\nAGPL-3.0 © DXOS\n"
-}
+  }
+}

package/src/api/party-proxy.ts

@@ -69,6 +69,26 @@ export class Party {
     return this._invitationProxy;
   }
 
+  get key () {
+    return this._key;
+  }
+
+  get isOpen () {
+    return this._isOpen;
+  }
+
+  get isActive () {
+    return this._isActive;
+  }
+
+  get database (): Database {
+    if (!this._database) {
+      throw Error('Party not open.');
+    }
+
+    return this._database;
+  }
+
   /**
    * Called by EchoProxy open.
    */
@@ -90,26 +110,6 @@ export class Party {
     }
   }
 
-  get key () {
-    return this._key;
-  }
-
-  get isOpen () {
-    return this._isOpen;
-  }
-
-  get isActive () {
-    return this._isActive;
-  }
-
-  get database (): Database {
-    if (!this._database) {
-      throw Error('Party not open.');
-    }
-
-    return this._database;
-  }
-
   async open () {
     return this.setOpen(true);
   }

package/src/client/client.test.ts

@@ -313,11 +313,11 @@ describe('Client', () => {
       const client = new Client(config);
       await client.initialize();
       client.registerModel(TestModel);
+      // TODO(burdon): Better error if halo is not created.
       await client.halo.createProfile({ username: 'test-user' });
       const party = await client.echo.createParty();
       const item = await party.database.createItem({ model: TestModel, type: 'test' });
       await item.model.set('prop', 'value1');
-
       await client.destroy();
     }
 
@@ -330,7 +330,7 @@ describe('Client', () => {
       client.registerModel(TestModel);
 
       const party = client.echo.queryParties().first;
-      const result = party.database.select({ type: 'test' }).query();
+      const result = party.database.select({ type: 'test' }).exec();
       await result.update.waitForCondition(() => result.entities.length > 0);
       const item = result.expectOne();
 

package/src/client/service-host/services/halo.ts

@@ -2,6 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
+// TODO(burdon): Factor out polkadot deps (plugin?)
 import PolkadotKeyring from '@polkadot/keyring';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
 import assert from 'assert';
@@ -59,11 +60,11 @@ export class HaloService implements IHaloService {
     assert(await this.echo.halo.keyring.getKey(request.keyRecord.publicKey), 'Key not inserted correctly.');
   }
 
+  // TODO(burdon): Factor out polkadot deps (plugin?)
   private async polkadotSign (key: KeyRecord, payload: Uint8Array): Promise<SignResponse> {
     await cryptoWaitReady();
 
     assert(key.secretKey, 'Secret key is missing.');
-
     const keyring = new PolkadotKeyring({ type: 'sr25519' });
     const keypair = keyring.addFromUri(key.secretKey.toString());
 
@@ -72,6 +73,7 @@ export class HaloService implements IHaloService {
     };
   }
 
+  // TODO(burdon): Factor out polkadot deps (plugin?)
   async sign (request: SignRequest): Promise<SignResponse> {
     assert(request.publicKey, 'Provide a publicKey of the key that should be used for signing.');
     const key = await this.echo.halo.keyring.getFullKey(request.publicKey);
@@ -80,7 +82,8 @@ export class HaloService implements IHaloService {
       assert(request.payload, 'No payload to sign.');
       return this.polkadotSign(key, request.payload);
     }
-    throw new Error('Only DXNS Address key signing is supported.');
+
+    throw new Error('Only DXNS address key signing is supported.');
   }
 
   async setGlobalPreference (request: SetPreferenceRequest): Promise<void> {

package/src/devtools/items.ts

@@ -19,7 +19,7 @@ const getData = (echo: DevtoolsServiceDependencies['echo']): SubscribeToItemsRes
       items: []
     };
 
-    const queryResult = party.database.select().query();
+    const queryResult = party.database.select().exec();
     for (const item of queryResult.entities) {
       partyInfo.items.push({
         id: item.id,
@@ -48,7 +48,7 @@ export const subscribeToItems = ({ echo }: DevtoolsServiceDependencies) => {
     const unsubscribe = echo.queryParties().subscribe((parties) => {
       parties.forEach(party => {
         if (!partySubscriptions[party.key.toHex()]) {
-          const sub = party.database.select().query().update.on(() => {
+          const sub = party.database.select().exec().update.on(() => {
             // Send updates on items changes.
             update();
           });

package/src/index.ts

@@ -13,7 +13,7 @@ export * from './version';
 export * as proto from './proto/gen';
 
 export {
-  PARTY_ITEM_TYPE,
+  PARTY_ITEM_TYPE, // TODO(burdon): Remove?
   Entity,
   Item,
   Link,

package/src/shims.d.ts

@@ -3,5 +3,3 @@
 //
 
 declare module 'jsondown';
-
-declare module '@wirelineio/registry-client'; // TODO(burdon): Remove.

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "2.28.23";
+export const DXOS_VERSION = "2.29.1";