@dxos/functions 0.5.3-main.3b535c7 → 0.5.3-main.3c6700b

package/dist/lib/browser/index.mjs

@@ -20,16 +20,16 @@ import { log } from "@dxos/log";
 import { nonNullable } from "@dxos/util";
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/functions/src/handler.ts";
 var subscriptionHandler = (handler) => {
-  return ({ event, context, ...rest }) => {
+  return ({ event: { data }, context, ...rest }) => {
     const { client } = context;
-    const space = event.space ? client.spaces.get(PublicKey.from(event.space)) : void 0;
-    const objects = space && event.objects?.map((id) => space.db.getObjectById(id)).filter(nonNullable);
-    if (!!event.space && !space) {
+    const space = data.spaceKey ? client.spaces.get(PublicKey.from(data.spaceKey)) : void 0;
+    const objects = space ? data.objects?.map((id) => space.db.getObjectById(id)).filter(nonNullable) : [];
+    if (!!data.spaceKey && !space) {
       log.warn("invalid space", {
-        event
+        data
       }, {
         F: __dxlog_file,
-        L: 68,
+        L: 91,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -39,15 +39,18 @@ var subscriptionHandler = (handler) => {
         objects: objects?.length
       }, {
         F: __dxlog_file,
-        L: 70,
+        L: 93,
         S: void 0,
         C: (f, a) => f(...a)
       });
     }
     return handler({
       event: {
-        space,
-        objects
+        data: {
+          ...data,
+          space,
+          objects
+        }
       },
       context,
       ...rest
@@ -59,7 +62,7 @@ var subscriptionHandler = (handler) => {
 import express from "express";
 import { getPort } from "get-port-please";
 import { join } from "@dxos/node-std/path";
-import { Trigger } from "@dxos/async";
+import { Event, Trigger } from "@dxos/async";
 import { invariant } from "@dxos/invariant";
 import { log as log2 } from "@dxos/log";
 var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/dev-server.ts";
@@ -70,11 +73,17 @@ var DevServer = class {
     this._options = _options;
     this._handlers = {};
     this._seq = 0;
+    this.update = new Event();
+  }
+  get stats() {
+    return {
+      seq: this._seq
+    };
   }
   get endpoint() {
     invariant(this._port, void 0, {
       F: __dxlog_file2,
-      L: 46,
+      L: 54,
       S: this,
       A: [
         "this._port",
@@ -96,7 +105,7 @@ var DevServer = class {
       } catch (err) {
         log2.error("parsing function (check manifest)", err, {
           F: __dxlog_file2,
-          L: 63,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -104,29 +113,44 @@ var DevServer = class {
     }
   }
   async start() {
+    invariant(!this._server, void 0, {
+      F: __dxlog_file2,
+      L: 77,
+      S: this,
+      A: [
+        "!this._server",
+        ""
+      ]
+    });
+    log2.info("starting...", void 0, {
+      F: __dxlog_file2,
+      L: 78,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     const app = express();
     app.use(express.json());
-    app.post("/:name", async (req, res) => {
-      const { name } = req.params;
+    app.post("/:path", async (req, res) => {
+      const { path: path2 } = req.params;
       try {
         log2.info("calling", {
-          name
+          path: path2
         }, {
           F: __dxlog_file2,
-          L: 75,
+          L: 87,
           S: this,
           C: (f, a) => f(...a)
         });
         if (this._options.reload) {
-          const { def } = this._handlers[name];
+          const { def } = this._handlers["/" + path2];
           await this._load(def, true);
         }
-        res.statusCode = await this._invoke(name, req.body);
+        res.statusCode = await this.invoke("/" + path2, req.body);
         res.end();
       } catch (err) {
         log2.catch(err, void 0, {
           F: __dxlog_file2,
-          L: 84,
+          L: 97,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -146,92 +170,170 @@ var DevServer = class {
     try {
       const { registrationId, endpoint } = await this._client.services.services.FunctionRegistryService.register({
         endpoint: this.endpoint,
-        functions: this.functions.map(({ def: { name } }) => ({
-          name
+        functions: this.functions.map(({ def: { id, path: path2 } }) => ({
+          id,
+          path: path2
         }))
       });
       log2.info("registered", {
-        registrationId,
         endpoint
       }, {
         F: __dxlog_file2,
-        L: 100,
+        L: 113,
         S: this,
         C: (f, a) => f(...a)
       });
-      this._registrationId = registrationId;
       this._proxy = endpoint;
+      this._functionServiceRegistration = registrationId;
     } catch (err) {
       await this.stop();
       throw new Error("FunctionRegistryService not available (check plugin is configured).");
     }
+    log2.info("started", {
+      port: this._port
+    }, {
+      F: __dxlog_file2,
+      L: 121,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
   async stop() {
+    invariant(this._server, void 0, {
+      F: __dxlog_file2,
+      L: 125,
+      S: this,
+      A: [
+        "this._server",
+        ""
+      ]
+    });
+    log2.info("stopping...", void 0, {
+      F: __dxlog_file2,
+      L: 126,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     const trigger = new Trigger();
-    this._server?.close(async () => {
-      if (this._registrationId) {
-        await this._client.services.services.FunctionRegistryService.unregister({
-          registrationId: this._registrationId
-        });
-        log2.info("unregistered", {
-          registrationId: this._registrationId
-        }, {
-          F: __dxlog_file2,
-          L: 117,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        this._registrationId = void 0;
-        this._proxy = void 0;
+    this._server.close(async () => {
+      log2.info("server stopped", void 0, {
+        F: __dxlog_file2,
+        L: 130,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      try {
+        if (this._functionServiceRegistration) {
+          invariant(this._client.services.services.FunctionRegistryService, void 0, {
+            F: __dxlog_file2,
+            L: 133,
+            S: this,
+            A: [
+              "this._client.services.services.FunctionRegistryService",
+              ""
+            ]
+          });
+          await this._client.services.services.FunctionRegistryService.unregister({
+            registrationId: this._functionServiceRegistration
+          });
+          log2.info("unregistered", {
+            registrationId: this._functionServiceRegistration
+          }, {
+            F: __dxlog_file2,
+            L: 138,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          this._functionServiceRegistration = void 0;
+          this._proxy = void 0;
+        }
+        trigger.wake();
+      } catch (err) {
+        trigger.throw(err);
       }
-      trigger.wake();
     });
     await trigger.wait();
     this._port = void 0;
     this._server = void 0;
+    log2.info("stopped", void 0, {
+      F: __dxlog_file2,
+      L: 152,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
   /**
   * Load function.
   */
-  async _load(def, flush = false) {
-    const { id, name, handler } = def;
-    const path = join(this._options.directory, handler);
+  async _load(def, force = false) {
+    const { id, path: path2, handler } = def;
+    const filePath = join(this._options.baseDir, handler);
     log2.info("loading", {
-      id
+      id,
+      force
     }, {
       F: __dxlog_file2,
-      L: 136,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
-    if (flush) {
-      Object.keys(__require.cache).filter((key) => key.startsWith(path)).forEach((key) => delete __require.cache[key]);
+    if (force) {
+      Object.keys(__require.cache).filter((key) => key.startsWith(filePath)).forEach((key) => {
+        delete __require.cache[key];
+      });
     }
-    const module = __require(path);
+    const module = __require(filePath);
     if (typeof module.default !== "function") {
       throw new Error(`Handler must export default function: ${id}`);
     }
-    this._handlers[name] = {
+    this._handlers[path2] = {
       def,
       handler: module.default
     };
   }
   /**
-  * Invoke function handler.
+  * Invoke function.
   */
-  async _invoke(name, event) {
+  async invoke(path2, data) {
     const seq = ++this._seq;
     const now = Date.now();
     log2.info("req", {
       seq,
-      name
+      path: path2
     }, {
       F: __dxlog_file2,
-      L: 161,
+      L: 188,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const statusCode = await this._invoke(path2, {
+      data
+    });
+    log2.info("res", {
+      seq,
+      path: path2,
+      statusCode,
+      duration: Date.now() - now
+    }, {
+      F: __dxlog_file2,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
-    const { handler } = this._handlers[name];
+    this.update.emit(statusCode);
+    return statusCode;
+  }
+  async _invoke(path2, event) {
+    const { handler } = this._handlers[path2] ?? {};
+    invariant(handler, `invalid path: ${path2}`, {
+      F: __dxlog_file2,
+      L: 198,
+      S: this,
+      A: [
+        "handler",
+        "`invalid path: ${path}`"
+      ]
+    });
     const context = {
       client: this._client,
       dataDir: this._options.dataDir
@@ -248,24 +350,15 @@ var DevServer = class {
       event,
       response
     });
-    log2.info("res", {
-      seq,
-      name,
-      statusCode,
-      duration: Date.now() - now
-    }, {
-      F: __dxlog_file2,
-      L: 178,
-      S: this,
-      C: (f, a) => f(...a)
-    });
     return statusCode;
   }
 };
 
 // packages/core/functions/src/runtime/scheduler.ts
 import { CronJob } from "cron";
+import { getPort as getPort2 } from "get-port-please";
 import http from "@dxos/node-std/http";
+import path from "@dxos/node-std/path";
 import WebSocket from "ws";
 import { TextV0Type } from "@braneframe/types";
 import { debounce, DeferredTask, sleep, Trigger as Trigger2 } from "@dxos/async";
@@ -280,7 +373,13 @@ var Scheduler = class {
     this._client = _client;
     this._manifest = _manifest;
     this._options = _options;
-    this._mounts = new ComplexMap(({ id, spaceKey }) => `${spaceKey.toHex()}:${id}`);
+    this._mounts = new ComplexMap(({ spaceKey, id }) => `${spaceKey.toHex()}:${id}`);
+  }
+  get mounts() {
+    return Array.from(this._mounts.values()).reduce((acc, { trigger }) => {
+      acc.push(trigger);
+      return acc;
+    }, []);
   }
   async start() {
     this._client.spaces.subscribe(async (spaces) => {
@@ -297,15 +396,18 @@ var Scheduler = class {
       await this.unmount(id, spaceKey);
     }
   }
+  /**
+  * Mount trigger.
+  */
   async mount(ctx, space, trigger) {
     const key = {
-      id: trigger.function,
-      spaceKey: space.key
+      spaceKey: space.key,
+      id: trigger.function
     };
     const def = this._manifest.functions.find((config) => config.id === trigger.function);
     invariant2(def, `Function not found: ${trigger.function}`, {
       F: __dxlog_file3,
-      L: 72,
+      L: 76,
       S: this,
       A: [
         "def",
@@ -323,7 +425,7 @@ var Scheduler = class {
         trigger
       }, {
         F: __dxlog_file3,
-        L: 78,
+        L: 82,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -331,16 +433,16 @@ var Scheduler = class {
         return;
       }
       if (trigger.timer) {
-        await this._createTimer(ctx, space, def, trigger.timer);
+        await this._createTimer(ctx, space, def, trigger);
       }
       if (trigger.webhook) {
-        await this._createWebhook(ctx, space, def, trigger.webhook);
+        await this._createWebhook(ctx, space, def, trigger);
       }
       if (trigger.websocket) {
-        await this._createWebsocket(ctx, space, def, trigger.websocket);
+        await this._createWebsocket(ctx, space, def, trigger);
       }
       if (trigger.subscription) {
-        await this._createSubscription(ctx, space, def, trigger.subscription);
+        await this._createSubscription(ctx, space, def, trigger);
       }
     }
   }
@@ -355,34 +457,52 @@ var Scheduler = class {
       await ctx.dispose();
     }
   }
-  // TODO(burdon): Pass in Space key (common context).
-  async _execFunction(def, data) {
+  async _execFunction(def, trigger, data) {
+    let status = 0;
     try {
-      log3.info("exec", {
-        function: def.id
-      }, {
-        F: __dxlog_file3,
-        L: 117,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      const payload = Object.assign({}, {
+        meta: trigger.meta
+      }, data);
       const { endpoint, callback } = this._options;
       if (endpoint) {
-        await fetch(`${this._options.endpoint}/${def.name}`, {
+        const url = path.join(endpoint, def.path);
+        log3.info("exec", {
+          function: def.id,
+          url
+        }, {
+          F: __dxlog_file3,
+          L: 128,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        const response = await fetch(url, {
           method: "POST",
           headers: {
             "Content-Type": "application/json"
           },
-          body: JSON.stringify(data)
+          body: JSON.stringify(payload)
         });
+        status = response.status;
       } else if (callback) {
-        await callback(data);
+        log3.info("exec", {
+          function: def.id
+        }, {
+          F: __dxlog_file3,
+          L: 139,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        status = await callback(payload) ?? 200;
+      }
+      if (status && status >= 400) {
+        throw new Error(`Response: ${status}`);
       }
       log3.info("done", {
-        function: def.id
+        function: def.id,
+        status
       }, {
         F: __dxlog_file3,
-        L: 133,
+        L: 149,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -392,11 +512,13 @@ var Scheduler = class {
         error: err.message
       }, {
         F: __dxlog_file3,
-        L: 135,
+        L: 151,
         S: this,
         C: (f, a) => f(...a)
       });
+      status = 500;
     }
+    return status;
   }
   //
   // Triggers
@@ -410,20 +532,20 @@ var Scheduler = class {
       trigger
     }, {
       F: __dxlog_file3,
-      L: 147,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
-    const { cron } = trigger;
+    const spec = trigger.timer;
     const task = new DeferredTask(ctx, async () => {
-      await this._execFunction(def, {
-        space: space.key
+      await this._execFunction(def, trigger, {
+        spaceKey: space.key
       });
     });
     let last = 0;
     let run = 0;
     const job = CronJob.from({
-      cronTime: cron,
+      cronTime: spec.cron,
       runOnInit: false,
       onTick: () => {
         const now = Date.now();
@@ -436,7 +558,7 @@ var Scheduler = class {
           delta
         }, {
           F: __dxlog_file3,
-          L: 167,
+          L: 186,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -455,25 +577,34 @@ var Scheduler = class {
       trigger
     }, {
       F: __dxlog_file3,
-      L: 180,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
-    const { port } = trigger;
+    const spec = trigger.webhook;
     const server = http.createServer(async (req, res) => {
-      await this._execFunction(def, {
-        space: space.key
+      if (req.method !== spec.method) {
+        res.statusCode = 405;
+        return res.end();
+      }
+      res.statusCode = await this._execFunction(def, trigger, {
+        spaceKey: space.key
       });
+      res.end();
+    });
+    const port = await getPort2({
+      random: true
     });
     server.listen(port, () => {
       log3.info("started webhook", {
         port
       }, {
         F: __dxlog_file3,
-        L: 189,
+        L: 223,
         S: this,
         C: (f, a) => f(...a)
       });
+      spec.port = port;
     });
     ctx.onDispose(() => {
       server.close();
@@ -481,6 +612,7 @@ var Scheduler = class {
   }
   /**
   * Websocket.
+  * NOTE: The port must be unique, so the same hook cannot be used for multiple spaces.
   */
   async _createWebsocket(ctx, space, def, trigger, options = {
     retryDelay: 2,
@@ -491,11 +623,12 @@ var Scheduler = class {
       trigger
     }, {
       F: __dxlog_file3,
-      L: 213,
+      L: 249,
       S: this,
       C: (f, a) => f(...a)
     });
-    const { url } = trigger;
+    const spec = trigger.websocket;
+    const { url, init } = spec;
     let ws;
     for (let attempt = 1; attempt <= options.maxAttempts; attempt++) {
       const open = new Trigger2();
@@ -506,24 +639,38 @@ var Scheduler = class {
             url
           }, {
             F: __dxlog_file3,
-            L: 223,
+            L: 260,
             S: this,
             C: (f, a) => f(...a)
           });
-          if (trigger.init) {
-            ws.send(new TextEncoder().encode(JSON.stringify(trigger.init)));
+          if (spec.init) {
+            ws.send(new TextEncoder().encode(JSON.stringify(init)));
           }
           open.wake(true);
         },
-        onclose: () => {
+        onclose: (event) => {
           log3.info("closed", {
-            url
+            url,
+            code: event.code
           }, {
             F: __dxlog_file3,
-            L: 232,
+            L: 269,
             S: this,
             C: (f, a) => f(...a)
           });
+          if (event.code === 1006) {
+            setTimeout(async () => {
+              log3.info(`reconnecting in ${options.retryDelay}s...`, {
+                url
+              }, {
+                F: __dxlog_file3,
+                L: 274,
+                S: this,
+                C: (f, a) => f(...a)
+              });
+              await this._createWebsocket(ctx, space, def, trigger, options);
+            }, options.retryDelay * 1e3);
+          }
           open.wake(false);
         },
         onerror: (event) => {
@@ -531,7 +678,7 @@ var Scheduler = class {
             url
           }, {
             F: __dxlog_file3,
-            L: 237,
+            L: 283,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -539,8 +686,8 @@ var Scheduler = class {
         onmessage: async (event) => {
           try {
             const data = JSON.parse(new TextDecoder().decode(event.data));
-            await this._execFunction(def, {
-              space: space.key,
+            await this._execFunction(def, trigger, {
+              spaceKey: space.key,
               data
             });
           } catch (err) {
@@ -548,7 +695,7 @@ var Scheduler = class {
               url
             }, {
               F: __dxlog_file3,
-              L: 245,
+              L: 291,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -565,7 +712,7 @@ var Scheduler = class {
             attempt
           }, {
             F: __dxlog_file3,
-            L: 256,
+            L: 302,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -586,14 +733,15 @@ var Scheduler = class {
       trigger
     }, {
       F: __dxlog_file3,
-      L: 271,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
+    const spec = trigger.subscription;
     const objectIds = /* @__PURE__ */ new Set();
     const task = new DeferredTask(ctx, async () => {
-      await this._execFunction(def, {
-        space: space.key,
+      await this._execFunction(def, trigger, {
+        spaceKey: space.key,
         objects: Array.from(objectIds)
       });
     });
@@ -604,7 +752,7 @@ var Scheduler = class {
         updated: updated.length
       }, {
         F: __dxlog_file3,
-        L: 281,
+        L: 329,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -617,7 +765,7 @@ var Scheduler = class {
       task.schedule();
     });
     subscriptions.push(() => subscription.unsubscribe());
-    const { filter, options: { deep, delay } = {} } = trigger;
+    const { filter, options: { deep, delay } = {} } = spec;
     const update = ({ objects }) => {
       subscription.update(objects);
       if (deep) {
@@ -625,7 +773,7 @@ var Scheduler = class {
           objects: objects.length
         }, {
           F: __dxlog_file3,
-          L: 301,
+          L: 349,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -652,9 +800,11 @@ import * as S from "@effect/schema/Schema";
 var TimerTriggerSchema = S.struct({
   cron: S.string
 });
-var WebhookTriggerSchema = S.struct({
-  port: S.number
-});
+var WebhookTriggerSchema = S.mutable(S.struct({
+  method: S.string,
+  // Assigned port.
+  port: S.optional(S.number)
+}));
 var WebsocketTriggerSchema = S.struct({
   url: S.string,
   init: S.optional(S.record(S.string, S.any))
@@ -675,6 +825,9 @@ var SubscriptionTriggerSchema = S.struct({
 });
 var FunctionTriggerSchema = S.struct({
   function: S.string.pipe(S.description("Function ID/URI.")),
+  // Context passed to function.
+  meta: S.optional(S.record(S.string, S.any)),
+  // Triggers.
   timer: S.optional(TimerTriggerSchema),
   webhook: S.optional(WebhookTriggerSchema),
   websocket: S.optional(WebsocketTriggerSchema),
@@ -682,14 +835,16 @@ var FunctionTriggerSchema = S.struct({
 });
 var FunctionDefSchema = S.struct({
   id: S.string,
+  // name: S.string,
   description: S.optional(S.string),
-  name: S.string,
-  // TODO(burdon): NPM/GitHub URL?
+  // TODO(burdon): Rename route?
+  path: S.string,
+  // TODO(burdon): NPM/GitHub/Docker/CF URL?
   handler: S.string
 });
 var FunctionManifestSchema = S.struct({
   functions: S.mutable(S.array(FunctionDefSchema)),
-  triggers: S.mutable(S.array(FunctionTriggerSchema))
+  triggers: S.optional(S.mutable(S.array(FunctionTriggerSchema)))
 });
 export {
   DevServer,