@dxos/client-services 0.6.12-main.15a606f → 0.6.12-main.78ddbdf

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

@@ -32,7 +32,7 @@ __export(testing_exports, {
   sanitizeInvitation: () => sanitizeInvitation
 });
 module.exports = __toCommonJS(testing_exports);
-var import_chunk_EBZ7KFXS = require("../chunk-EBZ7KFXS.cjs");
+var import_chunk_F3WGFGEN = require("../chunk-F3WGFGEN.cjs");
 var import_credentials = require("@dxos/credentials");
 var import_keys = require("@dxos/keys");
 var import_async = require("@dxos/async");
@@ -228,7 +228,7 @@ var createInvitation = async (host, options) => {
     authMethod: import_services.Invitation.AuthMethod.NONE,
     ...options ?? {}
   };
-  if (host instanceof import_chunk_EBZ7KFXS.ServiceContext) {
+  if (host instanceof import_chunk_F3WGFGEN.ServiceContext) {
     return host.invitationsManager.createInvitation({
       kind: import_services.Invitation.Kind.SPACE,
       ...options
@@ -238,7 +238,7 @@ var createInvitation = async (host, options) => {
 };
 var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
   invitation = sanitizeInvitation(invitation);
-  if (guest instanceof import_chunk_EBZ7KFXS.ServiceContext) {
+  if (guest instanceof import_chunk_F3WGFGEN.ServiceContext) {
     return guest.invitationsManager.acceptInvitation({
       invitation,
       deviceProfile: guestDeviceProfile
@@ -248,7 +248,7 @@ var acceptInvitation = (guest, invitation, guestDeviceProfile) => {
 };
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/testing/test-builder.ts";
 var createServiceHost = (config, signalManagerContext) => {
-  return new import_chunk_EBZ7KFXS.ClientServicesHost({
+  return new import_chunk_F3WGFGEN.ClientServicesHost({
     config,
     signalManager: new import_messaging.MemorySignalManager(signalManagerContext),
     transportFactory: import_network_manager.MemoryTransportFactory
@@ -267,7 +267,7 @@ var createServiceContext = async ({ signalManagerFactory = async () => {
   });
   const level = (0, import_testing.createTestLevel)();
   await level.open();
-  return new import_chunk_EBZ7KFXS.ServiceContext(storage, level, networkManager, signalManager, void 0, {
+  return new import_chunk_F3WGFGEN.ServiceContext(storage, level, networkManager, signalManager, void 0, {
     invitationConnectionDefaultParams: {
       controlHeartbeatInterval: 200
     },
@@ -376,7 +376,7 @@ var TestPeer = class {
     return this._props.meshEchoReplicator ??= new import_echo_pipeline.MeshEchoReplicator();
   }
   get dataSpaceManager() {
-    return this._props.dataSpaceManager ??= new import_chunk_EBZ7KFXS.DataSpaceManager({
+    return this._props.dataSpaceManager ??= new import_chunk_F3WGFGEN.DataSpaceManager({
       spaceManager: this.spaceManager,
       metadataStore: this.metadataStore,
       keyring: this.keyring,
@@ -391,9 +391,9 @@ var TestPeer = class {
     });
   }
   get invitationsManager() {
-    return this._props.invitationsManager ??= new import_chunk_EBZ7KFXS.InvitationsManager(new import_chunk_EBZ7KFXS.InvitationsHandler(this.networkManager), (invitation) => {
+    return this._props.invitationsManager ??= new import_chunk_F3WGFGEN.InvitationsManager(new import_chunk_F3WGFGEN.InvitationsHandler(this.networkManager), (invitation) => {
       if (invitation.kind === import_services2.Invitation.Kind.SPACE) {
-        return new import_chunk_EBZ7KFXS.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
+        return new import_chunk_F3WGFGEN.SpaceInvitationProtocol(this.dataSpaceManager, this.identity, this.keyring, invitation.spaceKey);
       } else {
         throw new Error("not implemented");
       }

package/dist/lib/node-esm/{chunk-LDBJYNPL.mjs → chunk-3HDLTAT2.mjs}

@@ -397,7 +397,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.6.12-main.15a606f";
+var DXOS_VERSION = "0.6.12-main.78ddbdf";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -726,7 +726,8 @@ var TrustedKeySetAuthVerifier = class {
 // packages/sdk/client-services/src/packlets/spaces/edge-feed-replicator.ts
 import { decode as decodeCbor, encode as encodeCbor } from "cbor-x";
 import { Event, Mutex, scheduleMicroTask } from "@dxos/async";
-import { Resource } from "@dxos/context";
+import { Context as Context3, Resource } from "@dxos/context";
+import { EdgeConnectionClosedError, EdgeIdentityChangedError } from "@dxos/edge-client";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
@@ -815,7 +816,7 @@ var EdgeFeedReplicator = class extends Resource {
     this._spaceId = spaceId;
   }
   async _open() {
-    this._ctx.onDispose(this._messenger.addListener(async (message) => {
+    this._ctx.onDispose(this._messenger.addListener((message) => {
       if (!message.serviceId) {
         return;
       }
@@ -830,7 +831,7 @@ var EdgeFeedReplicator = class extends Resource {
           _spaceId: this._spaceId
         }, {
           F: __dxlog_file5,
-          L: 62,
+          L: 66,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -843,20 +844,54 @@ var EdgeFeedReplicator = class extends Resource {
         type: payload.type
       }, {
         F: __dxlog_file5,
-        L: 67,
+        L: 71,
         S: this,
         C: (f, a) => f(...a)
       });
       this._onMessage(payload);
     }));
-    this._connected = true;
-    this._connectionCtx = this._ctx.derive();
-    for (const feed of this._feeds.values()) {
-      await this._replicateFeed(feed);
-    }
+    this._messenger.connected.on(this._ctx, async () => {
+      await this._resetConnection();
+      this._connected = true;
+      const connectionCtx = new Context3({
+        onError: async (err) => {
+          if (connectionCtx !== this._connectionCtx) {
+            return;
+          }
+          if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
+            log3("resetting on reconnect", void 0, {
+              F: __dxlog_file5,
+              L: 86,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            await this._resetConnection();
+          } else {
+            this._ctx.raise(err);
+          }
+        }
+      }, {
+        F: __dxlog_file5,
+        L: 80
+      });
+      this._connectionCtx = connectionCtx;
+      log3("connection context created", void 0, {
+        F: __dxlog_file5,
+        L: 94,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      scheduleMicroTask(connectionCtx, async () => {
+        for (const feed of this._feeds.values()) {
+          await this._replicateFeed(connectionCtx, feed);
+        }
+      });
+    });
   }
   async _close() {
-    this._connected = false;
+    await this._resetConnection();
+  }
+  async _resetConnection() {
     this._connected = false;
     await this._connectionCtx?.dispose();
     this._connectionCtx = void 0;
@@ -867,37 +902,37 @@ var EdgeFeedReplicator = class extends Resource {
       key: feed.key
     }, {
       F: __dxlog_file5,
-      L: 89,
+      L: 115,
       S: this,
       C: (f, a) => f(...a)
     });
     this._feeds.set(feed.key, feed);
-    if (this._connected) {
-      await this._replicateFeed(feed);
+    if (this._connected && this._connectionCtx) {
+      await this._replicateFeed(this._connectionCtx, feed);
     }
   }
   _getPushMutex(key) {
     return defaultMap(this._pushMutex, key, () => new Mutex());
   }
-  async _replicateFeed(feed) {
-    invariant2(this._connectionCtx, void 0, {
-      F: __dxlog_file5,
-      L: 102,
-      S: this,
-      A: [
-        "this._connectionCtx",
-        ""
-      ]
-    });
+  async _replicateFeed(ctx, feed) {
     await this._sendMessage({
       type: "get-metadata",
       feedKey: feed.key.toHex()
     });
-    Event.wrap(feed.core, "append").on(this._connectionCtx, async () => {
+    Event.wrap(feed.core, "append").on(ctx, async () => {
       await this._pushBlocksIfNeeded(feed);
     });
   }
   async _sendMessage(message) {
+    if (!this._connectionCtx) {
+      log3.info("message dropped because connection was disposed", void 0, {
+        F: __dxlog_file5,
+        L: 140,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
     const logPayload = message.type === "data" ? {
       feedKey: message.feedKey,
       blocks: message.blocks.map((b) => b.index)
@@ -906,13 +941,13 @@ var EdgeFeedReplicator = class extends Resource {
     };
     log3.info("sending message", logPayload, {
       F: __dxlog_file5,
-      L: 117,
+      L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 119,
+      L: 148,
       S: this,
       A: [
         "message.feedKey",
@@ -932,7 +967,16 @@ var EdgeFeedReplicator = class extends Resource {
     }));
   }
   _onMessage(message) {
-    scheduleMicroTask(this._ctx, async () => {
+    if (!this._connectionCtx) {
+      log3.warn("received message after connection context was disposed", void 0, {
+        F: __dxlog_file5,
+        L: 165,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    scheduleMicroTask(this._connectionCtx, async () => {
       switch (message.type) {
         case "metadata": {
           try {
@@ -941,7 +985,7 @@ var EdgeFeedReplicator = class extends Resource {
               message
             }, {
               F: __dxlog_file5,
-              L: 138,
+              L: 171,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -952,7 +996,7 @@ var EdgeFeedReplicator = class extends Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 143,
+                L: 176,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -985,7 +1029,7 @@ var EdgeFeedReplicator = class extends Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 165,
+            L: 198,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -996,7 +1040,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 170,
+              L: 203,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1010,7 +1054,7 @@ var EdgeFeedReplicator = class extends Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 179,
+            L: 212,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1025,7 +1069,7 @@ var EdgeFeedReplicator = class extends Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 186,
+      L: 219,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1035,7 +1079,7 @@ var EdgeFeedReplicator = class extends Resource {
       });
       invariant2(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 191,
+        L: 224,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1063,7 +1107,7 @@ var EdgeFeedReplicator = class extends Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 212,
+      L: 245,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1081,11 +1125,11 @@ var EdgeFeedReplicator = class extends Resource {
   async _pushBlocksIfNeeded(feed) {
     try {
       var _usingCtx = _using_ctx();
-      const _guard = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
+      const _ = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
       if (!this._remoteLength.has(feed.key)) {
         log3("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file5,
-          L: 233,
+          L: 266,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1116,7 +1160,7 @@ var bufferizeBlock = (block) => ({
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
 import { Event as Event7, Mutex as Mutex2, scheduleTask as scheduleTask4, sleep as sleep3, synchronized as synchronized2, trackLeaks as trackLeaks2 } from "@dxos/async";
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
-import { Context as Context5, ContextDisposedError, cancelWithContext as cancelWithContext2 } from "@dxos/context";
+import { Context as Context6, ContextDisposedError, cancelWithContext as cancelWithContext2 } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
 import { SpaceDocVersion as SpaceDocVersion3 } from "@dxos/echo-protocol";
@@ -1352,7 +1396,7 @@ var runEpochMigration = async (ctx, context) => {
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
 import { DeferredTask, Event as Event3, scheduleTask as scheduleTask2, sleep, TimeoutError, Trigger as Trigger2 } from "@dxos/async";
-import { Context as Context3, rejectOnDispose } from "@dxos/context";
+import { Context as Context4, rejectOnDispose } from "@dxos/context";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { PublicKey as PublicKey4 } from "@dxos/keys";
 import { log as log5 } from "@dxos/log";
@@ -1366,7 +1410,7 @@ var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
 var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
-    this._ctx = new Context3(void 0, {
+    this._ctx = new Context4(void 0, {
       F: __dxlog_file7,
       L: 62
     });
@@ -2936,7 +2980,7 @@ Identity = _ts_decorate2([
 // packages/sdk/client-services/src/packlets/identity/identity-manager.ts
 import platform from "platform";
 import { Event as Event6 } from "@dxos/async";
-import { Context as Context4 } from "@dxos/context";
+import { Context as Context5 } from "@dxos/context";
 import { createCredentialSignerWithKey as createCredentialSignerWithKey2, CredentialGenerator } from "@dxos/credentials";
 import { invariant as invariant8 } from "@dxos/invariant";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
@@ -3018,7 +3062,7 @@ var IdentityManager = class {
     });
   }
   async close() {
-    await this._identity?.close(new Context4(void 0, {
+    await this._identity?.close(new Context5(void 0, {
       F: __dxlog_file12,
       L: 140
     }));
@@ -3051,7 +3095,7 @@ var IdentityManager = class {
       }
     };
     const identity = await this._constructIdentity(identityRecord);
-    await identity.open(new Context4(void 0, {
+    await identity.open(new Context5(void 0, {
       F: __dxlog_file12,
       L: 161
     }));
@@ -3180,7 +3224,7 @@ var IdentityManager = class {
       }
     };
     const identity = await this._constructIdentity(identityRecord);
-    await identity.open(new Context4(void 0, {
+    await identity.open(new Context5(void 0, {
       F: __dxlog_file12,
       L: 268
     }));
@@ -3635,7 +3679,7 @@ function _using_ctx2() {
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
-    this._ctx = new Context5(void 0, {
+    this._ctx = new Context6(void 0, {
       F: __dxlog_file14,
       L: 94
     });
@@ -3742,7 +3786,7 @@ var DataSpace = class {
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.append(this._onFeedAdded);
     }
-    await this._inner.open(new Context5(void 0, {
+    await this._inner.open(new Context6(void 0, {
       F: __dxlog_file14,
       L: 238
     }));
@@ -3777,7 +3821,7 @@ var DataSpace = class {
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
-    this._ctx = new Context5(void 0, {
+    this._ctx = new Context6(void 0, {
       F: __dxlog_file14,
       L: 264
     });
@@ -4272,7 +4316,7 @@ import { ComplexSet as ComplexSet5 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts
 import { Trigger as Trigger4 } from "@dxos/async";
-import { cancelWithContext as cancelWithContext4, Context as Context6 } from "@dxos/context";
+import { cancelWithContext as cancelWithContext4, Context as Context7 } from "@dxos/context";
 import { invariant as invariant11 } from "@dxos/invariant";
 import { log as log13 } from "@dxos/log";
 import { InvalidInvitationExtensionRoleError } from "@dxos/protocols";
@@ -4314,7 +4358,7 @@ var InvitationGuestExtension = class extends RpcExtension2 {
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
-    this._ctx = new Context6(void 0, {
+    this._ctx = new Context7(void 0, {
       F: __dxlog_file16,
       L: 34
     });
@@ -4426,7 +4470,7 @@ var InvitationGuestExtension = class extends RpcExtension2 {
 
 // packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts
 import { Trigger as Trigger5, scheduleTask as scheduleTask5 } from "@dxos/async";
-import { cancelWithContext as cancelWithContext5, Context as Context7 } from "@dxos/context";
+import { cancelWithContext as cancelWithContext5, Context as Context8 } from "@dxos/context";
 import { randomBytes, verify } from "@dxos/crypto";
 import { invariant as invariant12, InvariantViolation } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
@@ -4451,7 +4495,7 @@ var InvitationHostExtension = class extends RpcExtension3 {
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
-    this._ctx = new Context7(void 0, {
+    this._ctx = new Context8(void 0, {
       F: __dxlog_file17,
       L: 53
     });
@@ -5826,7 +5870,7 @@ var SpaceInvitationProtocol = class {
 // packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts
 import { Event as Event8, PushStream, TimeoutError as TimeoutError3, Trigger as Trigger6 } from "@dxos/async";
 import { AuthenticatingInvitation, AUTHENTICATION_CODE_LENGTH, CancellableInvitation, INVITATION_TIMEOUT as INVITATION_TIMEOUT2 } from "@dxos/client-protocol";
-import { Context as Context8 } from "@dxos/context";
+import { Context as Context9 } from "@dxos/context";
 import { generatePasscode } from "@dxos/credentials";
 import { hasInvitationExpired } from "@dxos/echo-pipeline";
 import { invariant as invariant16 } from "@dxos/invariant";
@@ -6058,7 +6102,7 @@ var InvitationsManager = class {
   }
   _createObservableInvitation(handler, invitation) {
     const stream = new PushStream();
-    const ctx = new Context8({
+    const ctx = new Context9({
       onError: (err) => {
         stream.error(err);
         void ctx.dispose();
@@ -6098,7 +6142,7 @@ var InvitationsManager = class {
   _createObservableAcceptingInvitation(handler, initialState) {
     const otpEnteredTrigger = new Trigger6();
     const stream = new PushStream();
-    const ctx = new Context8({
+    const ctx = new Context9({
       onError: (err) => {
         if (err instanceof TimeoutError3) {
           log18("timeout", {
@@ -6328,7 +6372,7 @@ ClientRpcServer = _ts_decorate6([
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
 import { Trigger as Trigger7 } from "@dxos/async";
-import { Context as Context9, Resource as Resource5 } from "@dxos/context";
+import { Context as Context10, Resource as Resource5 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion5 } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { EchoEdgeReplicator, EchoHost, MeshEchoReplicator, MetadataStore, SpaceManager, valueEncoding } from "@dxos/echo-pipeline";
@@ -6518,7 +6562,7 @@ var ServiceContext = class extends Resource5 {
   }
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
-    await this._initialize(new Context9(void 0, {
+    await this._initialize(new Context10(void 0, {
       F: __dxlog_file23,
       L: 249
     }));
@@ -6547,7 +6591,7 @@ var ServiceContext = class extends Resource5 {
   }
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize(new Context9(void 0, {
+    await this._initialize(new Context10(void 0, {
       F: __dxlog_file23,
       L: 271
     }));
@@ -6937,7 +6981,7 @@ var importProfileData = async ({ storage, level }, archive) => {
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 import { Event as Event10, synchronized as synchronized3 } from "@dxos/async";
 import { clientServiceBundle } from "@dxos/client-protocol";
-import { Context as Context10 } from "@dxos/context";
+import { Context as Context11 } from "@dxos/context";
 import { EdgeClient } from "@dxos/edge-client";
 import { invariant as invariant21 } from "@dxos/invariant";
 import { PublicKey as PublicKey17 } from "@dxos/keys";
@@ -7372,7 +7416,7 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new Context10(void 0, {
+            void this.open(new Context11(void 0, {
               F: __dxlog_file26,
               L: 132
             }));
@@ -7762,4 +7806,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-LDBJYNPL.mjs.map
+//# sourceMappingURL=chunk-3HDLTAT2.mjs.map