@dxos/protocols 0.8.4-main.3f58842 → 0.8.4-main.406dc2a

package/src/buf/proto/gen/dxos/type_pb.ts

@@ -2,14 +2,14 @@
 // Copyright 2022 DXOS.org
 //
 
-// @generated by protoc-gen-es v2.1.0 with parameter "target=ts,import_extension=js"
+// @generated by protoc-gen-es v2.9.0 with parameter "target=ts,import_extension=js"
 // @generated from file dxos/type.proto (package dxos.type, syntax proto3)
 /* eslint-disable */
 
 // TODO(burdon): Rename `dxos.registry.type`.
 
-import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
-import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1";
+import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
+import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
 import { file_google_protobuf_struct } from "@bufbuild/protobuf/wkt";
 import type { Record_Extension } from "./registry_pb.js";
 import { file_dxos_registry } from "./registry_pb.js";

package/src/buf/proto/gen/dxos/value_pb.ts

@@ -2,12 +2,12 @@
 // Copyright 2021 DXOS.org
 //
 
-// @generated by protoc-gen-es v2.1.0 with parameter "target=ts,import_extension=js"
+// @generated by protoc-gen-es v2.9.0 with parameter "target=ts,import_extension=js"
 // @generated from file dxos/value.proto (package dxos.value, syntax proto3)
 /* eslint-disable */
 
-import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
-import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1";
+import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
+import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
 import type { Message } from "@bufbuild/protobuf";
 
 /**

package/src/buf/proto/gen/example/testing/data_pb.ts

@@ -2,12 +2,12 @@
 // Copyright 2020 DXOS.org
 //
 
-// @generated by protoc-gen-es v2.1.0 with parameter "target=ts,import_extension=js"
+// @generated by protoc-gen-es v2.9.0 with parameter "target=ts,import_extension=js"
 // @generated from file example/testing/data.proto (package example.testing.data, syntax proto3)
 /* eslint-disable */
 
-import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
-import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1";
+import type { GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
+import { fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
 import type { Message } from "@bufbuild/protobuf";
 
 /**

package/src/buf/proto/gen/example/testing/rpc_pb.ts

@@ -2,12 +2,12 @@
 // Copyright 2020 DXOS.org
 //
 
-// @generated by protoc-gen-es v2.1.0 with parameter "target=ts,import_extension=js"
+// @generated by protoc-gen-es v2.9.0 with parameter "target=ts,import_extension=js"
 // @generated from file example/testing/rpc.proto (package example.testing.rpc, syntax proto3)
 /* eslint-disable */
 
-import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1";
-import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1";
+import type { GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
 import type { Any, EmptySchema } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_any, file_google_protobuf_empty } from "@bufbuild/protobuf/wkt";
 import type { Message } from "@bufbuild/protobuf";

package/src/edge-error.ts

@@ -2,8 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
+import { BaseError } from '@dxos/errors';
+
 import { type EdgeErrorData, type EdgeHttpFailure } from './edge';
 
+// TODO(burdon): Reconcile with @dxos/errors.
 export class EdgeCallFailedError extends Error {
   public static fromProcessingFailureCause(cause: Error): EdgeCallFailedError {
     return new EdgeCallFailedError({
@@ -13,11 +16,12 @@ export class EdgeCallFailedError extends Error {
     });
   }
 
-  public static fromHttpFailure(response: Response): EdgeCallFailedError {
+  public static async fromHttpFailure(response: Response): Promise<EdgeCallFailedError> {
     return new EdgeCallFailedError({
       reason: `HTTP code ${response.status}: ${response.statusText}.`,
       isRetryable: isRetryableCode(response.status),
       retryAfterMs: getRetryAfterMillis(response),
+      cause: await parseErrorBody(response),
     });
   }
 
@@ -77,3 +81,54 @@ const isRetryableCode = (status: number) => {
   }
   return !(status >= 400 && status < 500);
 };
+
+const parseErrorBody = async (response: Response): Promise<Error | undefined> => {
+  if (response.headers.get('Content-Type') !== 'application/json') {
+    const body = await response.text();
+    return new Error(body.slice(0, 256));
+  }
+
+  const body = await response.json();
+  if (!('error' in body)) {
+    return undefined;
+  }
+
+  return parseSerializedError(body.error);
+};
+
+type SerializedError = {
+  code?: string;
+  message?: string;
+  context?: Record<string, unknown>;
+  stack?: string;
+  cause?: SerializedError;
+};
+
+const parseSerializedError = (serializedError: SerializedError): Error => {
+  let err: Error;
+  if (typeof serializedError.code === 'string') {
+    err = new BaseError(serializedError.code, {
+      message: serializedError.message ?? 'Unknown error',
+      cause: serializedError.cause ? parseSerializedError(serializedError.cause) : undefined,
+      context: serializedError.context,
+    });
+
+    if (serializedError.stack) {
+      Object.defineProperty(err, 'stack', {
+        value: serializedError.stack,
+      });
+    }
+  } else {
+    err = new Error(serializedError.message ?? 'Unknown error', {
+      cause: serializedError.cause ? parseSerializedError(serializedError.cause) : undefined,
+    });
+
+    if (serializedError.stack) {
+      Object.defineProperty(err, 'stack', {
+        value: serializedError.stack,
+      });
+    }
+  }
+
+  return err;
+};

package/src/edge.ts

@@ -2,16 +2,18 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { SpaceId } from '@dxos/keys';
 
-// TODO(burdon): Rename EdgerRouterEndpoint?
+// TODO(burdon): Rename EdgerRouterEndpoint.
+// If we would rename it, we need to be careful to not break composer production.
 export enum EdgeService {
   AUTOMERGE_REPLICATOR = 'automerge-replicator',
   FEED_REPLICATOR = 'feed-replicator',
   SWARM = 'swarm',
   SIGNAL = 'signal',
+  STATUS = 'status',
 }
 
 export type EdgeHttpSuccess<T> = {
@@ -116,15 +118,18 @@ export type GetAgentStatusResponseBody = {
 
 export type UploadFunctionRequest = {
   name?: string;
-  script: string;
   version: string;
   ownerPublicKey: string;
+  entryPoint: string;
+  assets: Record<string, Uint8Array>;
 };
 
 export type UploadFunctionResponseBody = {
   functionId: string;
   version: string;
   meta: {
+    key?: string;
+    name?: string;
     description?: string;
     /**
      * JSON Schema for the input of the function.
@@ -138,12 +143,18 @@ export type UploadFunctionResponseBody = {
 };
 
 export type CreateSpaceRequest = {
+  /**
+   * HEX encoded public key of the agent.
+   */
   agentKey: string;
 };
 
 export type CreateSpaceResponseBody = {
+  /**
+   * HEX encoded public key of the space.
+   */
   spaceKey: string;
-  spaceId: string; // TODO(burdon): Use SpaceId.
+  spaceId: SpaceId;
   automergeRoot: string;
 };
 
@@ -220,3 +231,49 @@ export type EdgeStatus = {
     fetchError?: string;
   };
 };
+
+//
+// Space import/export.
+//
+
+export type ImportBundleRequest = {
+  bundle: {
+    /**
+     * DocumentId.
+     */
+    documentId: string;
+    /**
+     * Encoded mutation.
+     */
+    mutation: string;
+    /**
+     * Heads of the document.
+     */
+    heads: string[];
+  }[];
+};
+
+export type ExportBundleRequest = {
+  /**
+   * DocumentId -> Heads (decoded heads since which we want to export).
+   */
+  docHeads: Record<string, string[]>;
+};
+
+export type ExportBundleResponse = {
+  bundle: {
+    /**
+     * DocumentId.
+     */
+    documentId: string;
+    /**
+     * Encoded mutation.
+     */
+    mutation: string;
+  }[];
+};
+
+export const DocumentCodec = {
+  encode: (doc: Uint8Array) => Buffer.from(doc).toString('base64'),
+  decode: (doc: string) => new Uint8Array(Buffer.from(doc, 'base64')),
+};

package/src/errors/base-errors.ts

@@ -2,6 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
+// TODO(dmaretskyi): Reconcile with @dxos/errors
+
 /**
  * NOTE: Messages should be sentences (Start with a capital letter and end with a period).
  * Errors can optionally include a JSON context object.

package/src/errors/encoding.ts

@@ -2,9 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-import { reconstructError } from './helpers.js';
 import { type Error as SerializedErrorProto } from '../proto/gen/dxos/error.js';
 
+import { reconstructError } from './helpers.js';
+
 export const encodeError = (err: any): SerializedErrorProto => {
   if (typeof err === 'object' && err?.message) {
     return {

package/src/errors/errors.ts

@@ -4,9 +4,10 @@
 
 import { PublicKey } from '@dxos/keys';
 
+import type { ObjectId } from '../types.js';
+
 import { ApiError, BaseError, DatabaseError, SystemError } from './base-errors.js';
 import { registerError, registerErrorMessageContext, registerErrorNoArgs } from './helpers.js';
-import type { ObjectId } from '../types.js';
 
 /**
  * Thrown when request was terminated because the RPC endpoint has been closed.

package/src/errors/helpers.ts

@@ -4,9 +4,10 @@
 
 import { invariant } from '@dxos/invariant';
 
-import { SystemError } from './base-errors.js';
 import { type Error as SerializedErrorProto } from '../proto/gen/dxos/error.js';
 
+import { SystemError } from './base-errors.js';
+
 export const reconstructError = (error: SerializedErrorProto) => {
   const { name, message, context } = error;
   return errorFromCode(name, message, context);

package/src/index.ts

@@ -2,15 +2,15 @@
 // Copyright 2021 DXOS.org
 //
 
+export * from './automerge.js';
+export * from './edge-error.js';
+export * from './edge.js';
 export * from './errors/index.js';
 export * from './indexing.js';
+export * from './profile-archive.js';
+export * from './query.js';
+export * from './queue.js';
+export * from './space-archive.js';
 export * from './storage.js';
 export * from './tracing.js';
 export type * from './types.js';
-export * from './query.js';
-export * from './profile-archive.js';
-export * from './automerge.js';
-export * from './edge.js';
-export type * from './queue.js';
-export * from './space-archive.js';
-export * from './edge-error.js';

package/src/indexing.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 export type ObjectPointerDecoded = {
   spaceKey: string | undefined;

package/src/invitation.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { ParamKeyAnnotation } from '@dxos/effect';
 

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

@@ -596,9 +596,26 @@ service EdgeAgentService {
   rpc QueryAgentStatus(google.protobuf.Empty) returns (stream QueryAgentStatusResponse);
 }
 
-enum EdgeStatus {
-  NOT_CONNECTED = 0;
-  CONNECTED = 1;
+message EdgeStatus {
+  enum ConnectionState {
+    NOT_CONNECTED = 0;
+    CONNECTED = 1;
+  }
+
+  ConnectionState state = 1;
+  /** Latency in ms */
+  int32 rtt = 2;
+
+  /** How long the connection has been up */
+  int32 uptime = 3;
+
+  /** Upload rate in bytes per second */
+  int32 rate_bytes_up = 4;
+  /** Download rate in bytes per second */
+  int32 rate_bytes_down = 5;
+
+  int32 messages_sent = 6;
+  int32 messages_received = 7;
 }
 
 message QueryEdgeStatusResponse {

package/src/proto/dxos/config.proto

@@ -12,9 +12,7 @@ package dxos.config;
 
 option go_package = "github.com/dxos/dxos/proto/def/dxos/config";
 
-extend google.protobuf.FieldOptions {
-  optional string env_var = 1000;
-}
+extend google.protobuf.FieldOptions { optional string env_var = 1000; }
 
 message Config {
   optional int32 version = 1;
@@ -58,9 +56,10 @@ message Module {
     optional google.protobuf.Struct env = 10;
   }
 
-  optional string id = 8;     // TODO(burdon): Ensured FQ (e.g., 'dxos.app.xxx')
-  optional string name = 1;   // TODO(burdon): Replace with id (or key?)
-  optional string type = 2;   // TODO(burdon): Define namespace (e.g., 'dxos.org/type/frame' vs. 'dxos.type.frame')
+  optional string id = 8;   // TODO(burdon): Ensured FQ (e.g., 'dxos.app.xxx')
+  optional string name = 1; // TODO(burdon): Replace with id (or key?)
+  optional string type = 2; // TODO(burdon): Define namespace (e.g.,
+                            // 'dxos.org/type/frame' vs. 'dxos.type.frame')
 
   // TODO(burdon): Developer info message.
 
@@ -74,7 +73,7 @@ message Module {
   optional bool tunnel = 7;
 
   // TODO(burdon): Start at 100.
-  repeated Module deps = 10;  // TODO(burdon): E.g., types.
+  repeated Module deps = 10; // TODO(burdon): E.g., types.
   optional Build build = 100;
   repeated Repo repos = 101;
 
@@ -111,8 +110,8 @@ message Runtime {
     }
 
     message Log {
-      optional string filter = 1 [(env_var) = "LOG_FILTER"];
-      optional string prefix = 2 [(env_var) = "LOG_PREFIX"];
+      optional string filter = 1 [ (env_var) = "LOG_FILTER" ];
+      optional string prefix = 2 [ (env_var) = "LOG_PREFIX" ];
     }
 
     message EdgeFeatures {
@@ -136,7 +135,8 @@ message Runtime {
     optional int32 invitation_expiration = 5;
 
     /// Location of the remote client host.
-    // TODO(burdon): Rename vault_endpoint (generalize http/ws; drop vault.html).
+    // TODO(burdon): Rename vault_endpoint (generalize http/ws; drop
+    // vault.html).
     optional string remote_source = 6;
 
     // Authenticate via `Sec-WebSocket-Protocol` header hack.
@@ -145,7 +145,8 @@ message Runtime {
     /// Connect to and serve client services to a remote proxy.
     optional string devtools_proxy = 7;
 
-    /// Spaces will stay in SpaceState.CLOSED until explicitly opened. Speeds up client-services initialization.
+    /// Spaces will stay in SpaceState.CLOSED until explicitly opened. Speeds up
+    /// client-services initialization.
     optional bool lazy_space_open = 9;
 
     /// Disabled automerge & hypercore replication through P2P connections.
@@ -169,7 +170,7 @@ message Runtime {
     optional string org = 1;
     optional string theme = 2;
     optional string website = 3;
-    optional string public_url = 4 [(env_var) = "PUBLIC_URL"];
+    optional string public_url = 4 [ (env_var) = "PUBLIC_URL" ];
 
     optional BuildInfo build = 100;
     optional google.protobuf.Struct env = 101;
@@ -214,13 +215,9 @@ message Runtime {
     optional string channel = 7;
   }
 
-  message Props {
-    optional string title = 1;
-  }
+  message Props { optional string title = 1; }
 
-  message System {
-    optional string debug = 1;
-  }
+  message System { optional string debug = 1; }
 
   //
   // KUBE
@@ -255,9 +252,7 @@ message Runtime {
       int32 interval = 3;
     }
 
-    message Trace {
-      bool disabled = 1;
-    }
+    message Trace { bool disabled = 1; }
 
     message Telemetry {
       bool disabled = 1;
@@ -285,10 +280,10 @@ message Runtime {
 
     /// https://github.com/ipfs/kubo/blob/master/docs/config.md#apiauthorizations
     message KuboApiAuthorization {
-        /// Just for organizational purposes.
-        string name = 1;
-        string auth_secret = 2;
-        repeated string allowed_paths = 3;
+      /// Just for organizational purposes.
+      string name = 1;
+      string auth_secret = 2;
+      repeated string allowed_paths = 3;
     }
 
     // TODO(burdon): Needs documentation/
@@ -359,8 +354,9 @@ message Runtime {
     message Ipfs {
       optional string server = 1;
       optional string gateway = 2;
-      /// Used for IPFS API authentication, regardless if server is direct KUBO API (e.g. path of '/api/v0') or a reverse proxy
-      /// Same secret format as https://github.com/ipfs/kubo/blob/master/docs/config.md#apiauthorizations
+      /// Used for IPFS API authentication, regardless if server is direct KUBO
+      /// API (e.g. path of '/api/v0') or a reverse proxy Same secret format as
+      /// https://github.com/ipfs/kubo/blob/master/docs/config.md#apiauthorizations
       optional string server_auth_secret = 3;
     }
 
@@ -376,9 +372,7 @@ message Runtime {
       optional string credential = 3;
     }
 
-    message IceProvider {
-      string urls = 1;
-    }
+    message IceProvider { string urls = 1; }
 
     message Machine {
       optional string do_access_token = 1;
@@ -396,9 +390,7 @@ message Runtime {
       optional string server = 1;
     }
 
-    message Tunneling {
-      optional string server = 1;
-    }
+    message Tunneling { optional string server = 1; }
 
     message Supervisor { // TODO(burdon): Is this a service?
       optional string server = 1;
@@ -416,14 +408,13 @@ message Runtime {
       optional string type = 2;
     }
 
-    message Edge {
-      optional string url = 1;
-    }
+    message Edge { optional string url = 1; }
 
-    message Ai {
-      optional string server = 1;
-    }
+    message Ai { optional string server = 1; }
+
+    message Hub { optional string url = 1; }
 
+    /** Deprecated */
     optional Kube kube = 1;
     optional AppServer app = 2;
     optional Dxns dxns = 3;
@@ -434,12 +425,17 @@ message Runtime {
     optional Machine machine = 7;
     optional BotHost bot = 8;
     optional Publisher publisher = 9;
-    optional Supervisor supervisor = 10; // TODO(burdon): Promote to 1; start others at 10.
+    /** Deprecated */
+    optional Supervisor supervisor = 10;
+    /** Deprecated */
     optional Tunneling tunneling = 11;
+    /** Deprecated */
     optional Faasd faasd = 12;
+    /** Deprecated */
     optional AgentHosting agent_hosting = 13;
     optional Edge edge = 15;
     optional Ai ai = 16;
+    optional Hub hub = 17;
   }
 
   message Keys {

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

@@ -128,6 +128,17 @@ message SpaceSyncState {
      * Total number of documents on the remote peer.
      */
     int32 remote_document_count = 14;
+
+    /**
+     * Total number of documents across this peer and the remote peer.
+     */
+    int32 total_document_count = 15;
+
+    /**
+    * Total number of documents that are not synced.
+    * Includes documents that are present only locally, only on the remote peer, or whether the peers have different versions.
+    */
+    int32 unsynced_document_count = 16;
   }
 
   repeated PeerState peers = 1;

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

@@ -1399,9 +1399,36 @@ export interface EdgeAgentService {
  * Defined in:
  *   {@link file://./../../../dxos/client/services.proto}
  */
-export enum EdgeStatus {
-    NOT_CONNECTED = 0,
-    CONNECTED = 1
+export interface EdgeStatus {
+    state: EdgeStatus.ConnectionState;
+    /**
+     * Latency in ms
+     */
+    rtt: number;
+    /**
+     * How long the connection has been up
+     */
+    uptime: number;
+    /**
+     * Upload rate in bytes per second
+     */
+    rateBytesUp: number;
+    /**
+     * Download rate in bytes per second
+     */
+    rateBytesDown: number;
+    messagesSent: number;
+    messagesReceived: number;
+}
+export namespace EdgeStatus {
+    /**
+     * Defined in:
+     *   {@link file://./../../../dxos/client/services.proto}
+     */
+    export enum ConnectionState {
+        NOT_CONNECTED = 0,
+        CONNECTED = 1
+    }
 }
 /**
  * Defined in: