@dxos/echo-pipeline 0.8.2-main.12df754 → 0.8.2-main.30e4dbb

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.3"}
+{"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.8.2-main.12df754",
+  "version": "0.8.2-main.30e4dbb",
   "description": "ECHO database.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -38,44 +38,44 @@
     "crc-32": "^1.2.2",
     "level-transcoder": "^1.0.1",
     "lodash.isequal": "^4.5.0",
-    "@dxos/async": "0.8.2-main.12df754",
-    "@dxos/automerge": "0.8.2-main.12df754",
-    "@dxos/codec-protobuf": "0.8.2-main.12df754",
-    "@dxos/context": "0.8.2-main.12df754",
-    "@dxos/crypto": "0.8.2-main.12df754",
-    "@dxos/credentials": "0.8.2-main.12df754",
-    "@dxos/debug": "0.8.2-main.12df754",
-    "@dxos/echo-protocol": "0.8.2-main.12df754",
-    "@dxos/echo-schema": "0.8.2-main.12df754",
-    "@dxos/edge-client": "0.8.2-main.12df754",
-    "@dxos/indexing": "0.8.2-main.12df754",
-    "@dxos/feed-store": "0.8.2-main.12df754",
-    "@dxos/invariant": "0.8.2-main.12df754",
-    "@dxos/hypercore": "0.8.2-main.12df754",
-    "@dxos/keyring": "0.8.2-main.12df754",
-    "@dxos/keys": "0.8.2-main.12df754",
-    "@dxos/kv-store": "0.8.2-main.12df754",
-    "@dxos/messaging": "0.8.2-main.12df754",
-    "@dxos/log": "0.8.2-main.12df754",
-    "@dxos/node-std": "0.8.2-main.12df754",
-    "@dxos/protocols": "0.8.2-main.12df754",
-    "@dxos/network-manager": "0.8.2-main.12df754",
-    "@dxos/teleport-extension-automerge-replicator": "0.8.2-main.12df754",
-    "@dxos/teleport": "0.8.2-main.12df754",
-    "@dxos/random-access-storage": "0.8.2-main.12df754",
-    "@dxos/teleport-extension-gossip": "0.8.2-main.12df754",
-    "@dxos/teleport-extension-object-sync": "0.8.2-main.12df754",
-    "@dxos/teleport-extension-replicator": "0.8.2-main.12df754",
-    "@dxos/timeframe": "0.8.2-main.12df754",
-    "@dxos/tracing": "0.8.2-main.12df754",
-    "@dxos/typings": "0.8.2-main.12df754",
-    "@dxos/util": "0.8.2-main.12df754"
+    "@dxos/async": "0.8.2-main.30e4dbb",
+    "@dxos/context": "0.8.2-main.30e4dbb",
+    "@dxos/codec-protobuf": "0.8.2-main.30e4dbb",
+    "@dxos/credentials": "0.8.2-main.30e4dbb",
+    "@dxos/crypto": "0.8.2-main.30e4dbb",
+    "@dxos/automerge": "0.8.2-main.30e4dbb",
+    "@dxos/debug": "0.8.2-main.30e4dbb",
+    "@dxos/echo-protocol": "0.8.2-main.30e4dbb",
+    "@dxos/edge-client": "0.8.2-main.30e4dbb",
+    "@dxos/echo-schema": "0.8.2-main.30e4dbb",
+    "@dxos/feed-store": "0.8.2-main.30e4dbb",
+    "@dxos/hypercore": "0.8.2-main.30e4dbb",
+    "@dxos/indexing": "0.8.2-main.30e4dbb",
+    "@dxos/invariant": "0.8.2-main.30e4dbb",
+    "@dxos/keyring": "0.8.2-main.30e4dbb",
+    "@dxos/keys": "0.8.2-main.30e4dbb",
+    "@dxos/kv-store": "0.8.2-main.30e4dbb",
+    "@dxos/log": "0.8.2-main.30e4dbb",
+    "@dxos/messaging": "0.8.2-main.30e4dbb",
+    "@dxos/network-manager": "0.8.2-main.30e4dbb",
+    "@dxos/node-std": "0.8.2-main.30e4dbb",
+    "@dxos/protocols": "0.8.2-main.30e4dbb",
+    "@dxos/random-access-storage": "0.8.2-main.30e4dbb",
+    "@dxos/teleport": "0.8.2-main.30e4dbb",
+    "@dxos/teleport-extension-gossip": "0.8.2-main.30e4dbb",
+    "@dxos/teleport-extension-object-sync": "0.8.2-main.30e4dbb",
+    "@dxos/teleport-extension-replicator": "0.8.2-main.30e4dbb",
+    "@dxos/timeframe": "0.8.2-main.30e4dbb",
+    "@dxos/tracing": "0.8.2-main.30e4dbb",
+    "@dxos/teleport-extension-automerge-replicator": "0.8.2-main.30e4dbb",
+    "@dxos/typings": "0.8.2-main.30e4dbb",
+    "@dxos/util": "0.8.2-main.30e4dbb"
   },
   "devDependencies": {
     "@types/lodash.isequal": "^4.5.0",
     "fast-check": "^3.19.0",
     "get-port-please": "^3.1.1",
-    "@dxos/test-utils": "0.8.2-main.12df754"
+    "@dxos/test-utils": "0.8.2-main.30e4dbb"
   },
   "publishConfig": {
     "access": "public"

package/src/automerge/echo-data-monitor.ts

@@ -26,7 +26,7 @@ export class EchoDataMonitor implements StorageAdapterDataMonitor, NetworkDataMo
   private readonly _localTimeSeries = createLocalTimeSeries();
   private readonly _storageAverages = createStorageAverages();
   private readonly _replicationAverages = createNetworkAverages();
-  private readonly _sizeByMessageType: { [type: string]: SlidingWindowSummary } = {};
+  private readonly _sizeByMessage: { [type: string]: SlidingWindowSummary } = {};
   private readonly _lastReceivedMessages = new CircularBuffer<StoredMessage>(100);
   private readonly _lastSentMessages = new CircularBuffer<StoredMessage>(100);
 
@@ -68,8 +68,8 @@ export class EchoDataMonitor implements StorageAdapterDataMonitor, NetworkDataMo
           countPerSecond: this._replicationAverages.sentPerSecond.average(),
           failedPerSecond: this._replicationAverages.sendsFailedPerSecond.average(),
         },
-        countByMessageType: this._computeMessageHistogram('type'),
-        avgSizeByMessageType: mapValues(this._sizeByMessageType, (summary) => summary.average()),
+        countByMessage: this._computeMessageHistogram('type'),
+        avgSizeByMessage: mapValues(this._sizeByMessage, (summary) => summary.average()),
       },
     };
   }
@@ -225,7 +225,7 @@ export class EchoDataMonitor implements StorageAdapterDataMonitor, NetworkDataMo
   }
 
   private _getStatsForType(message: Message) {
-    const messageSize = (this._sizeByMessageType[message.type] ??= createSlidingWindow());
+    const messageSize = (this._sizeByMessage[message.type] ??= createSlidingWindow());
     const messageCounts = (this._activeCounters.byType[message.type] ??= createMessageCounter());
     return { messageCounts, messageSize };
   }
@@ -269,7 +269,7 @@ type MessageCounts = {
 type MessageCountTimeSeries = TimeSeries<MessageCounts>;
 
 type MessageAttributeHistogram = {
-  [messageType: string]: {
+  [Message: string]: {
     received: number;
     sent: number;
   };
@@ -287,8 +287,8 @@ export type EchoDataStats = {
     connections: number;
     receivedMessages: BaseDataOpStats;
     sentMessages: TimedDataOpStats & { failedPerSecond: number };
-    avgSizeByMessageType: { [messageType: string]: number };
-    countByMessageType: MessageAttributeHistogram;
+    avgSizeByMessage: { [Message: string]: number };
+    countByMessage: MessageAttributeHistogram;
   };
 };
 

package/src/db-host/echo-host.ts

@@ -84,7 +84,7 @@ export class EchoHost extends Resource {
       loadDocuments: createSelectedDocumentsIterator(this._automergeHost),
       indexCooldownTime: process.env.NODE_ENV === 'test' ? 0 : undefined,
     });
-    this._indexer.setConfig(INDEXER_CONFIG);
+    void this._indexer.setConfig(INDEXER_CONFIG);
 
     this._queryService = new QueryServiceImpl({
       automergeHost: this._automergeHost,

package/src/db-host/query-service.ts

@@ -86,7 +86,7 @@ export class QueryServiceImpl extends Resource implements QueryService {
       log.warn('Indexer already initialized.');
       return;
     }
-    this._params.indexer.setConfig(config);
+    void this._params.indexer.setConfig(config);
   }
 
   execQuery(request: QueryRequest): Stream<QueryResponse> {

package/src/db-host/query-state.ts

@@ -181,21 +181,20 @@ export class QueryState extends Resource {
 
 // TODO(burdon): Process Filter DSL.
 const filterToIndexQuery = (filter: FilterProto): IndexQuery => {
-  invariant(!(filter.type && (filter.or ?? []).length > 0), 'Cannot mix type and or filters.');
+  const { type = [], or = [] } = filter;
+
+  invariant(!(type.length > 0 && or.length > 0), 'Cannot mix type and or filters.');
   invariant(
-    (filter.or ?? []).every((subFilter) => !(subFilter.type && (subFilter.or ?? []).length > 0)),
+    or.every((subFilter) => !((subFilter.type ?? []).length > 0 && (subFilter.or ?? []).length > 0)),
     'Cannot mix type and or filters.',
   );
-  if (
-    filter.type ||
-    ((filter.or ?? []).length > 0 && (filter.or ?? []).every((subFilter) => !subFilter.not && subFilter.type))
-  ) {
+  if (type.length > 0 || (or.length > 0 && (or ?? []).every((subFilter) => !subFilter.not && subFilter.type))) {
     return {
       typenames:
-        filter.type && filter.type.length > 0
-          ? filter.type.map((type) => dxnToIndexerTypename(DXN.parse(type)))
-          : (filter.or ?? [])
-              .flatMap((f) => f.type?.map((type) => dxnToIndexerTypename(DXN.parse(type))) ?? [])
+        type.length > 0
+          ? type.map((type) => dxnToIndexerTypename(DXN.parse(type)))
+          : or
+              .flatMap((f) => (f.type ?? []).map((type) => dxnToIndexerTypename(DXN.parse(type))) ?? [])
               .filter(isNonNullable),
       inverted: filter.not,
     };

package/src/edge/echo-edge-replicator.test.ts

@@ -33,12 +33,12 @@ describe('EchoEdgeReplicator', () => {
     await connectionOpen.waitForCount(1);
 
     const forbidden = createForbiddenMessage({ identityKey: client.identityKey, peerKey: client.peerKey }, spaceId);
-    server.sendMessage(forbidden);
+    await server.sendMessage(forbidden);
     await connectionOpen.waitForCount(1);
 
     // Double restart to check for race conditions.
     client.setIdentity(await createEphemeralEdgeIdentity());
-    server.sendMessage(forbidden);
+    await server.sendMessage(forbidden);
     await connectionOpen.waitForCount(1);
 
     await replicator.disconnect();