@dxos/functions 0.3.9-main.c2ac8a5 → 0.3.9-main.c7cd0ec

package/dist/types/src/runtime/scheduler.d.ts

@@ -1,7 +1,10 @@
 import { type Client } from '@dxos/client';
+import { type FunctionSubscriptionEvent } from '../handler';
 import { type FunctionManifest } from '../manifest';
+type Callback = (data: FunctionSubscriptionEvent) => Promise<number>;
 type SchedulerOptions = {
-    endpoint: string;
+    endpoint?: string;
+    callback?: Callback;
 };
 /**
  * Functions scheduler.
@@ -11,12 +14,14 @@ export declare class Scheduler {
     private readonly _manifest;
     private readonly _options;
     private readonly _mounts;
-    constructor(_client: Client, _manifest: FunctionManifest, _options: SchedulerOptions);
+    constructor(_client: Client, _manifest: FunctionManifest, _options?: SchedulerOptions);
     start(): Promise<void>;
     stop(): Promise<void>;
     private mount;
     private unmount;
-    private execFunction;
+    private _createTimer;
+    private _createSubscription;
+    private _execFunction;
 }
 export {};
 //# sourceMappingURL=scheduler.d.ts.map

package/dist/types/src/runtime/scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../../../src/runtime/scheduler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,MAAM,EAAkB,MAAM,cAAc,CAAC;AAQ3D,OAAO,EAAoB,KAAK,gBAAgB,EAAwB,MAAM,aAAa,CAAC;AAE5F,KAAK,gBAAgB,GAAG;IACtB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AAEH,qBAAa,SAAS;IAQlB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAG6B;gBAGlC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,gBAAgB,EAC3B,QAAQ,EAAE,gBAAgB;IAGvC,KAAK;IAWL,IAAI;YAMI,KAAK;YAgFL,OAAO;YASP,YAAY;CAiB3B"}
+{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../../../src/runtime/scheduler.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,MAAM,EAAkB,MAAM,cAAc,CAAC;AAQ3D,OAAO,EAAE,KAAK,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAC5D,OAAO,EAAoB,KAAK,gBAAgB,EAAkD,MAAM,aAAa,CAAC;AAEtH,KAAK,QAAQ,GAAG,CAAC,IAAI,EAAE,yBAAyB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAErE,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF;;GAEG;AAEH,qBAAa,SAAS;IAQlB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAG6B;gBAGlC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,gBAAgB,EAC3B,QAAQ,GAAE,gBAAqB;IAG5C,KAAK;IAWL,IAAI;YAMI,KAAK;YA0BL,OAAO;IASrB,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,mBAAmB;YAoDb,aAAa;CA0B5B"}

package/dist/types/src/runtime/scheduler.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=scheduler.test.d.ts.map

package/dist/types/src/runtime/scheduler.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scheduler.test.d.ts","sourceRoot":"","sources":["../../../../src/runtime/scheduler.test.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions",
-  "version": "0.3.9-main.c2ac8a5",
+  "version": "0.3.9-main.c7cd0ec",
   "description": "Functions SDK and runtime.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -24,14 +24,14 @@
     "deepsignal": "1.4.0-shallow.0",
     "express": "^4.17.1",
     "get-port-please": "^3.1.1",
-    "@dxos/async": "0.3.9-main.c2ac8a5",
-    "@dxos/client": "0.3.9-main.c2ac8a5",
-    "@dxos/echo-schema": "0.3.9-main.c2ac8a5",
-    "@dxos/context": "0.3.9-main.c2ac8a5",
-    "@dxos/invariant": "0.3.9-main.c2ac8a5",
-    "@dxos/log": "0.3.9-main.c2ac8a5",
-    "@dxos/node-std": "0.3.9-main.c2ac8a5",
-    "@dxos/util": "0.3.9-main.c2ac8a5"
+    "@dxos/async": "0.3.9-main.c7cd0ec",
+    "@dxos/context": "0.3.9-main.c7cd0ec",
+    "@dxos/client": "0.3.9-main.c7cd0ec",
+    "@dxos/echo-schema": "0.3.9-main.c7cd0ec",
+    "@dxos/invariant": "0.3.9-main.c7cd0ec",
+    "@dxos/log": "0.3.9-main.c7cd0ec",
+    "@dxos/node-std": "0.3.9-main.c7cd0ec",
+    "@dxos/util": "0.3.9-main.c7cd0ec"
   },
   "devDependencies": {
     "@types/express": "^4.17.17"

package/src/handler.ts

@@ -2,7 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Client } from '@dxos/client';
+import { type Client, PublicKey } from '@dxos/client';
+import { type Space } from '@dxos/client/echo';
+import { isTypedObject, type TypedObject } from '@dxos/echo-schema';
+import { log } from '@dxos/log';
+import { nonNullable } from '@dxos/util';
 
 // TODO(burdon): No response?
 export interface Response {
@@ -24,6 +28,44 @@ export type FunctionHandler<T extends {}> = (params: {
 }) => Promise<Response | void>;
 
 export type FunctionSubscriptionEvent = {
-  space: string; // TODO(burdon): Convert to PublicKey.
-  objects: string[];
+  space?: string; // TODO(burdon): Convert to PublicKey.
+  objects?: string[];
+};
+
+export type FunctionSubscriptionEvent2 = {
+  space?: Space;
+  objects?: TypedObject[];
+};
+
+/**
+ * Handler wrapper for subscription events; extracts space and objects.
+ *
+ * To test:
+ * ```
+ * curl -s -X POST -H "Content-Type: application/json" --data '{"space": "0446...1cbb"}' http://localhost:7100/dev/email-extractor
+ * ```
+ *
+ * NOTE: Get space key from devtools or `dx space list --json`
+ */
+export const subscriptionHandler = (
+  handler: FunctionHandler<FunctionSubscriptionEvent2>,
+): FunctionHandler<FunctionSubscriptionEvent> => {
+  return ({ event, context, ...rest }) => {
+    const { client } = context;
+    const space = event.space ? client.spaces.get(PublicKey.from(event.space)) : undefined;
+    const objects =
+      space &&
+      event.objects
+        ?.map<TypedObject | undefined>((id) => space!.db.getObjectById(id))
+        .filter(nonNullable)
+        .filter(isTypedObject);
+
+    if (!!event.space && !space) {
+      log.warn('invalid space', { event });
+    } else {
+      log.info('handler', { space: space?.key.truncate(), objects: objects?.length });
+    }
+
+    return handler({ event: { space, objects }, context, ...rest });
+  };
 };

package/src/manifest.ts

@@ -20,7 +20,7 @@ export type TriggerSubscription = {
   type: string;
   spaceKey: string;
   props?: Record<string, any>;
-  deep?: boolean;
+  deep?: boolean; // Watch changes to object (not just creation).
   delay?: number;
 };
 
@@ -30,7 +30,7 @@ export type TriggerSubscription = {
 export type FunctionTrigger = {
   function: string;
   schedule?: string;
-  subscription?: TriggerSubscription;
+  subscriptions?: TriggerSubscription[];
 };
 
 /**

package/src/runtime/dev-server.ts

@@ -80,7 +80,7 @@ export class DevServer {
         res.statusCode = await this._invoke(name, req.body);
         res.end();
       } catch (err: any) {
-        log.catch(err);
+        log.error(`Function failed: ${name}`, err);
         res.statusCode = 500;
         res.end();
       }

package/src/runtime/scheduler.test.ts

@@ -0,0 +1,57 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { expect } from 'chai';
+
+import { Trigger } from '@dxos/async';
+import { Client } from '@dxos/client';
+import { TestBuilder } from '@dxos/client/testing';
+import { describe, test } from '@dxos/test';
+
+import { Scheduler } from './scheduler';
+import { type FunctionManifest } from '../manifest';
+
+describe('scheduler', () => {
+  test('basic', async () => {
+    const testBuilder = new TestBuilder();
+    const client = new Client({ services: testBuilder.createLocal() });
+    await client.initialize();
+    await client.halo.createIdentity();
+
+    const manifest: FunctionManifest = {
+      functions: [
+        {
+          id: 'example.com/function/test',
+          name: 'test',
+          handler: 'test',
+        },
+      ],
+      triggers: [
+        {
+          function: 'example.com/function/test',
+          schedule: '* * * * * *', // Every second.
+        },
+      ],
+    };
+
+    let count = 0;
+    const done = new Trigger();
+    const scheduler = new Scheduler(client, manifest, {
+      callback: async () => {
+        if (++count === 3) {
+          done.wake();
+        }
+
+        return 200;
+      },
+    });
+
+    await scheduler.start();
+    await done.wait();
+    expect(count).to.equal(3);
+
+    await scheduler.stop();
+    await client.destroy();
+  });
+});

package/src/runtime/scheduler.ts

@@ -13,10 +13,14 @@ import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { ComplexMap } from '@dxos/util';
 
-import { type FunctionDef, type FunctionManifest, type FunctionTrigger } from '../manifest';
+import { type FunctionSubscriptionEvent } from '../handler';
+import { type FunctionDef, type FunctionManifest, type FunctionTrigger, type TriggerSubscription } from '../manifest';
+
+type Callback = (data: FunctionSubscriptionEvent) => Promise<number>;
 
 type SchedulerOptions = {
-  endpoint: string;
+  endpoint?: string;
+  callback?: Callback;
 };
 
 /**
@@ -33,7 +37,7 @@ export class Scheduler {
   constructor(
     private readonly _client: Client,
     private readonly _manifest: FunctionManifest,
-    private readonly _options: SchedulerOptions,
+    private readonly _options: SchedulerOptions = {},
   ) {}
 
   async start() {
@@ -58,6 +62,7 @@ export class Scheduler {
     const def = this._manifest.functions.find((config) => config.id === trigger.function);
     invariant(def, `Function not found: ${trigger.function}`);
 
+    // Currently supports only one trigger declaration per function.
     const exists = this._mounts.get(key);
     if (!exists) {
       this._mounts.set(key, { ctx, trigger });
@@ -66,69 +71,14 @@ export class Scheduler {
         return;
       }
 
-      // Cron schedule.
+      // Timer.
       if (trigger.schedule) {
-        const task = new DeferredTask(ctx, async () => {
-          await this.execFunction(def, {
-            space: space.key,
-          });
-        });
-
-        // TODO(burdon): Check greater than 30s min (use cron-parser).
-        const job = new CronJob(trigger.schedule, () => task.schedule());
-
-        job.start();
-        ctx.onDispose(() => job.stop());
+        this._createTimer(ctx, space, def, trigger);
       }
 
-      // ECHO subscription.
-      if (trigger.subscription) {
-        const objectIds = new Set<string>();
-        const task = new DeferredTask(ctx, async () => {
-          await this.execFunction(def, {
-            space: space.key,
-            objects: Array.from(objectIds),
-          });
-        });
-
-        // TODO(burdon): Standardize subscription handles.
-        const subscriptions: (() => void)[] = [];
-        const subscription = createSubscription(({ added, updated }) => {
-          for (const object of added) {
-            objectIds.add(object.id);
-          }
-          for (const object of updated) {
-            objectIds.add(object.id);
-          }
-
-          task.schedule();
-        });
-        subscriptions.push(() => subscription.unsubscribe());
-
-        const { type, props, deep, delay } = trigger.subscription;
-        const update = ({ objects }: Query) => {
-          subscription.update(objects);
-
-          // TODO(burdon): Hack to monitor changes to Document's text object.
-          if (deep) {
-            log.info('update', { type, deep, objects: objects.length });
-            for (const object of objects) {
-              const content = object.content;
-              if (content instanceof TextObject) {
-                subscriptions.push(content[subscribe](debounce(() => subscription.update([object]), 1_000)));
-              }
-            }
-          }
-        };
-
-        // TODO(burdon): [Bug]: all callbacks are fired on the first mutation.
-        // TODO(burdon): [Bug]: not updated when document is deleted (either top or hierarchically).
-        const query = space.db.query(Filter.typename(type, props));
-        subscriptions.push(query.subscribe(delay ? debounce(update, delay * 1_000) : update));
-
-        ctx.onDispose(() => {
-          subscriptions.forEach((unsubscribe) => unsubscribe());
-        });
+      // Subscription.
+      for (const triggerSubscription of trigger.subscriptions ?? []) {
+        this._createSubscription(ctx, space, def, triggerSubscription);
       }
     }
   }
@@ -142,19 +92,95 @@ export class Scheduler {
     }
   }
 
-  private async execFunction(def: FunctionDef, data: any) {
+  private _createTimer(ctx: Context, space: Space, def: FunctionDef, trigger: FunctionTrigger) {
+    const task = new DeferredTask(ctx, async () => {
+      await this._execFunction(def, {
+        space: space.key,
+      });
+    });
+
+    // TODO(burdon): Check greater than 30s min (use cron-parser).
+    invariant(trigger.schedule);
+    const job = new CronJob(trigger.schedule, () => task.schedule());
+
+    job.start();
+    ctx.onDispose(() => job.stop());
+  }
+
+  private _createSubscription(ctx: Context, space: Space, def: FunctionDef, triggerSubscription: TriggerSubscription) {
+    const objectIds = new Set<string>();
+    const task = new DeferredTask(ctx, async () => {
+      await this._execFunction(def, {
+        space: space.key,
+        objects: Array.from(objectIds),
+      });
+    });
+
+    // TODO(burdon): Don't fire initially.
+    // TODO(burdon): Standardize subscription handles.
+    const subscriptions: (() => void)[] = [];
+    const subscription = createSubscription(({ added, updated }) => {
+      for (const object of added) {
+        objectIds.add(object.id);
+      }
+      for (const object of updated) {
+        objectIds.add(object.id);
+      }
+
+      task.schedule();
+    });
+    subscriptions.push(() => subscription.unsubscribe());
+
+    // TODO(burdon): Create queue. Only allow one invocation per trigger at a time?
+    // TODO(burdon): Disable trigger if keeps failing.
+    const { type, props, deep, delay } = triggerSubscription;
+    const update = ({ objects }: Query) => {
+      subscription.update(objects);
+
+      // TODO(burdon): Hack to monitor changes to Document's text object.
+      if (deep) {
+        log.info('update', { type, deep, objects: objects.length });
+        for (const object of objects) {
+          const content = object.content;
+          if (content instanceof TextObject) {
+            subscriptions.push(content[subscribe](debounce(() => subscription.update([object]), 1_000)));
+          }
+        }
+      }
+    };
+
+    // TODO(burdon): [Bug]: all callbacks are fired on the first mutation.
+    // TODO(burdon): [Bug]: not updated when document is deleted (either top or hierarchically).
+    const query = space.db.query(Filter.typename(type, props));
+    subscriptions.push(query.subscribe(delay ? debounce(update, delay * 1_000) : update));
+
+    ctx.onDispose(() => {
+      subscriptions.forEach((unsubscribe) => unsubscribe());
+    });
+  }
+
+  private async _execFunction(def: FunctionDef, data: any) {
     try {
       log('request', { function: def.id });
-      const response = await fetch(`${this._options.endpoint}/${def.name}`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(data),
-      });
+      const { endpoint, callback } = this._options;
+      let status = 0;
+      if (endpoint) {
+        // TODO(burdon): Move out of scheduler (generalize as callback).
+        const response = await fetch(`${this._options.endpoint}/${def.name}`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(data),
+        });
+
+        status = response.status;
+      } else if (callback) {
+        status = await callback(data);
+      }
 
       // const result = await response.json();
-      log('result', { function: def.id, result: response.status });
+      log('result', { function: def.id, result: status });
     } catch (err: any) {
       log.error('error', { function: def.id, error: err.message });
     }

package/dist/types/src/function.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=function.test.d.ts.map

package/dist/types/src/function.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"function.test.d.ts","sourceRoot":"","sources":["../../../src/function.test.ts"],"names":[],"mappings":""}

package/src/function.test.ts

@@ -1,7 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-import { test } from '@dxos/test';
-
-test('works', () => {});