@dxos/protocols 0.5.1-main.c37e119 → 0.5.1-main.c4f37e4

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;AAgiB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,o1vGAAo1vG,CAAC,CAAC,CAAC;AAC74vG,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;AA+DhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AA0iB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,q+zGAAq+zG,CAAC,CAAC,CAAC;AAC9h0G,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.5.1-main.c37e119",
+  "version": "0.5.1-main.c4f37e4",
   "description": "Protobuf definitions for DXOS protocols.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,10 +33,10 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/keys": "0.5.1-main.c37e119",
-    "@dxos/invariant": "0.5.1-main.c37e119",
-    "@dxos/timeframe": "0.5.1-main.c37e119",
-    "@dxos/codec-protobuf": "0.5.1-main.c37e119"
+    "@dxos/invariant": "0.5.1-main.c4f37e4",
+    "@dxos/codec-protobuf": "0.5.1-main.c4f37e4",
+    "@dxos/keys": "0.5.1-main.c4f37e4",
+    "@dxos/timeframe": "0.5.1-main.c4f37e4"
   },
   "devDependencies": {
     "glob": "~7.1.6"

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

@@ -208,7 +208,7 @@ message SpaceMember {
 
   Identity identity = 1;
   PresenceState presence = 2;
-  repeated PeerState peerStates = 3;
+  repeated dxos.mesh.presence.PeerState peerStates = 3;
 }
 
 /// Runtime state of the space object.
@@ -364,11 +364,19 @@ message CreateEpochRequest {
   optional Migration migration = 2;
 }
 
+message UpdateMemberRoleRequest {
+  dxos.keys.PublicKey space_key = 1;
+  dxos.keys.PublicKey member_key = 2;
+  dxos.halo.credentials.SpaceMember.Role new_role = 3;
+}
+
 service SpacesService {
   rpc CreateSpace(google.protobuf.Empty) returns (Space);
   rpc UpdateSpace(UpdateSpaceRequest) returns (google.protobuf.Empty);
   rpc QuerySpaces(google.protobuf.Empty) returns (stream QuerySpacesResponse);
 
+  rpc UpdateMemberRole(UpdateMemberRoleRequest) returns (google.protobuf.Empty);
+
   /// Broadcast an ephemeral message to the space swarm.
   rpc PostMessage(PostMessageRequest) returns (google.protobuf.Empty);
   /// Subscribe to messages from the space swarm.
@@ -483,6 +491,9 @@ message Invitation {
 
   /// Present on Type.DELEGATED invitations.
   optional dxos.keys.PublicKey delegation_credential_id = 17;
+
+  /// Role of the admitted member, defaults to ADMIN.
+  optional dxos.halo.credentials.SpaceMember.Role role = 18;
 }
 
 message AdmissionKeypair {
@@ -492,7 +503,7 @@ message AdmissionKeypair {
 
 message AcceptInvitationRequest {
   Invitation invitation = 1;
-  optional dxos.credentials.DeviceProfileDocument device_profile = 2;
+  optional dxos.halo.credentials.DeviceProfileDocument device_profile = 2;
 }
 
 message AuthenticationRequest {

package/src/proto/dxos/config.proto

@@ -267,6 +267,14 @@ message Runtime {
       int32 interval = 2;
     }
 
+    /// https://github.com/ipfs/kubo/blob/master/docs/config.md#apiauthorizations
+    message KuboApiAuthorization {
+        /// Just for organizational purposes.
+        string name = 1;
+        string auth_secret = 2;
+        repeated string allowed_paths = 3;
+    }
+
     // TODO(burdon): Needs documentation/
     string host = 1;
     string port = 2;
@@ -282,6 +290,8 @@ message Runtime {
     Gravity gravity = 12;
     AppTunneling app_tunneling = 13;
     Bots bots = 14;
+    // TODO(nf): manage secret better.
+    repeated KuboApiAuthorization ipfs_api_authorizations = 15;
   }
 
   //

package/src/proto/dxos/echo/query.proto

@@ -18,6 +18,15 @@ message QueryRequest {
   dxos.echo.filter.Filter filter = 2;
 }
 
+/**
+ * Automerge heads.
+ * Used for encoding in Index metadata store.
+ * @see https://automerge.org/automerge-repo/types/_automerge_automerge_repo.Heads.html
+ */
+message Heads {
+  repeated string hashes = 1;
+}
+
 message QueryResult {
   string id = 1;
   dxos.keys.PublicKey spaceKey = 2;
@@ -31,7 +40,7 @@ message QueryResponse {
 }
 
 service QueryService {
-  rpc SetIndexConfig(dxos.echo.indexing.IndexConfig) returns (google.protobuf.Empty);
-  rpc Find(QueryRequest) returns (stream QueryResponse);
-  rpc ReIndex(google.protobuf.Empty) returns (google.protobuf.Empty);
+  rpc SetConfig(dxos.echo.indexing.IndexConfig) returns (google.protobuf.Empty);
+  rpc ExecQuery(QueryRequest) returns (stream QueryResponse);
+  rpc Reindex(google.protobuf.Empty) returns (google.protobuf.Empty);
 }

package/src/proto/dxos/halo/credentials.proto

@@ -39,13 +39,6 @@ message SpaceGenesis {
 // Claims can be written directly to a feed or used within Credentials.
 //
 
-/**
- * Revocation of another credential.
- * Subject must be the credential id being revoked.
- */
-message Revocation {
-}
-
 // TODO(burdon): Reconcile with dxos.client.SpaceMember.
 // [ASSERTION]: Agent is authorized to access Space.
 message SpaceMember {
@@ -55,9 +48,13 @@ message SpaceMember {
     /// Manage members.
     ADMIN = 1;
     /// Read and write.
-    MEMBER = 2;
+    EDITOR = 2;
     /// Read-only.
     READER = 3;
+    /// Admin that can't be removed.
+    OWNER = 4;
+    /// Revoked membership.
+    REMOVED = 5;
   }
 
   dxos.keys.PublicKey space_key = 1;
@@ -191,6 +188,15 @@ message KubeAccess {
   repeated string capabilities = 3;
 }
 
+// [ASSERTION]: Identity is authorized to access an external server.
+message ServiceAccess {
+  string server_name = 1;
+  optional google.protobuf.Struct server_metadata = 2;
+  dxos.keys.PublicKey server_key = 3;
+  dxos.keys.PublicKey identity_key = 4;
+  repeated string capabilities = 5;
+}
+
 /// Metadata associated with a key.
 /// Subject must be a key being referenced.
 message KeyInfo {
@@ -267,6 +273,7 @@ message Credential {
   optional bytes expiration_ref = 5;                        // Could reference blockchain or epoch number.
   Claim subject = 10;
   optional Proof proof = 11;
+  repeated dxos.keys.PublicKey parent_credential_ids = 12;  // Can be used for resolution of concurrent mutually exclusive actions
 }
 
 //

package/src/proto/dxos/iframe.proto

@@ -78,7 +78,19 @@ message LayoutRequest {
   optional string target = 4;
 }
 
+message InvitationUrlRequest {
+  /// Base URL for invitations.
+  string invitation_url = 1;
+
+  /// Query parameter for device invitations.
+  string device_invitation_param = 2;
+
+  /// Query parameter for space invitations.
+  string space_invitation_param = 3;
+}
+
 /// Shell UI RPCs.
 service ShellService {
   rpc SetLayout(LayoutRequest) returns (google.protobuf.Empty);
+  rpc SetInvitationUrl(InvitationUrlRequest) returns (google.protobuf.Empty);
 }

package/src/proto/dxos/service/agentmanager.proto

@@ -0,0 +1,51 @@
+//
+// Copyright 2022 DXOS.org
+//
+
+syntax = "proto3";
+
+import "google/protobuf/any.proto";
+import "google/protobuf/empty.proto";
+import "dxos/config.proto";
+import "dxos/halo/credentials.proto";
+import "dxos/keys.proto";
+
+package dxos.service.agentmanager;
+
+option go_package = "github.com/dxos/kube/proto/def/dxos/service/agentmanager";
+
+message InitAuthSequenceRequest {
+  // Auth token for the agentmanager to validate authorization.
+  optional string auth_token = 1;
+}
+
+message InitAuthSequenceResponse {
+  enum InitAuthSequenceResult {
+    UNKNOWN = 0;
+    SUCCESS = 1;
+    NOT_AUTHORIZED = 2;
+    ERROR = 3;
+  }
+
+  InitAuthSequenceResult result = 1;
+    optional bytes nonce = 2;
+    optional dxos.keys.PublicKey agentmanager_key = 3;
+    // Reason why initializing the auth sequence failed (e.g. invalid access token)
+    optional string init_auth_response_reason = 4;
+}
+
+message Authentication {
+  dxos.halo.credentials.Presentation presentation = 1;
+}
+
+message AuthenticateResponse {
+  optional string token = 1;
+  optional dxos.halo.credentials.Credential credential = 2;
+}
+
+service AgentManager {
+  // Initialize the authentication sequence. Send an optional authentication token to permit the server to authorize the request.
+  // Receive a nonce (challenge) necessary to call Authenticate to prevent replay attacks.
+  rpc InitAuthSequence(InitAuthSequenceRequest) returns (InitAuthSequenceResponse);
+  rpc Authenticate(Authentication) returns (AuthenticateResponse);
+}

package/src/proto/dxos/tracing.proto

@@ -111,7 +111,6 @@ message Metric {
   }
 }
 
-
 service TracingService {
   rpc StreamTrace(google.protobuf.Empty) returns (stream StreamTraceEvent);
-}
+}

package/src/proto/gen/dxos/agent/dashboard.ts

@@ -51,6 +51,7 @@ import * as dxos_mesh_teleport_notarization from "../mesh/teleport/notarization"
 import * as dxos_mesh_teleport_replicator from "../mesh/teleport/replicator";
 import * as dxos_registry from "../registry";
 import * as dxos_rpc from "../rpc";
+import * as dxos_service_agentmanager from "../service/agentmanager";
 import * as dxos_service_publisher from "../service/publisher";
 import * as dxos_service_supervisor from "../service/supervisor";
 import * as dxos_service_tunnel from "../service/tunnel";

package/src/proto/gen/dxos/agent/echoproxy.ts

@@ -51,6 +51,7 @@ import * as dxos_mesh_teleport_notarization from "../mesh/teleport/notarization"
 import * as dxos_mesh_teleport_replicator from "../mesh/teleport/replicator";
 import * as dxos_registry from "../registry";
 import * as dxos_rpc from "../rpc";
+import * as dxos_service_agentmanager from "../service/agentmanager";
 import * as dxos_service_publisher from "../service/publisher";
 import * as dxos_service_supervisor from "../service/supervisor";
 import * as dxos_service_tunnel from "../service/tunnel";

package/src/proto/gen/dxos/agent/epoch.ts

@@ -51,6 +51,7 @@ import * as dxos_mesh_teleport_notarization from "../mesh/teleport/notarization"
 import * as dxos_mesh_teleport_replicator from "../mesh/teleport/replicator";
 import * as dxos_registry from "../registry";
 import * as dxos_rpc from "../rpc";
+import * as dxos_service_agentmanager from "../service/agentmanager";
 import * as dxos_service_publisher from "../service/publisher";
 import * as dxos_service_supervisor from "../service/supervisor";
 import * as dxos_service_tunnel from "../service/tunnel";

package/src/proto/gen/dxos/agent/functions.ts

@@ -51,6 +51,7 @@ import * as dxos_mesh_teleport_notarization from "../mesh/teleport/notarization"
 import * as dxos_mesh_teleport_replicator from "../mesh/teleport/replicator";
 import * as dxos_registry from "../registry";
 import * as dxos_rpc from "../rpc";
+import * as dxos_service_agentmanager from "../service/agentmanager";
 import * as dxos_service_publisher from "../service/publisher";
 import * as dxos_service_supervisor from "../service/supervisor";
 import * as dxos_service_tunnel from "../service/tunnel";

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

@@ -51,6 +51,7 @@ import * as dxos_mesh_teleport_notarization from "./mesh/teleport/notarization";
 import * as dxos_mesh_teleport_replicator from "./mesh/teleport/replicator";
 import * as dxos_registry from "./registry";
 import * as dxos_rpc from "./rpc";
+import * as dxos_service_agentmanager from "./service/agentmanager";
 import * as dxos_service_publisher from "./service/publisher";
 import * as dxos_service_supervisor from "./service/supervisor";
 import * as dxos_service_tunnel from "./service/tunnel";