@dxos/functions-runtime-cloudflare 0.8.4-main.9be5663bfe → 0.8.4-main.bc2380dfbc

package/LICENSE

@@ -1,8 +1,105 @@
-MIT License 
-Copyright (c) 2022 DXOS
+# Functional Source License, Version 1.1, ALv2 Future License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+## Abbreviation
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+FSL-1.1-Apache-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## Notice
+
+Copyright 2026 DXOS
+
+## Terms and Conditions
+
+### Licensor ("We")
+
+The party offering the Software under these Terms and Conditions.
+
+### The Software
+
+The "Software" is each version of the software that we make available under
+these Terms and Conditions, as indicated by our inclusion of these Terms and
+Conditions with the Software.
+
+### License Grant
+
+Subject to your compliance with this License Grant and the Patents,
+Redistribution and Trademark clauses below, we hereby grant you the right to
+use, copy, modify, create derivative works, publicly perform, publicly display
+and redistribute the Software for any Permitted Purpose identified below.
+
+### Permitted Purpose
+
+A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
+means making the Software available to others in a commercial product or
+service that:
+
+1. substitutes for the Software;
+
+2. substitutes for any other product or service we offer using the Software
+   that exists as of the date we make the Software available; or
+
+3. offers the same or substantially similar functionality as the Software.
+
+Permitted Purposes specifically include using the Software:
+
+1. for your internal use and access;
+
+2. for non-commercial education;
+
+3. for non-commercial research; and
+
+4. in connection with professional services that you provide to a licensee
+   using the Software in accordance with these Terms and Conditions.
+
+### Patents
+
+To the extent your use for a Permitted Purpose would necessarily infringe our
+patents, the license grant above includes a license under our patents. If you
+make a claim against any party that the Software infringes or contributes to
+the infringement of any patent, then your patent license to the Software ends
+immediately.
+
+### Redistribution
+
+The Terms and Conditions apply to all copies, modifications and derivatives of
+the Software.
+
+If you redistribute any copies, modifications or derivatives of the Software,
+you must include a copy of or a link to these Terms and Conditions and not
+remove any copyright notices provided in or with the Software.
+
+### Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+
+IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
+SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
+EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+
+### Trademarks
+
+Except for displaying the License Details and identifying us as the origin of
+the Software, you have no right under these Terms and Conditions to use our
+trademarks, trade names, service marks or product names.
+
+## Grant of Future License
+
+We hereby irrevocably grant you an additional license to use the Software under
+the Apache License, Version 2.0 that is effective on the second anniversary of
+the date we make the Software available. On or after that date, you may use the
+Software under the Apache License, Version 2.0, in which case the following
+will apply:
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.

package/README.md

@@ -44,4 +44,4 @@ pnpm i @dxos/functions-runtime-cloudflare
 
 Your ideas, issues, and code are most welcome. Please take a look at our [community code of conduct](https://github.com/dxos/dxos/blob/main/CODE_OF_CONDUCT.md), the [issue guide](https://github.com/dxos/dxos/blob/main/CONTRIBUTING.md#submitting-issues), and the [PR contribution guide](https://github.com/dxos/dxos/blob/main/CONTRIBUTING.md#submitting-prs).
 
-License: [MIT](./LICENSE) Copyright 2022 © DXOS
+License: [FSL-1.1-Apache-2.0](./LICENSE) Copyright 2022 © DXOS

package/dist/lib/browser/index.mjs

@@ -15,6 +15,7 @@ import { log } from "@dxos/log";
 var copyUint8Array = (value) => new Uint8Array(value);
 
 // src/internal/data-service-impl.ts
+var __dxlog_file = "/__w/dxos/dxos/packages/core/compute/functions-runtime-cloudflare/src/internal/data-service-impl.ts";
 function _ts_add_disposable_resource(env, value, async) {
   if (value !== null && value !== void 0) {
     if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
@@ -80,7 +81,6 @@ function _ts_dispose_resources(env) {
     return next();
   })(env);
 }
-var __dxlog_file = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/internal/data-service-impl.ts";
 var DataServiceImpl = class {
   _executionContext;
   _dataService;
@@ -91,15 +91,7 @@ var DataServiceImpl = class {
   }
   subscribe({ subscriptionId, spaceId }) {
     return new Stream(({ next }) => {
-      invariant(SpaceId.isValid(spaceId), void 0, {
-        F: __dxlog_file,
-        L: 39,
-        S: this,
-        A: [
-          "SpaceId.isValid(spaceId)",
-          ""
-        ]
-      });
+      invariant(SpaceId.isValid(spaceId), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 86, S: this, A: ["SpaceId.isValid(spaceId)", ""] });
       this.dataSubscriptions.set(subscriptionId, {
         spaceId,
         next
@@ -119,12 +111,7 @@ var DataServiceImpl = class {
     if (addIds) {
       log.info("request documents", {
         count: addIds.length
-      }, {
-        F: __dxlog_file,
-        L: 59,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 104, S: this });
       for (const documentId of addIds) {
         const env = {
           stack: [],
@@ -137,21 +124,11 @@ var DataServiceImpl = class {
             documentId,
             spaceId: sub.spaceId,
             found: !!document
-          }, {
-            F: __dxlog_file,
-            L: 63,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 116, S: this });
           if (!document) {
             log.warn("not found", {
               documentId
-            }, {
-              F: __dxlog_file,
-              L: 65,
-              S: this,
-              C: (f, a) => f(...a)
-            });
+            }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 122, S: this });
             continue;
           }
           sub.next({
@@ -180,15 +157,7 @@ var DataServiceImpl = class {
       hasError: false
     };
     try {
-      invariant(SpaceId.isValid(spaceId), void 0, {
-        F: __dxlog_file,
-        L: 83,
-        S: this,
-        A: [
-          "SpaceId.isValid(spaceId)",
-          ""
-        ]
-      });
+      invariant(SpaceId.isValid(spaceId), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 153, 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
@@ -209,6 +178,9 @@ var DataServiceImpl = class {
     }));
     try {
       for (const update of updates ?? []) {
+        if (!update.mutation) {
+          continue;
+        }
         await this._dataService.changeDocument(this._executionContext, sub.spaceId, update.documentId, update.mutation);
       }
     } catch (error) {
@@ -239,12 +211,7 @@ var DataServiceImpl = class {
     });
   }
   async updateIndexes() {
-    log.error("updateIndexes is not available in EDGE env.", void 0, {
-      F: __dxlog_file,
-      L: 134,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    log.verbose("updateIndexes called, but it is a no-op in EDGE env.", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 211, S: this });
   }
   async waitUntilHeadsReplicated({ heads: _heads }) {
     throw new NotImplementedError({
@@ -257,6 +224,7 @@ var DataServiceImpl = class {
 import { Stream as Stream2 } from "@dxos/codec-protobuf/stream";
 import { NotImplementedError as NotImplementedError2, RuntimeServiceError as RuntimeServiceError2 } from "@dxos/errors";
 import { log as log2 } from "@dxos/log";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/compute/functions-runtime-cloudflare/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.");
@@ -322,7 +290,6 @@ function _ts_dispose_resources2(env) {
     return next();
   })(env);
 }
-var __dxlog_file2 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/internal/query-service-impl.ts";
 var QueryServiceImpl = class {
   _executionContext;
   _dataService;
@@ -334,12 +301,7 @@ var QueryServiceImpl = class {
   execQuery(request) {
     log2.info("execQuery", {
       request
-    }, {
-      F: __dxlog_file2,
-      L: 20,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 81, S: this });
     return Stream2.fromPromise((async () => {
       try {
         const env = {
@@ -351,21 +313,11 @@ var QueryServiceImpl = class {
           this._queryCount++;
           log2.info("begin query", {
             request
-          }, {
-            F: __dxlog_file2,
-            L: 26,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 93, S: this });
           const queryResponse = _ts_add_disposable_resource2(env, await this._dataService.execQuery(this._executionContext, request), false);
           log2.info("query response", {
             resultCount: queryResponse.results?.length
-          }, {
-            F: __dxlog_file2,
-            L: 28,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 97, S: this });
           return structuredClone(queryResponse);
         } catch (e) {
           env.error = e;
@@ -376,12 +328,7 @@ var QueryServiceImpl = class {
       } catch (error) {
         log2.error("query failed", {
           err: error
-        }, {
-          F: __dxlog_file2,
-          L: 31,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 108, S: this });
         throw new RuntimeServiceError2({
           message: `Query execution failed (queryCount=${this._queryCount})`,
           context: {
@@ -709,7 +656,7 @@ var ServiceContainer = class {
       subspaceTag,
       spaceId,
       queueId,
-      objects
+      objects: objects.map((obj) => JSON.stringify(obj))
     });
   }
 };
@@ -720,6 +667,8 @@ 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/compute/functions-runtime-cloudflare/src/queues-api.ts";
 var QueuesAPIImpl = class {
   _serviceContainer;
   _spaceId;
@@ -727,8 +676,26 @@ 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
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 22, S: this });
+        return [];
+      }
+    });
+    return {
+      objects,
+      nextCursor: result.nextCursor ?? null,
+      prevCursor: result.prevCursor ?? null
+    };
   }
   insertIntoQueue(queue, objects) {
     return this._serviceContainer.insertIntoQueue(queue, JSON.parse(JSON.stringify(objects)));
@@ -736,7 +703,7 @@ var QueuesAPIImpl = class {
 };
 
 // src/space-proxy.ts
-var __dxlog_file3 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/space-proxy.ts";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/core/compute/functions-runtime-cloudflare/src/space-proxy.ts";
 var SpaceProxy = class extends Resource {
   _serviceContainer;
   _echoClient;
@@ -751,30 +718,14 @@ var SpaceProxy = class extends Resource {
     return this._id;
   }
   get db() {
-    invariant2(this._db, void 0, {
-      F: __dxlog_file3,
-      L: 35,
-      S: this,
-      A: [
-        "this._db",
-        ""
-      ]
-    });
+    invariant2(this._db, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 24, S: this, A: ["this._db", ""] });
     return this._db;
   }
   /**
   * @deprecated Use db API.
   */
   get crud() {
-    invariant2(this._db, void 0, {
-      F: __dxlog_file3,
-      L: 43,
-      S: this,
-      A: [
-        "this._db",
-        ""
-      ]
-    });
+    invariant2(this._db, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 30, S: this, A: ["this._db", ""] });
     return this._db.coreDatabase;
   }
   get queues() {
@@ -798,7 +749,7 @@ var SpaceProxy = class extends Resource {
 };
 
 // src/functions-client.ts
-var __dxlog_file4 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/functions-client.ts";
+var __dxlog_file5 = "/__w/dxos/dxos/packages/core/compute/functions-runtime-cloudflare/src/functions-client.ts";
 var FunctionsClient = class extends Resource2 {
   _serviceContainer;
   _echoClient;
@@ -806,24 +757,8 @@ var FunctionsClient = class extends Resource2 {
   _spaces = /* @__PURE__ */ new Map();
   constructor(services) {
     super();
-    invariant3(typeof services.dataService !== "undefined", "DataService is required", {
-      F: __dxlog_file4,
-      L: 33,
-      S: this,
-      A: [
-        "typeof services.dataService !== 'undefined'",
-        "'DataService is required'"
-      ]
-    });
-    invariant3(typeof services.queueService !== "undefined", "QueueService is required", {
-      F: __dxlog_file4,
-      L: 34,
-      S: this,
-      A: [
-        "typeof services.queueService !== 'undefined'",
-        "'QueueService is required'"
-      ]
-    });
+    invariant3(typeof services.dataService !== "undefined", "DataService is required", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 19, S: this, A: ["typeof services.dataService !== 'undefined'", "'DataService is required'"] });
+    invariant3(typeof services.queueService !== "undefined", "QueueService is required", { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 20, S: this, A: ["typeof services.queueService !== 'undefined'", "'QueueService is required'"] });
     this._serviceContainer = new ServiceContainer(this._executionContext, services.dataService, services.queueService, services.functionsAiService);
     this._echoClient = new EchoClient({});
   }
@@ -875,9 +810,9 @@ var FunctionRouteValue = /* @__PURE__ */ (function(FunctionRouteValue2) {
 // src/wrap-handler-for-cloudflare.ts
 import { invariant as invariant4 } from "@dxos/invariant";
 import { SpaceId as SpaceId2 } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
+import { log as log4 } from "@dxos/log";
 import { EdgeResponse } from "@dxos/protocols";
-var __dxlog_file5 = "/__w/dxos/dxos/packages/core/functions-runtime-cloudflare/src/wrap-handler-for-cloudflare.ts";
+var __dxlog_file6 = "/__w/dxos/dxos/packages/core/compute/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) {
@@ -899,15 +834,10 @@ 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
-      }, {
-        F: __dxlog_file5,
-        L: 44,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 37, S: void 0 });
       return EdgeResponse.failure({
         message: error?.message ?? "Internal error",
         error
@@ -940,12 +870,7 @@ var decodeRequest = async (request) => {
       }
     };
   } catch (err) {
-    log3.catch(err, void 0, {
-      F: __dxlog_file5,
-      L: 79,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    log4.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 76, S: void 0 });
     return {
       data: {
         bodyText,
@@ -978,15 +903,7 @@ var createFunctionContext = async ({ serviceContainer, contextSpaceId }) => {
       throw new Error(`Space not found: ${contextSpaceId}`);
     }
     spaceKey = meta.spaceKey;
-    invariant4(!meta.rootDocumentId.startsWith("automerge:"), void 0, {
-      F: __dxlog_file5,
-      L: 117,
-      S: void 0,
-      A: [
-        "!meta.rootDocumentId.startsWith('automerge:')",
-        ""
-      ]
-    });
+    invariant4(!meta.rootDocumentId.startsWith("automerge:"), void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file6, L: 109, S: void 0, A: ["!meta.rootDocumentId.startsWith('automerge:')", ""] });
     rootUrl = `automerge:${meta.rootDocumentId}`;
   }
   return {
@@ -1003,36 +920,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;
   }
 };
@@ -1042,6 +963,7 @@ export {
   FunctionsClient,
   ServiceContainer,
   createClientFromEnv,
+  createFunctionContext,
   setupFunctionsLogger,
   wrapHandlerForCloudflare
 };