@dxos/client 2.28.1-dev.f858bec7 → 2.28.2-dev.5bd59700

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dxos/client",
-  "version": "2.28.1-dev.f858bec7",
-  "license": "AGPL-3.0",
+  "version": "2.28.2-dev.5bd59700",
+  "license": "MIT",
   "author": "DXOS.org",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -10,21 +10,21 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.28.1-dev.f858bec7",
-    "@dxos/codec-protobuf": "2.28.1-dev.f858bec7",
-    "@dxos/config": "2.28.1-dev.f858bec7",
-    "@dxos/credentials": "2.28.1-dev.f858bec7",
-    "@dxos/crypto": "2.28.1-dev.f858bec7",
-    "@dxos/debug": "2.28.1-dev.f858bec7",
-    "@dxos/echo-db": "2.28.1-dev.f858bec7",
-    "@dxos/echo-protocol": "2.28.1-dev.f858bec7",
-    "@dxos/feed-store": "2.28.1-dev.f858bec7",
-    "@dxos/model-factory": "2.28.1-dev.f858bec7",
-    "@dxos/network-manager": "2.28.1-dev.f858bec7",
-    "@dxos/object-model": "2.28.1-dev.f858bec7",
-    "@dxos/protocol": "2.28.1-dev.f858bec7",
-    "@dxos/rpc": "2.28.1-dev.f858bec7",
-    "@dxos/util": "2.28.1-dev.f858bec7",
+    "@dxos/async": "2.28.2-dev.5bd59700",
+    "@dxos/codec-protobuf": "2.28.2-dev.5bd59700",
+    "@dxos/config": "2.28.2-dev.5bd59700",
+    "@dxos/credentials": "2.28.2-dev.5bd59700",
+    "@dxos/crypto": "2.28.2-dev.5bd59700",
+    "@dxos/debug": "2.28.2-dev.5bd59700",
+    "@dxos/echo-db": "2.28.2-dev.5bd59700",
+    "@dxos/echo-protocol": "2.28.2-dev.5bd59700",
+    "@dxos/feed-store": "2.28.2-dev.5bd59700",
+    "@dxos/model-factory": "2.28.2-dev.5bd59700",
+    "@dxos/network-manager": "2.28.2-dev.5bd59700",
+    "@dxos/object-model": "2.28.2-dev.5bd59700",
+    "@dxos/protocols": "2.28.2-dev.5bd59700",
+    "@dxos/rpc": "2.28.2-dev.5bd59700",
+    "@dxos/util": "2.28.2-dev.5bd59700",
     "@polkadot/keyring": "6.11.1",
     "@polkadot/util": "6.11.1",
     "@polkadot/util-crypto": "6.11.1",
@@ -41,9 +41,9 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@dxos/random-access-multi-storage": "2.28.1-dev.f858bec7",
-    "@dxos/testutils": "2.28.0",
-    "@dxos/toolchain-node-library": "2.28.0",
+    "@dxos/random-access-multi-storage": "2.28.2-dev.5bd59700",
+    "@dxos/testutils": "2.28.1",
+    "@dxos/toolchain-node-library": "2.28.1",
     "@types/debug": "^4.1.7",
     "@types/jest": "^26.0.7",
     "@types/level-js": "~4.0.1",

package/src/api/halo-proxy.ts

@@ -15,21 +15,26 @@ export interface CreateInvitationOptions extends InvitationOptions {
   onPinGenerated?: (pin: string) => void
 }
 
-export class HaloProxy extends InvitationProxy {
+export class HaloProxy {
+  private readonly _invitationProxy = new InvitationProxy();
+  private readonly _subscriptions = new SubscriptionGroup();
+
   private _profile?: Profile;
   private _contacts: PartyMember[] = [];
 
-  public readonly profileChanged = new Event();
   private readonly _contactsChanged = new Event();
+  public readonly profileChanged = new Event();
 
-  private readonly _subscriptions = new SubscriptionGroup();
+  constructor (
+    private readonly _serviceProvider: ClientServiceProvider
+  ) {}
 
-  constructor (private readonly _serviceProvider: ClientServiceProvider) {
-    super();
+  toString () {
+    return `HaloProxy(${this._profile?.publicKey})`;
   }
 
-  override toString () {
-    return `HaloProxy(${this._profile?.publicKey})`;
+  get invitationProxy () {
+    return this._invitationProxy;
   }
 
   /**
@@ -87,7 +92,7 @@ export class HaloProxy extends InvitationProxy {
    */
   async createInvitation (): Promise<InvitationRequest> {
     const stream = await this._serviceProvider.services.ProfileService.createInvitation();
-    return this.createInvitationRequest({ stream });
+    return this._invitationProxy.createInvitationRequest({ stream });
   }
 
   /**

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

@@ -32,7 +32,7 @@ export class InvitationProxy {
   readonly activeInvitations: InvitationRequest[] = [];
   readonly invitationsUpdate = new Event();
 
-  protected async createInvitationRequest ({ stream }: CreateInvitationRequestOpts): Promise<InvitationRequest> {
+  async createInvitationRequest ({ stream }: CreateInvitationRequestOpts): Promise<InvitationRequest> {
     return new Promise((resolve, reject) => {
       const connected = new Event();
       const finished = new Event();

package/src/api/party-proxy.ts

@@ -5,7 +5,7 @@
 import { PublicKey } from '@dxos/crypto';
 import { failUndefined } from '@dxos/debug';
 import {
-  ActivationOptions, Database, PARTY_ITEM_TYPE, PARTY_TITLE_PROPERTY, RemoteDatabaseBackend, RootSelector
+  PARTY_ITEM_TYPE, PARTY_TITLE_PROPERTY, ActivationOptions, Database, RemoteDatabaseBackend, RootSelector
 } from '@dxos/echo-db';
 import { PartyKey } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
@@ -21,8 +21,9 @@ export interface CreationInvitationOptions {
   inviteeKey?: PublicKey
 }
 
-export class Party extends InvitationProxy {
+export class Party {
   private readonly _database?: Database;
+  private readonly _invitationProxy = new InvitationProxy();
 
   private _key: PartyKey;
   private _isOpen: boolean;
@@ -37,7 +38,6 @@ export class Party extends InvitationProxy {
     party: PartyProto,
     memberKey: PublicKey
   ) {
-    super();
     this._key = party.publicKey;
     this._isOpen = party.isOpen;
     this._isActive = party.isActive;
@@ -60,6 +60,10 @@ export class Party extends InvitationProxy {
     }
   }
 
+  get invitationProxy () {
+    return this._invitationProxy;
+  }
+
   async init () {
     if (this._database && this._serviceProvider instanceof ClientServiceProxy) {
       await this._database.init();
@@ -146,7 +150,7 @@ export class Party extends InvitationProxy {
    */
   async createInvitation ({ inviteeKey }: CreationInvitationOptions = {}): Promise<InvitationRequest> {
     const stream = this._serviceProvider.services.PartyService.createInvitation({ partyKey: this.key, inviteeKey });
-    return this.createInvitationRequest({ stream });
+    return this._invitationProxy.createInvitationRequest({ stream });
   }
 
   queryMembers () {

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

@@ -3,7 +3,7 @@
 //
 
 import { Config } from '@dxos/config';
-import * as debug from '@dxos/debug'; // TODO(burdon): ???
+import * as debug from '@dxos/debug'; // TODO(burdon): Why import *?
 import { ECHO, OpenProgress } from '@dxos/echo-db';
 
 import { createDevtoolsHost, DevtoolsHostEvents, DevtoolsServiceDependencies } from '../../devtools';

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

@@ -21,7 +21,6 @@ import {
   SetPreferenceRequest,
   GetPreferenceRequest,
   GetPreferenceResponse
-
 } from '../../../proto/gen/dxos/client';
 import { resultSetToStream } from '../../../util';
 import { CreateServicesOpts } from './interfaces';

package/src/proto/imports.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-import "@dxos/protocol/src/proto/dxos/client.proto";
-import "@dxos/protocol/src/proto/dxos/devtools.proto";
-import "@dxos/protocol/src/proto/dxos/config.proto";
-import "@dxos/protocol/src/proto/dxos/echo/service.proto";
+import "@dxos/protocols/src/proto/dxos/client.proto";
+import "@dxos/protocols/src/proto/dxos/devtools.proto";
+import "@dxos/protocols/src/proto/dxos/config.proto";
+import "@dxos/protocols/src/proto/dxos/echo/service.proto";