@dxos/protocols 0.1.56-main.d0c207f → 0.1.56-main.d9d1c3e

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;AAsDhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAod7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,w1qFAAw1qF,CAAC,CAAC,CAAC;AACj5qF,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;AAuDhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAie7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,mrvFAAmrvF,CAAC,CAAC,CAAC;AAC5uvF,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.1.56-main.d0c207f",
+  "version": "0.1.56-main.d9d1c3e",
   "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.1.56-main.d0c207f",
-    "@dxos/hypercore": "0.1.56-main.d0c207f",
-    "@dxos/keys": "0.1.56-main.d0c207f",
-    "@dxos/timeframe": "0.1.56-main.d0c207f"
+    "@dxos/codec-protobuf": "0.1.56-main.d9d1c3e",
+    "@dxos/hypercore": "0.1.56-main.d9d1c3e",
+    "@dxos/keys": "0.1.56-main.d9d1c3e",
+    "@dxos/timeframe": "0.1.56-main.d9d1c3e"
   },
   "devDependencies": {
     "glob": "~7.1.6"

package/src/proto/dxos/client/logging.proto

@@ -45,10 +45,16 @@ message ControlMetricsResponse {
   optional bool recording = 1;
 }
 
+// TODO(burdon): Rename Trace?
 message QueryMetricsRequest {
   optional int32 interval = 1;
 }
 
+message QueryMetricsResponse {
+  google.protobuf.Timestamp timestamp = 1;
+  Metrics metrics = 2;
+}
+
 // NOTE: Keep aligned with LogLevel in @dxos/log.
 enum LogLevel {
   TRACE = 5;
@@ -92,7 +98,8 @@ message LogEntry {
 }
 
 service LoggingService {
+  // TODO(burdon): Deprecated: move to system service/diagnostics.
   rpc ControlMetrics(ControlMetricsRequest) returns (ControlMetricsResponse);
-  rpc QueryMetrics(QueryMetricsRequest) returns (stream Metrics);
+  rpc QueryMetrics(QueryMetricsRequest) returns (stream QueryMetricsResponse);
   rpc QueryLogs(QueryLogsRequest) returns (stream LogEntry);
 }

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

@@ -17,6 +17,7 @@ import "dxos/halo/credentials.proto";
 import "dxos/keys.proto";
 import "dxos/mesh/signal.proto";
 import "dxos/mesh/teleport/gossip.proto";
+import "dxos/mesh/presence.proto";
 import "dxos/value.proto";
 
 // TODO(burdon): Reorganize packages (e.g., client.services, echo.database).
@@ -47,6 +48,21 @@ message QueryStatusResponse {
   SystemStatus status = 1;
 }
 
+message GetDiagnosticsRequest {
+  enum KEY_OPTION {
+    NONE = 0;
+    TRUNCATE = 1;
+    HUMANIZE = 2;
+  }
+
+  optional KEY_OPTION keys = 1;
+}
+
+message GetDiagnosticsResponse {
+  google.protobuf.Timestamp timestamp = 1;
+  google.protobuf.Struct diagnostics = 2;
+}
+
 //
 // System
 //
@@ -55,6 +71,9 @@ service SystemService {
   /// Get the static config of the client.
   rpc GetConfig(google.protobuf.Empty) returns (dxos.config.Config);
 
+  /// Get the diagnostics snapshot.
+  rpc GetDiagnostics(GetDiagnosticsRequest) returns (GetDiagnosticsResponse);
+
   /// Update the status of the client. Used to re-activate an inactive client.
   rpc UpdateStatus(UpdateStatusRequest) returns (google.protobuf.Empty);
 
@@ -147,6 +166,7 @@ message SpaceMember {
 
   Identity identity = 1;
   PresenceState presence = 2;
+  repeated PeerState peerStates = 3;
 }
 
 /// Runtime state of the space object.

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

@@ -46,6 +46,8 @@ service DevtoolsHost {
   rpc EnableDebugLogging(EnableDebugLoggingRequest) returns (EnableDebugLoggingResponse);
   rpc DisableDebugLogging(EnableDebugLoggingRequest) returns (EnableDebugLoggingResponse);
 
+  // TODO(burdon): Rename SubscribeToX as QueryX.
+
   //
   // HALO
   //
@@ -183,7 +185,6 @@ message SubscribeToSpacesResponse {
     dxos.keys.PublicKey genesis_feed = 4;
     dxos.keys.PublicKey control_feed = 5;
     dxos.keys.PublicKey data_feed = 6;
-
   }
 
   repeated SpaceInfo spaces = 1;

package/src/proto/dxos/iframe.proto

@@ -29,8 +29,12 @@ enum ShellDisplay {
 }
 
 message AppContextRequest {
-  ShellDisplay display = 1;
+  /// The display mode that shell should use
+  optional ShellDisplay display = 1;
+  /// The key of the joined space
   optional dxos.keys.PublicKey space_key = 2;
+  /// The invitation code which has become invalidated
+  optional string invalidated_invitation_code = 3;
 }
 
 /// App RPCs for the shell.

package/src/proto/dxos/mesh/presence.proto

@@ -16,4 +16,7 @@ message PeerState {
 
   // TODO(mykola): Remove once IdentityKey can be obtained from DeviceKey.
   dxos.keys.PublicKey identity_key = 2;
+
+  /// Omitted when sent over the network.
+  optional dxos.keys.PublicKey peer_id = 3;
 }

package/src/proto/dxos/tracing.proto

@@ -0,0 +1,64 @@
+syntax = "proto3";
+
+import "google/protobuf/struct.proto";
+import "google/protobuf/empty.proto";
+import "dxos/error.proto";
+
+package dxos.tracing;
+
+enum TraceLevel {
+  DISABLED = 0;
+  PRODUCTION = 10;
+  DEVELOPMENT = 20;
+  DEBUG = 30;
+}
+
+message Resource {
+  int32 id = 1;
+  string class_name = 2;
+  int32 instance_id = 3;
+
+  google.protobuf.Struct info = 4;
+  repeated ResourceLink links = 5;
+}
+
+message ResourceLink {
+  int32 from = 1;
+  int32 to = 2;
+  google.protobuf.Struct attributes = 4;
+}
+
+message Span {
+  int32 id = 1;
+  optional int32 parent_id = 2;
+  optional int32 resource_id = 3;
+  string method_name = 4;
+
+  // TODO(dmaretskyi): Figure out proper sub-millisecond timestamp type.
+  string start_ts = 5;
+  optional string end_ts = 6;
+
+  optional dxos.error.Error error = 11;
+}
+
+message StreamTraceEvent {
+  message ResourceAdded {
+    Resource resource = 1;
+  }
+
+  message ResourceRemoved {
+    int32 id = 1;
+  }
+
+  message SpanAdded {
+    Span span = 1;
+  }
+
+  repeated ResourceAdded resource_added = 1;
+  repeated ResourceRemoved resource_removed = 2;
+  repeated SpanAdded span_added = 3;
+}
+
+service TracingService {
+  rpc StreamTrace(google.protobuf.Empty) returns (stream StreamTraceEvent);
+}

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

@@ -47,6 +47,7 @@ import * as dxos_rpc from "../rpc";
 import * as dxos_service_publisher from "../service/publisher";
 import * as dxos_service_supervisor from "../service/supervisor";
 import * as dxos_service_tunnel from "../service/tunnel";
+import * as dxos_tracing from "../tracing";
 import * as dxos_type from "../type";
 import * as dxos_value from "../value";
 import * as example_testing_data from "../../example/testing/data";

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

@@ -47,6 +47,7 @@ import * as dxos_rpc from "./rpc";
 import * as dxos_service_publisher from "./service/publisher";
 import * as dxos_service_supervisor from "./service/supervisor";
 import * as dxos_service_tunnel from "./service/tunnel";
+import * as dxos_tracing from "./tracing";
 import * as dxos_type from "./type";
 import * as dxos_value from "./value";
 import * as example_testing_data from "../example/testing/data";

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

@@ -47,11 +47,182 @@ import * as dxos_rpc from "../rpc";
 import * as dxos_service_publisher from "../service/publisher";
 import * as dxos_service_supervisor from "../service/supervisor";
 import * as dxos_service_tunnel from "../service/tunnel";
+import * as dxos_tracing from "../tracing";
 import * as dxos_type from "../type";
 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"]>;
+    }
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/logging.proto}
+ */
+export interface LoggingService {
+    controlMetrics: (request: ControlMetricsRequest) => Promise<ControlMetricsResponse>;
+    queryMetrics: (request: QueryMetricsRequest) => Stream<QueryMetricsResponse>;
+    queryLogs: (request: QueryLogsRequest) => Stream<LogEntry>;
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
@@ -85,6 +256,36 @@ export interface QueryStatusRequest {
 export interface QueryStatusResponse {
     status: SystemStatus;
 }
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface GetDiagnosticsRequest {
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    keys?: GetDiagnosticsRequest.KEY_OPTION;
+}
+export namespace GetDiagnosticsRequest {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/services.proto}
+     */
+    export enum KEY_OPTION {
+        NONE = 0,
+        TRUNCATE = 1,
+        HUMANIZE = 2
+    }
+}
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface GetDiagnosticsResponse {
+    timestamp: ReturnType<(typeof substitutions)["google.protobuf.Timestamp"]["decode"]>;
+    diagnostics: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
@@ -94,6 +295,10 @@ export interface SystemService {
      * Get the static config of the client.
      */
     getConfig: (request: void) => Promise<dxos_config.Config>;
+    /**
+     * Get the diagnostics snapshot.
+     */
+    getDiagnostics: (request: GetDiagnosticsRequest) => Promise<GetDiagnosticsResponse>;
     /**
      * Update the status of the client. Used to re-activate an inactive client.
      */
@@ -222,6 +427,7 @@ export interface ContactsService {
 export interface SpaceMember {
     identity: Identity;
     presence: SpaceMember.PresenceState;
+    peerStates?: dxos_mesh_presence.PeerState[];
 }
 export namespace SpaceMember {
     /**
@@ -704,165 +910,3 @@ export interface NetworkService {
     updateConfig: (request: UpdateConfigRequest) => Promise<void>;
     queryStatus: (request: void) => 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 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"]>;
-    }
-}
-/**
- * Defined in:
- *   {@link file://./../../../dxos/client/logging.proto}
- */
-export interface LoggingService {
-    controlMetrics: (request: ControlMetricsRequest) => Promise<ControlMetricsResponse>;
-    queryMetrics: (request: QueryMetricsRequest) => Stream<Metrics>;
-    queryLogs: (request: QueryLogsRequest) => Stream<LogEntry>;
-}

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

@@ -47,6 +47,7 @@ import * as dxos_rpc from "./rpc";
 import * as dxos_service_publisher from "./service/publisher";
 import * as dxos_service_supervisor from "./service/supervisor";
 import * as dxos_service_tunnel from "./service/tunnel";
+import * as dxos_tracing from "./tracing";
 import * as dxos_type from "./type";
 import * as dxos_value from "./value";
 import * as example_testing_data from "../example/testing/data";

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

@@ -47,6 +47,7 @@ import * as dxos_rpc from "../rpc";
 import * as dxos_service_publisher from "../service/publisher";
 import * as dxos_service_supervisor from "../service/supervisor";
 import * as dxos_service_tunnel from "../service/tunnel";
+import * as dxos_tracing from "../tracing";
 import * as dxos_type from "../type";
 import * as dxos_value from "../value";
 import * as example_testing_data from "../../example/testing/data";

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

@@ -47,6 +47,7 @@ import * as dxos_rpc from "../rpc";
 import * as dxos_service_publisher from "../service/publisher";
 import * as dxos_service_supervisor from "../service/supervisor";
 import * as dxos_service_tunnel from "../service/tunnel";
+import * as dxos_tracing from "../tracing";
 import * as dxos_type from "../type";
 import * as dxos_value from "../value";
 import * as example_testing_data from "../../example/testing/data";

package/src/proto/gen/dxos/echo/blob.ts

@@ -47,6 +47,7 @@ import * as dxos_rpc from "../rpc";
 import * as dxos_service_publisher from "../service/publisher";
 import * as dxos_service_supervisor from "../service/supervisor";
 import * as dxos_service_tunnel from "../service/tunnel";
+import * as dxos_tracing from "../tracing";
 import * as dxos_type from "../type";
 import * as dxos_value from "../value";
 import * as example_testing_data from "../../example/testing/data";

package/src/proto/gen/dxos/echo/feed.ts

@@ -47,6 +47,7 @@ import * as dxos_rpc from "../rpc";
 import * as dxos_service_publisher from "../service/publisher";
 import * as dxos_service_supervisor from "../service/supervisor";
 import * as dxos_service_tunnel from "../service/tunnel";
+import * as dxos_tracing from "../tracing";
 import * as dxos_type from "../type";
 import * as dxos_value from "../value";
 import * as example_testing_data from "../../example/testing/data";

package/src/proto/gen/dxos/echo/metadata.ts

@@ -47,6 +47,7 @@ import * as dxos_rpc from "../rpc";
 import * as dxos_service_publisher from "../service/publisher";
 import * as dxos_service_supervisor from "../service/supervisor";
 import * as dxos_service_tunnel from "../service/tunnel";
+import * as dxos_tracing from "../tracing";
 import * as dxos_type from "../type";
 import * as dxos_value from "../value";
 import * as example_testing_data from "../../example/testing/data";