@dxos/client-services 0.1.58-main.f5feb2a → 0.1.58-main.fc3ea9b

package/src/packlets/services/service-registry.test.ts

@@ -14,9 +14,9 @@ import { SystemService, SystemStatus } from '@dxos/protocols/proto/dxos/client/s
 import { createLinkedPorts, createProtoRpcPeer, createServiceBundle } from '@dxos/rpc';
 import { describe, test } from '@dxos/test';
 
+import { ServiceRegistry } from './service-registry';
 import { SystemServiceImpl } from '../system';
 import { createServiceContext } from '../testing';
-import { ServiceRegistry } from './service-registry';
 
 // TODO(burdon): Create TestService (that doesn't require peers).
 

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

@@ -164,7 +164,7 @@ describe('DataSpaceManager', () => {
         afterTest(async () => builder.destroy());
 
         const peer = builder.createPeer({
-          storageType: typeof window === 'undefined' ? StorageType.NODE : StorageType.WEBFS,
+          dataStore: typeof window === 'undefined' ? StorageType.NODE : StorageType.WEBFS,
         });
         await peer.createIdentity();
         await openAndClose(peer.dataSpaceManager);

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

@@ -20,9 +20,9 @@ import { Gossip, Presence } from '@dxos/teleport-extension-gossip';
 import { Timeframe } from '@dxos/timeframe';
 import { ComplexMap, deferFunction, forEachAsync } from '@dxos/util';
 
-import { createAuthProvider } from '../identity';
 import { DataSpace } from './data-space';
 import { spaceGenesis } from './genesis';
+import { createAuthProvider } from '../identity';
 
 export interface SigningContext {
   identityKey: PublicKey;

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

@@ -22,9 +22,9 @@ import { Timeframe } from '@dxos/timeframe';
 import { trace } from '@dxos/tracing';
 import { ComplexSet } from '@dxos/util';
 
-import { TrustedKeySetAuthVerifier } from '../identity';
 import { SigningContext } from './data-space-manager';
 import { NotarizationPlugin } from './notarization-plugin';
+import { TrustedKeySetAuthVerifier } from '../identity';
 
 export type DataSpaceCallbacks = {
   /**

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

@@ -11,9 +11,9 @@ import { PublicKey } from '@dxos/keys';
 import { Space, SpacesService } from '@dxos/protocols/proto/dxos/client/services';
 import { afterEach, afterTest, beforeEach, describe, test } from '@dxos/test';
 
+import { SpacesServiceImpl } from './spaces-service';
 import { ServiceContext } from '../services';
 import { createServiceContext } from '../testing';
-import { SpacesServiceImpl } from './spaces-service';
 
 chai.use(chaiAsPromised);
 

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

@@ -27,9 +27,9 @@ import { Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { GossipMessage } from '@dxos/protocols/proto/dxos/mesh/teleport/gossip';
 import { Provider } from '@dxos/util';
 
-import { IdentityManager } from '../identity';
 import { DataSpace } from './data-space';
 import { DataSpaceManager } from './data-space-manager';
+import { IdentityManager } from '../identity';
 
 export class SpacesServiceImpl implements SpacesService {
   constructor(
@@ -99,7 +99,7 @@ export class SpacesServiceImpl implements SpacesService {
             subscriptions.add(space.dataPipeline.onNewEpoch.on(ctx, () => scheduler.trigger()));
 
             // Pipeline progress.
-            space.inner.controlPipeline.state.timeframeUpdate.on(ctx, () => scheduler.trigger());
+            subscriptions.add(space.inner.controlPipeline.state.timeframeUpdate.on(ctx, () => scheduler.trigger()));
             if (space.dataPipeline.pipelineState) {
               subscriptions.add(space.dataPipeline.pipelineState.timeframeUpdate.on(ctx, () => scheduler.trigger()));
             }

package/src/packlets/storage/storage.ts

@@ -15,29 +15,29 @@ import StorageDriver = Runtime.Client.Storage.StorageDriver;
 // TODO(burdon): Factor out.
 export const createStorageObjects = (config: Runtime.Client.Storage) => {
   const {
-    path = isNode() ? DX_DATA : 'dxos/storage', // TODO(burdon): Factor out const.
-    storageType,
-    keyStorage,
     persistent = false,
+    keyStore,
+    dataStore,
+    dataRoot = isNode() ? DX_DATA : 'dxos/storage', // TODO(burdon): Factor out const.
   } = config ?? {};
 
-  if (persistent && storageType === StorageDriver.RAM) {
+  if (persistent && dataStore === StorageDriver.RAM) {
     throw new InvalidConfigError('RAM storage cannot be used in persistent mode.');
   }
-  if (!persistent && storageType !== undefined && storageType !== StorageDriver.RAM) {
+  if (!persistent && dataStore !== undefined && dataStore !== StorageDriver.RAM) {
     throw new InvalidConfigError('Cannot use a persistent storage in not persistent mode.');
   }
-  if (persistent && keyStorage === StorageDriver.RAM) {
+  if (persistent && keyStore === StorageDriver.RAM) {
     throw new InvalidConfigError('RAM key storage cannot be used in persistent mode.');
   }
-  if (!persistent && keyStorage !== StorageDriver.RAM && keyStorage !== undefined) {
+  if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== undefined) {
     throw new InvalidConfigError('Cannot use a persistent key storage in not persistent mode.');
   }
 
   return {
     storage: createStorage({
-      type: persistent ? toStorageType(storageType) : StorageType.RAM,
-      root: `${path}/`,
+      type: persistent ? toStorageType(dataStore) : StorageType.RAM,
+      root: `${dataRoot}/`,
     }),
   };
 };

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

@@ -94,7 +94,7 @@ export class TestBuilder {
 }
 
 export type TestPeerOpts = {
-  storageType?: StorageType;
+  dataStore?: StorageType;
 };
 
 export type TestPeerProps = {
@@ -115,7 +115,7 @@ export class TestPeer {
 
   constructor(
     private readonly signalContext: MemorySignalManagerContext,
-    private readonly opts: TestPeerOpts = { storageType: StorageType.RAM },
+    private readonly opts: TestPeerOpts = { dataStore: StorageType.RAM },
   ) {}
 
   get props() {
@@ -123,7 +123,7 @@ export class TestPeer {
   }
 
   get storage() {
-    return (this._props.storage ??= createStorage({ type: this.opts.storageType }));
+    return (this._props.storage ??= createStorage({ type: this.opts.dataStore }));
   }
 
   get keyring() {

package/src/packlets/vault/iframe-host-runtime.ts

@@ -12,9 +12,9 @@ import { createSimplePeerTransportFactory, TransportFactory } from '@dxos/networ
 import { RpcPort } from '@dxos/rpc';
 import { getAsyncValue, MaybePromise, Provider } from '@dxos/util';
 
+import { ShellRuntimeImpl } from './shell-runtime';
 import { ClientServicesHost } from '../services';
 import { ClientRpcServer, ClientRpcServerParams } from '../services/client-rpc-server';
-import { ShellRuntimeImpl } from './shell-runtime';
 
 const LOCK_KEY = 'DXOS_RESOURCE_LOCK';
 

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

@@ -11,8 +11,8 @@ import { SimplePeerTransportProxyFactory } from '@dxos/network-manager';
 import { RpcPort } from '@dxos/rpc';
 import { MaybePromise } from '@dxos/util';
 
-import { ClientServicesHost } from '../services';
 import { WorkerSession } from './worker-session';
+import { ClientServicesHost } from '../services';
 
 // NOTE: Keep as RpcPorts to avoid dependency on @dxos/rpc-tunnel so we don't depend on browser-specific apis.
 export type CreateSessionParams = {
@@ -34,11 +34,14 @@ export class WorkerRuntime {
   private _sessionForNetworking?: WorkerSession; // TODO(burdon): Expose to client QueryStatusResponse.
   private _config!: Config;
 
-  // prettier-ignore
-  constructor(
-    private readonly _configProvider: () => MaybePromise<Config>
-  ) {
-    this._clientServices = new ClientServicesHost({ callbacks: { onReset: async () => { self.close(); } } });
+  constructor(private readonly _configProvider: () => MaybePromise<Config>) {
+    this._clientServices = new ClientServicesHost({
+      callbacks: {
+        onReset: async () => {
+          self.close();
+        },
+      },
+    });
   }
 
   get host() {

package/src/version.ts

@@ -1 +1 @@
-export const DXOS_VERSION = "0.1.58-main.f5feb2a";
+export const DXOS_VERSION = "0.1.58-main.fc3ea9b";