@dxos/edge-client 0.8.3 → 0.8.4-main.f9ba587

package/dist/lib/browser/{chunk-VHS3XEIX.mjs → chunk-LMP5TVOP.mjs}

@@ -1,19 +1,19 @@
-// packages/core/mesh/edge-client/src/edge-ws-muxer.ts
+// src/edge-ws-muxer.ts
 import { Trigger } from "@dxos/async";
 import { log } from "@dxos/log";
 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/defs.ts
+// src/defs.ts
 import { bufWkt as bufWkt2 } from "@dxos/protocols/buf";
 import { SwarmRequestSchema, SwarmResponseSchema, TextMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 
-// packages/core/mesh/edge-client/src/protocol.ts
+// 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 __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/protocol.ts";
 var getTypename = (typeName) => `type.googleapis.com/${typeName}`;
 var Protocol = class {
   constructor(types) {
@@ -104,7 +104,7 @@ var toUint8Array = async (data) => {
   throw new Error(`Unexpected datatype: ${data}`);
 };
 
-// packages/core/mesh/edge-client/src/defs.ts
+// src/defs.ts
 var protocol = new Protocol([
   SwarmRequestSchema,
   SwarmResponseSchema,
@@ -112,8 +112,8 @@ var protocol = new Protocol([
   bufWkt2.AnySchema
 ]);
 
-// packages/core/mesh/edge-client/src/edge-ws-muxer.ts
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-ws-muxer.ts";
+// src/edge-ws-muxer.ts
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-ws-muxer.ts";
 var FLAG_SEGMENT_SEQ = 1;
 var FLAG_SEGMENT_SEQ_TERMINATED = 1 << 1;
 var CLOUDFLARE_MESSAGE_MAX_BYTES = 1e3 * 1e3;
@@ -294,4 +294,4 @@ export {
   CLOUDFLARE_RPC_MAX_BYTES,
   WebSocketMuxer
 };
-//# sourceMappingURL=chunk-VHS3XEIX.mjs.map
+//# sourceMappingURL=chunk-LMP5TVOP.mjs.map

package/dist/lib/browser/edge-ws-muxer.mjs

@@ -2,7 +2,7 @@ import {
   CLOUDFLARE_MESSAGE_MAX_BYTES,
   CLOUDFLARE_RPC_MAX_BYTES,
   WebSocketMuxer
-} from "./chunk-VHS3XEIX.mjs";
+} from "./chunk-LMP5TVOP.mjs";
 export {
   CLOUDFLARE_MESSAGE_MAX_BYTES,
   CLOUDFLARE_RPC_MAX_BYTES,

package/dist/lib/browser/index.mjs

@@ -6,21 +6,21 @@ import {
   getTypename,
   protocol,
   toUint8Array
-} from "./chunk-VHS3XEIX.mjs";
+} from "./chunk-LMP5TVOP.mjs";
 
-// packages/core/mesh/edge-client/src/index.ts
+// src/index.ts
 export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 
-// packages/core/mesh/edge-client/src/edge-client.ts
+// src/edge-client.ts
 import { Trigger, scheduleMicroTask, TriggerState, PersistentLifecycle, Event } from "@dxos/async";
 import { Resource as Resource2 } from "@dxos/context";
 import { log as log2, logInfo as logInfo2 } from "@dxos/log";
 import { EdgeStatus } from "@dxos/protocols/proto/dxos/client/services";
 
-// packages/core/mesh/edge-client/src/edge-identity.ts
+// src/edge-identity.ts
 import { invariant } from "@dxos/invariant";
 import { schema } from "@dxos/protocols/proto";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-identity.ts";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-identity.ts";
 var handleAuthChallenge = async (failedResponse, identity) => {
   invariant(failedResponse.status === 401, void 0, {
     F: __dxlog_file,
@@ -57,7 +57,7 @@ var handleAuthChallenge = async (failedResponse, identity) => {
   return schema.getCodecForType("dxos.halo.credentials.Presentation").encode(presentation);
 };
 
-// packages/core/mesh/edge-client/src/edge-ws-connection.ts
+// src/edge-ws-connection.ts
 import WebSocket from "isomorphic-ws";
 import { scheduleTask, scheduleTaskInterval } from "@dxos/async";
 import { Context, Resource } from "@dxos/context";
@@ -72,7 +72,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_file2 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-ws-connection.ts";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-ws-connection.ts";
 var SIGNAL_KEEPALIVE_INTERVAL = 4e3;
 var SIGNAL_KEEPALIVE_TIMEOUT = 12e3;
 var EdgeWsConnection = class extends Resource {
@@ -309,7 +309,7 @@ _ts_decorate([
   logInfo
 ], EdgeWsConnection.prototype, "info", null);
 
-// packages/core/mesh/edge-client/src/errors.ts
+// src/errors.ts
 var EdgeConnectionClosedError = class extends Error {
   constructor() {
     super("Edge connection closed.");
@@ -321,7 +321,7 @@ var EdgeIdentityChangedError = class extends Error {
   }
 };
 
-// packages/core/mesh/edge-client/src/utils.ts
+// src/utils.ts
 var getEdgeUrlWithProtocol = (baseUrl, protocol2) => {
   const isSecure = baseUrl.startsWith("https") || baseUrl.startsWith("wss");
   const url = new URL(baseUrl);
@@ -329,14 +329,14 @@ var getEdgeUrlWithProtocol = (baseUrl, protocol2) => {
   return url.toString();
 };
 
-// packages/core/mesh/edge-client/src/edge-client.ts
+// src/edge-client.ts
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.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_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-client.ts";
 var DEFAULT_TIMEOUT = 1e4;
 var EdgeClient = class extends Resource2 {
   constructor(_identity, _config) {
@@ -624,12 +624,12 @@ var encodePresentationWsAuthHeader = (encodedPresentation) => {
   return `base64url.bearer.authorization.dxos.org.${encodedToken}`;
 };
 
-// packages/core/mesh/edge-client/src/auth.ts
+// src/auth.ts
 import { createCredential, signPresentation } from "@dxos/credentials";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey } from "@dxos/keys";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/auth.ts";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/auth.ts";
 var createDeviceEdgeIdentity = async (signer, key) => {
   return {
     identityKey: key.toHex(),
@@ -735,23 +735,67 @@ var createStubEdgeIdentity = () => {
   };
 };
 
-// packages/core/mesh/edge-client/src/edge-http-client.ts
+// src/edge-http-client.ts
+import { FetchHttpClient, HttpClient } from "@effect/platform";
+import { Effect as Effect2, pipe } from "effect";
 import { sleep } from "@dxos/async";
-import { Context as Context2 } from "@dxos/context";
+import { Context as Context3 } from "@dxos/context";
+import { log as log4 } from "@dxos/log";
+import { EdgeAuthChallengeError, EdgeCallFailedError } from "@dxos/protocols";
+import { createUrl } from "@dxos/util";
+
+// src/http-client.ts
+import { Context as Context2, Duration, Effect, Layer, Schedule } from "effect";
 import { log as log3 } from "@dxos/log";
-import { EdgeCallFailedError, EdgeAuthChallengeError } from "@dxos/protocols";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/edge-client/src/edge-http-client.ts";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/http-client.ts";
+var HttpConfig = class _HttpConfig extends Context2.Tag("HttpConfig")() {
+  static {
+    this.default = Layer.succeed(_HttpConfig, {
+      timeout: Duration.millis(1e3),
+      retryTimes: 3,
+      retryBaseDelay: Duration.millis(1e3)
+    });
+  }
+};
+var withRetry = (effect, { timeout = Duration.millis(1e3), retryBaseDelay = Duration.millis(1e3), retryTimes = 3 } = {}) => {
+  return effect.pipe(Effect.flatMap((res) => (
+    // Treat 500 errors as retryable?
+    res.status === 500 ? Effect.fail(new Error(res.status.toString())) : res.json
+  )), Effect.timeout(timeout), Effect.retry({
+    schedule: Schedule.exponential(retryBaseDelay).pipe(Schedule.jittered),
+    times: retryTimes
+  }));
+};
+var withRetryConfig = (effect) => Effect.gen(function* () {
+  const config = yield* HttpConfig;
+  return yield* withRetry(effect, config);
+});
+var withLogging = (effect) => effect.pipe(Effect.tap((res) => log3.info("response", {
+  status: res.status
+}, {
+  F: __dxlog_file5,
+  L: 58,
+  S: void 0,
+  C: (f, a) => f(...a)
+})));
+var encodeAuthHeader = (challenge) => {
+  const encodedChallenge = Buffer.from(challenge).toString("base64");
+  return `VerifiablePresentation pb;base64,${encodedChallenge}`;
+};
+
+// src/edge-http-client.ts
+var __dxlog_file6 = "/__w/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", {
+    log4("created", {
       url: this._baseUrl
     }, {
-      F: __dxlog_file5,
-      L: 53,
+      F: __dxlog_file6,
+      L: 84,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -765,98 +809,105 @@ var EdgeHttpClient = class {
       this._authHeader = void 0;
     }
   }
+  //
+  // Status
+  //
+  async getStatus(args) {
+    return this._call(new URL("/status", this.baseUrl), {
+      ...args,
+      method: "GET"
+    });
+  }
+  //
+  // Agents
+  //
   createAgent(body, args) {
-    return this._call("/agents/create", {
+    return this._call(new URL("/agents/create", this.baseUrl), {
       ...args,
       method: "POST",
       body
     });
   }
   getAgentStatus(request, args) {
-    return this._call(`/users/${request.ownerIdentityKey.toHex()}/agent/status`, {
+    return this._call(new URL(`/users/${request.ownerIdentityKey.toHex()}/agent/status`, this.baseUrl), {
       ...args,
       method: "GET"
     });
   }
+  //
+  // Credentials
+  //
   getCredentialsForNotarization(spaceId, args) {
-    return this._call(`/spaces/${spaceId}/notarization`, {
+    return this._call(new URL(`/spaces/${spaceId}/notarization`, this.baseUrl), {
       ...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`, {
+    await this._call(new URL(`/spaces/${spaceId}/notarization`, this.baseUrl), {
       ...args,
       body,
       method: "POST"
     });
   }
+  //
+  // Identity
+  //
   async recoverIdentity(body, args) {
-    return this._call("/identity/recover", {
+    return this._call(new URL("/identity/recover", this.baseUrl), {
       ...args,
       body,
       method: "POST"
     });
   }
-  async executeWorkflow(spaceId, graphId, input, args) {
-    return this._call(`/workflows/${spaceId}/${graphId}`, {
+  //
+  // Invitations
+  //
+  async joinSpaceByInvitation(spaceId, body, args) {
+    return this._call(new URL(`/spaces/${spaceId}/join`, this.baseUrl), {
       ...args,
-      body: input,
+      body,
       method: "POST"
     });
   }
-  async uploadFunction(pathParts, body, args) {
-    const path = [
-      "functions",
-      ...pathParts.functionId ? [
-        pathParts.functionId
-      ] : []
-    ].join("/");
-    return this._call(path, {
+  //
+  // OAuth and credentials
+  //
+  async initiateOAuthFlow(body, args) {
+    return this._call(new URL("/oauth/initiate", this.baseUrl), {
       ...args,
       body,
-      method: "PUT"
+      method: "POST"
     });
   }
-  async initiateOAuthFlow(body, args) {
-    return this._call("/oauth/initiate", {
+  //
+  // Spaces
+  //
+  async createSpace(body, args) {
+    return this._call(new URL("/spaces/create", this.baseUrl), {
       ...args,
       body,
       method: "POST"
     });
   }
+  //
+  // Queues
+  //
   async queryQueue(subspaceTag, spaceId, query, args) {
     const { queueId } = query;
-    const queryParams = new URLSearchParams();
-    if (query.after != null) {
-      queryParams.set("after", query.after);
-    }
-    if (query.before != null) {
-      queryParams.set("before", query.before);
-    }
-    if (query.limit != null) {
-      queryParams.set("limit", query.limit.toString());
-    }
-    if (query.reverse != null) {
-      queryParams.set("reverse", query.reverse.toString());
-    }
-    if (query.objectIds != null) {
-      queryParams.set("objectIds", query.objectIds.join(","));
-    }
-    return this._call(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}/query?${queryParams.toString()}`, {
+    return this._call(createUrl(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}/query`, this.baseUrl), {
+      after: query.after,
+      before: query.before,
+      limit: query.limit,
+      reverse: query.reverse,
+      objectIds: query.objectIds?.join(",")
+    }), {
       ...args,
       method: "GET"
     });
   }
   async insertIntoQueue(subspaceTag, spaceId, queueId, objects, args) {
-    return this._call(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, {
+    return this._call(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, this.baseUrl), {
       ...args,
       body: {
         objects
@@ -865,52 +916,67 @@ var EdgeHttpClient = class {
     });
   }
   async deleteFromQueue(subspaceTag, spaceId, queueId, objectIds, args) {
-    return this._call(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, {
+    return this._call(createUrl(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, this.baseUrl), {
+      ids: objectIds.join(",")
+    }), {
       ...args,
-      query: {
-        ids: objectIds.join(",")
-      },
       method: "DELETE"
     });
   }
-  async createSpace(body, args) {
-    return this._call("/spaces/create", {
+  //
+  // Functions
+  //
+  async uploadFunction(pathParts, body, args) {
+    const path = [
+      "functions",
+      ...pathParts.functionId ? [
+        pathParts.functionId
+      ] : []
+    ].join("/");
+    return this._call(new URL(path, this.baseUrl), {
       ...args,
       body,
-      method: "POST"
+      method: "PUT"
     });
   }
-  async _call(path, args) {
-    const requestContext = args.context ?? new Context2(void 0, {
-      F: __dxlog_file5,
-      L: 192
+  //
+  // Workflows
+  //
+  async executeWorkflow(spaceId, graphId, input, args) {
+    return this._call(new URL(`/workflows/${spaceId}/${graphId}`, this.baseUrl), {
+      ...args,
+      body: input,
+      method: "POST"
     });
+  }
+  //
+  // Internal
+  //
+  async _fetch(url, args) {
+    return pipe(HttpClient.get(url), withLogging, withRetryConfig, Effect2.provide(FetchHttpClient.layer), Effect2.provide(HttpConfig.default), Effect2.withSpan("EdgeHttpClient"), Effect2.runPromise);
+  }
+  // TODO(burdon): Refactor with effect (see edge-http-client.test.ts).
+  async _call(url, args) {
     const shouldRetry = createRetryHandler(args);
-    let url = `${this._baseUrl}${path.startsWith("/") ? path.slice(1) : path}`;
-    if (args.query) {
-      const queryParams = new URLSearchParams();
-      for (const [key, value] of Object.entries(args.query)) {
-        queryParams.set(key, value.toString());
-      }
-      url += `?${queryParams.toString()}`;
-    }
-    log3("call", {
-      method: args.method,
-      path,
+    const requestContext = args.context ?? new Context3(void 0, {
+      F: __dxlog_file6,
+      L: 289
+    });
+    log4("fetch", {
+      url,
       request: args.body
     }, {
-      F: __dxlog_file5,
-      L: 204,
+      F: __dxlog_file6,
+      L: 290,
       S: this,
       C: (f, a) => f(...a)
     });
     let handledAuth = false;
-    let authHeader = this._authHeader;
     while (true) {
       let processingError;
       let retryAfterHeaderValue = Number.NaN;
       try {
-        const request = createRequest(args, authHeader);
+        const request = createRequest(args, this._authHeader);
         const response = await fetch(url, request);
         retryAfterHeaderValue = Number(response.headers.get("Retry-After"));
         if (response.ok) {
@@ -918,12 +984,12 @@ var EdgeHttpClient = class {
           if (body.success) {
             return body.data;
           }
-          log3("unsuccessful edge response", {
-            path,
+          log4.warn("unsuccessful edge response", {
+            url,
             body
           }, {
-            F: __dxlog_file5,
-            L: 223,
+            F: __dxlog_file6,
+            L: 306,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -933,7 +999,7 @@ var EdgeHttpClient = class {
             processingError = EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
           }
         } else if (response.status === 401 && !handledAuth) {
-          authHeader = await this._handleUnauthorized(response);
+          this._authHeader = await this._handleUnauthorized(response);
           handledAuth = true;
           continue;
         } else {
@@ -943,12 +1009,12 @@ var EdgeHttpClient = class {
         processingError = EdgeCallFailedError.fromProcessingFailureCause(error);
       }
       if (processingError.isRetryable && await shouldRetry(requestContext, retryAfterHeaderValue)) {
-        log3("retrying edge request", {
-          path,
+        log4("retrying edge request", {
+          url,
           processingError
         }, {
-          F: __dxlog_file5,
-          L: 242,
+          F: __dxlog_file6,
+          L: 324,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -959,33 +1025,35 @@ var EdgeHttpClient = class {
   }
   async _handleUnauthorized(response) {
     if (!this._edgeIdentity) {
-      log3.warn("edge unauthorized response received before identity was set", void 0, {
-        F: __dxlog_file5,
-        L: 251,
+      log4.warn("unauthorized response received before identity was set", void 0, {
+        F: __dxlog_file6,
+        L: 333,
         S: this,
         C: (f, a) => f(...a)
       });
       throw EdgeCallFailedError.fromHttpFailure(response);
     }
     const challenge = await handleAuthChallenge(response, this._edgeIdentity);
-    this._authHeader = encodeAuthHeader(challenge);
-    log3("auth header updated", void 0, {
-      F: __dxlog_file5,
-      L: 256,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    return this._authHeader;
+    return encodeAuthHeader(challenge);
   }
 };
-var createRetryHandler = (args) => {
-  if (!args.retry || args.retry.count < 1) {
+var createRequest = ({ method, body }, authHeader) => {
+  return {
+    method,
+    body: body && JSON.stringify(body),
+    headers: authHeader ? {
+      Authorization: authHeader
+    } : void 0
+  };
+};
+var createRetryHandler = ({ retry }) => {
+  if (!retry || 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;
+  const maxRetries = retry.count ?? DEFAULT_MAX_RETRIES_COUNT;
+  const baseTimeout = retry.timeout ?? DEFAULT_RETRY_TIMEOUT;
+  const jitter = retry.jitter ?? DEFAULT_RETRY_JITTER;
   return async (ctx, retryAfter) => {
     if (++retries > maxRetries || ctx.disposed) {
       return false;
@@ -999,19 +1067,6 @@ var createRetryHandler = (args) => {
     return true;
   };
 };
-var createRequest = (args, authHeader) => {
-  return {
-    method: args.method,
-    body: args.body && JSON.stringify(args.body),
-    headers: authHeader ? {
-      Authorization: authHeader
-    } : void 0
-  };
-};
-var encodeAuthHeader = (challenge) => {
-  const encodedChallenge = Buffer.from(challenge).toString("base64");
-  return `VerifiablePresentation pb;base64,${encodedChallenge}`;
-};
 export {
   CLOUDFLARE_MESSAGE_MAX_BYTES,
   CLOUDFLARE_RPC_MAX_BYTES,