@dxos/echo-pipeline 0.8.4-main.84f28bd → 0.8.4-main.b97322e

package/dist/lib/browser/index.mjs

@@ -38,7 +38,7 @@ import { log as log7 } from "@dxos/log";
 // src/db-host/documents-synchronizer.ts
 import { next as A2 } from "@automerge/automerge";
 import { UpdateScheduler } from "@dxos/async";
-import { Resource as Resource5 } from "@dxos/context";
+import { LifecycleState as LifecycleState3, Resource as Resource5 } from "@dxos/context";
 import { invariant as invariant6 } from "@dxos/invariant";
 import { log as log6 } from "@dxos/log";
 
@@ -2193,10 +2193,13 @@ var DocumentsSynchronizer = class extends Resource5 {
     return mutation;
   }
   _writeMutation(documentId, mutation) {
+    if (this._lifecycleState === LifecycleState3.CLOSED) {
+      return;
+    }
     const syncState = this._syncStates.get(documentId);
     invariant6(syncState, "Sync state for document not found", {
       F: __dxlog_file7,
-      L: 162,
+      L: 165,
       S: this,
       A: [
         "syncState",
@@ -2357,7 +2360,7 @@ var DataServiceImpl = class {
 };
 
 // src/db-host/echo-host.ts
-import { LifecycleState as LifecycleState5, Resource as Resource9 } from "@dxos/context";
+import { LifecycleState as LifecycleState6, Resource as Resource9 } from "@dxos/context";
 import { todo } from "@dxos/debug";
 import { createIdFromSpaceKey as createIdFromSpaceKey2, SpaceDocVersion as SpaceDocVersion3 } from "@dxos/echo-protocol";
 import { IndexMetadataStore, IndexStore, Indexer } from "@dxos/indexing";
@@ -2467,7 +2470,7 @@ import { trace as trace4 } from "@dxos/tracing";
 
 // src/query/query-executor.ts
 import { Match } from "effect";
-import { Context as Context3, ContextDisposedError, LifecycleState as LifecycleState3, Resource as Resource6 } from "@dxos/context";
+import { Context as Context3, ContextDisposedError, LifecycleState as LifecycleState4, Resource as Resource6 } from "@dxos/context";
 import { DatabaseDirectory as DatabaseDirectory3, isEncodedReference, ObjectStructure } from "@dxos/echo-protocol";
 import { EscapedPropPath } from "@dxos/indexing";
 import { invariant as invariant10 } from "@dxos/invariant";
@@ -3014,7 +3017,7 @@ var QueryExecutor = class extends Resource6 {
     }));
   }
   async execQuery() {
-    invariant10(this._lifecycleState === LifecycleState3.OPEN, void 0, {
+    invariant10(this._lifecycleState === LifecycleState4.OPEN, void 0, {
       F: __dxlog_file11,
       L: 173,
       S: this,
@@ -3552,6 +3555,18 @@ var QueryServiceImpl = class extends Resource7 {
   }
   execQuery(request) {
     return new Stream2(({ next, close, ctx }) => {
+      if (this._params.indexer.config?.enabled !== true) {
+        log10.error("indexer is disabled", {
+          config: this._params.indexer.config
+        }, {
+          F: __dxlog_file12,
+          L: 100,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        close();
+        return;
+      }
       const queryEntry = this._createQuery(ctx, request, next, close, close);
       scheduleMicroTask(ctx, async () => {
         await queryEntry.executor.open();
@@ -3567,7 +3582,7 @@ var QueryServiceImpl = class extends Resource7 {
   async reindex() {
     log10("Reindexing all documents...", void 0, {
       F: __dxlog_file12,
-      L: 113,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3582,7 +3597,7 @@ var QueryServiceImpl = class extends Resource7 {
           count: ids.size
         }, {
           F: __dxlog_file12,
-          L: 121,
+          L: 127,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3592,7 +3607,7 @@ var QueryServiceImpl = class extends Resource7 {
       count: ids.size
     }, {
       F: __dxlog_file12,
-      L: 125,
+      L: 131,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3658,7 +3673,7 @@ var QueryServiceImpl = class extends Resource7 {
       } catch (err) {
         log10.catch(err, void 0, {
           F: __dxlog_file12,
-          L: 196,
+          L: 202,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3669,7 +3684,7 @@ var QueryServiceImpl = class extends Resource7 {
       duration: performance.now() - begin
     }, {
       F: __dxlog_file12,
-      L: 200,
+      L: 206,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3720,7 +3735,7 @@ var createDocumentsIterator = (automergeHost) => (
           }
           const linkHandle = await automergeHost.loadDoc(Context4.default(void 0, {
             F: __dxlog_file12,
-            L: 240
+            L: 246
           }), urlString);
           for await (const result of getObjectsFromHandle(linkHandle)) {
             yield result;
@@ -3745,7 +3760,7 @@ var createDocumentsIterator = (automergeHost) => (
 import { interpretAsDocumentId as interpretAsDocumentId3 } from "@automerge/automerge-repo";
 import isEqual from "lodash.isequal";
 import { Event as Event3, UpdateScheduler as UpdateScheduler3 } from "@dxos/async";
-import { Resource as Resource8, Context as Context5, LifecycleState as LifecycleState4 } from "@dxos/context";
+import { Resource as Resource8, Context as Context5, LifecycleState as LifecycleState5 } from "@dxos/context";
 import { invariant as invariant12 } from "@dxos/invariant";
 
 // src/db-host/database-root.ts
@@ -3894,7 +3909,7 @@ var SpaceStateManager = class extends Resource8 {
     return this._rootBySpace.get(spaceId);
   }
   getRootBySpaceId(spaceId) {
-    invariant12(this._lifecycleState === LifecycleState4.OPEN, void 0, {
+    invariant12(this._lifecycleState === LifecycleState5.OPEN, void 0, {
       F: __dxlog_file15,
       L: 44,
       S: this,
@@ -4135,7 +4150,7 @@ var EchoHost = class extends Resource9 {
   * Create new space root.
   */
   async createSpaceRoot(spaceKey) {
-    invariant13(this._lifecycleState === LifecycleState5.OPEN, void 0, {
+    invariant13(this._lifecycleState === LifecycleState6.OPEN, void 0, {
       F: __dxlog_file16,
       L: 255,
       S: this,
@@ -4163,7 +4178,7 @@ var EchoHost = class extends Resource9 {
   }
   // TODO(dmaretskyi): Change to document id.
   async openSpaceRoot(spaceId, automergeUrl) {
-    invariant13(this._lifecycleState === LifecycleState5.OPEN, void 0, {
+    invariant13(this._lifecycleState === LifecycleState6.OPEN, void 0, {
       F: __dxlog_file16,
       L: 274,
       S: this,
@@ -4475,9 +4490,25 @@ var EchoEdgeReplicator = class {
       context: this._context,
       sharedPolicyEnabled: this._sharePolicyEnabled,
       onRemoteConnected: async () => {
+        log13.trace("dxos.echo.edge.replicator.onRemoteConnected", {
+          spaceId
+        }, {
+          F: __dxlog_file18,
+          L: 135,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         this._context?.onConnectionOpen(connection);
       },
       onRemoteDisconnected: async () => {
+        log13.trace("dxos.echo.edge.replicator.onRemoteDisconnected", {
+          spaceId
+        }, {
+          F: __dxlog_file18,
+          L: 139,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         this._context?.onConnectionClosed(connection);
       },
       onRestartRequested: async () => {
@@ -4491,7 +4522,7 @@ var EchoEdgeReplicator = class {
           restartDelay
         }, {
           F: __dxlog_file18,
-          L: 148,
+          L: 150,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4513,6 +4544,16 @@ var EchoEdgeReplicator = class {
             if (ctx?.disposed) {
               return;
             }
+            log13.trace("dxos.echo.edge.replicator.restart", {
+              spaceId,
+              reconnects,
+              restartDelay
+            }, {
+              F: __dxlog_file18,
+              L: 167,
+              S: this,
+              C: (f, a) => f(...a)
+            });
             await this._openConnection(spaceId, reconnects + 1);
           } catch (e) {
             env.error = e;
@@ -4561,7 +4602,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   async _open(ctx) {
     log13("opening...", void 0, {
       F: __dxlog_file18,
-      L: 251,
+      L: 254,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4569,12 +4610,29 @@ var EdgeReplicatorConnection = class extends Resource11 {
     this._ctx.onDispose(this._edgeConnection.onMessage((msg) => {
       this._onMessage(msg);
     }));
+    let firstReconnect = true;
+    this._ctx.onDispose(
+      // NOTE: This will fire immediately if the connection is already open.
+      this._edgeConnection.onReconnected(async () => {
+        if (firstReconnect) {
+          log13.verbose("first reconnect skipped", void 0, {
+            F: __dxlog_file18,
+            L: 269,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          firstReconnect = false;
+          return;
+        }
+        this._onRestartRequested();
+      })
+    );
     await this._onRemoteConnected();
   }
   async _close() {
     log13("closing...", void 0, {
       F: __dxlog_file18,
-      L: 266,
+      L: 282,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4585,7 +4643,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
   get peerId() {
     invariant14(this._remotePeerId, "Not connected", {
       F: __dxlog_file18,
-      L: 275,
+      L: 291,
       S: this,
       A: [
         "this._remotePeerId",
@@ -4610,7 +4668,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
         remoteId: this._remotePeerId
       }, {
         F: __dxlog_file18,
-        L: 290,
+        L: 306,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4636,7 +4694,7 @@ var EdgeReplicatorConnection = class extends Resource11 {
       remoteId: this._remotePeerId
     }, {
       F: __dxlog_file18,
-      L: 319,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4659,21 +4717,32 @@ var EdgeReplicatorConnection = class extends Resource11 {
       remoteId: this._remotePeerId
     }, {
       F: __dxlog_file18,
-      L: 348,
+      L: 364,
       S: this,
       C: (f, a) => f(...a)
     });
     const encoded = cbor2.encode(message);
-    await this._edgeConnection.send(buf.create(RouterMessageSchema, {
-      serviceId: this._targetServiceId,
-      source: {
-        identityKey: this._edgeConnection.identityKey,
-        peerKey: this._edgeConnection.peerKey
-      },
-      payload: {
-        value: bufferToArray2(encoded)
-      }
-    }));
+    try {
+      await this._edgeConnection.send(buf.create(RouterMessageSchema, {
+        serviceId: this._targetServiceId,
+        source: {
+          identityKey: this._edgeConnection.identityKey,
+          peerKey: this._edgeConnection.peerKey
+        },
+        payload: {
+          value: bufferToArray2(encoded)
+        }
+      }));
+    } catch (err) {
+      log13.error("failed to send message", {
+        err
+      }, {
+        F: __dxlog_file18,
+        L: 384,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
   }
 };
 var isForbiddenErrorMessage = (message) => message.type === "error" && message.message === "Forbidden";