@dxos/client-services 0.1.58-main.e460f33 → 0.1.58-main.e4cedde

package/dist/lib/node/index.cjs

@@ -1220,6 +1220,7 @@ var import_async8 = require("@dxos/async");
 var import_client_protocol2 = require("@dxos/client-protocol");
 var import_context5 = require("@dxos/context");
 var import_credentials7 = require("@dxos/credentials");
+var import_errors2 = require("@dxos/errors");
 var import_invariant6 = require("@dxos/invariant");
 var import_keys6 = require("@dxos/keys");
 var import_log5 = require("@dxos/log");
@@ -1231,6 +1232,7 @@ var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations")
 // packages/sdk/client-services/src/packlets/invitations/invitation-extension.ts
 var import_async7 = require("@dxos/async");
 var import_context4 = require("@dxos/context");
+var import_errors = require("@dxos/errors");
 var import_invariant5 = require("@dxos/invariant");
 var import_keys5 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
@@ -1268,7 +1270,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         options: async (options) => {
           (0, import_invariant5.invariant)(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file6,
-            L: 87,
+            L: 88,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1285,7 +1287,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 96,
+            L: 97,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1295,7 +1297,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               invitationId
             }, {
               F: __dxlog_file6,
-              L: 100,
+              L: 101,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1309,7 +1311,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             guestProfile: profile
           }, {
             F: __dxlog_file6,
-            L: 109,
+            L: 110,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1322,7 +1324,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 116,
+            L: 117,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1337,7 +1339,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 125,
+            L: 126,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1345,14 +1347,14 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             authCode: code
           }, {
             F: __dxlog_file6,
-            L: 126,
+            L: 127,
             S: this,
             C: (f, a) => f(...a)
           });
           let status = import_invitations.AuthenticationResponse.Status.OK;
           (0, import_invariant5.invariant)(this.invitation, "Invitation is not set.", {
             F: __dxlog_file6,
-            L: 129,
+            L: 130,
             S: this,
             A: [
               "this.invitation",
@@ -1363,7 +1365,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             case import_services2.Invitation.AuthMethod.NONE: {
               (0, import_log4.log)("authentication not required", void 0, {
                 F: __dxlog_file6,
-                L: 132,
+                L: 133,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1388,7 +1390,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
                 authMethod: this.invitation.authMethod
               }, {
                 F: __dxlog_file6,
-                L: 150,
+                L: 151,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1403,7 +1405,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             }
           }), {
             F: __dxlog_file6,
-            L: 156,
+            L: 157,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1417,14 +1419,14 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             F: __dxlog_file6,
-            L: 162,
+            L: 163,
             S: this,
             C: (f, a) => f(...a)
           });
           try {
             (0, import_invariant5.invariant)(this.invitation, "Invitation is not set.", {
               F: __dxlog_file6,
-              L: 165,
+              L: 166,
               S: this,
               A: [
                 "this.invitation",
@@ -1439,7 +1441,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
               id: traceId
             }), {
               F: __dxlog_file6,
-              L: 173,
+              L: 174,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1462,7 +1464,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         timeout: OPTIONS_TIMEOUT
       }));
       if (this._remoteOptions?.role !== import_invitations.Options.Role.GUEST) {
-        throw new import_protocols3.InvalidInvitationExtensionRoleError(void 0, {
+        throw new import_errors.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations.Options.Role.GUEST,
           remoteOptions: this._remoteOptions
         });
@@ -1496,7 +1498,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
         options: async (options) => {
           (0, import_invariant5.invariant)(!this._remoteOptions, "Remote options already set.", {
             F: __dxlog_file6,
-            L: 240,
+            L: 241,
             S: this,
             A: [
               "!this._remoteOptions",
@@ -1523,7 +1525,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     try {
       (0, import_log4.log)("begin options", void 0, {
         F: __dxlog_file6,
-        L: 261,
+        L: 262,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1535,12 +1537,12 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       }));
       (0, import_log4.log)("end options", void 0, {
         F: __dxlog_file6,
-        L: 264,
+        L: 265,
         S: this,
         C: (f, a) => f(...a)
       });
       if (this._remoteOptions?.role !== import_invitations.Options.Role.HOST) {
-        throw new import_protocols3.InvalidInvitationExtensionRoleError(void 0, {
+        throw new import_errors.InvalidInvitationExtensionRoleError(void 0, {
           expected: import_invitations.Options.Role.HOST,
           remoteOptions: this._remoteOptions
         });
@@ -1549,7 +1551,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     } catch (err) {
       (0, import_log4.log)("openError", err, {
         F: __dxlog_file6,
-        L: 274,
+        L: 275,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1559,7 +1561,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   async onClose() {
     (0, import_log4.log)("onClose", void 0, {
       F: __dxlog_file6,
-      L: 280,
+      L: 281,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1582,7 +1584,7 @@ var InvitationsHandler = class {
     const authCode = options?.authCode ?? (authMethod === import_services3.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials7.generatePasscode)(import_client_protocol2.AUTHENTICATION_CODE_LENGTH) : void 0);
     (0, import_invariant6.invariant)(protocol, void 0, {
       F: __dxlog_file7,
-      L: 75,
+      L: 76,
       S: this,
       A: [
         "protocol",
@@ -1611,7 +1613,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 97,
+        L: 98,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1636,7 +1638,7 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             (0, import_invariant6.invariant)(deviceKey, void 0, {
               F: __dxlog_file7,
-              L: 118,
+              L: 119,
               S: this,
               A: [
                 "deviceKey",
@@ -1659,7 +1661,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 136,
+                L: 137,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1667,7 +1669,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 137,
+                L: 138,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1683,7 +1685,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 140,
+                L: 141,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1695,7 +1697,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 142,
+                L: 143,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1705,7 +1707,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 145,
+                  L: 146,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1716,7 +1718,7 @@ var InvitationsHandler = class {
               } else {
                 import_log5.log.error("failed", err, {
                   F: __dxlog_file7,
-                  L: 148,
+                  L: 149,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -1727,7 +1729,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 151,
+                L: 152,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1740,7 +1742,7 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          if (err instanceof import_protocols4.InvalidInvitationExtensionRoleError) {
+          if (err instanceof import_errors2.InvalidInvitationExtensionRoleError) {
             return;
           }
           if (err instanceof import_async8.TimeoutError) {
@@ -1748,7 +1750,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 166,
+              L: 167,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1759,7 +1761,7 @@ var InvitationsHandler = class {
           } else {
             import_log5.log.error("failed", err, {
               F: __dxlog_file7,
-              L: 169,
+              L: 170,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1804,7 +1806,7 @@ var InvitationsHandler = class {
     const { timeout = import_client_protocol2.INVITATION_TIMEOUT } = invitation;
     (0, import_invariant6.invariant)(protocol, void 0, {
       F: __dxlog_file7,
-      L: 210,
+      L: 211,
       S: this,
       A: [
         "protocol",
@@ -1818,7 +1820,7 @@ var InvitationsHandler = class {
     const setState = (newData) => {
       (0, import_invariant6.invariant)(newData.state !== void 0, void 0, {
         F: __dxlog_file7,
-        L: 221,
+        L: 222,
         S: this,
         A: [
           "newData.state !== undefined",
@@ -1838,7 +1840,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             F: __dxlog_file7,
-            L: 229,
+            L: 230,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1848,7 +1850,7 @@ var InvitationsHandler = class {
         } else {
           import_log5.log.warn("auth failed", err, {
             F: __dxlog_file7,
-            L: 232,
+            L: 233,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1862,7 +1864,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         F: __dxlog_file7,
-        L: 240,
+        L: 241,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1877,7 +1879,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               F: __dxlog_file7,
-              L: 250,
+              L: 251,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1892,7 +1894,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 259,
+                L: 260,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1904,7 +1906,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 267,
+                L: 268,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1915,7 +1917,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 271,
+                L: 272,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1925,7 +1927,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file7,
-                L: 275,
+                L: 276,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1937,7 +1939,7 @@ var InvitationsHandler = class {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   (0, import_log5.log)("guest waiting for authentication code...", void 0, {
                     F: __dxlog_file7,
-                    L: 284,
+                    L: 285,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1949,7 +1951,7 @@ var InvitationsHandler = class {
                   });
                   (0, import_log5.log)("sending authentication request", void 0, {
                     F: __dxlog_file7,
-                    L: 288,
+                    L: 289,
                     S: this,
                     C: (f, a) => f(...a)
                   });
@@ -1970,7 +1972,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         F: __dxlog_file7,
-                        L: 299,
+                        L: 300,
                         S: this,
                         C: (f, a) => f(...a)
                       });
@@ -1987,7 +1989,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 310,
+                L: 311,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1999,7 +2001,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file7,
-                L: 321,
+                L: 322,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2011,7 +2013,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file7,
-                L: 323,
+                L: 324,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2021,7 +2023,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file7,
-                  L: 326,
+                  L: 327,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2031,7 +2033,7 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log5.log)("auth failed", err, {
                   F: __dxlog_file7,
-                  L: 329,
+                  L: 330,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2042,7 +2044,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file7,
-                L: 332,
+                L: 333,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2052,7 +2054,7 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          if (err instanceof import_protocols4.InvalidInvitationExtensionRoleError) {
+          if (err instanceof import_errors2.InvalidInvitationExtensionRoleError) {
             return;
           }
           if (err instanceof import_async8.TimeoutError) {
@@ -2060,7 +2062,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file7,
-              L: 343,
+              L: 344,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2070,7 +2072,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log5.log)("auth failed", err, {
               F: __dxlog_file7,
-              L: 346,
+              L: 347,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2083,7 +2085,7 @@ var InvitationsHandler = class {
     (0, import_async8.scheduleTask)(ctx, async () => {
       (0, import_invariant6.invariant)(invitation.swarmKey, void 0, {
         F: __dxlog_file7,
-        L: 356,
+        L: 357,
         S: this,
         A: [
           "invitation.swarmKey",
@@ -2530,7 +2532,7 @@ var import_protocols5 = require("@dxos/protocols");
 var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.1.58-main.e460f33";
+var DXOS_VERSION = "0.1.58-main.e4cedde";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 var getPlatform = () => {
@@ -2683,13 +2685,13 @@ var import_async14 = require("@dxos/async");
 var import_context9 = require("@dxos/context");
 var import_credentials14 = require("@dxos/credentials");
 var import_debug7 = require("@dxos/debug");
-var import_echo_pipeline2 = require("@dxos/echo-pipeline");
+var import_echo_pipeline3 = require("@dxos/echo-pipeline");
 var import_feed_store4 = require("@dxos/feed-store");
-var import_invariant13 = require("@dxos/invariant");
+var import_invariant12 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
 var import_keys10 = require("@dxos/keys");
 var import_log13 = require("@dxos/log");
-var import_protocols10 = require("@dxos/protocols");
+var import_protocols9 = require("@dxos/protocols");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing4 = require("@dxos/tracing");
@@ -2702,7 +2704,7 @@ var import_credentials13 = require("@dxos/credentials");
 var import_invariant11 = require("@dxos/invariant");
 var import_keys9 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
-var import_protocols8 = require("@dxos/protocols");
+var import_protocols7 = require("@dxos/protocols");
 var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
 var import_util5 = require("@dxos/util");
@@ -2713,9 +2715,9 @@ var import_client_protocol3 = require("@dxos/client-protocol");
 var import_context7 = require("@dxos/context");
 var import_debug4 = require("@dxos/debug");
 var import_echo_pipeline = require("@dxos/echo-pipeline");
+var import_errors3 = require("@dxos/errors");
 var import_keys8 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
-var import_protocols7 = require("@dxos/protocols");
 var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe2 = require("@dxos/timeframe");
@@ -3024,7 +3026,7 @@ var DataSpace = class DataSpace2 {
     this._signingContext = params.signingContext;
     this._callbacks = params.callbacks ?? {};
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new import_util4.ComplexSet(import_keys8.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => !member.removed).map((member) => member.key)),
+      trustedKeysProvider: () => new import_util4.ComplexSet(import_keys8.PublicKey.hash, Array.from(this._inner.spaceState.members.keys())),
       update: this._inner.stateUpdate,
       authTimeout: import_client_protocol3.AUTH_TIMEOUT
     });
@@ -3034,7 +3036,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 118,
+      L: 112,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3077,7 +3079,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 165,
+      L: 159,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3095,7 +3097,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 179,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3123,10 +3125,10 @@ var DataSpace = class DataSpace2 {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
-        if (err instanceof import_protocols7.CancelledError) {
+        if (err instanceof import_errors3.CancelledError) {
           (0, import_log10.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file12,
-            L: 211,
+            L: 205,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3134,7 +3136,7 @@ var DataSpace = class DataSpace2 {
         }
         import_log10.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file12,
-          L: 215,
+          L: 209,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3143,7 +3145,7 @@ var DataSpace = class DataSpace2 {
           state: import_services7.SpaceState[this._state]
         }, {
           F: __dxlog_file12,
-          L: 217,
+          L: 211,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3156,14 +3158,14 @@ var DataSpace = class DataSpace2 {
   }
   async initializeDataPipeline() {
     if (this._state !== import_services7.SpaceState.CONTROL_ONLY) {
-      throw new import_protocols7.SystemError("Invalid operation");
+      throw new import_errors3.SystemError("Invalid operation");
     }
     this._state = import_services7.SpaceState.INITIALIZING;
     (0, import_log10.log)("new state", {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 233,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3174,7 +3176,7 @@ var DataSpace = class DataSpace2 {
     await (0, import_context7.cancelWithContext)(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
     (0, import_log10.log)("waiting for data pipeline to reach target timeframe", void 0, {
       F: __dxlog_file12,
-      L: 247,
+      L: 241,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3185,7 +3187,7 @@ var DataSpace = class DataSpace2 {
     this.metrics.dataPipelineReady = /* @__PURE__ */ new Date();
     (0, import_log10.log)("data pipeline ready", void 0, {
       F: __dxlog_file12,
-      L: 256,
+      L: 250,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3195,7 +3197,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 260,
+      L: 254,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3211,7 +3213,7 @@ var DataSpace = class DataSpace2 {
     await this._createWritableFeeds();
     (0, import_log10.log)("writable feeds created", void 0, {
       F: __dxlog_file12,
-      L: 276,
+      L: 270,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3316,7 +3318,7 @@ var DataSpace = class DataSpace2 {
       state: import_services7.SpaceState[this._state]
     }, {
       F: __dxlog_file12,
-      L: 392,
+      L: 386,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3458,7 +3460,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols8.trace.begin({
+    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols7.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
@@ -3504,7 +3506,7 @@ var DataSpaceManager = class DataSpaceManager2 {
         space.initializeDataPipelineAsync();
       }
     }
-    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols8.trace.end({
+    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols7.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file13,
@@ -3758,9 +3760,10 @@ DataSpaceManager = _ts_decorate4([
 var import_async13 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_debug6 = require("@dxos/debug");
-var import_invariant12 = require("@dxos/invariant");
+var import_echo_pipeline2 = require("@dxos/echo-pipeline");
+var import_errors4 = require("@dxos/errors");
 var import_log12 = require("@dxos/log");
-var import_protocols9 = require("@dxos/protocols");
+var import_protocols8 = require("@dxos/protocols");
 var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
@@ -3780,7 +3783,7 @@ var SpacesServiceImpl = class {
   }
   async updateSpace({ spaceKey, state }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
         case import_services9.SpaceState.ACTIVE:
@@ -3790,7 +3793,7 @@ var SpacesServiceImpl = class {
           await space.deactivate();
           break;
         default:
-          throw new import_protocols9.ApiError("Invalid space state");
+          throw new import_errors4.ApiError("Invalid space state");
       }
     }
   }
@@ -3845,14 +3848,14 @@ var SpacesServiceImpl = class {
   }
   async postMessage({ spaceKey, channel, message }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     await space.postMessage(getChannelId(channel), message);
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
       (0, import_async13.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
           next(message);
         });
@@ -3860,83 +3863,38 @@ var SpacesServiceImpl = class {
       });
     });
   }
-  queryCredentials({ spaceKey, noTail }) {
-    return new import_codec_protobuf11.Stream(({ ctx, next, close }) => {
-      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+  queryCredentials({ spaceKey }) {
+    return new import_codec_protobuf11.Stream(({ ctx, next }) => {
+      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
       const processor = {
         processCredential: async (credential) => {
           next(credential);
         }
       };
       ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
-      (0, import_async13.scheduleTask)(ctx, async () => {
-        await space.spaceState.addCredentialProcessor(processor);
-        if (noTail) {
-          close();
-        }
-      });
+      (0, import_async13.scheduleTask)(ctx, () => space.spaceState.addCredentialProcessor(processor));
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
-    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     for (const credential of credentials ?? []) {
-      if (credential.proof) {
-        await space.controlPipeline.writer.write({
-          credential: {
-            credential
-          }
-        });
-      } else {
-        (0, import_invariant12.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
-          F: __dxlog_file14,
-          L: 168,
-          S: this,
-          A: [
-            "!credential.id",
-            "'Id on unsigned credentials is not allowed'"
-          ]
-        });
-        (0, import_invariant12.invariant)(this._identityManager.identity, "Identity is not available", {
-          F: __dxlog_file14,
-          L: 169,
-          S: this,
-          A: [
-            "this._identityManager.identity",
-            "'Identity is not available'"
-          ]
-        });
-        const signer = this._identityManager.identity.getIdentityCredentialSigner();
-        (0, import_invariant12.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
-          F: __dxlog_file14,
-          L: 171,
-          S: this,
-          A: [
-            "credential.issuer.equals(signer.getIssuer())",
-            ""
-          ]
-        });
-        const signedCredential = await signer.createCredential({
-          subject: credential.subject.id,
-          assertion: credential.subject.assertion
-        });
-        await space.controlPipeline.writer.write({
-          credential: {
-            credential: signedCredential
-          }
-        });
-      }
+      await space.controlPipeline.writer.write({
+        credential: {
+          credential
+        }
+      });
     }
   }
   async createEpoch({ spaceKey }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_protocols9.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug6.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     await space.createEpoch();
   }
   _serializeSpace(space) {
     return {
       spaceKey: space.key,
       state: space.state,
-      error: space.error ? (0, import_protocols9.encodeError)(space.error) : void 0,
+      error: space.error ? (0, import_protocols8.encodeError)(space.error) : void 0,
       pipeline: {
         currentEpoch: space.dataPipeline.currentEpoch,
         appliedEpoch: space.dataPipeline.appliedEpoch,
@@ -3963,7 +3921,7 @@ var SpacesServiceImpl = class {
               displayName: member.assertion.profile?.displayName
             }
           },
-          presence: member.removed ? import_services9.SpaceMember.PresenceState.REMOVED : isMe || peers.length > 0 ? import_services9.SpaceMember.PresenceState.ONLINE : import_services9.SpaceMember.PresenceState.OFFLINE,
+          presence: isMe || peers.length > 0 ? import_services9.SpaceMember.PresenceState.ONLINE : import_services9.SpaceMember.PresenceState.OFFLINE,
           peerStates: peers
         };
       }),
@@ -3995,11 +3953,11 @@ var ServiceContext = class ServiceContext2 {
     this.signalManager = signalManager;
     this.modelFactory = modelFactory;
     this.initialized = new import_async14.Trigger();
-    this.dataServiceSubscriptions = new import_echo_pipeline2.DataServiceSubscriptions();
+    this.dataServiceSubscriptions = new import_echo_pipeline3.DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = import_keys10.PublicKey.random().toHex();
-    this.metadataStore = new import_echo_pipeline2.MetadataStore(storage.createDirectory("metadata"));
-    this.snapshotStore = new import_echo_pipeline2.SnapshotStore(storage.createDirectory("snapshots"));
+    this.metadataStore = new import_echo_pipeline3.MetadataStore(storage.createDirectory("metadata"));
+    this.snapshotStore = new import_echo_pipeline3.SnapshotStore(storage.createDirectory("snapshots"));
     this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
     this.feedStore = new import_feed_store4.FeedStore({
@@ -4007,12 +3965,12 @@ var ServiceContext = class ServiceContext2 {
         root: storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline2.valueEncoding,
+          valueEncoding: import_echo_pipeline3.valueEncoding,
           stats: true
         }
       })
     });
-    this.spaceManager = new import_echo_pipeline2.SpaceManager({
+    this.spaceManager = new import_echo_pipeline3.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       blobStore: this.blobStore,
@@ -4032,7 +3990,7 @@ var ServiceContext = class ServiceContext2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols10.trace.begin({
+    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols9.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
@@ -4048,7 +4006,7 @@ var ServiceContext = class ServiceContext2 {
     if (this.identityManager.identity) {
       await this._initialize(ctx);
     }
-    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols10.trace.end({
+    import_log13.log.trace("dxos.sdk.service-context.open", import_protocols9.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file15,
@@ -4095,7 +4053,7 @@ var ServiceContext = class ServiceContext2 {
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    (0, import_invariant13.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
+    (0, import_invariant12.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file15,
       L: 174,
       S: this,
@@ -4113,8 +4071,8 @@ var ServiceContext = class ServiceContext2 {
   }
   async _checkStorageVersion() {
     await this.metadataStore.load();
-    if (this.metadataStore.version !== import_protocols10.STORAGE_VERSION) {
-      throw new import_protocols10.InvalidStorageVersionError(import_protocols10.STORAGE_VERSION, this.metadataStore.version);
+    if (this.metadataStore.version !== import_protocols9.STORAGE_VERSION) {
+      throw new Error(`Invalid storage version: current=${this.metadataStore.version}, expected=${import_protocols9.STORAGE_VERSION}`);
     }
   }
   // Called when identity is created.
@@ -4142,7 +4100,7 @@ var ServiceContext = class ServiceContext2 {
     this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore);
     await this.dataSpaceManager.open();
     this._handlerFactories.set(import_services10.Invitation.Kind.SPACE, (invitation) => {
-      (0, import_invariant13.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+      (0, import_invariant12.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file15,
         L: 218,
         S: this,
@@ -4227,14 +4185,14 @@ var import_async17 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context10 = require("@dxos/context");
 var import_document_model2 = require("@dxos/document-model");
-var import_echo_pipeline3 = require("@dxos/echo-pipeline");
-var import_invariant15 = require("@dxos/invariant");
+var import_echo_pipeline4 = require("@dxos/echo-pipeline");
+var import_invariant14 = require("@dxos/invariant");
 var import_keys11 = require("@dxos/keys");
 var import_log16 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_model_factory = require("@dxos/model-factory");
 var import_network_manager2 = require("@dxos/network-manager");
-var import_protocols12 = require("@dxos/protocols");
+var import_protocols10 = require("@dxos/protocols");
 var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
 var import_text_model = require("@dxos/text-model");
 var import_tracing5 = require("@dxos/tracing");
@@ -4284,7 +4242,7 @@ var DevicesServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/locks/node.ts
-var import_invariant14 = require("@dxos/invariant");
+var import_invariant13 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
 var import_log14 = require("@dxos/log");
 function _ts_decorate6(decorators, target, key, desc) {
@@ -4325,7 +4283,7 @@ var Lock = class {
   }
   async release() {
     await this._onRelease?.();
-    (0, import_invariant14.invariant)(this._fileHandle, "Lock is not acquired", {
+    (0, import_invariant13.invariant)(this._fileHandle, "Lock is not acquired", {
       F: __dxlog_file16,
       L: 42,
       S: this,
@@ -4493,7 +4451,7 @@ var NetworkServiceImpl = class {
 
 // packages/sdk/client-services/src/packlets/storage/storage.ts
 var import_client_protocol4 = require("@dxos/client-protocol");
-var import_protocols11 = require("@dxos/protocols");
+var import_errors5 = require("@dxos/errors");
 var import_config = require("@dxos/protocols/proto/dxos/config");
 var import_random_access_storage = require("@dxos/random-access-storage");
 var import_util8 = require("@dxos/util");
@@ -4501,16 +4459,16 @@ var StorageDriver = import_config.Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
   const { path = (0, import_util8.isNode)() ? import_client_protocol4.DX_DATA : "dxos/storage", storageType, keyStorage, persistent = false } = config ?? {};
   if (persistent && storageType === StorageDriver.RAM) {
-    throw new import_protocols11.InvalidConfigError("RAM storage cannot be used in persistent mode.");
+    throw new import_errors5.InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
   if (!persistent && storageType !== void 0 && storageType !== StorageDriver.RAM) {
-    throw new import_protocols11.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+    throw new import_errors5.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
   }
   if (persistent && keyStorage === StorageDriver.RAM) {
-    throw new import_protocols11.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+    throw new import_errors5.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
   }
   if (!persistent && keyStorage !== StorageDriver.RAM && keyStorage !== void 0) {
-    throw new import_protocols11.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+    throw new import_errors5.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
   }
   return {
     storage: (0, import_random_access_storage.createStorage)({
@@ -4717,7 +4675,7 @@ var ClientServicesHost = class ClientServicesHost2 {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    (0, import_invariant15.invariant)(!this._open, "service host is open", {
+    (0, import_invariant14.invariant)(!this._open, "service host is open", {
       F: __dxlog_file17,
       L: 184,
       S: this,
@@ -4733,7 +4691,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       C: (f, a) => f(...a)
     });
     if (config) {
-      (0, import_invariant15.invariant)(!this._config, "config already set", {
+      (0, import_invariant14.invariant)(!this._config, "config already set", {
         F: __dxlog_file17,
         L: 188,
         S: this,
@@ -4751,7 +4709,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       iceServers: this._config?.get("runtime.services.ice")
     }), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    (0, import_invariant15.invariant)(!this._networkManager, "network manager already set", {
+    (0, import_invariant14.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file17,
       L: 204,
       S: this,
@@ -4777,7 +4735,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       return;
     }
     const traceId = import_keys11.PublicKey.random().toHex();
-    import_log16.log.trace("dxos.client-services.host.open", import_protocols12.trace.begin({
+    import_log16.log.trace("dxos.client-services.host.open", import_protocols10.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4785,7 +4743,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant15.invariant)(this._config, "config not set", {
+    (0, import_invariant14.invariant)(this._config, "config not set", {
       F: __dxlog_file17,
       L: 224,
       S: this,
@@ -4794,7 +4752,7 @@ var ClientServicesHost = class ClientServicesHost2 {
         "'config not set'"
       ]
     });
-    (0, import_invariant15.invariant)(this._storage, "storage not set", {
+    (0, import_invariant14.invariant)(this._storage, "storage not set", {
       F: __dxlog_file17,
       L: 225,
       S: this,
@@ -4803,7 +4761,7 @@ var ClientServicesHost = class ClientServicesHost2 {
         "'storage not set'"
       ]
     });
-    (0, import_invariant15.invariant)(this._signalManager, "signal manager not set", {
+    (0, import_invariant14.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file17,
       L: 226,
       S: this,
@@ -4812,7 +4770,7 @@ var ClientServicesHost = class ClientServicesHost2 {
         "'signal manager not set'"
       ]
     });
-    (0, import_invariant15.invariant)(this._networkManager, "network manager not set", {
+    (0, import_invariant14.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file17,
       L: 227,
       S: this,
@@ -4842,7 +4800,7 @@ var ClientServicesHost = class ClientServicesHost2 {
         await this._serviceContext.initialized.wait();
         return this._serviceContext.dataSpaceManager;
       }),
-      DataService: new import_echo_pipeline3.DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
+      DataService: new import_echo_pipeline4.DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
@@ -4876,7 +4834,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log16.log.trace("dxos.client-services.host.open", import_protocols12.trace.end({
+    import_log16.log.trace("dxos.client-services.host.open", import_protocols10.trace.end({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4917,7 +4875,7 @@ var ClientServicesHost = class ClientServicesHost2 {
   }
   async reset() {
     const traceId = import_keys11.PublicKey.random().toHex();
-    import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols12.trace.begin({
+    import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols10.trace.begin({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4939,7 +4897,7 @@ var ClientServicesHost = class ClientServicesHost2 {
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols12.trace.end({
+    import_log16.log.trace("dxos.sdk.client-services-host.reset", import_protocols10.trace.end({
       id: traceId
     }), {
       F: __dxlog_file17,
@@ -4980,7 +4938,7 @@ var import_util10 = require("@dxos/util");
 // packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
 var import_async18 = require("@dxos/async");
 var import_client_protocol6 = require("@dxos/client-protocol");
-var import_invariant16 = require("@dxos/invariant");
+var import_invariant15 = require("@dxos/invariant");
 var import_iframe = require("@dxos/protocols/proto/dxos/iframe");
 var import_rpc2 = require("@dxos/rpc");
 var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/shell-runtime.ts";
@@ -5009,7 +4967,7 @@ var ShellRuntimeImpl = class {
     });
   }
   async setAppContext(context) {
-    (0, import_invariant16.invariant)(this._appRpc, "runtime not open", {
+    (0, import_invariant15.invariant)(this._appRpc, "runtime not open", {
       F: __dxlog_file18,
       L: 44,
       S: this,
@@ -5165,9 +5123,9 @@ _ts_decorate8([
 // packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
 var import_async20 = require("@dxos/async");
 var import_client_protocol8 = require("@dxos/client-protocol");
+var import_errors6 = require("@dxos/errors");
 var import_log18 = require("@dxos/log");
 var import_network_manager4 = require("@dxos/network-manager");
-var import_protocols13 = require("@dxos/protocols");
 var import_rpc3 = require("@dxos/rpc");
 var import_util11 = require("@dxos/util");
 var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts";
@@ -5223,7 +5181,7 @@ var IFrameProxyRuntime = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      throw new import_protocols13.RemoteServiceConnectionError("Failed to connect to worker");
+      throw new import_errors6.RemoteServiceConnectionError("Failed to connect to worker");
     }
     await this._shellRuntime?.open();
   }
@@ -5248,7 +5206,7 @@ var import_network_manager5 = require("@dxos/network-manager");
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
 var import_async21 = require("@dxos/async");
 var import_client_protocol9 = require("@dxos/client-protocol");
-var import_invariant17 = require("@dxos/invariant");
+var import_invariant16 = require("@dxos/invariant");
 var import_log19 = require("@dxos/log");
 var import_rpc4 = require("@dxos/rpc");
 var import_util12 = require("@dxos/util");
@@ -5267,7 +5225,7 @@ var WorkerSession = class {
   constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }) {
     this._startTrigger = new import_async21.Trigger();
     this.onClose = new import_util12.Callback();
-    (0, import_invariant17.invariant)(serviceHost, void 0, {
+    (0, import_invariant16.invariant)(serviceHost, void 0, {
       F: __dxlog_file21,
       L: 49,
       S: this,