@dxos/protocols 0.5.1-next.39e0ee2 → 0.5.1-next.5a770e3

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;AA+DhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AA0iB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,wuzGAAwuzG,CAAC,CAAC,CAAC;AACjyzG,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-next.39e0ee2",
+  "version": "0.5.1-next.5a770e3",
   "description": "Protobuf definitions for DXOS protocols.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,10 +33,10 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/codec-protobuf": "0.5.1-next.39e0ee2",
-    "@dxos/invariant": "0.5.1-next.39e0ee2",
-    "@dxos/keys": "0.5.1-next.39e0ee2",
-    "@dxos/timeframe": "0.5.1-next.39e0ee2"
+    "@dxos/invariant": "0.5.1-next.5a770e3",
+    "@dxos/timeframe": "0.5.1-next.5a770e3",
+    "@dxos/codec-protobuf": "0.5.1-next.5a770e3",
+    "@dxos/keys": "0.5.1-next.5a770e3"
   },
   "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/echo/query.proto

@@ -22,7 +22,7 @@ message QueryRequest {
  * 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;
 }
@@ -40,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;
@@ -276,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/tracing.proto

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

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

@@ -61,6 +61,181 @@ import * as dxos_value from "../value";
 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/client/logging.proto}
+ */
+export interface Metrics {
+    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
+    values?: Metrics.KeyPair[];
+}
+export namespace Metrics {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/logging.proto}
+     */
+    export interface KeyPair {
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        key?: string;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        value?: dxos_value.Value;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        stats?: dxos_value.Stats;
+    }
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface ControlMetricsRequest {
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    reset?: boolean;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    record?: boolean;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface ControlMetricsResponse {
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    recording?: boolean;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface QueryMetricsRequest {
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    interval?: number;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface QueryMetricsResponse {
+    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
+    metrics: Metrics;
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export enum LogLevel {
+    TRACE = 5,
+    DEBUG = 10,
+    INFO = 11,
+    WARN = 12,
+    ERROR = 13
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface QueryLogsRequest {
+    filters?: QueryLogsRequest.Filter[];
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    options?: QueryLogsRequest.MatchingOptions;
+}
+export namespace QueryLogsRequest {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/logging.proto}
+     */
+    export enum MatchingOptions {
+        INCLUSIVE = 1,
+        EXPLICIT = 2
+    }
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/logging.proto}
+     */
+    export interface Filter {
+        level: LogLevel;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        pattern?: string;
+    }
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface LogEntry {
+    level: LogLevel;
+    message: string;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    context?: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    meta?: LogEntry.Meta;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    error?: dxos_error.Error;
+    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
+}
+export namespace LogEntry {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/logging.proto}
+     */
+    export interface Meta {
+        file: string;
+        line: number;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        scope?: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        resourceId?: number;
+    }
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface LoggingService {
+    controlMetrics: (request: ControlMetricsRequest, options?: RequestOptions) => Promise<ControlMetricsResponse>;
+    queryMetrics: (request: QueryMetricsRequest, options?: RequestOptions) => Stream<QueryMetricsResponse>;
+    queryLogs: (request: QueryLogsRequest, options?: RequestOptions) => Stream<LogEntry>;
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
@@ -634,6 +809,15 @@ export namespace CreateEpochRequest {
         FRAGMENT_AUTOMERGE_ROOT = 3
     }
 }
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface UpdateMemberRoleRequest {
+    spaceKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    memberKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    newRole: dxos_halo_credentials.SpaceMember.Role;
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
@@ -642,6 +826,7 @@ export interface SpacesService {
     createSpace: (request: void, options?: RequestOptions) => Promise<Space>;
     updateSpace: (request: UpdateSpaceRequest, options?: RequestOptions) => Promise<void>;
     querySpaces: (request: void, options?: RequestOptions) => Stream<QuerySpacesResponse>;
+    updateMemberRole: (request: UpdateMemberRoleRequest, options?: RequestOptions) => Promise<void>;
     /**
      * Broadcast an ephemeral message to the space swarm.
      */
@@ -764,6 +949,13 @@ export interface Invitation {
      *   - proto3_optional = true
      */
     delegationCredentialId?: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
+    /**
+     * Role of the admitted member, defaults to ADMIN.
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    role?: dxos_halo_credentials.SpaceMember.Role;
 }
 export namespace Invitation {
     /**
@@ -950,178 +1142,3 @@ export interface NetworkService {
     updateConfig: (request: UpdateConfigRequest, options?: RequestOptions) => Promise<void>;
     queryStatus: (request: void, options?: RequestOptions) => Stream<NetworkStatus>;
 }
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface Metrics {
-    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
-    values?: Metrics.KeyPair[];
-}
-export namespace Metrics {
-    /**
-     * Defined in:
-     *   {@link file://./../../../dxos/client/logging.proto}
-     */
-    export interface KeyPair {
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        key?: string;
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        value?: dxos_value.Value;
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        stats?: dxos_value.Stats;
-    }
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface ControlMetricsRequest {
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    reset?: boolean;
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    record?: boolean;
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface ControlMetricsResponse {
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    recording?: boolean;
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface QueryMetricsRequest {
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    interval?: number;
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface QueryMetricsResponse {
-    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
-    metrics: Metrics;
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export enum LogLevel {
-    TRACE = 5,
-    DEBUG = 10,
-    INFO = 11,
-    WARN = 12,
-    ERROR = 13
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface QueryLogsRequest {
-    filters?: QueryLogsRequest.Filter[];
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    options?: QueryLogsRequest.MatchingOptions;
-}
-export namespace QueryLogsRequest {
-    /**
-     * Defined in:
-     *   {@link file://./../../../dxos/client/logging.proto}
-     */
-    export enum MatchingOptions {
-        INCLUSIVE = 1,
-        EXPLICIT = 2
-    }
-    /**
-     * Defined in:
-     *   {@link file://./../../../dxos/client/logging.proto}
-     */
-    export interface Filter {
-        level: LogLevel;
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        pattern?: string;
-    }
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface LogEntry {
-    level: LogLevel;
-    message: string;
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    context?: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    meta?: LogEntry.Meta;
-    /**
-     * Options:
-     *   - proto3_optional = true
-     */
-    error?: dxos_error.Error;
-    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
-}
-export namespace LogEntry {
-    /**
-     * Defined in:
-     *   {@link file://./../../../dxos/client/logging.proto}
-     */
-    export interface Meta {
-        file: string;
-        line: number;
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        scope?: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
-        /**
-         * Options:
-         *   - proto3_optional = true
-         */
-        resourceId?: number;
-    }
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface LoggingService {
-    controlMetrics: (request: ControlMetricsRequest, options?: RequestOptions) => Promise<ControlMetricsResponse>;
-    queryMetrics: (request: QueryMetricsRequest, options?: RequestOptions) => Stream<QueryMetricsResponse>;
-    queryLogs: (request: QueryLogsRequest, options?: RequestOptions) => Stream<LogEntry>;
-}

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

@@ -61,6 +61,37 @@ import * as dxos_value from "../value";
 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}
@@ -483,34 +514,3 @@ export interface SubscribeToSwarmInfoRequest {
 export interface SubscribeToSwarmInfoResponse {
     data?: dxos_devtools_swarm.SwarmInfo[];
 }
-/**
- * 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/echo/query.ts

@@ -111,7 +111,7 @@ export interface QueryResponse {
  *   {@link file://./../../../dxos/echo/query.proto}
  */
 export interface QueryService {
-    setIndexConfig: (request: dxos_echo_indexing.IndexConfig, options?: RequestOptions) => Promise<void>;
-    find: (request: QueryRequest, options?: RequestOptions) => Stream<QueryResponse>;
-    reIndex: (request: void, options?: RequestOptions) => Promise<void>;
+    setConfig: (request: dxos_echo_indexing.IndexConfig, options?: RequestOptions) => Promise<void>;
+    execQuery: (request: QueryRequest, options?: RequestOptions) => Stream<QueryResponse>;
+    reindex: (request: void, options?: RequestOptions) => Promise<void>;
 }

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

@@ -68,15 +68,6 @@ import * as google_protobuf from "../../google/protobuf";
 export interface SpaceGenesis {
     spaceKey: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>;
 }
-/**
- * Revocation of another credential.
- * Subject must be the credential id being revoked.
- *
- * Defined in:
- *   {@link file://./../../../dxos/halo/credentials.proto}
- */
-export interface Revocation {
-}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/halo/credentials.proto}
@@ -109,8 +100,10 @@ export namespace SpaceMember {
     export enum Role {
         INVALID = 0,
         ADMIN = 1,
-        MEMBER = 2,
-        READER = 3
+        EDITOR = 2,
+        READER = 3,
+        OWNER = 4,
+        REMOVED = 5
     }
 }
 /**
@@ -445,6 +438,7 @@ export interface Credential {
      *   - proto3_optional = true
      */
     proof?: Proof;
+    parentCredentialIds?: ReturnType<(typeof substitutions)["dxos.keys.PublicKey"]["decode"]>[];
 }
 /**
  * Defined in: