@dxos/edge-client 0.8.4-main.ae835ea → 0.8.4-main.bc674ce

package/dist/lib/node-esm/index.mjs

@@ -868,6 +868,7 @@ import * as Effect2 from "effect/Effect";
 import * as Function from "effect/Function";
 import { sleep } from "@dxos/async";
 import { Context as Context3 } from "@dxos/context";
+import { runAndForwardErrors } from "@dxos/effect";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { log as log4 } from "@dxos/log";
 import { EdgeAuthChallengeError, EdgeCallFailedError } from "@dxos/protocols";
@@ -901,14 +902,16 @@ 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: 64,
-  S: void 0,
-  C: (f, a) => f(...a)
-})));
+var withLogging = (effect) => effect.pipe(Effect.tap((res) => {
+  log3.info("response", {
+    status: res.status
+  }, {
+    F: __dxlog_file5,
+    L: 66,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
+}));
 var encodeAuthHeader = (challenge) => {
   const encodedChallenge = Buffer.from(challenge).toString("base64");
   return `VerifiablePresentation pb;base64,${encodedChallenge}`;
@@ -933,7 +936,7 @@ var EdgeHttpClient = class {
       url: this._baseUrl
     }, {
       F: __dxlog_file6,
-      L: 101,
+      L: 107,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -953,7 +956,8 @@ var EdgeHttpClient = class {
   async getStatus(args) {
     return this._call(new URL("/status", this.baseUrl), {
       ...args,
-      method: "GET"
+      method: "GET",
+      auth: true
     });
   }
   //
@@ -1032,7 +1036,16 @@ var EdgeHttpClient = class {
   // Queues
   //
   async queryQueue(subspaceTag, spaceId, query, args) {
-    const { queueId } = query;
+    const queueId = query.queueIds?.[0];
+    invariant4(queueId, "queueId required", {
+      F: __dxlog_file6,
+      L: 216,
+      S: this,
+      A: [
+        "queueId",
+        "'queueId required'"
+      ]
+    });
     return this._call(createUrl(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}/query`, this.baseUrl), {
       after: query.after,
       before: query.before,
@@ -1070,6 +1083,7 @@ var EdgeHttpClient = class {
     formData.append("version", body.version);
     formData.append("ownerPublicKey", body.ownerPublicKey);
     formData.append("entryPoint", body.entryPoint);
+    body.runtime && formData.append("runtime", body.runtime);
     for (const [filename, content] of Object.entries(body.assets)) {
       formData.append("assets", new Blob([
         content
@@ -1113,8 +1127,7 @@ var EdgeHttpClient = class {
     return this._call(url, {
       ...args,
       body: input,
-      method: "POST",
-      rawResponse: true
+      method: "POST"
     });
   }
   //
@@ -1135,6 +1148,11 @@ var EdgeHttpClient = class {
       method: "GET"
     });
   }
+  async forceRunCronTrigger(spaceId, triggerId) {
+    return this._call(new URL(`/test/functions/${spaceId}/triggers/crons/${triggerId}/run`, this.baseUrl), {
+      method: "POST"
+    });
+  }
   //
   // Import/Export space.
   //
@@ -1155,73 +1173,88 @@ var EdgeHttpClient = class {
   //
   // Internal
   //
-  async _fetch(url, args) {
-    return Function.pipe(HttpClient.get(url), withLogging, withRetryConfig, Effect2.provide(FetchHttpClient.layer), Effect2.provide(HttpConfig.default), Effect2.withSpan("EdgeHttpClient"), Effect2.runPromise);
+  async _fetch(url, _args) {
+    return Function.pipe(HttpClient.get(url), withLogging, withRetryConfig, Effect2.provide(FetchHttpClient.layer), Effect2.provide(HttpConfig.default), Effect2.withSpan("EdgeHttpClient"), runAndForwardErrors);
   }
   // TODO(burdon): Refactor with effect (see edge-http-client.test.ts).
   async _call(url, args) {
     const shouldRetry = createRetryHandler(args);
     const requestContext = args.context ?? Context3.default(void 0, {
       F: __dxlog_file6,
-      L: 393
+      L: 408
     });
     log4("fetch", {
       url,
       request: args.body
     }, {
       F: __dxlog_file6,
-      L: 394,
+      L: 409,
       S: this,
       C: (f, a) => f(...a)
     });
     let handledAuth = false;
+    const tryCount = 1;
     while (true) {
       let processingError = void 0;
       try {
+        if (!this._authHeader && args.auth) {
+          const response2 = await fetch(new URL(`/auth`, this.baseUrl));
+          if (response2.status === 401) {
+            this._authHeader = await this._handleUnauthorized(response2);
+          }
+        }
         const request = createRequest(args, this._authHeader);
+        log4("call edge", {
+          url,
+          tryCount,
+          authHeader: !!this._authHeader
+        }, {
+          F: __dxlog_file6,
+          L: 424,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         const response = await fetch(url, request);
-        const body = response.headers.get("Content-Type") === "application/json" ? await response.clone().json() : void 0;
         if (response.ok) {
-          if (args.rawResponse) {
-            return body;
-          }
-          invariant4(body, "Expected body to be present", {
+          const body2 = await response.clone().json();
+          invariant4(body2, "Expected body to be present", {
             F: __dxlog_file6,
-            L: 409,
+            L: 429,
             S: this,
             A: [
               "body",
               "'Expected body to be present'"
             ]
           });
-          if (!("success" in body)) {
-            return body;
+          if (!("success" in body2)) {
+            return body2;
           }
-          if (body.success) {
-            return body.data;
+          if (body2.success) {
+            return body2.data;
           }
         } else if (response.status === 401 && !handledAuth) {
           this._authHeader = await this._handleUnauthorized(response);
           handledAuth = true;
           continue;
         }
+        const body = response.headers.get("Content-Type") === "application/json" ? await response.clone().json() : void 0;
         invariant4(!body?.success, "Expected body to not be a failure response or undefined.", {
           F: __dxlog_file6,
-          L: 422,
+          L: 445,
           S: this,
           A: [
             "!body?.success",
             "'Expected body to not be a failure response or undefined.'"
           ]
         });
-        if (body?.errorData?.type === "auth_challenge" && typeof body?.errorData?.challenge === "string") {
-          processingError = new EdgeAuthChallengeError(body.errorData.challenge, body.errorData);
+        if (body?.data?.type === "auth_challenge" && typeof body?.data?.challenge === "string") {
+          processingError = new EdgeAuthChallengeError(body.data.challenge, body.data);
         } else if (body?.success === false) {
           processingError = EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
         } else {
           invariant4(!response.ok, "Expected response to not be ok.", {
             F: __dxlog_file6,
-            L: 429,
+            L: 452,
             S: this,
             A: [
               "!response.ok",
@@ -1234,12 +1267,12 @@ var EdgeHttpClient = class {
         processingError = EdgeCallFailedError.fromProcessingFailureCause(error);
       }
       if (processingError?.isRetryable && await shouldRetry(requestContext, processingError.retryAfterMs)) {
-        log4("retrying edge request", {
+        log4.verbose("retrying edge request", {
           url,
           processingError
         }, {
           F: __dxlog_file6,
-          L: 437,
+          L: 460,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1252,7 +1285,7 @@ var EdgeHttpClient = class {
     if (!this._edgeIdentity) {
       log4.warn("unauthorized response received before identity was set", void 0, {
         F: __dxlog_file6,
-        L: 446,
+        L: 469,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1276,7 +1309,7 @@ var createRequest = ({ method, body, json = true }, authHeader) => {
       bodySize: requestBody.length
     }, {
       F: __dxlog_file6,
-      L: 470,
+      L: 493,
       S: void 0,
       C: (f, a) => f(...a)
     });