@dxos/client-services 0.1.31-next.ea8f0bc → 0.1.31

package/dist/lib/node/packlets/testing/index.cjs

@@ -39,6 +39,7 @@ __export(testing_exports, {
   createServiceContext: () => createServiceContext,
   createServiceHost: () => createServiceHost,
   createSigningContext: () => createSigningContext,
+  joinCommonSpace: () => joinCommonSpace,
   performInvitation: () => performInvitation,
   syncItems: () => syncItems,
   syncItemsLocal: () => syncItemsLocal,
@@ -1995,7 +1996,7 @@ var import_credentials11 = require("@dxos/credentials");
 var import_echo_pipeline2 = require("@dxos/echo-pipeline");
 var import_keys9 = require("@dxos/keys");
 var import_log8 = require("@dxos/log");
-var import_teleport_extension_presence = require("@dxos/teleport-extension-presence");
+var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
 var import_util5 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
@@ -2017,6 +2018,7 @@ var import_protocols4 = require("@dxos/protocols");
 var import_teleport3 = require("@dxos/teleport");
 var import_util3 = require("@dxos/util");
 var RETRY_TIMEOUT = 1e3;
+var SUCCESS_DELAY = 1e3;
 var NOTARIZE_TIMEOUT = 1e4;
 var NotarizationPlugin = class {
   constructor() {
@@ -2039,7 +2041,7 @@ var NotarizationPlugin = class {
       credentials
     }, {
       file: "notarization-plugin.ts",
-      line: 44,
+      line: 50,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2051,7 +2053,7 @@ var NotarizationPlugin = class {
           err
         }, {
           file: "notarization-plugin.ts",
-          line: 53,
+          line: 59,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2062,7 +2064,7 @@ var NotarizationPlugin = class {
     (0, import_async9.scheduleTask)(ctx, () => {
       import_log7.log.warn("Notarization timeout", {}, {
         file: "notarization-plugin.ts",
-        line: 61,
+        line: 67,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -2076,7 +2078,7 @@ var NotarizationPlugin = class {
         if (this._extensions.size === 0) {
           import_log7.log.warn("No peers to notarize with", {}, {
             file: "notarization-plugin.ts",
-            line: 76,
+            line: 82,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -2090,7 +2092,7 @@ var NotarizationPlugin = class {
             retryIn: RETRY_TIMEOUT
           }, {
             file: "notarization-plugin.ts",
-            line: 83,
+            line: 89,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -2104,7 +2106,7 @@ var NotarizationPlugin = class {
           credentialId: credentials.map((credential) => credential.id)
         }, {
           file: "notarization-plugin.ts",
-          line: 90,
+          line: 96,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2113,14 +2115,15 @@ var NotarizationPlugin = class {
         });
         (0, import_log7.log)("success", {}, {
           file: "notarization-plugin.ts",
-          line: 94,
+          line: 100,
           scope: this,
           callSite: (f, a) => f(...a)
         });
+        await (0, import_async9.sleep)(SUCCESS_DELAY);
       } catch (err) {
         import_log7.log.warn("error notarizing (recoverable)", err, {
           file: "notarization-plugin.ts",
-          line: 96,
+          line: 103,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2136,7 +2139,7 @@ var NotarizationPlugin = class {
       ]);
       (0, import_log7.log)("done", {}, {
         file: "notarization-plugin.ts",
-        line: 107,
+        line: 114,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -2189,7 +2192,7 @@ var NotarizationPlugin = class {
           peer: extension.localPeerId
         }, {
           file: "notarization-plugin.ts",
-          line: 156,
+          line: 163,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2201,7 +2204,7 @@ var NotarizationPlugin = class {
           peer: extension.localPeerId
         }, {
           file: "notarization-plugin.ts",
-          line: 161,
+          line: 168,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2260,6 +2263,7 @@ var DataSpace = class DataSpace2 {
   constructor(params) {
     this._ctx = new import_context6.Context();
     this._inner = params.inner;
+    this._gossip = params.gossip;
     this._presence = params.presence;
     this._keyring = params.keyring;
     this._feedStore = params.feedStore;
@@ -2316,6 +2320,12 @@ var DataSpace = class DataSpace2 {
     await this.notarizationPlugin.close();
     await this._presence.destroy();
   }
+  async postMessage(channel, message) {
+    return this._gossip.postMessage(channel, message);
+  }
+  listen(channel, callback) {
+    return this._gossip.listen(channel, callback);
+  }
   async initializeDataPipeline() {
     await this._inner.controlPipeline.state.waitUntilReachedTargetTimeframe({
       timeout: CONTROL_PIPELINE_READY_TIMEFRAME
@@ -2496,11 +2506,14 @@ var DataSpaceManager = class DataSpaceManager2 {
     return space;
   }
   async _constructSpace(metadata) {
-    const presence = new import_teleport_extension_presence.Presence({
-      localPeerId: this._signingContext.deviceKey,
-      announceInterval: 1e3,
-      offlineTimeout: 1e4,
-      identityKey: this._signingContext.identityKey
+    const gossip = new import_teleport_extension_gossip.Gossip({
+      localPeerId: this._signingContext.deviceKey
+    });
+    const presence = new import_teleport_extension_gossip.Presence({
+      announceInterval: 500,
+      offlineTimeout: 5e3,
+      identityKey: this._signingContext.identityKey,
+      gossip
     });
     const snapshotManager = new import_echo_pipeline2.SnapshotManager(this._snapshotStore);
     const controlFeed = metadata.controlFeedKey && await this._feedStore.openFeed(metadata.controlFeedKey, {
@@ -2517,7 +2530,7 @@ var DataSpaceManager = class DataSpaceManager2 {
         credentialAuthenticator: (0, import_util5.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
       onNetworkConnection: (session) => {
-        session.addExtension("dxos.mesh.teleport.presence", presence.createExtension({
+        session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
         session.addExtension("dxos.mesh.teleport.objectsync", snapshotManager.objectSync.createExtension());
@@ -2531,6 +2544,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       modelFactory: this._modelFactory,
       metadataStore: this._metadataStore,
       snapshotManager,
+      gossip,
       presence,
       memberKey: this._signingContext.identityKey,
       keyring: this._keyring,
@@ -2594,7 +2608,7 @@ var SpacesServiceImpl = class {
           spaces
         }, {
           file: "spaces-service.ts",
-          line: 59,
+          line: 62,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2632,6 +2646,25 @@ var SpacesServiceImpl = class {
       }
     });
   }
+  async postMessage({ spaceKey, channel, message }) {
+    var _a;
+    const dataSpaceManager = await this._getDataSpaceManager();
+    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug4.raise)(new import_echo_pipeline3.SpaceNotFoundError(spaceKey));
+    await space.postMessage(getChannelId(channel), message);
+  }
+  subscribeMessages({ spaceKey, channel }) {
+    return new import_codec_protobuf10.Stream(({ ctx, next }) => {
+      (0, import_async12.scheduleTask)(ctx, async () => {
+        var _a;
+        const dataSpaceManager = await this._getDataSpaceManager();
+        const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug4.raise)(new import_echo_pipeline3.SpaceNotFoundError(spaceKey));
+        const handle = space.listen(getChannelId(channel), (message) => {
+          next(message);
+        });
+        ctx.onDispose(() => handle.unsubscribe());
+      });
+    });
+  }
   queryCredentials({ spaceKey }) {
     return new import_codec_protobuf10.Stream(({ ctx, next }) => {
       var _a;
@@ -2675,6 +2708,7 @@ var SpacesServiceImpl = class {
     };
   }
 };
+var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/storage/storage.ts
 var import_errors = require("@dxos/errors");
@@ -3833,9 +3867,11 @@ var import_node_assert14 = __toESM(require("node:assert"));
 var import_async21 = require("@dxos/async");
 var import_client8 = require("@dxos/client");
 var import_config3 = require("@dxos/config");
+var import_debug9 = require("@dxos/debug");
 var import_document_model = require("@dxos/document-model");
 var import_echo_db = require("@dxos/echo-db");
 var import_keys10 = require("@dxos/keys");
+var import_log17 = require("@dxos/log");
 var import_messaging5 = require("@dxos/messaging");
 var import_network_manager8 = require("@dxos/network-manager");
 var import_rpc5 = require("@dxos/rpc");
@@ -3926,15 +3962,70 @@ var TestBuilder = class {
 var testSpace = async (create, check = create) => {
   const objectId = import_keys10.PublicKey.random().toHex();
   const result = create.mutate((0, import_echo_db.genesisMutation)(objectId, import_document_model.DocumentModel.meta.type));
-  await result.getReceipt();
-  (0, import_node_assert14.default)(create._itemManager.entities.has(result.objectsCreated[0].id));
-  await (0, import_async21.asyncTimeout)(check._itemManager.update.waitForCondition(() => check._itemManager.entities.has(objectId)), 1e3);
+  await result.batch.getReceipt();
+  (0, import_node_assert14.default)(create._itemManager.entities.has(result.objectsUpdated[0].id));
+  await (0, import_async21.asyncTimeout)(check.itemUpdate.waitForCondition(() => check._itemManager.entities.has(objectId)), 1e3);
   return result;
 };
 var syncItems = async (db1, db2) => {
   await testSpace(db1, db2);
   await testSpace(db2, db1);
 };
+var joinCommonSpace = async ([initialPeer, ...peers], spaceKey) => {
+  const rootSpace = spaceKey ? initialPeer.echo.getSpace(spaceKey) : await initialPeer.echo.createSpace();
+  (0, import_node_assert14.default)(rootSpace, "Space not found.");
+  await Promise.all(peers.map(async (peer) => {
+    const hostDone = new import_async21.Trigger();
+    const guestDone = new import_async21.Trigger();
+    const hostObservabli = rootSpace.createInvitation({
+      type: import_client8.Invitation.Type.INTERACTIVE_TESTING
+    });
+    (0, import_log17.log)("invitation created", {}, {
+      file: "test-builder.ts",
+      line: 154,
+      scope: void 0,
+      callSite: (f, a) => f(...a)
+    });
+    hostObservabli.subscribe({
+      onConnecting: (invitation) => {
+        const guestObservable = peer.echo.acceptInvitation(invitation);
+        (0, import_log17.log)("invitation accepted", {}, {
+          file: "test-builder.ts",
+          line: 158,
+          scope: void 0,
+          callSite: (f, a) => f(...a)
+        });
+        guestObservable.subscribe({
+          onSuccess: (invitation2) => {
+            guestDone.wake(invitation2);
+            (0, import_log17.log)("invitation guestDone", {}, {
+              file: "test-builder.ts",
+              line: 163,
+              scope: void 0,
+              callSite: (f, a) => f(...a)
+            });
+          },
+          onError: (err) => (0, import_debug9.raise)(err)
+        });
+      },
+      onSuccess: (invitation) => {
+        hostDone.wake(invitation);
+        (0, import_log17.log)("invitation hostDone", {}, {
+          file: "test-builder.ts",
+          line: 170,
+          scope: void 0,
+          callSite: (f, a) => f(...a)
+        });
+      },
+      onError: (err) => (0, import_debug9.raise)(err)
+    });
+    await Promise.all([
+      hostDone.wait(),
+      guestDone.wait()
+    ]);
+  }));
+  return rootSpace.key;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   HostTestBuilder,
@@ -3946,6 +4037,7 @@ var syncItems = async (db1, db2) => {
   createServiceContext,
   createServiceHost,
   createSigningContext,
+  joinCommonSpace,
   performInvitation,
   syncItems,
   syncItemsLocal,