@dxos/protocols 0.3.11-main.0b0bfb1 → 0.3.11-main.0e02eb0

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;AA6DhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAihB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,s4jGAAs4jG,CAAC,CAAC,CAAC;AAC/7jG,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;AA6DhE,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAohB7C,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,oimGAAoimG,CAAC,CAAC,CAAC;AAC7lmG,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.3.11-main.0b0bfb1",
+  "version": "0.3.11-main.0e02eb0",
   "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.3.11-main.0b0bfb1",
-    "@dxos/keys": "0.3.11-main.0b0bfb1",
-    "@dxos/invariant": "0.3.11-main.0b0bfb1",
-    "@dxos/timeframe": "0.3.11-main.0b0bfb1"
+    "@dxos/keys": "0.3.11-main.0e02eb0",
+    "@dxos/codec-protobuf": "0.3.11-main.0e02eb0",
+    "@dxos/timeframe": "0.3.11-main.0e02eb0",
+    "@dxos/invariant": "0.3.11-main.0e02eb0"
   },
   "devDependencies": {
     "glob": "~7.1.6"

package/src/errors/base-errors.ts

@@ -7,7 +7,11 @@
  * Errors can optionally include a JSON context object.
  */
 export class BaseError extends Error {
-  constructor(readonly code: string, message?: string, readonly context?: Record<string, any>) {
+  constructor(
+    readonly code: string,
+    message?: string,
+    readonly context?: Record<string, any>,
+  ) {
     super(message ?? code);
     this.name = code;
     // NOTE: Restores prototype chain (https://stackoverflow.com/a/48342359).

package/src/errors/errors.ts

@@ -100,6 +100,14 @@ export class InvalidInvitationError extends DatabaseError {
 
 registerErrorMessageContext('INVALID_INVITATION', InvalidInvitationError);
 
+export class AlreadyJoinedError extends DatabaseError {
+  constructor(message?: string, context?: Record<string, any>) {
+    super('ALREADY_JOINED', message, context);
+  }
+}
+
+registerErrorMessageContext('ALREADY_JOINED', AlreadyJoinedError);
+
 export class ConnectionResetError extends BaseError {
   constructor(message?: string, context?: any) {
     super('CONNECTION_RESET', message, context);

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

@@ -19,6 +19,7 @@ import "dxos/mesh/signal.proto";
 import "dxos/mesh/teleport/gossip.proto";
 import "dxos/mesh/presence.proto";
 import "dxos/value.proto";
+import "dxos/devtools/swarm.proto";
 
 // TODO(burdon): Reorganize packages (e.g., client.services, echo.database).
 
@@ -63,6 +64,28 @@ message GetDiagnosticsResponse {
   google.protobuf.Struct diagnostics = 2;
 }
 
+message Platform {
+  enum PLATFORM_TYPE {
+    BROWSER = 0;
+    SHARED_WORKER = 1;
+    NODE = 2;
+  }
+
+  PLATFORM_TYPE type = 1;
+  /// The User-Agent string from a browser
+  optional string user_agent = 2;
+  /// e.g process.platform from node, e.g. 'darwin', 'linux', 'win32'
+  optional string platform = 3;
+  /// the Node.JS arch string, e.g. 'arm64', 'x64'
+  optional string arch = 4;
+  /// the node.js version string
+  optional string runtime = 5;
+  // TODO(nf): uint64? :)
+  /// the number of seconds the client has been up
+  optional uint32 uptime = 6;
+  /// e.g. NodeJS.MemoryUsage, subject to change
+  optional google.protobuf.Struct memory = 7;
+}
 //
 // System
 //
@@ -82,6 +105,9 @@ service SystemService {
 
   /// Reset the client.
   rpc Reset(google.protobuf.Empty) returns (google.protobuf.Empty);
+
+  /// Get platform Information
+  rpc GetPlatform(google.protobuf.Empty) returns (Platform);
 }
 
 //
@@ -107,9 +133,14 @@ message SignPresentationRequest {
   optional bytes nonce = 2;
 }
 
+message CreateIdentityRequest {
+  optional halo.credentials.ProfileDocument profile = 1;
+  optional bool use_automerge = 2;
+}
+
 // TODO(wittjosiah): Align pluralization with other services.
 service IdentityService {
-  rpc CreateIdentity(halo.credentials.ProfileDocument) returns (Identity);
+  rpc CreateIdentity(CreateIdentityRequest) returns (Identity);
   rpc RecoverIdentity(RecoverIdentityRequest) returns (Identity);
   rpc QueryIdentity(google.protobuf.Empty) returns (stream QueryIdentityResponse);
   rpc UpdateProfile(halo.credentials.ProfileDocument) returns (Identity);
@@ -471,6 +502,7 @@ message NetworkStatus {
 
   ConnectionState swarm = 1;
   repeated Signal signaling = 2;
+  repeated dxos.devtools.swarm.SwarmInfo connection_info = 3;
 }
 
 message UpdateConfigRequest {

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

@@ -297,6 +297,66 @@ 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}
+ */
+export interface Platform {
+    type: Platform.PLATFORM_TYPE;
+    /**
+     * The User-Agent string from a browser
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    userAgent?: string;
+    /**
+     * e.g process.platform from node, e.g. 'darwin', 'linux', 'win32'
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    platform?: string;
+    /**
+     * the Node.JS arch string, e.g. 'arm64', 'x64'
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    arch?: string;
+    /**
+     * the node.js version string
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    runtime?: string;
+    /**
+     * the number of seconds the client has been up
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    uptime?: number;
+    /**
+     * e.g. NodeJS.MemoryUsage, subject to change
+     *
+     * Options:
+     *   - proto3_optional = true
+     */
+    memory?: ReturnType<(typeof substitutions)["google.protobuf.Struct"]["decode"]>;
+}
+export namespace Platform {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/services.proto}
+     */
+    export enum PLATFORM_TYPE {
+        BROWSER = 0,
+        SHARED_WORKER = 1,
+        NODE = 2
+    }
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
@@ -322,6 +382,10 @@ export interface SystemService {
      * Reset the client.
      */
     reset: (request: void, options?: RequestOptions) => Promise<void>;
+    /**
+     * Get platform Information
+     */
+    getPlatform: (request: void, options?: RequestOptions) => Promise<Platform>;
 }
 /**
  * Defined in:
@@ -370,12 +434,28 @@ export interface SignPresentationRequest {
      */
     nonce?: Uint8Array;
 }
+/**
+ * Defined in:
+ *   {@link file://./../../../dxos/client/services.proto}
+ */
+export interface CreateIdentityRequest {
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    profile?: dxos_halo_credentials.ProfileDocument;
+    /**
+     * Options:
+     *   - proto3_optional = true
+     */
+    useAutomerge?: boolean;
+}
 /**
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
  */
 export interface IdentityService {
-    createIdentity: (request: dxos_halo_credentials.ProfileDocument, options?: RequestOptions) => Promise<Identity>;
+    createIdentity: (request: CreateIdentityRequest, options?: RequestOptions) => Promise<Identity>;
     recoverIdentity: (request: RecoverIdentityRequest, options?: RequestOptions) => Promise<Identity>;
     queryIdentity: (request: void, options?: RequestOptions) => Stream<QueryIdentityResponse>;
     updateProfile: (request: dxos_halo_credentials.ProfileDocument, options?: RequestOptions) => Promise<Identity>;
@@ -924,6 +1004,7 @@ export enum ConnectionState {
 export interface NetworkStatus {
     swarm: ConnectionState;
     signaling?: NetworkStatus.Signal[];
+    connectionInfo?: dxos_devtools_swarm.SwarmInfo[];
 }
 export namespace NetworkStatus {
     /**