@dxos/client-services 0.9.1-main.c7dcc2e112 → 0.9.1-staging.ee54ba693a

package/dist/lib/browser/{chunk-7KG6VMEU.mjs → chunk-SRTDXIDQ.mjs}

@@ -414,7 +414,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // src/version.ts
-var DXOS_VERSION = "0.9.1-main.c7dcc2e112";
+var DXOS_VERSION = "0.9.1-staging.ee54ba693a";
 
 // src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -908,7 +908,7 @@ var EdgeFeedReplicator = class extends Resource {
     }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 202, S: this });
     await this._messenger.send(ctx, buf.create(RouterMessageSchema, {
       source: {
-        identityKey: this._messenger.identityKey,
+        identityDid: this._messenger.identityDid,
         peerKey: this._messenger.peerKey
       },
       serviceId: `${EdgeService.FEED_REPLICATOR}:${this._spaceId}`,
@@ -1153,9 +1153,9 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot, tags, m
       subject: space.key,
       assertion: {
         "@type": "dxos.halo.credentials.SpaceGenesis",
-        spaceKey: space.key,
-        tags: tags ?? [],
-        membershipPolicy: membershipPolicy ?? MembershipPolicy.INVITE
+        "spaceKey": space.key,
+        "tags": tags ?? [],
+        "membershipPolicy": membershipPolicy ?? MembershipPolicy.INVITE
       }
     }),
     await createCredential({
@@ -1164,41 +1164,41 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot, tags, m
       subject: signingContext.identityKey,
       assertion: {
         "@type": "dxos.halo.credentials.SpaceMember",
-        spaceKey: space.key,
-        role: SpaceMember2.Role.OWNER,
-        profile: signingContext.getProfile(),
-        genesisFeedKey: space.controlFeedKey ?? failUndefined(),
-        tags: tags ?? []
+        "spaceKey": space.key,
+        "role": SpaceMember2.Role.OWNER,
+        "profile": signingContext.getProfile(),
+        "genesisFeedKey": space.controlFeedKey ?? failUndefined(),
+        "tags": tags ?? []
       }
     }),
     await signingContext.credentialSigner.createCredential({
       subject: space.controlFeedKey ?? failUndefined(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
-        spaceKey: space.key,
-        identityKey: signingContext.identityKey,
-        deviceKey: signingContext.deviceKey,
-        designation: AdmittedFeed.Designation.CONTROL
+        "spaceKey": space.key,
+        "identityKey": signingContext.identityKey,
+        "deviceKey": signingContext.deviceKey,
+        "designation": AdmittedFeed.Designation.CONTROL
       }
     }),
     await signingContext.credentialSigner.createCredential({
       subject: space.dataFeedKey ?? failUndefined(),
       assertion: {
         "@type": "dxos.halo.credentials.AdmittedFeed",
-        spaceKey: space.key,
-        identityKey: signingContext.identityKey,
-        deviceKey: signingContext.deviceKey,
-        designation: AdmittedFeed.Designation.DATA
+        "spaceKey": space.key,
+        "identityKey": signingContext.identityKey,
+        "deviceKey": signingContext.deviceKey,
+        "designation": AdmittedFeed.Designation.DATA
       }
     }),
     await signingContext.credentialSigner.createCredential({
       subject: space.key ?? failUndefined(),
       assertion: {
         "@type": "dxos.halo.credentials.Epoch",
-        number: 0,
-        previousId: void 0,
-        timeframe: new Timeframe(),
-        snapshotCid: void 0,
+        "number": 0,
+        "previousId": void 0,
+        "timeframe": new Timeframe(),
+        "snapshotCid": void 0,
         automergeRoot
       }
     })
@@ -1458,7 +1458,7 @@ var DataSpaceManager = class extends Resource2 {
       assertion: {
         "@type": "dxos.halo.credentials.SpaceDeleted",
         spaceKey,
-        deletedAt: /* @__PURE__ */ new Date()
+        "deletedAt": /* @__PURE__ */ new Date()
       }
     });
     await this._signingContext.recordCredential(credential);
@@ -2933,7 +2933,7 @@ var Identity = class {
       subject: deviceKey,
       assertion: {
         "@type": "dxos.halo.credentials.AuthorizedDevice",
-        identityKey: this.identityKey,
+        "identityKey": this.identityKey,
         deviceKey
       }
     });
@@ -2943,20 +2943,20 @@ var Identity = class {
         subject: controlFeedKey,
         assertion: {
           "@type": "dxos.halo.credentials.AdmittedFeed",
-          spaceKey: this.haloSpaceKey,
+          "spaceKey": this.haloSpaceKey,
           deviceKey,
-          identityKey: this.identityKey,
-          designation: AdmittedFeed2.Designation.CONTROL
+          "identityKey": this.identityKey,
+          "designation": AdmittedFeed2.Designation.CONTROL
         }
       }),
       await signer.createCredential({
         subject: dataFeedKey,
         assertion: {
           "@type": "dxos.halo.credentials.AdmittedFeed",
-          spaceKey: this.haloSpaceKey,
+          "spaceKey": this.haloSpaceKey,
           deviceKey,
-          identityKey: this.identityKey,
-          designation: AdmittedFeed2.Designation.DATA
+          "identityKey": this.identityKey,
+          "designation": AdmittedFeed2.Designation.DATA
         }
       })
     ].map((credential) => ({
@@ -4206,10 +4206,10 @@ var DataSpace = class {
         subject: controlFeed.key,
         assertion: {
           "@type": "dxos.halo.credentials.AdmittedFeed",
-          spaceKey: this.key,
-          deviceKey: this._signingContext.deviceKey,
-          identityKey: this._signingContext.identityKey,
-          designation: AdmittedFeed4.Designation.CONTROL
+          "spaceKey": this.key,
+          "deviceKey": this._signingContext.deviceKey,
+          "identityKey": this._signingContext.identityKey,
+          "designation": AdmittedFeed4.Designation.CONTROL
         }
       }));
     }
@@ -4223,10 +4223,10 @@ var DataSpace = class {
         subject: dataFeed.key,
         assertion: {
           "@type": "dxos.halo.credentials.AdmittedFeed",
-          spaceKey: this.key,
-          deviceKey: this._signingContext.deviceKey,
-          identityKey: this._signingContext.identityKey,
-          designation: AdmittedFeed4.Designation.DATA
+          "spaceKey": this.key,
+          "deviceKey": this._signingContext.deviceKey,
+          "identityKey": this._signingContext.identityKey,
+          "designation": AdmittedFeed4.Designation.DATA
         }
       }));
     }
@@ -5980,7 +5980,7 @@ var SpaceInvitationProtocol = class {
 
 // src/packlets/invitations/invitations-manager.ts
 import { Event as Event8, PushStream, TimeoutError as TimeoutError3, Trigger as Trigger5 } from "@dxos/async";
-import { AUTHENTICATION_CODE_LENGTH, AuthenticatingInvitation, CancellableInvitation, INVITATION_TIMEOUT as INVITATION_TIMEOUT2 } from "@dxos/client-protocol";
+import { AuthenticatingInvitation, AUTHENTICATION_CODE_LENGTH, CancellableInvitation, INVITATION_TIMEOUT as INVITATION_TIMEOUT2 } from "@dxos/client-protocol";
 import { generatePasscode } from "@dxos/credentials";
 import { hasInvitationExpired } from "@dxos/echo-host";
 import { invariant as invariant20 } from "@dxos/invariant";
@@ -6464,7 +6464,7 @@ var FeedSyncer = class extends Resource7 {
       this.#edgeClient.onReconnected(async () => {
         log20("feed sync edge reconnected", {
           peerKey: this.#edgeClient.peerKey,
-          identityKey: this.#edgeClient.identityKey
+          identityDid: this.#edgeClient.identityDid
         }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 174, S: this });
         if (this.#backgroundSync) {
           this.#resetSpacesToPoll();
@@ -6646,7 +6646,7 @@ var FeedSyncer = class extends Resource7 {
       }, { "~LogMeta": "~LogMeta", F: __dxlog_file25, L: 346, S: this });
       yield* Effect.tryPromise(async () => this.#edgeClient.send(ctx, createBuf(MessageSchema, {
         source: {
-          identityKey: this.#edgeClient.identityKey,
+          identityDid: this.#edgeClient.identityDid,
           peerKey: this.#edgeClient.peerKey
         },
         serviceId,
@@ -6789,7 +6789,7 @@ var EdgeAgentManager = class extends Resource8 {
     invariant22(this._edgeHttpClient, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 42, S: this, A: ["this._edgeHttpClient", ""] });
     invariant22(this._edgeFeatures?.agents, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 43, S: this, A: ["this._edgeFeatures?.agents", ""] });
     const response = await this._edgeHttpClient.createAgent(ctx, {
-      identityKey: this._identity.identityKey.toHex(),
+      identityDid: this._identity.did,
       haloSpaceId: this._identity.haloSpaceId,
       haloSpaceKey: this._identity.haloSpaceKey.toHex()
     });
@@ -6846,7 +6846,7 @@ var EdgeAgentManager = class extends Resource8 {
     try {
       log21("fetching agent status", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file26, L: 100, S: this });
       const { agent } = await this._edgeHttpClient.getAgentStatus(ctx, {
-        ownerIdentityKey: this._identity.identityKey
+        ownerIdentityDid: this._identity.did
       });
       const wasAgentCreatedDuringQuery = this._agentStatus === EdgeAgentStatus.ACTIVE;
       if (!wasAgentCreatedDuringQuery) {
@@ -6992,7 +6992,7 @@ import { Mutex as Mutex5, Trigger as Trigger6 } from "@dxos/async";
 import { Resource as Resource9 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion5 } from "@dxos/credentials";
 import { failUndefined as failUndefined2, warnAfterTimeout as warnAfterTimeout2 } from "@dxos/debug";
-import { EchoEdgeReplicator, EchoEdgeSubductionReplicator, EchoHost, MeshEchoReplicator, runSqliteHealthCheck, SqliteMetadataStore, SpaceManager, valueEncoding } from "@dxos/echo-host";
+import { EchoEdgeReplicator, EchoEdgeSubductionReplicator, EchoHost, MeshEchoReplicator, SpaceManager, SqliteMetadataStore, runSqliteHealthCheck, valueEncoding } from "@dxos/echo-host";
 import { createChainEdgeIdentity, createEphemeralEdgeIdentity } from "@dxos/edge-client";
 import { RuntimeProvider as RuntimeProvider3 } from "@dxos/effect";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
@@ -7318,11 +7318,17 @@ var SqliteRandomAccessFile = class extends BaseEventEmitter {
   }
   async _loadFromDb() {
     const filePath = this.filePath;
-    const rows = await RuntimeProvider2.runPromise(this.runtime)(Effect2.gen(function* () {
-      const sql = yield* SqlClient.SqlClient;
-      return yield* sql`SELECT data FROM hypercore_files WHERE path = ${filePath}`;
-    }));
-    this.#buffer = rows.length > 0 ? Buffer.from(rows[0].data) : Buffer.alloc(0);
+    try {
+      const rows = await RuntimeProvider2.runPromise(this.runtime)(Effect2.gen(function* () {
+        const sql = yield* SqlClient.SqlClient;
+        return yield* sql`SELECT data FROM hypercore_files WHERE path = ${filePath}`;
+      }));
+      this.#buffer = rows.length > 0 ? Buffer.from(rows[0].data) : Buffer.alloc(0);
+    } catch (err) {
+      if (!this.#closed) {
+        throw err;
+      }
+    }
     this.#loaded = true;
   }
   async _saveToDb() {
@@ -7409,7 +7415,7 @@ var SqliteStorage = class {
           path TEXT PRIMARY KEY,
           data BLOB NOT NULL DEFAULT x''
         )`;
-    log23("hypercore_files table ready", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 241, S: this });
+    log23("hypercore_files table ready", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 251, S: this });
   }).pipe(Effect2.withSpan("SqliteStorage.migrate")))();
   get size() {
     return this.#files.size;
@@ -7460,7 +7466,7 @@ var SqliteStorage = class {
     });
   }
   async reset() {
-    log23("SqliteStorage: clearing all hypercore files", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 293, S: this });
+    log23("SqliteStorage: clearing all hypercore files", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file29, L: 303, S: this });
     await RuntimeProvider2.runPromise(this.#runtime)(Effect2.gen(function* () {
       const sql = yield* SqlClient.SqlClient;
       yield* sql`DELETE FROM hypercore_files`;
@@ -7967,7 +7973,7 @@ var ServiceContext = class extends Resource9 {
       this._edgeConnection?.setIdentity(edgeIdentity);
       this._edgeHttpClient?.setIdentity(edgeIdentity);
       this.networkManager.setPeerInfo({
-        identityKey: edgeIdentity.identityKey,
+        identityDid: edgeIdentity.identityDid,
         peerKey: edgeIdentity.peerKey
       });
       log24("_setNetworkIdentity: done", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file30, L: 527, S: this });
@@ -8628,7 +8634,7 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager,
       peerInfo: this._edgeConnection ? {
-        identityKey: this._edgeConnection.identityKey,
+        identityDid: this._edgeConnection.identityDid,
         peerKey: this._edgeConnection.peerKey
       } : void 0
     });
@@ -8828,4 +8834,4 @@ export {
   ServiceRegistry,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-7KG6VMEU.mjs.map
+//# sourceMappingURL=chunk-SRTDXIDQ.mjs.map