@dxos/client-services 0.8.4-main.fd6878d → 0.8.4-main.fffef41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/client-services",
-  "version": "0.8.4-main.fd6878d",
+  "version": "0.8.4-main.fffef41",
   "description": "DXOS client services implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -43,52 +43,52 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.1.1",
-    "@automerge/automerge-repo": "2.3.0-alpha.0",
+    "@automerge/automerge": "3.1.2",
+    "@automerge/automerge-repo": "2.4.0",
     "@obsidize/tar-browserify": "^5.2.0",
     "cbor-x": "^1.5.4",
     "platform": "^1.3.6",
-    "@dxos/async": "0.8.4-main.fd6878d",
-    "@dxos/client-protocol": "0.8.4-main.fd6878d",
-    "@dxos/codec-protobuf": "0.8.4-main.fd6878d",
-    "@dxos/credentials": "0.8.4-main.fd6878d",
-    "@dxos/crypto": "0.8.4-main.fd6878d",
-    "@dxos/context": "0.8.4-main.fd6878d",
-    "@dxos/debug": "0.8.4-main.fd6878d",
-    "@dxos/echo-pipeline": "0.8.4-main.fd6878d",
-    "@dxos/echo-db": "0.8.4-main.fd6878d",
-    "@dxos/echo-protocol": "0.8.4-main.fd6878d",
-    "@dxos/echo-schema": "0.8.4-main.fd6878d",
-    "@dxos/config": "0.8.4-main.fd6878d",
-    "@dxos/feed-store": "0.8.4-main.fd6878d",
-    "@dxos/indexing": "0.8.4-main.fd6878d",
-    "@dxos/invariant": "0.8.4-main.fd6878d",
-    "@dxos/keyring": "0.8.4-main.fd6878d",
-    "@dxos/keys": "0.8.4-main.fd6878d",
-    "@dxos/kv-store": "0.8.4-main.fd6878d",
-    "@dxos/edge-client": "0.8.4-main.fd6878d",
-    "@dxos/lock-file": "0.8.4-main.fd6878d",
-    "@dxos/log": "0.8.4-main.fd6878d",
-    "@dxos/messaging": "0.8.4-main.fd6878d",
-    "@dxos/network-manager": "0.8.4-main.fd6878d",
-    "@dxos/node-std": "0.8.4-main.fd6878d",
-    "@dxos/protocols": "0.8.4-main.fd6878d",
-    "@dxos/random-access-storage": "0.8.4-main.fd6878d",
-    "@dxos/teleport": "0.8.4-main.fd6878d",
-    "@dxos/teleport-extension-gossip": "0.8.4-main.fd6878d",
-    "@dxos/rpc": "0.8.4-main.fd6878d",
-    "@dxos/timeframe": "0.8.4-main.fd6878d",
-    "@dxos/util": "0.8.4-main.fd6878d",
-    "@dxos/tracing": "0.8.4-main.fd6878d",
-    "@dxos/websocket-rpc": "0.8.4-main.fd6878d",
-    "@dxos/teleport-extension-object-sync": "0.8.4-main.fd6878d"
+    "@dxos/async": "0.8.4-main.fffef41",
+    "@dxos/client-protocol": "0.8.4-main.fffef41",
+    "@dxos/config": "0.8.4-main.fffef41",
+    "@dxos/codec-protobuf": "0.8.4-main.fffef41",
+    "@dxos/credentials": "0.8.4-main.fffef41",
+    "@dxos/crypto": "0.8.4-main.fffef41",
+    "@dxos/context": "0.8.4-main.fffef41",
+    "@dxos/debug": "0.8.4-main.fffef41",
+    "@dxos/echo": "0.8.4-main.fffef41",
+    "@dxos/echo-pipeline": "0.8.4-main.fffef41",
+    "@dxos/edge-client": "0.8.4-main.fffef41",
+    "@dxos/echo-protocol": "0.8.4-main.fffef41",
+    "@dxos/indexing": "0.8.4-main.fffef41",
+    "@dxos/invariant": "0.8.4-main.fffef41",
+    "@dxos/echo-db": "0.8.4-main.fffef41",
+    "@dxos/feed-store": "0.8.4-main.fffef41",
+    "@dxos/keyring": "0.8.4-main.fffef41",
+    "@dxos/keys": "0.8.4-main.fffef41",
+    "@dxos/kv-store": "0.8.4-main.fffef41",
+    "@dxos/lock-file": "0.8.4-main.fffef41",
+    "@dxos/messaging": "0.8.4-main.fffef41",
+    "@dxos/log": "0.8.4-main.fffef41",
+    "@dxos/network-manager": "0.8.4-main.fffef41",
+    "@dxos/protocols": "0.8.4-main.fffef41",
+    "@dxos/random-access-storage": "0.8.4-main.fffef41",
+    "@dxos/rpc": "0.8.4-main.fffef41",
+    "@dxos/node-std": "0.8.4-main.fffef41",
+    "@dxos/teleport": "0.8.4-main.fffef41",
+    "@dxos/teleport-extension-gossip": "0.8.4-main.fffef41",
+    "@dxos/teleport-extension-object-sync": "0.8.4-main.fffef41",
+    "@dxos/tracing": "0.8.4-main.fffef41",
+    "@dxos/util": "0.8.4-main.fffef41",
+    "@dxos/websocket-rpc": "0.8.4-main.fffef41",
+    "@dxos/timeframe": "0.8.4-main.fffef41"
   },
   "devDependencies": {
     "@types/platform": "^1.3.4",
     "@types/readable-stream": "^2.3.9",
     "get-port-please": "^3.1.1",
-    "@dxos/signal": "0.8.4-main.fd6878d",
-    "@dxos/test-utils": "0.8.4-main.fd6878d"
+    "@dxos/signal": "0.8.4-main.fffef41",
+    "@dxos/test-utils": "0.8.4-main.fffef41"
   },
   "publishConfig": {
     "access": "public"

package/src/packlets/agents/edge-agent-manager.ts

@@ -162,7 +162,7 @@ export class EdgeAgentManager extends Resource {
       space.notarizationPlugin.setActiveEdgePollingEnabled(agentFeedNeedsNotarization);
       activePollingEnabled = activePollingEnabled || agentFeedNeedsNotarization;
 
-      log.info('set active edge polling', { enabled: agentFeedNeedsNotarization, spaceId: space.id });
+      log.verbose('set active edge polling', { enabled: agentFeedNeedsNotarization, spaceId: space.id });
     }
 
     if (activePollingEnabled) {
@@ -178,6 +178,6 @@ export class EdgeAgentManager extends Resource {
     if (deviceKey) {
       this._ensureAgentIsInSpaces(deviceKey);
     }
-    log.info('agent status update', { status });
+    log.verbose('agent status update', { status });
   }
 }

package/src/packlets/agents/edge-agent-service.ts

@@ -25,7 +25,17 @@ export class EdgeAgentServiceImpl implements EdgeAgentService {
   queryEdgeStatus(): Stream<QueryEdgeStatusResponse> {
     return new Stream(({ ctx, next }) => {
       const update = () => {
-        next({ status: this._edgeConnection?.status ?? EdgeStatus.NOT_CONNECTED });
+        next({
+          status: this._edgeConnection?.status ?? {
+            state: EdgeStatus.ConnectionState.NOT_CONNECTED,
+            rtt: 0,
+            uptime: 0,
+            rateBytesUp: 0,
+            rateBytesDown: 0,
+            messagesSent: 0,
+            messagesReceived: 0,
+          },
+        });
       };
 
       this._edgeConnection?.statusChanged.on(ctx, update);

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

@@ -44,7 +44,7 @@ export class DevicesServiceImpl implements DevicesService {
                 presence = Device.PresenceState.ONLINE;
               } else if (profile.os?.toUpperCase() === 'EDGE') {
                 presence =
-                  this._edgeConnection?.status === EdgeStatus.CONNECTED
+                  this._edgeConnection?.status.state === EdgeStatus.ConnectionState.CONNECTED
                     ? Device.PresenceState.ONLINE
                     : Device.PresenceState.OFFLINE;
               } else {

package/src/packlets/identity/identity.test.ts

@@ -109,16 +109,16 @@ describe('identity/identity', () => {
 
   test('edge feed replicator', async () => {
     let replicationStarted = false;
-    let status = EdgeStatus.NOT_CONNECTED;
+    let status = EdgeStatus.ConnectionState.NOT_CONNECTED;
     const listeners: Array<() => void> = [];
     const setup = await setupIdentity({
       edgeConnection: {
         statusChanged: new Event(),
         get status() {
-          return status;
+          return { state: status };
         },
         onReconnected: (listener) => {
-          if (status === EdgeStatus.CONNECTED) {
+          if (status === EdgeStatus.ConnectionState.CONNECTED) {
             listener();
           } else {
             listeners.push(listener);
@@ -138,7 +138,7 @@ describe('identity/identity', () => {
 
     await writeGenesisCredential(setup);
     listeners.forEach((callback) => callback());
-    status = EdgeStatus.CONNECTED;
+    status = EdgeStatus.ConnectionState.CONNECTED;
 
     await expect.poll(() => replicationStarted).toBeTruthy();
   });

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

@@ -37,7 +37,7 @@ export class LoggingServiceImpl implements LoggingService {
   }
 
   async close(): Promise<void> {
-    const index = log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    const index = log.runtimeConfig.processors.findIndex((processor: LogProcessor) => processor === this._logProcessor);
     log.runtimeConfig.processors.splice(index, 1);
   }
 

package/src/packlets/services/service-context.ts

@@ -189,9 +189,10 @@ export class ServiceContext extends Resource {
     if (!this._runtimeParams?.disableP2pReplication) {
       this._meshReplicator = new MeshEchoReplicator();
     }
-    if (this._edgeConnection && this._edgeFeatures?.echoReplicator) {
+    if (this._edgeConnection && this._edgeFeatures?.echoReplicator && this._edgeHttpClient) {
       this._echoEdgeReplicator = new EchoEdgeReplicator({
         edgeConnection: this._edgeConnection,
+        edgeHttpClient: this._edgeHttpClient,
       });
     }
   }
@@ -244,13 +245,13 @@ export class ServiceContext extends Resource {
     await this.edgeAgentManager?.close();
     await this.identityManager.close();
     await this.spaceManager.close();
-    await this.feedStore.close();
-    await this.metadataStore.close();
-
     await this.echoHost.close(ctx);
+
     await this.networkManager.close();
     await this.signalManager.close();
     await this._edgeConnection?.close();
+    await this.feedStore.close();
+    await this.metadataStore.close();
 
     log('closed');
   }

package/src/packlets/services/service-host.ts

@@ -217,8 +217,9 @@ export class ClientServicesHost {
       }
     }
 
+    // TODO(wittjosiah): This is quite noisy during tests. Make configurable? Remove?
     if (!options.signalManager) {
-      log.warn('running signaling without telemetry metadata.');
+      // log.warn('running signaling without telemetry metadata.');
     }
 
     const endpoint = config?.get('runtime.services.edge.url');
@@ -407,6 +408,12 @@ export class ClientServicesHost {
     this._resetting = true;
     this._statusUpdate.emit();
     await this._serviceContext?.close();
+    // Clear LevelDB contents to remove all persisted Echo/Automerge/index data.
+    try {
+      await this._level!.clear();
+    } catch (err) {
+      log.warn('failed to clear leveldb during reset', { err });
+    }
     await this._storage!.reset();
     log.info('reset');
     log.trace('dxos.sdk.client-services-host.reset', trace.end({ id: traceId }));

package/src/packlets/space-export/space-archive-reader.ts

@@ -18,7 +18,7 @@ export const extractSpaceArchive = async (archive: SpaceArchive): Promise<Extrac
   const { Archive } = await import('@obsidize/tar-browserify');
   const { entries } = await Archive.extract(archive.contents);
   const metadataEntry = entries.find((entry) => entry.fileName === SpaceArchiveFileStructure.metadata);
-  assertArgument(metadataEntry, 'Metadata entry not found');
+  assertArgument(metadataEntry, 'metadataEntry', 'Metadata entry not found');
   const metadata = JSON.parse(metadataEntry.getContentAsText());
   const documents: Record<DocumentId, Uint8Array> = {};
   for (const entry of entries.filter((entry) => entry.fileName.startsWith(`${SpaceArchiveFileStructure.documents}/`))) {

package/src/packlets/space-export/space-archive-writer.ts

@@ -44,14 +44,14 @@ export class SpaceArchiveWriter extends Resource {
   }
 
   async setCurrentRootUrl(url: string): Promise<void> {
-    assertArgument(url.startsWith('automerge:'), 'Invalid root URL');
+    assertArgument(url.startsWith('automerge:'), 'url', 'Invalid root URL');
     assertState(this._tar, 'Not open');
     assertState(this._meta, 'Not started');
     this._currentRootUrl = url;
   }
 
   async writeDocument(documentId: string, data: Uint8Array): Promise<void> {
-    assertArgument(!documentId.startsWith('automerge:'), 'Invalid document ID');
+    assertArgument(!documentId.startsWith('automerge:'), 'documentId', 'Invalid document ID');
     assertState(this._archive, 'Not open');
     this._archive.addBinaryFile(`${SpaceArchiveFileStructure.documents}/${documentId}.bin`, data);
   }
@@ -76,7 +76,8 @@ export class SpaceArchiveWriter extends Resource {
     const binary = this._archive.toUint8Array();
 
     return {
-      filename: `${this._meta.spaceId}.tar`,
+      // TODO(wittjosiah): Factor out file name construction.
+      filename: `${new Date().toISOString()}-${this._meta.spaceId}.tar`,
       contents: binary,
     };
   }

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

@@ -15,6 +15,7 @@ import {
   createAdmissionCredentials,
   getCredentialAssertion,
 } from '@dxos/credentials';
+import { ObjectId, getTypeReference } from '@dxos/echo/internal';
 import {
   AuthStatus,
   CredentialServerExtension,
@@ -37,7 +38,6 @@ import {
   createIdFromSpaceKey,
   encodeReference,
 } from '@dxos/echo-protocol';
-import { ObjectId, getTypeReference } from '@dxos/echo-schema';
 import type { EdgeConnection, EdgeHttpClient } from '@dxos/edge-client';
 import { type FeedStore, writeMessages } from '@dxos/feed-store';
 import { assertArgument, assertState, failedInvariant, invariant } from '@dxos/invariant';
@@ -245,7 +245,11 @@ export class DataSpaceManager extends Resource {
    */
   @synchronized
   async createSpace(options: CreateSpaceOptions = {}): Promise<DataSpace> {
-    assertArgument(!!options.rootUrl === !!options.documents, 'root url must be required when providing documents');
+    assertArgument(
+      !!options.rootUrl === !!options.documents,
+      'options',
+      'root url must be required when providing documents',
+    );
 
     assertState(this._lifecycleState === LifecycleState.OPEN, 'Not open.');
     const spaceKey = await this._keyring.createKey();
@@ -275,7 +279,18 @@ export class DataSpaceManager extends Resource {
       await Promise.all(
         Object.entries(options.documents).map(async ([documentId, data]) => {
           log('creating document...', { documentId });
-          const newDoc = await this._echoHost.createDoc(data, { preserveHistory: true });
+          // TODO(dmaretskyi): Broken types -- the bytes get interpreted as CRDT data.
+          const newDoc = await this._echoHost.createDoc(data as any as DatabaseDirectory, {
+            preserveHistory: true,
+          });
+
+          // The archived documents might have the spaceKey from the space they were expored from, we need to update it to the new spaceKey.
+          if (newDoc.doc().access !== undefined && newDoc.doc().access!.spaceKey !== spaceKey.toHex()) {
+            newDoc.change((doc) => {
+              doc.access!.spaceKey = spaceKey.toHex();
+            });
+          }
+
           documentIdMapping[documentId as DocumentId] = newDoc.documentId;
         }),
       );
@@ -293,6 +308,7 @@ export class DataSpaceManager extends Resource {
     } else {
       root = await this._echoHost.createSpaceRoot(spaceKey);
     }
+    await this._echoHost.flush();
 
     log('constructing space...', { spaceKey });
 

package/src/packlets/spaces/edge-feed-replicator.test.ts

@@ -45,7 +45,7 @@ describe('EdgeFeedReplicator', () => {
     const { endpoint, admitConnection, messageSink } = await createEdge();
     const { messenger } = await createClient(endpoint);
     admitConnection.wake();
-    await expect.poll(() => messenger.status).toBe(EdgeStatus.CONNECTED);
+    await expect.poll(() => messenger.status.state).toBe(EdgeStatus.ConnectionState.CONNECTED);
 
     await attachReplicator(messenger);
     await expect.poll(() => messageSink.length).toEqual(1);

package/src/packlets/spaces/edge-feed-replicator.ts

@@ -87,7 +87,7 @@ export class EdgeFeedReplicator extends Resource {
 
   private async _handleReconnect(): Promise<void> {
     await this._resetConnection();
-    if (this._messenger.status === EdgeStatus.CONNECTED) {
+    if (this._messenger.status.state === EdgeStatus.ConnectionState.CONNECTED) {
       this._startReplication();
     }
   }

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

@@ -267,7 +267,7 @@ export class SpacesServiceImpl implements SpacesService {
 
   async exportSpace(request: ExportSpaceRequest): Promise<ExportSpaceResponse> {
     await using writer = await new SpaceArchiveWriter().open();
-    assertArgument(SpaceId.isValid(request.spaceId), 'Invalid space ID');
+    assertArgument(SpaceId.isValid(request.spaceId), 'spaceId', 'Invalid space ID');
 
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.getSpaceById(request.spaceId) ?? raise(new Error('Space not found'));

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.8.4-main.fd6878d";
+export const DXOS_VERSION = "0.8.4-main.fffef41";