@dxos/protocols 0.1.39 → 0.1.40

package/src/proto/dxos/client/services.proto

@@ -325,11 +325,35 @@ message CancelInvitationRequest {
   string invitation_id = 1;
 }
 
+message InvitationMethod {
+  oneof kind {
+    Invitation created = 1;
+    Invitation accepted = 2;
+  }
+}
+
+message QueryInvitationsResponse {
+  enum Action {
+    ADDED = 0;
+    REMOVED = 1;
+  }
+
+  enum Type {
+    CREATED = 0;
+    ACCEPTED = 1;
+  }
+
+  Action action = 1;
+  Type type = 2;
+  repeated Invitation invitations = 3;
+}
+
 service InvitationsService {
   rpc CreateInvitation(Invitation) returns (stream Invitation);
-  rpc Authenticate(AuthenticationRequest) returns (google.protobuf.Empty);
   rpc AcceptInvitation(Invitation) returns (stream Invitation);
+  rpc Authenticate(AuthenticationRequest) returns (google.protobuf.Empty);
   rpc CancelInvitation(CancelInvitationRequest) returns (google.protobuf.Empty);
+  rpc QueryInvitations(google.protobuf.Empty) returns (stream QueryInvitationsResponse);
 }
 
 //

package/src/proto/dxos/config.proto

@@ -301,7 +301,7 @@ message Runtime {
     }
 
     message Signal {
-      optional string server = 1;
+      string server = 1;
       optional string api = 2;
       optional string status = 3;
     }
@@ -336,7 +336,7 @@ message Runtime {
     optional AppServer app = 2;
     optional Dxns dxns = 3;
     optional Ipfs ipfs = 4;
-    optional Signal signal = 5;
+    repeated Signal signaling = 5;
     repeated Ice ice = 6;
     optional Machine machine = 7;
     optional BotHost bot = 8;

package/src/proto/dxos/halo/invitations.proto

@@ -13,6 +13,16 @@ import "dxos/keys.proto";
 
 package dxos.halo.invitations;
 
+message Options {
+  enum Role {
+    GUEST = 0;
+    HOST = 1;
+  }
+
+  /// Role of the peer.
+  Role role = 1;
+}
+
 message IntroductionRequest {
   /// Guest's profile.
   optional halo.credentials.ProfileDocument profile = 1;
@@ -87,13 +97,17 @@ message AdmissionResponse {
 
 /// Host service for two peers exchanging an invitation.
 // TODO(wittjosiah): Handle invitations where guest is the initiatating peer.
+// TODO(dmaretskyi): Rename to InvitationExtensionService.
 service InvitationHostService {
-  /// Introduce guest to the host.
+  /// Both peers must call this method before any other.
+  rpc Options(Options) returns (google.protobuf.Empty);
+
+  /// Introduce guest to the host. Only on the host.
   rpc Introduce(IntroductionRequest) returns (IntroductionResponse);
 
-  /// Authenticate request.
+  /// Authenticate request. Only on the host.
   rpc Authenticate(AuthenticationRequest) returns (AuthenticationResponse);
 
-  /// Process admission credentials.
+  /// Process admission credentials. Only on the host.
   rpc Admit(AdmissionRequest) returns (AdmissionResponse);
 }

package/src/proto/gen/dxos/client/services.ts

@@ -511,15 +511,51 @@ export interface AuthenticationRequest {
 export interface CancelInvitationRequest {
     invitationId: string;
 }
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface InvitationMethod {
+    created?: Invitation;
+    accepted?: Invitation;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface QueryInvitationsResponse {
+    action: QueryInvitationsResponse.Action;
+    type: QueryInvitationsResponse.Type;
+    invitations?: Invitation[];
+}
+export namespace QueryInvitationsResponse {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/services.proto}
+     */
+    export enum Action {
+        ADDED = 0,
+        REMOVED = 1
+    }
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/services.proto}
+     */
+    export enum Type {
+        CREATED = 0,
+        ACCEPTED = 1
+    }
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
  */
 export interface InvitationsService {
     createInvitation: (request: Invitation) => Stream<Invitation>;
-    authenticate: (request: AuthenticationRequest) => Promise<void>;
     acceptInvitation: (request: Invitation) => Stream<Invitation>;
+    authenticate: (request: AuthenticationRequest) => Promise<void>;
     cancelInvitation: (request: CancelInvitationRequest) => Promise<void>;
+    queryInvitations: (request: void) => Stream<QueryInvitationsResponse>;
 }
 /**
  * Defined in:

package/src/proto/gen/dxos/config.ts

@@ -666,11 +666,7 @@ export namespace Runtime {
          *   - proto3_optional = true
          */
         ipfs?: Runtime.Services.Ipfs;
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        signal?: Runtime.Services.Signal;
+        signaling?: Runtime.Services.Signal[];
         ice?: Runtime.Services.Ice[];
         /**
          * Options:
@@ -812,11 +808,7 @@ export namespace Runtime {
          *   {@link file://./../../dxos/config.proto}
          */
         export interface Signal {
-            /**
-             * Options:
-             *   - proto3_optional = true
-             */
-            server?: string;
+            server: string;
             /**
              * Options:
              *   - proto3_optional = true

package/src/proto/gen/dxos/devtools/host.ts

@@ -47,6 +47,37 @@ import * as dxos_type from "../type";
 import * as example_testing_data from "../../example/testing/data";
 import * as example_testing_rpc from "../../example/testing/rpc";
 import * as google_protobuf from "../../google/protobuf";
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/devtools/diagnostics.proto}
+ */
+export interface Services {
+    spaces?: SpaceStats[];
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/devtools/diagnostics.proto}
+ */
+export interface SpaceStats {
+    key: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    peers?: PeerStats[];
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/devtools/diagnostics.proto}
+ */
+export interface PeerStats {
+    controlFeed: FeedStats;
+    dataFeed: FeedStats;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/devtools/diagnostics.proto}
+ */
+export interface FeedStats {
+    key: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    length: number;
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/devtools/host.proto}
@@ -431,34 +462,3 @@ export interface TracingService {
 export interface SetTracingOptionsRequest {
     enable: boolean;
 }
-/**
- * Defined in:
- *   {@link file://./../../../dxos/devtools/diagnostics.proto}
- */
-export interface Services {
-    spaces?: SpaceStats[];
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/devtools/diagnostics.proto}
- */
-export interface SpaceStats {
-    key: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
-    peers?: PeerStats[];
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/devtools/diagnostics.proto}
- */
-export interface PeerStats {
-    controlFeed: FeedStats;
-    dataFeed: FeedStats;
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/devtools/diagnostics.proto}
- */
-export interface FeedStats {
-    key: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
-    length: number;
-}

package/src/proto/gen/dxos/halo/invitations.ts

@@ -47,6 +47,26 @@ import * as dxos_type from "../type";
 import * as example_testing_data from "../../example/testing/data";
 import * as example_testing_rpc from "../../example/testing/rpc";
 import * as google_protobuf from "../../google/protobuf";
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/halo/invitations.proto}
+ */
+export interface Options {
+    /**
+     * Role of the peer.
+     */
+    role: Options.Role;
+}
+export namespace Options {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/halo/invitations.proto}
+     */
+    export enum Role {
+        GUEST = 0,
+        HOST = 1
+    }
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/halo/invitations.proto}
@@ -183,15 +203,19 @@ export interface AdmissionResponse {
  */
 export interface InvitationHostService {
     /**
-     * Introduce guest to the host.
+     * Both peers must call this method before any other.
+     */
+    options: (request: Options) => Promise<void>;
+    /**
+     * Introduce guest to the host. Only on the host.
      */
     introduce: (request: IntroductionRequest) => Promise<IntroductionResponse>;
     /**
-     * Authenticate request.
+     * Authenticate request. Only on the host.
      */
     authenticate: (request: AuthenticationRequest) => Promise<AuthenticationResponse>;
     /**
-     * Process admission credentials.
+     * Process admission credentials. Only on the host.
      */
     admit: (request: AdmissionRequest) => Promise<AdmissionResponse>;
 }