@dxos/protocols 0.4.10-main.fd4f2a3 → 0.4.10-main.fda6f37

package/dist/esm/src/proto/gen/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/proto/gen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AA8DhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AA4hB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,wksGAAwksG,CAAC,CAAC,CAAC;AACjosG,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAkB,UAAU,EAAE,aAAa,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/proto/gen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AA8DhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AA6hB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,g7tGAAg7tG,CAAC,CAAC,CAAC;AACz+tG,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAkB,UAAU,EAAE,aAAa,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/protocols",
-  "version": "0.4.10-main.fd4f2a3",
+  "version": "0.4.10-main.fda6f37",
   "description": "Protobuf definitions for DXOS protocols.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,10 +33,10 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/invariant": "0.4.10-main.fd4f2a3",
-    "@dxos/codec-protobuf": "0.4.10-main.fd4f2a3",
-    "@dxos/timeframe": "0.4.10-main.fd4f2a3",
-    "@dxos/keys": "0.4.10-main.fd4f2a3"
+    "@dxos/codec-protobuf": "0.4.10-main.fda6f37",
+    "@dxos/timeframe": "0.4.10-main.fda6f37",
+    "@dxos/invariant": "0.4.10-main.fda6f37",
+    "@dxos/keys": "0.4.10-main.fda6f37"
   },
   "devDependencies": {
     "glob": "~7.1.6"

package/src/indexing.ts

@@ -2,15 +2,16 @@
 // Copyright 2024 DXOS.org
 //
 
-// TODO(dmaretskyi): Rename ObjectPointer{Decoded/Encoded}.
-export type IdDecoded = {
+export type ObjectPointerDecoded = {
   documentId: string;
   objectId: string;
 };
 
+export type ObjectPointerEncoded = string;
+
 export const idCodec = {
-  encode: ({ documentId, objectId }: IdDecoded) => `${documentId}|${objectId}`,
-  decode: (id: string): IdDecoded => {
+  encode: ({ documentId, objectId }: ObjectPointerDecoded): ObjectPointerEncoded => `${documentId}|${objectId}`,
+  decode: (id: ObjectPointerEncoded): ObjectPointerDecoded => {
     const [documentId, objectId] = id.split('|');
     return { documentId, objectId };
   },

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

@@ -405,9 +405,12 @@ message Invitation {
   enum Type {
     /// Requires both to be online to complete key exchange.
     INTERACTIVE = 0;
-    /// Guest's identity key is known; invitation can be accepted by any valid peer.
-    OFFLINE = 1;
-    /// Multiple-use interactive invitation.
+    /// Invitation can be accepted by any valid peer.
+    DELEGATED = 1;
+    /**
+     * Multi-use interactive invitations.
+     * @deprecated use multiUse flag with type=interactive instead.
+     */
     MULTIUSE = 2;
   }
 
@@ -422,6 +425,9 @@ message Invitation {
 
     /// Guest should call `Authenticate` with the shared secret.
     SHARED_SECRET = 1;
+
+    /// Guest should prove they possess a private key corresponding to the known public key recorded in an invitation.
+    KNOWN_PUBLIC_KEY = 2;
   }
 
   enum State {
@@ -480,6 +486,17 @@ message Invitation {
   // TODO(nf): some feedback mechanism or GC for immortal invitations?
   // TODO(nf): should the creator have a way to make an invitation last as long as the client? this was the previous behavior.
   optional int32 lifetime = 14;
+
+  /// Whether an invitation can be used multiple times.
+  optional bool multi_use = 15;
+
+  /// Guest's keypair required for AuthMethod.KNOWN_PUBLIC_KEY.
+  optional AdmissionKeypair guest_keypair = 16;
+}
+
+message AdmissionKeypair {
+  dxos.keys.PublicKey public_key = 1;
+  optional dxos.keys.PrivateKey private_key = 2;
 }
 
 message AcceptInvitationRequest {

package/src/proto/dxos/echo/model/document.proto

@@ -32,9 +32,6 @@ message Value {
     Array array                       = 21;
 
     Reference reference               = 30;
-
-    // YJS state snapshot.
-    YJS yjs                           = 40;
   }
 }
 

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

@@ -33,12 +33,19 @@ message IntroductionRequest {
 message IntroductionResponse {
   dxos.client.services.Invitation.AuthMethod auth_method = 1;
 
+  /// Present when auth_method is KNOWN_PUBLIC_KEY.
+  optional bytes challenge = 2;
+
   /// Only present for testing invitation types.
   optional dxos.keys.PublicKey space_key = 100;
 }
 
 message AuthenticationRequest {
-  string auth_code = 1;
+  /// Present when auth_method is SHARED_SECRET.
+  optional string auth_code = 1;
+
+  /// Present when auth_method is KNOWN_PUBLIC_KEY.
+  optional bytes signed_challenge = 2;
 }
 
 message AuthenticationResponse {
@@ -47,6 +54,7 @@ message AuthenticationResponse {
     INVALID_OTP = 1;
     INVALID_OPT_ATTEMPTS = 2;
     INTERNAL_ERROR = 3;
+    INVALID_SIGNATURE = 4;
   }
 
   optional Status status = 1;

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

@@ -750,6 +750,20 @@ export interface Invitation {
      *   - proto3_optional = true
      */
     lifetime?: number;
+    /**
+     * Whether an invitation can be used multiple times.
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    multiUse?: boolean;
+    /**
+     * Guest's keypair required for AuthMethod.KNOWN_PUBLIC_KEY.
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    guestKeypair?: AdmissionKeypair;
 }
 export namespace Invitation {
     /**
@@ -758,7 +772,7 @@ export namespace Invitation {
      */
     export enum Type {
         INTERACTIVE = 0,
-        OFFLINE = 1,
+        DELEGATED = 1,
         MULTIUSE = 2
     }
     /**
@@ -775,7 +789,8 @@ export namespace Invitation {
      */
     export enum AuthMethod {
         NONE = 0,
-        SHARED_SECRET = 1
+        SHARED_SECRET = 1,
+        KNOWN_PUBLIC_KEY = 2
     }
     /**
      * Defined in:
@@ -794,6 +809,18 @@ export namespace Invitation {
         EXPIRED = 9
     }
 }
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface AdmissionKeypair {
+    publicKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    privateKey?: ReturnType<(typeof substitutions)["dxos.keys.PrivateKey"]["decode"]>;
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}

package/src/proto/gen/dxos/echo/model/document.ts

@@ -78,7 +78,6 @@ export interface Value {
     object?: KeyValueObject;
     array?: Array;
     reference?: Reference;
-    yjs?: YJS;
 }
 /**
  * Ordered collection of values.

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

@@ -104,6 +104,13 @@ export interface IntroductionRequest {
  */
 export interface IntroductionResponse {
     authMethod: dxos_client_services.Invitation.AuthMethod;
+    /**
+     * Present when auth_method is KNOWN_PUBLIC_KEY.
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    challenge?: Uint8Array;
     /**
      * Only present for testing invitation types.
      *
@@ -117,7 +124,20 @@ export interface IntroductionResponse {
  *   {@link file://./../../../dxos/halo/invitations.proto}
  */
 export interface AuthenticationRequest {
-    authCode: string;
+    /**
+     * Present when auth_method is SHARED_SECRET.
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    authCode?: string;
+    /**
+     * Present when auth_method is KNOWN_PUBLIC_KEY.
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    signedChallenge?: Uint8Array;
 }
 /**
  * Defined in:
@@ -139,7 +159,8 @@ export namespace AuthenticationResponse {
         OK = 0,
         INVALID_OTP = 1,
         INVALID_OPT_ATTEMPTS = 2,
-        INTERNAL_ERROR = 3
+        INTERNAL_ERROR = 3,
+        INVALID_SIGNATURE = 4
     }
 }
 /**