@dxos/client-services 0.8.4-main.b97322e → 0.8.4-main.bcb3aa67d6

package/src/packlets/invitations/space-invitation-protocol.test.ts

@@ -2,9 +2,10 @@
 // Copyright 2022 DXOS.org
 //
 
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
-import { chain, Trigger } from '@dxos/async';
+import { Trigger, chain } from '@dxos/async';
+import { Context } from '@dxos/context';
 import { raise } from '@dxos/debug';
 import { AlreadyJoinedError } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
@@ -24,26 +25,26 @@ describe('services/space-invitations-protocol', () => {
   test('genesis', async () => {
     const [peer] = await chain<ServiceContext>([createIdentity, closeAfterTest])(createPeers(1));
 
-    const space = await peer.dataSpaceManager!.createSpace();
+    const space = await peer.dataSpaceManager!.createSpace(new Context());
     expect(peer.dataSpaceManager!.spaces.has(space.key)).to.be.true;
 
-    await space.close();
+    await space.close(new Context());
   });
 
   test('genesis & ready', async () => {
     const [peer] = await chain<ServiceContext>([createIdentity, closeAfterTest])(createPeers(1));
 
-    const space = await peer.dataSpaceManager!.createSpace();
+    const space = await peer.dataSpaceManager!.createSpace(new Context());
     expect(peer.dataSpaceManager!.spaces.has(space.key)).to.be.true;
 
     await peer.dataSpaceManager?.waitUntilSpaceReady(space.key);
-    await space.close();
+    await space.close(new Context());
   });
 
   test('invitation with no auth', async () => {
     const [host, guest] = await chain<ServiceContext>([createIdentity, closeAfterTest])(createPeers(2));
 
-    const space1 = await host.dataSpaceManager!.createSpace();
+    const space1 = await host.dataSpaceManager!.createSpace(new Context());
     const spaceKey = space1.key;
 
     await Promise.all(performInvitation({ host, guest, options: { kind: Invitation.Kind.SPACE, spaceKey } }));
@@ -59,15 +60,15 @@ describe('services/space-invitations-protocol', () => {
 
       await space2.inner.controlPipeline.state.waitUntilTimeframe(space1.inner.controlPipeline.state.timeframe);
 
-      await space1.close();
-      await space2.close();
+      await space1.close(new Context());
+      await space2.close(new Context());
     }
   });
 
   test('invitation when already joined', async () => {
     const [host, guest] = await chain<ServiceContext>([createIdentity, closeAfterTest])(createPeers(2));
 
-    const space1 = await host.dataSpaceManager!.createSpace();
+    const space1 = await host.dataSpaceManager!.createSpace(new Context());
     const spaceKey = space1.key;
 
     await Promise.all(performInvitation({ host, guest, options: { kind: Invitation.Kind.SPACE, spaceKey } }));
@@ -96,7 +97,7 @@ describe('services/space-invitations-protocol', () => {
 
     let attempt = 0;
 
-    const space1 = await host.dataSpaceManager!.createSpace();
+    const space1 = await host.dataSpaceManager!.createSpace(new Context());
 
     const [{ invitation: invitation1, error: error1 }, { invitation: invitation2, error: error2 }] = await Promise.all(
       performInvitation({
@@ -143,8 +144,8 @@ describe('services/space-invitations-protocol', () => {
 
       await space2.inner.controlPipeline.state.waitUntilTimeframe(space1.inner.controlPipeline.state.timeframe);
 
-      await space1.close();
-      await space2.close();
+      await space1.close(new Context());
+      await space2.close(new Context());
     }
 
     expect(
@@ -154,14 +155,14 @@ describe('services/space-invitations-protocol', () => {
 
   test('timeout', async () => {
     const [host, guest] = await chain<ServiceContext>([createIdentity, closeAfterTest])(createPeers(2));
-    const space = await host.dataSpaceManager!.createSpace();
+    const space = await host.dataSpaceManager!.createSpace(new Context());
     const hostInvitation = await createInvitation(host, {
       kind: Invitation.Kind.SPACE,
       spaceKey: space.key,
       timeout: 100,
     });
     const invitation = hostInvitation.get();
-    await host.close();
+    await host.close(Context.default());
 
     const guestTimeout = new Trigger();
     const guestInvitation = await acceptInvitation(guest, invitation);
@@ -180,7 +181,7 @@ describe('services/space-invitations-protocol', () => {
     const hostConnected = new Trigger<Invitation>();
     const guestConnected = new Trigger<Invitation>();
 
-    const space1 = await host.dataSpaceManager!.createSpace();
+    const space1 = await host.dataSpaceManager!.createSpace(new Context());
 
     const invitationPromises = performInvitation({
       host,
@@ -213,7 +214,7 @@ describe('services/space-invitations-protocol', () => {
     expect(invitation1?.state).to.eq(Invitation.State.CANCELLED);
     expect(error).to.exist;
 
-    await space1.close();
+    await space1.close(new Context());
   });
 
   // TODO(burdon): Flaky.
@@ -223,7 +224,7 @@ describe('services/space-invitations-protocol', () => {
   //     createPeers(GUEST_COUNT + 1)
   //   );
 
-  //   const hostSpace = await host.dataSpaceManager!.createSpace();
+  //   const hostSpace = await host.dataSpaceManager!.createSpace(new Context());
   //   const swarmKey = PublicKey.random();
   //   const hostObservable = await host.spaceInvitations!.createInvitation(hostSpace, {
   //     swarmKey,

package/src/packlets/invitations/space-invitation-protocol.ts

@@ -7,29 +7,25 @@ import {
   createDelegatedSpaceInvitationCredential,
   getCredentialAssertion,
 } from '@dxos/credentials';
+import { Context } from '@dxos/context';
 import { writeMessages } from '@dxos/feed-store';
 import { invariant } from '@dxos/invariant';
 import { type Keyring } from '@dxos/keyring';
 import { type PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import {
-  AlreadyJoinedError,
-  type ApiError,
-  AuthorizationError,
-  InvalidInvitationError,
-  SpaceNotFoundError,
-} from '@dxos/protocols';
+import { AlreadyJoinedError, AuthorizationError, InvalidInvitationError, SpaceNotFoundError } from '@dxos/protocols';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
-import { SpaceMember, type ProfileDocument } from '@dxos/protocols/proto/dxos/halo/credentials';
+import { type ProfileDocument, SpaceMember } from '@dxos/protocols/proto/dxos/halo/credentials';
 import {
   type AdmissionRequest,
   type AdmissionResponse,
   type IntroductionRequest,
 } from '@dxos/protocols/proto/dxos/halo/invitations';
 
+import { type DataSpaceManager, type SigningContext } from '../spaces';
+
 import { type InvitationProtocol } from './invitation-protocol';
 import { computeExpirationTime } from './utils';
-import { type DataSpaceManager, type SigningContext } from '../spaces';
 
 export class SpaceInvitationProtocol implements InvitationProtocol {
   constructor(
@@ -47,16 +43,16 @@ export class SpaceInvitationProtocol implements InvitationProtocol {
     };
   }
 
-  checkCanInviteNewMembers(): ApiError | undefined {
+  checkCanInviteNewMembers(): Error | undefined {
     if (this._spaceKey == null) {
-      return new InvalidInvitationError('No spaceKey was provided for a space invitation.');
+      return new InvalidInvitationError({ message: 'No spaceKey was provided for a space invitation.' });
     }
     const space = this._spaceManager.spaces.get(this._spaceKey);
     if (space == null) {
       return new SpaceNotFoundError(this._spaceKey);
     }
     if (!space?.inner.spaceState.hasMembershipManagementPermission(this._signingContext.identityKey)) {
-      return new AuthorizationError('No member management permission.');
+      return new AuthorizationError({ message: 'No member management permission.' });
     }
     return undefined;
   }
@@ -147,10 +143,10 @@ export class SpaceInvitationProtocol implements InvitationProtocol {
 
   checkInvitation(invitation: Partial<Invitation>): InvalidInvitationError | AlreadyJoinedError | undefined {
     if (invitation.spaceKey == null) {
-      return new InvalidInvitationError('No spaceKey was provided for a space invitation.');
+      return new InvalidInvitationError({ message: 'No spaceKey was provided for a space invitation.' });
     }
     if (this._spaceManager.spaces.has(invitation.spaceKey)) {
-      return new AlreadyJoinedError('Already joined space.');
+      return new AlreadyJoinedError({ message: 'Already joined space.' });
     }
   }
 
@@ -183,15 +179,16 @@ export class SpaceInvitationProtocol implements InvitationProtocol {
     invariant(credential.subject.id.equals(this._signingContext.identityKey));
 
     if (this._spaceManager.spaces.has(assertion.spaceKey)) {
-      throw new AlreadyJoinedError('Already joined space.');
+      throw new AlreadyJoinedError({ message: 'Already joined space.' });
     }
 
     // Create local space.
-    await this._spaceManager.acceptSpace({
+    await this._spaceManager.acceptSpace(Context.default(), {
       spaceKey: assertion.spaceKey,
       genesisFeedKey: assertion.genesisFeedKey,
       controlTimeframe,
       dataTimeframe,
+      tags: assertion.tags,
     });
 
     await this._signingContext.recordCredential(credential);

package/src/packlets/invitations/utils.ts

@@ -3,7 +3,7 @@
 //
 
 import { type Mutex, type MutexGuard } from '@dxos/async';
-import { cancelWithContext, type Context, ContextDisposedError } from '@dxos/context';
+import { type Context, ContextDisposedError, cancelWithContext } from '@dxos/context';
 import { Invitation } from '@dxos/protocols/proto/dxos/client/services';
 
 export const stateToString = (state: Invitation.State): string => {

package/src/packlets/locks/browser.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { asyncTimeout, Trigger } from '@dxos/async';
+import { Trigger, asyncTimeout } from '@dxos/async';
 import { RESOURCE_LOCK_TIMEOUT } from '@dxos/client-protocol';
 import { log, logInfo } from '@dxos/log';
 

package/src/packlets/locks/index.ts

@@ -3,4 +3,4 @@
 //
 
 export type * from './resource-lock';
-export * from './node';
+export * from '#locks-platform';

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

@@ -13,12 +13,12 @@ import {
   log,
 } from '@dxos/log';
 import {
+  type ControlMetricsRequest,
+  type ControlMetricsResponse,
   type LogEntry,
   type LoggingService,
   type Metrics,
   QueryLogsRequest,
-  type ControlMetricsRequest,
-  type ControlMetricsResponse,
   type QueryMetricsRequest,
   type QueryMetricsResponse,
 } from '@dxos/protocols/proto/dxos/client/services';
@@ -26,6 +26,10 @@ import { getDebugName, jsonify, numericalValues, tracer } from '@dxos/util';
 
 /**
  * Logging service used to spy on logs of the host.
+ *
+ * @deprecated This was created so that logs from the shared worker (WorkerClientServices) could be
+ * seen in the main window console without opening the shared worker DevTools. Shared worker client
+ * services is deprecated; dedicated worker logs already show in the main window console.
  */
 export class LoggingServiceImpl implements LoggingService {
   private readonly _logs = new Event<NaturalLogEntry>();
@@ -37,7 +41,7 @@ export class LoggingServiceImpl implements LoggingService {
   }
 
   async close(): Promise<void> {
-    const index = log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    const index = log.runtimeConfig.processors.findIndex((processor: LogProcessor) => processor === this._logProcessor);
     log.runtimeConfig.processors.splice(index, 1);
   }
 

package/src/packlets/logging/logging.test.ts

@@ -5,7 +5,7 @@
 import { afterEach, beforeEach, describe, expect, test } from 'vitest';
 
 import { Trigger } from '@dxos/async';
-import { log, LogLevel } from '@dxos/log';
+import { LogLevel, log } from '@dxos/log';
 import { type LogEntry } from '@dxos/protocols/proto/dxos/client/services';
 
 import { LoggingServiceImpl } from './logging-service';

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

@@ -2,16 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
-import { afterEach, onTestFinished, beforeEach, describe, expect, test } from 'vitest';
+import { afterEach, beforeEach, describe, expect, onTestFinished, test } from 'vitest';
 
 import { Trigger } from '@dxos/async';
 import { Context } from '@dxos/context';
-import { type NetworkService, ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
+import { ConnectionState, type NetworkService } from '@dxos/protocols/proto/dxos/client/services';
 
-import { NetworkServiceImpl } from './network-service';
 import { type ServiceContext } from '../services';
 import { createServiceContext } from '../testing';
 
+import { NetworkServiceImpl } from './network-service';
+
 describe('NetworkService', () => {
   let serviceContext: ServiceContext;
   let networkService: NetworkService;

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

@@ -3,19 +3,20 @@
 //
 
 import { Stream } from '@dxos/codec-protobuf/stream';
+import { Context } from '@dxos/context';
 import { type EdgeConnection } from '@dxos/edge-client';
 import { type SignalManager } from '@dxos/messaging';
 import { type SwarmNetworkManager } from '@dxos/network-manager';
 import {
-  type SubscribeSwarmStateRequest,
   type NetworkService,
   type NetworkStatus,
+  type SubscribeSwarmStateRequest,
   type UpdateConfigRequest,
 } from '@dxos/protocols/proto/dxos/client/services';
 import { type Peer, type SwarmResponse } from '@dxos/protocols/proto/dxos/edge/messenger';
 import {
-  type LeaveRequest,
   type JoinRequest,
+  type LeaveRequest,
   type Message,
   type QueryRequest,
 } from '@dxos/protocols/proto/dxos/edge/signal';
@@ -48,15 +49,15 @@ export class NetworkServiceImpl implements NetworkService {
   }
 
   async joinSwarm(request: JoinRequest): Promise<void> {
-    return this.signalManager.join(request);
+    return this.signalManager.join(Context.default(), request);
   }
 
   async leaveSwarm(request: LeaveRequest): Promise<void> {
-    return this.signalManager.leave(request);
+    return this.signalManager.leave(Context.default(), request);
   }
 
   async querySwarm(request: QueryRequest): Promise<SwarmResponse> {
-    return this.signalManager.query(request);
+    return this.signalManager.query(Context.default(), request);
   }
 
   subscribeSwarmState(request: SubscribeSwarmStateRequest): Stream<SwarmResponse> {
@@ -70,7 +71,7 @@ export class NetworkServiceImpl implements NetworkService {
   }
 
   async sendMessage(message: Message): Promise<void> {
-    return this.signalManager.sendMessage(message);
+    return this.signalManager.sendMessage(Context.default(), message);
   }
 
   subscribeMessages(peer: Peer): Stream<Message> {

package/src/packlets/services/client-rpc-server.ts

@@ -5,13 +5,13 @@
 import { type ClientServices } from '@dxos/client-protocol';
 import { type Any, type ServiceHandler, Stream } from '@dxos/codec-protobuf';
 import { raise } from '@dxos/debug';
-import { parseMethodName, RpcPeer, type RpcPeerOptions, type ServiceBundle } from '@dxos/rpc';
+import { RpcPeer, type RpcPeerOptions, type ServiceBundle, parseMethodName } from '@dxos/rpc';
 import { MapCounter, trace } from '@dxos/tracing';
 import { type MaybePromise } from '@dxos/util';
 
 import { type ServiceRegistry } from './service-registry';
 
-export type ClientRpcServerParams = {
+export type ClientRpcServerProps = {
   serviceRegistry: ServiceRegistry<ClientServices>;
   handleCall?: (
     method: string,
@@ -30,8 +30,8 @@ export class ClientRpcServer {
   private readonly _serviceRegistry: ServiceRegistry<ClientServices>;
   private readonly _rpcPeer: RpcPeer;
   private readonly _handlerCache = new Map<string, ServiceHandler<any>>();
-  private readonly _handleCall: ClientRpcServerParams['handleCall'];
-  private readonly _handleStream: ClientRpcServerParams['handleStream'];
+  private readonly _handleCall: ClientRpcServerProps['handleCall'];
+  private readonly _handleStream: ClientRpcServerProps['handleStream'];
 
   @trace.metricsCounter()
   private readonly _callMetrics = new MapCounter();
@@ -41,7 +41,7 @@ export class ClientRpcServer {
     return Object.keys(this._serviceRegistry.services);
   }
 
-  constructor(params: ClientRpcServerParams) {
+  constructor(params: ClientRpcServerProps) {
     const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
     this._handleCall = handleCall;
     this._handleStream = handleStream;