@dxos/functions-testing 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions-testing",
-  "version": "0.8.4-main.9be5663bfe",
+  "version": "0.8.4-main.abd8ff62ef",
   "description": "Functions tests",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -25,31 +25,25 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "testing": [
-        "dist/types/src/testing/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
     "@effect/platform": "0.94.4",
-    "@dxos/async": "0.8.4-main.9be5663bfe",
-    "@dxos/context": "0.8.4-main.9be5663bfe",
-    "@dxos/client": "0.8.4-main.9be5663bfe",
-    "@dxos/config": "0.8.4-main.9be5663bfe",
-    "@dxos/echo": "0.8.4-main.9be5663bfe",
-    "@dxos/functions": "0.8.4-main.9be5663bfe",
-    "@dxos/functions-runtime-cloudflare": "0.8.4-main.9be5663bfe",
-    "@dxos/functions-runtime": "0.8.4-main.9be5663bfe",
-    "@dxos/invariant": "0.8.4-main.9be5663bfe",
-    "@dxos/operation": "0.8.4-main.9be5663bfe",
-    "@dxos/protocols": "0.8.4-main.9be5663bfe",
-    "@dxos/log": "0.8.4-main.9be5663bfe"
+    "@dxos/async": "0.8.4-main.abd8ff62ef",
+    "@dxos/client": "0.8.4-main.abd8ff62ef",
+    "@dxos/compute": "0.8.4-main.abd8ff62ef",
+    "@dxos/context": "0.8.4-main.abd8ff62ef",
+    "@dxos/config": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo": "0.8.4-main.abd8ff62ef",
+    "@dxos/functions": "0.8.4-main.abd8ff62ef",
+    "@dxos/functions-runtime-cloudflare": "0.8.4-main.abd8ff62ef",
+    "@dxos/invariant": "0.8.4-main.abd8ff62ef",
+    "@dxos/log": "0.8.4-main.abd8ff62ef",
+    "@dxos/functions-runtime": "0.8.4-main.abd8ff62ef",
+    "@dxos/protocols": "0.8.4-main.abd8ff62ef",
+    "@dxos/operation": "0.8.4-main.abd8ff62ef"
   },
   "publishConfig": {
     "access": "public"

package/src/cpu-limit.test.ts

@@ -4,18 +4,18 @@
 
 import { describe, test } from 'vitest';
 
+import { Trigger } from '@dxos/compute';
 import { configPreset } from '@dxos/config';
 import { Context } from '@dxos/context';
 import { Obj, Ref } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
 import { FunctionRuntimeKind } from '@dxos/protocols';
 
 import { deployFunction, observeInvocations, setup, sync } from './testing';
 
 const FIB_FUNCTION_PATH = new URL('./functions/fib.ts', import.meta.url).pathname;
 
-// Test suite to explore who CPU time limits influence function execution
-describe.runIf(process.env.DX_TEST_TAGS?.includes('functions-e2e'))('CPU limit', () => {
+// Test suite to explore who CPU time limits influence function execution.
+describe('CPU limit', { tags: ['functions-e2e'] }, () => {
   const config = configPreset({ edge: 'dev' });
 
   test('invoke directly', { timeout: 120_000 }, async ({ expect }) => {
@@ -51,7 +51,7 @@ describe.runIf(process.env.DX_TEST_TAGS?.includes('functions-e2e'))('CPU limit',
       Obj.make(Trigger.Trigger, {
         enabled: true,
         function: Ref.make(func),
-        spec: { kind: 'timer', cron: '* */30 * * * *' },
+        spec: Trigger.specTimer('* */30 * * * *'),
         input: { iterations: 100 },
       }),
     );
@@ -72,7 +72,7 @@ describe.runIf(process.env.DX_TEST_TAGS?.includes('functions-e2e'))('CPU limit',
       Obj.make(Trigger.Trigger, {
         enabled: true,
         function: Ref.make(func),
-        spec: { kind: 'timer', cron: '* */30 * * * *' },
+        spec: Trigger.specTimer('* */30 * * * *'),
         input: { iterations: 1_000_000_000 },
       }),
     );
@@ -88,7 +88,7 @@ describe.runIf(process.env.DX_TEST_TAGS?.includes('functions-e2e'))('CPU limit',
     }
 
     {
-      Obj.change(trigger, (trigger) => {
+      Obj.update(trigger, (trigger) => {
         trigger.input!.iterations = 100;
       });
       await sync(space);
@@ -109,7 +109,7 @@ describe.runIf(process.env.DX_TEST_TAGS?.includes('functions-e2e'))('CPU limit',
       Obj.make(Trigger.Trigger, {
         enabled: true,
         function: Ref.make(func),
-        spec: { kind: 'timer', cron: '* * * * * *' },
+        spec: Trigger.specTimer('* * * * * *'),
         input: { iterations: 1_000_000 },
       }),
     );
@@ -129,20 +129,20 @@ describe.runIf(process.env.DX_TEST_TAGS?.includes('functions-e2e'))('CPU limit',
       Obj.make(Trigger.Trigger, {
         enabled: true,
         function: Ref.make(func),
-        spec: { kind: 'timer', cron: '* * * * * *' },
+        spec: Trigger.specTimer('* * * * * *'),
         input: { iterations: 100 },
       }),
     );
     await sync(space);
     await observeInvocations(space, 5);
 
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       trigger.input!.iterations = 1_000_000_000;
     });
     await sync(space);
     await observeInvocations(space, 10);
 
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       trigger.input!.iterations = 100;
     });
     await sync(space);

package/src/functions/definitions.ts

@@ -4,12 +4,12 @@
 
 import * as Schema from 'effect/Schema';
 
+import { Operation } from '@dxos/compute';
 import { Database } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 export const Fibonacci = Operation.make({
   meta: {
-    key: 'example.org/function/fib',
+    key: 'org.example.function.fib',
     name: 'Fibonacci',
     description: 'Function that calculates a Fibonacci number',
   },
@@ -26,7 +26,7 @@ export const Fibonacci = Operation.make({
 
 export const Reply = Operation.make({
   meta: {
-    key: 'example.org/function/reply',
+    key: 'org.example.function.reply',
     name: 'Reply',
     description: 'Function that echoes the input',
   },
@@ -36,7 +36,7 @@ export const Reply = Operation.make({
 
 export const Sleep = Operation.make({
   meta: {
-    key: 'example.org/function/sleep',
+    key: 'org.example.function.sleep',
     name: 'Sleep',
     description: 'Function that sleeps for a given amount of time',
   },
@@ -51,7 +51,7 @@ export const Sleep = Operation.make({
 
 export const QueryDb = Operation.make({
   meta: {
-    key: 'example.org/function/query',
+    key: 'org.example.function.query',
     name: 'Query',
     description: 'Queries the database',
   },

package/src/functions/fib.ts

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { Fibonacci } from './definitions';
 

package/src/functions/forex-effect.ts

@@ -10,7 +10,7 @@ import * as Effect from 'effect/Effect';
 import * as Schedule from 'effect/Schedule';
 import * as Schema from 'effect/Schema';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 const ForexEffect = Operation.make({
   meta: {

package/src/functions/query.ts

@@ -4,8 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Filter, Query as EchoQuery } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { QueryDb } from './definitions';
 

package/src/functions/reply.ts

@@ -5,7 +5,7 @@
 import * as Console from 'effect/Console';
 import * as Effect from 'effect/Effect';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { Reply } from './definitions';
 

package/src/functions/sleep.ts

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { Sleep } from './definitions';
 

package/src/testing/util.ts

@@ -7,14 +7,13 @@ import fs from 'node:fs';
 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 { Context } from '@dxos/context';
-import { Filter, Obj, Query } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
+import { Feed, Obj } 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 { Operation } from '@dxos/operation';
 import { ErrorCodec, type FunctionRuntimeKind } from '@dxos/protocols';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 
@@ -84,8 +83,9 @@ export const observeInvocations = async (space: Space, maxCount: number | null)
   let count = 0;
   while (true) {
     try {
-      const invocations =
-        (await space.properties.invocationTraceQueue?.target!.query(Query.select(Filter.everything())).run()) ?? [];
+      const traceFeed = space.properties.invocationTraceFeed?.target;
+      const traceQueueDxn = traceFeed ? Feed.getQueueDxn(traceFeed) : undefined;
+      const invocations = traceQueueDxn ? ((await space.queues.get(traceQueueDxn).queryObjects()) ?? []) : [];
 
       for (const invocation of invocations) {
         if (Obj.instanceOf(InvocationTraceStartEvent, invocation)) {