@dxos/client 2.33.5-dev.ea3876ba → 2.33.5-dev.fee8f5fe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client",
-  "version": "2.33.5-dev.ea3876ba",
+  "version": "2.33.5-dev.fee8f5fe",
   "license": "MIT",
   "author": "DXOS.org",
   "main": "dist/src/index.js",
@@ -10,21 +10,21 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "2.33.5-dev.ea3876ba",
-    "@dxos/codec-protobuf": "2.33.5-dev.ea3876ba",
-    "@dxos/config": "2.33.5-dev.ea3876ba",
-    "@dxos/credentials": "2.33.5-dev.ea3876ba",
-    "@dxos/crypto": "2.33.5-dev.ea3876ba",
-    "@dxos/debug": "2.33.5-dev.ea3876ba",
-    "@dxos/echo-db": "2.33.5-dev.ea3876ba",
-    "@dxos/echo-protocol": "2.33.5-dev.ea3876ba",
-    "@dxos/feed-store": "2.33.5-dev.ea3876ba",
-    "@dxos/model-factory": "2.33.5-dev.ea3876ba",
-    "@dxos/network-manager": "2.33.5-dev.ea3876ba",
-    "@dxos/object-model": "2.33.5-dev.ea3876ba",
-    "@dxos/protocols": "2.33.5-dev.ea3876ba",
-    "@dxos/rpc": "2.33.5-dev.ea3876ba",
-    "@dxos/util": "2.33.5-dev.ea3876ba",
+    "@dxos/async": "2.33.5-dev.fee8f5fe",
+    "@dxos/codec-protobuf": "2.33.5-dev.fee8f5fe",
+    "@dxos/config": "2.33.5-dev.fee8f5fe",
+    "@dxos/credentials": "2.33.5-dev.fee8f5fe",
+    "@dxos/crypto": "2.33.5-dev.fee8f5fe",
+    "@dxos/debug": "2.33.5-dev.fee8f5fe",
+    "@dxos/echo-db": "2.33.5-dev.fee8f5fe",
+    "@dxos/echo-protocol": "2.33.5-dev.fee8f5fe",
+    "@dxos/feed-store": "2.33.5-dev.fee8f5fe",
+    "@dxos/model-factory": "2.33.5-dev.fee8f5fe",
+    "@dxos/network-manager": "2.33.5-dev.fee8f5fe",
+    "@dxos/object-model": "2.33.5-dev.fee8f5fe",
+    "@dxos/protocols": "2.33.5-dev.fee8f5fe",
+    "@dxos/rpc": "2.33.5-dev.fee8f5fe",
+    "@dxos/util": "2.33.5-dev.fee8f5fe",
     "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.27",
+    "@dxos/eslint-plugin": "~1.0.33",
     "@dxos/protocols-toolchain": "2.33.4",
-    "@dxos/random-access-multi-storage": "2.33.5-dev.ea3876ba",
+    "@dxos/random-access-multi-storage": "2.33.5-dev.fee8f5fe",
     "@dxos/testutils": "2.33.4",
     "@types/debug": "^4.1.7",
     "@types/jest": "^26.0.7",
@@ -53,7 +53,7 @@
     "eslint": "^7.12.1",
     "expect": "~27.0.2",
     "mocha": "~8.4.0",
-    "typescript": "^4.5.2",
+    "typescript": "^4.7.2",
     "wait-for-expect": "^3.0.2"
   },
   "publishConfig": {

package/src/api/client.test.ts

@@ -25,7 +25,7 @@ describe('Client', () => {
   //
   // Suite is called for local and remote client configurations.
   //
-  function testSuite (createClient: () => Promise<Client>) {
+  const testSuite = (createClient: () => Promise<Client>) => {
     describe('initialization', () => {
       test('initialize and destroy', async () => {
         const client = await createClient();
@@ -285,12 +285,10 @@ describe('Client', () => {
         expect(details.processedTimeframe.frames().some(([key, seq]) => seq > 0)).toBe(true);
       });
     });
-  }
+  };
 
   describe('local', () => {
-    testSuite(async () => {
-      return new Client();
-    });
+    testSuite(async () => new Client());
   });
 
   describe('remote', () => {

package/src/devtools/config.ts

@@ -5,8 +5,6 @@
 import { GetConfigResponse } from '../proto/gen/dxos/devtools';
 import { DevtoolsServiceDependencies } from './devtools-context';
 
-export const getConfig = (hook: DevtoolsServiceDependencies): GetConfigResponse => {
-  return {
-    config: JSON.stringify(hook.config.values) // TODO(marik-d): Serialize config with protobuf.
-  };
-};
+export const getConfig = (hook: DevtoolsServiceDependencies): GetConfigResponse => ({
+  config: JSON.stringify(hook.config.values) // TODO(marik-d): Serialize config with protobuf.
+});

package/src/devtools/devtools-host.ts

@@ -22,71 +22,41 @@ import {
 import { getPartySnapshot, savePartySnapshot, subscribeToParties } from './parties';
 import { resetStorage } from './storage';
 
-export const createDevtoolsHost = (context: DevtoolsServiceDependencies, events: DevtoolsHostEvents) : DevtoolsHost => {
-  return {
-    events: () => {
-      return new Stream<ClientAPIEvent>(({ next }) => {
-        events.ready.on(() => {
-          next({ ready: {} });
-        });
-      });
-    },
-    getConfig: async () => {
-      const config = getConfig(context);
-      return config;
-    },
-    resetStorage: async () => {
-      await resetStorage(context);
-    },
-    enableDebugLogging: async (request) => {
-      enableDebugLogging(context, request);
-      return {};
-    },
-    disableDebugLogging: async () => {
-      disableDebugLogging(context);
-      return {};
-    },
-    subscribeToKeyringKeys: () => {
-      return subscribeToKeyringKeys(context);
-    },
-    subscribeToCredentialMessages: (request) => {
-      return subscribeToCredentialMessages(context, request);
-    },
-    subscribeToParties: () => {
-      return subscribeToParties(context);
-    },
-    subscribeToItems: () => {
-      return subscribeToItems(context);
-    },
-    subscribeToFeeds: () => {
-      return subscribeToFeeds(context);
-    },
-    subscribeToFeed: (request) => {
-      return subscribeToFeed(context, request);
-    },
-    getPartySnapshot: async (request) => {
-      return getPartySnapshot(context, request);
-    },
-    savePartySnapshot: async (request) => {
-      return savePartySnapshot(context, request);
-    },
-    clearSnapshots: async () => {
-      await context.echo.snapshotStore.clear();
-    },
-    getNetworkPeers: async (request) => {
-      return getNetworkPeers(context, request);
-    },
-    subscribeToNetworkTopics: () => {
-      return subscribeToNetworkTopics(context);
-    },
-    subscribeToSignalStatus: () => {
-      return subscribeToNetworkStatus(context);
-    },
-    subscribeToSignalTrace: () => {
-      return subscribeToSignalTrace(context);
-    },
-    subscribeToSwarmInfo: () => {
-      return subscribeToSwarmInfo(context);
-    }
-  };
-};
+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;
+  },
+  resetStorage: async () => {
+    await resetStorage(context);
+  },
+  enableDebugLogging: async (request) => {
+    enableDebugLogging(context, request);
+    return {};
+  },
+  disableDebugLogging: async () => {
+    disableDebugLogging(context);
+    return {};
+  },
+  subscribeToKeyringKeys: () => subscribeToKeyringKeys(context),
+  subscribeToCredentialMessages: (request) => subscribeToCredentialMessages(context, request),
+  subscribeToParties: () => subscribeToParties(context),
+  subscribeToItems: () => subscribeToItems(context),
+  subscribeToFeeds: () => subscribeToFeeds(context),
+  subscribeToFeed: (request) => subscribeToFeed(context, request),
+  getPartySnapshot: async (request) => getPartySnapshot(context, request),
+  savePartySnapshot: async (request) => savePartySnapshot(context, request),
+  clearSnapshots: async () => {
+    await context.echo.snapshotStore.clear();
+  },
+  getNetworkPeers: async (request) => getNetworkPeers(context, request),
+  subscribeToNetworkTopics: () => subscribeToNetworkTopics(context),
+  subscribeToSignalStatus: () => subscribeToNetworkStatus(context),
+  subscribeToSignalTrace: () => subscribeToSignalTrace(context),
+  subscribeToSwarmInfo: () => subscribeToSwarmInfo(context)
+});

package/src/devtools/feeds.ts

@@ -10,73 +10,69 @@ import { createBatchStream } from '@dxos/feed-store';
 import { SubscribeToFeedRequest, SubscribeToFeedResponse, SubscribeToFeedsResponse } from '../proto/gen/dxos/devtools';
 import { DevtoolsServiceDependencies } from './devtools-context';
 
-export const subscribeToFeeds = ({ echo }: DevtoolsServiceDependencies) => {
-  return new Stream<SubscribeToFeedsResponse>(({ next }) => {
-    const update = () => {
-      const { value: parties } = echo.queryParties();
-      next({
-        parties: parties.map(party => ({
-          key: party.key,
-          feeds: party.feedProvider.getFeeds().map(feed => feed.key)
-        }))
-      });
-    };
-
-    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());
-        }
-      });
+export const subscribeToFeeds = ({ echo }: DevtoolsServiceDependencies) => new Stream<SubscribeToFeedsResponse>(({ next }) => {
+  const update = () => {
+    const { value: parties } = echo.queryParties();
+    next({
+      parties: parties.map(party => ({
+        key: party.key,
+        feeds: party.getFeeds().map(feed => feed.key)
+      }))
+    });
+  };
 
-      // Send feeds for new parties.
-      update();
+  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());
+      }
     });
 
-    // Send initial feeds.
+    // Send feeds for new parties.
     update();
-
-    return () => {
-      unsubscribe();
-      Object.values(partySubscriptions).forEach(unsubscribe => unsubscribe());
-    };
   });
-};
 
-export const subscribeToFeed = (
-  { echo }: DevtoolsServiceDependencies,
-  { partyKey, feedKey }: SubscribeToFeedRequest
-) => {
-  return new Stream<SubscribeToFeedResponse>(({ next }) => {
-    if (!partyKey || !feedKey) {
+  // Send initial feeds.
+  update();
+
+  return () => {
+    unsubscribe();
+    Object.values(partySubscriptions).forEach(unsubscribe => unsubscribe());
+  };
+});
+
+export const subscribeToFeed = ({ echo }: DevtoolsServiceDependencies, { partyKey, feedKey }: SubscribeToFeedRequest) => new Stream<SubscribeToFeedResponse>(({ next }) => {
+  if (!partyKey || !feedKey) {
+    return;
+  }
+
+  let feedStream: Readable;
+  setImmediate(async () => {
+    const { value: parties } = echo.queryParties();
+    const party = parties.find(party => party.key.equals(partyKey));
+    if (!party) {
       return;
     }
 
-    let feedStream: Readable;
-    setImmediate(async () => {
-      const { value: parties } = echo.queryParties();
-      const party = parties.find(party => party.key.equals(partyKey));
-      if (!party) {
-        return;
-      }
-
-      const { feed } = await party.feedProvider.createOrOpenReadOnlyFeed(feedKey);
+    const feed = await party.getFeeds().find(feed => feed.key.equals(feedKey));
+    if (!feed) {
+      return;
+    }
 
-      // TODO(wittjosiah): Start from timeframe?
-      // TODO(wittjosiah): Bidirectional lazy loading to feed into virtualized table.
-      // Tail feed so as to not overload the browser.
-      feedStream = new Readable({ objectMode: true })
-        .wrap(createBatchStream(feed, { live: true, start: Math.max(0, feed.length - 10) }));
+    // TODO(wittjosiah): Start from timeframe?
+    // TODO(wittjosiah): Bidirectional 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) }));
 
-      feedStream.on('data', blocks => {
-        next({ blocks });
-      });
+    feedStream.on('data', blocks => {
+      next({ blocks });
     });
-
-    return () => {
-      feedStream?.destroy();
-    };
   });
-};
+
+  return () => {
+    feedStream?.destroy();
+  };
+});

package/src/devtools/items.ts

@@ -37,35 +37,33 @@ const getData = (echo: DevtoolsServiceDependencies['echo']): SubscribeToItemsRes
   };
 };
 
-export const subscribeToItems = ({ echo }: DevtoolsServiceDependencies) => {
-  return new Stream<SubscribeToItemsResponse>(({ next }) => {
-    const update = () => {
-      const res = getData(echo);
-      next(res);
-    };
-
-    const partySubscriptions: Record<string, () => void> = {};
-    const unsubscribe = echo.queryParties().subscribe((parties) => {
-      parties.forEach(party => {
-        if (!partySubscriptions[party.key.toHex()]) {
-          const sub = party.database.select().exec().update.on(() => {
-            // Send updates on items changes.
-            update();
-          });
-          partySubscriptions[party.key.toHex()] = sub;
-        }
-      });
+export const subscribeToItems = ({ echo }: DevtoolsServiceDependencies) => new Stream<SubscribeToItemsResponse>(({ next }) => {
+  const update = () => {
+    const res = getData(echo);
+    next(res);
+  };
 
-      // Send items for new parties.
-      update();
+  const partySubscriptions: Record<string, () => void> = {};
+  const unsubscribe = echo.queryParties().subscribe((parties) => {
+    parties.forEach(party => {
+      if (!partySubscriptions[party.key.toHex()]) {
+        const sub = party.database.select().exec().update.on(() => {
+          // Send updates on items changes.
+          update();
+        });
+        partySubscriptions[party.key.toHex()] = sub;
+      }
     });
 
-    // Send initial items.
+    // Send items for new parties.
     update();
-
-    return () => {
-      unsubscribe();
-      Object.values(partySubscriptions).forEach(unsubscribe => unsubscribe());
-    };
   });
-};
+
+  // Send initial items.
+  update();
+
+  return () => {
+    unsubscribe();
+    Object.values(partySubscriptions).forEach(unsubscribe => unsubscribe());
+  };
+});

package/src/devtools/keys.ts

@@ -12,34 +12,27 @@ import {
 } from '../proto/gen/dxos/devtools';
 import { DevtoolsServiceDependencies } from './devtools-context';
 
-export const subscribeToKeyringKeys = ({ keyring }: DevtoolsServiceDependencies) => {
-  return new Stream<SubscribeToKeyringKeysResponse>(({ next }) => {
-    next({ keys: keyring.keys });
-    return keyring.keysUpdate.on((keys) => {
-      next({ keys });
-    });
+export const subscribeToKeyringKeys = ({ keyring }: DevtoolsServiceDependencies) => new Stream<SubscribeToKeyringKeysResponse>(({ next }) => {
+  next({ keys: keyring.keys });
+  return keyring.keysUpdate.on((keys) => {
+    next({ keys });
   });
-};
+});
 
-export const subscribeToCredentialMessages = (
-  { echo }: DevtoolsServiceDependencies,
-  { partyKey }: SubscribeToCredentialMessagesRequest
-) => {
-  return new Stream<SubscribeToCredentialMessagesResponse>(({ next }) => {
-    const party = partyKey && echo.getParty(partyKey);
-    if (!party) {
-      throw new Error('Party not found');
-    }
+export const subscribeToCredentialMessages = ({ echo }: DevtoolsServiceDependencies, { partyKey }: SubscribeToCredentialMessagesRequest) => new Stream<SubscribeToCredentialMessagesResponse>(({ next }) => {
+  const party = partyKey && echo.getParty(partyKey);
+  if (!party) {
+    throw new Error('Party not found');
+  }
 
-    const update = () => {
-      next({ messages: Array.from(party.processor.credentialMessages.values()) });
-    };
+  const update = () => {
+    next({ messages: Array.from(party.processor.credentialMessages.values()) });
+  };
 
-    const subscriptions = new SubscriptionGroup();
-    subscriptions.push(party.processor.keyOrInfoAdded.on(() => update()));
-    subscriptions.push(party.processor.feedAdded.on(() => update()));
-    update();
+  const subscriptions = new SubscriptionGroup();
+  subscriptions.push(party.processor.keyOrInfoAdded.on(() => update()));
+  subscriptions.push(party.processor.feedAdded.on(() => update()));
+  update();
 
-    return () => subscriptions.unsubscribe();
-  });
-};
+  return () => subscriptions.unsubscribe();
+});

package/src/devtools/network.ts

@@ -16,65 +16,58 @@ import {
 } from '../proto/gen/dxos/devtools';
 import { DevtoolsServiceDependencies } from './devtools-context';
 
-export const subscribeToNetworkStatus = (hook: DevtoolsServiceDependencies) => {
-  return new Stream<SubscribeToSignalStatusResponse>(({ next, close }) => {
-    const update = () => {
-      try {
-        const status = hook.networkManager.signal.getStatus();
-        next({ servers: status });
-      } catch (err: any) {
-        close(err);
-      }
-    };
-    hook.networkManager.signal.statusChanged.on(update);
-    update();
-  });
-};
+export const subscribeToNetworkStatus = (hook: DevtoolsServiceDependencies) => new Stream<SubscribeToSignalStatusResponse>(({ next, close }) => {
+  const update = () => {
+    try {
+      const status = hook.networkManager.signal.getStatus();
+      next({ servers: status });
+    } catch (err: any) {
+      close(err);
+    }
+  };
 
-export const subscribeToSignalTrace = (hook: DevtoolsServiceDependencies) => {
-  return new Stream<SubscribeToSignalTraceResponse>(({ next }) => {
-    next({ events: [] });
-    const trace: SignalApi.CommandTrace[] = [];
-    hook.networkManager.signal.commandTrace.on(msg => {
-      trace.push(msg);
-      next({ events: trace.map((msg) => JSON.stringify(msg)) });
-    });
+  hook.networkManager.signal.statusChanged.on(update);
+  update();
+});
+
+export const subscribeToSignalTrace = (hook: DevtoolsServiceDependencies) => new Stream<SubscribeToSignalTraceResponse>(({ next }) => {
+  next({ events: [] });
+  const trace: SignalApi.CommandTrace[] = [];
+  hook.networkManager.signal.commandTrace.on(msg => {
+    trace.push(msg);
+    next({ events: trace.map((msg) => JSON.stringify(msg)) });
   });
-};
+});
 
-export const subscribeToNetworkTopics = (hook: DevtoolsServiceDependencies) => {
-  return new Stream<SubscribeToNetworkTopicsResponse>(({ next, close }) => {
-    const update = () => {
-      try {
-        const topics = hook.networkManager.topics;
-        const labeledTopics = topics.map(topic => ({
-          topic,
-          label: hook.networkManager.getSwarm(topic)?.label ?? topic.toHex()
-        }));
-        next({ topics: labeledTopics });
-      } catch (err: any) {
-        close(err);
-      }
-    };
-    hook.networkManager.topicsUpdated.on(update);
+export const subscribeToNetworkTopics = (hook: DevtoolsServiceDependencies) => new Stream<SubscribeToNetworkTopicsResponse>(({ next, close }) => {
+  const update = () => {
+    try {
+      const topics = hook.networkManager.topics;
+      const labeledTopics = topics.map(topic => ({
+        topic,
+        label: hook.networkManager.getSwarm(topic)?.label ?? topic.toHex()
+      }));
+      next({ topics: labeledTopics });
+    } catch (err: any) {
+      close(err);
+    }
+  };
+  hook.networkManager.topicsUpdated.on(update);
 
-    update();
-  });
-};
+  update();
+});
 
-export const subscribeToSwarmInfo = (hook: DevtoolsServiceDependencies) => {
-  return new Stream<SubscribeToSwarmInfoResponse>(({ next }) => {
-    const networkManager = hook.networkManager;
-    const update = () => {
-      const info = networkManager.connectionLog?.swarms;
-      if (info) {
-        next({ data: info });
-      }
-    };
-    networkManager.connectionLog?.update.on(update);
-    update();
-  });
-};
+export const subscribeToSwarmInfo = (hook: DevtoolsServiceDependencies) => new Stream<SubscribeToSwarmInfoResponse>(({ next }) => {
+  const networkManager = hook.networkManager;
+  const update = () => {
+    const info = networkManager.connectionLog?.swarms;
+    if (info) {
+      next({ data: info });
+    }
+  };
+  networkManager.connectionLog?.update.on(update);
+  update();
+});
 
 export const getNetworkPeers = (hook: DevtoolsServiceDependencies, request: GetNetworkPeersRequest): GetNetworkPeersResponse => {
   if (!request.topic) {

package/src/devtools/parties.ts

@@ -13,38 +13,36 @@ import {
 } from '../proto/gen/dxos/devtools';
 import { DevtoolsServiceDependencies } from './devtools-context';
 
-export const subscribeToParties = ({ echo }: DevtoolsServiceDependencies) => {
-  return new Stream<SubscribeToPartiesResponse>(({ next }) => {
-    const update = () => {
-      const { value: parties } = echo.queryParties();
-      next({ parties: parties.map(party => party.partyInfo) });
-    };
+export const subscribeToParties = ({ echo }: DevtoolsServiceDependencies) => new Stream<SubscribeToPartiesResponse>(({ next }) => {
+  const update = () => {
+    const { value: parties } = echo.queryParties();
+    next({ parties: parties.map(party => party.partyInfo) });
+  };
 
-    const partySubscriptions: Record<string, () => void> = {};
-    const timeframeSubscriptions: Record<string, () => void> = {};
-    const unsubscribe = echo.queryParties().subscribe((parties) => {
-      parties.forEach((party) => {
-        if (!partySubscriptions[party.key.toHex()]) {
-          // Send updates on party changes.
-          partySubscriptions[party.key.toHex()] = party.update.on(() => update());
-          timeframeSubscriptions[party.key.toHex()] = party.timeframeUpdate.on(() => update());
-        }
-      });
-
-      // Send new parties.
-      update();
+  const partySubscriptions: Record<string, () => void> = {};
+  const timeframeSubscriptions: Record<string, () => void> = {};
+  const unsubscribe = echo.queryParties().subscribe((parties) => {
+    parties.forEach((party) => {
+      if (!partySubscriptions[party.key.toHex()]) {
+        // Send updates on party changes.
+        partySubscriptions[party.key.toHex()] = party.update.on(() => update());
+        timeframeSubscriptions[party.key.toHex()] = party.timeframeUpdate.on(() => update());
+      }
     });
 
-    // Send initial parties.
+    // Send new parties.
     update();
-
-    return () => {
-      unsubscribe();
-      Object.values(partySubscriptions).forEach(unsubscribe => unsubscribe());
-      Object.values(timeframeSubscriptions).forEach(unsubscribe => unsubscribe());
-    };
   });
-};
+
+  // Send initial parties.
+  update();
+
+  return () => {
+    unsubscribe();
+    Object.values(partySubscriptions).forEach(unsubscribe => unsubscribe());
+    Object.values(timeframeSubscriptions).forEach(unsubscribe => unsubscribe());
+  };
+});
 
 export const getPartySnapshot = async (
   { echo }: DevtoolsServiceDependencies,