@dxos/protocols 0.1.56-next.a63ce79 → 0.1.56

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;AAuDhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAie7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,4svFAA4svF,CAAC,CAAC,CAAC;AACrwvF,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;AAye7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,w7xFAAw7xF,CAAC,CAAC,CAAC;AACj/xF,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-next.a63ce79",
+  "version": "0.1.56",
   "description": "Protobuf definitions for DXOS protocols.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,10 +33,9 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/codec-protobuf": "0.1.56-next.a63ce79",
-    "@dxos/hypercore": "0.1.56-next.a63ce79",
-    "@dxos/keys": "0.1.56-next.a63ce79",
-    "@dxos/timeframe": "0.1.56-next.a63ce79"
+    "@dxos/codec-protobuf": "0.1.56",
+    "@dxos/keys": "0.1.56",
+    "@dxos/timeframe": "0.1.56"
   },
   "devDependencies": {
     "glob": "~7.1.6"

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

@@ -87,6 +87,7 @@ message LogEntry {
     string file = 1;
     int32 line = 2;
     optional google.protobuf.Struct scope = 3;
+    optional int32 resource_id = 4;
   }
 
   LogLevel level = 1;

package/src/proto/dxos/config.proto

@@ -110,6 +110,7 @@ message Runtime {
     optional Storage storage = 2;
 
     // TODO(burdon): Structure snapshot/epoch related props.
+
     optional bool enable_snapshots = 3;
 
     /// Milliseconds
@@ -119,6 +120,7 @@ message Runtime {
     optional int32 invitation_expiration = 5;
 
     /// Location of the remote client host.
+    // TODO(burdon): Rename vault_endpoint (generalize http/ws; drop vault.html).
     optional string remote_source = 6;
   }
 

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

@@ -4,6 +4,8 @@
 
 syntax = "proto3";
 
+import "google/protobuf/timestamp.proto";
+
 import "dxos/keys.proto";
 
 package dxos.devtools.swarm;
@@ -20,9 +22,11 @@ message ConnectionInfo {
   message StreamStats {
     uint32 id = 1;
     string tag = 2;
+    optional string contentType = 5;
     uint32 bytesSent = 3;
     uint32 bytesReceived = 4;
-    optional string contentType = 5;
+    optional uint32 bytesSentRate = 6; // bytes per second.
+    optional uint32 bytesReceivedRate = 7;
   }
 
   string state = 1;
@@ -32,6 +36,7 @@ message ConnectionInfo {
   repeated string protocol_extensions = 5;
   repeated ConnectionEvent events = 6;
   repeated StreamStats streams = 7;
+  optional string close_reason = 8;
 }
 
 message ConnectionEvent {

package/src/proto/dxos/echo/service.proto

@@ -23,6 +23,12 @@ message EchoEvent {
   optional dxos.keys.PublicKey feed_key = 2;
   optional int32 seq = 3;
 
+  enum DatabaseAction {
+    RESET = 0;
+  }
+
+  optional DatabaseAction action = 4;
+
   dxos.echo.object.EchoObjectBatch batch = 10;
 }
 

package/src/proto/dxos/tracing.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 import "google/protobuf/struct.proto";
 import "google/protobuf/empty.proto";
 import "dxos/error.proto";
+import "dxos/client/logging.proto";
 
 package dxos.tracing;
 
@@ -20,6 +21,7 @@ message Resource {
 
   google.protobuf.Struct info = 4;
   repeated ResourceLink links = 5;
+  repeated Metric metrics = 6;
 }
 
 message ResourceLink {
@@ -54,11 +56,51 @@ message StreamTraceEvent {
     Span span = 1;
   }
 
+  message LogAdded {
+    dxos.client.services.LogEntry log = 1;
+  }
+
   repeated ResourceAdded resource_added = 1;
   repeated ResourceRemoved resource_removed = 2;
   repeated SpanAdded span_added = 3;
+  repeated LogAdded log_added = 4;
 }
 
+message Metric {
+  message Counter {
+    double value = 1;
+    optional string units = 2;
+  }
+
+  message TimeSeries {
+    message Point {
+      double value = 1;
+    }
+
+    message Track {
+      string name = 1;
+      optional string units = 2;
+      repeated Point points = 10;
+      double total = 11;
+    }
+
+    repeated Track tracks = 1;
+  }
+
+  message Custom {
+    google.protobuf.Struct payload = 1;
+  }
+
+  string name = 1;
+
+  oneof Value {
+    Counter counter = 100;
+    TimeSeries time_series = 101;
+    Custom custom = 199;
+  }
+}
+
+
 service TracingService {
   rpc StreamTrace(google.protobuf.Empty) returns (stream StreamTraceEvent);
 }

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

@@ -53,176 +53,6 @@ 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}
@@ -911,3 +741,178 @@ 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 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) => Promise<ControlMetricsResponse>;
+    queryMetrics: (request: QueryMetricsRequest) => Stream<QueryMetricsResponse>;
+    queryLogs: (request: QueryLogsRequest) => Stream<LogEntry>;
+}

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

@@ -280,8 +280,6 @@ export namespace Runtime {
          */
         invitationExpiration?: number;
         /**
-         * Location of the remote client host.
-         *
          * Options:
          *   - proto3_optional = true
          */

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

@@ -84,6 +84,11 @@ export interface ConnectionInfo {
     protocolExtensions?: string[];
     events?: ConnectionEvent[];
     streams?: ConnectionInfo.StreamStats[];
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    closeReason?: string;
 }
 export namespace ConnectionInfo {
     /**
@@ -93,13 +98,23 @@ export namespace ConnectionInfo {
     export interface StreamStats {
         id: number;
         tag: string;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        contentType?: string;
         bytesSent: number;
         bytesReceived: number;
         /**
          * Options:
          *   - proto3_optional = true
          */
-        contentType?: string;
+        bytesSentRate?: number;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        bytesReceivedRate?: number;
     }
 }
 /**

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

@@ -84,8 +84,22 @@ export interface EchoEvent {
      *   - proto3_optional = true
      */
     seq?: number;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    action?: EchoEvent.DatabaseAction;
     batch: dxos_echo_object.EchoObjectBatch;
 }
+export namespace EchoEvent {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/echo/service.proto}
+     */
+    export enum DatabaseAction {
+        RESET = 0
+    }
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/echo/service.proto}

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

@@ -73,6 +73,7 @@ export interface Resource {
     instanceId: number;
     info: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
     links?: ResourceLink[];
+    metrics?: Metric[];
 }
 /**
  * Defined in:
@@ -120,6 +121,7 @@ export interface StreamTraceEvent {
     resourceAdded?: StreamTraceEvent.ResourceAdded[];
     resourceRemoved?: StreamTraceEvent.ResourceRemoved[];
     spanAdded?: StreamTraceEvent.SpanAdded[];
+    logAdded?: StreamTraceEvent.LogAdded[];
 }
 export namespace StreamTraceEvent {
     /**
@@ -143,6 +145,74 @@ export namespace StreamTraceEvent {
     export interface SpanAdded {
         span: Span;
     }
+    /**
+     * Defined in:
+     *   {@link file://./../../dxos/tracing.proto}
+     */
+    export interface LogAdded {
+        log: dxos_client_services.LogEntry;
+    }
+}
+/**
+ * Defined in:
+ *   {@link file://./../../dxos/tracing.proto}
+ */
+export interface Metric {
+    name: string;
+    counter?: Metric.Counter;
+    timeSeries?: Metric.TimeSeries;
+    custom?: Metric.Custom;
+}
+export namespace Metric {
+    /**
+     * Defined in:
+     *   {@link file://./../../dxos/tracing.proto}
+     */
+    export interface Counter {
+        value: number;
+        /**
+         * Options:
+         *   - proto3_optional = true
+         */
+        units?: string;
+    }
+    /**
+     * Defined in:
+     *   {@link file://./../../dxos/tracing.proto}
+     */
+    export interface TimeSeries {
+        tracks?: Metric.TimeSeries.Track[];
+    }
+    export namespace TimeSeries {
+        /**
+         * Defined in:
+         *   {@link file://./../../dxos/tracing.proto}
+         */
+        export interface Point {
+            value: number;
+        }
+        /**
+         * Defined in:
+         *   {@link file://./../../dxos/tracing.proto}
+         */
+        export interface Track {
+            name: string;
+            /**
+             * Options:
+             *   - proto3_optional = true
+             */
+            units?: string;
+            points?: Metric.TimeSeries.Point[];
+            total: number;
+        }
+    }
+    /**
+     * Defined in:
+     *   {@link file://./../../dxos/tracing.proto}
+     */
+    export interface Custom {
+        payload: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
+    }
 }
 /**
  * Defined in: