@dxos/edge-client 0.8.4-main.406dc2a → 0.8.4-main.40e3dcdf1b

package/dist/lib/{browser → neutral}/index.mjs

@@ -6,7 +6,7 @@ import {
   getTypename,
   protocol,
   toUint8Array
-} from "./chunk-IKP53CBQ.mjs";
+} from "./chunk-VESGVCLQ.mjs";
 
 // src/index.ts
 export * from "@dxos/protocols/buf/dxos/edge/messenger_pb";
@@ -177,19 +177,6 @@ import { log, logInfo } from "@dxos/log";
 import { EdgeWebsocketProtocol } from "@dxos/protocols";
 import { buf } from "@dxos/protocols/buf";
 import { MessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_decorate(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);
@@ -200,6 +187,28 @@ var __dxlog_file3 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-ws-c
 var SIGNAL_KEEPALIVE_INTERVAL = 4e3;
 var SIGNAL_KEEPALIVE_TIMEOUT = 12e3;
 var EdgeWsConnection = class extends Resource {
+  _identity;
+  _connectionInfo;
+  _callbacks;
+  _inactivityTimeoutCtx;
+  _ws;
+  _wsMuxer;
+  _lastReceivedMessageTimestamp = Date.now();
+  _openTimestamp;
+  // Latency tracking.
+  _pingTimestamp;
+  _rtt = 0;
+  // Rate tracking with sliding window.
+  _uploadRate = 0;
+  _downloadRate = 0;
+  _rateWindow = 1e4;
+  _rateUpdateInterval = 1e3;
+  _bytesSamples = [];
+  _messagesSent = 0;
+  _messagesReceived = 0;
+  constructor(_identity, _connectionInfo, _callbacks) {
+    super(), this._identity = _identity, this._connectionInfo = _connectionInfo, this._callbacks = _callbacks;
+  }
   get info() {
     return {
       open: this.isOpen,
@@ -505,21 +514,6 @@ var EdgeWsConnection = class extends Resource {
     this._uploadRate = timeSpan > 0 ? Math.round(totalSent / timeSpan) : 0;
     this._downloadRate = timeSpan > 0 ? Math.round(totalReceived / timeSpan) : 0;
   }
-  constructor(_identity, _connectionInfo, _callbacks) {
-    super(), _define_property(this, "_identity", void 0), _define_property(this, "_connectionInfo", void 0), _define_property(this, "_callbacks", void 0), _define_property(this, "_inactivityTimeoutCtx", void 0), _define_property(this, "_ws", void 0), _define_property(this, "_wsMuxer", void 0), _define_property(this, "_lastReceivedMessageTimestamp", void 0), _define_property(this, "_openTimestamp", void 0), // Latency tracking.
-    _define_property(this, "_pingTimestamp", void 0), _define_property(this, "_rtt", void 0), // Rate tracking with sliding window.
-    _define_property(this, "_uploadRate", void 0), _define_property(this, "_downloadRate", void 0), _define_property(
-      this,
-      "_rateWindow",
-      void 0
-      // 10 second sliding window.
-    ), _define_property(
-      this,
-      "_rateUpdateInterval",
-      void 0
-      // Update rates every second.
-    ), _define_property(this, "_bytesSamples", void 0), _define_property(this, "_messagesSent", void 0), _define_property(this, "_messagesReceived", void 0), this._identity = _identity, this._connectionInfo = _connectionInfo, this._callbacks = _callbacks, this._lastReceivedMessageTimestamp = Date.now(), this._rtt = 0, this._uploadRate = 0, this._downloadRate = 0, this._rateWindow = 1e4, this._rateUpdateInterval = 1e3, this._bytesSamples = [], this._messagesSent = 0, this._messagesReceived = 0;
-  }
 };
 _ts_decorate([
   logInfo
@@ -546,19 +540,6 @@ var getEdgeUrlWithProtocol = (baseUrl, protocol2) => {
 };
 
 // src/edge-client.ts
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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);
@@ -569,6 +550,24 @@ var __dxlog_file4 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/edge-clie
 var DEFAULT_TIMEOUT = 1e4;
 var STATUS_REFRESH_INTERVAL = 1e3;
 var EdgeClient = class extends Resource2 {
+  _identity;
+  _config;
+  statusChanged = new Event();
+  _persistentLifecycle = new PersistentLifecycle({
+    start: async () => this._connect(),
+    stop: async (state) => this._disconnect(state)
+  });
+  _messageListeners = /* @__PURE__ */ new Set();
+  _reconnectListeners = /* @__PURE__ */ new Set();
+  _baseWsUrl;
+  _baseHttpUrl;
+  _currentConnection = void 0;
+  _ready = new Trigger();
+  constructor(_identity, _config) {
+    super(), this._identity = _identity, this._config = _config;
+    this._baseWsUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "ws");
+    this._baseHttpUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "http");
+  }
   get info() {
     return {
       open: this.isOpen,
@@ -851,14 +850,7 @@ var EdgeClient = class extends Resource2 {
       return void 0;
     }
   }
-  constructor(_identity, _config) {
-    super(), _define_property2(this, "_identity", void 0), _define_property2(this, "_config", void 0), _define_property2(this, "statusChanged", void 0), _define_property2(this, "_persistentLifecycle", void 0), _define_property2(this, "_messageListeners", void 0), _define_property2(this, "_reconnectListeners", void 0), _define_property2(this, "_baseWsUrl", void 0), _define_property2(this, "_baseHttpUrl", void 0), _define_property2(this, "_currentConnection", void 0), _define_property2(this, "_ready", void 0), _define_property2(this, "_isActive", void 0), this._identity = _identity, this._config = _config, this.statusChanged = new Event(), this._persistentLifecycle = new PersistentLifecycle({
-      start: async () => this._connect(),
-      stop: async (state) => this._disconnect(state)
-    }), this._messageListeners = /* @__PURE__ */ new Set(), this._reconnectListeners = /* @__PURE__ */ new Set(), this._currentConnection = void 0, this._ready = new Trigger(), this._isActive = (connection) => connection === this._currentConnection;
-    this._baseWsUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "ws");
-    this._baseHttpUrl = getEdgeUrlWithProtocol(_config.socketEndpoint, "http");
-  }
+  _isActive = (connection) => connection === this._currentConnection;
 };
 _ts_decorate2([
   logInfo2
@@ -875,6 +867,8 @@ 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";
 import { createUrl } from "@dxos/util";
@@ -886,28 +880,14 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schedule from "effect/Schedule";
 import { log as log3 } from "@dxos/log";
-function _define_property3(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file5 = "/__w/dxos/dxos/packages/core/mesh/edge-client/src/http-client.ts";
-var _Context_Tag;
-var HttpConfig = class extends (_Context_Tag = Context2.Tag("HttpConfig")()) {
+var HttpConfig = class _HttpConfig extends Context2.Tag("HttpConfig")() {
+  static default = Layer.succeed(_HttpConfig, {
+    timeout: Duration.millis(1e3),
+    retryTimes: 3,
+    retryBaseDelay: Duration.millis(1e3)
+  });
 };
-_define_property3(HttpConfig, "default", Layer.succeed(HttpConfig, {
-  timeout: Duration.millis(1e3),
-  retryTimes: 3,
-  retryBaseDelay: Duration.millis(1e3)
-}));
 var withRetry = (effect, { timeout: timeout2 = Duration.millis(1e3), retryBaseDelay = Duration.millis(1e3), retryTimes = 3 } = {}) => {
   return effect.pipe(Effect.flatMap((res) => (
     // Treat 500 errors as retryable?
@@ -921,39 +901,45 @@ 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}`;
 };
 
 // src/edge-http-client.ts
-function _define_property4(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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 WARNING_BODY_SIZE = 10 * 1024 * 1024;
 var EdgeHttpClient = class {
+  _baseUrl;
+  _edgeIdentity;
+  /**
+  * Auth header is cached until receiving the next 401 from EDGE, at which point it gets refreshed.
+  */
+  _authHeader;
+  constructor(baseUrl) {
+    this._baseUrl = getEdgeUrlWithProtocol(baseUrl, "http");
+    log4("created", {
+      url: this._baseUrl
+    }, {
+      F: __dxlog_file6,
+      L: 110,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
   get baseUrl() {
     return this._baseUrl;
   }
@@ -969,7 +955,8 @@ var EdgeHttpClient = class {
   async getStatus(args) {
     return this._call(new URL("/status", this.baseUrl), {
       ...args,
-      method: "GET"
+      method: "GET",
+      auth: true
     });
   }
   //
@@ -1048,7 +1035,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: 219,
+      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,
@@ -1086,6 +1082,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
@@ -1129,8 +1126,7 @@ var EdgeHttpClient = class {
     return this._call(url, {
       ...args,
       body: input,
-      method: "POST",
-      rawResponse: true
+      method: "POST"
     });
   }
   //
@@ -1151,6 +1147,24 @@ 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"
+    });
+  }
+  //
+  // Query
+  //
+  /**
+  * Execute a QueryAST query against a space.
+  */
+  async execQuery(spaceId, body, args) {
+    return this._call(new URL(`/spaces/${spaceId}/exec-query`, this.baseUrl), {
+      ...args,
+      body,
+      method: "POST"
+    });
+  }
   //
   // Import/Export space.
   //
@@ -1171,75 +1185,106 @@ 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 ?? new Context3(void 0, {
+    const requestContext = args.context ?? Context3.default(void 0, {
       F: __dxlog_file6,
-      L: 391
+      L: 426
     });
     log4("fetch", {
       url,
       request: args.body
     }, {
       F: __dxlog_file6,
-      L: 392,
+      L: 427,
       S: this,
       C: (f, a) => f(...a)
     });
     let handledAuth = false;
+    const tryCount = 1;
     while (true) {
       let processingError = void 0;
-      let retryAfterHeaderValue = Number.NaN;
       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: 442,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         const response = await fetch(url, request);
-        retryAfterHeaderValue = Number(response.headers.get("Retry-After"));
         if (response.ok) {
-          const body = await response.json();
-          if (args.rawResponse) {
-            return body;
-          }
-          if (!("success" in body)) {
-            return body;
-          }
-          if (body.success) {
-            return body.data;
-          }
-          log4.warn("unsuccessful edge response", {
-            url,
-            body
-          }, {
+          const body2 = await response.clone().json();
+          invariant4(body2, "Expected body to be present", {
             F: __dxlog_file6,
-            L: 417,
+            L: 447,
             S: this,
-            C: (f, a) => f(...a)
+            A: [
+              "body",
+              "'Expected body to be present'"
+            ]
           });
-          if (body.errorData?.type === "auth_challenge" && typeof body.errorData?.challenge === "string") {
-            processingError = new EdgeAuthChallengeError(body.errorData.challenge, body.errorData);
-          } else if (body.errorData) {
-            processingError = EdgeCallFailedError.fromUnsuccessfulResponse(response, body);
+          if (!("success" in body2)) {
+            return body2;
+          }
+          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: 463,
+          S: this,
+          A: [
+            "!body?.success",
+            "'Expected body to not be a failure response or undefined.'"
+          ]
+        });
+        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: 470,
+            S: this,
+            A: [
+              "!response.ok",
+              "'Expected response to not be ok.'"
+            ]
+          });
           processingError = await EdgeCallFailedError.fromHttpFailure(response);
         }
       } catch (error) {
         processingError = EdgeCallFailedError.fromProcessingFailureCause(error);
       }
-      if (processingError?.isRetryable && await shouldRetry(requestContext, retryAfterHeaderValue)) {
-        log4("retrying edge request", {
+      if (processingError?.isRetryable && await shouldRetry(requestContext, processingError.retryAfterMs)) {
+        log4.verbose("retrying edge request", {
           url,
           processingError
         }, {
           F: __dxlog_file6,
-          L: 435,
+          L: 478,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1252,7 +1297,7 @@ var EdgeHttpClient = class {
     if (!this._edgeIdentity) {
       log4.warn("unauthorized response received before identity was set", void 0, {
         F: __dxlog_file6,
-        L: 444,
+        L: 487,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1261,20 +1306,6 @@ var EdgeHttpClient = class {
     const challenge = await handleAuthChallenge(response, this._edgeIdentity);
     return encodeAuthHeader(challenge);
   }
-  constructor(baseUrl) {
-    _define_property4(this, "_baseUrl", void 0);
-    _define_property4(this, "_edgeIdentity", void 0);
-    _define_property4(this, "_authHeader", void 0);
-    this._baseUrl = getEdgeUrlWithProtocol(baseUrl, "http");
-    log4("created", {
-      url: this._baseUrl
-    }, {
-      F: __dxlog_file6,
-      L: 99,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
 };
 var createRequest = ({ method, body, json = true }, authHeader) => {
   let requestBody;
@@ -1290,7 +1321,7 @@ var createRequest = ({ method, body, json = true }, authHeader) => {
       bodySize: requestBody.length
     }, {
       F: __dxlog_file6,
-      L: 468,
+      L: 511,
       S: void 0,
       C: (f, a) => f(...a)
     });