@dxos/functions 0.5.3-main.79e0565 → 0.5.3-main.7cd4303

package/dist/lib/node/index.cjs

@@ -38,48 +38,45 @@ __export(node_exports, {
   subscriptionHandler: () => subscriptionHandler
 });
 module.exports = __toCommonJS(node_exports);
+var import_client = require("@dxos/client");
+var import_log = require("@dxos/log");
+var import_util = require("@dxos/util");
 var import_async = require("@dxos/async");
 var import_echo = require("@dxos/client/echo");
 var import_context = require("@dxos/context");
 var import_keys = require("@dxos/keys");
-var import_log = require("@dxos/log");
-var import_util = require("@dxos/util");
-var import_echo_schema = require("@dxos/echo-schema");
-var import_client = require("@dxos/client");
-var import_log2 = require("@dxos/log");
 var import_util2 = require("@dxos/util");
+var import_echo_schema = require("@dxos/echo-schema");
 var import_express = __toESM(require("express"));
 var import_get_port_please = require("get-port-please");
 var import_node_path = require("node:path");
 var import_async2 = require("@dxos/async");
 var import_context2 = require("@dxos/context");
 var import_invariant = require("@dxos/invariant");
-var import_log3 = require("@dxos/log");
+var import_log2 = require("@dxos/log");
 var import_node_path2 = __toESM(require("node:path"));
-var import_async3 = require("@dxos/async");
 var import_context3 = require("@dxos/context");
-var import_log4 = require("@dxos/log");
-var import_async4 = require("@dxos/async");
+var import_log3 = require("@dxos/log");
+var import_async3 = require("@dxos/async");
 var import_echo2 = require("@dxos/client/echo");
 var import_context4 = require("@dxos/context");
-var import_echo_schema2 = require("@dxos/echo-schema");
 var import_invariant2 = require("@dxos/invariant");
 var import_keys2 = require("@dxos/keys");
-var import_log5 = require("@dxos/log");
+var import_log4 = require("@dxos/log");
 var import_util3 = require("@dxos/util");
 var import_types = require("@braneframe/types");
-var import_async5 = require("@dxos/async");
+var import_async4 = require("@dxos/async");
 var import_echo_db = require("@dxos/echo-db");
-var import_log6 = require("@dxos/log");
+var import_log5 = require("@dxos/log");
 var import_cron = require("cron");
-var import_async6 = require("@dxos/async");
-var import_log7 = require("@dxos/log");
+var import_async5 = require("@dxos/async");
+var import_log6 = require("@dxos/log");
 var import_get_port_please2 = require("get-port-please");
 var import_node_http = __toESM(require("node:http"));
-var import_log8 = require("@dxos/log");
+var import_log7 = require("@dxos/log");
 var import_ws = __toESM(require("ws"));
-var import_async7 = require("@dxos/async");
-var import_log9 = require("@dxos/log");
+var import_async6 = require("@dxos/async");
+var import_log8 = require("@dxos/log");
 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) {
@@ -87,9 +84,51 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
     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/handler.ts";
+var subscriptionHandler = (handler) => {
+  return ({ event: { data }, context, ...rest }) => {
+    const { client } = context;
+    const space = data.spaceKey ? client.spaces.get(import_client.PublicKey.from(data.spaceKey)) : void 0;
+    const objects = space ? data.objects?.map((id) => space.db.getObjectById(id)).filter(import_util.nonNullable) : [];
+    if (!!data.spaceKey && !space) {
+      import_log.log.warn("invalid space", {
+        data
+      }, {
+        F: __dxlog_file,
+        L: 91,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+    } else {
+      import_log.log.info("handler", {
+        space: space?.key.truncate(),
+        objects: objects?.length
+      }, {
+        F: __dxlog_file,
+        L: 93,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+    }
+    return handler({
+      event: {
+        data: {
+          ...data,
+          space,
+          objects
+        }
+      },
+      context,
+      ...rest
+    });
+  };
+};
+var omitEchoId = (schema) => import_echo_schema.S.make(import_echo_schema.AST.omit(schema.ast, [
+  "id"
+]));
 var SubscriptionTriggerSchema = import_echo_schema.S.struct({
   type: import_echo_schema.S.literal("subscription"),
-  // TODO(burdon): Define query DSL (from ECHO).
+  // TODO(burdon): Define query DSL.
   filter: import_echo_schema.S.array(import_echo_schema.S.struct({
     type: import_echo_schema.S.string,
     props: import_echo_schema.S.optional(import_echo_schema.S.record(import_echo_schema.S.string, import_echo_schema.S.any))
@@ -132,75 +171,47 @@ var FunctionTrigger = class extends (0, import_echo_schema.TypedObject)({
   typename: "dxos.org/type/FunctionTrigger",
   version: "0.1.0"
 })({
-  function: import_echo_schema.S.string.pipe(import_echo_schema.S.description("Function URI.")),
-  // Context is merged into the event data passed to the function.
-  meta: import_echo_schema.S.optional(import_echo_schema.S.object),
+  function: import_echo_schema.S.string.pipe(import_echo_schema.S.description("Function ID/URI.")),
+  // Context passed to a function.
+  meta: import_echo_schema.S.optional(import_echo_schema.S.record(import_echo_schema.S.string, import_echo_schema.S.any)),
   spec: TriggerSpecSchema
 }) {
 };
 var FunctionManifestSchema = import_echo_schema.S.struct({
-  functions: import_echo_schema.S.optional(import_echo_schema.S.mutable(import_echo_schema.S.array((0, import_echo_schema.RawObject)(FunctionDef)))),
-  triggers: import_echo_schema.S.optional(import_echo_schema.S.mutable(import_echo_schema.S.array((0, import_echo_schema.RawObject)(FunctionTrigger))))
+  functions: import_echo_schema.S.optional(import_echo_schema.S.mutable(import_echo_schema.S.array(omitEchoId(FunctionDef)))),
+  triggers: import_echo_schema.S.optional(import_echo_schema.S.mutable(import_echo_schema.S.array(omitEchoId(FunctionTrigger))))
 });
-var diff = (previous, next, comparator) => {
-  const remaining = [
-    ...previous
-  ];
-  const result = {
-    added: [],
-    updated: [],
-    removed: remaining
-  };
-  for (const object of next) {
-    const index = remaining.findIndex((item) => comparator(item, object));
-    if (index === -1) {
-      result.added.push(object);
-    } else {
-      result.updated.push(remaining[index]);
-      remaining.splice(index, 1);
-    }
-  }
-  return result;
-};
-var intersection = (a, b, comparator) => a.filter((a2) => b.find((b2) => comparator(a2, b2)) !== void 0);
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/functions/src/function/function-registry.ts";
 var FunctionRegistry = class extends import_context.Resource {
   constructor(_client) {
     super();
     this._client = _client;
-    this._functionBySpaceKey = new import_util.ComplexMap(import_keys.PublicKey.hash);
-    this.registered = new import_async.Event();
+    this._functionBySpaceKey = new import_util2.ComplexMap(import_keys.PublicKey.hash);
+    this.onFunctionsRegistered = new import_async.Event();
   }
   getFunctions(space) {
     return this._functionBySpaceKey.get(space.key) ?? [];
   }
   /**
-  * Loads function definitions from the manifest into the space.
+  * The method loads function definitions from the manifest into the space.
   * We first load all the definitions from the space to deduplicate by functionId.
   */
-  async register(space, functions) {
-    (0, import_log.log)("register", {
-      space: space.key,
-      functions: functions?.length ?? 0
-    }, {
-      F: __dxlog_file,
-      L: 39,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    if (!functions?.length) {
+  // TODO(burdon): This should not be space specific (they are static for the agent).
+  async register(space, manifest) {
+    if (!manifest.functions?.length) {
       return;
     }
-    if (!space.db.graph.runtimeSchemaRegistry.hasSchema(FunctionDef)) {
+    if (!space.db.graph.runtimeSchemaRegistry.isSchemaRegistered(FunctionDef)) {
       space.db.graph.runtimeSchemaRegistry.registerSchema(FunctionDef);
     }
-    const { objects: existing } = await space.db.query(import_echo.Filter.schema(FunctionDef)).run();
-    const { added, removed } = diff(existing, functions, (a, b) => a.uri === b.uri);
-    added.forEach((def) => space.db.add((0, import_echo.create)(FunctionDef, def)));
-    removed.forEach((def) => space.db.remove(def));
+    const { objects: existingDefinitions } = await space.db.query(import_echo.Filter.schema(FunctionDef)).run();
+    const newDefinitions = getNewDefinitions(manifest.functions, existingDefinitions);
+    const reactiveObjects = newDefinitions.map((template) => (0, import_echo.create)(FunctionDef, {
+      ...template
+    }));
+    reactiveObjects.forEach((obj) => space.db.add(obj));
   }
   async _open() {
-    const spacesSubscription = this._client.spaces.subscribe(async (spaces) => {
+    const spaceListSubscription = this._client.spaces.subscribe(async (spaces) => {
       for (const space of spaces) {
         if (this._functionBySpaceKey.has(space.key)) {
           continue;
@@ -211,65 +222,31 @@ var FunctionRegistry = class extends import_context.Resource {
         if (this._ctx.disposed) {
           break;
         }
-        this._ctx.onDispose(space.db.query(import_echo.Filter.schema(FunctionDef)).subscribe(({ objects }) => {
-          const { added } = diff(registered, objects, (a, b) => a.uri === b.uri);
-          if (added.length > 0) {
-            registered.push(...added);
-            this.registered.emit({
+        const functionsSubscription = space.db.query(import_echo.Filter.schema(FunctionDef)).subscribe((definitions) => {
+          const newFunctions = getNewDefinitions(definitions.objects, registered);
+          if (newFunctions.length > 0) {
+            registered.push(...newFunctions);
+            this.onFunctionsRegistered.emit({
               space,
-              added
+              newFunctions
             });
           }
-        }));
+        });
+        this._ctx.onDispose(functionsSubscription);
       }
     });
-    this._ctx.onDispose(() => spacesSubscription.unsubscribe());
+    this._ctx.onDispose(() => spaceListSubscription.unsubscribe());
   }
   async _close(_) {
     this._functionBySpaceKey.clear();
   }
 };
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/functions/src/handler.ts";
-var subscriptionHandler = (handler) => {
-  return ({ event: { data }, context, ...rest }) => {
-    const { client } = context;
-    const space = data.spaceKey ? client.spaces.get(import_client.PublicKey.from(data.spaceKey)) : void 0;
-    const objects = space ? data.objects?.map((id) => space.db.getObjectById(id)).filter(import_util2.nonNullable) : [];
-    if (!!data.spaceKey && !space) {
-      import_log2.log.warn("invalid space", {
-        data
-      }, {
-        F: __dxlog_file2,
-        L: 91,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-    } else {
-      import_log2.log.info("handler", {
-        space: space?.key.truncate(),
-        objects: objects?.length
-      }, {
-        F: __dxlog_file2,
-        L: 93,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-    }
-    return handler({
-      event: {
-        data: {
-          ...data,
-          space,
-          objects
-        }
-      },
-      context,
-      ...rest
-    });
-  };
+var getNewDefinitions = (candidateList, existing) => {
+  return candidateList.filter((candidate) => existing.find((def) => def.uri === candidate.uri) == null);
 };
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/dev-server.ts";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/dev-server.ts";
 var DevServer = class {
+  // prettier-ignore
   constructor(_client, _functionsRegistry, _options) {
     this._client = _client;
     this._functionsRegistry = _functionsRegistry;
@@ -278,14 +255,14 @@ var DevServer = class {
     this._handlers = {};
     this._seq = 0;
     this.update = new import_async2.Event();
-    this._functionsRegistry.registered.on(async ({ added }) => {
-      added.forEach((def) => this._load(def));
+    this._functionsRegistry.onFunctionsRegistered.on(async ({ newFunctions }) => {
+      newFunctions.forEach((def) => this._load(def));
       await this._safeUpdateRegistration();
-      (0, import_log3.log)("new functions loaded", {
-        added
+      (0, import_log2.log)("new functions loaded", {
+        newFunctions
       }, {
-        F: __dxlog_file3,
-        L: 52,
+        F: __dxlog_file2,
+        L: 53,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -298,8 +275,8 @@ var DevServer = class {
   }
   get endpoint() {
     (0, import_invariant.invariant)(this._port, void 0, {
-      F: __dxlog_file3,
-      L: 63,
+      F: __dxlog_file2,
+      L: 64,
       S: this,
       A: [
         "this._port",
@@ -316,17 +293,17 @@ var DevServer = class {
   }
   async start() {
     (0, import_invariant.invariant)(!this._server, void 0, {
-      F: __dxlog_file3,
-      L: 76,
+      F: __dxlog_file2,
+      L: 77,
       S: this,
       A: [
         "!this._server",
         ""
       ]
     });
-    import_log3.log.info("starting...", void 0, {
-      F: __dxlog_file3,
-      L: 77,
+    import_log2.log.info("starting...", void 0, {
+      F: __dxlog_file2,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -336,11 +313,11 @@ var DevServer = class {
     app.post("/:path", async (req, res) => {
       const { path: path2 } = req.params;
       try {
-        import_log3.log.info("calling", {
+        import_log2.log.info("calling", {
           path: path2
         }, {
-          F: __dxlog_file3,
-          L: 87,
+          F: __dxlog_file2,
+          L: 88,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -351,9 +328,9 @@ var DevServer = class {
         res.statusCode = await this.invoke("/" + path2, req.body);
         res.end();
       } catch (err) {
-        import_log3.log.catch(err, void 0, {
-          F: __dxlog_file3,
-          L: 97,
+        import_log2.log.catch(err, void 0, {
+          F: __dxlog_file2,
+          L: 98,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -374,11 +351,11 @@ var DevServer = class {
       const { registrationId, endpoint } = await this._client.services.services.FunctionRegistryService.register({
         endpoint: this.endpoint
       });
-      import_log3.log.info("registered", {
+      import_log2.log.info("registered", {
         endpoint
       }, {
-        F: __dxlog_file3,
-        L: 112,
+        F: __dxlog_file2,
+        L: 113,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -389,44 +366,44 @@ var DevServer = class {
       await this.stop();
       throw new Error("FunctionRegistryService not available (check plugin is configured).");
     }
-    import_log3.log.info("started", {
+    import_log2.log.info("started", {
       port: this._port
     }, {
-      F: __dxlog_file3,
-      L: 123,
+      F: __dxlog_file2,
+      L: 124,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async stop() {
     (0, import_invariant.invariant)(this._server, void 0, {
-      F: __dxlog_file3,
-      L: 127,
+      F: __dxlog_file2,
+      L: 128,
       S: this,
       A: [
         "this._server",
         ""
       ]
     });
-    import_log3.log.info("stopping...", void 0, {
-      F: __dxlog_file3,
-      L: 128,
+    import_log2.log.info("stopping...", void 0, {
+      F: __dxlog_file2,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
     const trigger = new import_async2.Trigger();
     this._server.close(async () => {
-      import_log3.log.info("server stopped", void 0, {
-        F: __dxlog_file3,
-        L: 132,
+      import_log2.log.info("server stopped", void 0, {
+        F: __dxlog_file2,
+        L: 133,
         S: this,
         C: (f, a) => f(...a)
       });
       try {
         if (this._functionServiceRegistration) {
           (0, import_invariant.invariant)(this._client.services.services.FunctionRegistryService, void 0, {
-            F: __dxlog_file3,
-            L: 135,
+            F: __dxlog_file2,
+            L: 136,
             S: this,
             A: [
               "this._client.services.services.FunctionRegistryService",
@@ -436,11 +413,11 @@ var DevServer = class {
           await this._client.services.services.FunctionRegistryService.unregister({
             registrationId: this._functionServiceRegistration
           });
-          import_log3.log.info("unregistered", {
+          import_log2.log.info("unregistered", {
             registrationId: this._functionServiceRegistration
           }, {
-            F: __dxlog_file3,
-            L: 140,
+            F: __dxlog_file2,
+            L: 141,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -455,9 +432,9 @@ var DevServer = class {
     await trigger.wait();
     this._port = void 0;
     this._server = void 0;
-    import_log3.log.info("stopped", void 0, {
-      F: __dxlog_file3,
-      L: 154,
+    import_log2.log.info("stopped", void 0, {
+      F: __dxlog_file2,
+      L: 155,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -468,12 +445,12 @@ var DevServer = class {
   async _load(def, force = false) {
     const { uri, route, handler } = def;
     const filePath = (0, import_node_path.join)(this._options.baseDir, handler);
-    import_log3.log.info("loading", {
+    import_log2.log.info("loading", {
       uri,
       force
     }, {
-      F: __dxlog_file3,
-      L: 163,
+      F: __dxlog_file2,
+      L: 164,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -493,8 +470,8 @@ var DevServer = class {
   }
   async _safeUpdateRegistration() {
     (0, import_invariant.invariant)(this._functionServiceRegistration, void 0, {
-      F: __dxlog_file3,
-      L: 185,
+      F: __dxlog_file2,
+      L: 186,
       S: this,
       A: [
         "this._functionServiceRegistration",
@@ -510,9 +487,9 @@ var DevServer = class {
         }))
       });
     } catch (e) {
-      import_log3.log.catch(e, void 0, {
-        F: __dxlog_file3,
-        L: 192,
+      import_log2.log.catch(e, void 0, {
+        F: __dxlog_file2,
+        L: 193,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -524,26 +501,26 @@ var DevServer = class {
   async invoke(path2, data) {
     const seq = ++this._seq;
     const now = Date.now();
-    import_log3.log.info("req", {
+    import_log2.log.info("req", {
       seq,
       path: path2
     }, {
-      F: __dxlog_file3,
-      L: 203,
+      F: __dxlog_file2,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
     const statusCode = await this._invoke(path2, {
       data
     });
-    import_log3.log.info("res", {
+    import_log2.log.info("res", {
       seq,
       path: path2,
       statusCode,
       duration: Date.now() - now
     }, {
-      F: __dxlog_file3,
-      L: 206,
+      F: __dxlog_file2,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -553,8 +530,8 @@ var DevServer = class {
   async _invoke(path2, event) {
     const { handler } = this._handlers[path2] ?? {};
     (0, import_invariant.invariant)(handler, `invalid path: ${path2}`, {
-      F: __dxlog_file3,
-      L: 213,
+      F: __dxlog_file2,
+      L: 214,
       S: this,
       A: [
         "handler",
@@ -583,16 +560,15 @@ var DevServer = class {
 var createContext = () => new import_context2.Context({
   name: "DevServer"
 });
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/scheduler.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/scheduler.ts";
 var Scheduler = class {
   constructor(functions, triggers, _options = {}) {
     this.functions = functions;
     this.triggers = triggers;
     this._options = _options;
     this._ctx = createContext2();
-    this._callMutex = new import_async3.Mutex();
-    this.functions.registered.on(async ({ space, added }) => {
-      await this._safeActivateTriggers(space, this.triggers.getInactiveTriggers(space), added);
+    this.functions.onFunctionsRegistered.on(async ({ space, newFunctions }) => {
+      await this._safeActivateTriggers(space, this.triggers.getInactiveTriggers(space), newFunctions);
     });
     this.triggers.registered.on(async ({ space, triggers: triggers2 }) => {
       await this._safeActivateTriggers(space, triggers2, this.functions.getFunctions(space));
@@ -609,25 +585,24 @@ var Scheduler = class {
     await this.functions.close();
     await this.triggers.close();
   }
-  // TODO(burdon): Remove and update registries directly.
   async register(space, manifest) {
-    await this.functions.register(space, manifest.functions);
+    await this.functions.register(space, manifest);
     await this.triggers.register(space, manifest);
   }
   async _safeActivateTriggers(space, triggers, functions) {
     const mountTasks = triggers.map((trigger) => {
       return this.activate(space, functions, trigger);
     });
-    await Promise.all(mountTasks).catch(import_log4.log.catch);
+    await Promise.all(mountTasks).catch(import_log3.log.catch);
   }
   async activate(space, functions, fnTrigger) {
     const definition = functions.find((def) => def.uri === fnTrigger.function);
     if (!definition) {
-      import_log4.log.info("function is not found for trigger", {
+      import_log3.log.info("function is not found for trigger", {
         fnTrigger
       }, {
-        F: __dxlog_file4,
-        L: 78,
+        F: __dxlog_file3,
+        L: 74,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -636,27 +611,25 @@ var Scheduler = class {
     await this.triggers.activate({
       space
     }, fnTrigger, async (args) => {
-      return this._callMutex.executeSynchronized(() => {
-        return this._execFunction(definition, fnTrigger, {
-          meta: fnTrigger.meta,
-          data: {
-            ...args,
-            spaceKey: space.key
-          }
-        });
+      return this._execFunction(definition, {
+        meta: fnTrigger.meta,
+        data: {
+          ...args,
+          spaceKey: space.key
+        }
       });
     });
-    (0, import_log4.log)("activated trigger", {
+    (0, import_log3.log)("activated trigger", {
       space: space.key,
       trigger: fnTrigger
     }, {
-      F: __dxlog_file4,
-      L: 91,
+      F: __dxlog_file3,
+      L: 84,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async _execFunction(def, trigger, { data, meta }) {
+  async _execFunction(def, { data, meta }) {
     let status = 0;
     try {
       const payload = Object.assign({}, meta && {
@@ -665,13 +638,12 @@ var Scheduler = class {
       const { endpoint, callback } = this._options;
       if (endpoint) {
         const url = import_node_path2.default.join(endpoint, def.route);
-        import_log4.log.info("exec", {
+        import_log3.log.info("exec", {
           function: def.uri,
-          url,
-          triggerType: trigger.spec.type
+          url
         }, {
-          F: __dxlog_file4,
-          L: 108,
+          F: __dxlog_file3,
+          L: 100,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -684,11 +656,11 @@ var Scheduler = class {
         });
         status = response.status;
       } else if (callback) {
-        import_log4.log.info("exec", {
+        import_log3.log.info("exec", {
           function: def.uri
         }, {
-          F: __dxlog_file4,
-          L: 119,
+          F: __dxlog_file3,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -697,22 +669,22 @@ var Scheduler = class {
       if (status && status >= 400) {
         throw new Error(`Response: ${status}`);
       }
-      import_log4.log.info("done", {
+      import_log3.log.info("done", {
         function: def.uri,
         status
       }, {
-        F: __dxlog_file4,
-        L: 129,
+        F: __dxlog_file3,
+        L: 121,
         S: this,
         C: (f, a) => f(...a)
       });
     } catch (err) {
-      import_log4.log.error("error", {
+      import_log3.log.error("error", {
         function: def.uri,
         error: err.message
       }, {
-        F: __dxlog_file4,
-        L: 131,
+        F: __dxlog_file3,
+        L: 123,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -724,59 +696,53 @@ var Scheduler = class {
 var createContext2 = () => new import_context3.Context({
   name: "FunctionScheduler"
 });
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/subscription-trigger.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/subscription-trigger.ts";
 var createSubscriptionTrigger = async (ctx, triggerCtx, spec, callback) => {
   const objectIds = /* @__PURE__ */ new Set();
-  const task = new import_async5.UpdateScheduler(ctx, async () => {
+  const task = new import_async4.DeferredTask(ctx, async () => {
     if (objectIds.size > 0) {
-      const objects = Array.from(objectIds);
-      objectIds.clear();
       await callback({
-        objects
+        objects: Array.from(objectIds)
       });
+      objectIds.clear();
     }
-  }, {
-    maxFrequency: 4
   });
   const subscriptions = [];
   const subscription = (0, import_echo_db.createSubscription)(({ added, updated }) => {
-    const sizeBefore = objectIds.size;
+    import_log5.log.info("updated", {
+      added: added.length,
+      updated: updated.length
+    }, {
+      F: __dxlog_file4,
+      L: 32,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
     for (const object of added) {
       objectIds.add(object.id);
     }
     for (const object of updated) {
       objectIds.add(object.id);
     }
-    if (objectIds.size > sizeBefore) {
-      import_log6.log.info("updated", {
-        added: added.length,
-        updated: updated.length
-      }, {
-        F: __dxlog_file5,
-        L: 45,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      task.trigger();
-    }
+    task.schedule();
   });
   subscriptions.push(() => subscription.unsubscribe());
   const { filter, options: { deep, delay } = {} } = spec;
   const update = ({ objects }) => {
     subscription.update(objects);
     if (deep) {
-      import_log6.log.info("update", {
+      import_log5.log.info("update", {
         objects: objects.length
       }, {
-        F: __dxlog_file5,
-        L: 59,
+        F: __dxlog_file4,
+        L: 52,
         S: void 0,
         C: (f, a) => f(...a)
       });
       for (const object of objects) {
         const content = object.content;
         if (content instanceof import_types.TextV0Type) {
-          subscriptions.push((0, import_echo_db.getAutomergeObjectCore)(content).updates.on((0, import_async5.debounce)(() => subscription.update([
+          subscriptions.push((0, import_echo_db.getAutomergeObjectCore)(content).updates.on((0, import_async4.debounce)(() => subscription.update([
             object
           ]), 1e3)));
         }
@@ -784,14 +750,14 @@ var createSubscriptionTrigger = async (ctx, triggerCtx, spec, callback) => {
     }
   };
   const query = triggerCtx.space.db.query(import_echo_db.Filter.or(filter.map(({ type, props }) => import_echo_db.Filter.typename(type, props))));
-  subscriptions.push(query.subscribe(delay ? (0, import_async5.debounce)(update, delay) : update));
+  subscriptions.push(query.subscribe(delay ? (0, import_async4.debounce)(update, delay) : update));
   ctx.onDispose(() => {
     subscriptions.forEach((unsubscribe) => unsubscribe());
   });
 };
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/timer-trigger.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/timer-trigger.ts";
 var createTimerTrigger = async (ctx, triggerContext, spec, callback) => {
-  const task = new import_async6.DeferredTask(ctx, async () => {
+  const task = new import_async5.DeferredTask(ctx, async () => {
     await callback({});
   });
   let last = 0;
@@ -804,12 +770,12 @@ var createTimerTrigger = async (ctx, triggerContext, spec, callback) => {
       const delta = last ? now - last : 0;
       last = now;
       run++;
-      import_log7.log.info("tick", {
+      import_log6.log.info("tick", {
         space: triggerContext.space.key.truncate(),
         count: run,
         delta
       }, {
-        F: __dxlog_file6,
+        F: __dxlog_file5,
         L: 37,
         S: void 0,
         C: (f, a) => f(...a)
@@ -820,7 +786,7 @@ var createTimerTrigger = async (ctx, triggerContext, spec, callback) => {
   job.start();
   ctx.onDispose(() => job.stop());
 };
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/webhook-trigger.ts";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/webhook-trigger.ts";
 var createWebhookTrigger = async (ctx, _, spec, callback) => {
   const server = import_node_http.default.createServer(async (req, res) => {
     if (req.method !== spec.method) {
@@ -834,10 +800,10 @@ var createWebhookTrigger = async (ctx, _, spec, callback) => {
     random: true
   });
   server.listen(port, () => {
-    import_log8.log.info("started webhook", {
+    import_log7.log.info("started webhook", {
       port
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 40,
       S: void 0,
       C: (f, a) => f(...a)
@@ -848,7 +814,7 @@ var createWebhookTrigger = async (ctx, _, spec, callback) => {
     server.close();
   });
 };
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/websocket-trigger.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/websocket-trigger.ts";
 var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
   retryDelay: 2,
   maxAttempts: 5
@@ -856,14 +822,14 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
   const { url, init } = spec;
   let ws;
   for (let attempt = 1; attempt <= options.maxAttempts; attempt++) {
-    const open = new import_async7.Trigger();
+    const open = new import_async6.Trigger();
     ws = new import_ws.default(url);
     Object.assign(ws, {
       onopen: () => {
-        import_log9.log.info("opened", {
+        import_log8.log.info("opened", {
           url
         }, {
-          F: __dxlog_file8,
+          F: __dxlog_file7,
           L: 39,
           S: void 0,
           C: (f, a) => f(...a)
@@ -874,21 +840,21 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
         open.wake(true);
       },
       onclose: (event) => {
-        import_log9.log.info("closed", {
+        import_log8.log.info("closed", {
           url,
           code: event.code
         }, {
-          F: __dxlog_file8,
+          F: __dxlog_file7,
           L: 48,
           S: void 0,
           C: (f, a) => f(...a)
         });
         if (event.code === 1006) {
           setTimeout(async () => {
-            import_log9.log.info(`reconnecting in ${options.retryDelay}s...`, {
+            import_log8.log.info(`reconnecting in ${options.retryDelay}s...`, {
               url
             }, {
-              F: __dxlog_file8,
+              F: __dxlog_file7,
               L: 53,
               S: void 0,
               C: (f, a) => f(...a)
@@ -899,10 +865,10 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
         open.wake(false);
       },
       onerror: (event) => {
-        import_log9.log.catch(event.error, {
+        import_log8.log.catch(event.error, {
           url
         }, {
-          F: __dxlog_file8,
+          F: __dxlog_file7,
           L: 62,
           S: void 0,
           C: (f, a) => f(...a)
@@ -910,8 +876,8 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
       },
       onmessage: async (event) => {
         try {
-          import_log9.log.info("message", void 0, {
-            F: __dxlog_file8,
+          import_log8.log.info("message", void 0, {
+            F: __dxlog_file7,
             L: 67,
             S: void 0,
             C: (f, a) => f(...a)
@@ -921,10 +887,10 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
             data
           });
         } catch (err) {
-          import_log9.log.catch(err, {
+          import_log8.log.catch(err, {
             url
           }, {
-            F: __dxlog_file8,
+            F: __dxlog_file7,
             L: 71,
             S: void 0,
             C: (f, a) => f(...a)
@@ -938,15 +904,15 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
     } else {
       const wait = Math.pow(attempt, 2) * options.retryDelay;
       if (attempt < options.maxAttempts) {
-        import_log9.log.warn(`failed to connect; trying again in ${wait}s`, {
+        import_log8.log.warn(`failed to connect; trying again in ${wait}s`, {
           attempt
         }, {
-          F: __dxlog_file8,
+          F: __dxlog_file7,
           L: 82,
           S: void 0,
           C: (f, a) => f(...a)
         });
-        await (0, import_async7.sleep)(wait * 1e3);
+        await (0, import_async6.sleep)(wait * 1e3);
       }
     }
   }
@@ -954,7 +920,7 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
     ws?.close();
   });
 };
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/trigger-registry.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/trigger-registry.ts";
 var triggerHandlers = {
   subscription: createSubscriptionTrigger,
   timer: createTimerTrigger,
@@ -967,8 +933,8 @@ var TriggerRegistry = class extends import_context4.Resource {
     this._client = _client;
     this._options = _options;
     this._triggersBySpaceKey = new import_util3.ComplexMap(import_keys2.PublicKey.hash);
-    this.registered = new import_async4.Event();
-    this.removed = new import_async4.Event();
+    this.registered = new import_async3.Event();
+    this.removed = new import_async3.Event();
   }
   getActiveTriggers(space) {
     return this._getTriggers(space, (t) => t.activationCtx != null);
@@ -977,12 +943,12 @@ var TriggerRegistry = class extends import_context4.Resource {
     return this._getTriggers(space, (t) => t.activationCtx == null);
   }
   async activate(triggerCtx, trigger, callback) {
-    (0, import_log5.log)("activate", {
+    (0, import_log4.log)("activate", {
       space: triggerCtx.space.key,
       trigger
     }, {
-      F: __dxlog_file9,
-      L: 75,
+      F: __dxlog_file8,
+      L: 73,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -992,8 +958,8 @@ var TriggerRegistry = class extends import_context4.Resource {
     this._ctx.onDispose(() => activationCtx.dispose());
     const registeredTrigger = this._triggersBySpaceKey.get(triggerCtx.space.key)?.find((reg) => reg.trigger.id === trigger.id);
     (0, import_invariant2.invariant)(registeredTrigger, `Trigger is not registered: ${trigger.function}`, {
-      F: __dxlog_file9,
-      L: 81,
+      F: __dxlog_file8,
+      L: 79,
       S: this,
       A: [
         "registeredTrigger",
@@ -1013,35 +979,24 @@ var TriggerRegistry = class extends import_context4.Resource {
   * Loads triggers from the manifest into the space.
   */
   async register(space, manifest) {
-    (0, import_log5.log)("register", {
+    (0, import_log4.log)("register", {
       space: space.key
     }, {
-      F: __dxlog_file9,
-      L: 97,
+      F: __dxlog_file8,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
     if (!manifest.triggers?.length) {
       return;
     }
-    if (!space.db.graph.runtimeSchemaRegistry.hasSchema(FunctionTrigger)) {
+    if (!space.db.graph.runtimeSchemaRegistry.isSchemaRegistered(FunctionTrigger)) {
       space.db.graph.runtimeSchemaRegistry.registerSchema(FunctionTrigger);
     }
-    const { objects: existing } = await space.db.query(import_echo2.Filter.schema(FunctionTrigger)).run();
-    const { added, removed } = diff(existing, manifest.triggers, (a, b) => {
-      const keys = b[import_echo_schema2.ECHO_ATTR_META]?.keys ?? [
-        (0, import_echo_schema2.foreignKey)("manifest", [
-          b.function,
-          b.spec.type
-        ].join("-"))
-      ];
-      return intersection((0, import_echo2.getMeta)(a)?.keys ?? [], keys, import_echo_schema2.foreignKeyEquals).length > 0;
-    });
-    added.forEach((trigger) => {
-      const { meta, object } = (0, import_echo_schema2.splitMeta)(trigger);
-      space.db.add((0, import_echo2.create)(FunctionTrigger, object, meta));
-    });
-    removed.forEach((trigger) => space.db.remove(trigger));
+    const reactiveObjects = manifest.triggers.map((template) => (0, import_echo2.create)(FunctionTrigger, {
+      ...template
+    }));
+    reactiveObjects.forEach((obj) => space.db.add(obj));
   }
   async _open() {
     const spaceListSubscription = this._client.spaces.subscribe(async (spaces) => {
@@ -1076,12 +1031,12 @@ var TriggerRegistry = class extends import_context4.Resource {
         trigger
       }));
       registered.push(...newRegisteredTriggers);
-      (0, import_log5.log)("registered new triggers", () => ({
+      (0, import_log4.log)("registered new triggers", () => ({
         spaceKey: space.key,
         functions: newTriggers.map((t) => t.function)
       }), {
-        F: __dxlog_file9,
-        L: 159,
+        F: __dxlog_file8,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });