@dxos/functions 0.5.3-main.d7fe7b5 → 0.5.3-main.e38fceb

package/dist/lib/browser/index.mjs

@@ -1,163 +1,62 @@
 import "@dxos/node-std/globals";
-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');
-});
-
-// inject-globals:@inject-globals
 import {
-  global,
-  Buffer as Buffer2,
-  process
-} from "@dxos/node-std/inject-globals";
-
-// 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
-    });
-  };
-};
+  FUNCTION_SCHEMA,
+  FunctionDef,
+  FunctionManifestSchema,
+  FunctionTrigger,
+  __require
+} from "./chunk-4D4I3YMJ.mjs";
 
-// packages/core/functions/src/registry/function-registry.ts
+// packages/core/functions/src/function/function-registry.ts
 import { Event } from "@dxos/async";
 import { create, Filter } from "@dxos/client/echo";
 import { Resource } from "@dxos/context";
-import { PublicKey as PublicKey2 } from "@dxos/keys";
-import { ComplexMap } from "@dxos/util";
-
-// packages/core/functions/src/types.ts
-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.
-  filter: S.array(S.struct({
-    type: S.string,
-    props: S.optional(S.record(S.string, S.any))
-  })),
-  options: S.optional(S.struct({
-    // Watch changes to object (not just creation).
-    deep: S.optional(S.boolean),
-    // Debounce changes (delay in ms).
-    delay: S.optional(S.number)
-  }))
-});
-var TimerTriggerSchema = S.struct({
-  type: S.literal("timer"),
-  cron: S.string
-});
-var WebhookTriggerSchema = S.mutable(S.struct({
-  type: S.literal("webhook"),
-  method: S.string,
-  // Assigned port.
-  port: S.optional(S.number)
-}));
-var WebsocketTriggerSchema = S.struct({
-  type: S.literal("websocket"),
-  url: S.string,
-  init: S.optional(S.record(S.string, S.any))
-});
-var TriggerSpecSchema = S.union(TimerTriggerSchema, WebhookTriggerSchema, WebsocketTriggerSchema, SubscriptionTriggerSchema);
-var FunctionDef = class extends TypedObject({
-  typename: "dxos.org/type/FunctionDef",
-  version: "0.1.0"
-})({
-  uri: S.string,
-  description: S.optional(S.string),
-  route: S.string,
-  // TODO(burdon): NPM/GitHub/Docker/CF URL?
-  handler: S.string
-}) {
-};
-var FunctionTrigger = class extends TypedObject({
-  typename: "dxos.org/type/FunctionTrigger",
-  version: "0.1.0"
-})({
-  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(omitEchoId(FunctionDef)))),
-  triggers: S.optional(S.mutable(S.array(omitEchoId(FunctionTrigger))))
-});
-
-// packages/core/functions/src/registry/function-registry.ts
+import { PublicKey } from "@dxos/keys";
+import { log } from "@dxos/log";
+import { ComplexMap, diff } from "@dxos/util";
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/functions/src/function/function-registry.ts";
 var FunctionRegistry = class extends Resource {
   constructor(_client) {
     super();
     this._client = _client;
-    this._functionBySpaceKey = new ComplexMap(PublicKey2.hash);
-    this.onFunctionsRegistered = new Event();
+    this._functionBySpaceKey = new ComplexMap(PublicKey.hash);
+    this.registered = new Event();
   }
   getFunctions(space) {
     return this._functionBySpaceKey.get(space.key) ?? [];
   }
   /**
-  * The method loads function definitions from the manifest into the space.
+  * Loads function definitions from the manifest into the space.
   * We first load all the definitions from the space to deduplicate by functionId.
   */
-  // TODO(burdon): This should not be space specific (they are static for the agent).
-  async register(space, manifest) {
-    if (!manifest.functions?.length) {
+  async register(space, functions) {
+    log("register", {
+      space: space.key,
+      functions: functions?.length ?? 0
+    }, {
+      F: __dxlog_file,
+      L: 38,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (!functions?.length) {
       return;
     }
-    if (!space.db.graph.runtimeSchemaRegistry.isSchemaRegistered(FunctionDef)) {
+    if (!space.db.graph.runtimeSchemaRegistry.hasSchema(FunctionDef)) {
       space.db.graph.runtimeSchemaRegistry.registerSchema(FunctionDef);
     }
-    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));
+    const { objects: existing } = await space.db.query(Filter.schema(FunctionDef)).run();
+    const { added } = diff(existing, functions, (a, b) => a.uri === b.uri);
+    added.forEach((def) => space.db.add(create(FunctionDef, def)));
   }
   async _open() {
-    const spaceListSubscription = this._client.spaces.subscribe(async (spaces) => {
+    log.info("opening...", void 0, {
+      F: __dxlog_file,
+      L: 54,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const spacesSubscription = this._client.spaces.subscribe(async (spaces) => {
       for (const space of spaces) {
         if (this._functionBySpaceKey.has(space.key)) {
           continue;
@@ -168,27 +67,73 @@ var FunctionRegistry = class extends Resource {
         if (this._ctx.disposed) {
           break;
         }
-        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({
+        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({
               space,
-              newFunctions
+              added
             });
           }
-        });
-        this._ctx.onDispose(functionsSubscription);
+        }));
       }
     });
-    this._ctx.onDispose(() => spaceListSubscription.unsubscribe());
+    this._ctx.onDispose(() => spacesSubscription.unsubscribe());
   }
   async _close(_) {
+    log.info("closing...", void 0, {
+      F: __dxlog_file,
+      L: 87,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._functionBySpaceKey.clear();
   }
 };
-var getNewDefinitions = (candidateList, existing) => {
-  return candidateList.filter((candidate) => existing.find((def) => def.uri === candidate.uri) == null);
+
+// 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
+    });
+  };
 };
 
 // packages/core/functions/src/runtime/dev-server.ts
@@ -198,10 +143,9 @@ 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 log2 } from "@dxos/log";
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/dev-server.ts";
+import { log as log3 } from "@dxos/log";
+var __dxlog_file3 = "/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;
@@ -210,13 +154,13 @@ var DevServer = class {
     this._handlers = {};
     this._seq = 0;
     this.update = new Event2();
-    this._functionsRegistry.onFunctionsRegistered.on(async ({ newFunctions }) => {
-      newFunctions.forEach((def) => this._load(def));
+    this._functionsRegistry.registered.on(async ({ added }) => {
+      added.forEach((def) => this._load(def));
       await this._safeUpdateRegistration();
-      log2("new functions loaded", {
-        newFunctions
+      log3("new functions loaded", {
+        added
       }, {
-        F: __dxlog_file2,
+        F: __dxlog_file3,
         L: 53,
         S: this,
         C: (f, a) => f(...a)
@@ -230,7 +174,7 @@ var DevServer = class {
   }
   get endpoint() {
     invariant(this._port, void 0, {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 64,
       S: this,
       A: [
@@ -248,7 +192,7 @@ var DevServer = class {
   }
   async start() {
     invariant(!this._server, void 0, {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 77,
       S: this,
       A: [
@@ -256,8 +200,8 @@ var DevServer = class {
         ""
       ]
     });
-    log2.info("starting...", void 0, {
-      F: __dxlog_file2,
+    log3.info("starting...", void 0, {
+      F: __dxlog_file3,
       L: 78,
       S: this,
       C: (f, a) => f(...a)
@@ -268,10 +212,10 @@ var DevServer = class {
     app.post("/:path", async (req, res) => {
       const { path: path2 } = req.params;
       try {
-        log2.info("calling", {
+        log3.info("calling", {
           path: path2
         }, {
-          F: __dxlog_file2,
+          F: __dxlog_file3,
           L: 88,
           S: this,
           C: (f, a) => f(...a)
@@ -283,8 +227,8 @@ var DevServer = class {
         res.statusCode = await this.invoke("/" + path2, req.body);
         res.end();
       } catch (err) {
-        log2.catch(err, void 0, {
-          F: __dxlog_file2,
+        log3.catch(err, void 0, {
+          F: __dxlog_file3,
           L: 98,
           S: this,
           C: (f, a) => f(...a)
@@ -306,10 +250,10 @@ var DevServer = class {
       const { registrationId, endpoint } = await this._client.services.services.FunctionRegistryService.register({
         endpoint: this.endpoint
       });
-      log2.info("registered", {
+      log3.info("registered", {
         endpoint
       }, {
-        F: __dxlog_file2,
+        F: __dxlog_file3,
         L: 113,
         S: this,
         C: (f, a) => f(...a)
@@ -321,10 +265,10 @@ var DevServer = class {
       await this.stop();
       throw new Error("FunctionRegistryService not available (check plugin is configured).");
     }
-    log2.info("started", {
+    log3.info("started", {
       port: this._port
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 124,
       S: this,
       C: (f, a) => f(...a)
@@ -332,7 +276,7 @@ var DevServer = class {
   }
   async stop() {
     invariant(this._server, void 0, {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 128,
       S: this,
       A: [
@@ -340,16 +284,16 @@ var DevServer = class {
         ""
       ]
     });
-    log2.info("stopping...", void 0, {
-      F: __dxlog_file2,
+    log3.info("stopping...", void 0, {
+      F: __dxlog_file3,
       L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
     const trigger = new Trigger();
     this._server.close(async () => {
-      log2.info("server stopped", void 0, {
-        F: __dxlog_file2,
+      log3.info("server stopped", void 0, {
+        F: __dxlog_file3,
         L: 133,
         S: this,
         C: (f, a) => f(...a)
@@ -357,7 +301,7 @@ var DevServer = class {
       try {
         if (this._functionServiceRegistration) {
           invariant(this._client.services.services.FunctionRegistryService, void 0, {
-            F: __dxlog_file2,
+            F: __dxlog_file3,
             L: 136,
             S: this,
             A: [
@@ -368,10 +312,10 @@ var DevServer = class {
           await this._client.services.services.FunctionRegistryService.unregister({
             registrationId: this._functionServiceRegistration
           });
-          log2.info("unregistered", {
+          log3.info("unregistered", {
             registrationId: this._functionServiceRegistration
           }, {
-            F: __dxlog_file2,
+            F: __dxlog_file3,
             L: 141,
             S: this,
             C: (f, a) => f(...a)
@@ -387,8 +331,8 @@ var DevServer = class {
     await trigger.wait();
     this._port = void 0;
     this._server = void 0;
-    log2.info("stopped", void 0, {
-      F: __dxlog_file2,
+    log3.info("stopped", void 0, {
+      F: __dxlog_file3,
       L: 155,
       S: this,
       C: (f, a) => f(...a)
@@ -397,14 +341,14 @@ var DevServer = class {
   /**
   * Load function.
   */
-  async _load(def, force = false) {
+  async _load(def, force) {
     const { uri, route, handler } = def;
     const filePath = join(this._options.baseDir, handler);
-    log2.info("loading", {
+    log3.info("loading", {
       uri,
       force
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 164,
       S: this,
       C: (f, a) => f(...a)
@@ -425,7 +369,7 @@ var DevServer = class {
   }
   async _safeUpdateRegistration() {
     invariant(this._functionServiceRegistration, void 0, {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 186,
       S: this,
       A: [
@@ -441,9 +385,9 @@ var DevServer = class {
           route
         }))
       });
-    } catch (e) {
-      log2.catch(e, void 0, {
-        F: __dxlog_file2,
+    } catch (err) {
+      log3.catch(err, void 0, {
+        F: __dxlog_file3,
         L: 193,
         S: this,
         C: (f, a) => f(...a)
@@ -456,11 +400,11 @@ var DevServer = class {
   async invoke(path2, data) {
     const seq = ++this._seq;
     const now = Date.now();
-    log2.info("req", {
+    log3.info("req", {
       seq,
       path: path2
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 204,
       S: this,
       C: (f, a) => f(...a)
@@ -468,13 +412,13 @@ var DevServer = class {
     const statusCode = await this._invoke(path2, {
       data
     });
-    log2.info("res", {
+    log3.info("res", {
       seq,
       path: path2,
       statusCode,
       duration: Date.now() - now
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 207,
       S: this,
       C: (f, a) => f(...a)
@@ -485,7 +429,7 @@ var DevServer = class {
   async _invoke(path2, event) {
     const { handler } = this._handlers[path2] ?? {};
     invariant(handler, `invalid path: ${path2}`, {
-      F: __dxlog_file2,
+      F: __dxlog_file3,
       L: 214,
       S: this,
       A: [
@@ -518,17 +462,19 @@ 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 log3 } from "@dxos/log";
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/functions/src/runtime/scheduler.ts";
+import { log as log4 } from "@dxos/log";
+var __dxlog_file4 = "/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.functions.onFunctionsRegistered.on(async ({ space, newFunctions }) => {
-      await this._safeActivateTriggers(space, this.triggers.getInactiveTriggers(space), newFunctions);
+    this._functionUriToCallMutex = /* @__PURE__ */ new Map();
+    this.functions.registered.on(async ({ space, added }) => {
+      await this._safeActivateTriggers(space, this.triggers.getInactiveTriggers(space), added);
     });
     this.triggers.registered.on(async ({ space, triggers: triggers2 }) => {
       await this._safeActivateTriggers(space, triggers2, this.functions.getFunctions(space));
@@ -545,51 +491,70 @@ 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);
+    await this.functions.register(space, manifest.functions);
     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(log3.catch);
+    await Promise.all(mountTasks).catch(log4.catch);
   }
-  async activate(space, functions, fnTrigger) {
-    const definition = functions.find((def) => def.uri === fnTrigger.function);
+  async activate(space, functions, trigger) {
+    const definition = functions.find((def) => def.uri === trigger.function);
     if (!definition) {
-      log3.info("function is not found for trigger", {
-        fnTrigger
+      log4.info("function is not found for trigger", {
+        trigger
       }, {
-        F: __dxlog_file3,
-        L: 74,
+        F: __dxlog_file4,
+        L: 78,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
-    await this.triggers.activate({
-      space
-    }, fnTrigger, async (args) => {
-      return this._execFunction(definition, {
-        meta: fnTrigger.meta,
-        data: {
-          ...args,
-          spaceKey: space.key
-        }
+    await this.triggers.activate(space, trigger, async (args) => {
+      const mutex = this._functionUriToCallMutex.get(definition.uri) ?? new Mutex();
+      this._functionUriToCallMutex.set(definition.uri, mutex);
+      log4.info("function triggered, waiting for mutex", {
+        uri: definition.uri
+      }, {
+        F: __dxlog_file4,
+        L: 86,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return mutex.executeSynchronized(() => {
+        log4.info("mutex acquired", {
+          uri: definition.uri
+        }, {
+          F: __dxlog_file4,
+          L: 88,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return this._execFunction(definition, trigger, {
+          meta: trigger.meta ?? {},
+          data: {
+            ...args,
+            spaceKey: space.key
+          }
+        });
       });
     });
-    log3("activated trigger", {
+    log4("activated trigger", {
       space: space.key,
-      trigger: fnTrigger
+      trigger
     }, {
-      F: __dxlog_file3,
-      L: 84,
+      F: __dxlog_file4,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async _execFunction(def, { data, meta }) {
+  async _execFunction(def, trigger, { data, meta }) {
     let status = 0;
     try {
       const payload = Object.assign({}, meta && {
@@ -598,12 +563,13 @@ var Scheduler = class {
       const { endpoint, callback } = this._options;
       if (endpoint) {
         const url = path.join(endpoint, def.route);
-        log3.info("exec", {
+        log4.info("exec", {
           function: def.uri,
-          url
+          url,
+          triggerType: trigger.spec.type
         }, {
-          F: __dxlog_file3,
-          L: 100,
+          F: __dxlog_file4,
+          L: 113,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -616,11 +582,11 @@ var Scheduler = class {
         });
         status = response.status;
       } else if (callback) {
-        log3.info("exec", {
+        log4.info("exec", {
           function: def.uri
         }, {
-          F: __dxlog_file3,
-          L: 111,
+          F: __dxlog_file4,
+          L: 124,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -629,22 +595,22 @@ var Scheduler = class {
       if (status && status >= 400) {
         throw new Error(`Response: ${status}`);
       }
-      log3.info("done", {
+      log4.info("done", {
         function: def.uri,
         status
       }, {
-        F: __dxlog_file3,
-        L: 121,
+        F: __dxlog_file4,
+        L: 134,
         S: this,
         C: (f, a) => f(...a)
       });
     } catch (err) {
-      log3.error("error", {
+      log4.error("error", {
         function: def.uri,
         error: err.message
       }, {
-        F: __dxlog_file3,
-        L: 123,
+        F: __dxlog_file4,
+        L: 136,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -659,61 +625,69 @@ 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 } from "@dxos/client/echo";
+import { create as create2, Filter as Filter3, getMeta } from "@dxos/client/echo";
 import { Context as Context3, Resource as Resource2 } from "@dxos/context";
+import { compareForeignKeys, ECHO_ATTR_META, foreignKey } from "@dxos/echo-schema";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
-import { log as log8 } from "@dxos/log";
-import { ComplexMap as ComplexMap2 } from "@dxos/util";
+import { log as log9 } from "@dxos/log";
+import { ComplexMap as ComplexMap2, diff as diff2 } from "@dxos/util";
 
 // packages/core/functions/src/trigger/type/subscription-trigger.ts
 import { TextV0Type } from "@braneframe/types";
-import { debounce, DeferredTask } from "@dxos/async";
-import { createSubscription, Filter as Filter2, getAutomergeObjectCore } from "@dxos/echo-db";
-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) => {
+import { debounce, UpdateScheduler } from "@dxos/async";
+import { Filter as Filter2 } from "@dxos/client/echo";
+import { createSubscription, 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";
+var createSubscriptionTrigger = async (ctx, space, spec, callback) => {
   const objectIds = /* @__PURE__ */ new Set();
-  const task = new DeferredTask(ctx, async () => {
+  const task = new UpdateScheduler(ctx, async () => {
     if (objectIds.size > 0) {
+      const objects = Array.from(objectIds);
+      objectIds.clear();
       await callback({
-        objects: Array.from(objectIds)
+        objects
       });
-      objectIds.clear();
     }
+  }, {
+    maxFrequency: 4
   });
   const subscriptions = [];
   const subscription = createSubscription(({ added, updated }) => {
-    log4.info("updated", {
-      added: added.length,
-      updated: updated.length
-    }, {
-      F: __dxlog_file4,
-      L: 32,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
+    const sizeBefore = objectIds.size;
     for (const object of added) {
       objectIds.add(object.id);
     }
     for (const object of updated) {
       objectIds.add(object.id);
     }
-    task.schedule();
+    if (objectIds.size > sizeBefore) {
+      log5.info("updated", {
+        added: added.length,
+        updated: updated.length
+      }, {
+        F: __dxlog_file5,
+        L: 47,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      task.trigger();
+    }
   });
   subscriptions.push(() => subscription.unsubscribe());
   const { filter, options: { deep, delay } = {} } = spec;
   const update = ({ objects }) => {
+    log5.info("update", {
+      objects: objects.length
+    }, {
+      F: __dxlog_file5,
+      L: 57,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
     subscription.update(objects);
     if (deep) {
-      log4.info("update", {
-        objects: objects.length
-      }, {
-        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 TextV0Type) {
@@ -724,8 +698,18 @@ var createSubscriptionTrigger = async (ctx, triggerCtx, spec, callback) => {
       }
     }
   };
-  const query = triggerCtx.space.db.query(Filter2.or(filter.map(({ type, props }) => Filter2.typename(type, props))));
-  subscriptions.push(query.subscribe(delay ? debounce(update, delay) : update));
+  log5.info("subscription", {
+    filter
+  }, {
+    F: __dxlog_file5,
+    L: 76,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
+  if (filter) {
+    const query = space.db.query(Filter2.typename(filter[0].type, filter[0].props));
+    subscriptions.push(query.subscribe(delay ? debounce(update, delay) : update));
+  }
   ctx.onDispose(() => {
     subscriptions.forEach((unsubscribe) => unsubscribe());
   });
@@ -733,11 +717,11 @@ var createSubscriptionTrigger = async (ctx, triggerCtx, spec, callback) => {
 
 // packages/core/functions/src/trigger/type/timer-trigger.ts
 import { CronJob } from "cron";
-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 DeferredTask2(ctx, async () => {
+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";
+var createTimerTrigger = async (ctx, space, spec, callback) => {
+  const task = new DeferredTask(ctx, async () => {
     await callback({});
   });
   let last = 0;
@@ -750,13 +734,13 @@ var createTimerTrigger = async (ctx, triggerContext, spec, callback) => {
       const delta = last ? now - last : 0;
       last = now;
       run++;
-      log5.info("tick", {
-        space: triggerContext.space.key.truncate(),
+      log6.info("tick", {
+        space: space.key.truncate(),
         count: run,
         delta
       }, {
-        F: __dxlog_file5,
-        L: 37,
+        F: __dxlog_file6,
+        L: 38,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -770,9 +754,9 @@ 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 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) => {
+import { log as log7 } from "@dxos/log";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/webhook-trigger.ts";
+var createWebhookTrigger = async (ctx, space, spec, callback) => {
   const server = http.createServer(async (req, res) => {
     if (req.method !== spec.method) {
       res.statusCode = 405;
@@ -785,11 +769,11 @@ var createWebhookTrigger = async (ctx, _, spec, callback) => {
     random: true
   });
   server.listen(port, () => {
-    log6.info("started webhook", {
+    log7.info("started webhook", {
       port
     }, {
-      F: __dxlog_file6,
-      L: 40,
+      F: __dxlog_file7,
+      L: 41,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -803,9 +787,9 @@ 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 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 = {
+import { log as log8 } from "@dxos/log";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/websocket-trigger.ts";
+var createWebsocketTrigger = async (ctx, space, spec, callback, options = {
   retryDelay: 2,
   maxAttempts: 5
 }) => {
@@ -816,11 +800,11 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
     ws = new WebSocket(url);
     Object.assign(ws, {
       onopen: () => {
-        log7.info("opened", {
+        log8.info("opened", {
           url
         }, {
-          F: __dxlog_file7,
-          L: 39,
+          F: __dxlog_file8,
+          L: 40,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -830,45 +814,45 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
         open.wake(true);
       },
       onclose: (event) => {
-        log7.info("closed", {
+        log8.info("closed", {
           url,
           code: event.code
         }, {
-          F: __dxlog_file7,
-          L: 48,
+          F: __dxlog_file8,
+          L: 49,
           S: void 0,
           C: (f, a) => f(...a)
         });
         if (event.code === 1006) {
           setTimeout(async () => {
-            log7.info(`reconnecting in ${options.retryDelay}s...`, {
+            log8.info(`reconnecting in ${options.retryDelay}s...`, {
               url
             }, {
-              F: __dxlog_file7,
-              L: 53,
+              F: __dxlog_file8,
+              L: 54,
               S: void 0,
               C: (f, a) => f(...a)
             });
-            await createWebsocketTrigger(ctx, triggerCtx, spec, callback, options);
+            await createWebsocketTrigger(ctx, space, spec, callback, options);
           }, options.retryDelay * 1e3);
         }
         open.wake(false);
       },
       onerror: (event) => {
-        log7.catch(event.error, {
+        log8.catch(event.error, {
           url
         }, {
-          F: __dxlog_file7,
-          L: 62,
+          F: __dxlog_file8,
+          L: 63,
           S: void 0,
           C: (f, a) => f(...a)
         });
       },
       onmessage: async (event) => {
         try {
-          log7.info("message", void 0, {
-            F: __dxlog_file7,
-            L: 67,
+          log8.info("message", void 0, {
+            F: __dxlog_file8,
+            L: 68,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -877,11 +861,11 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
             data
           });
         } catch (err) {
-          log7.catch(err, {
+          log8.catch(err, {
             url
           }, {
-            F: __dxlog_file7,
-            L: 71,
+            F: __dxlog_file8,
+            L: 72,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -894,11 +878,11 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
     } else {
       const wait = Math.pow(attempt, 2) * options.retryDelay;
       if (attempt < options.maxAttempts) {
-        log7.warn(`failed to connect; trying again in ${wait}s`, {
+        log8.warn(`failed to connect; trying again in ${wait}s`, {
           attempt
         }, {
-          F: __dxlog_file7,
-          L: 82,
+          F: __dxlog_file8,
+          L: 83,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -912,7 +896,7 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
 };
 
 // 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 __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/trigger-registry.ts";
 var triggerHandlers = {
   subscription: createSubscriptionTrigger,
   timer: createTimerTrigger,
@@ -934,24 +918,24 @@ var TriggerRegistry = class extends Resource2 {
   getInactiveTriggers(space) {
     return this._getTriggers(space, (t) => t.activationCtx == null);
   }
-  async activate(triggerCtx, trigger, callback) {
-    log8("activate", {
-      space: triggerCtx.space.key,
+  async activate(space, trigger, callback) {
+    log9("activate", {
+      space: space.key,
       trigger
     }, {
-      F: __dxlog_file8,
-      L: 73,
+      F: __dxlog_file9,
+      L: 72,
       S: this,
       C: (f, a) => f(...a)
     });
     const activationCtx = new Context3({
-      name: `trigger_${trigger.function}`
+      name: `FunctionTrigger-${trigger.function}`
     });
     this._ctx.onDispose(() => activationCtx.dispose());
-    const registeredTrigger = this._triggersBySpaceKey.get(triggerCtx.space.key)?.find((reg) => reg.trigger.id === trigger.id);
+    const registeredTrigger = this._triggersBySpaceKey.get(space.key)?.find((reg) => reg.trigger.id === trigger.id);
     invariant2(registeredTrigger, `Trigger is not registered: ${trigger.function}`, {
-      F: __dxlog_file8,
-      L: 79,
+      F: __dxlog_file9,
+      L: 77,
       S: this,
       A: [
         "registeredTrigger",
@@ -961,7 +945,7 @@ var TriggerRegistry = class extends Resource2 {
     registeredTrigger.activationCtx = activationCtx;
     try {
       const options = this._options?.[trigger.spec.type];
-      await triggerHandlers[trigger.spec.type](activationCtx, triggerCtx, trigger.spec, callback, options);
+      await triggerHandlers[trigger.spec.type](activationCtx, space, trigger.spec, callback, options);
     } catch (err) {
       delete registeredTrigger.activationCtx;
       throw err;
@@ -971,26 +955,59 @@ var TriggerRegistry = class extends Resource2 {
   * Loads triggers from the manifest into the space.
   */
   async register(space, manifest) {
-    log8("register", {
+    log9("register", {
       space: space.key
     }, {
-      F: __dxlog_file8,
-      L: 95,
+      F: __dxlog_file9,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
     if (!manifest.triggers?.length) {
       return;
     }
-    if (!space.db.graph.runtimeSchemaRegistry.isSchemaRegistered(FunctionTrigger)) {
+    if (!space.db.graph.runtimeSchemaRegistry.hasSchema(FunctionTrigger)) {
       space.db.graph.runtimeSchemaRegistry.registerSchema(FunctionTrigger);
     }
-    const reactiveObjects = manifest.triggers.map((template) => create2(FunctionTrigger, {
-      ...template
-    }));
-    reactiveObjects.forEach((obj) => space.db.add(obj));
+    const manifestTriggers = manifest.triggers.map((trigger) => {
+      let keys = trigger[ECHO_ATTR_META]?.keys;
+      delete trigger[ECHO_ATTR_META];
+      if (!keys?.length) {
+        keys = [
+          foreignKey("manifest", [
+            trigger.function,
+            trigger.spec.type
+          ].join(":"))
+        ];
+      }
+      return create2(FunctionTrigger, trigger, {
+        keys
+      });
+    });
+    const { objects: existing } = await space.db.query(Filter3.schema(FunctionTrigger)).run();
+    const { added } = diff2(existing, manifestTriggers, compareForeignKeys);
+    added.forEach((trigger) => {
+      space.db.add(trigger);
+      log9.info("added", {
+        meta: getMeta(trigger)
+      }, {
+        F: __dxlog_file9,
+        L: 120,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    });
+    if (added.length > 0) {
+      await space.db.flush();
+    }
   }
   async _open() {
+    log9.info("open...", void 0, {
+      F: __dxlog_file9,
+      L: 129,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     const spaceListSubscription = this._client.spaces.subscribe(async (spaces) => {
       for (const space of spaces) {
         if (this._triggersBySpaceKey.has(space.key)) {
@@ -1002,46 +1019,73 @@ var TriggerRegistry = class extends Resource2 {
         if (this._ctx.disposed) {
           break;
         }
-        const functionsSubscription = space.db.query(Filter3.schema(FunctionTrigger)).subscribe(async (triggers) => {
-          await this._handleRemovedTriggers(space, triggers.objects, registered);
-          this._handleNewTriggers(space, triggers.objects, registered);
-        });
-        this._ctx.onDispose(functionsSubscription);
+        this._ctx.onDispose(space.db.query(Filter3.schema(FunctionTrigger)).subscribe(async ({ objects: current }) => {
+          log9.info("update", {
+            space: space.key,
+            registered: registered.length,
+            current: current.length
+          }, {
+            F: __dxlog_file9,
+            L: 146,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await this._handleRemovedTriggers(space, current, registered);
+          this._handleNewTriggers(space, current, registered);
+        }));
       }
     });
     this._ctx.onDispose(() => spaceListSubscription.unsubscribe());
+    log9.info("opened", void 0, {
+      F: __dxlog_file9,
+      L: 155,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
   async _close(_) {
+    log9.info("close...", void 0, {
+      F: __dxlog_file9,
+      L: 159,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._triggersBySpaceKey.clear();
+    log9.info("closed", void 0, {
+      F: __dxlog_file9,
+      L: 161,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
-  _handleNewTriggers(space, allTriggers, registered) {
-    const newTriggers = allTriggers.filter((candidate) => {
-      return registered.find((reg) => reg.trigger.id === candidate.id) == null;
+  _handleNewTriggers(space, current, registered) {
+    const added = current.filter((candidate) => {
+      return candidate.enabled && registered.find((reg) => reg.trigger.id === candidate.id) == null;
     });
-    if (newTriggers.length > 0) {
-      const newRegisteredTriggers = newTriggers.map((trigger) => ({
+    if (added.length > 0) {
+      const newRegisteredTriggers = added.map((trigger) => ({
         trigger
       }));
       registered.push(...newRegisteredTriggers);
-      log8("registered new triggers", () => ({
+      log9.info("added", () => ({
         spaceKey: space.key,
-        functions: newTriggers.map((t) => t.function)
+        triggers: added.map((trigger) => trigger.function)
       }), {
-        F: __dxlog_file8,
-        L: 146,
+        F: __dxlog_file9,
+        L: 172,
         S: this,
         C: (f, a) => f(...a)
       });
       this.registered.emit({
         space,
-        triggers: newTriggers
+        triggers: added
       });
     }
   }
-  async _handleRemovedTriggers(space, allTriggers, registered) {
+  async _handleRemovedTriggers(space, current, registered) {
     const removed = [];
     for (let i = registered.length - 1; i >= 0; i--) {
-      const wasRemoved = allTriggers.find((trigger) => trigger.id === registered[i].trigger.id) == null;
+      const wasRemoved = current.filter((trigger) => trigger.enabled).find((trigger) => trigger.id === registered[i].trigger.id) == null;
       if (wasRemoved) {
         const unregistered = registered.splice(i, 1)[0];
         await unregistered.activationCtx?.dispose();
@@ -1049,6 +1093,15 @@ var TriggerRegistry = class extends Resource2 {
       }
     }
     if (removed.length > 0) {
+      log9.info("removed", () => ({
+        spaceKey: space.key,
+        triggers: removed.map((trigger) => trigger.function)
+      }), {
+        F: __dxlog_file9,
+        L: 198,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       this.removed.emit({
         space,
         triggers: removed
@@ -1062,6 +1115,7 @@ var TriggerRegistry = class extends Resource2 {
 };
 export {
   DevServer,
+  FUNCTION_SCHEMA,
   FunctionDef,
   FunctionManifestSchema,
   FunctionRegistry,