@dxos/echo-pipeline 0.5.9-main.a2de4fa → 0.5.9-main.aa46ff0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-pipeline",
-  "version": "0.5.9-main.a2de4fa",
+  "version": "0.5.9-main.aa46ff0",
   "description": "ECHO database.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -39,38 +39,38 @@
     "crc-32": "^1.2.2",
     "level": "^8.0.1",
     "level-transcoder": "^1.0.1",
-    "@dxos/async": "0.5.9-main.a2de4fa",
-    "@dxos/automerge": "0.5.9-main.a2de4fa",
-    "@dxos/context": "0.5.9-main.a2de4fa",
-    "@dxos/codec-protobuf": "0.5.9-main.a2de4fa",
-    "@dxos/credentials": "0.5.9-main.a2de4fa",
-    "@dxos/crypto": "0.5.9-main.a2de4fa",
-    "@dxos/debug": "0.5.9-main.a2de4fa",
-    "@dxos/echo-protocol": "0.5.9-main.a2de4fa",
-    "@dxos/echo-schema": "0.5.9-main.a2de4fa",
-    "@dxos/hypercore": "0.5.9-main.a2de4fa",
-    "@dxos/indexing": "0.5.9-main.a2de4fa",
-    "@dxos/feed-store": "0.5.9-main.a2de4fa",
-    "@dxos/invariant": "0.5.9-main.a2de4fa",
-    "@dxos/keyring": "0.5.9-main.a2de4fa",
-    "@dxos/keys": "0.5.9-main.a2de4fa",
-    "@dxos/kv-store": "0.5.9-main.a2de4fa",
-    "@dxos/log": "0.5.9-main.a2de4fa",
-    "@dxos/messaging": "0.5.9-main.a2de4fa",
-    "@dxos/network-manager": "0.5.9-main.a2de4fa",
-    "@dxos/node-std": "0.5.9-main.a2de4fa",
-    "@dxos/rpc": "0.5.9-main.a2de4fa",
-    "@dxos/teleport": "0.5.9-main.a2de4fa",
-    "@dxos/protocols": "0.5.9-main.a2de4fa",
-    "@dxos/random-access-storage": "0.5.9-main.a2de4fa",
-    "@dxos/teleport-extension-gossip": "0.5.9-main.a2de4fa",
-    "@dxos/teleport-extension-automerge-replicator": "0.5.9-main.a2de4fa",
-    "@dxos/teleport-extension-object-sync": "0.5.9-main.a2de4fa",
-    "@dxos/timeframe": "0.5.9-main.a2de4fa",
-    "@dxos/teleport-extension-replicator": "0.5.9-main.a2de4fa",
-    "@dxos/tracing": "0.5.9-main.a2de4fa",
-    "@dxos/typings": "0.5.9-main.a2de4fa",
-    "@dxos/util": "0.5.9-main.a2de4fa"
+    "@dxos/async": "0.5.9-main.aa46ff0",
+    "@dxos/automerge": "0.5.9-main.aa46ff0",
+    "@dxos/codec-protobuf": "0.5.9-main.aa46ff0",
+    "@dxos/context": "0.5.9-main.aa46ff0",
+    "@dxos/crypto": "0.5.9-main.aa46ff0",
+    "@dxos/credentials": "0.5.9-main.aa46ff0",
+    "@dxos/debug": "0.5.9-main.aa46ff0",
+    "@dxos/echo-protocol": "0.5.9-main.aa46ff0",
+    "@dxos/echo-schema": "0.5.9-main.aa46ff0",
+    "@dxos/hypercore": "0.5.9-main.aa46ff0",
+    "@dxos/indexing": "0.5.9-main.aa46ff0",
+    "@dxos/invariant": "0.5.9-main.aa46ff0",
+    "@dxos/keyring": "0.5.9-main.aa46ff0",
+    "@dxos/feed-store": "0.5.9-main.aa46ff0",
+    "@dxos/keys": "0.5.9-main.aa46ff0",
+    "@dxos/kv-store": "0.5.9-main.aa46ff0",
+    "@dxos/log": "0.5.9-main.aa46ff0",
+    "@dxos/messaging": "0.5.9-main.aa46ff0",
+    "@dxos/network-manager": "0.5.9-main.aa46ff0",
+    "@dxos/protocols": "0.5.9-main.aa46ff0",
+    "@dxos/node-std": "0.5.9-main.aa46ff0",
+    "@dxos/random-access-storage": "0.5.9-main.aa46ff0",
+    "@dxos/teleport": "0.5.9-main.aa46ff0",
+    "@dxos/rpc": "0.5.9-main.aa46ff0",
+    "@dxos/teleport-extension-automerge-replicator": "0.5.9-main.aa46ff0",
+    "@dxos/teleport-extension-object-sync": "0.5.9-main.aa46ff0",
+    "@dxos/teleport-extension-replicator": "0.5.9-main.aa46ff0",
+    "@dxos/timeframe": "0.5.9-main.aa46ff0",
+    "@dxos/teleport-extension-gossip": "0.5.9-main.aa46ff0",
+    "@dxos/util": "0.5.9-main.aa46ff0",
+    "@dxos/tracing": "0.5.9-main.aa46ff0",
+    "@dxos/typings": "0.5.9-main.aa46ff0"
   },
   "devDependencies": {
     "fast-check": "^3.19.0",

package/src/automerge/mesh-echo-replicator.ts

@@ -70,8 +70,8 @@ export class MeshEchoReplicator implements EchoReplicator {
       onRemoteDisconnected: async () => {
         log('onRemoteDisconnected', { peerId: connection.peerId });
         this._context?.onConnectionClosed(connection);
-        await connection.disable();
         this._connectionsPerPeer.delete(connection.peerId);
+        await connection.disable();
         this._connections.delete(connection);
       },
       shouldAdvertize: async (params: ShouldAdvertizeParams) => {

package/src/space/admission-discovery-extension.ts

@@ -0,0 +1,90 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { scheduleTask, type Trigger } from '@dxos/async';
+import { Context } from '@dxos/context';
+import { ProtocolError, schema } from '@dxos/protocols';
+import { type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
+import {
+  type AdmissionDiscoveryService,
+  type GetAdmissionCredentialResponse,
+  type GetAdmissionCredentialRequest,
+} from '@dxos/protocols/proto/dxos/mesh/teleport';
+import { type ExtensionContext, RpcExtension } from '@dxos/teleport';
+
+import { type Space } from './space';
+
+/**
+ * Guest's side for a connection to a concrete peer in p2p network during invitation.
+ */
+export class CredentialRetrieverExtension extends RpcExtension<
+  { AdmissionDiscoveryService: AdmissionDiscoveryService },
+  {}
+> {
+  private _ctx = new Context();
+
+  constructor(
+    private readonly _request: GetAdmissionCredentialRequest,
+    private readonly _onResult: Trigger<Credential>,
+  ) {
+    super({
+      requested: {
+        AdmissionDiscoveryService: schema.getService('dxos.mesh.teleport.AdmissionDiscoveryService'),
+      },
+    });
+  }
+
+  protected override async getHandlers(): Promise<{}> {
+    return {};
+  }
+
+  override async onOpen(context: ExtensionContext) {
+    await super.onOpen(context);
+    scheduleTask(this._ctx, async () => {
+      try {
+        const result = await this.rpc.AdmissionDiscoveryService.getAdmissionCredential(this._request);
+        this._onResult.wake(result.admissionCredential);
+      } catch (err: any) {
+        context.close(err);
+      }
+    });
+  }
+
+  override async onClose() {
+    await this._ctx.dispose();
+  }
+
+  override async onAbort(): Promise<void> {
+    await this._ctx.dispose();
+  }
+}
+
+export class CredentialServerExtension extends RpcExtension<
+  {},
+  { AdmissionDiscoveryService: AdmissionDiscoveryService }
+> {
+  constructor(private readonly _space: Space) {
+    super({
+      exposed: {
+        AdmissionDiscoveryService: schema.getService('dxos.mesh.teleport.AdmissionDiscoveryService'),
+      },
+    });
+  }
+
+  protected override async getHandlers(): Promise<{ AdmissionDiscoveryService: AdmissionDiscoveryService }> {
+    return {
+      AdmissionDiscoveryService: {
+        getAdmissionCredential: async (
+          request: GetAdmissionCredentialRequest,
+        ): Promise<GetAdmissionCredentialResponse> => {
+          const memberInfo = this._space.spaceState.members.get(request.memberKey);
+          if (!memberInfo?.credential) {
+            throw new ProtocolError('Space member not found.', request);
+          }
+          return { admissionCredential: memberInfo.credential };
+        },
+      },
+    };
+  }
+}

package/src/space/index.ts

@@ -6,3 +6,4 @@ export * from './auth';
 export * from './space';
 export * from './space-manager';
 export * from './space-protocol';
+export * from './admission-discovery-extension';

package/src/space/space-manager.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { synchronized, trackLeaks } from '@dxos/async';
+import { synchronized, trackLeaks, Trigger } from '@dxos/async';
 import { type DelegateInvitationCredential, type MemberInfo } from '@dxos/credentials';
 import { failUndefined } from '@dxos/debug';
 import { type FeedStore } from '@dxos/feed-store';
@@ -12,10 +12,12 @@ import { type SwarmNetworkManager } from '@dxos/network-manager';
 import { trace } from '@dxos/protocols';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type SpaceMetadata } from '@dxos/protocols/proto/dxos/echo/metadata';
+import type { Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type Teleport } from '@dxos/teleport';
 import { type BlobStore } from '@dxos/teleport-extension-object-sync';
 import { ComplexMap } from '@dxos/util';
 
+import { CredentialRetrieverExtension } from './admission-discovery-extension';
 import { Space, createIdFromSpaceKey } from './space';
 import { SpaceProtocol, type SwarmIdentity } from './space-protocol';
 import { SnapshotManager, type SnapshotStore } from '../db-host';
@@ -47,6 +49,13 @@ export type ConstructSpaceParams = {
   onMemberRolesChanged: (member: MemberInfo[]) => Promise<void>;
 };
 
+export type RequestSpaceAdmissionCredentialParams = {
+  spaceKey: PublicKey;
+  identityKey: PublicKey;
+  swarmIdentity: SwarmIdentity;
+  timeout: number;
+};
+
 /**
  * Manages a collection of ECHO (Data) Spaces.
  */
@@ -126,4 +135,40 @@ export class SpaceManager {
     log.trace('dxos.echo.space-manager.construct-space', trace.end({ id: this._instanceId }));
     return space;
   }
+
+  public async requestSpaceAdmissionCredential(params: RequestSpaceAdmissionCredentialParams): Promise<Credential> {
+    const traceKey = 'dxos.echo.space-manager.request-space-admission';
+    log.trace(traceKey, trace.begin({ id: this._instanceId }));
+    log('requesting space admission credential...', { spaceKey: params.spaceKey });
+
+    const onCredentialResolved = new Trigger<Credential>();
+    const protocol = new SpaceProtocol({
+      topic: params.spaceKey,
+      swarmIdentity: params.swarmIdentity,
+      networkManager: this._networkManager,
+      onSessionAuth: (session: Teleport) => {
+        session.addExtension(
+          'dxos.mesh.teleport.admission-discovery',
+          new CredentialRetrieverExtension(
+            { spaceKey: params.spaceKey, memberKey: params.identityKey },
+            onCredentialResolved,
+          ),
+        );
+      },
+      onAuthFailure: (session: Teleport) => session.close(),
+      blobStore: this._blobStore,
+    });
+
+    try {
+      await protocol.start();
+      const credential = await onCredentialResolved.wait({ timeout: params.timeout });
+      log.trace(traceKey, trace.end({ id: this._instanceId }));
+      return credential;
+    } catch (err: any) {
+      log.trace(traceKey, trace.error({ id: this._instanceId, error: err }));
+      throw err;
+    } finally {
+      await protocol.stop();
+    }
+  }
 }