@dxos/client-services 0.5.9-main.c34beda → 0.5.9-main.c7dd658

package/dist/lib/browser/{chunk-Y5AUZFDK.mjs → chunk-KUJSUGD2.mjs}

@@ -359,7 +359,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.5.9-main.c34beda";
+var DXOS_VERSION = "0.5.9-main.c7dd658";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -1658,7 +1658,7 @@ var IdentityServiceImpl = class extends Resource {
             duplicate: space.id
           }, {
             F: __dxlog_file8,
-            L: 127,
+            L: 129,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1669,6 +1669,13 @@ var IdentityServiceImpl = class extends Resource {
         recodedDefaultSpace = true;
         recordedDefaultSpaceTrigger.wake();
       }
+    }, (err) => {
+      log6.catch(err, void 0, {
+        F: __dxlog_file8,
+        L: 140,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     });
     await Promise.race([
       allProcessed,
@@ -3717,10 +3724,10 @@ var InvitationsManager = class {
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
 import { Event as Event6, Mutex as Mutex2, scheduleTask as scheduleTask5, sleep as sleep3, synchronized, trackLeaks } from "@dxos/async";
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
-import { Context as Context8, ContextDisposedError as ContextDisposedError3, cancelWithContext as cancelWithContext5 } from "@dxos/context";
+import { Context as Context8, ContextDisposedError as ContextDisposedError3, cancelWithContext as cancelWithContext4 } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
-import { SpaceDocVersion } from "@dxos/echo-protocol";
+import { SpaceDocVersion as SpaceDocVersion2 } from "@dxos/echo-protocol";
 import { failedInvariant } from "@dxos/invariant";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
 import { log as log15 } from "@dxos/log";
@@ -3777,22 +3784,19 @@ var AutomergeSpaceState = class extends Resource2 {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts
-import { asyncTimeout as asyncTimeout2 } from "@dxos/async";
-import { next as am } from "@dxos/automerge/automerge";
-import { cancelWithContext as cancelWithContext4 } from "@dxos/context";
 import { convertLegacyReferences, convertLegacySpaceRootDoc, findInlineObjectOfType, migrateDocument } from "@dxos/echo-db";
-import { AutomergeDocumentLoaderImpl } from "@dxos/echo-pipeline";
+import { SpaceDocVersion } from "@dxos/echo-protocol";
 import { TYPE_PROPERTIES } from "@dxos/echo-schema";
 import { invariant as invariant12 } from "@dxos/invariant";
 import { log as log13 } from "@dxos/log";
 import { CreateEpochRequest } from "@dxos/protocols/proto/dxos/client/services";
-import { assignDeep } from "@dxos/util";
 var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
+var LOAD_DOC_TIMEOUT = 1e4;
 var runEpochMigration = async (ctx, context) => {
   switch (context.migration) {
     case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
-      const document = context.repo.create();
-      await context.repo.flush();
+      const document = context.echoHost.createDoc();
+      await context.echoHost.flush();
       return {
         newRoot: document.url
       };
@@ -3801,10 +3805,11 @@ var runEpochMigration = async (ctx, context) => {
       if (!context.currentRoot) {
         throw new Error("Space does not have an automerge root");
       }
-      const rootHandle = context.repo.find(context.currentRoot);
-      await cancelWithContext4(ctx, asyncTimeout2(rootHandle.whenReady(), 1e4));
-      const newRoot = context.repo.create(rootHandle.docSync());
-      await context.repo.flush();
+      const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
+      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
+      await context.echoHost.flush();
       return {
         newRoot: newRoot.url
       };
@@ -3812,66 +3817,76 @@ var runEpochMigration = async (ctx, context) => {
     case CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
       log13.info("Fragmenting", void 0, {
         F: __dxlog_file16,
-        L: 63,
+        L: 64,
         S: void 0,
         C: (f, a) => f(...a)
       });
       const currentRootUrl = context.currentRoot;
-      const rootHandle = context.repo.find(currentRootUrl);
-      await cancelWithContext4(ctx, asyncTimeout2(rootHandle.whenReady(), 1e4));
+      const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
       const objects = Object.entries(rootHandle.docSync().objects);
       const properties = findInlineObjectOfType(rootHandle.docSync(), TYPE_PROPERTIES);
       const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
       invariant12(properties, "Properties not found", {
         F: __dxlog_file16,
-        L: 73,
+        L: 75,
         S: void 0,
         A: [
           "properties",
           "'Properties not found'"
         ]
       });
-      const newSpaceDoc = {
+      const newRoot = context.echoHost.createDoc({
         ...rootHandle.docSync(),
         objects: Object.fromEntries([
           properties
         ])
-      };
-      const newRoot = context.repo.create(newSpaceDoc);
+      });
       invariant12(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
         F: __dxlog_file16,
-        L: 78,
+        L: 82,
         S: void 0,
         A: [
           "typeof newRoot.url === 'string' && newRoot.url.length > 0",
           ""
         ]
       });
-      const docLoader = new AutomergeDocumentLoaderImpl(context.spaceId, context.repo, context.spaceKey);
-      await docLoader.loadSpaceRootDocHandle(ctx, {
-        rootUrl: newRoot.url
-      });
-      otherObjects.forEach(([key, value]) => {
-        const handle = docLoader.createDocumentForObject(key);
-        handle.change((doc) => {
-          assignDeep(doc, [
-            "objects",
-            key
-          ], value);
+      const newLinks = [];
+      for (const [id, objData] of otherObjects) {
+        const handle = context.echoHost.createDoc({
+          version: SpaceDocVersion.CURRENT,
+          access: {
+            spaceKey: context.spaceKey.toHex()
+          },
+          objects: {
+            [id]: objData
+          }
         });
+        newLinks.push([
+          id,
+          handle.url
+        ]);
+      }
+      newRoot.change((doc) => {
+        doc.links ??= {};
+        for (const [id, url] of newLinks) {
+          doc.links[id] = url;
+        }
       });
-      await context.repo.flush();
+      await context.echoHost.flush();
       return {
         newRoot: newRoot.url
       };
     }
     case CreateEpochRequest.Migration.MIGRATE_REFERENCES_TO_DXN: {
       const currentRootUrl = context.currentRoot;
-      const rootHandle = context.repo.find(currentRootUrl);
-      await cancelWithContext4(ctx, asyncTimeout2(rootHandle.whenReady(), 1e4));
+      const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
       invariant12(rootHandle.docSync(), "Root doc not found", {
         F: __dxlog_file16,
-        L: 100,
+        L: 115,
         S: void 0,
         A: [
           "rootHandle.docSync()",
@@ -3880,25 +3895,44 @@ var runEpochMigration = async (ctx, context) => {
       });
       const newRootContent = await convertLegacySpaceRootDoc(structuredClone(rootHandle.docSync()));
       for (const [id, url] of Object.entries(newRootContent.links ?? {})) {
-        const handle = context.repo.find(url);
-        await cancelWithContext4(ctx, asyncTimeout2(handle.whenReady(), 1e4));
-        invariant12(handle.docSync(), "Doc not found", {
-          F: __dxlog_file16,
-          L: 107,
-          S: void 0,
-          A: [
-            "handle.docSync()",
-            "'Doc not found'"
-          ]
-        });
-        const newDoc = await convertLegacyReferences(structuredClone(handle.docSync()));
-        const migratedDoc = migrateDocument(handle.docSync(), newDoc);
-        const newHandle = context.repo.import(am.save(migratedDoc));
-        newRootContent.links[id] = newHandle.url;
+        try {
+          const handle = await context.echoHost.loadDoc(ctx, url, {
+            timeout: LOAD_DOC_TIMEOUT
+          });
+          invariant12(handle.docSync(), void 0, {
+            F: __dxlog_file16,
+            L: 122,
+            S: void 0,
+            A: [
+              "handle.docSync()",
+              ""
+            ]
+          });
+          const newDoc = await convertLegacyReferences(structuredClone(handle.docSync()));
+          const migratedDoc = migrateDocument(handle.docSync(), newDoc);
+          const newHandle = context.echoHost.createDoc(migratedDoc, {
+            preserveHistory: true
+          });
+          newRootContent.links[id] = newHandle.url;
+        } catch (err) {
+          log13.warn("Failed to migrate reference", {
+            id,
+            url,
+            error: err
+          }, {
+            F: __dxlog_file16,
+            L: 128,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
+          delete newRootContent.links[id];
+        }
       }
       const migratedRoot = migrateDocument(rootHandle.docSync(), newRootContent);
-      const newRoot = context.repo.import(am.save(migratedRoot));
-      await context.repo.flush();
+      const newRoot = context.echoHost.createDoc(migratedRoot, {
+        preserveHistory: true
+      });
+      await context.echoHost.flush();
       return {
         newRoot: newRoot.url
       };
@@ -3906,14 +3940,14 @@ var runEpochMigration = async (ctx, context) => {
     case CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
       invariant12(context.newAutomergeRoot, void 0, {
         F: __dxlog_file16,
-        L: 124,
+        L: 143,
         S: void 0,
         A: [
           "context.newAutomergeRoot",
           ""
         ]
       });
-      await context.repo.flush();
+      await context.echoHost.flush();
       return {
         newRoot: context.newAutomergeRoot
       };
@@ -4568,7 +4602,7 @@ var DataSpace = class {
         try {
           var _usingCtx = _using_ctx();
           await warnAfterTimeout(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
-            await cancelWithContext5(this._ctx, handle.whenReady());
+            await cancelWithContext4(this._ctx, handle.whenReady());
           });
           if (this._ctx.disposed) {
             return;
@@ -4587,7 +4621,7 @@ var DataSpace = class {
           }
           const root = await this._echoHost.openSpaceRoot(handle.url);
           this._databaseRoot = root;
-          if (root.getVersion() !== SpaceDocVersion.CURRENT) {
+          if (root.getVersion() !== SpaceDocVersion2.CURRENT) {
             if (this._state !== SpaceState2.REQUIRES_MIGRATION) {
               this._state = SpaceState2.REQUIRES_MIGRATION;
               this.stateUpdate.emit();
@@ -4612,7 +4646,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file18,
-          L: 431,
+          L: 433,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4640,7 +4674,7 @@ var DataSpace = class {
       return null;
     }
     const { newRoot } = await runEpochMigration(ctx, {
-      repo: this._echoHost.automergeRepo,
+      echoHost: this._echoHost,
       spaceId: this.id,
       spaceKey: this.key,
       migration: options.migration,
@@ -4698,7 +4732,7 @@ var DataSpace = class {
       state: SpaceState2[this._state]
     }, {
       F: __dxlog_file18,
-      L: 512,
+      L: 514,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4757,12 +4791,12 @@ DataSpace = _ts_decorate4([
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
 import { Event as Event7, synchronized as synchronized2, trackLeaks as trackLeaks2 } from "@dxos/async";
 import { PropertiesType } from "@dxos/client-protocol";
-import { Context as Context9, cancelWithContext as cancelWithContext6 } from "@dxos/context";
+import { Context as Context9, cancelWithContext as cancelWithContext5 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion3, createAdmissionCredentials } from "@dxos/credentials";
 import { convertLegacyReferences as convertLegacyReferences2, findInlineObjectOfType as findInlineObjectOfType2 } from "@dxos/echo-db";
 import { AuthStatus } from "@dxos/echo-pipeline";
 import { CredentialServerExtension } from "@dxos/echo-pipeline";
-import { LEGACY_TYPE_PROPERTIES, SpaceDocVersion as SpaceDocVersion2, encodeReference } from "@dxos/echo-protocol";
+import { LEGACY_TYPE_PROPERTIES, SpaceDocVersion as SpaceDocVersion3, encodeReference } from "@dxos/echo-protocol";
 import { TYPE_PROPERTIES as TYPE_PROPERTIES2, generateEchoId, getTypeReference } from "@dxos/echo-schema";
 import { writeMessages as writeMessages3 } from "@dxos/feed-store";
 import { invariant as invariant14 } from "@dxos/invariant";
@@ -4773,7 +4807,7 @@ import { Invitation as Invitation7, SpaceState as SpaceState3 } from "@dxos/prot
 import { SpaceMember as SpaceMember6 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Gossip as Gossip2, Presence as Presence2 } from "@dxos/teleport-extension-gossip";
 import { trace as trace7 } from "@dxos/tracing";
-import { ComplexMap as ComplexMap3, assignDeep as assignDeep2, deferFunction as deferFunction2, forEachAsync } from "@dxos/util";
+import { ComplexMap as ComplexMap3, assignDeep, deferFunction as deferFunction2, forEachAsync } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
 import { createCredential } from "@dxos/credentials";
@@ -5032,11 +5066,11 @@ var DataSpaceManager = class {
       return false;
     }
     switch (space.databaseRoot.getVersion()) {
-      case SpaceDocVersion2.CURRENT: {
+      case SpaceDocVersion3.CURRENT: {
         const [_, properties] = findInlineObjectOfType2(space.databaseRoot.docSync(), TYPE_PROPERTIES2) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
-      case SpaceDocVersion2.LEGACY: {
+      case SpaceDocVersion3.LEGACY: {
         const convertedDoc = await convertLegacyReferences2(space.databaseRoot.docSync());
         const [_, properties] = findInlineObjectOfType2(convertedDoc, LEGACY_TYPE_PROPERTIES) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
@@ -5070,7 +5104,7 @@ var DataSpaceManager = class {
     };
     const propertiesId = generateEchoId();
     document.change((doc) => {
-      assignDeep2(doc, [
+      assignDeep(doc, [
         "objects",
         propertiesId
       ], properties);
@@ -5177,7 +5211,7 @@ var DataSpaceManager = class {
   * TODO(dmaretskyi): Consider removing.
   */
   async waitUntilSpaceReady(spaceKey) {
-    await cancelWithContext6(this._ctx, this.updated.waitForCondition(() => {
+    await cancelWithContext5(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
       return !!space && space.state === SpaceState3.READY;
     }));
@@ -5712,7 +5746,8 @@ var SpacesServiceImpl = class {
         startDataTimeframe: void 0,
         currentDataTimeframe: void 0,
         targetDataTimeframe: void 0,
-        totalDataTimeframe: void 0
+        totalDataTimeframe: void 0,
+        spaceRootUrl: space.databaseRoot?.url
       },
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
         const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));
@@ -6070,7 +6105,7 @@ var ServiceRegistry = class {
 };
 
 // packages/sdk/client-services/src/packlets/locks/browser.ts
-import { asyncTimeout as asyncTimeout3, Trigger as Trigger9 } from "@dxos/async";
+import { asyncTimeout as asyncTimeout2, Trigger as Trigger9 } from "@dxos/async";
 import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
 import { log as log19, logInfo } from "@dxos/log";
 function _ts_decorate7(decorators, target, key, desc) {
@@ -6111,7 +6146,7 @@ var Lock = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      await asyncTimeout3(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
+      await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
       log19("acquired lock", void 0, {
         F: __dxlog_file22,
         L: 44,
@@ -6345,14 +6380,15 @@ var exportProfileData = async ({ storage, level }) => {
   return archive;
 };
 var importProfileData = async ({ storage, level }, archive) => {
-  const batch = level.batch();
+  let batch = level.batch();
+  let count = 0;
   for (const entry2 of archive.storage) {
     switch (entry2.type) {
       case ProfileArchiveEntryType.FILE: {
         const directory = await storage.createDirectory();
         invariant17(typeof entry2.key === "string", "Invalid key type", {
           F: __dxlog_file23,
-          L: 78,
+          L: 79,
           S: void 0,
           A: [
             "typeof entry.key === 'string'",
@@ -6362,7 +6398,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         const file = await directory.getOrCreateFile(entry2.key);
         invariant17(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file23,
-          L: 80,
+          L: 81,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -6376,7 +6412,7 @@ var importProfileData = async ({ storage, level }, archive) => {
       case ProfileArchiveEntryType.KEY_VALUE: {
         invariant17(entry2.key instanceof Uint8Array, "Invalid key type", {
           F: __dxlog_file23,
-          L: 86,
+          L: 87,
           S: void 0,
           A: [
             "entry.key instanceof Uint8Array",
@@ -6385,7 +6421,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         });
         invariant17(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file23,
-          L: 87,
+          L: 88,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -6401,7 +6437,27 @@ var importProfileData = async ({ storage, level }, archive) => {
       default:
         throw new Error(`Invalid entry type: ${entry2.type}`);
     }
+    if (++count % 1e3 === 0) {
+      await batch.write();
+      batch = level.batch();
+      log20.info("importing", {
+        count,
+        total: archive.storage.length,
+        progress: `${(count / archive.storage.length * 100).toFixed()}%`
+      }, {
+        F: __dxlog_file23,
+        L: 101,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+    }
   }
+  log20.info("committing changes..", void 0, {
+    F: __dxlog_file23,
+    L: 109,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
   await batch.write();
 };
 
@@ -7267,4 +7323,4 @@ export {
   ClientServicesProviderResource,
   DiagnosticsCollector
 };
-//# sourceMappingURL=chunk-Y5AUZFDK.mjs.map
+//# sourceMappingURL=chunk-KUJSUGD2.mjs.map