@dxos/functions-runtime-cloudflare 0.8.4-main.3eb6e50203 → 0.8.4-main.40e3dcdf1b

package/dist/lib/browser/meta.json

@@ -1 +1 @@
-{"inputs":{"src/internal/utils.ts":{"bytes":692,"imports":[],"format":"esm"},"src/internal/data-service-impl.ts":{"bytes":19658,"imports":[{"path":"@dxos/codec-protobuf/stream","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"src/internal/utils.ts","kind":"import-statement","original":"./utils"}],"format":"esm"},"src/internal/adapter.ts":{"bytes":5596,"imports":[{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true}],"format":"esm"},"src/internal/query-service-impl.ts":{"bytes":16599,"imports":[{"path":"effect/Schema","kind":"import-statement","external":true},{"path":"@dxos/codec-protobuf/stream","kind":"import-statement","external":true},{"path":"@dxos/echo-protocol","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"src/internal/adapter.ts","kind":"import-statement","original":"./adapter"},{"path":"src/internal/utils.ts","kind":"import-statement","original":"./utils"}],"format":"esm"},"src/internal/queue-service-impl.ts":{"bytes":11072,"imports":[{"path":"@dxos/errors","kind":"import-statement","external":true}],"format":"esm"},"src/internal/service-container.ts":{"bytes":12956,"imports":[{"path":"src/internal/data-service-impl.ts","kind":"import-statement","original":"./data-service-impl"},{"path":"src/internal/query-service-impl.ts","kind":"import-statement","original":"./query-service-impl"},{"path":"src/internal/queue-service-impl.ts","kind":"import-statement","original":"./queue-service-impl"}],"format":"esm"},"src/internal/index.ts":{"bytes":503,"imports":[{"path":"src/internal/service-container.ts","kind":"import-statement","original":"./service-container"}],"format":"esm"},"src/queues-api.ts":{"bytes":3005,"imports":[],"format":"esm"},"src/space-proxy.ts":{"bytes":6240,"imports":[{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"src/queues-api.ts","kind":"import-statement","original":"./queues-api"}],"format":"esm"},"src/functions-client.ts":{"bytes":9326,"imports":[{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/echo-db","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"src/internal/index.ts","kind":"import-statement","original":"./internal"},{"path":"src/space-proxy.ts","kind":"import-statement","original":"./space-proxy"}],"format":"esm"},"src/types.ts":{"bytes":1696,"imports":[],"format":"esm"},"src/wrap-handler-for-cloudflare.ts":{"bytes":15375,"imports":[{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"src/internal/index.ts","kind":"import-statement","original":"./internal"},{"path":"src/types.ts","kind":"import-statement","original":"./types"}],"format":"esm"},"src/logger.ts":{"bytes":4389,"imports":[{"path":"@dxos/log","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":879,"imports":[{"path":"src/functions-client.ts","kind":"import-statement","original":"./functions-client"},{"path":"src/internal/index.ts","kind":"import-statement","original":"./internal"},{"path":"src/types.ts","kind":"import-statement","original":"./types"},{"path":"src/wrap-handler-for-cloudflare.ts","kind":"import-statement","original":"./wrap-handler-for-cloudflare"},{"path":"src/logger.ts","kind":"import-statement","original":"./logger"}],"format":"esm"}},"outputs":{"dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":45586},"dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/echo-db","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/codec-protobuf/stream","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"effect/Schema","kind":"import-statement","external":true},{"path":"@dxos/codec-protobuf/stream","kind":"import-statement","external":true},{"path":"@dxos/echo-protocol","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true}],"exports":["FUNCTION_ROUTE_HEADER","FunctionRouteValue","FunctionsClient","ServiceContainer","createClientFromEnv","setupFunctionsLogger","wrapHandlerForCloudflare"],"entryPoint":"src/index.ts","inputs":{"src/functions-client.ts":{"bytesInOutput":2163},"src/internal/data-service-impl.ts":{"bytesInOutput":7096},"src/internal/utils.ts":{"bytesInOutput":55},"src/internal/query-service-impl.ts":{"bytesInOutput":6314},"src/internal/adapter.ts":{"bytesInOutput":1609},"src/internal/queue-service-impl.ts":{"bytesInOutput":4763},"src/internal/service-container.ts":{"bytesInOutput":4409},"src/space-proxy.ts":{"bytesInOutput":1561},"src/queues-api.ts":{"bytesInOutput":414},"src/index.ts":{"bytesInOutput":0},"src/types.ts":{"bytesInOutput":205},"src/wrap-handler-for-cloudflare.ts":{"bytesInOutput":3517},"src/logger.ts":{"bytesInOutput":948}},"bytes":33743}}}
+{"inputs":{"src/internal/utils.ts":{"bytes":692,"imports":[],"format":"esm"},"src/internal/data-service-impl.ts":{"bytes":19654,"imports":[{"path":"@dxos/codec-protobuf/stream","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"src/internal/utils.ts","kind":"import-statement","original":"./utils"}],"format":"esm"},"src/internal/query-service-impl.ts":{"bytes":9761,"imports":[{"path":"@dxos/codec-protobuf/stream","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true}],"format":"esm"},"src/internal/queue-service-impl.ts":{"bytes":11363,"imports":[{"path":"@dxos/errors","kind":"import-statement","external":true}],"format":"esm"},"src/internal/service-container.ts":{"bytes":12952,"imports":[{"path":"src/internal/data-service-impl.ts","kind":"import-statement","original":"./data-service-impl"},{"path":"src/internal/query-service-impl.ts","kind":"import-statement","original":"./query-service-impl"},{"path":"src/internal/queue-service-impl.ts","kind":"import-statement","original":"./queue-service-impl"}],"format":"esm"},"src/internal/index.ts":{"bytes":503,"imports":[{"path":"src/internal/service-container.ts","kind":"import-statement","original":"./service-container"}],"format":"esm"},"src/queues-api.ts":{"bytes":3005,"imports":[],"format":"esm"},"src/space-proxy.ts":{"bytes":6240,"imports":[{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"src/queues-api.ts","kind":"import-statement","original":"./queues-api"}],"format":"esm"},"src/functions-client.ts":{"bytes":9322,"imports":[{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/echo-db","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"src/internal/index.ts","kind":"import-statement","original":"./internal"},{"path":"src/space-proxy.ts","kind":"import-statement","original":"./space-proxy"}],"format":"esm"},"src/types.ts":{"bytes":1696,"imports":[],"format":"esm"},"src/wrap-handler-for-cloudflare.ts":{"bytes":15375,"imports":[{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"src/internal/index.ts","kind":"import-statement","original":"./internal"},{"path":"src/types.ts","kind":"import-statement","original":"./types"}],"format":"esm"},"src/logger.ts":{"bytes":4389,"imports":[{"path":"@dxos/log","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":879,"imports":[{"path":"src/functions-client.ts","kind":"import-statement","original":"./functions-client"},{"path":"src/internal/index.ts","kind":"import-statement","original":"./internal"},{"path":"src/types.ts","kind":"import-statement","original":"./types"},{"path":"src/wrap-handler-for-cloudflare.ts","kind":"import-statement","original":"./wrap-handler-for-cloudflare"},{"path":"src/logger.ts","kind":"import-statement","original":"./logger"}],"format":"esm"}},"outputs":{"dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":39868},"dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/echo-db","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/codec-protobuf/stream","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/codec-protobuf/stream","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/errors","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/keys","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true}],"exports":["FUNCTION_ROUTE_HEADER","FunctionRouteValue","FunctionsClient","ServiceContainer","createClientFromEnv","setupFunctionsLogger","wrapHandlerForCloudflare"],"entryPoint":"src/index.ts","inputs":{"src/functions-client.ts":{"bytesInOutput":2163},"src/internal/data-service-impl.ts":{"bytesInOutput":7096},"src/internal/utils.ts":{"bytesInOutput":55},"src/internal/query-service-impl.ts":{"bytesInOutput":4571},"src/internal/queue-service-impl.ts":{"bytesInOutput":4790},"src/internal/service-container.ts":{"bytesInOutput":4409},"src/space-proxy.ts":{"bytesInOutput":1546},"src/queues-api.ts":{"bytesInOutput":414},"src/index.ts":{"bytesInOutput":0},"src/types.ts":{"bytesInOutput":205},"src/wrap-handler-for-cloudflare.ts":{"bytesInOutput":3517},"src/logger.ts":{"bytesInOutput":948}},"bytes":30336}}}

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

@@ -3,7 +3,7 @@ import { createRequire } from 'node:module';const require = createRequire(import
 // 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";
@@ -250,83 +250,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.");
@@ -392,7 +318,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;
@@ -405,23 +331,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 = {
@@ -432,37 +346,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;
@@ -473,16 +373,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
@@ -501,22 +399,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";
@@ -681,6 +563,8 @@ var QueueServiceImpl = class {
       })(error);
     }
   }
+  async syncQueue(_) {
+  }
 };
 
 // src/internal/service-container.ts
@@ -828,8 +712,8 @@ var ServiceContainer = class {
 
 // 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
 var QueuesAPIImpl = class {
@@ -848,7 +732,7 @@ var QueuesAPIImpl = class {
 };
 
 // src/space-proxy.ts
-var __dxlog_file4 = "/__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;
@@ -863,8 +747,8 @@ var SpaceProxy = class extends Resource {
     return this._id;
   }
   get db() {
-    invariant4(this._db, void 0, {
-      F: __dxlog_file4,
+    invariant2(this._db, void 0, {
+      F: __dxlog_file3,
       L: 35,
       S: this,
       A: [
@@ -878,8 +762,8 @@ var SpaceProxy = class extends Resource {
   * @deprecated Use db API.
   */
   get crud() {
-    invariant4(this._db, void 0, {
-      F: __dxlog_file4,
+    invariant2(this._db, void 0, {
+      F: __dxlog_file3,
       L: 43,
       S: this,
       A: [
@@ -899,7 +783,7 @@ 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
     });
@@ -910,7 +794,7 @@ var SpaceProxy = class extends Resource {
 };
 
 // src/functions-client.ts
-var __dxlog_file5 = "/__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;
@@ -918,8 +802,8 @@ var FunctionsClient = class extends Resource2 {
   _spaces = /* @__PURE__ */ new Map();
   constructor(services) {
     super();
-    invariant5(typeof services.dataService !== "undefined", "DataService is required", {
-      F: __dxlog_file5,
+    invariant3(typeof services.dataService !== "undefined", "DataService is required", {
+      F: __dxlog_file4,
       L: 33,
       S: this,
       A: [
@@ -927,8 +811,8 @@ var FunctionsClient = class extends Resource2 {
         "'DataService is required'"
       ]
     });
-    invariant5(typeof services.queueService !== "undefined", "QueueService is required", {
-      F: __dxlog_file5,
+    invariant3(typeof services.queueService !== "undefined", "QueueService is required", {
+      F: __dxlog_file4,
       L: 34,
       S: this,
       A: [
@@ -985,11 +869,11 @@ 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 { 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_file6 = "/__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) {
@@ -998,7 +882,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
           });
@@ -1015,7 +899,7 @@ var wrapHandlerForCloudflare = (func) => {
         error,
         stack: error.stack
       }, {
-        F: __dxlog_file6,
+        F: __dxlog_file5,
         L: 44,
         S: void 0,
         C: (f, a) => f(...a)
@@ -1053,7 +937,7 @@ var decodeRequest = async (request) => {
     };
   } catch (err) {
     log3.catch(err, void 0, {
-      F: __dxlog_file6,
+      F: __dxlog_file5,
       L: 79,
       S: void 0,
       C: (f, a) => f(...a)
@@ -1090,8 +974,8 @@ var createFunctionContext = async ({ serviceContainer, contextSpaceId }) => {
       throw new Error(`Space not found: ${contextSpaceId}`);
     }
     spaceKey = meta.spaceKey;
-    invariant6(!meta.rootDocumentId.startsWith("automerge:"), void 0, {
-      F: __dxlog_file6,
+    invariant4(!meta.rootDocumentId.startsWith("automerge:"), void 0, {
+      F: __dxlog_file5,
       L: 117,
       S: void 0,
       A: [