@dxos/client-services 0.6.13 → 0.6.14-main.1366248

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

@@ -60,7 +60,7 @@ export class SpacesServiceImpl implements SpacesService {
     return this._serializeSpace(space);
   }
 
-  async updateSpace({ spaceKey, state }: UpdateSpaceRequest) {
+  async updateSpace({ spaceKey, state, edgeReplication }: UpdateSpaceRequest) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
 
@@ -77,6 +77,10 @@ export class SpacesServiceImpl implements SpacesService {
           throw new ApiError('Invalid space state');
       }
     }
+
+    if (edgeReplication !== undefined) {
+      await dataSpaceManager.setSpaceEdgeReplicationSetting(spaceKey, edgeReplication);
+    }
   }
 
   async updateMemberRole(request: UpdateMemberRoleRequest): Promise<void> {
@@ -308,6 +312,7 @@ export class SpacesServiceImpl implements SpacesService {
       creator: space.inner.spaceState.creator?.key,
       cache: space.cache,
       metrics: space.metrics,
+      edgeReplication: space.getEdgeReplicationSetting(),
     };
   }
 

package/src/packlets/storage/storage.ts

@@ -14,7 +14,6 @@ import { getRootPath } from './util';
 // TODO(burdon): Factor out.
 export const createStorageObjects = (config: Runtime.Client.Storage) => {
   const { persistent = false, keyStore, dataStore } = config ?? {};
-
   if (persistent && dataStore === StorageDriver.RAM) {
     throw new InvalidConfigError('RAM storage cannot be used in persistent mode.');
   }

package/src/packlets/system/system-service.test.ts

@@ -2,12 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import { expect } from 'chai';
+import { beforeEach, describe, expect, test } from 'vitest';
 
 import { Event, Trigger } from '@dxos/async';
 import { Config } from '@dxos/config';
 import { type SystemService, SystemStatus, type QueryStatusResponse } from '@dxos/protocols/proto/dxos/client/services';
-import { beforeEach, describe, test } from '@dxos/test';
 
 import { SystemServiceImpl } from './system-service';
 

package/src/packlets/testing/invitation-utils.ts

@@ -62,6 +62,7 @@ export const performInvitation = ({
 }: PerformInvitationParams): [Promise<Result>, Promise<Result>] => {
   let guestError = false;
   let guestConnected = false;
+  let wereConnected = false;
   const hostComplete = new Trigger<Result>();
   const guestComplete = new Trigger<Result>();
   const authCode = new Trigger<string>();
@@ -72,12 +73,17 @@ export const performInvitation = ({
         switch (hostInvitation.state) {
           case Invitation.State.CONNECTING: {
             if (guestConnected) {
+              if (wereConnected) {
+                hostComplete.wake({ invitation: hostInvitation });
+              }
               break;
             }
+
             guestConnected = true;
             if (hooks?.host?.onConnecting?.(hostObservable)) {
               break;
             }
+
             const guestObservable = acceptInvitation(guest, hostInvitation, guestDeviceProfile);
             guestObservable.subscribe(
               async (guestInvitation: Invitation) => {
@@ -153,6 +159,7 @@ export const performInvitation = ({
           }
 
           case Invitation.State.CONNECTED: {
+            wereConnected = true;
             hooks?.host?.onConnected?.(hostObservable);
             break;
           }

package/src/packlets/testing/test-builder.ts

@@ -6,8 +6,7 @@ import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { createCredentialSignerWithChain, CredentialGenerator } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';
-import { EchoHost } from '@dxos/echo-db';
-import { MetadataStore, SpaceManager, valueEncoding, MeshEchoReplicator } from '@dxos/echo-pipeline';
+import { EchoHost, MetadataStore, SpaceManager, valueEncoding, MeshEchoReplicator } from '@dxos/echo-pipeline';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
 import { type LevelDB } from '@dxos/kv-store';
@@ -54,8 +53,8 @@ export const createServiceContext = async ({
   const level = createTestLevel();
   await level.open();
 
-  return new ServiceContext(storage, level, networkManager, signalManager, undefined, {
-    invitationConnectionDefaultParams: { controlHeartbeatInterval: 200 },
+  return new ServiceContext(storage, level, networkManager, signalManager, undefined, undefined, {
+    invitationConnectionDefaultParams: { teleport: { controlHeartbeatInterval: 200 } },
     ...runtimeParams,
   });
 };
@@ -219,6 +218,10 @@ export class TestPeer {
 
   async createIdentity() {
     this._props.signingContext ??= await createSigningContext(this.keyring);
+    this.networkManager.setPeerInfo({
+      identityKey: this._props.signingContext.identityKey.toHex(),
+      peerKey: this._props.signingContext.deviceKey.toHex(),
+    });
   }
 
   async destroy() {

package/src/packlets/worker/worker-runtime.ts

@@ -14,7 +14,7 @@ import {
   WebsocketSignalManager,
   setIdentityTags,
 } from '@dxos/messaging';
-import { SimplePeerTransportProxyFactory } from '@dxos/network-manager';
+import { RtcTransportProxyFactory } from '@dxos/network-manager';
 import { type RpcPort } from '@dxos/rpc';
 import { type MaybePromise } from '@dxos/util';
 
@@ -46,7 +46,7 @@ export class WorkerRuntime {
   private readonly _acquireLock: () => Promise<void>;
   private readonly _releaseLock: () => void;
   private readonly _onStop?: () => Promise<void>;
-  private readonly _transportFactory = new SimplePeerTransportProxyFactory();
+  private readonly _transportFactory = new RtcTransportProxyFactory();
   private readonly _ready = new Trigger<Error | undefined>();
   private readonly _sessions = new Set<WorkerSession>();
   private readonly _clientServices!: ClientServicesHost;

package/src/testing/setup.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { runTestSignalServer } from '@dxos/signal';
+
+const port = 12004;
+
+export default async () => {
+  await runTestSignalServer({ port, killExisting: true });
+};

package/src/version.ts

@@ -1,5 +1 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-export const DXOS_VERSION = '0.6.13'; // {x-release-please-version}
+export const DXOS_VERSION = "0.6.14-main.1366248";