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

package/dist/lib/browser/index.mjs

@@ -14,19 +14,65 @@ import {
   process
 } from "@dxos/node-std/inject-globals";
 
-// packages/core/functions/src/function/function-registry.ts
+// packages/core/functions/src/handler.ts
+import { PublicKey } from "@dxos/client";
+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: { data }, context, ...rest }) => {
+    const { client } = context;
+    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", {
+        data
+      }, {
+        F: __dxlog_file,
+        L: 91,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+    } else {
+      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
+    });
+  };
+};
+
+// packages/core/functions/src/registry/function-registry.ts
 import { Event } from "@dxos/async";
 import { create, Filter } from "@dxos/client/echo";
 import { Resource } from "@dxos/context";
-import { PublicKey } from "@dxos/keys";
-import { log } from "@dxos/log";
+import { PublicKey as PublicKey2 } from "@dxos/keys";
 import { ComplexMap } from "@dxos/util";
 
 // packages/core/functions/src/types.ts
-import { RawObject, S, TypedObject } from "@dxos/echo-schema";
+import { AST, S, TypedObject } from "@dxos/echo-schema";
+var omitEchoId = (schema) => S.make(AST.omit(schema.ast, [
+  "id"
+]));
 var SubscriptionTriggerSchema = S.struct({
   type: S.literal("subscription"),
-  // TODO(burdon): Define query DSL (from ECHO).
+  // TODO(burdon): Define query DSL.
   filter: S.array(S.struct({
     type: S.string,
     props: S.optional(S.record(S.string, S.any))
@@ -69,79 +115,49 @@ var FunctionTrigger = class extends TypedObject({
   typename: "dxos.org/type/FunctionTrigger",
   version: "0.1.0"
 })({
-  function: S.string.pipe(S.description("Function URI.")),
-  // Context is merged into the event data passed to the function.
-  meta: S.optional(S.object),
+  function: S.string.pipe(S.description("Function ID/URI.")),
+  // Context passed to a function.
+  meta: S.optional(S.record(S.string, S.any)),
   spec: TriggerSpecSchema
 }) {
 };
 var FunctionManifestSchema = S.struct({
-  functions: S.optional(S.mutable(S.array(RawObject(FunctionDef)))),
-  triggers: S.optional(S.mutable(S.array(RawObject(FunctionTrigger))))
+  functions: S.optional(S.mutable(S.array(omitEchoId(FunctionDef)))),
+  triggers: S.optional(S.mutable(S.array(omitEchoId(FunctionTrigger))))
 });
 
-// packages/core/functions/src/util.ts
-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);
-
-// packages/core/functions/src/function/function-registry.ts
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/functions/src/function/function-registry.ts";
+// packages/core/functions/src/registry/function-registry.ts
 var FunctionRegistry = class extends Resource {
   constructor(_client) {
     super();
     this._client = _client;
-    this._functionBySpaceKey = new ComplexMap(PublicKey.hash);
-    this.registered = new Event();
+    this._functionBySpaceKey = new ComplexMap(PublicKey2.hash);
+    this.onFunctionsRegistered = new 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) {
-    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(Filter.schema(FunctionDef)).run();
-    const { added, removed } = diff(existing, functions, (a, b) => a.uri === b.uri);
-    added.forEach((def) => space.db.add(create(FunctionDef, def)));
-    removed.forEach((def) => space.db.remove(def));
+    const { objects: existingDefinitions } = await space.db.query(Filter.schema(FunctionDef)).run();
+    const newDefinitions = getNewDefinitions(manifest.functions, existingDefinitions);
+    const reactiveObjects = newDefinitions.map((template) => 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;
@@ -152,67 +168,27 @@ var FunctionRegistry = class extends Resource {
         if (this._ctx.disposed) {
           break;
         }
-        this._ctx.onDispose(space.db.query(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(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();
   }
 };
-
-// packages/core/functions/src/handler.ts
-import { PublicKey as PublicKey2 } from "@dxos/client";
-import { log as log2 } from "@dxos/log";
-import { nonNullable } from "@dxos/util";
-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(PublicKey2.from(data.spaceKey)) : void 0;
-    const objects = space ? data.objects?.map((id) => space.db.getObjectById(id)).filter(nonNullable) : [];
-    if (!!data.spaceKey && !space) {
-      log2.warn("invalid space", {
-        data
-      }, {
-        F: __dxlog_file2,
-        L: 91,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-    } else {
-      log2.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);
 };
 
 // packages/core/functions/src/runtime/dev-server.ts
@@ -222,9 +198,10 @@ import { join } from "@dxos/node-std/path";
 import { Event as Event2, Trigger } from "@dxos/async";
 import { Context } from "@dxos/context";
 import { invariant } from "@dxos/invariant";
-import { log as log3 } from "@dxos/log";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/dev-server.ts";
+import { log as log2 } from "@dxos/log";
+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;
@@ -233,14 +210,14 @@ var DevServer = class {
     this._handlers = {};
     this._seq = 0;
     this.update = new Event2();
-    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();
-      log3("new functions loaded", {
-        added
+      log2("new functions loaded", {
+        newFunctions
       }, {
-        F: __dxlog_file3,
-        L: 52,
+        F: __dxlog_file2,
+        L: 53,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -253,8 +230,8 @@ var DevServer = class {
   }
   get endpoint() {
     invariant(this._port, void 0, {
-      F: __dxlog_file3,
-      L: 63,
+      F: __dxlog_file2,
+      L: 64,
       S: this,
       A: [
         "this._port",
@@ -271,17 +248,17 @@ var DevServer = class {
   }
   async start() {
     invariant(!this._server, void 0, {
-      F: __dxlog_file3,
-      L: 76,
+      F: __dxlog_file2,
+      L: 77,
       S: this,
       A: [
         "!this._server",
         ""
       ]
     });
-    log3.info("starting...", void 0, {
-      F: __dxlog_file3,
-      L: 77,
+    log2.info("starting...", void 0, {
+      F: __dxlog_file2,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -291,11 +268,11 @@ var DevServer = class {
     app.post("/:path", async (req, res) => {
       const { path: path2 } = req.params;
       try {
-        log3.info("calling", {
+        log2.info("calling", {
           path: path2
         }, {
-          F: __dxlog_file3,
-          L: 87,
+          F: __dxlog_file2,
+          L: 88,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -306,9 +283,9 @@ var DevServer = class {
         res.statusCode = await this.invoke("/" + path2, req.body);
         res.end();
       } catch (err) {
-        log3.catch(err, void 0, {
-          F: __dxlog_file3,
-          L: 97,
+        log2.catch(err, void 0, {
+          F: __dxlog_file2,
+          L: 98,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -329,11 +306,11 @@ var DevServer = class {
       const { registrationId, endpoint } = await this._client.services.services.FunctionRegistryService.register({
         endpoint: this.endpoint
       });
-      log3.info("registered", {
+      log2.info("registered", {
         endpoint
       }, {
-        F: __dxlog_file3,
-        L: 112,
+        F: __dxlog_file2,
+        L: 113,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -344,44 +321,44 @@ var DevServer = class {
       await this.stop();
       throw new Error("FunctionRegistryService not available (check plugin is configured).");
     }
-    log3.info("started", {
+    log2.info("started", {
       port: this._port
     }, {
-      F: __dxlog_file3,
-      L: 123,
+      F: __dxlog_file2,
+      L: 124,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async stop() {
     invariant(this._server, void 0, {
-      F: __dxlog_file3,
-      L: 127,
+      F: __dxlog_file2,
+      L: 128,
       S: this,
       A: [
         "this._server",
         ""
       ]
     });
-    log3.info("stopping...", void 0, {
-      F: __dxlog_file3,
-      L: 128,
+    log2.info("stopping...", void 0, {
+      F: __dxlog_file2,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
     const trigger = new Trigger();
     this._server.close(async () => {
-      log3.info("server stopped", void 0, {
-        F: __dxlog_file3,
-        L: 132,
+      log2.info("server stopped", void 0, {
+        F: __dxlog_file2,
+        L: 133,
         S: this,
         C: (f, a) => f(...a)
       });
       try {
         if (this._functionServiceRegistration) {
           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",
@@ -391,11 +368,11 @@ var DevServer = class {
           await this._client.services.services.FunctionRegistryService.unregister({
             registrationId: this._functionServiceRegistration
           });
-          log3.info("unregistered", {
+          log2.info("unregistered", {
             registrationId: this._functionServiceRegistration
           }, {
-            F: __dxlog_file3,
-            L: 140,
+            F: __dxlog_file2,
+            L: 141,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -410,9 +387,9 @@ var DevServer = class {
     await trigger.wait();
     this._port = void 0;
     this._server = void 0;
-    log3.info("stopped", void 0, {
-      F: __dxlog_file3,
-      L: 154,
+    log2.info("stopped", void 0, {
+      F: __dxlog_file2,
+      L: 155,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -423,12 +400,12 @@ var DevServer = class {
   async _load(def, force = false) {
     const { uri, route, handler } = def;
     const filePath = join(this._options.baseDir, handler);
-    log3.info("loading", {
+    log2.info("loading", {
       uri,
       force
     }, {
-      F: __dxlog_file3,
-      L: 163,
+      F: __dxlog_file2,
+      L: 164,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -448,8 +425,8 @@ var DevServer = class {
   }
   async _safeUpdateRegistration() {
     invariant(this._functionServiceRegistration, void 0, {
-      F: __dxlog_file3,
-      L: 185,
+      F: __dxlog_file2,
+      L: 186,
       S: this,
       A: [
         "this._functionServiceRegistration",
@@ -465,9 +442,9 @@ var DevServer = class {
         }))
       });
     } catch (e) {
-      log3.catch(e, void 0, {
-        F: __dxlog_file3,
-        L: 192,
+      log2.catch(e, void 0, {
+        F: __dxlog_file2,
+        L: 193,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -479,26 +456,26 @@ var DevServer = class {
   async invoke(path2, data) {
     const seq = ++this._seq;
     const now = Date.now();
-    log3.info("req", {
+    log2.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
     });
-    log3.info("res", {
+    log2.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)
     });
@@ -508,8 +485,8 @@ var DevServer = class {
   async _invoke(path2, event) {
     const { handler } = this._handlers[path2] ?? {};
     invariant(handler, `invalid path: ${path2}`, {
-      F: __dxlog_file3,
-      L: 213,
+      F: __dxlog_file2,
+      L: 214,
       S: this,
       A: [
         "handler",
@@ -541,19 +518,17 @@ var createContext = () => new Context({
 
 // packages/core/functions/src/runtime/scheduler.ts
 import path from "@dxos/node-std/path";
-import { Mutex } from "@dxos/async";
 import { Context as Context2 } from "@dxos/context";
-import { log as log4 } from "@dxos/log";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/scheduler.ts";
+import { log as log3 } from "@dxos/log";
+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 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));
@@ -570,25 +545,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(log4.catch);
+    await Promise.all(mountTasks).catch(log3.catch);
   }
   async activate(space, functions, fnTrigger) {
     const definition = functions.find((def) => def.uri === fnTrigger.function);
     if (!definition) {
-      log4.info("function is not found for trigger", {
+      log3.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)
       });
@@ -597,27 +571,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
+        }
       });
     });
-    log4("activated trigger", {
+    log3("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 && {
@@ -626,13 +598,12 @@ var Scheduler = class {
       const { endpoint, callback } = this._options;
       if (endpoint) {
         const url = path.join(endpoint, def.route);
-        log4.info("exec", {
+        log3.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)
         });
@@ -645,11 +616,11 @@ var Scheduler = class {
         });
         status = response.status;
       } else if (callback) {
-        log4.info("exec", {
+        log3.info("exec", {
           function: def.uri
         }, {
-          F: __dxlog_file4,
-          L: 119,
+          F: __dxlog_file3,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -658,22 +629,22 @@ var Scheduler = class {
       if (status && status >= 400) {
         throw new Error(`Response: ${status}`);
       }
-      log4.info("done", {
+      log3.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) {
-      log4.error("error", {
+      log3.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)
       });
@@ -688,65 +659,58 @@ var createContext2 = () => new Context2({
 
 // packages/core/functions/src/trigger/trigger-registry.ts
 import { Event as Event3 } from "@dxos/async";
-import { create as create2, Filter as Filter3, getMeta } from "@dxos/client/echo";
+import { create as create2, Filter as Filter3 } from "@dxos/client/echo";
 import { Context as Context3, Resource as Resource2 } from "@dxos/context";
-import { ECHO_ATTR_META, foreignKey, foreignKeyEquals, splitMeta } from "@dxos/echo-schema";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
-import { log as log9 } from "@dxos/log";
+import { log as log8 } from "@dxos/log";
 import { ComplexMap as ComplexMap2 } from "@dxos/util";
 
 // packages/core/functions/src/trigger/type/subscription-trigger.ts
 import { TextV0Type } from "@braneframe/types";
-import { debounce, UpdateScheduler } from "@dxos/async";
+import { debounce, DeferredTask } from "@dxos/async";
 import { createSubscription, Filter as Filter2, getAutomergeObjectCore } from "@dxos/echo-db";
-import { log as log5 } from "@dxos/log";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/subscription-trigger.ts";
+import { log as log4 } from "@dxos/log";
+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 UpdateScheduler(ctx, async () => {
+  const task = new 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 = createSubscription(({ added, updated }) => {
-    const sizeBefore = objectIds.size;
+    log4.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) {
-      log5.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) {
-      log5.info("update", {
+      log4.info("update", {
         objects: objects.length
       }, {
-        F: __dxlog_file5,
-        L: 59,
+        F: __dxlog_file4,
+        L: 52,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -769,11 +733,11 @@ var createSubscriptionTrigger = async (ctx, triggerCtx, spec, callback) => {
 
 // packages/core/functions/src/trigger/type/timer-trigger.ts
 import { CronJob } from "cron";
-import { DeferredTask } from "@dxos/async";
-import { log as log6 } from "@dxos/log";
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/timer-trigger.ts";
+import { DeferredTask as DeferredTask2 } from "@dxos/async";
+import { log as log5 } from "@dxos/log";
+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 DeferredTask(ctx, async () => {
+  const task = new DeferredTask2(ctx, async () => {
     await callback({});
   });
   let last = 0;
@@ -786,12 +750,12 @@ var createTimerTrigger = async (ctx, triggerContext, spec, callback) => {
       const delta = last ? now - last : 0;
       last = now;
       run++;
-      log6.info("tick", {
+      log5.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)
@@ -806,8 +770,8 @@ var createTimerTrigger = async (ctx, triggerContext, spec, callback) => {
 // packages/core/functions/src/trigger/type/webhook-trigger.ts
 import { getPort as getPort2 } from "get-port-please";
 import http from "@dxos/node-std/http";
-import { log as log7 } from "@dxos/log";
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/webhook-trigger.ts";
+import { log as log6 } from "@dxos/log";
+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 = http.createServer(async (req, res) => {
     if (req.method !== spec.method) {
@@ -821,10 +785,10 @@ var createWebhookTrigger = async (ctx, _, spec, callback) => {
     random: true
   });
   server.listen(port, () => {
-    log7.info("started webhook", {
+    log6.info("started webhook", {
       port
     }, {
-      F: __dxlog_file7,
+      F: __dxlog_file6,
       L: 40,
       S: void 0,
       C: (f, a) => f(...a)
@@ -839,8 +803,8 @@ var createWebhookTrigger = async (ctx, _, spec, callback) => {
 // packages/core/functions/src/trigger/type/websocket-trigger.ts
 import WebSocket from "ws";
 import { sleep, Trigger as Trigger2 } from "@dxos/async";
-import { log as log8 } from "@dxos/log";
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/websocket-trigger.ts";
+import { log as log7 } from "@dxos/log";
+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
@@ -852,10 +816,10 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
     ws = new WebSocket(url);
     Object.assign(ws, {
       onopen: () => {
-        log8.info("opened", {
+        log7.info("opened", {
           url
         }, {
-          F: __dxlog_file8,
+          F: __dxlog_file7,
           L: 39,
           S: void 0,
           C: (f, a) => f(...a)
@@ -866,21 +830,21 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
         open.wake(true);
       },
       onclose: (event) => {
-        log8.info("closed", {
+        log7.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 () => {
-            log8.info(`reconnecting in ${options.retryDelay}s...`, {
+            log7.info(`reconnecting in ${options.retryDelay}s...`, {
               url
             }, {
-              F: __dxlog_file8,
+              F: __dxlog_file7,
               L: 53,
               S: void 0,
               C: (f, a) => f(...a)
@@ -891,10 +855,10 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
         open.wake(false);
       },
       onerror: (event) => {
-        log8.catch(event.error, {
+        log7.catch(event.error, {
           url
         }, {
-          F: __dxlog_file8,
+          F: __dxlog_file7,
           L: 62,
           S: void 0,
           C: (f, a) => f(...a)
@@ -902,8 +866,8 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
       },
       onmessage: async (event) => {
         try {
-          log8.info("message", void 0, {
-            F: __dxlog_file8,
+          log7.info("message", void 0, {
+            F: __dxlog_file7,
             L: 67,
             S: void 0,
             C: (f, a) => f(...a)
@@ -913,10 +877,10 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
             data
           });
         } catch (err) {
-          log8.catch(err, {
+          log7.catch(err, {
             url
           }, {
-            F: __dxlog_file8,
+            F: __dxlog_file7,
             L: 71,
             S: void 0,
             C: (f, a) => f(...a)
@@ -930,10 +894,10 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
     } else {
       const wait = Math.pow(attempt, 2) * options.retryDelay;
       if (attempt < options.maxAttempts) {
-        log8.warn(`failed to connect; trying again in ${wait}s`, {
+        log7.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)
@@ -948,7 +912,7 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
 };
 
 // packages/core/functions/src/trigger/trigger-registry.ts
-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,
@@ -971,12 +935,12 @@ var TriggerRegistry = class extends Resource2 {
     return this._getTriggers(space, (t) => t.activationCtx == null);
   }
   async activate(triggerCtx, trigger, callback) {
-    log9("activate", {
+    log8("activate", {
       space: triggerCtx.space.key,
       trigger
     }, {
-      F: __dxlog_file9,
-      L: 75,
+      F: __dxlog_file8,
+      L: 73,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -986,8 +950,8 @@ var TriggerRegistry = class extends Resource2 {
     this._ctx.onDispose(() => activationCtx.dispose());
     const registeredTrigger = this._triggersBySpaceKey.get(triggerCtx.space.key)?.find((reg) => reg.trigger.id === trigger.id);
     invariant2(registeredTrigger, `Trigger is not registered: ${trigger.function}`, {
-      F: __dxlog_file9,
-      L: 81,
+      F: __dxlog_file8,
+      L: 79,
       S: this,
       A: [
         "registeredTrigger",
@@ -1007,35 +971,24 @@ var TriggerRegistry = class extends Resource2 {
   * Loads triggers from the manifest into the space.
   */
   async register(space, manifest) {
-    log9("register", {
+    log8("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(Filter3.schema(FunctionTrigger)).run();
-    const { added, removed } = diff(existing, manifest.triggers, (a, b) => {
-      const keys = b[ECHO_ATTR_META]?.keys ?? [
-        foreignKey("manifest", [
-          b.function,
-          b.spec.type
-        ].join("-"))
-      ];
-      return intersection(getMeta(a)?.keys ?? [], keys, foreignKeyEquals).length > 0;
-    });
-    added.forEach((trigger) => {
-      const { meta, object } = splitMeta(trigger);
-      space.db.add(create2(FunctionTrigger, object, meta));
-    });
-    removed.forEach((trigger) => space.db.remove(trigger));
+    const reactiveObjects = manifest.triggers.map((template) => create2(FunctionTrigger, {
+      ...template
+    }));
+    reactiveObjects.forEach((obj) => space.db.add(obj));
   }
   async _open() {
     const spaceListSubscription = this._client.spaces.subscribe(async (spaces) => {
@@ -1070,12 +1023,12 @@ var TriggerRegistry = class extends Resource2 {
         trigger
       }));
       registered.push(...newRegisteredTriggers);
-      log9("registered new triggers", () => ({
+      log8("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)
       });