@dxos/edge-client 0.8.4-main.72ec0f3 → 0.8.4-main.7996785055

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

@@ -123,10 +123,12 @@ var createStubEdgeIdentity = () => {
 };
 
 // src/edge-client.ts
+import { propagation } from "@opentelemetry/api";
 import { Event, PersistentLifecycle, Trigger, TriggerState, scheduleMicroTask, scheduleTaskInterval as scheduleTaskInterval2 } 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";
+import { TRACE_PROCESSOR, TRACE_SPAN_ATTRIBUTE } from "@dxos/tracing";
 
 // src/edge-identity.ts
 import { invariant as invariant2 } from "@dxos/invariant";
@@ -600,7 +602,7 @@ var EdgeClient = class extends Resource2 {
         oldIdentity: this._identity
       }, {
         F: __dxlog_file4,
-        L: 118,
+        L: 121,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -613,11 +615,11 @@ var EdgeClient = class extends Resource2 {
   * Send message.
   * NOTE: The message is guaranteed to be delivered but the service must respond with a message to confirm processing.
   */
-  async send(message) {
+  async send(ctx, message) {
     if (this._ready.state !== TriggerState.RESOLVED) {
       log2("waiting for websocket", void 0, {
         F: __dxlog_file4,
-        L: 131,
+        L: 134,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -631,6 +633,17 @@ var EdgeClient = class extends Resource2 {
     if (message.source && (message.source.peerKey !== this._identity.peerKey || message.source.identityKey !== this.identityKey)) {
       throw new EdgeIdentityChangedError();
     }
+    const spanId = ctx.getAttribute(TRACE_SPAN_ATTRIBUTE);
+    const otlpContext = typeof spanId === "number" ? TRACE_PROCESSOR.remoteTracing.getSpanContext(spanId) : void 0;
+    if (otlpContext) {
+      const activeSpan = {};
+      propagation.inject(otlpContext, activeSpan);
+      message.traceContext = {
+        $typeName: "dxos.edge.messenger.TraceContext",
+        traceparent: activeSpan.traceparent,
+        tracestate: activeSpan.tracestate
+      };
+    }
     this._currentConnection.send(message);
   }
   onMessage(listener) {
@@ -647,7 +660,7 @@ var EdgeClient = class extends Resource2 {
           } catch (error) {
             log2.catch(error, void 0, {
               F: __dxlog_file4,
-              L: 164,
+              L: 186,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -665,7 +678,7 @@ var EdgeClient = class extends Resource2 {
       info: this.info
     }, {
       F: __dxlog_file4,
-      L: 177,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -674,7 +687,7 @@ var EdgeClient = class extends Resource2 {
         err
       }, {
         F: __dxlog_file4,
-        L: 179,
+        L: 201,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -694,7 +707,7 @@ var EdgeClient = class extends Resource2 {
       peerKey: this._identity.peerKey
     }, {
       F: __dxlog_file4,
-      L: 199,
+      L: 221,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -711,7 +724,7 @@ var EdgeClient = class extends Resource2 {
     if (this._identity !== identity) {
       log2("identity changed during auth header request", void 0, {
         F: __dxlog_file4,
-        L: 213,
+        L: 235,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -724,7 +737,7 @@ var EdgeClient = class extends Resource2 {
       protocolHeader
     }, {
       F: __dxlog_file4,
-      L: 219,
+      L: 241,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -739,7 +752,7 @@ var EdgeClient = class extends Resource2 {
         } else {
           log2.verbose("connected callback ignored, because connection is not active", void 0, {
             F: __dxlog_file4,
-            L: 229,
+            L: 251,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -752,7 +765,7 @@ var EdgeClient = class extends Resource2 {
         } else {
           log2.verbose("restart requested by inactive connection", void 0, {
             F: __dxlog_file4,
-            L: 237,
+            L: 259,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -768,7 +781,7 @@ var EdgeClient = class extends Resource2 {
             type: message.payload?.typeUrl
           }, {
             F: __dxlog_file4,
-            L: 245,
+            L: 267,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -805,7 +818,7 @@ var EdgeClient = class extends Resource2 {
           err
         }, {
           F: __dxlog_file4,
-          L: 280,
+          L: 302,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -822,7 +835,7 @@ var EdgeClient = class extends Resource2 {
           payload: protocol.getPayloadType(message)
         }, {
           F: __dxlog_file4,
-          L: 290,
+          L: 312,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -843,7 +856,7 @@ var EdgeClient = class extends Resource2 {
         statusText: response.statusText
       }, {
         F: __dxlog_file4,
-        L: 302,
+        L: 324,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -865,11 +878,13 @@ import * as FetchHttpClient from "@effect/platform/FetchHttpClient";
 import * as HttpClient from "@effect/platform/HttpClient";
 import * as Effect2 from "effect/Effect";
 import * as Function from "effect/Function";
+import { propagation as propagation2 } from "@opentelemetry/api";
 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 { TRACE_PROCESSOR as TRACE_PROCESSOR2, TRACE_SPAN_ATTRIBUTE as TRACE_SPAN_ATTRIBUTE2 } from "@dxos/tracing";
 import { createUrl } from "@dxos/util";
 
 // src/http-client.ts
@@ -934,7 +949,7 @@ var EdgeHttpClient = class {
       url: this._baseUrl
     }, {
       F: __dxlog_file6,
-      L: 107,
+      L: 111,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -951,24 +966,25 @@ var EdgeHttpClient = class {
   //
   // Status
   //
-  async getStatus(args) {
-    return this._call(new URL("/status", this.baseUrl), {
+  async getStatus(ctx, args) {
+    return this._call(ctx, new URL("/status", this.baseUrl), {
       ...args,
-      method: "GET"
+      method: "GET",
+      auth: true
     });
   }
   //
   // Agents
   //
-  createAgent(body, args) {
-    return this._call(new URL("/agents/create", this.baseUrl), {
+  createAgent(ctx, body, args) {
+    return this._call(ctx, new URL("/agents/create", this.baseUrl), {
       ...args,
       method: "POST",
       body
     });
   }
-  getAgentStatus(request, args) {
-    return this._call(new URL(`/users/${request.ownerIdentityKey.toHex()}/agent/status`, this.baseUrl), {
+  getAgentStatus(ctx, request, args) {
+    return this._call(ctx, new URL(`/users/${request.ownerIdentityKey.toHex()}/agent/status`, this.baseUrl), {
       ...args,
       method: "GET"
     });
@@ -976,14 +992,14 @@ var EdgeHttpClient = class {
   //
   // Credentials
   //
-  getCredentialsForNotarization(spaceId, args) {
-    return this._call(new URL(`/spaces/${spaceId}/notarization`, this.baseUrl), {
+  getCredentialsForNotarization(ctx, spaceId, args) {
+    return this._call(ctx, new URL(`/spaces/${spaceId}/notarization`, this.baseUrl), {
       ...args,
       method: "GET"
     });
   }
-  async notarizeCredentials(spaceId, body, args) {
-    await this._call(new URL(`/spaces/${spaceId}/notarization`, this.baseUrl), {
+  async notarizeCredentials(ctx, spaceId, body, args) {
+    await this._call(ctx, new URL(`/spaces/${spaceId}/notarization`, this.baseUrl), {
       ...args,
       body,
       method: "POST"
@@ -992,8 +1008,8 @@ var EdgeHttpClient = class {
   //
   // Identity
   //
-  async recoverIdentity(body, args) {
-    return this._call(new URL("/identity/recover", this.baseUrl), {
+  async recoverIdentity(ctx, body, args) {
+    return this._call(ctx, new URL("/identity/recover", this.baseUrl), {
       ...args,
       body,
       method: "POST"
@@ -1002,8 +1018,8 @@ var EdgeHttpClient = class {
   //
   // Invitations
   //
-  async joinSpaceByInvitation(spaceId, body, args) {
-    return this._call(new URL(`/spaces/${spaceId}/join`, this.baseUrl), {
+  async joinSpaceByInvitation(ctx, spaceId, body, args) {
+    return this._call(ctx, new URL(`/spaces/${spaceId}/join`, this.baseUrl), {
       ...args,
       body,
       method: "POST"
@@ -1012,8 +1028,8 @@ var EdgeHttpClient = class {
   //
   // OAuth and credentials
   //
-  async initiateOAuthFlow(body, args) {
-    return this._call(new URL("/oauth/initiate", this.baseUrl), {
+  async initiateOAuthFlow(ctx, body, args) {
+    return this._call(ctx, new URL("/oauth/initiate", this.baseUrl), {
       ...args,
       body,
       method: "POST"
@@ -1022,8 +1038,8 @@ var EdgeHttpClient = class {
   //
   // Spaces
   //
-  async createSpace(body, args) {
-    return this._call(new URL("/spaces/create", this.baseUrl), {
+  async createSpace(ctx, body, args) {
+    return this._call(ctx, new URL("/spaces/create", this.baseUrl), {
       ...args,
       body,
       method: "POST"
@@ -1032,9 +1048,18 @@ var EdgeHttpClient = class {
   //
   // Queues
   //
-  async queryQueue(subspaceTag, spaceId, query, args) {
-    const { queueId } = query;
-    return this._call(createUrl(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}/query`, this.baseUrl), {
+  async queryQueue(ctx, subspaceTag, spaceId, query, args) {
+    const queueId = query.queueIds?.[0];
+    invariant4(queueId, "queueId required", {
+      F: __dxlog_file6,
+      L: 234,
+      S: this,
+      A: [
+        "queueId",
+        "'queueId required'"
+      ]
+    });
+    return this._call(ctx, createUrl(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}/query`, this.baseUrl), {
       after: query.after,
       before: query.before,
       limit: query.limit,
@@ -1045,8 +1070,8 @@ var EdgeHttpClient = class {
       method: "GET"
     });
   }
-  async insertIntoQueue(subspaceTag, spaceId, queueId, objects, args) {
-    return this._call(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, this.baseUrl), {
+  async insertIntoQueue(ctx, subspaceTag, spaceId, queueId, objects, args) {
+    return this._call(ctx, new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, this.baseUrl), {
       ...args,
       body: {
         objects
@@ -1054,8 +1079,8 @@ var EdgeHttpClient = class {
       method: "POST"
     });
   }
-  async deleteFromQueue(subspaceTag, spaceId, queueId, objectIds, args) {
-    return this._call(createUrl(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, this.baseUrl), {
+  async deleteFromQueue(ctx, subspaceTag, spaceId, queueId, objectIds, args) {
+    return this._call(ctx, createUrl(new URL(`/spaces/${subspaceTag}/${spaceId}/queue/${queueId}`, this.baseUrl), {
       ids: objectIds.join(",")
     }), {
       ...args,
@@ -1065,7 +1090,7 @@ var EdgeHttpClient = class {
   //
   // Functions
   //
-  async uploadFunction(pathParts, body, args) {
+  async uploadFunction(ctx, pathParts, body, args) {
     const formData = new FormData();
     formData.append("name", body.name ?? "");
     formData.append("version", body.version);
@@ -1085,20 +1110,20 @@ var EdgeHttpClient = class {
         pathParts.functionId
       ] : []
     ].join("/");
-    return this._call(new URL(path, this.baseUrl), {
+    return this._call(ctx, new URL(path, this.baseUrl), {
       ...args,
       body: formData,
       method: "PUT",
       json: false
     });
   }
-  async listFunctions(args) {
-    return this._call(new URL("/functions", this.baseUrl), {
+  async listFunctions(ctx, args) {
+    return this._call(ctx, new URL("/functions", this.baseUrl), {
       ...args,
       method: "GET"
     });
   }
-  async invokeFunction(params, input, args) {
+  async invokeFunction(ctx, params, input, args) {
     const url = new URL(`/functions/${params.functionId}`, this.baseUrl);
     if (params.version) {
       url.searchParams.set("version", params.version);
@@ -1112,18 +1137,17 @@ var EdgeHttpClient = class {
     if (params.subrequestsLimit) {
       url.searchParams.set("subrequestsLimit", params.subrequestsLimit.toString());
     }
-    return this._call(url, {
+    return this._call(ctx, url, {
       ...args,
       body: input,
-      method: "POST",
-      rawResponse: true
+      method: "POST"
     });
   }
   //
   // Workflows
   //
-  async executeWorkflow(spaceId, graphId, input, args) {
-    return this._call(new URL(`/workflows/${spaceId}/${graphId}`, this.baseUrl), {
+  async executeWorkflow(ctx, spaceId, graphId, input, args) {
+    return this._call(ctx, new URL(`/workflows/${spaceId}/${graphId}`, this.baseUrl), {
       ...args,
       body: input,
       method: "POST"
@@ -1132,23 +1156,41 @@ var EdgeHttpClient = class {
   //
   // Triggers
   //
-  async getCronTriggers(spaceId) {
-    return this._call(new URL(`/test/functions/${spaceId}/triggers/crons`, this.baseUrl), {
+  async getCronTriggers(ctx, spaceId) {
+    return this._call(ctx, new URL(`/functions/${spaceId}/triggers/crons`, this.baseUrl), {
       method: "GET"
     });
   }
+  async forceRunCronTrigger(ctx, spaceId, triggerId) {
+    return this._call(ctx, new URL(`/functions/${spaceId}/triggers/crons/${triggerId}/run`, this.baseUrl), {
+      method: "POST"
+    });
+  }
+  //
+  // Query
+  //
+  /**
+  * Execute a QueryAST query against a space.
+  */
+  async execQuery(ctx, spaceId, body, args) {
+    return this._call(ctx, new URL(`/spaces/${spaceId}/exec-query`, this.baseUrl), {
+      ...args,
+      body,
+      method: "POST"
+    });
+  }
   //
   // Import/Export space.
   //
-  async importBundle(spaceId, body, args) {
-    return this._call(new URL(`/spaces/${spaceId}/import`, this.baseUrl), {
+  async importBundle(ctx, spaceId, body, args) {
+    return this._call(ctx, new URL(`/spaces/${spaceId}/import`, this.baseUrl), {
       ...args,
       body,
       method: "PUT"
     });
   }
-  async exportBundle(spaceId, body, args) {
-    return this._call(new URL(`/spaces/${spaceId}/export`, this.baseUrl), {
+  async exportBundle(ctx, spaceId, body, args) {
+    return this._call(ctx, new URL(`/spaces/${spaceId}/export`, this.baseUrl), {
       ...args,
       body,
       method: "POST"
@@ -1158,24 +1200,21 @@ 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);
+    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) {
+  async _call(ctx, url, args) {
     const shouldRetry = createRetryHandler(args);
-    const requestContext = args.context ?? Context3.default(void 0, {
-      F: __dxlog_file6,
-      L: 400
-    });
     log4("fetch", {
       url,
       request: args.body
     }, {
       F: __dxlog_file6,
-      L: 401,
+      L: 451,
       S: this,
       C: (f, a) => f(...a)
     });
+    const traceHeaders = getTraceHeaders(ctx);
     let handledAuth = false;
     const tryCount = 1;
     while (true) {
@@ -1187,26 +1226,23 @@ var EdgeHttpClient = class {
             this._authHeader = await this._handleUnauthorized(response2);
           }
         }
-        const request = createRequest(args, this._authHeader);
+        const request = createRequest(args, this._authHeader, traceHeaders);
         log4("call edge", {
           url,
           tryCount,
           authHeader: !!this._authHeader
         }, {
           F: __dxlog_file6,
-          L: 416,
+          L: 468,
           S: this,
           C: (f, a) => f(...a)
         });
         const response = await fetch(url, request);
         if (response.ok) {
           const body2 = await response.clone().json();
-          if (args.rawResponse) {
-            return body2;
-          }
           invariant4(body2, "Expected body to be present", {
             F: __dxlog_file6,
-            L: 424,
+            L: 473,
             S: this,
             A: [
               "body",
@@ -1227,21 +1263,21 @@ var EdgeHttpClient = class {
         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: 440,
+          L: 489,
           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: 447,
+            L: 496,
             S: this,
             A: [
               "!response.ok",
@@ -1253,13 +1289,13 @@ var EdgeHttpClient = class {
       } catch (error) {
         processingError = EdgeCallFailedError.fromProcessingFailureCause(error);
       }
-      if (processingError?.isRetryable && await shouldRetry(requestContext, processingError.retryAfterMs)) {
+      if (processingError?.isRetryable && await shouldRetry(ctx, processingError.retryAfterMs)) {
         log4.verbose("retrying edge request", {
           url,
           processingError
         }, {
           F: __dxlog_file6,
-          L: 455,
+          L: 504,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1272,7 +1308,7 @@ var EdgeHttpClient = class {
     if (!this._edgeIdentity) {
       log4.warn("unauthorized response received before identity was set", void 0, {
         F: __dxlog_file6,
-        L: 464,
+        L: 513,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1282,7 +1318,7 @@ var EdgeHttpClient = class {
     return encodeAuthHeader(challenge);
   }
 };
-var createRequest = ({ method, body, json = true }, authHeader) => {
+var createRequest = ({ method, body, json = true }, authHeader, traceHeaders) => {
   let requestBody;
   const headers = {};
   if (json) {
@@ -1296,7 +1332,7 @@ var createRequest = ({ method, body, json = true }, authHeader) => {
       bodySize: requestBody.length
     }, {
       F: __dxlog_file6,
-      L: 488,
+      L: 538,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -1304,12 +1340,25 @@ var createRequest = ({ method, body, json = true }, authHeader) => {
   if (authHeader) {
     headers["Authorization"] = authHeader;
   }
+  if (traceHeaders) {
+    Object.assign(headers, traceHeaders);
+  }
   return {
     method,
     body: requestBody,
     headers
   };
 };
+var getTraceHeaders = (ctx) => {
+  const spanId = ctx.getAttribute(TRACE_SPAN_ATTRIBUTE2);
+  const otlpContext = typeof spanId === "number" ? TRACE_PROCESSOR2.remoteTracing.getSpanContext(spanId) : void 0;
+  if (!otlpContext) {
+    return void 0;
+  }
+  const headers = {};
+  propagation2.inject(otlpContext, headers);
+  return Object.keys(headers).length > 0 ? headers : void 0;
+};
 var createRetryHandler = ({ retry: retry2 }) => {
   if (!retry2 || retry2.count < 1) {
     return async () => false;