@dxos/functions 0.3.8-next.f4e0086 → 0.3.9-main.14901ff

package/dist/lib/browser/meta.json

@@ -1 +1 @@
-{"inputs":{"packages/core/functions/src/handler.ts":{"bytes":1109,"imports":[],"format":"esm"},"packages/core/functions/src/manifest.ts":{"bytes":1358,"imports":[],"format":"esm"},"packages/core/functions/src/runtime/dev-server.ts":{"bytes":15536,"imports":[{"path":"express","kind":"import-statement","external":true},{"path":"@dxos/node-std/path","kind":"import-statement","external":true},{"path":"portfinder","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"packages/core/functions/src/runtime/trigger-manager.ts":{"bytes":17315,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/core/functions/src/runtime/index.ts":{"bytes":584,"imports":[{"path":"packages/core/functions/src/runtime/dev-server.ts","kind":"import-statement","original":"./dev-server"},{"path":"packages/core/functions/src/runtime/trigger-manager.ts","kind":"import-statement","original":"./trigger-manager"}],"format":"esm"},"packages/core/functions/src/index.ts":{"bytes":637,"imports":[{"path":"packages/core/functions/src/handler.ts","kind":"import-statement","original":"./handler"},{"path":"packages/core/functions/src/manifest.ts","kind":"import-statement","original":"./manifest"},{"path":"packages/core/functions/src/runtime/index.ts","kind":"import-statement","original":"./runtime"}],"format":"esm"}},"outputs":{"packages/core/functions/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":15421},"packages/core/functions/dist/lib/browser/index.mjs":{"imports":[{"path":"express","kind":"import-statement","external":true},{"path":"@dxos/node-std/path","kind":"import-statement","external":true},{"path":"portfinder","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"exports":["DevServer","TriggerManager"],"entryPoint":"packages/core/functions/src/index.ts","inputs":{"packages/core/functions/src/index.ts":{"bytesInOutput":0},"packages/core/functions/src/runtime/dev-server.ts":{"bytesInOutput":3815},"packages/core/functions/src/runtime/index.ts":{"bytesInOutput":0},"packages/core/functions/src/runtime/trigger-manager.ts":{"bytesInOutput":4642}},"bytes":9049}}}
+{"inputs":{"packages/core/functions/src/handler.ts":{"bytes":1313,"imports":[],"format":"esm"},"packages/core/functions/src/manifest.ts":{"bytes":1795,"imports":[],"format":"esm"},"packages/core/functions/src/runtime/dev-server.ts":{"bytes":18569,"imports":[{"path":"express","kind":"import-statement","external":true},{"path":"get-port-please","kind":"import-statement","external":true},{"path":"@dxos/node-std/path","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"packages/core/functions/src/runtime/scheduler.ts":{"bytes":20325,"imports":[{"path":"cron","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/client/echo","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/core/functions/src/runtime/index.ts":{"bytes":566,"imports":[{"path":"packages/core/functions/src/runtime/dev-server.ts","kind":"import-statement","original":"./dev-server"},{"path":"packages/core/functions/src/runtime/scheduler.ts","kind":"import-statement","original":"./scheduler"}],"format":"esm"},"packages/core/functions/src/index.ts":{"bytes":637,"imports":[{"path":"packages/core/functions/src/handler.ts","kind":"import-statement","original":"./handler"},{"path":"packages/core/functions/src/manifest.ts","kind":"import-statement","original":"./manifest"},{"path":"packages/core/functions/src/runtime/index.ts","kind":"import-statement","original":"./runtime"}],"format":"esm"}},"outputs":{"packages/core/functions/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":18178},"packages/core/functions/dist/lib/browser/index.mjs":{"imports":[{"path":"express","kind":"import-statement","external":true},{"path":"get-port-please","kind":"import-statement","external":true},{"path":"@dxos/node-std/path","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"cron","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/client/echo","kind":"import-statement","external":true},{"path":"@dxos/context","kind":"import-statement","external":true},{"path":"@dxos/echo-schema","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"exports":["DevServer","Scheduler"],"entryPoint":"packages/core/functions/src/index.ts","inputs":{"packages/core/functions/src/index.ts":{"bytesInOutput":0},"packages/core/functions/src/runtime/dev-server.ts":{"bytesInOutput":4739},"packages/core/functions/src/runtime/index.ts":{"bytesInOutput":0},"packages/core/functions/src/runtime/scheduler.ts":{"bytesInOutput":5045}},"bytes":10365}}}

package/dist/lib/node/index.cjs

@@ -26,64 +26,68 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// packages/core/functions/src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var node_exports = {};
+__export(node_exports, {
   DevServer: () => DevServer,
-  TriggerManager: () => TriggerManager
+  Scheduler: () => Scheduler
 });
-module.exports = __toCommonJS(src_exports);
-
-// packages/core/functions/src/runtime/dev-server.ts
+module.exports = __toCommonJS(node_exports);
 var import_express = __toESM(require("express"));
+var import_get_port_please = require("get-port-please");
 var import_node_path = require("node:path");
-var import_portfinder = require("portfinder");
 var import_async = require("@dxos/async");
+var import_invariant = require("@dxos/invariant");
 var import_log = require("@dxos/log");
+var import_cron = require("cron");
+var import_async2 = require("@dxos/async");
+var import_echo = require("@dxos/client/echo");
+var import_context = require("@dxos/context");
+var import_echo_schema = require("@dxos/echo-schema");
+var import_invariant2 = require("@dxos/invariant");
+var import_log2 = require("@dxos/log");
+var import_util = require("@dxos/util");
+var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
+  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
+}) : x)(function(x) {
+  if (typeof require !== "undefined")
+    return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
+});
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/dev-server.ts";
-var DEFAULT_PORT = 7001;
 var DevServer = class {
   // prettier-ignore
   constructor(_client, _options) {
     this._client = _client;
     this._options = _options;
     this._handlers = {};
-  }
-  get port() {
-    return this._port;
+    this._seq = 0;
   }
   get endpoint() {
-    return this._port ? `http://localhost:${this._port}` : void 0;
+    (0, import_invariant.invariant)(this._port, void 0, {
+      F: __dxlog_file,
+      L: 45,
+      S: this,
+      A: [
+        "this._port",
+        ""
+      ]
+    });
+    return `http://localhost:${this._port}`;
+  }
+  get proxy() {
+    return this._proxy;
   }
   get functions() {
     return Object.values(this._handlers);
   }
   async initialize() {
     for (const def of this._options.manifest.functions) {
-      const { id, endpoint, handler: path } = def;
       try {
-        const module2 = require((0, import_node_path.join)(this._options.directory, path));
-        const handler = module2.default;
-        if (typeof handler !== "function") {
-          throw new Error(`Handler must export default function: ${id}`);
-        }
-        if (this._handlers[endpoint]) {
-          import_log.log.warn(`Function already registered: ${id}`, void 0, {
-            F: __dxlog_file,
-            L: 64,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-        }
-        this._handlers[endpoint] = {
-          def,
-          handler
-        };
+        await this._load(def);
       } catch (err) {
         import_log.log.error("parsing function (check manifest)", err, {
           F: __dxlog_file,
-          L: 69,
+          L: 62,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -93,66 +97,55 @@ var DevServer = class {
   async start() {
     const app = (0, import_express.default)();
     app.use(import_express.default.json());
-    app.post("/:endpoint", async (req, res) => {
-      const { endpoint } = req.params;
-      const response = {
-        status: (code) => {
-          res.statusCode = code;
-          return response;
-        },
-        succeed: (result = {}) => {
-          res.end(JSON.stringify(result));
-          return response;
-        }
-      };
-      const context = {
-        client: this._client,
-        status: response.status.bind(response)
-      };
-      void (async () => {
-        try {
-          (0, import_log.log)("invoking", {
-            endpoint
-          }, {
-            F: __dxlog_file,
-            L: 100,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          const { handler } = this._handlers[endpoint];
-          const response2 = await handler({
-            context,
-            event: req.body
-          });
-          (0, import_log.log)("done", {
-            response: response2
-          }, {
-            F: __dxlog_file,
-            L: 103,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-        } catch (err) {
-          res.statusCode = 500;
-          res.end(err.message);
+    app.post("/:name", async (req, res) => {
+      const { name } = req.params;
+      try {
+        if (this._options.reload) {
+          const { def } = this._handlers[name];
+          await this._load(def, true);
         }
-      })();
+        res.statusCode = await this._invoke(name, req.body);
+        res.end();
+      } catch (err) {
+        import_log.log.catch(err, void 0, {
+          F: __dxlog_file,
+          L: 82,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        res.statusCode = 500;
+        res.end();
+      }
     });
-    this._port = await (0, import_portfinder.getPortPromise)({
-      startPort: DEFAULT_PORT
+    this._port = await (0, import_get_port_please.getPort)({
+      port: 7200,
+      portRange: [
+        7200,
+        7299
+      ]
     });
     this._server = app.listen(this._port);
     try {
-      const { registrationId } = await this._client.services.services.FunctionRegistryService.register({
+      const { registrationId, endpoint } = await this._client.services.services.FunctionRegistryService.register({
         endpoint: this.endpoint,
-        functions: this.functions.map(({ def: { endpoint } }) => ({
-          name: endpoint
+        functions: this.functions.map(({ def: { name } }) => ({
+          name
         }))
       });
+      import_log.log.info("registered", {
+        registrationId,
+        endpoint
+      }, {
+        F: __dxlog_file,
+        L: 98,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       this._registrationId = registrationId;
+      this._proxy = endpoint;
     } catch (err) {
       await this.stop();
-      throw new Error("FunctionRegistryService not available; check config (agent.plugins.functions).");
+      throw new Error("FunctionRegistryService not available (check plugin is configured).");
     }
   }
   async stop() {
@@ -162,31 +155,101 @@ var DevServer = class {
         await this._client.services.services.FunctionRegistryService.unregister({
           registrationId: this._registrationId
         });
+        import_log.log.info("unregistered", {
+          registrationId: this._registrationId
+        }, {
+          F: __dxlog_file,
+          L: 115,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         this._registrationId = void 0;
+        this._proxy = void 0;
       }
       trigger.wake();
     });
     await trigger.wait();
-    this._server = void 0;
     this._port = void 0;
+    this._server = void 0;
+  }
+  /**
+  * Load function.
+  */
+  async _load(def, flush = false) {
+    const { id, name, handler } = def;
+    const path = (0, import_node_path.join)(this._options.directory, handler);
+    import_log.log.info("loading", {
+      id
+    }, {
+      F: __dxlog_file,
+      L: 134,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (flush) {
+      Object.keys(__require.cache).filter((key) => key.startsWith(path)).forEach((key) => delete __require.cache[key]);
+    }
+    const module2 = __require(path);
+    if (typeof module2.default !== "function") {
+      throw new Error(`Handler must export default function: ${id}`);
+    }
+    this._handlers[name] = {
+      def,
+      handler: module2.default
+    };
+  }
+  /**
+  * Invoke function handler.
+  */
+  async _invoke(name, event) {
+    const seq = ++this._seq;
+    const now = Date.now();
+    import_log.log.info("req", {
+      seq,
+      name
+    }, {
+      F: __dxlog_file,
+      L: 159,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const { handler } = this._handlers[name];
+    const context = {
+      client: this._client
+    };
+    let statusCode = 200;
+    const response = {
+      status: (code) => {
+        statusCode = code;
+        return response;
+      }
+    };
+    await handler({
+      context,
+      event,
+      response
+    });
+    import_log.log.info("res", {
+      seq,
+      name,
+      statusCode,
+      duration: Date.now() - now
+    }, {
+      F: __dxlog_file,
+      L: 175,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    return statusCode;
   }
 };
-
-// packages/core/functions/src/runtime/trigger-manager.ts
-var import_async2 = require("@dxos/async");
-var import_context = require("@dxos/context");
-var import_echo_schema = require("@dxos/echo-schema");
-var import_invariant = require("@dxos/invariant");
-var import_log2 = require("@dxos/log");
-var import_util = require("@dxos/util");
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/trigger-manager.ts";
-var TriggerManager = class {
-  constructor(_client, _manifest, _invokeOptions) {
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/scheduler.ts";
+var Scheduler = class {
+  constructor(_client, _manifest, _options) {
     this._client = _client;
     this._manifest = _manifest;
-    this._invokeOptions = _invokeOptions;
-    this._mounts = new import_util.ComplexMap(({ name, spaceKey }) => `${spaceKey.toHex()}:${name}`);
-    this._queries = /* @__PURE__ */ new Set();
+    this._options = _options;
+    this._mounts = new import_util.ComplexMap(({ id, spaceKey }) => `${spaceKey.toHex()}:${id}`);
   }
   async start() {
     this._client.spaces.subscribe(async (spaces) => {
@@ -199,22 +262,22 @@ var TriggerManager = class {
     });
   }
   async stop() {
-    for (const { name, spaceKey } of this._mounts.keys()) {
-      await this.unmount(name, spaceKey);
+    for (const { id, spaceKey } of this._mounts.keys()) {
+      await this.unmount(id, spaceKey);
     }
   }
   async mount(ctx, space, trigger) {
     const key = {
-      name: trigger.function,
+      id: trigger.function,
       spaceKey: space.key
     };
-    const config = this._manifest.functions.find((config2) => config2.id === trigger.function);
-    (0, import_invariant.invariant)(config, `Function not found: ${trigger.function}`, {
+    const def = this._manifest.functions.find((config) => config.id === trigger.function);
+    (0, import_invariant2.invariant)(def, `Function not found: ${trigger.function}`, {
       F: __dxlog_file2,
-      L: 58,
+      L: 59,
       S: this,
       A: [
-        "config",
+        "def",
         "`Function not found: ${trigger.function}`"
       ]
     });
@@ -224,62 +287,82 @@ var TriggerManager = class {
         ctx,
         trigger
       });
-      (0, import_log2.log)("mount", {
+      import_log2.log.info("mount", {
         space: space.key,
         trigger
       }, {
         F: __dxlog_file2,
-        L: 62,
+        L: 64,
         S: this,
         C: (f, a) => f(...a)
       });
       if (ctx.disposed) {
         return;
       }
-      const objectIds = /* @__PURE__ */ new Set();
-      const task = new import_async2.DeferredTask(ctx, async () => {
-        await this.execFunction(this._invokeOptions, config.endpoint, {
-          space: space.key,
-          objects: Array.from(objectIds)
+      if (trigger.schedule) {
+        const task = new import_async2.DeferredTask(ctx, async () => {
+          await this.execFunction(def, {
+            space: space.key
+          });
         });
-      });
-      let count = 0;
-      const subscription = (0, import_echo_schema.createSubscription)(({ added, updated }) => {
-        for (const object of added) {
-          objectIds.add(object.id);
-        }
-        for (const object of updated) {
-          objectIds.add(object.id);
-        }
-        (0, import_log2.log)("updated", {
-          trigger,
-          space: space.key,
-          objects: objectIds.size,
-          count
-        }, {
-          F: __dxlog_file2,
-          L: 85,
-          S: this,
-          C: (f, a) => f(...a)
+        const job = new import_cron.CronJob(trigger.schedule, () => task.schedule());
+        job.start();
+        ctx.onDispose(() => job.stop());
+      }
+      if (trigger.subscription) {
+        const objectIds = /* @__PURE__ */ new Set();
+        const task = new import_async2.DeferredTask(ctx, async () => {
+          await this.execFunction(def, {
+            space: space.key,
+            objects: Array.from(objectIds)
+          });
         });
-        task.schedule();
-        count++;
-      });
-      const query = space.db.query(import_echo_schema.Filter.typename(trigger.subscription.type, trigger.subscription.props));
-      this._queries.add(query);
-      const unsubscribe = query.subscribe(({ objects }) => {
-        subscription.update(objects);
-      }, true);
-      ctx.onDispose(() => {
-        subscription.unsubscribe();
-        unsubscribe();
-        this._queries.delete(query);
-      });
+        const subscriptions = [];
+        const subscription = (0, import_echo_schema.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 }) => {
+          subscription.update(objects);
+          if (deep) {
+            import_log2.log.info("update", {
+              type,
+              deep,
+              objects: objects.length
+            }, {
+              F: __dxlog_file2,
+              L: 114,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            for (const object of objects) {
+              const content = object.content;
+              if (content instanceof import_echo.TextObject) {
+                subscriptions.push(content[import_echo_schema.subscribe]((0, import_async2.debounce)(() => subscription.update([
+                  object
+                ]), 1e3)));
+              }
+            }
+          }
+        };
+        const query = space.db.query(import_echo_schema.Filter.typename(type, props));
+        subscriptions.push(query.subscribe(delay ? (0, import_async2.debounce)(update, delay * 1e3) : update));
+        ctx.onDispose(() => {
+          subscriptions.forEach((unsubscribe) => unsubscribe());
+        });
+      }
     }
   }
-  async unmount(name, spaceKey) {
+  async unmount(id, spaceKey) {
     const key = {
-      name,
+      id,
       spaceKey
     };
     const { ctx } = this._mounts.get(key) ?? {};
@@ -288,59 +371,39 @@ var TriggerManager = class {
       await ctx.dispose();
     }
   }
-  async execFunction(options, functionName, data) {
-    const { endpoint, runtime } = options;
-    (0, import_invariant.invariant)(endpoint, "Missing endpoint", {
-      F: __dxlog_file2,
-      L: 121,
-      S: this,
-      A: [
-        "endpoint",
-        "'Missing endpoint'"
-      ]
-    });
-    (0, import_invariant.invariant)(runtime, "Missing runtime", {
-      F: __dxlog_file2,
-      L: 122,
-      S: this,
-      A: [
-        "runtime",
-        "'Missing runtime'"
-      ]
-    });
+  async execFunction(def, data) {
     try {
-      (0, import_log2.log)("invoke", {
-        function: functionName
+      (0, import_log2.log)("request", {
+        function: def.id
       }, {
         F: __dxlog_file2,
-        L: 125,
+        L: 147,
         S: this,
         C: (f, a) => f(...a)
       });
-      const url = `${endpoint}/${runtime}/${functionName}`;
-      const res = await fetch(url, {
+      const response = await fetch(`${this._options.endpoint}/${def.name}`, {
         method: "POST",
-        body: JSON.stringify(data),
         headers: {
           "Content-Type": "application/json"
-        }
+        },
+        body: JSON.stringify(data)
       });
       (0, import_log2.log)("result", {
-        function: functionName,
-        result: await res.json()
+        function: def.id,
+        result: response.status
       }, {
         F: __dxlog_file2,
-        L: 135,
+        L: 157,
         S: this,
         C: (f, a) => f(...a)
       });
     } catch (err) {
       import_log2.log.error("error", {
-        function: functionName,
+        function: def.id,
         error: err.message
       }, {
         F: __dxlog_file2,
-        L: 137,
+        L: 159,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -350,6 +413,6 @@ var TriggerManager = class {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DevServer,
-  TriggerManager
+  Scheduler
 });
 //# sourceMappingURL=index.cjs.map