@dxos/client-services 0.5.1-next.2ad6c47 → 0.5.1-next.39e0ee2

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

@@ -6,17 +6,12 @@ import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { createCredentialSignerWithChain, CredentialGenerator } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';
-import {
-  AutomergeHost,
-  MetadataStore,
-  type LevelDB,
-  SnapshotStore,
-  SpaceManager,
-  valueEncoding,
-} from '@dxos/echo-pipeline';
-import { createTestLevel } from '@dxos/echo-pipeline/testing';
+import { EchoHost } from '@dxos/echo-db';
+import { MetadataStore, SnapshotStore, SpaceManager, valueEncoding } from '@dxos/echo-pipeline';
 import { FeedFactory, FeedStore } from '@dxos/feed-store';
 import { Keyring } from '@dxos/keyring';
+import { type LevelDB } from '@dxos/kv-store';
+import { createTestLevel } from '@dxos/kv-store/testing';
 import { MemorySignalManager, MemorySignalManagerContext } from '@dxos/messaging';
 import { MemoryTransportFactory, NetworkManager } from '@dxos/network-manager';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
@@ -54,7 +49,9 @@ export const createServiceContext = async ({
   const level = createTestLevel();
   await level.open();
 
-  return new ServiceContext(storage, level, networkManager, signalManager);
+  return new ServiceContext(storage, level, networkManager, signalManager, {
+    invitationConnectionDefaultParams: { controlHeartbeatInterval: 200 },
+  });
 };
 
 export const createPeers = async (numPeers: number) => {
@@ -105,7 +102,7 @@ export type TestPeerProps = {
   snapshotStore?: SnapshotStore;
   signingContext?: SigningContext;
   blobStore?: BlobStore;
-  automergeHost?: AutomergeHost;
+  echoHost?: EchoHost;
   invitationsManager?: InvitationsManager;
 };
 
@@ -178,9 +175,10 @@ export class TestPeer {
     return this._props.signingContext ?? failUndefined();
   }
 
-  get automergeHost() {
-    return (this._props.automergeHost ??= new AutomergeHost({
-      db: this.level.sublevel('automerge'),
+  get echoHost() {
+    return (this._props.echoHost ??= new EchoHost({
+      kv: this.level,
+      storage: this.storage,
     }));
   }
 
@@ -191,7 +189,7 @@ export class TestPeer {
       this.keyring,
       this.identity,
       this.feedStore,
-      this.automergeHost,
+      this.echoHost,
       this.invitationsManager,
     ));
   }

package/src/packlets/vault/shell-runtime.ts

@@ -6,7 +6,12 @@ import { Event } from '@dxos/async';
 import { appServiceBundle, type AppServiceBundle, type ShellRuntime, shellServiceBundle } from '@dxos/client-protocol';
 import { invariant } from '@dxos/invariant';
 import { type PublicKey } from '@dxos/keys';
-import { type AppContextRequest, type LayoutRequest, ShellLayout } from '@dxos/protocols/proto/dxos/iframe';
+import {
+  type AppContextRequest,
+  type LayoutRequest,
+  ShellLayout,
+  type InvitationUrlRequest,
+} from '@dxos/protocols/proto/dxos/iframe';
 import { createProtoRpcPeer, type ProtoRpcPeer, type RpcPort } from '@dxos/rpc';
 
 /**
@@ -14,11 +19,19 @@ import { createProtoRpcPeer, type ProtoRpcPeer, type RpcPort } from '@dxos/rpc';
  */
 export class ShellRuntimeImpl implements ShellRuntime {
   readonly layoutUpdate = new Event<LayoutRequest>();
+  readonly invitationUrlUpdate = new Event<InvitationUrlRequest>();
+
   private _appRpc?: ProtoRpcPeer<AppServiceBundle>;
   private _layout = ShellLayout.DEFAULT;
-  private _invitationCode?: string;
   private _spaceKey?: PublicKey;
 
+  private _invitationCode?: string;
+  private _invitationUrl? = typeof window !== 'undefined' ? window.location.origin : undefined;
+
+  // TODO(burdon): Change to using underscores (coordinate with @dxos/web-auth).
+  private _deviceInvitationParam = 'deviceInvitationCode'; // TODO(burdon): device_invitation_code
+  private _spaceInvitationParam = 'spaceInvitationCode'; // TODO(burdon): space_invitation_code
+
   constructor(private readonly _port: RpcPort) {}
 
   get layout() {
@@ -33,6 +46,18 @@ export class ShellRuntimeImpl implements ShellRuntime {
     return this._spaceKey;
   }
 
+  get invitationUrl() {
+    return this._invitationUrl!;
+  }
+
+  get deviceInvitationParam() {
+    return this._deviceInvitationParam;
+  }
+
+  get spaceInvitationParam() {
+    return this._spaceInvitationParam;
+  }
+
   setLayout({ layout, invitationCode, spaceKey }: LayoutRequest) {
     this._layout = layout;
     this._invitationCode = invitationCode;
@@ -40,6 +65,13 @@ export class ShellRuntimeImpl implements ShellRuntime {
     this.layoutUpdate.emit({ layout, invitationCode, spaceKey });
   }
 
+  setInvitationUrl({ invitationUrl, deviceInvitationParam, spaceInvitationParam }: InvitationUrlRequest) {
+    this._invitationUrl = invitationUrl;
+    this._deviceInvitationParam = deviceInvitationParam;
+    this._spaceInvitationParam = spaceInvitationParam;
+    this.invitationUrlUpdate.emit({ invitationUrl, deviceInvitationParam, spaceInvitationParam });
+  }
+
   async setAppContext(context: AppContextRequest) {
     invariant(this._appRpc, 'runtime not open');
 
@@ -58,6 +90,12 @@ export class ShellRuntimeImpl implements ShellRuntime {
             this._spaceKey = request.spaceKey;
             this.layoutUpdate.emit(request);
           },
+          setInvitationUrl: async (request) => {
+            this._invitationUrl = request.invitationUrl;
+            this._deviceInvitationParam = request.deviceInvitationParam;
+            this._spaceInvitationParam = request.spaceInvitationParam;
+            this.invitationUrlUpdate.emit(request);
+          },
         },
       },
       port: this._port,

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

@@ -120,7 +120,9 @@ export class WorkerRuntime {
       this._sessions.delete(session);
       if (this._sessions.size === 0) {
         // Terminate the worker when all sessions are closed.
-        self.close();
+        if (globalThis.self) {
+          self.close();
+        }
       } else {
         this._reconnectWebrtc();
       }

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.5.1-next.2ad6c47";
+export const DXOS_VERSION = "0.5.1-next.39e0ee2";