@dxos/client-services 0.4.7-main.e015b9e → 0.4.7-main.e5c4f14

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

@@ -8,7 +8,7 @@ import { type Config } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { DocumentModel } from '@dxos/document-model';
 import { DataServiceImpl } from '@dxos/echo-pipeline';
-import { type TypedObject, base, getRawDoc, type SpaceDoc } from '@dxos/echo-schema';
+import { type TypedObject, getRawDoc, type SpaceDoc, getAutomergeObjectCore } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -24,7 +24,7 @@ import { assignDeep } from '@dxos/util';
 import { WebsocketRpcClient } from '@dxos/websocket-rpc';
 
 import { createDiagnostics } from './diagnostics';
-import { ServiceContext } from './service-context';
+import { ServiceContext, type ServiceContextRuntimeParams } from './service-context';
 import { ServiceRegistry } from './service-registry';
 import { DevicesServiceImpl } from '../devices';
 import { DevtoolsServiceImpl, DevtoolsHostEvents } from '../devtools';
@@ -54,6 +54,7 @@ export type ClientServicesHostParams = {
   storage?: Storage;
   lockKey?: string;
   callbacks?: ClientServicesHostCallbacks;
+  runtimeParams?: ServiceContextRuntimeParams;
 };
 
 export type ClientServicesHostCallbacks = {
@@ -88,6 +89,7 @@ export class ClientServicesHost {
   private _devtoolsProxy?: WebsocketRpcClient<{}, ClientServices>;
 
   private _serviceContext!: ServiceContext;
+  private readonly _runtimeParams?: ServiceContextRuntimeParams;
 
   @Trace.info()
   private _opening = false;
@@ -104,10 +106,12 @@ export class ClientServicesHost {
     // TODO(wittjosiah): Turn this on by default.
     lockKey,
     callbacks,
+    runtimeParams,
   }: ClientServicesHostParams = {}) {
     this._storage = storage;
     this._modelFactory = modelFactory;
     this._callbacks = callbacks;
+    this._runtimeParams = runtimeParams;
 
     if (config) {
       this.initialize({ config, transportFactory, signalManager });
@@ -239,6 +243,7 @@ export class ClientServicesHost {
       this._networkManager,
       this._signalManager,
       this._modelFactory,
+      this._runtimeParams,
     );
 
     this._serviceRegistry.setServices({
@@ -352,7 +357,7 @@ export class ClientServicesHost {
     await document.whenReady();
 
     document.change((doc: SpaceDoc) => {
-      assignDeep(doc, ['objects', obj[base]._id], getRawDoc(obj).handle.docSync());
+      assignDeep(doc, ['objects', getAutomergeObjectCore(obj).id], getRawDoc(obj).handle.docSync());
     });
 
     return identity;

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

@@ -59,6 +59,11 @@ export type AcceptSpaceOptions = {
   dataTimeframe?: Timeframe;
 };
 
+export type DataSpaceManagerRuntimeParams = {
+  spaceMemberPresenceAnnounceInterval?: number;
+  spaceMemberPresenceOfflineTimeout?: number;
+};
+
 @trackLeaks('open', 'close')
 export class DataSpaceManager {
   private readonly _ctx = new Context();
@@ -69,6 +74,8 @@ export class DataSpaceManager {
 
   private _isOpen = false;
   private readonly _instanceId = PublicKey.random().toHex();
+  private readonly _spaceMemberPresenceAnnounceInterval: number;
+  private readonly _spaceMemberPresenceOfflineTimeout: number;
 
   constructor(
     private readonly _spaceManager: SpaceManager,
@@ -78,7 +85,15 @@ export class DataSpaceManager {
     private readonly _signingContext: SigningContext,
     private readonly _feedStore: FeedStore<FeedMessage>,
     private readonly _automergeHost: AutomergeHost,
-  ) {}
+    params?: DataSpaceManagerRuntimeParams,
+  ) {
+    const {
+      spaceMemberPresenceAnnounceInterval = PRESENCE_ANNOUNCE_INTERVAL,
+      spaceMemberPresenceOfflineTimeout = PRESENCE_OFFLINE_TIMEOUT,
+    } = params ?? {};
+    this._spaceMemberPresenceAnnounceInterval = spaceMemberPresenceAnnounceInterval;
+    this._spaceMemberPresenceOfflineTimeout = spaceMemberPresenceOfflineTimeout;
+  }
 
   // TODO(burdon): Remove.
   get spaces() {
@@ -204,8 +219,8 @@ export class DataSpaceManager {
       localPeerId: this._signingContext.deviceKey,
     });
     const presence = new Presence({
-      announceInterval: PRESENCE_ANNOUNCE_INTERVAL,
-      offlineTimeout: PRESENCE_OFFLINE_TIMEOUT, // TODO(burdon): Config.
+      announceInterval: this._spaceMemberPresenceAnnounceInterval,
+      offlineTimeout: this._spaceMemberPresenceOfflineTimeout,
       identityKey: this._signingContext.identityKey,
       gossip,
     });

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

@@ -215,9 +215,7 @@ export class SpacesServiceImpl implements SpacesService {
         return {
           identity: {
             identityKey: member.key,
-            profile: {
-              displayName: member.profile?.displayName,
-            },
+            profile: member.profile ?? {},
           },
           presence: member.removed
             ? SpaceMember.PresenceState.REMOVED

package/src/packlets/vault/shared-worker-connection.ts

@@ -76,7 +76,7 @@ export class SharedWorkerConnection {
         BridgeService: this._transportService,
       },
       port: this._systemPort,
-      timeout: 200,
+      timeout: 30_000,
     });
 
     let lockKey: string | undefined;

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.7-main.e015b9e";
+export const DXOS_VERSION = "0.4.7-main.e5c4f14";