@dxos/functions 0.8.4-main.1da679c → 0.8.4-main.1f223c7

package/dist/lib/browser/index.mjs

@@ -181,7 +181,6 @@ var deserializeFunction = (functionObj) => {
     description: functionObj.description,
     inputSchema: !functionObj.inputSchema ? Schema2.Unknown : Type2.toEffectSchema(functionObj.inputSchema),
     outputSchema: !functionObj.outputSchema ? void 0 : Type2.toEffectSchema(functionObj.outputSchema),
-    // TODO(dmaretskyi): This should throw error.
     handler: () => {
     }
   };
@@ -196,7 +195,7 @@ import { log } from "@dxos/log";
 
 // src/types.ts
 import { Schema as Schema3, SchemaAST } from "effect";
-import { Obj as Obj2, QueryAST, Type as Type3 } from "@dxos/echo";
+import { QueryAST, Type as Type3 } from "@dxos/echo";
 import { Expando, OptionsAnnotationId, RawObject, Ref as Ref2 } from "@dxos/echo-schema";
 import { DXN } from "@dxos/keys";
 var TriggerKinds = [
@@ -281,21 +280,10 @@ var QueueTriggerOutput = Schema3.mutable(Schema3.Struct({
   item: Schema3.Any,
   cursor: Schema3.String
 }));
-var SubscriptionTriggerOutput = Schema3.Struct({
-  /**
-  * Type of the mutation.
-  */
-  // TODO(dmaretskyi): Specify enum.
+var SubscriptionTriggerOutput = Schema3.mutable(Schema3.Struct({
   type: Schema3.String,
-  /**
-  * Reference to the object that was changed or created.
-  */
-  subject: Type3.Ref(Obj2.Any),
-  /**
-  * @deprecated
-  */
-  changedObjectId: Schema3.optional(Schema3.String)
-}).pipe(Schema3.mutable);
+  changedObjectId: Schema3.String
+}));
 var TimerTriggerOutput = Schema3.mutable(Schema3.Struct({
   tick: Schema3.Number
 }));
@@ -350,17 +338,17 @@ var FUNCTION_TYPES = [
 
 // src/trace.ts
 var __dxlog_file = "/__w/dxos/dxos/packages/core/functions/src/trace.ts";
-var InvocationOutcome = /* @__PURE__ */ (function(InvocationOutcome2) {
+var InvocationOutcome = /* @__PURE__ */ function(InvocationOutcome2) {
   InvocationOutcome2["SUCCESS"] = "success";
   InvocationOutcome2["FAILURE"] = "failure";
   InvocationOutcome2["PENDING"] = "pending";
   return InvocationOutcome2;
-})({});
-var InvocationTraceEventType = /* @__PURE__ */ (function(InvocationTraceEventType2) {
+}({});
+var InvocationTraceEventType = /* @__PURE__ */ function(InvocationTraceEventType2) {
   InvocationTraceEventType2["START"] = "start";
   InvocationTraceEventType2["END"] = "end";
   return InvocationTraceEventType2;
-})({});
+}({});
 var TraceEventException = Schema4.Struct({
   timestamp: Schema4.Number,
   message: Schema4.String,
@@ -495,13 +483,12 @@ var createInvocationSpans = (items) => {
 
 // src/triggers/invocation-tracer.ts
 import { Context as Context2, Effect as Effect3, Layer as Layer2 } from "effect";
-import { Obj as Obj3, Ref as Ref3 } from "@dxos/echo";
+import { Obj as Obj2, Ref as Ref3 } from "@dxos/echo";
 import { DXN as DXN2, ObjectId as ObjectId2 } from "@dxos/keys";
 
 // src/services/local-function-execution.ts
 import { Context, Effect as Effect2, Layer, Schema as Schema5 } from "effect";
 import { todo } from "@dxos/debug";
-import { log as log2 } from "@dxos/log";
 function _define_property(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, {
@@ -515,7 +502,6 @@ function _define_property(obj, key, value) {
   }
   return obj;
 }
-var __dxlog_file2 = "/__w/dxos/dxos/packages/core/functions/src/services/local-function-execution.ts";
 var _Context_Tag;
 var LocalFunctionExecutionService = class extends (_Context_Tag = Context.Tag("@dxos/functions/LocalFunctionExecutionService")()) {
 };
@@ -533,18 +519,8 @@ _define_property(LocalFunctionExecutionService, "layerLive", Layer.effect(LocalF
 })));
 _define_property(LocalFunctionExecutionService, "invokeFunction", Effect2.serviceFunctionEffect(LocalFunctionExecutionService, (_) => _.invokeFunction));
 var invokeFunction = (functionDef, input) => Effect2.gen(function* () {
-  try {
-    const assertInput = functionDef.inputSchema.pipe(Schema5.asserts);
-    assertInput(input);
-  } catch (e) {
-    throw new FunctionError({
-      message: "Invalid function input",
-      context: {
-        name: functionDef.name
-      },
-      cause: e
-    });
-  }
+  const assertInput = functionDef.inputSchema.pipe(Schema5.asserts);
+  assertInput(input);
   const context = {
     space: void 0,
     getService: () => todo(),
@@ -552,15 +528,6 @@ var invokeFunction = (functionDef, input) => Effect2.gen(function* () {
       throw new Error("Not available. Use the database service instead.");
     }
   };
-  log2.info("Invoking function", {
-    name: functionDef.name,
-    input
-  }, {
-    F: __dxlog_file2,
-    L: 72,
-    S: this,
-    C: (f, a) => f(...a)
-  });
   const data = yield* Effect2.gen(function* () {
     const result = functionDef.handler({
       context,
@@ -579,28 +546,8 @@ var invokeFunction = (functionDef, input) => Effect2.gen(function* () {
     },
     cause: defect
   }))));
-  log2.info("Function completed", {
-    name: functionDef.name,
-    input,
-    data
-  }, {
-    F: __dxlog_file2,
-    L: 96,
-    S: this,
-    C: (f, a) => f(...a)
-  });
-  try {
-    const assertOutput = functionDef.outputSchema?.pipe(Schema5.asserts);
-    assertOutput(data);
-  } catch (e) {
-    throw new FunctionError({
-      message: "Invalid function output",
-      context: {
-        name: functionDef.name
-      },
-      cause: e
-    });
-  }
+  const assertOutput = functionDef.outputSchema?.pipe(Schema5.asserts);
+  assertOutput(data);
   return data;
 }).pipe(Effect2.withSpan("invokeFunction", {
   attributes: {
@@ -645,7 +592,7 @@ _define_property2(InvocationTracer, "layerLive", (opts) => Layer2.effect(Invocat
         subspaceTag: "trace"
       });
       const now = Date.now();
-      const traceEvent = Obj3.make(InvocationTraceStartEvent, {
+      const traceEvent = Obj2.make(InvocationTraceStartEvent, {
         type: InvocationTraceEventType.START,
         invocationId,
         timestamp: now,
@@ -665,7 +612,7 @@ _define_property2(InvocationTracer, "layerLive", (opts) => Layer2.effect(Invocat
     }),
     traceInvocationEnd: Effect3.fn("traceInvocationEnd")(function* ({ trace, exception }) {
       const now = Date.now();
-      const traceEvent = Obj3.make(InvocationTraceEndEvent, {
+      const traceEvent = Obj2.make(InvocationTraceEndEvent, {
         type: InvocationTraceEventType.END,
         invocationId: trace.invocationId,
         timestamp: now,
@@ -694,10 +641,10 @@ _define_property2(InvocationTracer, "layerTest", Layer2.unwrapEffect(Effect3.gen
 
 // src/triggers/trigger-dispatcher.ts
 import { Cause, Context as Context4, Cron, Duration, Effect as Effect5, Either, Exit, Fiber, Layer as Layer4, Option as Option2, Record, Schedule } from "effect";
-import { DXN as DXN3, Filter, Obj as Obj4, Query } from "@dxos/echo";
+import { DXN as DXN3, Filter, Obj as Obj3, Query } from "@dxos/echo";
 import { causeToError } from "@dxos/effect";
 import { invariant } from "@dxos/invariant";
-import { log as log3 } from "@dxos/log";
+import { log as log2 } from "@dxos/log";
 import { KEY_QUEUE_POSITION } from "@dxos/protocols";
 
 // src/triggers/input-builder.ts
@@ -791,7 +738,7 @@ function _define_property4(obj, key, value) {
   }
   return obj;
 }
-var __dxlog_file3 = "/__w/dxos/dxos/packages/core/functions/src/triggers/trigger-dispatcher.ts";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/functions/src/triggers/trigger-dispatcher.ts";
 var _Context_Tag4;
 var TriggerDispatcher = class extends (_Context_Tag4 = Context4.Tag("@dxos/functions/TriggerDispatcher")()) {
 };
@@ -817,10 +764,10 @@ var TriggerDispatcherImpl = class {
       if (this.timeControl === "natural") {
         this._timerFiber = yield* this._startNaturalTimeProcessing().pipe(Effect5.tapErrorCause((cause) => {
           const error = causeToError(cause);
-          log3.error("trigger dispatcher error", {
+          log2.error("trigger dispatcher error", {
             error
           }, {
-            F: __dxlog_file3,
+            F: __dxlog_file2,
             L: 170,
             S: this,
             C: (f, a) => f(...a)
@@ -831,10 +778,10 @@ var TriggerDispatcherImpl = class {
       } else {
         return yield* Effect5.dieMessage("TriggerDispatcher started in manual time control mode");
       }
-      log3.info("TriggerDispatcher started", {
+      log2.info("TriggerDispatcher started", {
         timeControl: this.timeControl
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 180,
         S: this,
         C: (f, a) => f(...a)
@@ -850,8 +797,8 @@ var TriggerDispatcherImpl = class {
         this._timerFiber = void 0;
       }
       this._scheduledTriggers.clear();
-      log3.info("TriggerDispatcher stopped", void 0, {
-        F: __dxlog_file3,
+      log2.info("TriggerDispatcher stopped", void 0, {
+        F: __dxlog_file2,
         L: 200,
         S: this,
         C: (f, a) => f(...a)
@@ -859,12 +806,12 @@ var TriggerDispatcherImpl = class {
     }));
     _define_property4(this, "invokeTrigger", (options2) => Effect5.gen(this, function* () {
       const { trigger, event } = options2;
-      log3.info("running trigger", {
+      log2.info("running trigger", {
         triggerId: trigger.id,
         spec: trigger.spec,
         event
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file2,
         L: 208,
         S: this,
         C: (f, a) => f(...a)
@@ -889,8 +836,8 @@ var TriggerDispatcherImpl = class {
           return yield* Effect5.dieMessage("Trigger has no function reference");
         }
         const serialiedFunction = yield* DatabaseService.load(trigger.function).pipe(Effect5.orDie);
-        invariant(Obj4.instanceOf(FunctionType, serialiedFunction), void 0, {
-          F: __dxlog_file3,
+        invariant(Obj3.instanceOf(FunctionType, serialiedFunction), void 0, {
+          F: __dxlog_file2,
           L: 235,
           S: this,
           A: [
@@ -907,19 +854,19 @@ var TriggerDispatcherImpl = class {
         result
       };
       if (Exit.isSuccess(result)) {
-        log3.info("trigger execution success", {
+        log2.info("trigger execution success", {
           triggerId: trigger.id
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file2,
           L: 256,
           S: this,
           C: (f, a) => f(...a)
         });
       } else {
-        log3.error("trigger execution failure", {
+        log2.error("trigger execution failure", {
           error: causeToError(result.cause)
         }, {
-          F: __dxlog_file3,
+          F: __dxlog_file2,
           L: 260,
           S: this,
           C: (f, a) => f(...a)
@@ -968,11 +915,11 @@ var TriggerDispatcherImpl = class {
               if (spec?.kind !== "queue") {
                 continue;
               }
-              const cursor = Obj4.getKeys(trigger, KEY_QUEUE_CURSOR).at(0)?.id;
+              const cursor = Obj3.getKeys(trigger, KEY_QUEUE_CURSOR).at(0)?.id;
               const queue = yield* QueueService.getQueue(DXN3.parse(spec.queue));
               const objects = yield* Effect5.promise(() => queue.queryObjects());
               for (const object of objects) {
-                const objectPos = Obj4.getKeys(object, KEY_QUEUE_POSITION).at(0)?.id;
+                const objectPos = Obj3.getKeys(object, KEY_QUEUE_POSITION).at(0)?.id;
                 if (!objectPos || cursor && parseInt(cursor) >= parseInt(objectPos)) {
                   continue;
                 }
@@ -984,8 +931,8 @@ var TriggerDispatcherImpl = class {
                     cursor: objectPos
                   }
                 }));
-                Obj4.deleteKeys(trigger, KEY_QUEUE_CURSOR);
-                Obj4.getMeta(trigger).keys.push({
+                Obj3.deleteKeys(trigger, KEY_QUEUE_CURSOR);
+                Obj3.getMeta(trigger).keys.push({
                   source: KEY_QUEUE_CURSOR,
                   id: objectPos
                 });
@@ -998,7 +945,7 @@ var TriggerDispatcherImpl = class {
           case "subscription": {
             const triggers = yield* this._fetchTriggers();
             for (const trigger of triggers) {
-              const spec = Obj4.getSnapshot(trigger).spec;
+              const spec = Obj3.getSnapshot(trigger).spec;
               if (spec?.kind !== "subscription") {
                 continue;
               }
@@ -1012,7 +959,7 @@ var TriggerDispatcherImpl = class {
                 }
               })));
               invariant(state.state?._tag === "subscription", void 0, {
-                F: __dxlog_file3,
+                F: __dxlog_file2,
                 L: 373,
                 S: this,
                 A: [
@@ -1022,23 +969,21 @@ var TriggerDispatcherImpl = class {
               });
               let updated = false;
               for (const object of objects) {
-                const existingVersion = Record.get(state.state.processedVersions, object.id).pipe(Option2.map(Obj4.decodeVersion));
-                const currentVersion = Obj4.version(object);
-                const run = Option2.isNone(existingVersion) || Obj4.compareVersions(currentVersion, existingVersion.value) === "different";
+                const existingVersion = Record.get(state.state.processedVersions, object.id).pipe(Option2.map(Obj3.decodeVersion));
+                const currentVersion = Obj3.version(object);
+                const run = Option2.isNone(existingVersion) || Obj3.compareVersions(currentVersion, existingVersion.value) === "different";
                 if (!run) {
                   continue;
                 }
-                const { db } = yield* DatabaseService;
                 invocations.push(yield* this.invokeTrigger({
                   trigger,
                   event: {
                     // TODO(dmaretskyi): Change type not supported.
                     type: "unknown",
-                    subject: db.ref(Obj4.getDXN(object)),
                     changedObjectId: object.id
                   }
                 }));
-                state.state.processedVersions[object.id] = Obj4.encodeVersion(currentVersion);
+                state.state.processedVersions[object.id] = Obj3.encodeVersion(currentVersion);
                 updated = true;
               }
               if (updated) {
@@ -1060,12 +1005,12 @@ var TriggerDispatcherImpl = class {
       }
       const millis = Duration.toMillis(duration);
       this._internalTime = new Date(this._internalTime.getTime() + millis);
-      log3("Advanced internal time", {
+      log2("Advanced internal time", {
         newTime: this._internalTime,
         advancedBy: Duration.format(duration)
       }, {
-        F: __dxlog_file3,
-        L: 430,
+        F: __dxlog_file2,
+        L: 426,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1094,14 +1039,14 @@ var TriggerDispatcherImpl = class {
             const existing = this._scheduledTriggers.get(trigger.id);
             const now = this.getCurrentTime();
             const nextExecution = existing?.nextExecution ?? Cron.next(cron, now);
-            log3("Updated scheduled trigger", {
+            log2("Updated scheduled trigger", {
               triggerId: trigger.id,
               cron: timerSpec.cron,
               nextExecution,
               now
             }, {
-              F: __dxlog_file3,
-              L: 470,
+              F: __dxlog_file2,
+              L: 466,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1111,24 +1056,24 @@ var TriggerDispatcherImpl = class {
               nextExecution
             });
           } else {
-            log3.error("Invalid cron expression", {
+            log2.error("Invalid cron expression", {
               triggerId: trigger.id,
               cron: timerSpec.cron,
               error: cronEither.left.message
             }, {
-              F: __dxlog_file3,
-              L: 482,
+              F: __dxlog_file2,
+              L: 478,
               S: this,
               C: (f, a) => f(...a)
             });
           }
         }
       }
-      log3("Updated scheduled triggers", {
+      log2("Updated scheduled triggers", {
         count: this._scheduledTriggers.size
       }, {
-        F: __dxlog_file3,
-        L: 491,
+        F: __dxlog_file2,
+        L: 487,
         S: this,
         C: (f, a) => f(...a)
       });