@dxos/client-services 0.4.7 → 0.4.8-main.0602afb

package/src/packlets/spaces/data-space.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { Event, scheduleTask, sleep, synchronized, trackLeaks } from '@dxos/async';
+import { Event, asyncTimeout, scheduleTask, sleep, synchronized, trackLeaks } from '@dxos/async';
 import { AUTH_TIMEOUT } from '@dxos/client-protocol';
 import { cancelWithContext, Context, ContextDisposedError } from '@dxos/context';
 import { timed, warnAfterTimeout } from '@dxos/debug';
@@ -15,7 +15,7 @@ import {
   type AutomergeHost,
 } from '@dxos/echo-pipeline';
 import { type FeedStore } from '@dxos/feed-store';
-import { failedInvariant } from '@dxos/invariant';
+import { failedInvariant, invariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -276,6 +276,8 @@ export class DataSpace {
     // Allow other tasks to run before loading the data pipeline.
     await sleep(1);
 
+    this._automergeSpaceState.startProcessingRootDocs();
+
     await this._inner.initializeDataPipeline();
 
     this.metrics.dataPipelineOpen = new Date();
@@ -423,18 +425,38 @@ export class DataSpace {
       case undefined:
       case CreateEpochRequest.Migration.NONE:
         {
+          // TODO(dmaretskyi): Unify epoch construction.
           epoch = await this.dataPipeline.createEpoch();
         }
         break;
-      case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
-        const document = this._automergeHost.repo.create();
-        epoch = {
-          previousId: this._automergeSpaceState.lastEpoch?.id,
-          number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
-          timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe(),
-          automergeRoot: document.url,
-        };
-      }
+      case CreateEpochRequest.Migration.INIT_AUTOMERGE:
+        {
+          const document = this._automergeHost.repo.create();
+          // TODO(dmaretskyi): Unify epoch construction.
+          epoch = {
+            previousId: this._automergeSpaceState.lastEpoch?.id,
+            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
+            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe(),
+            automergeRoot: document.url,
+          };
+        }
+        break;
+      case CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY:
+        {
+          const currentRootUrl = this._automergeSpaceState.rootUrl;
+          const rootHandle = this._automergeHost.repo.find(currentRootUrl as any);
+          await cancelWithContext(this._ctx, asyncTimeout(rootHandle.whenReady(), 10_000));
+          const newRoot = this._automergeHost.repo.create(rootHandle.docSync());
+          invariant(typeof newRoot.url === 'string' && newRoot.url.length > 0);
+          // TODO(dmaretskyi): Unify epoch construction.
+          epoch = {
+            previousId: this._automergeSpaceState.lastEpoch?.id,
+            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
+            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe(),
+            automergeRoot: newRoot.url,
+          };
+        }
+        break;
     }
 
     if (!epoch) {

package/src/packlets/spaces/spaces-service.ts

@@ -178,10 +178,10 @@ export class SpacesServiceImpl implements SpacesService {
     }
   }
 
-  async createEpoch({ spaceKey }: CreateEpochRequest) {
+  async createEpoch({ spaceKey, migration }: CreateEpochRequest) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
-    await space.createEpoch();
+    await space.createEpoch({ migration });
   }
 
   private _serializeSpace(space: DataSpace): Space {

package/src/version.ts

@@ -1,5 +1 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export const DXOS_VERSION = '0.4.7'; // {x-release-please-version}
+export const DXOS_VERSION = "0.4.8-main.0602afb";