@dxos/client-services 0.4.7-main.0aeacda → 0.4.7-main.6b81200

package/src/packlets/identity/identity.ts

@@ -25,7 +25,6 @@ import {
   type ProfileDocument,
 } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type DeviceAdmissionRequest } from '@dxos/protocols/proto/dxos/halo/invitations';
-import { type Presence } from '@dxos/teleport-extension-gossip';
 import { trace } from '@dxos/tracing';
 import { type ComplexMap, ComplexSet } from '@dxos/util';
 
@@ -36,7 +35,6 @@ export type IdentityParams = {
   deviceKey: PublicKey;
   signer: Signer;
   space: Space;
-  presence?: Presence;
 };
 
 /**
@@ -46,7 +44,6 @@ export type IdentityParams = {
 export class Identity {
   public readonly space: Space;
   private readonly _signer: Signer;
-  private readonly _presence?: Presence;
   private readonly _deviceStateMachine: DeviceStateMachine;
   private readonly _profileStateMachine: ProfileStateMachine;
   public readonly authVerifier: TrustedKeySetAuthVerifier;
@@ -56,10 +53,9 @@ export class Identity {
 
   public readonly stateUpdate = new Event();
 
-  constructor({ space, signer, identityKey, deviceKey, presence }: IdentityParams) {
+  constructor({ space, signer, identityKey, deviceKey }: IdentityParams) {
     this.space = space;
     this._signer = signer;
-    this._presence = presence;
 
     this.identityKey = identityKey;
     this.deviceKey = deviceKey;
@@ -132,10 +128,6 @@ export class Identity {
     return this._deviceStateMachine.deviceCredentialChain;
   }
 
-  get presence() {
-    return this._presence;
-  }
-
   /**
    * Issues credentials as identity.
    * Requires identity to be ready.

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

@@ -31,21 +31,15 @@ import { BlobStore } from '@dxos/teleport-extension-object-sync';
 import { trace as Trace } from '@dxos/tracing';
 import { safeInstanceof } from '@dxos/util';
 
-import {
-  type CreateIdentityOptions,
-  IdentityManager,
-  type IdentityManagerRuntimeParams,
-  type JoinIdentityParams,
-} from '../identity';
+import { type CreateIdentityOptions, IdentityManager, type JoinIdentityParams } from '../identity';
 import {
   DeviceInvitationProtocol,
   InvitationsHandler,
   type InvitationProtocol,
   SpaceInvitationProtocol,
 } from '../invitations';
-import { DataSpaceManager, type DataSpaceManagerRuntimeParams, type SigningContext } from '../spaces';
+import { DataSpaceManager, type SigningContext } from '../spaces';
 
-export type ServiceContextRuntimeParams = IdentityManagerRuntimeParams & DataSpaceManagerRuntimeParams;
 /**
  * Shared backend for all client services.
  */
@@ -86,7 +80,6 @@ export class ServiceContext {
     public readonly networkManager: NetworkManager,
     public readonly signalManager: SignalManager,
     public readonly modelFactory: ModelFactory,
-    public readonly _runtimeParams?: IdentityManagerRuntimeParams & DataSpaceManagerRuntimeParams,
   ) {
     // TODO(burdon): Move strings to constants.
     this.metadataStore = new MetadataStore(storage.createDirectory('metadata'));
@@ -114,13 +107,7 @@ export class ServiceContext {
       snapshotStore: this.snapshotStore,
     });
 
-    this.identityManager = new IdentityManager(
-      this.metadataStore,
-      this.keyring,
-      this.feedStore,
-      this.spaceManager,
-      this._runtimeParams as IdentityManagerRuntimeParams,
-    );
+    this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
 
     this.automergeHost = new AutomergeHost(storage.createDirectory('automerge'));
 
@@ -234,7 +221,6 @@ export class ServiceContext {
       signingContext,
       this.feedStore,
       this.automergeHost,
-      this._runtimeParams as DataSpaceManagerRuntimeParams,
     );
     await this.dataSpaceManager.open();
 

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

@@ -24,7 +24,7 @@ import { assignDeep } from '@dxos/util';
 import { WebsocketRpcClient } from '@dxos/websocket-rpc';
 
 import { createDiagnostics } from './diagnostics';
-import { ServiceContext, type ServiceContextRuntimeParams } from './service-context';
+import { ServiceContext } from './service-context';
 import { ServiceRegistry } from './service-registry';
 import { DevicesServiceImpl } from '../devices';
 import { DevtoolsServiceImpl, DevtoolsHostEvents } from '../devtools';
@@ -54,7 +54,6 @@ export type ClientServicesHostParams = {
   storage?: Storage;
   lockKey?: string;
   callbacks?: ClientServicesHostCallbacks;
-  runtimeParams?: ServiceContextRuntimeParams;
 };
 
 export type ClientServicesHostCallbacks = {
@@ -89,7 +88,6 @@ export class ClientServicesHost {
   private _devtoolsProxy?: WebsocketRpcClient<{}, ClientServices>;
 
   private _serviceContext!: ServiceContext;
-  private readonly _runtimeParams?: ServiceContextRuntimeParams;
 
   @Trace.info()
   private _opening = false;
@@ -106,12 +104,10 @@ 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 });
@@ -243,7 +239,6 @@ export class ClientServicesHost {
       this._networkManager,
       this._signalManager,
       this._modelFactory,
-      this._runtimeParams,
     );
 
     this._serviceRegistry.setServices({

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

@@ -59,11 +59,6 @@ export type AcceptSpaceOptions = {
   dataTimeframe?: Timeframe;
 };
 
-export type DataSpaceManagerRuntimeParams = {
-  spaceMemberPresenceAnnounceInterval?: number;
-  spaceMemberPresenceOfflineTimeout?: number;
-};
-
 @trackLeaks('open', 'close')
 export class DataSpaceManager {
   private readonly _ctx = new Context();
@@ -74,8 +69,6 @@ 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,
@@ -85,15 +78,7 @@ 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() {
@@ -219,8 +204,8 @@ export class DataSpaceManager {
       localPeerId: this._signingContext.deviceKey,
     });
     const presence = new Presence({
-      announceInterval: this._spaceMemberPresenceAnnounceInterval,
-      offlineTimeout: this._spaceMemberPresenceOfflineTimeout,
+      announceInterval: PRESENCE_ANNOUNCE_INTERVAL,
+      offlineTimeout: PRESENCE_OFFLINE_TIMEOUT, // TODO(burdon): Config.
       identityKey: this._signingContext.identityKey,
       gossip,
     });

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.4.7-main.0aeacda";
+export const DXOS_VERSION = "0.4.7-main.6b81200";