@dxos/functions-runtime-cloudflare 0.8.4-main.3eb6e50203 → 0.8.4-main.422d1c7879

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 invariant5 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 
 // src/internal/data-service-impl.ts
 import { Stream } from "@dxos/codec-protobuf/stream";
@@ -180,10 +180,16 @@ var DataServiceImpl = class {
       hasError: false
     };
     try {
-      const response = _ts_add_disposable_resource(env, await this._dataService.createDocument(this._executionContext, {
-        spaceId,
-        initialValue
-      }), false);
+      invariant(SpaceId.isValid(spaceId), void 0, {
+        F: __dxlog_file,
+        L: 83,
+        S: this,
+        A: [
+          "SpaceId.isValid(spaceId)",
+          ""
+        ]
+      });
+      const response = _ts_add_disposable_resource(env, await this._dataService.createDocument(this._executionContext, spaceId, initialValue), false);
       return {
         documentId: response.documentId
       };
@@ -235,7 +241,7 @@ var DataServiceImpl = class {
   async updateIndexes() {
     log.error("updateIndexes is not available in EDGE env.", void 0, {
       F: __dxlog_file,
-      L: 133,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -248,83 +254,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 +322,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 +335,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 +350,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 +377,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,22 +403,6 @@ 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 { RuntimeServiceError as RuntimeServiceError3 } from "@dxos/errors";
@@ -679,6 +567,8 @@ var QueueServiceImpl = class {
       })(error);
     }
   }
+  async syncQueue(_) {
+  }
 };
 
 // src/internal/service-container.ts
@@ -819,17 +709,19 @@ var ServiceContainer = class {
       subspaceTag,
       spaceId,
       queueId,
-      objects
+      objects: objects.map((obj) => JSON.stringify(obj))
     });
   }
 };
 
 // src/space-proxy.ts
 import { Resource } from "@dxos/context";
-import { invariant as invariant4 } 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
+import { log as log3 } from "@dxos/log";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/queues-api.ts";
 var QueuesAPIImpl = class {
   _serviceContainer;
   _spaceId;
@@ -837,8 +729,31 @@ var QueuesAPIImpl = class {
     this._serviceContainer = _serviceContainer;
     this._spaceId = _spaceId;
   }
-  queryQueue(queue, options) {
-    return this._serviceContainer.queryQueue(queue);
+  async queryQueue(queue, options) {
+    const result = await this._serviceContainer.queryQueue(queue);
+    const objects = (result.objects ?? []).flatMap((encoded) => {
+      try {
+        return [
+          JSON.parse(encoded)
+        ];
+      } catch (err) {
+        log3.verbose("queue object JSON parse failed; object ignored", {
+          encoded,
+          error: err
+        }, {
+          F: __dxlog_file3,
+          L: 42,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return [];
+      }
+    });
+    return {
+      objects,
+      nextCursor: result.nextCursor ?? null,
+      prevCursor: result.prevCursor ?? null
+    };
   }
   insertIntoQueue(queue, objects) {
     return this._serviceContainer.insertIntoQueue(queue, JSON.parse(JSON.stringify(objects)));
@@ -861,7 +776,7 @@ var SpaceProxy = class extends Resource {
     return this._id;
   }
   get db() {
-    invariant4(this._db, void 0, {
+    invariant2(this._db, void 0, {
       F: __dxlog_file4,
       L: 35,
       S: this,
@@ -876,7 +791,7 @@ var SpaceProxy = class extends Resource {
   * @deprecated Use db API.
   */
   get crud() {
-    invariant4(this._db, void 0, {
+    invariant2(this._db, void 0, {
       F: __dxlog_file4,
       L: 43,
       S: this,
@@ -897,11 +812,11 @@ 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
     });
   }
@@ -916,7 +831,7 @@ var FunctionsClient = class extends Resource2 {
   _spaces = /* @__PURE__ */ new Map();
   constructor(services) {
     super();
-    invariant5(typeof services.dataService !== "undefined", "DataService is required", {
+    invariant3(typeof services.dataService !== "undefined", "DataService is required", {
       F: __dxlog_file5,
       L: 33,
       S: this,
@@ -925,7 +840,7 @@ var FunctionsClient = class extends Resource2 {
         "'DataService is required'"
       ]
     });
-    invariant5(typeof services.queueService !== "undefined", "QueueService is required", {
+    invariant3(typeof services.queueService !== "undefined", "QueueService is required", {
       F: __dxlog_file5,
       L: 34,
       S: this,
@@ -983,9 +898,9 @@ var FunctionRouteValue = /* @__PURE__ */ (function(FunctionRouteValue2) {
 })({});
 
 // src/wrap-handler-for-cloudflare.ts
-import { invariant as invariant6 } from "@dxos/invariant";
-import { SpaceId as SpaceId4 } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
+import { invariant as invariant4 } from "@dxos/invariant";
+import { SpaceId as SpaceId2 } from "@dxos/keys";
+import { log as log4 } from "@dxos/log";
 import { EdgeResponse } from "@dxos/protocols";
 var __dxlog_file6 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/wrap-handler-for-cloudflare.ts";
 var wrapHandlerForCloudflare = (func) => {
@@ -996,7 +911,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
           });
@@ -1009,7 +924,7 @@ var wrapHandlerForCloudflare = (func) => {
       });
       return EdgeResponse.success(await invokeFunction(func, context, request));
     } catch (error) {
-      log3.error("error invoking function", {
+      log4.error("error invoking function", {
         error,
         stack: error.stack
       }, {
@@ -1050,7 +965,7 @@ var decodeRequest = async (request) => {
       }
     };
   } catch (err) {
-    log3.catch(err, void 0, {
+    log4.catch(err, void 0, {
       F: __dxlog_file6,
       L: 79,
       S: void 0,
@@ -1088,7 +1003,7 @@ var createFunctionContext = async ({ serviceContainer, contextSpaceId }) => {
       throw new Error(`Space not found: ${contextSpaceId}`);
     }
     spaceKey = meta.spaceKey;
-    invariant6(!meta.rootDocumentId.startsWith("automerge:"), void 0, {
+    invariant4(!meta.rootDocumentId.startsWith("automerge:"), void 0, {
       F: __dxlog_file6,
       L: 117,
       S: void 0,
@@ -1113,36 +1028,40 @@ var createFunctionContext = async ({ serviceContainer, contextSpaceId }) => {
 };
 
 // src/logger.ts
-import { LogLevel, log as log4, shouldLog } from "@dxos/log";
+import { LogLevel, log as log5, shouldLog } from "@dxos/log";
 var setupFunctionsLogger = () => {
-  log4.runtimeConfig.processors.length = 0;
-  log4.runtimeConfig.processors.push(functionLogProcessor);
+  log5.runtimeConfig.processors.length = 0;
+  log5.runtimeConfig.processors.push(functionLogProcessor);
 };
 var functionLogProcessor = (config, entry) => {
   if (!shouldLog(entry, config.filters)) {
     return;
   }
+  const context = entry.computedContext;
+  const error = entry.computedError;
+  const extras = [
+    Object.keys(context).length > 0 ? context : void 0,
+    error
+  ].filter((value) => value !== void 0);
   switch (entry.level) {
     case LogLevel.DEBUG:
-      console.debug(entry.message, entry.context);
-      break;
     case LogLevel.TRACE:
-      console.debug(entry.message, entry.context);
+      console.debug(entry.message, ...extras);
       break;
     case LogLevel.VERBOSE:
-      console.log(entry.message, entry.context);
+      console.log(entry.message, ...extras);
       break;
     case LogLevel.INFO:
-      console.info(entry.message, entry.context);
+      console.info(entry.message, ...extras);
       break;
     case LogLevel.WARN:
-      console.warn(entry.message, entry.context);
+      console.warn(entry.message, ...extras);
       break;
     case LogLevel.ERROR:
-      console.error(entry.message, entry.context);
+      console.error(entry.message, ...extras);
       break;
     default:
-      console.log(entry.message, entry.context);
+      console.log(entry.message, ...extras);
       break;
   }
 };