@dxos/functions 0.5.3-main.427f0a3 → 0.5.3-main.4490e2f

package/dist/lib/browser/index.mjs

@@ -5,7 +5,7 @@ import {
   FunctionManifestSchema,
   FunctionTrigger,
   __require
-} from "./chunk-P3HPDHNI.mjs";
+} from "./chunk-4D4I3YMJ.mjs";
 
 // packages/core/functions/src/function/function-registry.ts
 import { Event } from "@dxos/async";
@@ -161,7 +161,7 @@ var DevServer = class {
         added
       }, {
         F: __dxlog_file3,
-        L: 52,
+        L: 53,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -175,7 +175,7 @@ var DevServer = class {
   get endpoint() {
     invariant(this._port, void 0, {
       F: __dxlog_file3,
-      L: 63,
+      L: 64,
       S: this,
       A: [
         "this._port",
@@ -193,7 +193,7 @@ var DevServer = class {
   async start() {
     invariant(!this._server, void 0, {
       F: __dxlog_file3,
-      L: 76,
+      L: 77,
       S: this,
       A: [
         "!this._server",
@@ -202,7 +202,7 @@ var DevServer = class {
     });
     log3.info("starting...", void 0, {
       F: __dxlog_file3,
-      L: 77,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -216,7 +216,7 @@ var DevServer = class {
           path: path2
         }, {
           F: __dxlog_file3,
-          L: 87,
+          L: 88,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -229,7 +229,7 @@ var DevServer = class {
       } catch (err) {
         log3.catch(err, void 0, {
           F: __dxlog_file3,
-          L: 97,
+          L: 98,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -254,7 +254,7 @@ var DevServer = class {
         endpoint
       }, {
         F: __dxlog_file3,
-        L: 112,
+        L: 113,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -269,7 +269,7 @@ var DevServer = class {
       port: this._port
     }, {
       F: __dxlog_file3,
-      L: 123,
+      L: 124,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -277,7 +277,7 @@ var DevServer = class {
   async stop() {
     invariant(this._server, void 0, {
       F: __dxlog_file3,
-      L: 127,
+      L: 128,
       S: this,
       A: [
         "this._server",
@@ -286,7 +286,7 @@ var DevServer = class {
     });
     log3.info("stopping...", void 0, {
       F: __dxlog_file3,
-      L: 128,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -294,7 +294,7 @@ var DevServer = class {
     this._server.close(async () => {
       log3.info("server stopped", void 0, {
         F: __dxlog_file3,
-        L: 132,
+        L: 133,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -302,7 +302,7 @@ var DevServer = class {
         if (this._functionServiceRegistration) {
           invariant(this._client.services.services.FunctionRegistryService, void 0, {
             F: __dxlog_file3,
-            L: 135,
+            L: 136,
             S: this,
             A: [
               "this._client.services.services.FunctionRegistryService",
@@ -316,7 +316,7 @@ var DevServer = class {
             registrationId: this._functionServiceRegistration
           }, {
             F: __dxlog_file3,
-            L: 140,
+            L: 141,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -333,7 +333,7 @@ var DevServer = class {
     this._server = void 0;
     log3.info("stopped", void 0, {
       F: __dxlog_file3,
-      L: 154,
+      L: 155,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -349,7 +349,7 @@ var DevServer = class {
       force
     }, {
       F: __dxlog_file3,
-      L: 163,
+      L: 164,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -370,7 +370,7 @@ var DevServer = class {
   async _safeUpdateRegistration() {
     invariant(this._functionServiceRegistration, void 0, {
       F: __dxlog_file3,
-      L: 185,
+      L: 186,
       S: this,
       A: [
         "this._functionServiceRegistration",
@@ -385,10 +385,10 @@ var DevServer = class {
           route
         }))
       });
-    } catch (e) {
-      log3.catch(e, void 0, {
+    } catch (err) {
+      log3.catch(err, void 0, {
         F: __dxlog_file3,
-        L: 192,
+        L: 193,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -405,7 +405,7 @@ var DevServer = class {
       path: path2
     }, {
       F: __dxlog_file3,
-      L: 203,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -419,7 +419,7 @@ var DevServer = class {
       duration: Date.now() - now
     }, {
       F: __dxlog_file3,
-      L: 206,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -430,7 +430,7 @@ var DevServer = class {
     const { handler } = this._handlers[path2] ?? {};
     invariant(handler, `invalid path: ${path2}`, {
       F: __dxlog_file3,
-      L: 213,
+      L: 214,
       S: this,
       A: [
         "handler",
@@ -502,11 +502,11 @@ var Scheduler = class {
     });
     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) {
       log4.info("function is not found for trigger", {
-        fnTrigger
+        trigger
       }, {
         F: __dxlog_file4,
         L: 78,
@@ -515,9 +515,7 @@ var Scheduler = class {
       });
       return;
     }
-    await this.triggers.activate({
-      space
-    }, fnTrigger, async (args) => {
+    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", {
@@ -537,8 +535,8 @@ var Scheduler = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        return this._execFunction(definition, fnTrigger, {
-          meta: fnTrigger.meta,
+        return this._execFunction(definition, trigger, {
+          meta: trigger.meta ?? {},
           data: {
             ...args,
             spaceKey: space.key
@@ -548,7 +546,7 @@ var Scheduler = class {
     });
     log4("activated trigger", {
       space: space.key,
-      trigger: fnTrigger
+      trigger
     }, {
       F: __dxlog_file4,
       L: 96,
@@ -629,19 +627,20 @@ var createContext2 = () => new Context2({
 import { Event as Event3 } from "@dxos/async";
 import { create as create2, Filter as Filter3, getMeta } 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 { 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 log9 } from "@dxos/log";
-import { ComplexMap as ComplexMap2, diff as diff2, intersection } from "@dxos/util";
+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, UpdateScheduler } from "@dxos/async";
-import { createSubscription, Filter as Filter2, getAutomergeObjectCore } from "@dxos/echo-db";
+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, triggerCtx, spec, callback) => {
+var createSubscriptionTrigger = async (ctx, space, spec, callback) => {
   const objectIds = /* @__PURE__ */ new Set();
   const task = new UpdateScheduler(ctx, async () => {
     if (objectIds.size > 0) {
@@ -669,7 +668,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)
       });
@@ -679,16 +678,16 @@ var createSubscriptionTrigger = async (ctx, triggerCtx, spec, callback) => {
   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) {
-      log5.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 TextV0Type) {
@@ -699,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());
   });
@@ -711,7 +720,7 @@ 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";
-var createTimerTrigger = async (ctx, triggerContext, spec, callback) => {
+var createTimerTrigger = async (ctx, space, spec, callback) => {
   const task = new DeferredTask(ctx, async () => {
     await callback({});
   });
@@ -726,12 +735,12 @@ var createTimerTrigger = async (ctx, triggerContext, spec, callback) => {
       last = now;
       run++;
       log6.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)
       });
@@ -747,7 +756,7 @@ 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";
-var createWebhookTrigger = async (ctx, _, spec, callback) => {
+var createWebhookTrigger = async (ctx, space, spec, callback) => {
   const server = http.createServer(async (req, res) => {
     if (req.method !== spec.method) {
       res.statusCode = 405;
@@ -764,7 +773,7 @@ var createWebhookTrigger = async (ctx, _, spec, callback) => {
       port
     }, {
       F: __dxlog_file7,
-      L: 40,
+      L: 41,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -780,7 +789,7 @@ 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";
-var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
+var createWebsocketTrigger = async (ctx, space, spec, callback, options = {
   retryDelay: 2,
   maxAttempts: 5
 }) => {
@@ -795,7 +804,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)
         });
@@ -810,7 +819,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)
         });
@@ -820,11 +829,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);
@@ -834,7 +843,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)
         });
@@ -843,7 +852,7 @@ var createWebsocketTrigger = async (ctx, triggerCtx, spec, callback, options = {
         try {
           log8.info("message", void 0, {
             F: __dxlog_file8,
-            L: 67,
+            L: 68,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -856,7 +865,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)
           });
@@ -873,7 +882,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)
         });
@@ -909,24 +918,24 @@ var TriggerRegistry = class extends Resource2 {
   getInactiveTriggers(space) {
     return this._getTriggers(space, (t) => t.activationCtx == null);
   }
-  async activate(triggerCtx, trigger, callback) {
+  async activate(space, trigger, callback) {
     log9("activate", {
-      space: triggerCtx.space.key,
+      space: space.key,
       trigger
     }, {
       F: __dxlog_file9,
-      L: 74,
+      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_file9,
-      L: 80,
+      L: 77,
       S: this,
       A: [
         "registeredTrigger",
@@ -936,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;
@@ -950,7 +959,7 @@ var TriggerRegistry = class extends Resource2 {
       space: space.key
     }, {
       F: __dxlog_file9,
-      L: 96,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -960,25 +969,42 @@ var TriggerRegistry = class extends Resource2 {
     if (!space.db.graph.runtimeSchemaRegistry.hasSchema(FunctionTrigger)) {
       space.db.graph.runtimeSchemaRegistry.registerSchema(FunctionTrigger);
     }
-    const { objects: existing } = await space.db.query(Filter3.schema(FunctionTrigger)).run();
-    const { added } = diff2(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;
+    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) => {
-      const { meta, object } = splitMeta(trigger);
-      space.db.add(create2(FunctionTrigger, object, meta));
+      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: 121,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -993,78 +1019,89 @@ var TriggerRegistry = class extends Resource2 {
         if (this._ctx.disposed) {
           break;
         }
-        this._ctx.onDispose(space.db.query(Filter3.schema(FunctionTrigger)).subscribe(async (triggers) => {
+        this._ctx.onDispose(space.db.query(Filter3.schema(FunctionTrigger)).subscribe(async ({ objects: current }) => {
           log9.info("update", {
             space: space.key,
-            triggers: triggers.objects.length
+            registered: registered.length,
+            current: current.length
           }, {
             F: __dxlog_file9,
-            L: 138,
+            L: 146,
             S: this,
             C: (f, a) => f(...a)
           });
-          await this._handleRemovedTriggers(space, triggers.objects, registered);
-          this._handleNewTriggers(space, triggers.objects, registered);
+          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: 150,
+      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);
       log9.info("added", () => ({
         spaceKey: space.key,
-        triggers: newTriggers.map((trigger) => trigger.function)
+        triggers: added.map((trigger) => trigger.function)
       }), {
         F: __dxlog_file9,
-        L: 162,
+        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) {
-        if (removed.length) {
-          log9.info("removed", () => ({
-            spaceKey: space.key,
-            triggers: removed.map((trigger) => trigger.function)
-          }), {
-            F: __dxlog_file9,
-            L: 181,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-        }
         const unregistered = registered.splice(i, 1)[0];
         await unregistered.activationCtx?.dispose();
         removed.push(unregistered.trigger);
       }
     }
     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