@dxos/protocols 0.1.23 → 0.1.24

package/dist/esm/src/testing.d.ts

@@ -0,0 +1,5 @@
+import { Timeframe } from '@dxos/timeframe';
+import type { FeedMessage } from './proto/gen/dxos/echo/feed';
+import { ItemID } from './types';
+export declare const createTestItemMutation: (objectId: ItemID, key: string, value: string, timeframe?: Timeframe) => FeedMessage;
+//# sourceMappingURL=testing.d.ts.map

package/dist/esm/src/testing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAOjC,eAAO,MAAM,sBAAsB,aACvB,MAAM,OACX,MAAM,SACJ,MAAM,4BAEZ,WAkBD,CAAC"}

package/dist/esm/src/testing.js

@@ -0,0 +1,29 @@
+//
+// Copyright 2020 DXOS.org
+//
+import { Timeframe } from '@dxos/timeframe';
+import { schema } from './proto';
+//
+// Testing.
+//
+// TODO(burdon): Move to testing package (with other fakers, etc.)
+export const createTestItemMutation = (objectId, key, value, timeframe = new Timeframe()) => ({
+    timeframe,
+    payload: {
+        data: {
+            object: {
+                objectId,
+                mutations: [
+                    {
+                        model: {
+                            '@type': 'google.protobuf.Any',
+                            typeUrl: 'todo',
+                            value: schema.getCodecForType('example.testing.data.TestItemMutation').encode({ key, value })
+                        }
+                    }
+                ]
+            }
+        }
+    }
+});
+//# sourceMappingURL=testing.js.map

package/dist/esm/src/testing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;AAEF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAIjC,EAAE;AACF,WAAW;AACX,EAAE;AAEF,kEAAkE;AAClE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,QAAgB,EAChB,GAAW,EACX,KAAa,EACb,SAAS,GAAG,IAAI,SAAS,EAAE,EACd,EAAE,CAAC,CAAC;IACjB,SAAS;IACT,OAAO,EAAE;QACP,IAAI,EAAE;YACJ,MAAM,EAAE;gBACN,QAAQ;gBACR,SAAS,EAAE;oBACT;wBACE,KAAK,EAAE;4BACL,OAAO,EAAE,qBAAqB;4BAC9B,OAAO,EAAE,MAAM;4BACf,KAAK,EAAE,MAAM,CAAC,eAAe,CAAC,uCAAuC,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;yBAC9F;qBACF;iBACF;aACF;SACF;KACF;CACF,CAAC,CAAC"}

package/dist/esm/src/types.d.ts

@@ -0,0 +1,34 @@
+import { TypedProtoMessage } from '@dxos/codec-protobuf';
+import { PublicKey } from '@dxos/keys';
+import { Timeframe } from '@dxos/timeframe';
+import { TYPES } from './proto';
+import { FeedMessage, CredentialsMessage } from './proto/gen/dxos/echo/feed';
+import { EchoObject } from './proto/gen/dxos/echo/object';
+export declare type TypedMessage = TypedProtoMessage<TYPES>;
+export declare type FeedMeta = {
+    feedKey: PublicKey;
+    seq: number;
+};
+export declare type FeedBlock<T> = {
+    feedKey: PublicKey;
+    seq: number;
+    data: T;
+};
+export declare type FeedMessageBlock = FeedBlock<FeedMessage>;
+export interface MutationMeta extends FeedMeta {
+    memberKey: PublicKey;
+}
+export interface MutationMetaWithTimeframe extends MutationMeta {
+    timeframe: Timeframe;
+}
+export interface IHaloStream {
+    meta: FeedMeta;
+    data: CredentialsMessage;
+}
+export interface IEchoStream {
+    meta: MutationMetaWithTimeframe;
+    data: EchoObject;
+}
+export declare type ItemID = string;
+export declare type ItemType = string;
+//# sourceMappingURL=types.d.ts.map

package/dist/esm/src/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAG1D,oBAAY,YAAY,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAGpD,oBAAY,QAAQ,GAAG;IACrB,OAAO,EAAE,SAAS,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,oBAAY,SAAS,CAAC,CAAC,IAAI;IACzB,OAAO,EAAE,SAAS,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,CAAC,CAAC;CACT,CAAC;AAEF,oBAAY,gBAAgB,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;AAEtD,MAAM,WAAW,YAAa,SAAQ,QAAQ;IAC5C,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,yBAA0B,SAAQ,YAAY;IAC7D,SAAS,EAAE,SAAS,CAAC;CACtB;AAGD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,kBAAkB,CAAC;CAC1B;AAGD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,yBAAyB,CAAC;IAChC,IAAI,EAAE,UAAU,CAAC;CAClB;AAGD,oBAAY,MAAM,GAAG,MAAM,CAAC;AAC5B,oBAAY,QAAQ,GAAG,MAAM,CAAC"}

package/dist/esm/src/types.js

@@ -0,0 +1,5 @@
+//
+// Copyright 2020 DXOS.org
+//
+export {};
+//# sourceMappingURL=types.js.map

package/dist/esm/src/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE"}

package/package.json

@@ -1,23 +1,42 @@
 {
   "name": "@dxos/protocols",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "Protobuf definitions for DXOS protocols.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "info@dxos.org",
-  "main": "dist/src/index.js",
-  "types": "dist/src/index.d.ts",
+  "exports": {
+    ".": {
+      "browser": "./dist/esm/src/index.js",
+      "import": "./dist/esm/src/index.js",
+      "require": "./dist/cjs/src/index.js",
+      "node": "./dist/cjs/src/index.js"
+    },
+    "./proto/*": {
+      "browser": "./dist/esm/src/proto/gen/*.js",
+      "import": "./dist/esm/src/proto/gen/*.js",
+      "require": "./dist/cjs/src/proto/gen/*.js",
+      "node": "./dist/cjs/src/proto/gen/*.js"
+    }
+  },
+  "types": "dist/esm/src/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "proto/*": [
+        "dist/esm/src/proto/gen/*"
+      ]
+    }
+  },
   "files": [
     "dist",
-    "proto",
     "src"
   ],
   "dependencies": {
-    "@dxos/codec-protobuf": "0.1.23",
-    "@dxos/hypercore": "0.1.23",
-    "@dxos/keys": "0.1.23",
-    "@dxos/timeframe": "0.1.23"
+    "@dxos/codec-protobuf": "0.1.24",
+    "@dxos/hypercore": "0.1.24",
+    "@dxos/keys": "0.1.24",
+    "@dxos/timeframe": "0.1.24"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
@@ -26,5 +45,8 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "scripts": {
+    "tsc-cjs": "tsc --module commonjs --target es2018 --outdir ./dist/cjs"
   }
 }

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

@@ -27,7 +27,7 @@ package dxos.client.services;
 //
 
 service SystemService {
-  rpc GetConfig(google.protobuf.Empty) returns (dxos.config.Config); // TODO(burdon): Stream?
+  rpc GetConfig(google.protobuf.Empty) returns (dxos.config.Config);
   rpc Reset(google.protobuf.Empty) returns (google.protobuf.Empty);
 }
 
@@ -110,7 +110,6 @@ service ContactsService {
 // TODO(burdon): Move to dxos.echo? Or rename dxos.echo => dxos.database?
 //
 
-// TODO(burdon): Preferences (in database).
 message Space {
   dxos.keys.PublicKey space_key = 1;
 }
@@ -120,6 +119,11 @@ message QueryMembersResponse {
   dxos.halo.credentials.IdentityProfile members = 1;
 }
 
+message WriteCredentialsRequest {
+  dxos.keys.PublicKey space_key = 1;
+  repeated dxos.halo.credentials.Credential credentials = 2;
+}
+
 message QueryCredentialsRequest {
   dxos.keys.PublicKey space_key = 1;
 }
@@ -130,7 +134,8 @@ service SpacesService {
 
   // TODO(dmaretskyi): I dont think we need a separate method here. We can include members in the Space object.
   rpc QueryMembers(QueryMembersRequest) returns (stream QueryMembersResponse);
-
+  
+  rpc WriteCredentials(WriteCredentialsRequest) returns (google.protobuf.Empty);
   rpc QueryCredentials(QueryCredentialsRequest) returns (stream dxos.halo.credentials.Credential);
 }
 

package/src/proto/dxos/client.proto

@@ -11,6 +11,7 @@ import "dxos/config.proto";
 import "dxos/echo/snapshot.proto";
 import "dxos/echo/timeframe.proto";
 import "dxos/halo/keys.proto";
+import "dxos/halo/credentials.proto";
 import "dxos/keys.proto";
 
 package dxos.client;
@@ -19,15 +20,24 @@ package dxos.client;
 // SYSTEM
 //
 
-message Status {
-  string message = 1;
+enum Status {
+  ACTIVE = 0;
+  INACTIVE = 1;
+}
+
+message StatusResponse {
+  optional Status status = 2;
+
+  /// Deprecated, use `status` instead.
+  optional string message = 1;
 }
 
 service SystemService {
   /// Called at the start of the session. Service should block until it is fully initialized.
   rpc InitSession (google.protobuf.Empty) returns (google.protobuf.Empty);
   rpc GetConfig(google.protobuf.Empty) returns (dxos.config.Config);
-  rpc GetStatus (google.protobuf.Empty) returns (Status);
+  // TODO(wittjosiah): Stream?
+  rpc GetStatus (google.protobuf.Empty) returns (StatusResponse);
   rpc Reset (google.protobuf.Empty) returns (google.protobuf.Empty);
 }
 
@@ -81,6 +91,8 @@ message Profile {
   optional string displayName = 2;
   // TODO(mykola): Factor out. It was added to make deviceKey available in the HaloProxy.
   optional dxos.keys.PublicKey device_key = 3;
+
+  optional dxos.keys.PublicKey halo_space = 4;
 }
 
 message SubscribeProfileResponse {
@@ -107,10 +119,17 @@ message Contacts {
   repeated Contact contacts = 1;
 }
 
+message SignPresentationRequest {
+  dxos.halo.credentials.Presentation presentation = 1;
+  optional bytes nonce = 2;
+}
+
 service ProfileService {
   rpc CreateProfile(CreateProfileRequest) returns (Profile);
   rpc RecoverProfile(RecoverProfileRequest) returns (Profile);
   rpc SubscribeProfile(google.protobuf.Empty) returns (stream SubscribeProfileResponse);
+
+  rpc SignPresentation(SignPresentationRequest) returns (dxos.halo.credentials.Presentation);
 }
 
 message AddKeyRecordRequest {

package/src/proto/dxos/config.proto

@@ -5,6 +5,7 @@
 syntax = "proto3";
 
 import "google/protobuf/any.proto";
+import "google/protobuf/struct.proto";
 
 package dxos.config;
 
@@ -43,11 +44,14 @@ message Module {
     optional string outdir = 2;
     optional string version = 3;
     optional string tag = 4;
+
+    optional google.protobuf.Struct env = 10;
   }
 
-  // TODO(burdon): Requires publicKey.
-  optional string name = 1;
-  optional string type = 2;
+  optional string name = 1;   // TODO(burdon): Replace with id (or key?)
+  optional string id = 8;     // TODO(burdon): Ensured FQ (e.g., 'dxos.app.xxx')
+  optional string type = 2;   // TODO(burdon): Define namespace (e.g., 'dxos:type/frame' vs. 'dxos.type.frame')
+
   optional string display_name = 3;
   optional string description = 4;
   repeated string tags = 5;
@@ -83,7 +87,12 @@ message Runtime {
       optional string path = 4;                   // TODO(burdon): Rename data_path.
     }
 
-    optional string debug = 1 [(env) = "DEBUG"];  // TODO(burdon): Change to LOG.
+    message Log {
+      optional string filter = 1 [(env) = "LOG_FILTER"];
+      optional string prefix = 2 [(env) = "LOG_PREFIX"];
+    }
+
+    optional Log log = 1;
     optional Storage storage = 2;
 
     // TODO(burdon): Structure snapshot/epoch related props.
@@ -95,15 +104,25 @@ message Runtime {
     /// Milliseconds
     optional int32 invitation_expiration = 5;
 
-    // TODO(burdon): Remove?
     optional string remote_source = 6;
   }
 
   message App {
+    message BuildInfo {
+      /// RFC-3339 datetime string.
+      optional string timestamp = 1;
+      optional string commit_hash = 2;
+      /// Version from package.json.
+      optional string version = 3;
+    }
+
     optional string org = 1;
     optional string theme = 2;
     optional string website = 3;
     optional string public_url = 4 [(env) = "PUBLIC_URL"];
+
+    optional BuildInfo build = 100;
+    optional google.protobuf.Struct env = 101;
   }
 
   // CLI configuration
@@ -303,6 +322,11 @@ message Runtime {
     optional Publisher publisher = 9;
   }
 
+  message Keys {
+    optional string name = 1;
+    optional string value = 2;
+  }
+
   optional Client client = 1;
   optional App app = 2;
   optional CLI cli = 3;
@@ -310,4 +334,5 @@ message Runtime {
   optional Services services = 5;
   optional System system = 6;
   optional Kube kube = 7;
+  repeated Keys keys = 8;
 }

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

@@ -4,14 +4,17 @@
 
 syntax = "proto3";
 
-import "dxos/echo/timeframe.proto";
 import "google/protobuf/empty.proto";
+import "google/protobuf/timestamp.proto";
 
+import "dxos/devtools/swarm.proto";
 import "dxos/echo/feed.proto";
 import "dxos/echo/snapshot.proto";
+import "dxos/echo/timeframe.proto";
 import "dxos/halo/keyring.proto";
 import "dxos/halo/signed.proto";
 import "dxos/keys.proto";
+import "dxos/mesh/signal.proto";
 import "dxos/rpc.proto";
 
 package dxos.devtools.host;
@@ -33,6 +36,7 @@ service DevtoolsHost {
 
   rpc ResetStorage(ResetStorageRequest) returns (google.protobuf.Empty);
 
+  // TODO(burdon): Single RPC with action.
   rpc EnableDebugLogging(EnableDebugLoggingRequest) returns (EnableDebugLoggingResponse);
   rpc DisableDebugLogging(EnableDebugLoggingRequest) returns (EnableDebugLoggingResponse);
 
@@ -41,7 +45,6 @@ service DevtoolsHost {
   //
 
   rpc SubscribeToKeyringKeys(SubscribeToKeyringKeysRequest) returns (stream SubscribeToKeyringKeysResponse);
-
   rpc SubscribeToCredentialMessages(SubscribeToCredentialMessagesRequest) returns (stream SubscribeToCredentialMessagesResponse);
 
   //
@@ -64,7 +67,7 @@ service DevtoolsHost {
   rpc GetNetworkPeers(GetNetworkPeersRequest) returns (GetNetworkPeersResponse);
   rpc SubscribeToNetworkTopics(google.protobuf.Empty) returns (stream SubscribeToNetworkTopicsResponse);
   rpc SubscribeToSignalStatus(google.protobuf.Empty) returns (stream SubscribeToSignalStatusResponse);
-  rpc SubscribeToSignalTrace(google.protobuf.Empty) returns (stream SubscribeToSignalTraceResponse);
+  rpc SubscribeToSignal(google.protobuf.Empty) returns (stream SignalResponse);
   rpc SubscribeToSwarmInfo(SubscribeToSwarmInfoRequest) returns (stream SubscribeToSwarmInfoResponse);
 }
 
@@ -81,7 +84,9 @@ message GetConfigResponse {
   string config = 1;
 }
 
-// EnableDebugLogging
+//
+// Logging
+//
 
 message EnableDebugLoggingRequest {
   optional string namespaces = 1;
@@ -91,8 +96,6 @@ message EnableDebugLoggingResponse {
   optional string enabled_namespaces = 1;
 }
 
-// DisableDebugLogging
-
 message DisableDebugLoggingRequest {
   optional string namespaces = 1;
 }
@@ -101,7 +104,9 @@ message DisableDebugLoggingResponse {
   optional string enabled_namespaces = 1;
 }
 
-// SubscribeToKeyringKeys
+//
+// Keys
+//
 
 message SubscribeToKeyringKeysRequest {}
 
@@ -109,7 +114,9 @@ message SubscribeToKeyringKeysResponse {
   repeated dxos.halo.keyring.KeyRecord keys = 1;
 }
 
-// SubscribeToCredential
+//
+// Credentials
+//
 
 message SubscribeToCredentialMessagesRequest {
   optional dxos.keys.PublicKey space_key = 1;
@@ -119,30 +126,15 @@ message SubscribeToCredentialMessagesResponse {
   repeated dxos.halo.signed.SignedMessage messages = 1;
 }
 
-// ResetStorage
+//
+// Storage
+//
 
 message ResetStorageRequest {}
 
-// GetNetworkPeers
-
-message GetNetworkPeersRequest {
-  bytes topic = 1;
-}
-
-message GetNetworkPeersResponse {
-  message PeerInfo {
-   dxos.keys.PublicKey id = 1;
-
-    // PeerState enum.
-    string state = 2;
-
-    repeated bytes connections = 3;
-  }
-
-  repeated PeerInfo peers = 1;
-}
-
-// SubscribeToSpaces
+//
+// Spaces
+//
 
 message SubscribeToSpacesRequest {
   repeated dxos.keys.PublicKey space_keys = 1;
@@ -153,15 +145,18 @@ message SubscribeToSpacesResponse {
     dxos.keys.PublicKey key = 1;
     bool is_open = 2;
     optional dxos.echo.timeframe.TimeframeVector timeframe = 3;
-    dxos.keys.PublicKey genesisFeed = 4;
-    dxos.keys.PublicKey controlFeed = 5;
-    dxos.keys.PublicKey dataFeed = 6;
+    dxos.keys.PublicKey genesis_feed = 4;
+    dxos.keys.PublicKey control_feed = 5;
+    dxos.keys.PublicKey data_feed = 6;
+
   }
 
   repeated SpaceInfo spaces = 1;
 }
 
-// SubscribeToItems
+//
+// Items
+//
 
 message SubscribeToItemsRequest {}
 
@@ -170,23 +165,24 @@ message SubscribeToItemsResponse {
   string data = 1;
 }
 
-// SubscribeToFeeds
+//
+// Feeds
+//
 
+// TODO(burdon): How to filter by space?
 message SubscribeToFeedsRequest {
   repeated dxos.keys.PublicKey feed_keys = 1;
 }
 
 message SubscribeToFeedsResponse {
   message Feed {
-   dxos.keys.PublicKey feed_key = 1;
+    dxos.keys.PublicKey feed_key = 1;
     int32 length = 2;
   }
 
   repeated Feed feeds = 1;
 }
 
-// SubscribeToFeedMessages
-
 message SubscribeToFeedBlocksRequest {
   optional dxos.keys.PublicKey space_key = 1;
   optional dxos.keys.PublicKey feed_key = 2;
@@ -203,7 +199,9 @@ message SubscribeToFeedBlocksResponse {
   repeated Block blocks = 1;
 }
 
-// GetSpaceSnapshot
+//
+// Snapshots
+//
 
 message GetSpaceSnapshotRequest {
   dxos.keys.PublicKey space_key = 1;
@@ -213,8 +211,6 @@ message GetSpaceSnapshotResponse {
   optional dxos.echo.snapshot.SpaceSnapshot snapshot = 1;
 }
 
-// SaveSpaceSnapshot
-
 message SaveSpaceSnapshotRequest {
   dxos.keys.PublicKey space_key = 1;
 }
@@ -223,11 +219,28 @@ message SaveSpaceSnapshotResponse {
   optional dxos.echo.snapshot.SpaceSnapshot snapshot = 1;
 }
 
-// ClearSnapshots
-
 message ClearSnapshotsRequest {}
 
-// SubscribeToNetworkTopics
+//
+// Network
+//
+
+message GetNetworkPeersRequest {
+  bytes topic = 1;
+}
+
+message GetNetworkPeersResponse {
+  message PeerInfo {
+    dxos.keys.PublicKey id = 1;
+
+    // PeerState enum.
+    string state = 2;
+
+    repeated bytes connections = 3;
+  }
+
+  repeated PeerInfo peers = 1;
+}
 
 message SubscribeToNetworkTopicsResponse {
   message Topic {
@@ -238,7 +251,9 @@ message SubscribeToNetworkTopicsResponse {
   repeated Topic topics = 1;
 }
 
-// SubscribeToSignalStatus
+//
+// Signaling
+//
 
 message SubscribeToSignalStatusResponse {
   message SignalServer {
@@ -253,27 +268,29 @@ message SubscribeToSignalStatusResponse {
     // TODO(dmaretskyi): Represent as absolute timestamp.
     int32 reconnect_in = 4;
 
-    // TODO(dmaretskyi): Change to timestamp.
-    int32 connection_started = 5;
-    int32 last_state_change = 6;
+    google.protobuf.Timestamp connection_started = 5;
+    google.protobuf.Timestamp last_state_change = 6;
   }
 
   repeated SignalServer servers = 1;
 }
 
-// SubscribeToSignalTrace
-
-message SubscribeToSignalTraceResponse {
-  // JSON-encoded events.
-  repeated string events = 1;
+message SignalResponse {
+  oneof data {
+    dxos.mesh.signal.SwarmEvent swarm_event = 1;
+    dxos.mesh.signal.Message message = 2;
+  }
+  google.protobuf.Timestamp received_at = 3;
 }
 
-// SubscribeToSwarmInfo
+//
+// Swarm
+//
 
 message SubscribeToSwarmInfoRequest {}
 
 message SubscribeToSwarmInfoResponse {
-  repeated SwarmInfo data = 1;
+  repeated dxos.devtools.swarm.SwarmInfo data = 1;
 }
 
 //
@@ -285,8 +302,6 @@ service TracingService {
   rpc SubscribeToRpcTrace (google.protobuf.Empty) returns (stream dxos.rpc.RpcMessage);
 }
 
-// SetTracingOptions
-
 message SetTracingOptionsRequest {
   bool enable = 1;
 }

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

@@ -27,6 +27,6 @@ message ConnectionInfo {
 
 message ConnectionEvent {
   string type = 1;
-  optional string newState = 2;
+  optional string new_state = 2;
   optional string error = 3;
 }