@dxos/functions 0.5.3-main.a3ea5f1 → 0.5.3-main.ac34611

package/dist/lib/browser/{chunk-366QG6IX.mjs → chunk-HRU7VDYL.mjs}

@@ -16,7 +16,7 @@ import {
 
 // packages/core/functions/src/types.ts
 import { RawObject, S, TypedObject } from "@dxos/echo-schema";
-var SubscriptionTriggerSchema = S.struct({
+var SubscriptionTriggerSchema = S.mutable(S.struct({
   type: S.literal("subscription"),
   // TODO(burdon): Define query DSL (from ECHO).
   filter: S.array(S.struct({
@@ -29,22 +29,22 @@ var SubscriptionTriggerSchema = S.struct({
     // Debounce changes (delay in ms).
     delay: S.optional(S.number)
   }))
-});
-var TimerTriggerSchema = S.struct({
+}));
+var TimerTriggerSchema = S.mutable(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({
+var WebsocketTriggerSchema = S.mutable(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",
@@ -61,6 +61,7 @@ var FunctionTrigger = class extends TypedObject({
   typename: "dxos.org/type/FunctionTrigger",
   version: "0.1.0"
 })({
+  enabled: S.optional(S.boolean),
   function: S.string.pipe(S.description("Function URI.")),
   // Context is merged into the event data passed to the function.
   meta: S.optional(S.object),
@@ -71,11 +72,16 @@ var FunctionManifestSchema = S.struct({
   functions: S.optional(S.mutable(S.array(RawObject(FunctionDef)))),
   triggers: S.optional(S.mutable(S.array(RawObject(FunctionTrigger))))
 });
+var FUNCTION_SCHEMA = [
+  FunctionDef,
+  FunctionTrigger
+];
 
 export {
   __require,
   FunctionDef,
   FunctionTrigger,
-  FunctionManifestSchema
+  FunctionManifestSchema,
+  FUNCTION_SCHEMA
 };
-//# sourceMappingURL=chunk-366QG6IX.mjs.map
+//# sourceMappingURL=chunk-HRU7VDYL.mjs.map

package/dist/lib/browser/chunk-HRU7VDYL.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/types.ts"],
+  "sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { RawObject, S, TypedObject } from '@dxos/echo-schema';\n\n/**\n * Type discriminator for TriggerSpec.\n * Every spec has a type field of type FunctionTriggerType that we can use to understand which\n * type we're working with.\n * https://www.typescriptlang.org/docs/handbook/2/narrowing.html#discriminated-unions\n */\nexport type FunctionTriggerType = 'subscription' | 'timer' | 'webhook' | 'websocket';\n\nconst SubscriptionTriggerSchema = S.mutable(\n  S.struct({\n    type: S.literal('subscription'),\n    // TODO(burdon): Define query DSL (from ECHO).\n    filter: S.array(\n      S.struct({\n        type: S.string,\n        props: S.optional(S.record(S.string, S.any)),\n      }),\n    ),\n    options: S.optional(\n      S.struct({\n        // Watch changes to object (not just creation).\n        deep: S.optional(S.boolean),\n        // Debounce changes (delay in ms).\n        delay: S.optional(S.number),\n      }),\n    ),\n  }),\n);\n\nexport type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;\n\nconst TimerTriggerSchema = S.mutable(\n  S.struct({\n    type: S.literal('timer'),\n    cron: S.string,\n  }),\n);\n\nexport type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;\n\nconst WebhookTriggerSchema = S.mutable(\n  S.struct({\n    type: S.literal('webhook'),\n    method: S.string,\n    // Assigned port.\n    port: S.optional(S.number),\n  }),\n);\n\nexport type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;\n\nconst WebsocketTriggerSchema = S.mutable(\n  S.struct({\n    type: S.literal('websocket'),\n    url: S.string,\n    init: S.optional(S.record(S.string, S.any)),\n  }),\n);\n\nexport type WebsocketTrigger = S.Schema.Type<typeof WebsocketTriggerSchema>;\n\nconst TriggerSpecSchema = S.union(\n  TimerTriggerSchema,\n  WebhookTriggerSchema,\n  WebsocketTriggerSchema,\n  SubscriptionTriggerSchema,\n);\n\nexport type TriggerSpec = TimerTrigger | WebhookTrigger | WebsocketTrigger | SubscriptionTrigger;\n\n/**\n * Function definition.\n */\nexport class FunctionDef extends TypedObject({\n  typename: 'dxos.org/type/FunctionDef',\n  version: '0.1.0',\n})({\n  uri: S.string,\n  description: S.optional(S.string),\n  route: S.string,\n  // TODO(burdon): NPM/GitHub/Docker/CF URL?\n  handler: S.string,\n}) {}\n\nexport class FunctionTrigger extends TypedObject({\n  typename: 'dxos.org/type/FunctionTrigger',\n  version: '0.1.0',\n})({\n  enabled: S.optional(S.boolean),\n  function: S.string.pipe(S.description('Function URI.')),\n  // Context is merged into the event data passed to the function.\n  meta: S.optional(S.object),\n  spec: TriggerSpecSchema,\n}) {}\n\n/**\n * Function manifest file.\n */\nexport const FunctionManifestSchema = S.struct({\n  functions: S.optional(S.mutable(S.array(RawObject(FunctionDef)))),\n  triggers: S.optional(S.mutable(S.array(RawObject(FunctionTrigger)))),\n});\n\nexport type FunctionManifest = S.Schema.Type<typeof FunctionManifestSchema>;\n\n// TODO(burdon): Standards?\nexport const FUNCTION_SCHEMA = [FunctionDef, FunctionTrigger];\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;AAIA,SAASA,WAAWC,GAAGC,mBAAmB;AAU1C,IAAMC,4BAA4BC,EAAEC,QAClCD,EAAEE,OAAO;EACPC,MAAMH,EAAEI,QAAQ,cAAA;;EAEhBC,QAAQL,EAAEM,MACRN,EAAEE,OAAO;IACPC,MAAMH,EAAEO;IACRC,OAAOR,EAAES,SAAST,EAAEU,OAAOV,EAAEO,QAAQP,EAAEW,GAAG,CAAA;EAC5C,CAAA,CAAA;EAEFC,SAASZ,EAAES,SACTT,EAAEE,OAAO;;IAEPW,MAAMb,EAAES,SAAST,EAAEc,OAAO;;IAE1BC,OAAOf,EAAES,SAAST,EAAEgB,MAAM;EAC5B,CAAA,CAAA;AAEJ,CAAA,CAAA;AAKF,IAAMC,qBAAqBjB,EAAEC,QAC3BD,EAAEE,OAAO;EACPC,MAAMH,EAAEI,QAAQ,OAAA;EAChBc,MAAMlB,EAAEO;AACV,CAAA,CAAA;AAKF,IAAMY,uBAAuBnB,EAAEC,QAC7BD,EAAEE,OAAO;EACPC,MAAMH,EAAEI,QAAQ,SAAA;EAChBgB,QAAQpB,EAAEO;;EAEVc,MAAMrB,EAAES,SAAST,EAAEgB,MAAM;AAC3B,CAAA,CAAA;AAKF,IAAMM,yBAAyBtB,EAAEC,QAC/BD,EAAEE,OAAO;EACPC,MAAMH,EAAEI,QAAQ,WAAA;EAChBmB,KAAKvB,EAAEO;EACPiB,MAAMxB,EAAES,SAAST,EAAEU,OAAOV,EAAEO,QAAQP,EAAEW,GAAG,CAAA;AAC3C,CAAA,CAAA;AAKF,IAAMc,oBAAoBzB,EAAE0B,MAC1BT,oBACAE,sBACAG,wBACAvB,yBAAAA;AAQK,IAAM4B,cAAN,cAA0BC,YAAY;EAC3CC,UAAU;EACVC,SAAS;AACX,CAAA,EAAG;EACDC,KAAK/B,EAAEO;EACPyB,aAAahC,EAAES,SAAST,EAAEO,MAAM;EAChC0B,OAAOjC,EAAEO;;EAET2B,SAASlC,EAAEO;AACb,CAAA,EAAA;AAAI;AAEG,IAAM4B,kBAAN,cAA8BP,YAAY;EAC/CC,UAAU;EACVC,SAAS;AACX,CAAA,EAAG;EACDM,SAASpC,EAAES,SAAST,EAAEc,OAAO;EAC7BuB,UAAUrC,EAAEO,OAAO+B,KAAKtC,EAAEgC,YAAY,eAAA,CAAA;;EAEtCO,MAAMvC,EAAES,SAAST,EAAEwC,MAAM;EACzBC,MAAMhB;AACR,CAAA,EAAA;AAAI;AAKG,IAAMiB,yBAAyB1C,EAAEE,OAAO;EAC7CyC,WAAW3C,EAAES,SAAST,EAAEC,QAAQD,EAAEM,MAAMsC,UAAUjB,WAAAA,CAAAA,CAAAA,CAAAA;EAClDkB,UAAU7C,EAAES,SAAST,EAAEC,QAAQD,EAAEM,MAAMsC,UAAUT,eAAAA,CAAAA,CAAAA,CAAAA;AACnD,CAAA;AAKO,IAAMW,kBAAkB;EAACnB;EAAaQ;;",
+  "names": ["RawObject", "S", "TypedObject", "SubscriptionTriggerSchema", "S", "mutable", "struct", "type", "literal", "filter", "array", "string", "props", "optional", "record", "any", "options", "deep", "boolean", "delay", "number", "TimerTriggerSchema", "cron", "WebhookTriggerSchema", "method", "port", "WebsocketTriggerSchema", "url", "init", "TriggerSpecSchema", "union", "FunctionDef", "TypedObject", "typename", "version", "uri", "description", "route", "handler", "FunctionTrigger", "enabled", "function", "pipe", "meta", "object", "spec", "FunctionManifestSchema", "functions", "RawObject", "triggers", "FUNCTION_SCHEMA"]
+}

package/dist/lib/browser/index.mjs

@@ -1,10 +1,11 @@
 import "@dxos/node-std/globals";
 import {
+  FUNCTION_SCHEMA,
   FunctionDef,
   FunctionManifestSchema,
   FunctionTrigger,
   __require
-} from "./chunk-366QG6IX.mjs";
+} from "./chunk-HRU7VDYL.mjs";
 
 // packages/core/functions/src/function/function-registry.ts
 import { Event } from "@dxos/async";
@@ -12,32 +13,7 @@ import { create, Filter } from "@dxos/client/echo";
 import { Resource } from "@dxos/context";
 import { PublicKey } from "@dxos/keys";
 import { log } from "@dxos/log";
-import { ComplexMap } from "@dxos/util";
-
-// packages/core/functions/src/util.ts
-var diff = (previous, next, comparator) => {
-  const remaining = [
-    ...previous
-  ];
-  const result = {
-    added: [],
-    updated: [],
-    removed: remaining
-  };
-  for (const object of next) {
-    const index = remaining.findIndex((item) => comparator(item, object));
-    if (index === -1) {
-      result.added.push(object);
-    } else {
-      result.updated.push(remaining[index]);
-      remaining.splice(index, 1);
-    }
-  }
-  return result;
-};
-var intersection = (a, b, comparator) => a.filter((a2) => b.find((b2) => comparator(a2, b2)) !== void 0);
-
-// packages/core/functions/src/function/function-registry.ts
+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) {
@@ -59,7 +35,7 @@ var FunctionRegistry = class extends Resource {
       functions: functions?.length ?? 0
     }, {
       F: __dxlog_file,
-      L: 39,
+      L: 38,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -70,11 +46,16 @@ var FunctionRegistry = class extends Resource {
       space.db.graph.runtimeSchemaRegistry.registerSchema(FunctionDef);
     }
     const { objects: existing } = await space.db.query(Filter.schema(FunctionDef)).run();
-    const { added, removed } = diff(existing, functions, (a, b) => a.uri === b.uri);
+    const { added } = diff(existing, functions, (a, b) => a.uri === b.uri);
     added.forEach((def) => space.db.add(create(FunctionDef, def)));
-    removed.forEach((def) => space.db.remove(def));
   }
   async _open() {
+    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)) {
@@ -101,6 +82,12 @@ var FunctionRegistry = class extends Resource {
     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();
   }
 };
@@ -485,7 +472,7 @@ var Scheduler = class {
     this.triggers = triggers;
     this._options = _options;
     this._ctx = createContext2();
-    this._callMutex = new Mutex();
+    this._functionUriToCallMutex = /* @__PURE__ */ new Map();
     this.functions.registered.on(async ({ space, added }) => {
       await this._safeActivateTriggers(space, this.triggers.getInactiveTriggers(space), added);
     });
@@ -531,7 +518,25 @@ var Scheduler = class {
     await this.triggers.activate({
       space
     }, fnTrigger, async (args) => {
-      return this._callMutex.executeSynchronized(() => {
+      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, fnTrigger, {
           meta: fnTrigger.meta,
           data: {
@@ -546,7 +551,7 @@ var Scheduler = class {
       trigger: fnTrigger
     }, {
       F: __dxlog_file4,
-      L: 91,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -566,7 +571,7 @@ var Scheduler = class {
           triggerType: trigger.spec.type
         }, {
           F: __dxlog_file4,
-          L: 108,
+          L: 113,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -583,7 +588,7 @@ var Scheduler = class {
           function: def.uri
         }, {
           F: __dxlog_file4,
-          L: 119,
+          L: 124,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -597,7 +602,7 @@ var Scheduler = class {
         status
       }, {
         F: __dxlog_file4,
-        L: 129,
+        L: 134,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -607,7 +612,7 @@ var Scheduler = class {
         error: err.message
       }, {
         F: __dxlog_file4,
-        L: 131,
+        L: 136,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -628,7 +633,7 @@ import { ECHO_ATTR_META, foreignKey, foreignKeyEquals, splitMeta } from "@dxos/e
 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 } from "@dxos/util";
+import { ComplexMap as ComplexMap2, diff as diff2, intersection } from "@dxos/util";
 
 // packages/core/functions/src/trigger/type/subscription-trigger.ts
 import { TextV0Type } from "@braneframe/types";
@@ -910,7 +915,7 @@ var TriggerRegistry = class extends Resource2 {
       trigger
     }, {
       F: __dxlog_file9,
-      L: 75,
+      L: 74,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -921,7 +926,7 @@ var TriggerRegistry = class extends Resource2 {
     const registeredTrigger = this._triggersBySpaceKey.get(triggerCtx.space.key)?.find((reg) => reg.trigger.id === trigger.id);
     invariant2(registeredTrigger, `Trigger is not registered: ${trigger.function}`, {
       F: __dxlog_file9,
-      L: 81,
+      L: 80,
       S: this,
       A: [
         "registeredTrigger",
@@ -945,7 +950,7 @@ var TriggerRegistry = class extends Resource2 {
       space: space.key
     }, {
       F: __dxlog_file9,
-      L: 97,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -956,7 +961,7 @@ var TriggerRegistry = class extends Resource2 {
       space.db.graph.runtimeSchemaRegistry.registerSchema(FunctionTrigger);
     }
     const { objects: existing } = await space.db.query(Filter3.schema(FunctionTrigger)).run();
-    const { added, removed } = diff(existing, manifest.triggers, (a, b) => {
+    const { added } = diff2(existing, manifest.triggers, (a, b) => {
       const keys = b[ECHO_ATTR_META]?.keys ?? [
         foreignKey("manifest", [
           b.function,
@@ -969,9 +974,14 @@ var TriggerRegistry = class extends Resource2 {
       const { meta, object } = splitMeta(trigger);
       space.db.add(create2(FunctionTrigger, object, meta));
     });
-    removed.forEach((trigger) => space.db.remove(trigger));
   }
   async _open() {
+    log9.info("open...", void 0, {
+      F: __dxlog_file9,
+      L: 121,
+      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)) {
@@ -983,16 +993,30 @@ var TriggerRegistry = class extends Resource2 {
         if (this._ctx.disposed) {
           break;
         }
-        const functionsSubscription = space.db.query(Filter3.schema(FunctionTrigger)).subscribe(async (triggers) => {
+        this._ctx.onDispose(space.db.query(Filter3.schema(FunctionTrigger)).subscribe(async (triggers) => {
+          log9.info("update", {
+            space: space.key,
+            triggers: triggers.objects.length
+          }, {
+            F: __dxlog_file9,
+            L: 138,
+            S: this,
+            C: (f, a) => f(...a)
+          });
           await this._handleRemovedTriggers(space, triggers.objects, registered);
           this._handleNewTriggers(space, triggers.objects, registered);
-        });
-        this._ctx.onDispose(functionsSubscription);
+        }));
       }
     });
     this._ctx.onDispose(() => spaceListSubscription.unsubscribe());
   }
   async _close(_) {
+    log9.info("close...", void 0, {
+      F: __dxlog_file9,
+      L: 150,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._triggersBySpaceKey.clear();
   }
   _handleNewTriggers(space, allTriggers, registered) {
@@ -1004,12 +1028,12 @@ var TriggerRegistry = class extends Resource2 {
         trigger
       }));
       registered.push(...newRegisteredTriggers);
-      log9("registered new triggers", () => ({
+      log9.info("added", () => ({
         spaceKey: space.key,
-        functions: newTriggers.map((t) => t.function)
+        triggers: newTriggers.map((trigger) => trigger.function)
       }), {
         F: __dxlog_file9,
-        L: 159,
+        L: 162,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1024,6 +1048,17 @@ var TriggerRegistry = class extends Resource2 {
     for (let i = registered.length - 1; i >= 0; i--) {
       const wasRemoved = allTriggers.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);
@@ -1043,6 +1078,7 @@ var TriggerRegistry = class extends Resource2 {
 };
 export {
   DevServer,
+  FUNCTION_SCHEMA,
   FunctionDef,
   FunctionManifestSchema,
   FunctionRegistry,