@dxos/functions 0.5.3-next.57eca40 → 0.5.3-next.63cdcad

package/dist/lib/node/index.cjs

@@ -29,16 +29,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var node_exports = {};
 __export(node_exports, {
   DevServer: () => DevServer,
-  FunctionDef: () => import_chunk_3VSJ57ZZ.FunctionDef,
-  FunctionManifestSchema: () => import_chunk_3VSJ57ZZ.FunctionManifestSchema,
+  FUNCTION_SCHEMA: () => import_chunk_3UYUR5N5.FUNCTION_SCHEMA,
+  FunctionDef: () => import_chunk_3UYUR5N5.FunctionDef,
+  FunctionManifestSchema: () => import_chunk_3UYUR5N5.FunctionManifestSchema,
   FunctionRegistry: () => FunctionRegistry,
-  FunctionTrigger: () => import_chunk_3VSJ57ZZ.FunctionTrigger,
+  FunctionTrigger: () => import_chunk_3UYUR5N5.FunctionTrigger,
   Scheduler: () => Scheduler,
   TriggerRegistry: () => TriggerRegistry,
   subscriptionHandler: () => subscriptionHandler
 });
 module.exports = __toCommonJS(node_exports);
-var import_chunk_3VSJ57ZZ = require("./chunk-3VSJ57ZZ.cjs");
+var import_chunk_3UYUR5N5 = require("./chunk-3UYUR5N5.cjs");
 var import_async = require("@dxos/async");
 var import_echo = require("@dxos/client/echo");
 var import_context = require("@dxos/context");
@@ -69,6 +70,7 @@ var import_log5 = require("@dxos/log");
 var import_util3 = require("@dxos/util");
 var import_types = require("@braneframe/types");
 var import_async5 = require("@dxos/async");
+var import_echo3 = require("@dxos/client/echo");
 var import_echo_db = require("@dxos/echo-db");
 var import_log6 = require("@dxos/log");
 var import_cron = require("cron");
@@ -80,27 +82,6 @@ var import_log8 = require("@dxos/log");
 var import_ws = __toESM(require("ws"));
 var import_async7 = require("@dxos/async");
 var import_log9 = require("@dxos/log");
-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) {
@@ -122,22 +103,27 @@ var FunctionRegistry = class extends import_context.Resource {
       functions: functions?.length ?? 0
     }, {
       F: __dxlog_file,
-      L: 39,
+      L: 38,
       S: this,
       C: (f, a) => f(...a)
     });
     if (!functions?.length) {
       return;
     }
-    if (!space.db.graph.runtimeSchemaRegistry.hasSchema(import_chunk_3VSJ57ZZ.FunctionDef)) {
-      space.db.graph.runtimeSchemaRegistry.registerSchema(import_chunk_3VSJ57ZZ.FunctionDef);
+    if (!space.db.graph.runtimeSchemaRegistry.hasSchema(import_chunk_3UYUR5N5.FunctionDef)) {
+      space.db.graph.runtimeSchemaRegistry.registerSchema(import_chunk_3UYUR5N5.FunctionDef);
     }
-    const { objects: existing } = await space.db.query(import_echo.Filter.schema(import_chunk_3VSJ57ZZ.FunctionDef)).run();
-    const { added, removed } = diff(existing, functions, (a, b) => a.uri === b.uri);
-    added.forEach((def) => space.db.add((0, import_echo.create)(import_chunk_3VSJ57ZZ.FunctionDef, def)));
-    removed.forEach((def) => space.db.remove(def));
+    const { objects: existing } = await space.db.query(import_echo.Filter.schema(import_chunk_3UYUR5N5.FunctionDef)).run();
+    const { added } = (0, import_util.diff)(existing, functions, (a, b) => a.uri === b.uri);
+    added.forEach((def) => space.db.add((0, import_echo.create)(import_chunk_3UYUR5N5.FunctionDef, def)));
   }
   async _open() {
+    import_log.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)) {
@@ -149,8 +135,8 @@ var FunctionRegistry = class extends import_context.Resource {
         if (this._ctx.disposed) {
           break;
         }
-        this._ctx.onDispose(space.db.query(import_echo.Filter.schema(import_chunk_3VSJ57ZZ.FunctionDef)).subscribe(({ objects }) => {
-          const { added } = diff(registered, objects, (a, b) => a.uri === b.uri);
+        this._ctx.onDispose(space.db.query(import_echo.Filter.schema(import_chunk_3UYUR5N5.FunctionDef)).subscribe(({ objects }) => {
+          const { added } = (0, import_util.diff)(registered, objects, (a, b) => a.uri === b.uri);
           if (added.length > 0) {
             registered.push(...added);
             this.registered.emit({
@@ -164,6 +150,12 @@ var FunctionRegistry = class extends import_context.Resource {
     this._ctx.onDispose(() => spacesSubscription.unsubscribe());
   }
   async _close(_) {
+    import_log.log.info("closing...", void 0, {
+      F: __dxlog_file,
+      L: 87,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._functionBySpaceKey.clear();
   }
 };
@@ -223,7 +215,7 @@ var DevServer = class {
         added
       }, {
         F: __dxlog_file3,
-        L: 52,
+        L: 53,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -237,7 +229,7 @@ var DevServer = class {
   get endpoint() {
     (0, import_invariant.invariant)(this._port, void 0, {
       F: __dxlog_file3,
-      L: 63,
+      L: 64,
       S: this,
       A: [
         "this._port",
@@ -255,7 +247,7 @@ var DevServer = class {
   async start() {
     (0, import_invariant.invariant)(!this._server, void 0, {
       F: __dxlog_file3,
-      L: 76,
+      L: 77,
       S: this,
       A: [
         "!this._server",
@@ -264,7 +256,7 @@ var DevServer = class {
     });
     import_log3.log.info("starting...", void 0, {
       F: __dxlog_file3,
-      L: 77,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -278,7 +270,7 @@ var DevServer = class {
           path: path2
         }, {
           F: __dxlog_file3,
-          L: 87,
+          L: 88,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -291,7 +283,7 @@ var DevServer = class {
       } catch (err) {
         import_log3.log.catch(err, void 0, {
           F: __dxlog_file3,
-          L: 97,
+          L: 98,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -316,7 +308,7 @@ var DevServer = class {
         endpoint
       }, {
         F: __dxlog_file3,
-        L: 112,
+        L: 113,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -331,7 +323,7 @@ var DevServer = class {
       port: this._port
     }, {
       F: __dxlog_file3,
-      L: 123,
+      L: 124,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -339,7 +331,7 @@ var DevServer = class {
   async stop() {
     (0, import_invariant.invariant)(this._server, void 0, {
       F: __dxlog_file3,
-      L: 127,
+      L: 128,
       S: this,
       A: [
         "this._server",
@@ -348,7 +340,7 @@ var DevServer = class {
     });
     import_log3.log.info("stopping...", void 0, {
       F: __dxlog_file3,
-      L: 128,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -356,7 +348,7 @@ var DevServer = class {
     this._server.close(async () => {
       import_log3.log.info("server stopped", void 0, {
         F: __dxlog_file3,
-        L: 132,
+        L: 133,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -364,7 +356,7 @@ var DevServer = class {
         if (this._functionServiceRegistration) {
           (0, import_invariant.invariant)(this._client.services.services.FunctionRegistryService, void 0, {
             F: __dxlog_file3,
-            L: 135,
+            L: 136,
             S: this,
             A: [
               "this._client.services.services.FunctionRegistryService",
@@ -378,7 +370,7 @@ var DevServer = class {
             registrationId: this._functionServiceRegistration
           }, {
             F: __dxlog_file3,
-            L: 140,
+            L: 141,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -395,7 +387,7 @@ var DevServer = class {
     this._server = void 0;
     import_log3.log.info("stopped", void 0, {
       F: __dxlog_file3,
-      L: 154,
+      L: 155,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -411,16 +403,16 @@ var DevServer = class {
       force
     }, {
       F: __dxlog_file3,
-      L: 163,
+      L: 164,
       S: this,
       C: (f, a) => f(...a)
     });
     if (force) {
-      Object.keys(import_chunk_3VSJ57ZZ.__require.cache).filter((key) => key.startsWith(filePath)).forEach((key) => {
-        delete import_chunk_3VSJ57ZZ.__require.cache[key];
+      Object.keys(import_chunk_3UYUR5N5.__require.cache).filter((key) => key.startsWith(filePath)).forEach((key) => {
+        delete import_chunk_3UYUR5N5.__require.cache[key];
       });
     }
-    const module2 = (0, import_chunk_3VSJ57ZZ.__require)(filePath);
+    const module2 = (0, import_chunk_3UYUR5N5.__require)(filePath);
     if (typeof module2.default !== "function") {
       throw new Error(`Handler must export default function: ${uri}`);
     }
@@ -432,7 +424,7 @@ var DevServer = class {
   async _safeUpdateRegistration() {
     (0, import_invariant.invariant)(this._functionServiceRegistration, void 0, {
       F: __dxlog_file3,
-      L: 185,
+      L: 186,
       S: this,
       A: [
         "this._functionServiceRegistration",
@@ -447,10 +439,10 @@ var DevServer = class {
           route
         }))
       });
-    } catch (e) {
-      import_log3.log.catch(e, void 0, {
+    } catch (err) {
+      import_log3.log.catch(err, void 0, {
         F: __dxlog_file3,
-        L: 192,
+        L: 193,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -467,7 +459,7 @@ var DevServer = class {
       path: path2
     }, {
       F: __dxlog_file3,
-      L: 203,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -481,7 +473,7 @@ var DevServer = class {
       duration: Date.now() - now
     }, {
       F: __dxlog_file3,
-      L: 206,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -492,7 +484,7 @@ var DevServer = class {
     const { handler } = this._handlers[path2] ?? {};
     (0, import_invariant.invariant)(handler, `invalid path: ${path2}`, {
       F: __dxlog_file3,
-      L: 213,
+      L: 214,
       S: this,
       A: [
         "handler",
@@ -528,7 +520,7 @@ var Scheduler = class {
     this.triggers = triggers;
     this._options = _options;
     this._ctx = createContext2();
-    this._callMutex = new import_async3.Mutex();
+    this._functionUriToCallMutex = /* @__PURE__ */ new Map();
     this.functions.registered.on(async ({ space, added }) => {
       await this._safeActivateTriggers(space, this.triggers.getInactiveTriggers(space), added);
     });
@@ -558,11 +550,11 @@ var Scheduler = class {
     });
     await Promise.all(mountTasks).catch(import_log4.log.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) {
       import_log4.log.info("function is not found for trigger", {
-        fnTrigger
+        trigger
       }, {
         F: __dxlog_file4,
         L: 78,
@@ -571,12 +563,28 @@ var Scheduler = class {
       });
       return;
     }
-    await this.triggers.activate({
-      space
-    }, fnTrigger, async (args) => {
-      return this._callMutex.executeSynchronized(() => {
-        return this._execFunction(definition, fnTrigger, {
-          meta: fnTrigger.meta,
+    await this.triggers.activate(space, trigger, async (args) => {
+      const mutex = this._functionUriToCallMutex.get(definition.uri) ?? new import_async3.Mutex();
+      this._functionUriToCallMutex.set(definition.uri, mutex);
+      import_log4.log.info("function triggered, waiting for mutex", {
+        uri: definition.uri
+      }, {
+        F: __dxlog_file4,
+        L: 86,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return mutex.executeSynchronized(() => {
+        import_log4.log.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
@@ -586,10 +594,10 @@ var Scheduler = class {
     });
     (0, import_log4.log)("activated trigger", {
       space: space.key,
-      trigger: fnTrigger
+      trigger
     }, {
       F: __dxlog_file4,
-      L: 91,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -609,7 +617,7 @@ var Scheduler = class {
           triggerType: trigger.spec.type
         }, {
           F: __dxlog_file4,
-          L: 108,
+          L: 113,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -626,7 +634,7 @@ var Scheduler = class {
           function: def.uri
         }, {
           F: __dxlog_file4,
-          L: 119,
+          L: 124,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -640,7 +648,7 @@ var Scheduler = class {
         status
       }, {
         F: __dxlog_file4,
-        L: 129,
+        L: 134,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -650,7 +658,7 @@ var Scheduler = class {
         error: err.message
       }, {
         F: __dxlog_file4,
-        L: 131,
+        L: 136,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -663,7 +671,7 @@ 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 createSubscriptionTrigger = async (ctx, triggerCtx, spec, callback) => {
+var createSubscriptionTrigger = async (ctx, space, spec, callback) => {
   const objectIds = /* @__PURE__ */ new Set();
   const task = new import_async5.UpdateScheduler(ctx, async () => {
     if (objectIds.size > 0) {
@@ -691,7 +699,7 @@ var createSubscriptionTrigger = async (ctx, triggerCtx, spec, callback) => {
         updated: updated.length
       }, {
         F: __dxlog_file5,
-        L: 45,
+        L: 47,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -701,16 +709,16 @@ var createSubscriptionTrigger = async (ctx, triggerCtx, spec, callback) => {
   subscriptions.push(() => subscription.unsubscribe());
   const { filter, options: { deep, delay } = {} } = spec;
   const update = ({ objects }) => {
+    import_log6.log.info("update", {
+      objects: objects.length
+    }, {
+      F: __dxlog_file5,
+      L: 57,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
     subscription.update(objects);
     if (deep) {
-      import_log6.log.info("update", {
-        objects: objects.length
-      }, {
-        F: __dxlog_file5,
-        L: 59,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
       for (const object of objects) {
         const content = object.content;
         if (content instanceof import_types.TextV0Type) {
@@ -721,14 +729,24 @@ 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));
+  import_log6.log.info("subscription", {
+    filter
+  }, {
+    F: __dxlog_file5,
+    L: 76,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
+  if (filter) {
+    const query = space.db.query(import_echo3.Filter.typename(filter[0].type, filter[0].props));
+    subscriptions.push(query.subscribe(delay ? (0, import_async5.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 createTimerTrigger = async (ctx, triggerContext, spec, callback) => {
+var createTimerTrigger = async (ctx, space, spec, callback) => {
   const task = new import_async6.DeferredTask(ctx, async () => {
     await callback({});
   });
@@ -743,12 +761,12 @@ var createTimerTrigger = async (ctx, triggerContext, spec, callback) => {
       last = now;
       run++;
       import_log7.log.info("tick", {
-        space: triggerContext.space.key.truncate(),
+        space: space.key.truncate(),
         count: run,
         delta
       }, {
         F: __dxlog_file6,
-        L: 37,
+        L: 38,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -759,7 +777,7 @@ var createTimerTrigger = async (ctx, triggerContext, spec, callback) => {
   ctx.onDispose(() => job.stop());
 };
 var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/webhook-trigger.ts";
-var createWebhookTrigger = async (ctx, _, spec, callback) => {
+var createWebhookTrigger = async (ctx, space, spec, callback) => {
   const server = import_node_http.default.createServer(async (req, res) => {
     if (req.method !== spec.method) {
       res.statusCode = 405;
@@ -776,7 +794,7 @@ var createWebhookTrigger = async (ctx, _, spec, callback) => {
       port
     }, {
       F: __dxlog_file7,
-      L: 40,
+      L: 41,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -787,7 +805,7 @@ var createWebhookTrigger = async (ctx, _, spec, callback) => {
   });
 };
 var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/core/functions/src/trigger/type/websocket-trigger.ts";
-var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
+var createWebsocketTrigger = async (ctx, space, spec, callback, options = {
   retryDelay: 2,
   maxAttempts: 5
 }) => {
@@ -802,7 +820,7 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
           url
         }, {
           F: __dxlog_file8,
-          L: 39,
+          L: 40,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -817,7 +835,7 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
           code: event.code
         }, {
           F: __dxlog_file8,
-          L: 48,
+          L: 49,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -827,11 +845,11 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
               url
             }, {
               F: __dxlog_file8,
-              L: 53,
+              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);
@@ -841,7 +859,7 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
           url
         }, {
           F: __dxlog_file8,
-          L: 62,
+          L: 63,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -850,7 +868,7 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
         try {
           import_log9.log.info("message", void 0, {
             F: __dxlog_file8,
-            L: 67,
+            L: 68,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -863,7 +881,7 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
             url
           }, {
             F: __dxlog_file8,
-            L: 71,
+            L: 72,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -880,7 +898,7 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
           attempt
         }, {
           F: __dxlog_file8,
-          L: 82,
+          L: 83,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -914,24 +932,24 @@ var TriggerRegistry = class extends import_context4.Resource {
   getInactiveTriggers(space) {
     return this._getTriggers(space, (t) => t.activationCtx == null);
   }
-  async activate(triggerCtx, trigger, callback) {
+  async activate(space, trigger, callback) {
     (0, import_log5.log)("activate", {
-      space: triggerCtx.space.key,
+      space: space.key,
       trigger
     }, {
       F: __dxlog_file9,
-      L: 75,
+      L: 72,
       S: this,
       C: (f, a) => f(...a)
     });
     const activationCtx = new import_context4.Context({
-      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);
     (0, import_invariant2.invariant)(registeredTrigger, `Trigger is not registered: ${trigger.function}`, {
       F: __dxlog_file9,
-      L: 81,
+      L: 77,
       S: this,
       A: [
         "registeredTrigger",
@@ -941,7 +959,7 @@ var TriggerRegistry = class extends import_context4.Resource {
     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;
@@ -955,33 +973,55 @@ var TriggerRegistry = class extends import_context4.Resource {
       space: space.key
     }, {
       F: __dxlog_file9,
-      L: 97,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
     if (!manifest.triggers?.length) {
       return;
     }
-    if (!space.db.graph.runtimeSchemaRegistry.hasSchema(import_chunk_3VSJ57ZZ.FunctionTrigger)) {
-      space.db.graph.runtimeSchemaRegistry.registerSchema(import_chunk_3VSJ57ZZ.FunctionTrigger);
+    if (!space.db.graph.runtimeSchemaRegistry.hasSchema(import_chunk_3UYUR5N5.FunctionTrigger)) {
+      space.db.graph.runtimeSchemaRegistry.registerSchema(import_chunk_3UYUR5N5.FunctionTrigger);
     }
-    const { objects: existing } = await space.db.query(import_echo2.Filter.schema(import_chunk_3VSJ57ZZ.FunctionTrigger)).run();
-    const { added, removed } = diff(existing, manifest.triggers, (a, b) => {
-      const keys = b[import_echo_schema.ECHO_ATTR_META]?.keys ?? [
-        (0, import_echo_schema.foreignKey)("manifest", [
-          b.function,
-          b.spec.type
-        ].join("-"))
-      ];
-      return intersection((0, import_echo2.getMeta)(a)?.keys ?? [], keys, import_echo_schema.foreignKeyEquals).length > 0;
+    const manifestTriggers = manifest.triggers.map((trigger) => {
+      let keys = trigger[import_echo_schema.ECHO_ATTR_META]?.keys;
+      delete trigger[import_echo_schema.ECHO_ATTR_META];
+      if (!keys?.length) {
+        keys = [
+          (0, import_echo_schema.foreignKey)("manifest", [
+            trigger.function,
+            trigger.spec.type
+          ].join(":"))
+        ];
+      }
+      return (0, import_echo2.create)(import_chunk_3UYUR5N5.FunctionTrigger, trigger, {
+        keys
+      });
     });
+    const { objects: existing } = await space.db.query(import_echo2.Filter.schema(import_chunk_3UYUR5N5.FunctionTrigger)).run();
+    const { added } = (0, import_util3.diff)(existing, manifestTriggers, import_echo_schema.compareForeignKeys);
     added.forEach((trigger) => {
-      const { meta, object } = (0, import_echo_schema.splitMeta)(trigger);
-      space.db.add((0, import_echo2.create)(import_chunk_3VSJ57ZZ.FunctionTrigger, object, meta));
+      space.db.add(trigger);
+      import_log5.log.info("added", {
+        meta: (0, import_echo2.getMeta)(trigger)
+      }, {
+        F: __dxlog_file9,
+        L: 120,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     });
-    removed.forEach((trigger) => space.db.remove(trigger));
+    if (added.length > 0) {
+      await space.db.flush();
+    }
   }
   async _open() {
+    import_log5.log.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)) {
@@ -993,46 +1033,73 @@ var TriggerRegistry = class extends import_context4.Resource {
         if (this._ctx.disposed) {
           break;
         }
-        const functionsSubscription = space.db.query(import_echo2.Filter.schema(import_chunk_3VSJ57ZZ.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(import_echo2.Filter.schema(import_chunk_3UYUR5N5.FunctionTrigger)).subscribe(async ({ objects: current }) => {
+          import_log5.log.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());
+    import_log5.log.info("opened", void 0, {
+      F: __dxlog_file9,
+      L: 155,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
   async _close(_) {
+    import_log5.log.info("close...", void 0, {
+      F: __dxlog_file9,
+      L: 159,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._triggersBySpaceKey.clear();
+    import_log5.log.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);
-      (0, import_log5.log)("registered new triggers", () => ({
+      import_log5.log.info("added", () => ({
         spaceKey: space.key,
-        functions: newTriggers.map((t) => t.function)
+        triggers: added.map((trigger) => trigger.function)
       }), {
         F: __dxlog_file9,
-        L: 159,
+        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();
@@ -1040,6 +1107,15 @@ var TriggerRegistry = class extends import_context4.Resource {
       }
     }
     if (removed.length > 0) {
+      import_log5.log.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
@@ -1054,6 +1130,7 @@ var TriggerRegistry = class extends import_context4.Resource {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DevServer,
+  FUNCTION_SCHEMA,
   FunctionDef,
   FunctionManifestSchema,
   FunctionRegistry,