@dxos/client 2.33.7-dev.848c0285 → 2.33.7-dev.c2ba88fb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client",
-  "version": "2.33.7-dev.848c0285",
+  "version": "2.33.7-dev.c2ba88fb",
   "license": "MIT",
   "author": "DXOS.org",
   "main": "dist/src/index.js",
@@ -10,21 +10,21 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.33.7-dev.848c0285",
-    "@dxos/codec-protobuf": "2.33.7-dev.848c0285",
-    "@dxos/config": "2.33.7-dev.848c0285",
-    "@dxos/credentials": "2.33.7-dev.848c0285",
-    "@dxos/crypto": "2.33.7-dev.848c0285",
-    "@dxos/debug": "2.33.7-dev.848c0285",
-    "@dxos/echo-db": "2.33.7-dev.848c0285",
-    "@dxos/echo-protocol": "2.33.7-dev.848c0285",
-    "@dxos/feed-store": "2.33.7-dev.848c0285",
-    "@dxos/model-factory": "2.33.7-dev.848c0285",
-    "@dxos/network-manager": "2.33.7-dev.848c0285",
-    "@dxos/object-model": "2.33.7-dev.848c0285",
-    "@dxos/protocols": "2.33.7-dev.848c0285",
-    "@dxos/rpc": "2.33.7-dev.848c0285",
-    "@dxos/util": "2.33.7-dev.848c0285",
+    "@dxos/async": "2.33.7-dev.c2ba88fb",
+    "@dxos/codec-protobuf": "2.33.7-dev.c2ba88fb",
+    "@dxos/config": "2.33.7-dev.c2ba88fb",
+    "@dxos/credentials": "2.33.7-dev.c2ba88fb",
+    "@dxos/crypto": "2.33.7-dev.c2ba88fb",
+    "@dxos/debug": "2.33.7-dev.c2ba88fb",
+    "@dxos/echo-db": "2.33.7-dev.c2ba88fb",
+    "@dxos/echo-protocol": "2.33.7-dev.c2ba88fb",
+    "@dxos/feed-store": "2.33.7-dev.c2ba88fb",
+    "@dxos/model-factory": "2.33.7-dev.c2ba88fb",
+    "@dxos/network-manager": "2.33.7-dev.c2ba88fb",
+    "@dxos/object-model": "2.33.7-dev.c2ba88fb",
+    "@dxos/protocols": "2.33.7-dev.c2ba88fb",
+    "@dxos/rpc": "2.33.7-dev.c2ba88fb",
+    "@dxos/util": "2.33.7-dev.c2ba88fb",
     "abstract-leveldown": "~7.0.0",
     "assert": "^2.0.0",
     "debug": "^4.3.3",
@@ -37,9 +37,9 @@
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@dxos/eslint-plugin": "~1.0.33",
+    "@dxos/eslint-plugin": "~1.0.34",
     "@dxos/protocols-toolchain": "2.33.6",
-    "@dxos/random-access-multi-storage": "2.33.7-dev.848c0285",
+    "@dxos/random-access-multi-storage": "2.33.7-dev.c2ba88fb",
     "@dxos/testutils": "2.33.6",
     "@types/debug": "^4.1.7",
     "@types/jest": "^26.0.7",

package/src/api/client.ts

@@ -261,6 +261,7 @@ export class Client {
    * Registers a new ECHO model.
    * @deprecated
    */
+  // TODO(burdon): Remove (moved to echo).
   registerModel (constructor: ModelConstructor<any>): this {
     this._echo.modelFactory.registerModel(constructor);
     return this;

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

@@ -69,11 +69,11 @@ export class InvitationProxy {
           reject(err);
           error.emit(err);
         }
-      }, error => {
-        if (error) {
-          console.error(error);
-          reject(error);
+      }, err => {
+        if (err) {
           // TODO(rzadp): Handle retry.
+          console.error(err);
+          reject(error);
         }
       });
     });
@@ -102,10 +102,10 @@ export class InvitationProxy {
         // TODO(dmaretskyi): Should result in an error inside the returned Invitation, rejecting the promise in Invitation.wait().
         throwUnhandledRejection(error);
       }
-    }, error => {
-      if (error && !(error instanceof RpcClosedError)) {
+    }, err => {
+      if (err && !(err instanceof RpcClosedError)) {
         // TODO(dmaretskyi): Should result in an error inside the returned Invitation, rejecting the promise in Invitation.wait().
-        throwUnhandledRejection(error);
+        throwUnhandledRejection(err);
       }
     });
 

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

@@ -119,12 +119,14 @@ export class EchoProxy implements Echo {
 
             partyProxy._processPartyUpdate(party);
             this._partiesChanged.emit();
-          }, () => {});
+          });
+
           this._subscriptions.push(() => partyStream.close());
         }
       }
+
       this._partiesChanged.emit();
-    }, () => {});
+    });
 
     this._subscriptions.push(() => partiesStream.close());
 

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

@@ -192,14 +192,16 @@ export class HaloProxy implements Halo {
     profileStream.subscribe(data => {
       this._profile = data.profile;
       this.profileChanged.emit();
-    }, () => {});
+    });
+
     this._subscriptions.push(() => profileStream.close());
 
     const contactsStream = this._serviceProvider.services.HaloService.subscribeContacts();
     contactsStream.subscribe(data => {
       this._contacts = data.contacts as PartyMember[];
       this._contactsChanged.emit();
-    }, () => {});
+    });
+
     this._subscriptions.push(() => contactsStream.close());
 
     await Promise.all([gotProfile, gotContacts]);

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

@@ -51,6 +51,7 @@ export interface Party {
   setTitle (title: string): Promise<void>
   getTitle (): string
 
+  // TODO(burdon): Rename (info?)
   getDetails(): Promise<PartyDetails>
 
   get properties (): ObjectProperties
@@ -112,7 +113,7 @@ export class PartyProxy implements Party {
     }
   }
 
-  // TODO(burdon): Getter require by react hook.
+  // TODO(burdon): Getter required by react hook.
   get invitationProxy () {
     return this._invitationProxy;
   }

package/src/devtools/devtools-host.ts

@@ -9,7 +9,7 @@ import { getConfig } from './config';
 import { enableDebugLogging, disableDebugLogging } from './debug-logging';
 import { DevtoolsServiceDependencies } from './devtools-context';
 import { DevtoolsHostEvents } from './devtools-host-events';
-import { subscribeToFeed, subscribeToFeeds } from './feeds';
+import { subscribeToFeeds, subscribeToFeedBlocks } from './feeds';
 import { subscribeToItems } from './items';
 import { subscribeToCredentialMessages, subscribeToKeyringKeys } from './keys';
 import {
@@ -22,15 +22,17 @@ import {
 import { getPartySnapshot, savePartySnapshot, subscribeToParties } from './parties';
 import { resetStorage } from './storage';
 
-export const createDevtoolsHost = (context: DevtoolsServiceDependencies, events: DevtoolsHostEvents): DevtoolsHost => ({
+export const createDevtoolsHost = (
+  context: DevtoolsServiceDependencies,
+  events: DevtoolsHostEvents
+): DevtoolsHost => ({
   events: () => new Stream<ClientAPIEvent>(({ next }) => {
     events.ready.on(() => {
       next({ ready: {} });
     });
   }),
   getConfig: async () => {
-    const config = getConfig(context);
-    return config;
+    return getConfig(context);
   },
   resetStorage: async () => {
     await resetStorage(context);
@@ -45,10 +47,10 @@ export const createDevtoolsHost = (context: DevtoolsServiceDependencies, events:
   },
   subscribeToKeyringKeys: () => subscribeToKeyringKeys(context),
   subscribeToCredentialMessages: (request) => subscribeToCredentialMessages(context, request),
-  subscribeToParties: () => subscribeToParties(context),
+  subscribeToParties: (request) => subscribeToParties(context, request),
   subscribeToItems: () => subscribeToItems(context),
-  subscribeToFeeds: () => subscribeToFeeds(context),
-  subscribeToFeed: (request) => subscribeToFeed(context, request),
+  subscribeToFeeds: (request) => subscribeToFeeds(context, request),
+  subscribeToFeedBlocks: (request) => subscribeToFeedBlocks(context, request),
   getPartySnapshot: async (request) => getPartySnapshot(context, request),
   savePartySnapshot: async (request) => savePartySnapshot(context, request),
   clearSnapshots: async () => {

package/src/devtools/feeds.ts

@@ -5,45 +5,80 @@
 import { Readable } from 'readable-stream';
 
 import { Stream } from '@dxos/codec-protobuf';
+import { PublicKey } from '@dxos/crypto';
 import { createBatchStream } from '@dxos/feed-store';
 
-import { SubscribeToFeedRequest, SubscribeToFeedResponse, SubscribeToFeedsResponse } from '../proto/gen/dxos/devtools';
+import {
+  SubscribeToFeedsRequest,
+  SubscribeToFeedsResponse,
+  SubscribeToFeedBlocksRequest,
+  SubscribeToFeedBlocksResponse
+} from '../proto/gen/dxos/devtools';
 import { DevtoolsServiceDependencies } from './devtools-context';
 
-export const subscribeToFeeds = ({ echo }: DevtoolsServiceDependencies) => new Stream<SubscribeToFeedsResponse>(({ next }) => {
-  const update = () => {
+export const subscribeToFeeds = (
+  { echo }: DevtoolsServiceDependencies,
+  { partyKey, feedKeys }: SubscribeToFeedsRequest
+) => new Stream<SubscribeToFeedsResponse>(({ next }) => {
+  if (!partyKey || feedKeys?.length === 0) {
+    return;
+  }
+
+  const feedMap = new Map<PublicKey, { feedKey: PublicKey, stream: Readable, length: number }>();
+
+  setImmediate(async () => {
     const { value: parties } = echo.queryParties();
-    next({
-      parties: parties.map(party => ({
-        key: party.key,
-        feeds: party.getFeeds().map(feed => feed.key)
-      }))
-    });
-  };
+    const party = parties.find(party => party.key.equals(partyKey));
+    if (!party) {
+      return;
+    }
 
-  const partySubscriptions: Record<string, () => void> = {};
-  const unsubscribe = echo.queryParties().subscribe((parties) => {
-    parties.forEach((party) => {
-      if (!partySubscriptions[party.key.toHex()]) {
-        // Send updates on timeframe changes.
-        partySubscriptions[party.key.toHex()] = party.timeframeUpdate.on(() => update());
-      }
-    });
+    const feeds = await party.getFeeds();
+    feeds
+      .filter(feed => !feedKeys?.length || feedKeys.some(feedKey => feedKey.equals(feed.key)))
+      .forEach(feed => {
+        let feedInfo = feedMap.get(feed.key);
+        if (!feedInfo) {
+          // TODO(wittjosiah): Start from timeframe?
+          // TODO(wittjosiah): Bi-directional lazy loading to feed into virtualized table.
+          // Tail feed so as to not overload the browser.
+          const feedStream = new Readable({ objectMode: true })
+            .wrap(createBatchStream(feed.feed, {
+              live: true,
+              start: 0
+            }));
 
-    // Send feeds for new parties.
-    update();
-  });
+          feedStream.on('data', blocks => {
+            feedInfo!.length += blocks.length;
+
+            next({
+              feeds: Array.from(feedMap.values()).map(({ feedKey, length }) => ({
+                feedKey,
+                length
+              }))
+            });
+          });
 
-  // Send initial feeds.
-  update();
+          feedInfo = {
+            feedKey: feed.key,
+            stream: feedStream,
+            length: 0
+          };
+
+          feedMap.set(feed.key, feedInfo);
+        }
+      });
+  });
 
   return () => {
-    unsubscribe();
-    Object.values(partySubscriptions).forEach(unsubscribe => unsubscribe());
+    feedMap.forEach(({ stream }) => stream.destroy());
   };
 });
 
-export const subscribeToFeed = ({ echo }: DevtoolsServiceDependencies, { partyKey, feedKey }: SubscribeToFeedRequest) => new Stream<SubscribeToFeedResponse>(({ next }) => {
+export const subscribeToFeedBlocks = (
+  { echo }: DevtoolsServiceDependencies,
+  { partyKey, feedKey, maxBlocks = 10 }: SubscribeToFeedBlocksRequest
+) => new Stream<SubscribeToFeedBlocksResponse>(({ next }) => {
   if (!partyKey || !feedKey) {
     return;
   }
@@ -56,16 +91,19 @@ export const subscribeToFeed = ({ echo }: DevtoolsServiceDependencies, { partyKe
       return;
     }
 
-    const feed = await party.getFeeds().find(feed => feed.key.equals(feedKey));
-    if (!feed) {
+    const descriptor = await party.getFeeds().find(feed => feed.key.equals(feedKey));
+    if (!descriptor) {
       return;
     }
 
     // TODO(wittjosiah): Start from timeframe?
-    // TODO(wittjosiah): Bidirectional lazy loading to feed into virtualized table.
+    // TODO(wittjosiah): Bi-directional lazy loading to feed into virtualized table.
     // Tail feed so as to not overload the browser.
     feedStream = new Readable({ objectMode: true })
-      .wrap(createBatchStream(feed.feed, { live: true, start: Math.max(0, feed.feed.length - 10) }));
+      .wrap(createBatchStream(descriptor.feed, {
+        live: true,
+        start: Math.max(0, descriptor.feed.length - maxBlocks)
+      }));
 
     feedStream.on('data', blocks => {
       next({ blocks });

package/src/devtools/parties.ts

@@ -9,14 +9,32 @@ import {
   GetPartySnapshotResponse,
   SavePartySnapshotRequest,
   SavePartySnapshotResponse,
+  SubscribeToPartiesRequest,
   SubscribeToPartiesResponse
 } from '../proto/gen/dxos/devtools';
 import { DevtoolsServiceDependencies } from './devtools-context';
 
-export const subscribeToParties = ({ echo }: DevtoolsServiceDependencies) => new Stream<SubscribeToPartiesResponse>(({ next }) => {
+export const subscribeToParties = (
+  { echo }: DevtoolsServiceDependencies,
+  { partyKeys = [] }: SubscribeToPartiesRequest
+) => new Stream<SubscribeToPartiesResponse>(({ next }) => {
   const update = () => {
     const { value: parties } = echo.queryParties();
-    next({ parties: parties.map(party => party.partyInfo) });
+    const filteredParties = parties.filter(
+      party => !partyKeys?.length || partyKeys.some(partyKey => partyKey.equals(party.key)));
+
+    next({
+      parties: filteredParties.map(party => {
+        return {
+          key: party.key,
+          isOpen: party.isOpen,
+          isActive: party.isActive,
+          timeframe: party.timeframe,
+          feeds: party.getFeeds().map(feed => feed.key),
+          properties: party.isOpen ? party.getPropertiesSet().expectOne().model.toObject() : undefined
+        };
+      })
+    });
   };
 
   const partySubscriptions: Record<string, () => void> = {};

package/src/proto/gen/dxos/devtools.ts

@@ -22,7 +22,7 @@ export interface DevtoolsHost {
     subscribeToParties: (request: SubscribeToPartiesRequest) => Stream<SubscribeToPartiesResponse>;
     subscribeToItems: (request: SubscribeToItemsRequest) => Stream<SubscribeToItemsResponse>;
     subscribeToFeeds: (request: SubscribeToFeedsRequest) => Stream<SubscribeToFeedsResponse>;
-    subscribeToFeed: (request: SubscribeToFeedRequest) => Stream<SubscribeToFeedResponse>;
+    subscribeToFeedBlocks: (request: SubscribeToFeedBlocksRequest) => Stream<SubscribeToFeedBlocksResponse>;
     getPartySnapshot: (request: GetPartySnapshotRequest) => Promise<GetPartySnapshotResponse>;
     savePartySnapshot: (request: SavePartySnapshotRequest) => Promise<SavePartySnapshotResponse>;
     clearSnapshots: (request: ClearSnapshotsRequest) => Promise<void>;
@@ -79,18 +79,19 @@ export namespace GetNetworkPeersResponse {
     }
 }
 export interface SubscribeToPartiesRequest {
+    partyKeys?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>[];
 }
 export interface SubscribeToPartiesResponse {
     parties?: SubscribeToPartiesResponse.PartyInfo[];
 }
 export namespace SubscribeToPartiesResponse {
     export interface PartyInfo {
-        key?: string;
+        key?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
         isOpen?: boolean;
         isActive?: boolean;
-        feedKeys?: number;
-        properties?: Partial<Record<string, string>>;
         timeframe?: ReturnType<(typeof substitutions)["dxos.echo.timeframe.TimeframeVector"]["decode"]>;
+        feeds?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>[];
+        properties?: Partial<Record<string, string>>;
     }
 }
 export interface SubscribeToItemsRequest {
@@ -99,25 +100,28 @@ export interface SubscribeToItemsResponse {
     data?: string;
 }
 export interface SubscribeToFeedsRequest {
+    partyKey?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
+    feedKeys?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>[];
 }
 export interface SubscribeToFeedsResponse {
-    parties?: SubscribeToFeedsResponse.Party[];
+    feeds?: SubscribeToFeedsResponse.Feed[];
 }
 export namespace SubscribeToFeedsResponse {
-    export interface Party {
-        key?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
-        feeds?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>[];
+    export interface Feed {
+        feedKey?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
+        length?: number;
     }
 }
-export interface SubscribeToFeedRequest {
+export interface SubscribeToFeedBlocksRequest {
     partyKey?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
     feedKey?: ReturnType<(typeof substitutions)["dxos.halo.keys.PubKey"]["decode"]>;
+    maxBlocks?: number;
 }
-export interface SubscribeToFeedResponse {
-    blocks?: SubscribeToFeedResponse.EchoFeedBlock[];
+export interface SubscribeToFeedBlocksResponse {
+    blocks?: SubscribeToFeedBlocksResponse.Block[];
 }
-export namespace SubscribeToFeedResponse {
-    export interface EchoFeedBlock {
+export namespace SubscribeToFeedBlocksResponse {
+    export interface Block {
         key?: Uint8Array;
         seq?: number;
         sync?: boolean;
@@ -193,10 +197,10 @@ export namespace SubscribeToSwarmInfoResponse {
         }
     }
 }
-export interface SetTracingOptionsRequest {
-    enable?: boolean;
-}
 export interface TracingService {
     setTracingOptions: (request: SetTracingOptionsRequest) => Promise<void>;
     subscribeToRpcTrace: (request: void) => Stream<dxos_rpc.RpcMessage>;
 }
+export interface SetTracingOptionsRequest {
+    enable?: boolean;
+}

package/src/proto/gen/google/protobuf.ts

@@ -13,14 +13,14 @@ import * as dxos_halo_keys from "../dxos/halo/keys";
 import * as dxos_rpc from "../dxos/rpc";
 export interface Empty {
 }
-export interface Timestamp {
-    seconds?: string;
-    nanos?: number;
-}
 export interface Any {
     type_url?: string;
     value?: Uint8Array;
 }
+export interface Timestamp {
+    seconds?: string;
+    nanos?: number;
+}
 export interface FileDescriptorSet {
     file?: FileDescriptorProto[];
 }