@dxos/functions-testing 0.10.0 → 0.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions-testing",
-  "version": "0.10.0",
+  "version": "0.11.1",
   "description": "Functions tests",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -14,14 +14,14 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "import": "./dist/lib/index.mjs"
     },
     "./testing": {
+      "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
-      "browser": "./dist/lib/browser/testing/index.mjs",
-      "node": "./dist/lib/node-esm/testing/index.mjs"
+      "import": "./dist/lib/testing.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -31,24 +31,25 @@
   ],
   "dependencies": {
     "@effect/platform": "0.96.2",
-    "@dxos/async": "0.10.0",
-    "@dxos/client": "0.10.0",
-    "@dxos/assistant-toolkit": "0.10.0",
-    "@dxos/config": "0.10.0",
-    "@dxos/context": "0.10.0",
-    "@dxos/functions": "0.10.0",
-    "@dxos/echo": "0.10.0",
-    "@dxos/functions-runtime": "0.10.0",
-    "@dxos/invariant": "0.10.0",
-    "@dxos/compute": "0.10.0",
-    "@dxos/functions-runtime-cloudflare": "0.10.0",
-    "@dxos/keys": "0.10.0",
-    "@dxos/log": "0.10.0",
-    "@dxos/operation": "0.10.0",
-    "@dxos/protocols": "0.10.0",
-    "@dxos/schema": "0.10.0",
-    "@dxos/util": "0.10.0"
+    "@dxos/assistant-toolkit": "0.11.1",
+    "@dxos/client": "0.11.1",
+    "@dxos/async": "0.11.1",
+    "@dxos/compute-runtime": "0.11.1",
+    "@dxos/compute": "0.11.1",
+    "@dxos/context": "0.11.1",
+    "@dxos/echo": "0.11.1",
+    "@dxos/config": "0.11.1",
+    "@dxos/functions-runtime-cloudflare": "0.11.1",
+    "@dxos/invariant": "0.11.1",
+    "@dxos/edge-compute": "0.11.1",
+    "@dxos/keys": "0.11.1",
+    "@dxos/log": "0.11.1",
+    "@dxos/operation": "0.11.1",
+    "@dxos/protocols": "0.11.1",
+    "@dxos/schema": "0.11.1",
+    "@dxos/util": "0.11.1"
   },
+  "devDependencies": {},
   "publishConfig": {
     "access": "public"
   },

package/src/bundle.test.ts

@@ -5,7 +5,7 @@
 import { join } from 'node:path';
 import { describe, it } from 'vitest';
 
-import { bundleFunction } from '@dxos/functions-runtime/native';
+import { bundleFunction } from '@dxos/edge-compute/native';
 
 import { writeBundle } from './testing';
 

package/src/edge-routine.test.ts

@@ -51,10 +51,6 @@ describe('Edge instructions', { tags: ['functions-e2e'] }, () => {
 
     await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);
 
-    Obj.update(space.properties, (properties) => {
-      properties.computeEnvironment = 'edge';
-    });
-
     space.db.add(Obj.make(TestSchema.Organization, { name: 'Acme Corp' }));
     space.db.add(Obj.make(TestSchema.Organization, { name: 'Globex Industries' }));
     space.db.add(Obj.make(TestSchema.Organization, { name: 'Initech' }));
@@ -80,6 +76,7 @@ describe('Edge instructions', { tags: ['functions-e2e'] }, () => {
     const trigger = space.db.add(
       Obj.make(Trigger.Trigger, {
         enabled: true,
+        remote: true,
         runnable: Ref.make(fn),
         spec: Trigger.specTimer('* * * * * *'),
         input: {

package/src/testing/util.ts

@@ -8,12 +8,12 @@ import { sleep } from '@dxos/async';
 import { Client, type Config } from '@dxos/client';
 import { type Space } from '@dxos/client/echo';
 import { Operation, Trigger } from '@dxos/compute';
+import { InvocationTraceEndEvent, InvocationTraceStartEvent } from '@dxos/compute-runtime';
 import { Context } from '@dxos/context';
 import { Feed, Filter, Obj, Query, Scope } from '@dxos/echo';
-import { InvocationTraceEndEvent, InvocationTraceStartEvent } from '@dxos/functions-runtime';
-import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
-import { bundleFunction } from '@dxos/functions-runtime/native';
-import type { BundleResult } from '@dxos/functions-runtime/native';
+import { FunctionsServiceClient } from '@dxos/edge-compute';
+import { bundleFunction } from '@dxos/edge-compute/native';
+import type { BundleResult } from '@dxos/edge-compute/native';
 import { ErrorCodec, type FunctionRuntimeKind } from '@dxos/protocols';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 
@@ -85,7 +85,7 @@ export const observeInvocations = async (space: Space, maxCount: number | null)
   while (true) {
     try {
       const traceFeed = space.properties.invocationTraceFeed?.target;
-      const traceFeedDXN = traceFeed ? Feed.getQueueUri(traceFeed) : undefined;
+      const traceFeedDXN = traceFeed ? Feed.getFeedUri(traceFeed) : undefined;
       const invocations = traceFeedDXN
         ? await space.db.query(Query.select(Filter.everything()).from(Scope.feed(traceFeedDXN))).run()
         : [];

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

@@ -1,2 +0,0 @@
-import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
-//# sourceMappingURL=index.mjs.map

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

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": [],
-  "sourcesContent": [],
-  "mappings": "",
-  "names": []
-}

package/dist/lib/node-esm/meta.json

@@ -1 +0,0 @@
-{"inputs":{"src/index.ts":{"bytes":332,"imports":[],"format":"esm"},"src/testing/util.ts":{"bytes":16206,"imports":[{"path":"node:fs","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/client","kind":"import-statement","external":true},{"path":"@dxos/compute","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/echo","kind":"import-statement","external":true},{"path":"@dxos/functions-runtime","kind":"import-statement","external":true},{"path":"@dxos/functions-runtime/edge","kind":"import-statement","external":true},{"path":"@dxos/functions-runtime/native","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/echo/metadata","kind":"import-statement","external":true}],"format":"esm"},"src/testing/index.ts":{"bytes":368,"imports":[{"path":"src/testing/util.ts","kind":"import-statement","original":"./util"}],"format":"esm"}},"outputs":{"dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":93},"dist/lib/node-esm/index.mjs":{"imports":[],"exports":[],"entryPoint":"src/index.ts","inputs":{"src/index.ts":{"bytesInOutput":0}},"bytes":127},"dist/lib/node-esm/testing/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":7623},"dist/lib/node-esm/testing/index.mjs":{"imports":[{"path":"node:fs","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/client","kind":"import-statement","external":true},{"path":"@dxos/compute","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/echo","kind":"import-statement","external":true},{"path":"@dxos/functions-runtime","kind":"import-statement","external":true},{"path":"@dxos/functions-runtime/edge","kind":"import-statement","external":true},{"path":"@dxos/functions-runtime/native","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/echo/metadata","kind":"import-statement","external":true}],"exports":["deployFunction","observeInvocations","setup","sync","writeBundle"],"entryPoint":"src/testing/index.ts","inputs":{"src/testing/util.ts":{"bytesInOutput":3950},"src/testing/index.ts":{"bytesInOutput":0}},"bytes":4184}}}

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

@@ -1,115 +0,0 @@
-import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
-
-// src/testing/util.ts
-import fs from "node:fs";
-import { sleep } from "@dxos/async";
-import { Client } from "@dxos/client";
-import { Operation, Trigger } from "@dxos/compute";
-import { Context } from "@dxos/context";
-import { Feed, Filter, Obj, Query, Scope } from "@dxos/echo";
-import { InvocationTraceEndEvent, InvocationTraceStartEvent } from "@dxos/functions-runtime";
-import { FunctionsServiceClient } from "@dxos/functions-runtime/edge";
-import { bundleFunction } from "@dxos/functions-runtime/native";
-import { ErrorCodec } from "@dxos/protocols";
-import { EdgeReplicationSetting } from "@dxos/protocols/proto/dxos/echo/metadata";
-var __dxlog_file = "/__w/dxos/dxos/packages/core/compute/functions-testing/src/testing/util.ts";
-var writeBundle = (path, bundle) => {
-  fs.mkdirSync(path, {
-    recursive: true
-  });
-  Object.entries(bundle.assets).forEach(([name, content]) => {
-    fs.writeFileSync(path + "/" + name, content);
-  });
-};
-var setup = async (config) => {
-  const client = await new Client({
-    config,
-    types: [
-      Operation.PersistentOperation,
-      Trigger.Trigger
-    ]
-  }).initialize();
-  await client.halo.createIdentity();
-  const space = await client.spaces.create();
-  await space.waitUntilReady();
-  await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);
-  const functionsServiceClient = FunctionsServiceClient.fromClient(client);
-  return {
-    client,
-    space,
-    functionsServiceClient
-  };
-};
-var sync = async (space) => {
-  await space.db.flush();
-  await space.internal.syncToEdge({
-    onProgress: (state) => console.log(state ? `${state.unsyncedDocumentCount} documents syncing...` : "connecting to edge...")
-  });
-};
-var deployFunction = async (space, functionsServiceClient, entryPoint, runtime, ownerUri) => {
-  const artifact = await bundleFunction({
-    entryPoint,
-    verbose: true
-  });
-  const func = await functionsServiceClient.deploy(Context.default(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 53 }), {
-    version: "0.0.1",
-    ownerUri,
-    entryPoint: artifact.entryPoint,
-    assets: artifact.assets,
-    runtime
-  });
-  space.db.add(func);
-  return func;
-};
-var observeInvocations = async (space, maxCount) => {
-  let initialCount = null;
-  const invocationData = /* @__PURE__ */ new Map();
-  let count = 0;
-  while (true) {
-    try {
-      const traceFeed = space.properties.invocationTraceFeed?.target;
-      const traceFeedDXN = traceFeed ? Feed.getQueueUri(traceFeed) : void 0;
-      const invocations = traceFeedDXN ? await space.db.query(Query.select(Filter.everything()).from(Scope.feed(traceFeedDXN))).run() : [];
-      for (const invocation of invocations) {
-        if (Obj.instanceOf(InvocationTraceStartEvent, invocation)) {
-          if (invocationData.has(invocation.invocationId)) {
-            continue;
-          }
-          invocationData.set(invocation.invocationId, {
-            count: count++,
-            begin: invocation
-          });
-          console.log(`${count.toString().padStart(3, " ")}: BEGIN ${invocation.runtime ?? "(unknown runtime)"} ${JSON.stringify(invocation.input)}`);
-        } else if (Obj.instanceOf(InvocationTraceEndEvent, invocation)) {
-          const data = invocationData.get(invocation.invocationId);
-          if (!data || !!data.end) {
-            continue;
-          }
-          data.end = invocation;
-          const outcome = data.end.outcome;
-          console.log(`${data.count.toString().padStart(3, " ")}: END outcome=${outcome} duration=${data.end.timestamp - data.begin.timestamp}`);
-          if (outcome === "failure" && data.end.error) {
-            console.error(ErrorCodec.decode(data.end.error));
-          }
-        }
-      }
-      if (initialCount === null) {
-        initialCount = invocations.length;
-      }
-      if (maxCount !== null && invocationData.size >= maxCount + initialCount) {
-        break;
-      }
-    } catch (err) {
-      console.error(err);
-    }
-    await sleep(1e3);
-  }
-};
-export {
-  deployFunction,
-  observeInvocations,
-  setup,
-  sync,
-  writeBundle
-};
-//# sourceMappingURL=index.mjs.map

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

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../../src/testing/util.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport fs from 'node:fs';\n\nimport { sleep } from '@dxos/async';\nimport { Client, type Config } from '@dxos/client';\nimport { type Space } from '@dxos/client/echo';\nimport { Operation, Trigger } from '@dxos/compute';\nimport { Context } from '@dxos/context';\nimport { Feed, Filter, Obj, Query, Scope } from '@dxos/echo';\nimport { InvocationTraceEndEvent, InvocationTraceStartEvent } from '@dxos/functions-runtime';\nimport { FunctionsServiceClient } from '@dxos/functions-runtime/edge';\nimport { bundleFunction } from '@dxos/functions-runtime/native';\nimport type { BundleResult } from '@dxos/functions-runtime/native';\nimport { ErrorCodec, type FunctionRuntimeKind } from '@dxos/protocols';\nimport { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';\n\nexport const writeBundle = (path: string, bundle: BundleResult) => {\n  fs.mkdirSync(path, { recursive: true });\n  Object.entries(bundle.assets).forEach(([name, content]) => {\n    fs.writeFileSync(path + '/' + name, content);\n  });\n};\n\nexport const setup = async (config: Config) => {\n  const client = await new Client({\n    config,\n    types: [Operation.PersistentOperation, Trigger.Trigger],\n  }).initialize();\n  await client.halo.createIdentity();\n\n  const space = await client.spaces.create();\n  await space.waitUntilReady();\n  await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);\n\n  const functionsServiceClient = FunctionsServiceClient.fromClient(client);\n\n  return { client, space, functionsServiceClient };\n};\n\nexport const sync = async (space: Space) => {\n  await space.db.flush();\n  await space.internal.syncToEdge({\n    onProgress: (state) =>\n      console.log(state ? `${state.unsyncedDocumentCount} documents syncing...` : 'connecting to edge...'),\n  });\n};\n\nexport const deployFunction = async (\n  space: Space,\n  functionsServiceClient: FunctionsServiceClient,\n  entryPoint: string,\n  runtime: FunctionRuntimeKind,\n  ownerUri: string,\n): Promise<Operation.PersistentOperation> => {\n  const artifact = await bundleFunction({\n    entryPoint,\n    verbose: true,\n  });\n  const func = await functionsServiceClient.deploy(Context.default(), {\n    version: '0.0.1',\n    ownerUri,\n    entryPoint: artifact.entryPoint,\n    assets: artifact.assets,\n    runtime,\n  });\n  space.db.add(func);\n\n  return func;\n};\n\nexport const observeInvocations = async (space: Space, maxCount: number | null) => {\n  let initialCount = null;\n  const invocationData = new Map<\n    string,\n    {\n      count: number;\n      begin: InvocationTraceStartEvent;\n      end?: InvocationTraceEndEvent;\n    }\n  >();\n  let count = 0;\n  while (true) {\n    try {\n      const traceFeed = space.properties.invocationTraceFeed?.target;\n      const traceFeedDXN = traceFeed ? Feed.getQueueUri(traceFeed) : undefined;\n      const invocations = traceFeedDXN\n        ? await space.db.query(Query.select(Filter.everything()).from(Scope.feed(traceFeedDXN))).run()\n        : [];\n\n      for (const invocation of invocations) {\n        if (Obj.instanceOf(InvocationTraceStartEvent, invocation)) {\n          if (invocationData.has(invocation.invocationId)) {\n            continue;\n          }\n          invocationData.set(invocation.invocationId, {\n            count: count++,\n            begin: invocation,\n          });\n          console.log(\n            `${count.toString().padStart(3, ' ')}: BEGIN ${invocation.runtime ?? '(unknown runtime)'} ${JSON.stringify(invocation.input)}`,\n          );\n        } else if (Obj.instanceOf(InvocationTraceEndEvent, invocation)) {\n          const data = invocationData.get(invocation.invocationId);\n          if (!data || !!data.end) {\n            continue;\n          }\n          data.end = invocation;\n\n          const outcome = data.end.outcome;\n          console.log(\n            `${data.count.toString().padStart(3, ' ')}: END outcome=${outcome} duration=${data.end.timestamp - data.begin.timestamp}`,\n          );\n          if (outcome === 'failure' && data.end.error) {\n            console.error(ErrorCodec.decode(data.end.error));\n          }\n        }\n      }\n      if (initialCount === null) {\n        initialCount = invocations.length;\n      }\n\n      if (maxCount !== null && invocationData.size >= maxCount + initialCount) {\n        break;\n      }\n    } catch (err) {\n      console.error(err);\n    }\n    await sleep(1_000);\n  }\n};\n"],
-  "mappings": ";;;AAIA,OAAOA,QAAQ;AAEf,SAASC,aAAa;AACtB,SAASC,cAA2B;AAEpC,SAASC,WAAWC,eAAe;AACnC,SAASC,eAAe;AACxB,SAASC,MAAMC,QAAQC,KAAKC,OAAOC,aAAa;AAChD,SAASC,yBAAyBC,iCAAiC;AACnE,SAASC,8BAA8B;AACvC,SAASC,sBAAsB;AAE/B,SAASC,kBAA4C;AACrD,SAASC,8BAA8B;AAEvC,IAAA,eAAaC;IACUC,cAAW,CAAA,MAAA,WAAA;AAAK,KAAA,UAAA,MAAA;IACrCC,WAAeC;;AAEf,SAAA,QAAA,OAAA,MAAA,EAAA,QAAA,CAAA,CAAA,MAAA,OAAA,MAAA;AACA,OAAA,cAAA,OAAA,MAAA,MAAA,OAAA;EAEF,CAAA;;IAEIC,QAAAA,OAAAA,WAAAA;QACAC,SAAO,MAAA,IAAA,OAAA;;WAAgClB;MAAgB,UAAA;MACtDmB,QAAU;IACb;EAEA,CAAA,EAAA,WAAc;AACd,QAAMC,OAAMC,KAAAA,eAAc;AAC1B,QAAMD,QAAME,MAAQ,OAACC,OAAAA,OAAAA;AAErB,QAAMC,MAAAA,eAAAA;AAEN,QAAA,MAAO,SAAA,6BAAA,uBAAA,OAAA;QAAEC,yBAAAA,uBAAAA,WAAAA,MAAAA;SAAQL;IAAOI;IAAuB;IAC/C;EAEF;;AAEE,IAAMJ,OAAME,OAASI,UAAU;QAC7BC,MAAAA,GAAAA,MAAaC;AAEf,QAAA,MAAA,SAAA,WAAA;IACA,YAAA,CAAA,UAAA,QAAA,IAAA,QAAA,GAAA,MAAA,qBAAA,0BAAA,uBAAA;EAEF,CAAA;;IAQIC,iBAAAA,OAAAA,OAAAA,wBAAAA,YAAAA,SAAAA,aAAAA;QACAC,WAAS,MAAA,eAAA;IACX;IACA,SAAa;;QAEXC,OAAAA,MAAAA,uBAAAA,OAAAA,QAAAA,QAAAA,QAAAA,EAAAA,YAAAA,YAAAA,GAAAA,cAAAA,GAAAA,GAAAA,CAAAA,GAAAA;IACAF,SAAAA;IACAG;IACAC,YAAAA,SAAAA;IACF,QAAA,SAAA;IACAb;EAEA,CAAA;AACA,QAAA,GAAA,IAAA,IAAA;AAEF,SAAO;;AAEL,IAAMc,qBAAqBC,OAAAA,OAAAA,aAAAA;AAQ3B,MAAIC,eAAQ;AACZ,QAAO,iBAAM,oBAAA,IAAA;MACX,QAAI;eACF;QACA;AACA,YAAMC,YAAAA,MAAcC,WAChB,qBAAqBjC;AAGzB,YAAK,eAAMkC,YAAcF,KAAa,YAAA,SAAA,IAAA;YACpC,cAAQG,eAAWhC,MAAAA,MAAAA,GAA2B+B,MAAAA,MAAAA,OAAa,OAAA,WAAA,CAAA,EAAA,KAAA,MAAA,KAAA,YAAA,CAAA,CAAA,EAAA,IAAA,IAAA,CAAA;iBACzD,cAAIL,aAAmBK;gBACrB,WAAA,2BAAA,UAAA,GAAA;AACF,cAAA,eAAA,IAAA,WAAA,YAAA,GAAA;AACAL;;yBAESK,IAAAA,WAAAA,cAAAA;YACT,OAAA;YACAE,OAAW;UAGb,CAAA;AACE,kBAAMC,IAAAA,GAAOR,MAAAA,SAAeS,EAAIJ,SAAAA,GAAWK,GAAAA,CAAAA,WAAY,WAAA,WAAA,mBAAA,IAAA,KAAA,UAAA,WAAA,KAAA,CAAA,EAAA;mBAClDF,IAAAA,WAAeG,yBAAK,UAAA,GAAA;gBACvB,OAAA,eAAA,IAAA,WAAA,YAAA;AACF,cAAA,CAAA,QAAA,CAAA,CAAA,KAAA,KAAA;AACAH;UAEA;AACAD,eAAAA,MAAW;AAGX,gBAAIK,UAAY,KAAA,IAAA;kBACdL,IAAQM,GAAAA,KAAMpC,MAAAA,SAAiB,EAAC+B,SAASK,GAAAA,GAAK,CAAA,iBAAA,OAAA,aAAA,KAAA,IAAA,YAAA,KAAA,MAAA,SAAA,EAAA;AAChD,cAAA,YAAA,aAAA,KAAA,IAAA,OAAA;AACF,oBAAA,MAAA,WAAA,OAAA,KAAA,IAAA,KAAA,CAAA;UACF;QACIC;;AAEJ,UAAA,iBAAA,MAAA;AAEIC,uBAAa,YAAQf;;AAEzB,UAAA,aAAA,QAAA,eAAA,QAAA,WAAA,cAAA;AACA;MACAO;IACF,SAAA,KAAA;AACA,cAAY,MAAA,GAAA;IACd;AACA,UAAA,MAAA,GAAA;;;",
-  "names": ["fs", "sleep", "Client", "Operation", "Trigger", "Context", "Feed", "Filter", "Obj", "Query", "Scope", "InvocationTraceEndEvent", "InvocationTraceStartEvent", "FunctionsServiceClient", "bundleFunction", "ErrorCodec", "EdgeReplicationSetting", "writeBundle", "recursive", "Object", "bundle", "config", "types", "initialize", "space", "waitUntilReady", "internal", "setEdgeReplicationPreference", "functionsServiceClient", "client", "syncToEdge", "onProgress", "state", "entryPoint", "verbose", "ownerUri", "assets", "runtime", "invocationData", "Map", "count", "invocations", "traceFeedDXN", "invocation", "instanceOf", "console", "data", "get", "invocationId", "end", "outcome", "error", "initialCount", "maxCount"]
-}