@dxos/protocols 0.8.4-main.c1de068 → 0.8.4-main.c4373fc

package/src/buf/proto/gen/dxos/mesh/teleport/control_pb.ts

@@ -2,12 +2,12 @@
 // 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/mesh/teleport/control.proto (package dxos.mesh.teleport.control, 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 { EmptySchema, Timestamp } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_empty, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
 import type { Message } from "@bufbuild/protobuf";

package/src/buf/proto/gen/dxos/mesh/teleport/gossip_pb.ts

@@ -2,12 +2,12 @@
 // 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/mesh/teleport/gossip.proto (package dxos.mesh.teleport.gossip, 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, Timestamp } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_any, file_google_protobuf_empty, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
 import type { PublicKey } from "../../keys_pb.js";

package/src/buf/proto/gen/dxos/mesh/teleport/notarization_pb.ts

@@ -2,12 +2,12 @@
 // 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/mesh/teleport/notarization.proto (package dxos.mesh.teleport.notarization, 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 { EmptySchema } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_empty } from "@bufbuild/protobuf/wkt";
 import { file_dxos_keys } from "../../keys_pb.js";

package/src/buf/proto/gen/dxos/mesh/teleport/replicator_pb.ts

@@ -2,12 +2,12 @@
 // 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/mesh/teleport/replicator.proto (package dxos.mesh.teleport.replicator, 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 { EmptySchema } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_empty } from "@bufbuild/protobuf/wkt";
 import type { PublicKey } from "../../keys_pb.js";

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

@@ -2,14 +2,14 @@
 // 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/registry.proto (package dxos.registry, syntax proto3)
 /* eslint-disable */
 
 // TODO(burdon): Rename `dxos.registry.record`.
 
-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 { Timestamp } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_struct, file_google_protobuf_timestamp } from "@bufbuild/protobuf/wkt";
 import type { JsonObject, Message } from "@bufbuild/protobuf";

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

@@ -2,14 +2,14 @@
 // 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 dxos/rpc.proto (package dxos.rpc, syntax proto3)
 /* eslint-disable */
 
 // TODO(burdon): Move to `dxos.mesh.rpc` (reconcile with @dxos/kube repo).
 
-import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
-import { enumDesc, fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1";
+import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv2";
+import { enumDesc, fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv2";
 import type { Any } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_any } from "@bufbuild/protobuf/wkt";
 import type { Error } from "./error_pb.js";

package/src/buf/proto/gen/dxos/service/agentmanager_pb.ts

@@ -2,12 +2,12 @@
 // 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/service/agentmanager.proto (package dxos.service.agentmanager, syntax proto3)
 /* eslint-disable */
 
-import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1";
-import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1";
+import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
 import { file_google_protobuf_any, file_google_protobuf_empty } from "@bufbuild/protobuf/wkt";
 import { file_dxos_config } from "../config_pb.js";
 import type { Credential, Presentation } from "../halo/credentials_pb.js";

package/src/buf/proto/gen/dxos/service/publisher_pb.ts

@@ -2,12 +2,12 @@
 // Copyright 2023 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/service/publisher.proto (package dxos.service.publisher, 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 { EmptySchema } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_empty } from "@bufbuild/protobuf/wkt";
 import type { Module, Package } from "../config_pb.js";

package/src/buf/proto/gen/dxos/service/supervisor_pb.ts

@@ -2,12 +2,12 @@
 // 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/service/supervisor.proto (package dxos.service.supervisor, syntax proto3)
 /* eslint-disable */
 
-import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1";
-import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1";
+import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
 import type { EmptySchema } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_empty } from "@bufbuild/protobuf/wkt";
 import type { Config } from "../config_pb.js";

package/src/buf/proto/gen/dxos/service/tunnel_pb.ts

@@ -2,12 +2,12 @@
 // Copyright 2023 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/service/tunnel.proto (package dxos.service.tunnel, 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 { EmptySchema } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_empty } from "@bufbuild/protobuf/wkt";
 import type { Message } from "@bufbuild/protobuf";

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

@@ -1,9 +1,9 @@
-// @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/tracing.proto (package dxos.tracing, syntax proto3)
 /* eslint-disable */
 
-import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv1";
-import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv1";
+import type { GenEnum, GenFile, GenMessage, GenService } from "@bufbuild/protobuf/codegenv2";
+import { enumDesc, fileDesc, messageDesc, serviceDesc } from "@bufbuild/protobuf/codegenv2";
 import type { EmptySchema } from "@bufbuild/protobuf/wkt";
 import { file_google_protobuf_empty, file_google_protobuf_struct } from "@bufbuild/protobuf/wkt";
 import type { Error } from "./error_pb.js";

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';