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

package/dist/lib/browser/index.mjs

@@ -22,9 +22,9 @@ var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/functions/src/hand
 var subscriptionHandler = (handler) => {
   return ({ event, context, ...rest }) => {
     const { client } = context;
-    const space = event.spaceKey ? client.spaces.get(PublicKey.from(event.spaceKey)) : void 0;
+    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.spaceKey && !space) {
+    if (!!event.space && !space) {
       log.warn("invalid space", {
         event
       }, {
@@ -59,7 +59,7 @@ var subscriptionHandler = (handler) => {
 import express from "express";
 import { getPort } from "get-port-please";
 import { join } from "@dxos/node-std/path";
-import { Event, Trigger } from "@dxos/async";
+import { 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,17 +70,11 @@ 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: 54,
+      L: 46,
       S: this,
       A: [
         "this._port",
@@ -102,7 +96,7 @@ var DevServer = class {
       } catch (err) {
         log2.error("parsing function (check manifest)", err, {
           F: __dxlog_file2,
-          L: 71,
+          L: 63,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -110,44 +104,29 @@ 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("/:path", async (req, res) => {
-      const { path: path2 } = req.params;
+    app.post("/:name", async (req, res) => {
+      const { name } = req.params;
       try {
         log2.info("calling", {
-          path: path2
+          name
         }, {
           F: __dxlog_file2,
-          L: 87,
+          L: 75,
           S: this,
           C: (f, a) => f(...a)
         });
         if (this._options.reload) {
-          const { def } = this._handlers["/" + path2];
+          const { def } = this._handlers[name];
           await this._load(def, true);
         }
-        res.statusCode = await this.invoke("/" + path2, req.body);
+        res.statusCode = await this._invoke(name, req.body);
         res.end();
       } catch (err) {
         log2.catch(err, void 0, {
           F: __dxlog_file2,
-          L: 97,
+          L: 84,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -167,168 +146,92 @@ var DevServer = class {
     try {
       const { registrationId, endpoint } = await this._client.services.services.FunctionRegistryService.register({
         endpoint: this.endpoint,
-        functions: this.functions.map(({ def: { id, path: path2 } }) => ({
-          id,
-          path: path2
+        functions: this.functions.map(({ def: { name } }) => ({
+          name
         }))
       });
       log2.info("registered", {
+        registrationId,
         endpoint
       }, {
         F: __dxlog_file2,
-        L: 113,
+        L: 100,
         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 () => {
-      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);
+    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;
       }
+      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, force = false) {
-    const { id, path: path2, handler } = def;
-    const filePath = join(this._options.baseDir, handler);
+  async _load(def, flush = false) {
+    const { id, name, handler } = def;
+    const path = join(this._options.directory, handler);
     log2.info("loading", {
-      id,
-      force
+      id
     }, {
       F: __dxlog_file2,
-      L: 161,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
-    if (force) {
-      Object.keys(__require.cache).filter((key) => key.startsWith(filePath)).forEach((key) => {
-        delete __require.cache[key];
-      });
+    if (flush) {
+      Object.keys(__require.cache).filter((key) => key.startsWith(path)).forEach((key) => delete __require.cache[key]);
     }
-    const module = __require(filePath);
+    const module = __require(path);
     if (typeof module.default !== "function") {
       throw new Error(`Handler must export default function: ${id}`);
     }
-    this._handlers[path2] = {
+    this._handlers[name] = {
       def,
       handler: module.default
     };
   }
   /**
-  * Invoke function.
+  * Invoke function handler.
   */
-  async invoke(path2, data) {
+  async _invoke(name, event) {
     const seq = ++this._seq;
     const now = Date.now();
     log2.info("req", {
       seq,
-      path: path2
-    }, {
-      F: __dxlog_file2,
-      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
+      name
     }, {
       F: __dxlog_file2,
-      L: 191,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
-    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 { handler } = this._handlers[name];
     const context = {
       client: this._client,
       dataDir: this._options.dataDir
@@ -345,15 +248,24 @@ 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";
@@ -368,13 +280,7 @@ var Scheduler = class {
     this._client = _client;
     this._manifest = _manifest;
     this._options = _options;
-    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;
-    }, []);
+    this._mounts = new ComplexMap(({ id, spaceKey }) => `${spaceKey.toHex()}:${id}`);
   }
   async start() {
     this._client.spaces.subscribe(async (spaces) => {
@@ -391,18 +297,15 @@ var Scheduler = class {
       await this.unmount(id, spaceKey);
     }
   }
-  /**
-  * Mount trigger.
-  */
   async mount(ctx, space, trigger) {
     const key = {
-      spaceKey: space.key,
-      id: trigger.function
+      id: trigger.function,
+      spaceKey: space.key
     };
     const def = this._manifest.functions.find((config) => config.id === trigger.function);
     invariant2(def, `Function not found: ${trigger.function}`, {
       F: __dxlog_file3,
-      L: 83,
+      L: 72,
       S: this,
       A: [
         "def",
@@ -420,7 +323,7 @@ var Scheduler = class {
         trigger
       }, {
         F: __dxlog_file3,
-        L: 89,
+        L: 78,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -455,62 +358,44 @@ var Scheduler = class {
   // TODO(burdon): Pass in Space key (common context).
   async _execFunction(def, data) {
     try {
-      let status = 0;
+      log3.info("exec", {
+        function: def.id
+      }, {
+        F: __dxlog_file3,
+        L: 117,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       const { endpoint, callback } = this._options;
       if (endpoint) {
-        const url = path.join(endpoint, def.path);
-        log3.info("exec", {
-          function: def.id,
-          url
-        }, {
-          F: __dxlog_file3,
-          L: 133,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        const response = await fetch(url, {
+        await fetch(`${this._options.endpoint}/${def.name}`, {
           method: "POST",
           headers: {
             "Content-Type": "application/json"
           },
           body: JSON.stringify(data)
         });
-        status = response.status;
       } else if (callback) {
-        log3.info("exec", {
-          function: def.id
-        }, {
-          F: __dxlog_file3,
-          L: 144,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        status = await callback(data) ?? 200;
-      }
-      if (status && status >= 400) {
-        throw new Error(`Response: ${status}`);
+        await callback(data);
       }
       log3.info("done", {
-        function: def.id,
-        status
+        function: def.id
       }, {
         F: __dxlog_file3,
-        L: 154,
+        L: 133,
         S: this,
         C: (f, a) => f(...a)
       });
-      return status;
     } catch (err) {
       log3.error("error", {
         function: def.id,
         error: err.message
       }, {
         F: __dxlog_file3,
-        L: 157,
+        L: 135,
         S: this,
         C: (f, a) => f(...a)
       });
-      return 500;
     }
   }
   //
@@ -525,14 +410,14 @@ var Scheduler = class {
       trigger
     }, {
       F: __dxlog_file3,
-      L: 170,
+      L: 147,
       S: this,
       C: (f, a) => f(...a)
     });
     const { cron } = trigger;
     const task = new DeferredTask(ctx, async () => {
       await this._execFunction(def, {
-        spaceKey: space.key
+        space: space.key
       });
     });
     let last = 0;
@@ -551,7 +436,7 @@ var Scheduler = class {
           delta
         }, {
           F: __dxlog_file3,
-          L: 190,
+          L: 167,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -570,33 +455,25 @@ var Scheduler = class {
       trigger
     }, {
       F: __dxlog_file3,
-      L: 203,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
+    const { port } = trigger;
     const server = http.createServer(async (req, res) => {
-      if (req.method !== trigger.method) {
-        res.statusCode = 405;
-        return res.end();
-      }
-      res.statusCode = await this._execFunction(def, {
-        spaceKey: space.key
+      await this._execFunction(def, {
+        space: space.key
       });
-      res.end();
-    });
-    const port = await getPort2({
-      random: true
     });
     server.listen(port, () => {
       log3.info("started webhook", {
         port
       }, {
         F: __dxlog_file3,
-        L: 226,
+        L: 189,
         S: this,
         C: (f, a) => f(...a)
       });
-      trigger.port = port;
     });
     ctx.onDispose(() => {
       server.close();
@@ -604,7 +481,6 @@ 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,
@@ -615,7 +491,7 @@ var Scheduler = class {
       trigger
     }, {
       F: __dxlog_file3,
-      L: 252,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -630,7 +506,7 @@ var Scheduler = class {
             url
           }, {
             F: __dxlog_file3,
-            L: 262,
+            L: 223,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -639,14 +515,12 @@ var Scheduler = class {
           }
           open.wake(true);
         },
-        // TODO(burdon): Config retry if server closes?
-        onclose: (event) => {
+        onclose: () => {
           log3.info("closed", {
-            url,
-            code: event.code
+            url
           }, {
             F: __dxlog_file3,
-            L: 272,
+            L: 232,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -657,7 +531,7 @@ var Scheduler = class {
             url
           }, {
             F: __dxlog_file3,
-            L: 277,
+            L: 237,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -666,7 +540,7 @@ var Scheduler = class {
           try {
             const data = JSON.parse(new TextDecoder().decode(event.data));
             await this._execFunction(def, {
-              spaceKey: space.key,
+              space: space.key,
               data
             });
           } catch (err) {
@@ -674,7 +548,7 @@ var Scheduler = class {
               url
             }, {
               F: __dxlog_file3,
-              L: 285,
+              L: 245,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -691,7 +565,7 @@ var Scheduler = class {
             attempt
           }, {
             F: __dxlog_file3,
-            L: 296,
+            L: 256,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -712,14 +586,14 @@ var Scheduler = class {
       trigger
     }, {
       F: __dxlog_file3,
-      L: 311,
+      L: 271,
       S: this,
       C: (f, a) => f(...a)
     });
     const objectIds = /* @__PURE__ */ new Set();
     const task = new DeferredTask(ctx, async () => {
       await this._execFunction(def, {
-        spaceKey: space.key,
+        space: space.key,
         objects: Array.from(objectIds)
       });
     });
@@ -730,7 +604,7 @@ var Scheduler = class {
         updated: updated.length
       }, {
         F: __dxlog_file3,
-        L: 321,
+        L: 281,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -751,7 +625,7 @@ var Scheduler = class {
           objects: objects.length
         }, {
           F: __dxlog_file3,
-          L: 342,
+          L: 301,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -778,11 +652,9 @@ import * as S from "@effect/schema/Schema";
 var TimerTriggerSchema = S.struct({
   cron: S.string
 });
-var WebhookTriggerSchema = S.mutable(S.struct({
-  method: S.string,
-  // Assigned port.
-  port: S.optional(S.number)
-}));
+var WebhookTriggerSchema = S.struct({
+  port: S.number
+});
 var WebsocketTriggerSchema = S.struct({
   url: S.string,
   init: S.optional(S.record(S.string, S.any))
@@ -803,9 +675,6 @@ var SubscriptionTriggerSchema = S.struct({
 });
 var FunctionTriggerSchema = S.struct({
   function: S.string.pipe(S.description("Function ID/URI.")),
-  // Context passed to function.
-  context: S.optional(S.record(S.string, S.any)),
-  // Triggers.
   timer: S.optional(TimerTriggerSchema),
   webhook: S.optional(WebhookTriggerSchema),
   websocket: S.optional(WebsocketTriggerSchema),
@@ -813,15 +682,14 @@ var FunctionTriggerSchema = S.struct({
 });
 var FunctionDefSchema = S.struct({
   id: S.string,
-  // name: S.string,
   description: S.optional(S.string),
-  path: S.string,
-  // TODO(burdon): NPM/GitHub/Docker/CF URL?
+  name: S.string,
+  // TODO(burdon): NPM/GitHub URL?
   handler: S.string
 });
 var FunctionManifestSchema = S.struct({
   functions: S.mutable(S.array(FunctionDefSchema)),
-  triggers: S.optional(S.mutable(S.array(FunctionTriggerSchema)))
+  triggers: S.mutable(S.array(FunctionTriggerSchema))
 });
 export {
   DevServer,