@dxos/functions-runtime-cloudflare 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

package/dist/lib/browser/index.mjs

@@ -1,7 +1,7 @@
 // src/functions-client.ts
 import { Resource as Resource2 } from "@dxos/context";
 import { EchoClient } from "@dxos/echo-db";
-import { invariant as invariant6 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 
 // src/internal/data-service-impl.ts
 import { Stream } from "@dxos/codec-protobuf/stream";
@@ -248,83 +248,9 @@ var DataServiceImpl = class {
 };
 
 // src/internal/query-service-impl.ts
-import * as Schema from "effect/Schema";
 import { Stream as Stream2 } from "@dxos/codec-protobuf/stream";
-import { QueryAST } from "@dxos/echo-protocol";
 import { NotImplementedError as NotImplementedError2, RuntimeServiceError as RuntimeServiceError2 } from "@dxos/errors";
-import { invariant as invariant3 } from "@dxos/invariant";
-import { PublicKey } from "@dxos/keys";
-import { SpaceId as SpaceId3 } from "@dxos/keys";
 import { log as log2 } from "@dxos/log";
-
-// src/internal/adapter.ts
-import { failUndefined } from "@dxos/debug";
-import { invariant as invariant2 } from "@dxos/invariant";
-import { SpaceId as SpaceId2 } from "@dxos/keys";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/internal/adapter.ts";
-var queryToDataServiceRequest = (query) => {
-  const { filter, options } = isSimpleSelectionQuery(query) ?? failUndefined();
-  invariant2(options?.spaceIds?.length === 1, "Only one space is supported", {
-    F: __dxlog_file2,
-    L: 13,
-    S: void 0,
-    A: [
-      "options?.spaceIds?.length === 1",
-      "'Only one space is supported'"
-    ]
-  });
-  invariant2(filter.type === "object", "Only object filters are supported", {
-    F: __dxlog_file2,
-    L: 14,
-    S: void 0,
-    A: [
-      "filter.type === 'object'",
-      "'Only object filters are supported'"
-    ]
-  });
-  const spaceId = options.spaceIds[0];
-  invariant2(SpaceId2.isValid(spaceId), void 0, {
-    F: __dxlog_file2,
-    L: 17,
-    S: void 0,
-    A: [
-      "SpaceId.isValid(spaceId)",
-      ""
-    ]
-  });
-  return {
-    spaceId,
-    type: filter.typename ?? void 0,
-    objectIds: [
-      ...filter.id ?? []
-    ]
-  };
-};
-var isSimpleSelectionQuery = (query) => {
-  switch (query.type) {
-    case "options": {
-      const maybeFilter = isSimpleSelectionQuery(query.query);
-      if (!maybeFilter) {
-        return null;
-      }
-      return {
-        filter: maybeFilter.filter,
-        options: query.options
-      };
-    }
-    case "select": {
-      return {
-        filter: query.filter,
-        options: void 0
-      };
-    }
-    default: {
-      return null;
-    }
-  }
-};
-
-// src/internal/query-service-impl.ts
 function _ts_add_disposable_resource2(env, value, async) {
   if (value !== null && value !== void 0) {
     if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
@@ -390,7 +316,7 @@ function _ts_dispose_resources2(env) {
     return next();
   })(env);
 }
-var __dxlog_file3 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/internal/query-service-impl.ts";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/internal/query-service-impl.ts";
 var QueryServiceImpl = class {
   _executionContext;
   _dataService;
@@ -403,23 +329,11 @@ var QueryServiceImpl = class {
     log2.info("execQuery", {
       request
     }, {
-      F: __dxlog_file3,
-      L: 34,
+      F: __dxlog_file2,
+      L: 20,
       S: this,
       C: (f, a) => f(...a)
     });
-    const query = QueryAST.Query.pipe(Schema.decodeUnknownSync)(JSON.parse(request.query));
-    const requestedSpaceIds = getTargetSpacesForQuery(query);
-    invariant3(requestedSpaceIds.length === 1, "Only one space is supported", {
-      F: __dxlog_file3,
-      L: 37,
-      S: this,
-      A: [
-        "requestedSpaceIds.length === 1",
-        "'Only one space is supported'"
-      ]
-    });
-    const spaceId = requestedSpaceIds[0];
     return Stream2.fromPromise((async () => {
       try {
         const env = {
@@ -430,37 +344,23 @@ var QueryServiceImpl = class {
         try {
           this._queryCount++;
           log2.info("begin query", {
-            spaceId
+            request
           }, {
-            F: __dxlog_file3,
-            L: 44,
+            F: __dxlog_file2,
+            L: 26,
             S: this,
             C: (f, a) => f(...a)
           });
-          const queryResponse = _ts_add_disposable_resource2(env, await this._dataService.queryDocuments(this._executionContext, queryToDataServiceRequest(query)), false);
+          const queryResponse = _ts_add_disposable_resource2(env, await this._dataService.execQuery(this._executionContext, request), false);
           log2.info("query response", {
-            spaceId,
-            filter: request.filter,
-            resultCount: queryResponse.results.length
+            resultCount: queryResponse.results?.length
           }, {
-            F: __dxlog_file3,
-            L: 49,
+            F: __dxlog_file2,
+            L: 28,
             S: this,
             C: (f, a) => f(...a)
           });
-          return {
-            results: queryResponse.results.map((object) => ({
-              id: object.objectId,
-              spaceId,
-              spaceKey: PublicKey.ZERO,
-              documentId: object.document.documentId,
-              // Rank 1 for predicate matches where ranking is not determined.
-              rank: 1,
-              // Copy returned object to avoid hanging RPC stub.
-              // See https://developers.cloudflare.com/workers/runtime-apis/rpc/lifecycle/
-              documentAutomerge: copyUint8Array(object.document.data)
-            }))
-          };
+          return structuredClone(queryResponse);
         } catch (e) {
           env.error = e;
           env.hasError = true;
@@ -471,16 +371,14 @@ var QueryServiceImpl = class {
         log2.error("query failed", {
           err: error
         }, {
-          F: __dxlog_file3,
-          L: 66,
+          F: __dxlog_file2,
+          L: 31,
           S: this,
           C: (f, a) => f(...a)
         });
         throw new RuntimeServiceError2({
           message: `Query execution failed (queryCount=${this._queryCount})`,
           context: {
-            spaceId,
-            filter: request.filter,
             queryCount: this._queryCount
           },
           cause: error
@@ -499,26 +397,9 @@ var QueryServiceImpl = class {
     });
   }
 };
-var getTargetSpacesForQuery = (query) => {
-  const spaces = /* @__PURE__ */ new Set();
-  const visitor = (node) => {
-    if (node.type === "options") {
-      if (node.options.spaceIds) {
-        for (const spaceId of node.options.spaceIds) {
-          spaces.add(SpaceId3.make(spaceId));
-        }
-      }
-    }
-  };
-  QueryAST.visit(query, visitor);
-  return [
-    ...spaces
-  ];
-};
 
 // src/internal/queue-service-impl.ts
-import { NotImplementedError as NotImplementedError3, RuntimeServiceError as RuntimeServiceError3 } from "@dxos/errors";
-import { invariant as invariant4 } from "@dxos/invariant";
+import { RuntimeServiceError as RuntimeServiceError3 } from "@dxos/errors";
 function _ts_add_disposable_resource3(env, value, async) {
   if (value !== null && value !== void 0) {
     if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
@@ -584,7 +465,6 @@ function _ts_dispose_resources3(env) {
     return next();
   })(env);
 }
-var __dxlog_file4 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/internal/queue-service-impl.ts";
 var QueueServiceImpl = class {
   _ctx;
   _queueService;
@@ -593,19 +473,6 @@ var QueueServiceImpl = class {
     this._queueService = _queueService;
   }
   async queryQueue(request) {
-    const { query } = request;
-    const { queueIds, ...filter } = query;
-    const spaceId = query.spaceId;
-    const queueId = queueIds?.[0];
-    invariant4(request.query.queuesNamespace, void 0, {
-      F: __dxlog_file4,
-      L: 26,
-      S: this,
-      A: [
-        "request.query.queuesNamespace",
-        ""
-      ]
-    });
     try {
       const env = {
         stack: [],
@@ -613,10 +480,8 @@ var QueueServiceImpl = class {
         hasError: false
       };
       try {
-        const result = _ts_add_disposable_resource3(env, await this._queueService.query(this._ctx, `dxn:queue:${request.query.queuesNamespace}:${spaceId}:${queueId}`, filter), false);
+        const result = _ts_add_disposable_resource3(env, await this._queueService.queryQueue(this._ctx, request), false);
         return {
-          // Copy returned object to avoid hanging RPC stub
-          // See https://developers.cloudflare.com/workers/runtime-apis/rpc/lifecycle/
           objects: structuredClone(result.objects),
           nextCursor: result.nextCursor,
           prevCursor: result.prevCursor
@@ -628,22 +493,35 @@ var QueueServiceImpl = class {
         _ts_dispose_resources3(env);
       }
     } catch (error) {
+      const { query } = request;
       throw RuntimeServiceError3.wrap({
         message: "Queue query failed.",
         context: {
-          subspaceTag: request.query.queuesNamespace,
-          spaceId,
-          queueId
+          subspaceTag: query?.queuesNamespace,
+          spaceId: query?.spaceId,
+          queueId: query?.queueIds?.[0]
         },
         ifTypeDiffers: true
       })(error);
     }
   }
   async insertIntoQueue(request) {
-    const { subspaceTag, spaceId, queueId, objects } = request;
     try {
-      await this._queueService.append(this._ctx, `dxn:queue:${subspaceTag}:${spaceId}:${queueId}`, objects ?? []);
+      const env = {
+        stack: [],
+        error: void 0,
+        hasError: false
+      };
+      try {
+        const _ = _ts_add_disposable_resource3(env, await this._queueService.insertIntoQueue(this._ctx, request), false);
+      } catch (e) {
+        env.error = e;
+        env.hasError = true;
+      } finally {
+        _ts_dispose_resources3(env);
+      }
     } catch (error) {
+      const { subspaceTag, spaceId, queueId } = request;
       throw RuntimeServiceError3.wrap({
         message: "Queue append failed.",
         context: {
@@ -655,16 +533,35 @@ var QueueServiceImpl = class {
       })(error);
     }
   }
-  deleteFromQueue(request) {
-    const { subspaceTag, spaceId, queueId } = request;
-    throw new NotImplementedError3({
-      message: "Deleting from queue is not supported.",
-      context: {
-        subspaceTag,
-        spaceId,
-        queueId
+  async deleteFromQueue(request) {
+    try {
+      const env = {
+        stack: [],
+        error: void 0,
+        hasError: false
+      };
+      try {
+        const _ = _ts_add_disposable_resource3(env, await this._queueService.deleteFromQueue(this._ctx, request), false);
+      } catch (e) {
+        env.error = e;
+        env.hasError = true;
+      } finally {
+        _ts_dispose_resources3(env);
       }
-    });
+    } catch (error) {
+      const { subspaceTag, spaceId, queueId } = request;
+      throw RuntimeServiceError3.wrap({
+        message: "Queue delete failed.",
+        context: {
+          subspaceTag,
+          spaceId,
+          queueId
+        },
+        ifTypeDiffers: true
+      })(error);
+    }
+  }
+  async syncQueue(_) {
   }
 };
 
@@ -776,37 +673,45 @@ var ServiceContainer = class {
     };
   }
   async queryQueue(queue) {
-    const env = {
-      stack: [],
-      error: void 0,
-      hasError: false
-    };
-    try {
-      const { spaceId } = queue.asQueueDXN() ?? {};
-      const result = _ts_add_disposable_resource4(env, await this._queueService.query({}, queue.toString(), {
-        spaceId
-      }), false);
-      return {
-        objects: structuredClone(result.objects),
-        nextCursor: result.nextCursor ?? null,
-        prevCursor: result.prevCursor ?? null
-      };
-    } catch (e) {
-      env.error = e;
-      env.hasError = true;
-    } finally {
-      _ts_dispose_resources4(env);
+    const parts = queue.asQueueDXN();
+    if (!parts) {
+      throw new Error("Invalid queue DXN");
     }
+    const { subspaceTag, spaceId, queueId } = parts;
+    const result = await this._queueService.queryQueue(this._executionContext, {
+      query: {
+        spaceId,
+        queuesNamespace: subspaceTag,
+        queueIds: [
+          queueId
+        ]
+      }
+    });
+    return {
+      objects: structuredClone(result.objects),
+      nextCursor: result.nextCursor ?? null,
+      prevCursor: result.prevCursor ?? null
+    };
   }
   async insertIntoQueue(queue, objects) {
-    await this._queueService.append({}, queue.toString(), objects);
+    const parts = queue.asQueueDXN();
+    if (!parts) {
+      throw new Error("Invalid queue DXN");
+    }
+    const { subspaceTag, spaceId, queueId } = parts;
+    await this._queueService.insertIntoQueue(this._executionContext, {
+      subspaceTag,
+      spaceId,
+      queueId,
+      objects
+    });
   }
 };
 
 // src/space-proxy.ts
 import { Resource } from "@dxos/context";
-import { invariant as invariant5 } from "@dxos/invariant";
-import { PublicKey as PublicKey2 } from "@dxos/keys";
+import { invariant as invariant2 } from "@dxos/invariant";
+import { PublicKey } from "@dxos/keys";
 
 // src/queues-api.ts
 var QueuesAPIImpl = class {
@@ -825,7 +730,7 @@ var QueuesAPIImpl = class {
 };
 
 // src/space-proxy.ts
-var __dxlog_file5 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/space-proxy.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/space-proxy.ts";
 var SpaceProxy = class extends Resource {
   _serviceContainer;
   _echoClient;
@@ -840,8 +745,8 @@ var SpaceProxy = class extends Resource {
     return this._id;
   }
   get db() {
-    invariant5(this._db, void 0, {
-      F: __dxlog_file5,
+    invariant2(this._db, void 0, {
+      F: __dxlog_file3,
       L: 35,
       S: this,
       A: [
@@ -855,8 +760,8 @@ var SpaceProxy = class extends Resource {
   * @deprecated Use db API.
   */
   get crud() {
-    invariant5(this._db, void 0, {
-      F: __dxlog_file5,
+    invariant2(this._db, void 0, {
+      F: __dxlog_file3,
       L: 43,
       S: this,
       A: [
@@ -876,18 +781,18 @@ var SpaceProxy = class extends Resource {
     }
     this._db = this._echoClient.constructDatabase({
       spaceId: this._id,
-      spaceKey: PublicKey2.from(meta.spaceKey),
+      spaceKey: PublicKey.from(meta.spaceKey),
       reactiveSchemaQuery: false,
       owningObject: this
     });
-    await this._db.coreDatabase.open({
+    await this._db.coreDatabase.open(this._ctx, {
       rootUrl: meta.rootDocumentId
     });
   }
 };
 
 // src/functions-client.ts
-var __dxlog_file6 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/functions-client.ts";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/functions-client.ts";
 var FunctionsClient = class extends Resource2 {
   _serviceContainer;
   _echoClient;
@@ -895,8 +800,8 @@ var FunctionsClient = class extends Resource2 {
   _spaces = /* @__PURE__ */ new Map();
   constructor(services) {
     super();
-    invariant6(typeof services.dataService !== "undefined", "DataService is required", {
-      F: __dxlog_file6,
+    invariant3(typeof services.dataService !== "undefined", "DataService is required", {
+      F: __dxlog_file4,
       L: 33,
       S: this,
       A: [
@@ -904,8 +809,8 @@ var FunctionsClient = class extends Resource2 {
         "'DataService is required'"
       ]
     });
-    invariant6(typeof services.queueService !== "undefined", "QueueService is required", {
-      F: __dxlog_file6,
+    invariant3(typeof services.queueService !== "undefined", "QueueService is required", {
+      F: __dxlog_file4,
       L: 34,
       S: this,
       A: [
@@ -962,11 +867,11 @@ var FunctionRouteValue = /* @__PURE__ */ (function(FunctionRouteValue2) {
 })({});
 
 // src/wrap-handler-for-cloudflare.ts
-import { invariant as invariant7 } from "@dxos/invariant";
-import { SpaceId as SpaceId4 } from "@dxos/keys";
+import { invariant as invariant4 } from "@dxos/invariant";
+import { SpaceId as SpaceId2 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 import { EdgeResponse } from "@dxos/protocols";
-var __dxlog_file7 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/wrap-handler-for-cloudflare.ts";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/wrap-handler-for-cloudflare.ts";
 var wrapHandlerForCloudflare = (func) => {
   return async (request, env) => {
     if (request.headers.get(FUNCTION_ROUTE_HEADER) === FunctionRouteValue.Meta) {
@@ -975,7 +880,7 @@ var wrapHandlerForCloudflare = (func) => {
     try {
       const spaceId = new URL(request.url).searchParams.get("spaceId");
       if (spaceId) {
-        if (!SpaceId4.isValid(spaceId)) {
+        if (!SpaceId2.isValid(spaceId)) {
           return new Response("Invalid spaceId", {
             status: 400
           });
@@ -992,7 +897,7 @@ var wrapHandlerForCloudflare = (func) => {
         error,
         stack: error.stack
       }, {
-        F: __dxlog_file7,
+        F: __dxlog_file5,
         L: 44,
         S: void 0,
         C: (f, a) => f(...a)
@@ -1030,7 +935,7 @@ var decodeRequest = async (request) => {
     };
   } catch (err) {
     log3.catch(err, void 0, {
-      F: __dxlog_file7,
+      F: __dxlog_file5,
       L: 79,
       S: void 0,
       C: (f, a) => f(...a)
@@ -1067,8 +972,8 @@ var createFunctionContext = async ({ serviceContainer, contextSpaceId }) => {
       throw new Error(`Space not found: ${contextSpaceId}`);
     }
     spaceKey = meta.spaceKey;
-    invariant7(!meta.rootDocumentId.startsWith("automerge:"), void 0, {
-      F: __dxlog_file7,
+    invariant4(!meta.rootDocumentId.startsWith("automerge:"), void 0, {
+      F: __dxlog_file5,
       L: 117,
       S: void 0,
       A: [