@dxos/echo-pipeline 0.1.46-next.c3cc04c → 0.1.47

package/dist/lib/node/index.cjs

@@ -46,7 +46,6 @@ __export(src_exports, {
   MOCK_AUTH_VERIFIER: () => MOCK_AUTH_VERIFIER,
   MetadataStore: () => MetadataStore,
   Pipeline: () => Pipeline,
-  STORAGE_VERSION: () => STORAGE_VERSION,
   SnapshotManager: () => SnapshotManager,
   SnapshotStore: () => SnapshotStore,
   Space: () => Space,
@@ -131,9 +130,8 @@ var __decorate = function(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var STORAGE_VERSION = 1;
 var emptyEchoMetadata = () => ({
-  version: STORAGE_VERSION,
+  version: import_protocols.STORAGE_VERSION,
   spaces: [],
   created: new Date(),
   updated: new Date()
@@ -173,7 +171,7 @@ var MetadataStore = class {
         checksum
       }, {
         file: "metadata-store.ts",
-        line: 70,
+        line: 63,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -191,7 +189,7 @@ var MetadataStore = class {
         err
       }, {
         file: "metadata-store.ts",
-        line: 85,
+        line: 78,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -204,7 +202,7 @@ var MetadataStore = class {
     var _a;
     const data = {
       ...this._metadata,
-      version: STORAGE_VERSION,
+      version: import_protocols.STORAGE_VERSION,
       created: (_a = this._metadata.created) != null ? _a : new Date(),
       updated: new Date()
     };
@@ -222,7 +220,7 @@ var MetadataStore = class {
         checksum
       }, {
         file: "metadata-store.ts",
-        line: 116,
+        line: 109,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -241,11 +239,12 @@ var MetadataStore = class {
   async clear() {
     (0, import_log.log)("clearing all metadata", {}, {
       file: "metadata-store.ts",
-      line: 132,
+      line: 125,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await this._directory.delete();
+    this._metadata = emptyEchoMetadata();
   }
   getIdentityRecord() {
     return this._metadata.identity;
@@ -772,7 +771,7 @@ var AuthExtension = class extends import_teleport.RpcExtension {
         (0, import_node_assert5.default)(success, "credential not verified");
         (0, import_async4.runInContext)(this._ctx, () => this._authParams.onAuthSuccess());
       } catch (err) {
-        import_log4.log.warn("auth failed", err, {
+        (0, import_log4.log)("auth failed", err, {
           file: "auth.ts",
           line: 75,
           scope: this,
@@ -947,12 +946,13 @@ var DataServiceHost = class {
       this._itemDemuxer.mutation.on(ctx, (message) => {
         var _a;
         const { batch, meta } = message;
+        (0, import_node_assert6.default)(!meta.clientTag, "Unexpected client tag in mutation message");
         (0, import_log6.log)("message", {
           batch,
           meta
         }, {
           file: "data-service-host.ts",
-          line: 49,
+          line: 51,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -961,10 +961,12 @@ var DataServiceHost = class {
           message.meta.seq
         ]);
         (_a = batch.objects) == null ? void 0 : _a.forEach((object) => {
-          (0, import_echo_db.setMetadataOnObject)(object, meta);
+          (0, import_echo_db.setMetadataOnObject)(object, {
+            ...meta
+          });
         });
         if (clientTag) {
-          (0, import_echo_db.tagMutationsInBatch)(batch, clientTag);
+          (0, import_echo_db.tagMutationsInBatch)(batch, clientTag, 0);
         }
         next({
           clientTag,
@@ -976,32 +978,18 @@ var DataServiceHost = class {
     });
   }
   async write(request) {
-    var _a, _b, _c;
+    var _a, _b;
     (0, import_node_assert6.default)(this._writeStream, "Cannot write mutations in readonly mode");
     (0, import_log6.log)("write", {
       clientTag: request.clientTag,
       objectCount: (_b = (_a = request.batch.objects) == null ? void 0 : _a.length) != null ? _b : 0
     }, {
       file: "data-service-host.ts",
-      line: 77,
+      line: 79,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    const message = {
-      batch: {
-        objects: (_c = request.batch.objects) == null ? void 0 : _c.map((object) => {
-          var _a2;
-          return {
-            ...object,
-            mutations: (_a2 = object.mutations) == null ? void 0 : _a2.map((mutation) => ({
-              ...mutation,
-              meta: void 0
-            })),
-            meta: void 0
-          };
-        })
-      }
-    };
+    const message = createDataMessage(request.batch);
     const receipt = await this._writeStream.write(message, {
       afterWrite: async (receipt2) => {
         if (request.clientTag) {
@@ -1011,7 +999,7 @@ var DataServiceHost = class {
             seq: receipt2.seq
           }, {
             file: "data-service-host.ts",
-            line: 96,
+            line: 88,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1025,6 +1013,24 @@ var DataServiceHost = class {
     return receipt;
   }
 };
+var createDataMessage = (batch) => {
+  var _a;
+  return {
+    batch: {
+      objects: (_a = batch.objects) == null ? void 0 : _a.map((object) => {
+        var _a2;
+        return {
+          ...object,
+          mutations: (_a2 = object.mutations) == null ? void 0 : _a2.map((mutation) => ({
+            ...mutation,
+            meta: void 0
+          })),
+          meta: void 0
+        };
+      })
+    }
+  };
+};
 
 // packages/core/echo/echo-pipeline/src/dbhost/database-host.ts
 var import_echo_db2 = require("@dxos/echo-db");
@@ -1703,7 +1709,7 @@ var Space = class Space2 {
     });
   }
   async initializeDataPipeline() {
-    import_log10.log.info("initializeDataPipeline", {}, {
+    (0, import_log10.log)("initializeDataPipeline", {}, {
       file: "space.ts",
       line: 245,
       scope: this,
@@ -1756,12 +1762,13 @@ var __decorate7 = function(decorators, target, key, desc) {
 var MOCK_AUTH_PROVIDER = async (nonce) => Buffer.from("mock");
 var MOCK_AUTH_VERIFIER = async (nonce, credential) => true;
 var SpaceProtocol = class {
-  constructor({ topic, swarmIdentity, networkManager, onSessionAuth }) {
+  constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure }) {
     this._feeds = /* @__PURE__ */ new Set();
     this._sessions = new import_util6.ComplexMap(import_keys4.PublicKey.hash);
     this._networkManager = networkManager;
     this._swarmIdentity = swarmIdentity;
     this._onSessionAuth = onSessionAuth;
+    this._onAuthFailure = onAuthFailure;
     this._topic = import_keys4.PublicKey.from((0, import_crypto3.discoveryKey)((0, import_crypto3.sha256)(topic.toHex())));
   }
   get sessions() {
@@ -1779,7 +1786,7 @@ var SpaceProtocol = class {
       key: feed.key
     }, {
       file: "space-protocol.ts",
-      line: 84,
+      line: 87,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1800,7 +1807,7 @@ var SpaceProtocol = class {
     };
     (0, import_log11.log)("starting...", {}, {
       file: "space-protocol.ts",
-      line: 107,
+      line: 110,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1813,7 +1820,7 @@ var SpaceProtocol = class {
     });
     (0, import_log11.log)("started", {}, {
       file: "space-protocol.ts",
-      line: 116,
+      line: 119,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1822,14 +1829,14 @@ var SpaceProtocol = class {
     if (this._connection) {
       (0, import_log11.log)("stopping...", {}, {
         file: "space-protocol.ts",
-        line: 121,
+        line: 124,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       await this._connection.close();
       (0, import_log11.log)("stopped", {}, {
         file: "space-protocol.ts",
-        line: 123,
+        line: 126,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1840,7 +1847,8 @@ var SpaceProtocol = class {
       const session = new SpaceProtocolSession({
         wireParams,
         swarmIdentity: this._swarmIdentity,
-        onSessionAuth: this._onSessionAuth
+        onSessionAuth: this._onSessionAuth,
+        onAuthFailure: this._onAuthFailure
       });
       this._sessions.set(wireParams.remotePeerId, session);
       for (const feed of this._feeds) {
@@ -1864,7 +1872,7 @@ var AuthStatus;
 })(AuthStatus || (AuthStatus = {}));
 var SpaceProtocolSession = class {
   // TODO(dmaretskyi): Allow to pass in extra extensions.
-  constructor({ wireParams, swarmIdentity, onSessionAuth }) {
+  constructor({ wireParams, swarmIdentity, onSessionAuth, onAuthFailure }) {
     // TODO(dmaretskyi): Start with upload=false when switching it on the fly works.
     this.replicator = new import_teleport_extension_replicator.ReplicatorExtension().setOptions({
       upload: true
@@ -1873,6 +1881,7 @@ var SpaceProtocolSession = class {
     this._wireParams = wireParams;
     this._swarmIdentity = swarmIdentity;
     this._onSessionAuth = onSessionAuth;
+    this._onAuthFailure = onAuthFailure;
     this._teleport = new import_teleport2.Teleport(wireParams);
   }
   get authStatus() {
@@ -1888,23 +1897,19 @@ var SpaceProtocolSession = class {
       verifier: this._swarmIdentity.credentialAuthenticator,
       onAuthSuccess: () => {
         var _a;
-        this._authStatus = AuthStatus.SUCCESS;
         (0, import_log11.log)("Peer authenticated", {}, {
           file: "space-protocol.ts",
-          line: 206,
+          line: 213,
           scope: this,
           callSite: (f, a) => f(...a)
         });
+        this._authStatus = AuthStatus.SUCCESS;
         (_a = this._onSessionAuth) == null ? void 0 : _a.call(this, this._teleport);
       },
       onAuthFailure: () => {
-        import_log11.log.warn("Auth failed", {}, {
-          file: "space-protocol.ts",
-          line: 211,
-          scope: this,
-          callSite: (f, a) => f(...a)
-        });
+        var _a;
         this._authStatus = AuthStatus.FAILURE;
+        (_a = this._onAuthFailure) == null ? void 0 : _a.call(this, this._teleport);
       }
     }));
     this._teleport.addExtension("dxos.mesh.teleport.replicator", this.replicator);
@@ -1952,13 +1957,13 @@ var SpaceManager = class SpaceManager2 {
       ...this._spaces.values()
     ].map((space) => space.close()));
   }
-  async constructSpace({ metadata, swarmIdentity, onNetworkConnection, memberKey }) {
+  async constructSpace({ metadata, swarmIdentity, onNetworkConnection, onAuthFailure, memberKey }) {
     var _a;
     import_log12.log.trace("dxos.echo.space-manager.construct-space", import_protocols6.trace.begin({
       id: this._instanceId
     }), {
       file: "space-manager.ts",
-      line: 74,
+      line: 81,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1966,7 +1971,7 @@ var SpaceManager = class SpaceManager2 {
       spaceKey: metadata.genesisFeedKey
     }, {
       file: "space-manager.ts",
-      line: 75,
+      line: 82,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1976,7 +1981,8 @@ var SpaceManager = class SpaceManager2 {
       topic: spaceKey,
       swarmIdentity,
       networkManager: this._networkManager,
-      onSessionAuth: onNetworkConnection
+      onSessionAuth: onNetworkConnection,
+      onAuthFailure
     });
     const snapshotManager = new SnapshotManager(this._snapshotStore);
     const space = new Space({
@@ -1994,7 +2000,7 @@ var SpaceManager = class SpaceManager2 {
       id: this._instanceId
     }), {
       file: "space-manager.ts",
-      line: 100,
+      line: 108,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2028,7 +2034,6 @@ SpaceManager = __decorate8([
   MOCK_AUTH_VERIFIER,
   MetadataStore,
   Pipeline,
-  STORAGE_VERSION,
   SnapshotManager,
   SnapshotStore,
   Space,