@dxos/functions 0.5.3-main.b41a319 → 0.5.3-main.c3feabc

package/dist/types/src/handler.d.ts

@@ -1,44 +1,24 @@
 import { type Client } from '@dxos/client';
 import { type Space } from '@dxos/client/echo';
 import { type EchoReactiveObject } from '@dxos/echo-schema';
-/**
- * Function handler.
- */
-export type FunctionHandler<TData = {}, TMeta = {}> = (params: {
-    context: FunctionContext;
-    event: FunctionEvent<TData, TMeta>;
-    response: FunctionResponse;
-}) => Promise<FunctionResponse | void>;
-/**
- * Function context.
- */
+export interface Response {
+    status(code: number): Response;
+}
 export interface FunctionContext {
     client: Client;
     dataDir?: string;
+    data?: any;
 }
-/**
- * Event payload.
- */
-export type FunctionEvent<TData = {}, TMeta = {}> = {
-    data: FunctionEventMeta<TMeta> & TData;
-};
-/**
- * Metadata from trigger.
- */
-export type FunctionEventMeta<TMeta = {}> = {
-    meta: TMeta;
-};
-/**
- * Function response.
- */
-export interface FunctionResponse {
-    status(code: number): FunctionResponse;
-}
-export type RawSubscriptionData = {
+export type FunctionHandler<T extends {}> = (params: {
+    event: T;
+    context: FunctionContext;
+    response: Response;
+}) => Promise<Response | void>;
+export type RawSubscriptionEvent = {
     spaceKey?: string;
     objects?: string[];
 };
-export type SubscriptionData = {
+export type SubscriptionEvent = {
     space?: Space;
     objects?: EchoReactiveObject<any>[];
 };
@@ -52,5 +32,5 @@ export type SubscriptionData = {
  *
  * NOTE: Get space key from devtools or `dx space list --json`
  */
-export declare const subscriptionHandler: <TMeta>(handler: FunctionHandler<SubscriptionData, TMeta>) => FunctionHandler<RawSubscriptionData, TMeta>;
+export declare const subscriptionHandler: (handler: FunctionHandler<SubscriptionEvent>) => FunctionHandler<RawSubscriptionEvent>;
 //# sourceMappingURL=handler.d.ts.map

package/dist/types/src/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/handler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAS5D;;GAEG;AACH,MAAM,MAAM,eAAe,CAAC,KAAK,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE;IAC7D,OAAO,EAAE,eAAe,CAAC;IACzB,KAAK,EAAE,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACnC,QAAQ,EAAE,gBAAgB,CAAC;CAC5B,KAAK,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;AAEvC;;GAEG;AACH,MAAM,WAAW,eAAe;IAE9B,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,KAAK,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,IAAI;IAClD,IAAI,EAAE,iBAAiB,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;CACxC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,KAAK,GAAG,EAAE,IAAI;IAC1C,IAAI,EAAE,KAAK,CAAC;CACb,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,CAAC;CACxC;AAMD,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,OAAO,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;CACrC,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,2GAkB/B,CAAC"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../../src/handler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAa,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAU5D,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC;CAChC;AAED,MAAM,WAAW,eAAe;IAE9B,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAGD,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE;IACnD,KAAK,EAAE,CAAC,CAAC;IACT,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,EAAE,QAAQ,CAAC;CACpB,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;AAE/B,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,OAAO,CAAC,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;CACrC,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,mBAAmB,YACrB,gBAAgB,iBAAiB,CAAC,KAC1C,gBAAgB,oBAAoB,CAgBtC,CAAC"}

package/dist/types/src/runtime/dev-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../../../src/runtime/dev-server.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,EAA4C,KAAK,eAAe,EAAyB,MAAM,YAAY,CAAC;AACnH,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEnE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,qBAAa,SAAS;IAclB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAb3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2E;IAErG,OAAO,CAAC,OAAO,CAAC,CAAc;IAC9B,OAAO,CAAC,KAAK,CAAC,CAAS;IACvB,OAAO,CAAC,4BAA4B,CAAC,CAAS;IAC9C,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,IAAI,CAAK;IAEjB,SAAgB,MAAM,gBAAuB;gBAI1B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,gBAAgB;IAG7C,IAAI,KAAK;;MAIR;IAED,IAAI,QAAQ,WAGX;IAED,IAAI,KAAK,uBAER;IAED,IAAI,SAAS;;;;;;;;QAEZ;IAEK,UAAU;IAUV,KAAK;IAgDL,IAAI;IA+BV;;OAEG;YACW,KAAK;IAuBnB;;OAEG;IACU,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;YAY/C,OAAO;CAoBtB"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../../../src/runtime/dev-server.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,EAAwB,KAAK,eAAe,EAAiB,MAAM,YAAY,CAAC;AACvF,OAAO,EAAoB,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEnE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,qBAAa,SAAS;IAclB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAb3B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA2E;IAErG,OAAO,CAAC,OAAO,CAAC,CAAc;IAC9B,OAAO,CAAC,KAAK,CAAC,CAAS;IACvB,OAAO,CAAC,4BAA4B,CAAC,CAAS;IAC9C,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,IAAI,CAAK;IAEjB,SAAgB,MAAM,gBAAuB;gBAI1B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,gBAAgB;IAG7C,IAAI,KAAK;;MAIR;IAED,IAAI,QAAQ,WAGX;IAED,IAAI,KAAK,uBAER;IAED,IAAI,SAAS;;;;;;;;QAEZ;IAEK,UAAU;IAUV,KAAK;IAgDL,IAAI;IA+BV;;OAEG;YACW,KAAK;IAuBnB;;OAEG;IACU,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC;YAY/C,OAAO;CAoBtB"}

package/dist/types/src/runtime/scheduler.d.ts

@@ -16,7 +16,7 @@ export declare class Scheduler {
     constructor(_client: Client, _manifest: FunctionManifest, _options?: SchedulerOptions);
     get mounts(): {
         readonly function: string;
-        readonly meta?: {
+        readonly context?: {
             readonly [x: string]: any;
         } | undefined;
         readonly timer?: {

package/dist/types/src/runtime/scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../../../src/runtime/scheduler.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,MAAM,EAAkB,MAAM,cAAc,CAAC;AAQ3D,OAAO,EAAoB,KAAK,gBAAgB,EAAwB,MAAM,UAAU,CAAC;AAEzF,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;AAE7D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,SAAS;IAQlB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAG6B;gBAGlC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,gBAAgB,EAC3B,QAAQ,GAAE,gBAAqB;IAGlD,IAAI,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAKT;IAEK,KAAK;IAWL,IAAI;IAMV;;OAEG;YACW,KAAK;YAoCL,OAAO;YASP,aAAa;IA4C3B;;OAEG;YACW,YAAY;IA8B1B;;OAEG;YACW,cAAc;IAkC5B;;;OAGG;YACW,gBAAgB;IA6E9B;;OAEG;YACW,mBAAmB;CAuDlC"}
+{"version":3,"file":"scheduler.d.ts","sourceRoot":"","sources":["../../../../src/runtime/scheduler.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,MAAM,EAAkB,MAAM,cAAc,CAAC;AAO3D,OAAO,EAEL,KAAK,gBAAgB,EAMtB,MAAM,UAAU,CAAC;AAElB,MAAM,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;AAE7D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,qBAAa,SAAS;IAQlB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAG6B;gBAGlC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,gBAAgB,EAC3B,QAAQ,GAAE,gBAAqB;IAGlD,IAAI,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAKT;IAEK,KAAK;IAWL,IAAI;IAMV;;OAEG;YACW,KAAK;YAoCL,OAAO;YAUP,aAAa;IAwC3B;;OAEG;YACW,YAAY;IA8B1B;;OAEG;YACW,cAAc;IAiC5B;;;OAGG;YACW,gBAAgB;IAoE9B;;OAEG;YACW,mBAAmB;CAsDlC"}

package/dist/types/src/types.d.ts

@@ -34,7 +34,7 @@ declare const SubscriptionTriggerSchema: S.struct<{
 }>;
 declare const FunctionTriggerSchema: S.struct<{
     function: S.$string;
-    meta: S.PropertySignature<"?:", {
+    context: S.PropertySignature<"?:", {
         readonly [x: string]: any;
     } | undefined, never, "?:", {
         readonly [x: string]: any;
@@ -88,11 +88,11 @@ declare const FunctionTriggerSchema: S.struct<{
         } | undefined;
     } | undefined, never>;
 }>;
-export type FunctionTrigger = S.Schema.Type<typeof FunctionTriggerSchema>;
 export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
 export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
 export type WebsocketTrigger = S.Schema.Type<typeof WebsocketTriggerSchema>;
 export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
+export type FunctionTrigger = S.Schema.Type<typeof FunctionTriggerSchema>;
 /**
  * Function definition.
  */
@@ -115,7 +115,7 @@ export declare const FunctionManifestSchema: S.struct<{
     }>>>;
     triggers: S.PropertySignature<"?:", {
         readonly function: string;
-        readonly meta?: {
+        readonly context?: {
             readonly [x: string]: any;
         } | undefined;
         readonly timer?: {
@@ -146,7 +146,7 @@ export declare const FunctionManifestSchema: S.struct<{
         } | undefined;
     }[] | undefined, never, "?:", {
         readonly function: string;
-        readonly meta?: {
+        readonly context?: {
             readonly [x: string]: any;
         } | undefined;
         readonly timer?: {

package/dist/types/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,uBAAuB,CAAC;AAE3C,QAAA,MAAM,kBAAkB;;EAEtB,CAAC;AAEH,QAAA,MAAM,oBAAoB;;;GAMzB,CAAC;AAEF,QAAA,MAAM,sBAAsB;;;;;;;EAG1B,CAAC;AAEH,QAAA,MAAM,yBAAyB;;;;;;;;;;;;;;;;;EAiB7B,CAAC;AAEH,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWzB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAE1E,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;AACpE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACxE,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAC5E,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAElF;;GAEG;AAEH,QAAA,MAAM,iBAAiB;;;;;EAQrB,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,uBAAuB,CAAC;AAE3C,QAAA,MAAM,kBAAkB;;EAEtB,CAAC;AAEH,QAAA,MAAM,oBAAoB;;;GAMzB,CAAC;AAEF,QAAA,MAAM,sBAAsB;;;;;;;EAG1B,CAAC;AAEH,QAAA,MAAM,yBAAyB;;;;;;;;;;;;;;;;;EAiB7B,CAAC;AAEH,QAAA,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAWzB,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;AACpE,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACxE,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAC5E,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAClF,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAE1E;;GAEG;AAEH,QAAA,MAAM,iBAAiB;;;;;EAOrB,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions",
-  "version": "0.5.3-main.b41a319",
+  "version": "0.5.3-main.c3feabc",
   "description": "Functions SDK and runtime.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -27,20 +27,20 @@
     "express": "^4.19.2",
     "get-port-please": "^3.1.1",
     "ws": "^8.14.2",
-    "@braneframe/types": "0.5.3-main.b41a319",
-    "@dxos/client": "0.5.3-main.b41a319",
-    "@dxos/async": "0.5.3-main.b41a319",
-    "@dxos/context": "0.5.3-main.b41a319",
-    "@dxos/invariant": "0.5.3-main.b41a319",
-    "@dxos/log": "0.5.3-main.b41a319",
-    "@dxos/util": "0.5.3-main.b41a319",
-    "@dxos/echo-schema": "0.5.3-main.b41a319",
-    "@dxos/node-std": "0.5.3-main.b41a319"
+    "@braneframe/types": "0.5.3-main.c3feabc",
+    "@dxos/async": "0.5.3-main.c3feabc",
+    "@dxos/client": "0.5.3-main.c3feabc",
+    "@dxos/context": "0.5.3-main.c3feabc",
+    "@dxos/node-std": "0.5.3-main.c3feabc",
+    "@dxos/invariant": "0.5.3-main.c3feabc",
+    "@dxos/echo-schema": "0.5.3-main.c3feabc",
+    "@dxos/log": "0.5.3-main.c3feabc",
+    "@dxos/util": "0.5.3-main.c3feabc"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/ws": "^7.4.0",
-    "@dxos/agent": "0.5.3-main.b41a319"
+    "@dxos/agent": "0.5.3-main.c3feabc"
   },
   "publishConfig": {
     "access": "public"

package/schema/functions.json

@@ -52,7 +52,7 @@
             "description": "Function ID/URI.",
             "title": "string"
           },
-          "meta": {
+          "context": {
             "type": "object",
             "required": [],
             "properties": {},
@@ -78,14 +78,9 @@
           "webhook": {
             "type": "object",
             "required": [
-              "method"
+              "port"
             ],
             "properties": {
-              "method": {
-                "type": "string",
-                "description": "a string",
-                "title": "string"
-              },
               "port": {
                 "type": "number",
                 "description": "a number",

package/src/handler.ts

@@ -8,61 +8,38 @@ import { type EchoReactiveObject } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
 import { nonNullable } from '@dxos/util';
 
-// TODO(burdon): Model after http request. Ref Lambda/OpenFaaS.
-// https://docs.aws.amazon.com/lambda/latest/dg/typescript-handler.html
+// Lambda-like function definitions.
 // https://www.serverless.com/framework/docs/providers/aws/guide/serverless.yml/#functions
 // https://www.npmjs.com/package/aws-lambda
+// https://docs.aws.amazon.com/lambda/latest/dg/typescript-handler.html
 
-/**
- * Function handler.
- */
-export type FunctionHandler<TData = {}, TMeta = {}> = (params: {
-  context: FunctionContext;
-  event: FunctionEvent<TData, TMeta>;
-  response: FunctionResponse;
-}) => Promise<FunctionResponse | void>;
+// TODO(burdon): No response?
+export interface Response {
+  status(code: number): Response;
+}
 
-/**
- * Function context.
- */
 export interface FunctionContext {
   // TODO(burdon): Limit access to individual space.
   client: Client;
   // TODO(burdon): Replace with storage service abstraction.
   dataDir?: string;
+  // Data passed to function invocation.
+  data?: any;
 }
 
-/**
- * Event payload.
- */
-export type FunctionEvent<TData = {}, TMeta = {}> = {
-  data: FunctionEventMeta<TMeta> & TData;
-};
-
-/**
- * Metadata from trigger.
- */
-export type FunctionEventMeta<TMeta = {}> = {
-  meta: TMeta;
-};
-
-/**
- * Function response.
- */
-export interface FunctionResponse {
-  status(code: number): FunctionResponse;
-}
-
-//
-// Subscription utils.
-//
+// TODO(burdon): Model after http request. Ref Lambda/OpenFaaS.
+export type FunctionHandler<T extends {}> = (params: {
+  event: T;
+  context: FunctionContext;
+  response: Response;
+}) => Promise<Response | void>;
 
-export type RawSubscriptionData = {
+export type RawSubscriptionEvent = {
   spaceKey?: string;
   objects?: string[];
 };
 
-export type SubscriptionData = {
+export type SubscriptionEvent = {
   space?: Space;
   objects?: EchoReactiveObject<any>[];
 };
@@ -77,22 +54,22 @@ export type SubscriptionData = {
  *
  * NOTE: Get space key from devtools or `dx space list --json`
  */
-export const subscriptionHandler = <TMeta>(
-  handler: FunctionHandler<SubscriptionData, TMeta>,
-): FunctionHandler<RawSubscriptionData, TMeta> => {
-  return ({ event: { data }, context, ...rest }) => {
+export const subscriptionHandler = (
+  handler: FunctionHandler<SubscriptionEvent>,
+): FunctionHandler<RawSubscriptionEvent> => {
+  return ({ event, context, ...rest }) => {
     const { client } = context;
-    const space = data.spaceKey ? client.spaces.get(PublicKey.from(data.spaceKey)) : undefined;
-    const objects = space
-      ? data.objects?.map<EchoReactiveObject<any> | undefined>((id) => space!.db.getObjectById(id)).filter(nonNullable)
-      : [];
+    const space = event.spaceKey ? client.spaces.get(PublicKey.from(event.spaceKey)) : undefined;
+    const objects =
+      space &&
+      event.objects?.map<EchoReactiveObject<any> | undefined>((id) => space!.db.getObjectById(id)).filter(nonNullable);
 
-    if (!!data.spaceKey && !space) {
-      log.warn('invalid space', { data });
+    if (!!event.spaceKey && !space) {
+      log.warn('invalid space', { event });
     } else {
       log.info('handler', { space: space?.key.truncate(), objects: objects?.length });
     }
 
-    return handler({ event: { data: { ...data, space, objects } }, context, ...rest });
+    return handler({ event: { space, objects }, context, ...rest });
   };
 };

package/src/runtime/dev-server.ts

@@ -12,7 +12,7 @@ import { type Client } from '@dxos/client';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 
-import { type FunctionContext, type FunctionEvent, type FunctionHandler, type FunctionResponse } from '../handler';
+import { type FunctionContext, type FunctionHandler, type Response } from '../handler';
 import { type FunctionDef, type FunctionManifest } from '../types';
 
 export type DevServerOptions = {
@@ -186,14 +186,14 @@ export class DevServer {
     const now = Date.now();
 
     log.info('req', { seq, path });
-    const statusCode = await this._invoke(path, { data });
+    const statusCode = await this._invoke(path, data);
 
     log.info('res', { seq, path, statusCode, duration: Date.now() - now });
     this.update.emit(statusCode);
     return statusCode;
   }
 
-  private async _invoke(path: string, event: FunctionEvent) {
+  private async _invoke(path: string, event: any) {
     const { handler } = this._handlers[path] ?? {};
     invariant(handler, `invalid path: ${path}`);
 
@@ -203,7 +203,7 @@ export class DevServer {
     };
 
     let statusCode = 200;
-    const response: FunctionResponse = {
+    const response: Response = {
       status: (code: number) => {
         statusCode = code;
         return response;

package/src/runtime/scheduler.ts

@@ -17,8 +17,15 @@ import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { ComplexMap } from '@dxos/util';
 
-import { type FunctionEventMeta } from '../handler';
-import { type FunctionDef, type FunctionManifest, type FunctionTrigger } from '../types';
+import {
+  type FunctionDef,
+  type FunctionManifest,
+  type FunctionTrigger,
+  type SubscriptionTrigger,
+  type TimerTrigger,
+  type WebhookTrigger,
+  type WebsocketTrigger,
+} from '../types';
 
 export type Callback = (data: any) => Promise<void | number>;
 
@@ -89,19 +96,19 @@ export class Scheduler {
       //
 
       if (trigger.timer) {
-        await this._createTimer(ctx, space, def, trigger);
+        await this._createTimer(ctx, space, def, trigger.timer);
       }
 
       if (trigger.webhook) {
-        await this._createWebhook(ctx, space, def, trigger);
+        await this._createWebhook(ctx, space, def, trigger.webhook);
       }
 
       if (trigger.websocket) {
-        await this._createWebsocket(ctx, space, def, trigger);
+        await this._createWebsocket(ctx, space, def, trigger.websocket);
       }
 
       if (trigger.subscription) {
-        await this._createSubscription(ctx, space, def, trigger);
+        await this._createSubscription(ctx, space, def, trigger.subscription);
       }
     }
   }
@@ -115,12 +122,10 @@ export class Scheduler {
     }
   }
 
-  private async _execFunction<TData, TMeta>(def: FunctionDef, trigger: FunctionTrigger, data: TData): Promise<number> {
-    let status = 0;
+  // TODO(burdon): Pass in Space key (common context).
+  private async _execFunction(def: FunctionDef, data: any): Promise<number> {
     try {
-      // TODO(burdon): Pass in Space key (common context)?
-      const payload = Object.assign({}, { meta: trigger.meta as TMeta } satisfies FunctionEventMeta<TMeta>, data);
-
+      let status = 0;
       const { endpoint, callback } = this._options;
       if (endpoint) {
         // TODO(burdon): Move out of scheduler (generalize as callback).
@@ -131,13 +136,13 @@ export class Scheduler {
           headers: {
             'Content-Type': 'application/json',
           },
-          body: JSON.stringify(payload),
+          body: JSON.stringify(data),
         });
 
         status = response.status;
       } else if (callback) {
         log.info('exec', { function: def.id });
-        status = (await callback(payload)) ?? 200;
+        status = (await callback(data)) ?? 200;
       }
 
       // Check errors.
@@ -147,12 +152,11 @@ export class Scheduler {
 
       // const result = await response.json();
       log.info('done', { function: def.id, status });
+      return status;
     } catch (err: any) {
       log.error('error', { function: def.id, error: err.message });
-      status = 500;
+      return 500;
     }
-
-    return status;
   }
 
   //
@@ -162,19 +166,19 @@ export class Scheduler {
   /**
    * Cron timer.
    */
-  private async _createTimer(ctx: Context, space: Space, def: FunctionDef, trigger: FunctionTrigger) {
+  private async _createTimer(ctx: Context, space: Space, def: FunctionDef, trigger: TimerTrigger) {
     log.info('timer', { space: space.key, trigger });
-    const spec = trigger.timer!;
+    const { cron } = trigger;
 
     const task = new DeferredTask(ctx, async () => {
-      await this._execFunction(def, trigger, { spaceKey: space.key });
+      await this._execFunction(def, { spaceKey: space.key });
     });
 
     let last = 0;
     let run = 0;
     // https://www.npmjs.com/package/cron#constructor
     const job = CronJob.from({
-      cronTime: spec.cron,
+      cronTime: cron,
       runOnInit: false,
       onTick: () => {
         // TODO(burdon): Check greater than 30s (use cron-parser).
@@ -195,18 +199,17 @@ export class Scheduler {
   /**
    * Webhook.
    */
-  private async _createWebhook(ctx: Context, space: Space, def: FunctionDef, trigger: FunctionTrigger) {
+  private async _createWebhook(ctx: Context, space: Space, def: FunctionDef, trigger: WebhookTrigger) {
     log.info('webhook', { space: space.key, trigger });
-    const spec = trigger.webhook!;
 
     // TODO(burdon): Enable POST hook with payload.
     const server = http.createServer(async (req, res) => {
-      if (req.method !== spec.method) {
+      if (req.method !== trigger.method) {
         res.statusCode = 405;
         return res.end();
       }
 
-      res.statusCode = await this._execFunction(def, trigger, { spaceKey: space.key });
+      res.statusCode = await this._execFunction(def, { spaceKey: space.key });
       res.end();
     });
 
@@ -221,7 +224,7 @@ export class Scheduler {
     // TODO(burdon): Update trigger object with actual port.
     server.listen(port, () => {
       log.info('started webhook', { port });
-      spec.port = port;
+      trigger.port = port;
     });
 
     ctx.onDispose(() => {
@@ -237,7 +240,7 @@ export class Scheduler {
     ctx: Context,
     space: Space,
     def: FunctionDef,
-    trigger: FunctionTrigger,
+    trigger: WebsocketTrigger,
     options: {
       retryDelay: number;
       maxAttempts: number;
@@ -247,8 +250,7 @@ export class Scheduler {
     },
   ) {
     log.info('websocket', { space: space.key, trigger });
-    const spec = trigger.websocket!;
-    const { url, init } = spec;
+    const { url } = trigger;
 
     let ws: WebSocket;
     for (let attempt = 1; attempt <= options.maxAttempts; attempt++) {
@@ -258,24 +260,16 @@ export class Scheduler {
       Object.assign(ws, {
         onopen: () => {
           log.info('opened', { url });
-          if (spec.init) {
-            ws.send(new TextEncoder().encode(JSON.stringify(init)));
+          if (trigger.init) {
+            ws.send(new TextEncoder().encode(JSON.stringify(trigger.init)));
           }
 
           open.wake(true);
         },
 
+        // TODO(burdon): Config retry if server closes?
         onclose: (event) => {
           log.info('closed', { url, code: event.code });
-          // Reconnect if server closes (e.g., CF restart).
-          // https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent/code
-          if (event.code === 1006) {
-            setTimeout(async () => {
-              log.info(`reconnecting in ${options.retryDelay}s...`, { url });
-              await this._createWebsocket(ctx, space, def, trigger, options);
-            }, options.retryDelay * 1_000);
-          }
-
           open.wake(false);
         },
 
@@ -286,7 +280,7 @@ export class Scheduler {
         onmessage: async (event) => {
           try {
             const data = JSON.parse(new TextDecoder().decode(event.data as Uint8Array));
-            await this._execFunction(def, trigger, { spaceKey: space.key, data });
+            await this._execFunction(def, { spaceKey: space.key, data });
           } catch (err) {
             log.catch(err, { url });
           }
@@ -313,17 +307,15 @@ export class Scheduler {
   /**
    * ECHO subscription.
    */
-  private async _createSubscription(ctx: Context, space: Space, def: FunctionDef, trigger: FunctionTrigger) {
+  private async _createSubscription(ctx: Context, space: Space, def: FunctionDef, trigger: SubscriptionTrigger) {
     log.info('subscription', { space: space.key, trigger });
-    const spec = trigger.subscription!;
-
     const objectIds = new Set<string>();
     const task = new DeferredTask(ctx, async () => {
-      await this._execFunction(def, trigger, { spaceKey: space.key, objects: Array.from(objectIds) });
+      await this._execFunction(def, { spaceKey: space.key, objects: Array.from(objectIds) });
     });
 
-    // TODO(burdon): Don't fire initially?
-    // TODO(burdon): Create queue. Only allow one invocation per trigger at a time?
+    // TODO(burdon): Don't fire initially.
+    // TODO(burdon): Subscription is called THREE times.
     const subscriptions: (() => void)[] = [];
     const subscription = createSubscription(({ added, updated }) => {
       log.info('updated', { added: added.length, updated: updated.length });
@@ -339,8 +331,9 @@ export class Scheduler {
 
     subscriptions.push(() => subscription.unsubscribe());
 
+    // TODO(burdon): Create queue. Only allow one invocation per trigger at a time?
     // TODO(burdon): Disable trigger if keeps failing.
-    const { filter, options: { deep, delay } = {} } = spec;
+    const { filter, options: { deep, delay } = {} } = trigger;
     const update = ({ objects }: Query) => {
       subscription.update(objects);
 

package/src/types.ts

@@ -44,7 +44,7 @@ const FunctionTriggerSchema = S.struct({
   function: S.string.pipe(S.description('Function ID/URI.')),
 
   // Context passed to function.
-  meta: S.optional(S.record(S.string, S.any)),
+  context: S.optional(S.record(S.string, S.any)),
 
   // Triggers.
   timer: S.optional(TimerTriggerSchema),
@@ -53,12 +53,11 @@ const FunctionTriggerSchema = S.struct({
   subscription: S.optional(SubscriptionTriggerSchema),
 });
 
-export type FunctionTrigger = S.Schema.Type<typeof FunctionTriggerSchema>;
-
 export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
 export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
 export type WebsocketTrigger = S.Schema.Type<typeof WebsocketTriggerSchema>;
 export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
+export type FunctionTrigger = S.Schema.Type<typeof FunctionTriggerSchema>;
 
 /**
  * Function definition.
@@ -68,7 +67,6 @@ const FunctionDefSchema = S.struct({
   id: S.string,
   // name: S.string,
   description: S.optional(S.string),
-  // TODO(burdon): Rename route?
   path: S.string,
   // TODO(burdon): NPM/GitHub/Docker/CF URL?
   handler: S.string,