@dxos/edge-client 0.6.13-main.548ca8d → 0.6.13-staging.1e988a3

package/dist/lib/browser/index.mjs

@@ -1,10 +1,3 @@
-import {
-  Protocol,
-  getTypename,
-  protocol,
-  toUint8Array
-} from "./chunk-ZWJXA37R.mjs";
-
 // packages/core/mesh/edge-client/src/index.ts
 export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 
@@ -12,21 +5,123 @@ export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 import WebSocket from "isomorphic-ws";
 import { Trigger, Event, scheduleTaskInterval, scheduleTask, TriggerState } from "@dxos/async";
 import { Context, LifecycleState as LifecycleState2, Resource as Resource2 } from "@dxos/context";
-import { randomBytes } from "@dxos/crypto";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
-import { buf } from "@dxos/protocols/buf";
-import { MessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
-import { schema } from "@dxos/protocols/proto";
+import { buf as buf2 } from "@dxos/protocols/buf";
+import { MessageSchema as MessageSchema2 } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 
-// packages/core/mesh/edge-client/src/errors.ts
-var EdgeConnectionClosedError = class extends Error {
-  constructor() {
-    super("Edge connection closed.");
+// packages/core/mesh/edge-client/src/defs.ts
+import { AnySchema } from "@bufbuild/protobuf/wkt";
+import { SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+
+// packages/core/mesh/edge-client/src/protocol.ts
+import { invariant } from "@dxos/invariant";
+import { buf, bufWkt } from "@dxos/protocols/buf";
+import { MessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+import { bufferToArray } from "@dxos/util";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/protocol.ts";
+var getTypename = (typeName) => `type.googleapis.com/${typeName}`;
+var Protocol = class {
+  constructor(types) {
+    this._typeRegistry = buf.createRegistry(...types);
+  }
+  get typeRegistry() {
+    return this._typeRegistry;
+  }
+  toJson(message) {
+    try {
+      return buf.toJson(MessageSchema, message, {
+        registry: this.typeRegistry
+      });
+    } catch (err) {
+      return {
+        type: this.getPayloadType(message)
+      };
+    }
+  }
+  /**
+  * Return the payload with the given type.
+  */
+  getPayload(message, type) {
+    invariant(message.payload, void 0, {
+      F: __dxlog_file,
+      L: 40,
+      S: this,
+      A: [
+        "message.payload",
+        ""
+      ]
+    });
+    const payloadTypename = this.getPayloadType(message);
+    if (type && type.typeName !== payloadTypename) {
+      throw new Error(`Unexpected payload type: ${payloadTypename}; expected ${type.typeName}`);
+    }
+    invariant(bufWkt.anyIs(message.payload, type), `Unexpected payload type: ${payloadTypename}}`, {
+      F: __dxlog_file,
+      L: 46,
+      S: this,
+      A: [
+        "bufWkt.anyIs(message.payload, type)",
+        "`Unexpected payload type: ${payloadTypename}}`"
+      ]
+    });
+    const payload = bufWkt.anyUnpack(message.payload, this.typeRegistry);
+    invariant(payload, `Empty payload: ${payloadTypename}}`, {
+      F: __dxlog_file,
+      L: 48,
+      S: this,
+      A: [
+        "payload",
+        "`Empty payload: ${payloadTypename}}`"
+      ]
+    });
+    return payload;
+  }
+  /**
+  * Get the payload type.
+  */
+  getPayloadType(message) {
+    if (!message.payload) {
+      return void 0;
+    }
+    const [, type] = message.payload.typeUrl.split("/");
+    return type;
+  }
+  /**
+  * Create a packed message.
+  */
+  createMessage(type, { source, target, payload, serviceId }) {
+    return buf.create(MessageSchema, {
+      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+      source,
+      target,
+      serviceId,
+      payload: payload ? bufWkt.anyPack(type, buf.create(type, payload)) : void 0
+    });
   }
 };
-var EdgeIdentityChangedError = class extends Error {
+var toUint8Array = async (data) => {
+  if (data instanceof Buffer) {
+    return bufferToArray(data);
+  }
+  if (data instanceof Blob) {
+    return new Uint8Array(await data.arrayBuffer());
+  }
+  throw new Error(`Unexpected datatype: ${data}`);
+};
+
+// packages/core/mesh/edge-client/src/defs.ts
+var protocol = new Protocol([
+  SwarmRequestSchema,
+  SwarmResponseSchema,
+  TextMessageSchema,
+  AnySchema
+]);
+
+// packages/core/mesh/edge-client/src/errors.ts
+var WebsocketClosedError = class extends Error {
   constructor() {
-    super("Edge identity changed.");
+    super("WebSocket connection closed");
   }
 };
 
@@ -41,7 +136,7 @@ function _ts_decorate(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/persistent-lifecycle.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/persistent-lifecycle.ts";
 var INIT_RESTART_DELAY = 100;
 var DEFAULT_MAX_RESTART_DELAY = 5e3;
 var PersistentLifecycle = class extends Resource {
@@ -62,7 +157,7 @@ var PersistentLifecycle = class extends Resource {
         log.warn("Restart failed", {
           err
         }, {
-          F: __dxlog_file,
+          F: __dxlog_file2,
           L: 64,
           S: this,
           C: (f, a) => f(...a)
@@ -74,7 +169,7 @@ var PersistentLifecycle = class extends Resource {
       log.warn("Start failed", {
         err
       }, {
-        F: __dxlog_file,
+        F: __dxlog_file2,
         L: 69,
         S: this,
         C: (f, a) => f(...a)
@@ -91,7 +186,7 @@ var PersistentLifecycle = class extends Resource {
     log(`restarting in ${this._restartAfter}ms`, {
       state: this._lifecycleState
     }, {
-      F: __dxlog_file,
+      F: __dxlog_file2,
       L: 81,
       S: this,
       C: (f, a) => f(...a)
@@ -123,25 +218,17 @@ _ts_decorate([
   synchronized
 ], PersistentLifecycle.prototype, "scheduleRestart", null);
 
-// packages/core/mesh/edge-client/src/utils.ts
-var getEdgeUrlWithProtocol = (baseUrl, protocol2) => {
-  const isSecure = baseUrl.startsWith("https") || baseUrl.startsWith("wss");
-  const url = new URL(baseUrl);
-  url.protocol = protocol2 + (isSecure ? "s" : "");
-  return url.toString();
-};
-
 // packages/core/mesh/edge-client/src/edge-client.ts
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
 var DEFAULT_TIMEOUT = 1e4;
 var SIGNAL_KEEPALIVE_INTERVAL = 5e3;
 var EdgeClient = class extends Resource2 {
-  constructor(_identity, _config) {
+  constructor(_identityKey, _peerKey, _config) {
     super();
-    this._identity = _identity;
+    this._identityKey = _identityKey;
+    this._peerKey = _peerKey;
     this._config = _config;
     this.reconnect = new Event();
-    this.connected = new Event();
     this._persistentLifecycle = new PersistentLifecycle({
       start: async () => this._openWebSocket(),
       stop: async () => this._closeWebSocket(),
@@ -152,27 +239,25 @@ var EdgeClient = class extends Resource2 {
     this._ws = void 0;
     this._keepaliveCtx = void 0;
     this._heartBeatContext = void 0;
-    this._baseUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "ws");
+    this._protocol = this._config.protocol ?? protocol;
   }
   // TODO(burdon): Attach logging.
   get info() {
     return {
       open: this.isOpen,
-      identity: this._identity.identityKey,
-      device: this._identity.peerKey
+      identity: this._identityKey,
+      device: this._peerKey
     };
   }
-  get isConnected() {
-    return Boolean(this._ws) && this._ready.state === TriggerState.RESOLVED;
-  }
   get identityKey() {
-    return this._identity.identityKey;
+    return this._identityKey;
   }
   get peerKey() {
-    return this._identity.peerKey;
+    return this._peerKey;
   }
-  setIdentity(identity) {
-    this._identity = identity;
+  setIdentity({ peerKey, identityKey }) {
+    this._peerKey = peerKey;
+    this._identityKey = identityKey;
     this._persistentLifecycle.scheduleRestart();
   }
   addListener(listener) {
@@ -186,8 +271,8 @@ var EdgeClient = class extends Resource2 {
     log2("opening...", {
       info: this.info
     }, {
-      F: __dxlog_file2,
-      L: 122,
+      F: __dxlog_file3,
+      L: 101,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -195,8 +280,8 @@ var EdgeClient = class extends Resource2 {
       log2.warn("Error while opening connection", {
         err
       }, {
-        F: __dxlog_file2,
-        L: 124,
+        F: __dxlog_file3,
+        L: 103,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -207,54 +292,31 @@ var EdgeClient = class extends Resource2 {
   */
   async _close() {
     log2("closing...", {
-      peerKey: this._identity.peerKey
+      peerKey: this._peerKey
     }, {
-      F: __dxlog_file2,
-      L: 132,
+      F: __dxlog_file3,
+      L: 111,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._persistentLifecycle.close();
   }
   async _openWebSocket() {
-    let protocolHeader;
-    if (!this._config.disableAuth) {
-      const challenge = randomBytes(32);
-      const credential = await this._identity.presentCredentials({
-        challenge
-      });
-      protocolHeader = encodePresentationIntoAuthHeader(credential);
-    }
-    if (this._ctx.disposed) {
-      return;
-    }
-    const url = new URL(`/ws/${this._identity.identityKey}/${this._identity.peerKey}`, this._baseUrl);
-    log2("Opening websocket", {
-      url: url.toString(),
-      protocolHeader
-    }, {
-      F: __dxlog_file2,
-      L: 151,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._ws = new WebSocket(url, protocolHeader ? [
-      protocolHeader
-    ] : []);
+    const url = new URL(`/ws/${this._identityKey}/${this._peerKey}`, this._config.socketEndpoint);
+    this._ws = new WebSocket(url);
     this._ws.onopen = () => {
       log2("opened", this.info, {
-        F: __dxlog_file2,
-        L: 155,
+        F: __dxlog_file3,
+        L: 120,
         S: this,
         C: (f, a) => f(...a)
       });
       this._ready.wake();
-      this.connected.emit();
     };
     this._ws.onclose = () => {
       log2("closed", this.info, {
-        F: __dxlog_file2,
-        L: 160,
+        F: __dxlog_file3,
+        L: 124,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -265,8 +327,8 @@ var EdgeClient = class extends Resource2 {
         error: event.error,
         info: event.message
       }, {
-        F: __dxlog_file2,
-        L: 164,
+        F: __dxlog_file3,
+        L: 128,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -278,13 +340,13 @@ var EdgeClient = class extends Resource2 {
         return;
       }
       const data = await toUint8Array(event.data);
-      const message = buf.fromBinary(MessageSchema, data);
+      const message = buf2.fromBinary(MessageSchema2, data);
       log2("received", {
-        peerKey: this._identity.peerKey,
+        peerKey: this._peerKey,
         payload: protocol.getPayloadType(message)
       }, {
-        F: __dxlog_file2,
-        L: 177,
+        F: __dxlog_file3,
+        L: 141,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -297,8 +359,8 @@ var EdgeClient = class extends Resource2 {
               err,
               payload: protocol.getPayloadType(message)
             }, {
-              F: __dxlog_file2,
-              L: 183,
+              F: __dxlog_file3,
+              L: 147,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -310,8 +372,8 @@ var EdgeClient = class extends Resource2 {
       timeout: this._config.timeout ?? DEFAULT_TIMEOUT
     });
     this._keepaliveCtx = new Context(void 0, {
-      F: __dxlog_file2,
-      L: 193
+      F: __dxlog_file3,
+      L: 154
     });
     scheduleTaskInterval(this._keepaliveCtx, async () => {
       this._ws?.send("__ping__");
@@ -324,7 +386,7 @@ var EdgeClient = class extends Resource2 {
       return;
     }
     try {
-      this._ready.throw(this.isOpen ? new EdgeIdentityChangedError() : new EdgeConnectionClosedError());
+      this._ready.throw(new WebsocketClosedError());
       this._ready.reset();
       void this._keepaliveCtx?.dispose();
       this._keepaliveCtx = void 0;
@@ -345,8 +407,8 @@ var EdgeClient = class extends Resource2 {
       log2.warn("Error closing websocket", {
         err
       }, {
-        F: __dxlog_file2,
-        L: 229,
+        F: __dxlog_file3,
+        L: 190,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -358,32 +420,38 @@ var EdgeClient = class extends Resource2 {
   */
   async send(message) {
     if (this._ready.state !== TriggerState.RESOLVED) {
-      log2("waiting for websocket to become ready", void 0, {
-        F: __dxlog_file2,
-        L: 239,
-        S: this,
-        C: (f, a) => f(...a)
-      });
       await this._ready.wait({
         timeout: this._config.timeout ?? DEFAULT_TIMEOUT
       });
     }
-    if (!this._ws) {
-      throw new EdgeConnectionClosedError();
-    }
-    if (message.source && (message.source.peerKey !== this._identity.peerKey || message.source.identityKey !== this.identityKey)) {
-      throw new EdgeIdentityChangedError();
-    }
+    invariant2(this._ws, void 0, {
+      F: __dxlog_file3,
+      L: 202,
+      S: this,
+      A: [
+        "this._ws",
+        ""
+      ]
+    });
+    invariant2(!message.source || message.source.peerKey === this._peerKey, void 0, {
+      F: __dxlog_file3,
+      L: 203,
+      S: this,
+      A: [
+        "!message.source || message.source.peerKey === this._peerKey",
+        ""
+      ]
+    });
     log2("sending...", {
-      peerKey: this._identity.peerKey,
+      peerKey: this._peerKey,
       payload: protocol.getPayloadType(message)
     }, {
-      F: __dxlog_file2,
-      L: 252,
+      F: __dxlog_file3,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._ws.send(buf.toBinary(MessageSchema, message));
+    this._ws.send(buf2.toBinary(MessageSchema2, message));
   }
   _onHeartbeat() {
     if (this._lifecycleState !== LifecycleState2.OPEN) {
@@ -391,254 +459,17 @@ var EdgeClient = class extends Resource2 {
     }
     void this._heartBeatContext?.dispose();
     this._heartBeatContext = new Context(void 0, {
-      F: __dxlog_file2,
-      L: 261
+      F: __dxlog_file3,
+      L: 213
     });
     scheduleTask(this._heartBeatContext, () => {
       this._persistentLifecycle.scheduleRestart();
     }, 2 * SIGNAL_KEEPALIVE_INTERVAL);
   }
 };
-var encodePresentationIntoAuthHeader = (presentation) => {
-  const encoded = schema.getCodecForType("dxos.halo.credentials.Presentation").encode(presentation);
-  const encodedToken = Buffer.from(encoded).toString("base64").replace(/=*$/, "").replaceAll("/", "|");
-  return `base64url.bearer.authorization.dxos.org.${encodedToken}`;
-};
-
-// packages/core/mesh/edge-client/src/auth.ts
-import { createCredential, signPresentation } from "@dxos/credentials";
-import { Keyring } from "@dxos/keyring";
-import { PublicKey } from "@dxos/keys";
-var createDeviceEdgeIdentity = async (signer, key) => {
-  return {
-    identityKey: key.toHex(),
-    peerKey: key.toHex(),
-    presentCredentials: async ({ challenge }) => {
-      return signPresentation({
-        presentation: {
-          credentials: [
-            // Verifier requires at least one credential in the presentation to establish the subject.
-            await createCredential({
-              assertion: {
-                "@type": "dxos.halo.credentials.Auth"
-              },
-              issuer: key,
-              subject: key,
-              signer
-            })
-          ]
-        },
-        signer,
-        signerKey: key,
-        nonce: challenge
-      });
-    }
-  };
-};
-var createChainEdgeIdentity = async (signer, identityKey, peerKey, chain, credentials) => {
-  const credentialsToSign = credentials.length > 0 ? credentials : [
-    await createCredential({
-      assertion: {
-        "@type": "dxos.halo.credentials.Auth"
-      },
-      issuer: identityKey,
-      subject: identityKey,
-      signer,
-      chain,
-      signingKey: peerKey
-    })
-  ];
-  return {
-    identityKey: identityKey.toHex(),
-    peerKey: peerKey.toHex(),
-    presentCredentials: async ({ challenge }) => {
-      return signPresentation({
-        presentation: {
-          credentials: credentialsToSign
-        },
-        signer,
-        nonce: challenge,
-        signerKey: peerKey,
-        chain
-      });
-    }
-  };
-};
-var createEphemeralEdgeIdentity = async () => {
-  const keyring = new Keyring();
-  const key = await keyring.createKey();
-  return createDeviceEdgeIdentity(keyring, key);
-};
-var createTestHaloEdgeIdentity = async (signer, identityKey, deviceKey) => {
-  const deviceAdmission = await createCredential({
-    assertion: {
-      "@type": "dxos.halo.credentials.AuthorizedDevice",
-      deviceKey,
-      identityKey
-    },
-    issuer: identityKey,
-    subject: deviceKey,
-    signer
-  });
-  return createChainEdgeIdentity(signer, identityKey, deviceKey, {
-    credential: deviceAdmission
-  }, [
-    await createCredential({
-      assertion: {
-        "@type": "dxos.halo.credentials.Auth"
-      },
-      issuer: identityKey,
-      subject: identityKey,
-      signer
-    })
-  ]);
-};
-var createStubEdgeIdentity = () => {
-  const identityKey = PublicKey.random();
-  const deviceKey = PublicKey.random();
-  return {
-    identityKey: identityKey.toHex(),
-    peerKey: deviceKey.toHex(),
-    presentCredentials: async () => {
-      throw new Error("Stub identity does not support authentication.");
-    }
-  };
-};
-
-// packages/core/mesh/edge-client/src/edge-http-client.ts
-import { sleep as sleep2 } from "@dxos/async";
-import { Context as Context2 } from "@dxos/context";
-import { log as log3 } from "@dxos/log";
-import { EdgeCallFailedError, EdgeAuthChallengeError } from "@dxos/protocols";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-http-client.ts";
-var DEFAULT_RETRY_TIMEOUT = 1500;
-var DEFAULT_RETRY_JITTER = 500;
-var DEFAULT_MAX_RETRIES_COUNT = 3;
-var EdgeHttpClient = class {
-  constructor(baseUrl) {
-    this._baseUrl = getEdgeUrlWithProtocol(baseUrl, "http");
-    log3("created", {
-      url: this._baseUrl
-    }, {
-      F: __dxlog_file3,
-      L: 30,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
-  getCredentialsForNotarization(spaceId, args) {
-    return this._call(`/spaces/${spaceId}/notarization`, {
-      ...args,
-      method: "GET"
-    });
-  }
-  async notarizeCredentials(spaceId, body, args) {
-    await this._call(`/spaces/${spaceId}/notarization`, {
-      ...args,
-      body,
-      method: "POST"
-    });
-  }
-  async joinSpaceByInvitation(spaceId, body, args) {
-    return this._call(`/spaces/${spaceId}/join`, {
-      ...args,
-      body,
-      method: "POST"
-    });
-  }
-  async _call(path, args) {
-    const requestContext = args.context ?? new Context2(void 0, {
-      F: __dxlog_file3,
-      L: 54
-    });
-    const shouldRetry = createRetryHandler(args);
-    const request = createRequest(args);
-    const url = `${this._baseUrl}${path.startsWith("/") ? path.slice(1) : path}`;
-    log3.info("call", {
-      method: args.method,
-      path
-    }, {
-      F: __dxlog_file3,
-      L: 59,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    while (true) {
-      let processingError;
-      let retryAfterHeaderValue = Number.NaN;
-      try {
-        const response = await fetch(url, request);
-        retryAfterHeaderValue = Number(response.headers.get("Retry-After"));
-        if (response.ok) {
-          const body = await response.json();
-          if (body.success) {
-            return body.data;
-          }
-          if (body.errorData?.type === "auth_challenge" && typeof body.errorData?.challenge === "string") {
-            processingError = new EdgeAuthChallengeError(body.errorData.challenge, body.errorData);
-          } else {
-            processingError = EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
-          }
-        } else {
-          processingError = EdgeCallFailedError.fromHttpFailure(response);
-        }
-      } catch (error) {
-        processingError = EdgeCallFailedError.fromProcessingFailureCause(error);
-      }
-      if (processingError.isRetryable && await shouldRetry(requestContext, retryAfterHeaderValue)) {
-        log3.info("retrying edge request", {
-          path,
-          processingError
-        }, {
-          F: __dxlog_file3,
-          L: 88,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      } else {
-        throw processingError;
-      }
-    }
-  }
-};
-var createRequest = (args) => {
-  return {
-    method: args.method,
-    body: args.body && JSON.stringify(args.body)
-  };
-};
-var createRetryHandler = (args) => {
-  if (!args.retry || args.retry.count < 1) {
-    return async () => false;
-  }
-  let retries = 0;
-  const maxRetries = args.retry.count ?? DEFAULT_MAX_RETRIES_COUNT;
-  const baseTimeout = args.retry.timeout ?? DEFAULT_RETRY_TIMEOUT;
-  const jitter = args.retry.jitter ?? DEFAULT_RETRY_JITTER;
-  return async (ctx, retryAfter) => {
-    if (++retries > maxRetries || ctx.disposed) {
-      return false;
-    }
-    if (retryAfter) {
-      await sleep2(retryAfter);
-    } else {
-      const timeout = baseTimeout + Math.random() * jitter;
-      await sleep2(timeout);
-    }
-    return true;
-  };
-};
 export {
   EdgeClient,
-  EdgeConnectionClosedError,
-  EdgeHttpClient,
-  EdgeIdentityChangedError,
   Protocol,
-  createChainEdgeIdentity,
-  createDeviceEdgeIdentity,
-  createEphemeralEdgeIdentity,
-  createStubEdgeIdentity,
-  createTestHaloEdgeIdentity,
   getTypename,
   protocol,
   toUint8Array