@dxos/functions 0.5.5-next.7ae47fc → 0.5.5-next.8e7c8c8

package/dist/lib/node/types.cjs

@@ -18,13 +18,13 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var types_exports = {};
 __export(types_exports, {
-  FUNCTION_SCHEMA: () => import_chunk_3UYUR5N5.FUNCTION_SCHEMA,
-  FunctionDef: () => import_chunk_3UYUR5N5.FunctionDef,
-  FunctionManifestSchema: () => import_chunk_3UYUR5N5.FunctionManifestSchema,
-  FunctionTrigger: () => import_chunk_3UYUR5N5.FunctionTrigger
+  FUNCTION_SCHEMA: () => import_chunk_BLLSDTKZ.FUNCTION_SCHEMA,
+  FunctionDef: () => import_chunk_BLLSDTKZ.FunctionDef,
+  FunctionManifestSchema: () => import_chunk_BLLSDTKZ.FunctionManifestSchema,
+  FunctionTrigger: () => import_chunk_BLLSDTKZ.FunctionTrigger
 });
 module.exports = __toCommonJS(types_exports);
-var import_chunk_3UYUR5N5 = require("./chunk-3UYUR5N5.cjs");
+var import_chunk_BLLSDTKZ = require("./chunk-BLLSDTKZ.cjs");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   FUNCTION_SCHEMA,

package/dist/lib/node/types.cjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["types.cjs"],
-  "sourcesContent": ["import {\n  FUNCTION_SCHEMA,\n  FunctionDef,\n  FunctionManifestSchema,\n  FunctionTrigger\n} from \"./chunk-3UYUR5N5.cjs\";\nexport {\n  FUNCTION_SCHEMA,\n  FunctionDef,\n  FunctionManifestSchema,\n  FunctionTrigger\n};\n//# sourceMappingURL=types.cjs.map\n"],
+  "sourcesContent": ["import {\n  FUNCTION_SCHEMA,\n  FunctionDef,\n  FunctionManifestSchema,\n  FunctionTrigger\n} from \"./chunk-BLLSDTKZ.cjs\";\nexport {\n  FUNCTION_SCHEMA,\n  FunctionDef,\n  FunctionManifestSchema,\n  FunctionTrigger\n};\n//# sourceMappingURL=types.cjs.map\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAKO;",
   "names": []
 }

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

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../src/testing/setup.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAKxD,OAAO,EAAa,KAAK,gBAAgB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAMzE,MAAM,MAAM,0BAA0B,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAAC;AAIrG,eAAO,MAAM,wBAAwB,gBAAuB,WAAW,UAAS,MAAM,WAAe,MAAM,sBAW1G,CAAC;AAEF,eAAO,MAAM,qBAAqB,gBACnB,WAAW,qBACL,0BAA0B,KAC5C,QAAQ,MAAM,CAahB,CAAC;AAEF,eAAO,MAAM,kBAAkB,gBAChB,WAAW,qBACL,0BAA0B,YACnC,gBAAgB;;;mCASa,KAAK;EAI7C,CAAC"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../../src/testing/setup.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAKxD,OAAO,EAAa,KAAK,gBAAgB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIzE,MAAM,MAAM,0BAA0B,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC,CAAC;AAIrG,eAAO,MAAM,wBAAwB,gBAAuB,WAAW,UAAS,MAAM,WAAe,MAAM,sBAY1G,CAAC;AAEF,eAAO,MAAM,qBAAqB,gBACnB,WAAW,qBACL,0BAA0B,KAC5C,QAAQ,MAAM,CAchB,CAAC;AAEF,eAAO,MAAM,kBAAkB,gBAChB,WAAW,qBACL,0BAA0B,YACnC,gBAAgB;;;mCASa,KAAK;EAI7C,CAAC"}

package/dist/types/src/trigger/type/websocket-trigger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-trigger.d.ts","sourceRoot":"","sources":["../../../../../src/trigger/type/websocket-trigger.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEhF,UAAU,uBAAuB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,cAAc,CAAC,gBAAgB,EAAE,uBAAuB,CAoE5F,CAAC"}
+{"version":3,"file":"websocket-trigger.d.ts","sourceRoot":"","sources":["../../../../../src/trigger/type/websocket-trigger.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAEhF,UAAU,uBAAuB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,eAAO,MAAM,sBAAsB,EAAE,cAAc,CAAC,gBAAgB,EAAE,uBAAuB,CAwE5F,CAAC"}

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

@@ -6,44 +6,33 @@ import { S } from '@dxos/echo-schema';
  * https://www.typescriptlang.org/docs/handbook/2/narrowing.html#discriminated-unions
  */
 export type FunctionTriggerType = 'subscription' | 'timer' | 'webhook' | 'websocket';
-declare const SubscriptionTriggerSchema: S.mutable<S.struct<{
-    type: S.literal<["subscription"]>;
-    filter: S.array<S.struct<{
-        type: S.$string;
-        props: S.PropertySignature<"?:", {
-            readonly [x: string]: any;
-        } | undefined, never, "?:", {
-            readonly [x: string]: any;
-        } | undefined, never>;
+declare const SubscriptionTriggerSchema: S.mutable<S.Struct<{
+    type: S.Literal<["subscription"]>;
+    filter: S.Array$<S.Struct<{
+        type: typeof S.String;
+        props: S.optional<S.Record$<typeof S.String, typeof S.Any>>;
+    }>>;
+    options: S.optional<S.Struct<{
+        deep: S.optional<typeof S.Boolean>;
+        delay: S.optional<typeof S.Number>;
     }>>;
-    options: S.PropertySignature<"?:", {
-        readonly deep?: boolean | undefined;
-        readonly delay?: number | undefined;
-    } | undefined, never, "?:", {
-        readonly deep?: boolean | undefined;
-        readonly delay?: number | undefined;
-    } | undefined, never>;
 }>>;
 export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
-declare const TimerTriggerSchema: S.mutable<S.struct<{
-    type: S.literal<["timer"]>;
-    cron: S.$string;
+declare const TimerTriggerSchema: S.mutable<S.Struct<{
+    type: S.Literal<["timer"]>;
+    cron: typeof S.String;
 }>>;
 export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
-declare const WebhookTriggerSchema: S.mutable<S.struct<{
-    type: S.literal<["webhook"]>;
-    method: S.$string;
-    port: S.PropertySignature<"?:", number | undefined, never, "?:", number | undefined, never>;
+declare const WebhookTriggerSchema: S.mutable<S.Struct<{
+    type: S.Literal<["webhook"]>;
+    method: typeof S.String;
+    port: S.optional<typeof S.Number>;
 }>>;
 export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
-declare const WebsocketTriggerSchema: S.mutable<S.struct<{
-    type: S.literal<["websocket"]>;
-    url: S.$string;
-    init: S.PropertySignature<"?:", {
-        readonly [x: string]: any;
-    } | undefined, never, "?:", {
-        readonly [x: string]: any;
-    } | undefined, never>;
+declare const WebsocketTriggerSchema: S.mutable<S.Struct<{
+    type: S.Literal<["websocket"]>;
+    url: typeof S.String;
+    init: S.optional<S.Record$<typeof S.String, typeof S.Any>>;
 }>>;
 export type WebsocketTrigger = S.Schema.Type<typeof WebsocketTriggerSchema>;
 export type TriggerSpec = TimerTrigger | WebhookTrigger | WebsocketTrigger | SubscriptionTrigger;
@@ -103,8 +92,8 @@ export declare class FunctionTrigger extends FunctionTrigger_base {
 /**
  * Function manifest file.
  */
-export declare const FunctionManifestSchema: S.struct<{
-    functions: S.PropertySignature<"?:", ({
+export declare const FunctionManifestSchema: S.Struct<{
+    functions: S.optional<S.mutable<S.Array$<S.Schema<{
         handler: string;
         uri: string;
         description?: string | undefined;
@@ -116,7 +105,7 @@ export declare const FunctionManifestSchema: S.struct<{
                 readonly source: string;
             }[];
         } | undefined;
-    })[] | undefined, never, "?:", ({
+    }, {
         handler: string;
         uri: string;
         description?: string | undefined;
@@ -128,8 +117,8 @@ export declare const FunctionManifestSchema: S.struct<{
                 readonly source: string;
             }[];
         } | undefined;
-    })[] | undefined, never>;
-    triggers: S.PropertySignature<"?:", ({
+    }, never>>>>;
+    triggers: S.optional<S.mutable<S.Array$<S.Schema<{
         function: string;
         enabled?: boolean | undefined;
         meta?: {
@@ -168,7 +157,7 @@ export declare const FunctionManifestSchema: S.struct<{
                 readonly source: string;
             }[];
         } | undefined;
-    })[] | undefined, never, "?:", ({
+    }, {
         function: string;
         enabled?: boolean | undefined;
         meta?: {
@@ -207,7 +196,7 @@ export declare const FunctionManifestSchema: S.struct<{
                 readonly source: string;
             }[];
         } | undefined;
-    })[] | undefined, never>;
+    }, never>>>>;
 }>;
 export type FunctionManifest = S.Schema.Type<typeof FunctionManifestSchema>;
 export declare const FUNCTION_SCHEMA: (typeof FunctionDef | typeof FunctionTrigger)[];

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,EAAa,CAAC,EAAe,MAAM,mBAAmB,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC;AAErF,QAAA,MAAM,yBAAyB;;;;;;;;;;;;;;;;;GAmB9B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAElF,QAAA,MAAM,kBAAkB;;;GAKvB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE,QAAA,MAAM,oBAAoB;;;;GAOzB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAExE,QAAA,MAAM,sBAAsB;;;;;;;;GAM3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAS5E,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG,cAAc,GAAG,gBAAgB,GAAG,mBAAmB,CAAC;;;;;;;;;AAEjG;;GAEG;AACH,qBAAa,WAAY,SAAQ,gBAQ/B;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;GAEG;AACH,qBAAa,eAAgB,SAAQ,oBASnC;CAAG;AAEL;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAG5E,eAAO,MAAM,eAAe,iDAAiC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAa,CAAC,EAAe,MAAM,mBAAmB,CAAC;AAE9D;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,OAAO,GAAG,SAAS,GAAG,WAAW,CAAC;AAErF,QAAA,MAAM,yBAAyB;;;;;;;;;;GAmB9B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAElF,QAAA,MAAM,kBAAkB;;;GAKvB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE,QAAA,MAAM,oBAAoB;;;;GAOzB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAExE,QAAA,MAAM,sBAAsB;;;;GAM3B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAS5E,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG,cAAc,GAAG,gBAAgB,GAAG,mBAAmB,CAAC;;;;;;;;;AAEjG;;GAEG;AACH,qBAAa,WAAY,SAAQ,gBAQ/B;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;GAEG;AACH,qBAAa,eAAgB,SAAQ,oBASnC;CAAG;AAEL;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAGjC,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAG5E,eAAO,MAAM,eAAe,iDAAiC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions",
-  "version": "0.5.5-next.7ae47fc",
+  "version": "0.5.5-next.8e7c8c8",
   "description": "Functions API and runtime.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -45,27 +45,27 @@
   "dependencies": {
     "@preact/signals-core": "^1.6.0",
     "cron": "^3.1.6",
-    "effect": "^2.4.19",
+    "effect": "^3.2.7",
     "express": "^4.19.2",
     "get-port-please": "^3.1.1",
     "ws": "^8.14.2",
-    "@braneframe/types": "0.5.5-next.7ae47fc",
-    "@dxos/async": "0.5.5-next.7ae47fc",
-    "@dxos/client": "0.5.5-next.7ae47fc",
-    "@dxos/context": "0.5.5-next.7ae47fc",
-    "@dxos/echo-db": "0.5.5-next.7ae47fc",
-    "@dxos/echo-schema": "0.5.5-next.7ae47fc",
-    "@dxos/invariant": "0.5.5-next.7ae47fc",
-    "@dxos/keys": "0.5.5-next.7ae47fc",
-    "@dxos/log": "0.5.5-next.7ae47fc",
-    "@dxos/node-std": "0.5.5-next.7ae47fc",
-    "@dxos/util": "0.5.5-next.7ae47fc",
-    "@dxos/protocols": "0.5.5-next.7ae47fc"
+    "@braneframe/types": "0.5.5-next.8e7c8c8",
+    "@dxos/async": "0.5.5-next.8e7c8c8",
+    "@dxos/context": "0.5.5-next.8e7c8c8",
+    "@dxos/echo-db": "0.5.5-next.8e7c8c8",
+    "@dxos/echo-schema": "0.5.5-next.8e7c8c8",
+    "@dxos/client": "0.5.5-next.8e7c8c8",
+    "@dxos/invariant": "0.5.5-next.8e7c8c8",
+    "@dxos/log": "0.5.5-next.8e7c8c8",
+    "@dxos/node-std": "0.5.5-next.8e7c8c8",
+    "@dxos/keys": "0.5.5-next.8e7c8c8",
+    "@dxos/util": "0.5.5-next.8e7c8c8",
+    "@dxos/protocols": "0.5.5-next.8e7c8c8"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/ws": "^7.4.0",
-    "@dxos/agent": "0.5.5-next.7ae47fc"
+    "@dxos/agent": "0.5.5-next.8e7c8c8"
   },
   "publishConfig": {
     "access": "public"

package/src/runtime/dev-server.test.ts

@@ -3,6 +3,7 @@
 //
 
 import { expect } from 'chai';
+import { getRandomPort } from 'get-port-please';
 import path from 'path';
 
 import { sleep, waitForCondition } from '@dxos/async';
@@ -16,7 +17,6 @@ import { createFunctionRuntime, testFunctionManifest } from '../testing';
 import { initFunctionsPlugin } from '../testing/plugin-init';
 
 describe('dev server', () => {
-  let port = 7201;
   let client: Client;
   let testBuilder: TestBuilder;
   before(async () => {
@@ -67,7 +67,7 @@ describe('dev server', () => {
     const registry = new FunctionRegistry(client);
     const server = new DevServer(client, registry, {
       baseDir: path.join(__dirname, '../testing'),
-      port: port++,
+      port: await getRandomPort('127.0.0.1'),
     });
     const space = await client.spaces.create();
     // TODO(burdon): Doesn't shut down cleanly.

package/src/runtime/scheduler.test.ts

@@ -3,6 +3,7 @@
 //
 
 import { expect } from 'chai';
+import { getRandomPort } from 'get-port-please';
 import WebSocket from 'ws';
 
 import { Trigger } from '@dxos/async';
@@ -108,6 +109,7 @@ describe('scheduler', () => {
   });
 
   test('websocket', async () => {
+    const port = await getRandomPort('127.0.0.1');
     const manifest: FunctionManifest = {
       functions: [
         {
@@ -123,7 +125,7 @@ describe('scheduler', () => {
           spec: {
             type: 'websocket',
             // url: 'https://hub.dxos.network/api/mailbox/test',
-            url: 'http://localhost:8081',
+            url: `http://localhost:${port}`,
             init: {
               type: 'sync',
             },
@@ -141,7 +143,7 @@ describe('scheduler', () => {
 
     // Test server.
     setTimeout(() => {
-      const wss = new WebSocket.Server({ port: 8081 });
+      const wss = new WebSocket.Server({ port });
       wss.on('connection', (ws: WebSocket) => {
         ws.on('message', (data) => {
           const info = JSON.parse(new TextDecoder().decode(data as ArrayBuffer));

package/src/testing/setup.ts

@@ -2,6 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
+import { getRandomPort } from 'get-port-please';
 import path from 'node:path';
 
 import { waitForCondition } from '@dxos/async';
@@ -16,8 +17,6 @@ import { DevServer, type DevServerOptions, Scheduler } from '../runtime';
 import { TriggerRegistry } from '../trigger';
 import { FunctionDef, FunctionTrigger } from '../types';
 
-let functionsPort = 8081;
-
 export type FunctionsPluginInitializer = (client: Client) => Promise<{ close: () => Promise<void> }>;
 
 // TODO(burdon): Extend/wrap TestBuilder.
@@ -29,6 +28,7 @@ export const createInitializedClients = async (testBuilder: TestBuilder, count:
     clients.map(async (client, index) => {
       await client.initialize();
       await client.halo.createIdentity({ displayName: `Peer ${index}` });
+      await client.spaces.isReady;
       client.addSchema(FunctionDef, FunctionTrigger, TestType);
       return client;
     }),
@@ -39,10 +39,11 @@ export const createFunctionRuntime = async (
   testBuilder: TestBuilder,
   pluginInitializer: FunctionsPluginInitializer,
 ): Promise<Client> => {
+  const functionsPort = await getRandomPort('127.0.0.1');
   const config = new Config({
     runtime: {
       agent: {
-        plugins: [{ id: 'dxos.org/agent/plugin/functions', config: { port: functionsPort++ } }],
+        plugins: [{ id: 'dxos.org/agent/plugin/functions', config: { port: functionsPort } }],
       },
     },
   });
@@ -92,6 +93,7 @@ const startDevServer = async (
 ) => {
   const server = new DevServer(client, functionRegistry, {
     baseDir: path.join(__dirname, '../testing'),
+    port: await getRandomPort('127.0.0.1'),
     ...options,
   });
   await server.start();

package/src/testing/types.ts

@@ -5,5 +5,5 @@
 import { S, TypedObject } from '@dxos/echo-schema';
 
 export class TestType extends TypedObject({ typename: 'example.com/type/Test', version: '0.1.0' })({
-  title: S.string,
+  title: S.String,
 }) {}

package/src/trigger/type/websocket-trigger.ts

@@ -30,6 +30,7 @@ export const createWebsocketTrigger: TriggerFactory<WebsocketTrigger, WebsocketT
 ) => {
   const { url, init } = spec;
 
+  let wasOpen = false;
   let ws: WebSocket;
   for (let attempt = 1; attempt <= options.maxAttempts; attempt++) {
     const open = new Trigger<boolean>();
@@ -49,18 +50,18 @@ export const createWebsocketTrigger: TriggerFactory<WebsocketTrigger, WebsocketT
         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) {
+        if (event.code === 1006 && wasOpen && !ctx.disposed) {
           setTimeout(async () => {
             log.info(`reconnecting in ${options.retryDelay}s...`, { url });
             await createWebsocketTrigger(ctx, space, spec, callback, options);
           }, options.retryDelay * 1_000);
         }
-
         open.wake(false);
       },
 
       onerror: (event) => {
         log.catch(event.error, { url });
+        open.wake(false);
       },
 
       onmessage: async (event) => {
@@ -75,14 +76,17 @@ export const createWebsocketTrigger: TriggerFactory<WebsocketTrigger, WebsocketT
     } satisfies Partial<WebSocket>);
 
     const isOpen = await open.wait();
+    if (ctx.disposed) {
+      break;
+    }
     if (isOpen) {
+      wasOpen = true;
       break;
-    } else {
-      const wait = Math.pow(attempt, 2) * options.retryDelay;
-      if (attempt < options.maxAttempts) {
-        log.warn(`failed to connect; trying again in ${wait}s`, { attempt });
-        await sleep(wait * 1_000);
-      }
+    }
+    const wait = Math.pow(attempt, 2) * options.retryDelay;
+    if (attempt < options.maxAttempts) {
+      log.warn(`failed to connect; trying again in ${wait}s`, { attempt });
+      await sleep(wait * 1_000);
     }
   }
 

package/src/types.ts

@@ -13,21 +13,21 @@ import { RawObject, S, TypedObject } from '@dxos/echo-schema';
 export type FunctionTriggerType = 'subscription' | 'timer' | 'webhook' | 'websocket';
 
 const SubscriptionTriggerSchema = S.mutable(
-  S.struct({
-    type: S.literal('subscription'),
+  S.Struct({
+    type: S.Literal('subscription'),
     // TODO(burdon): Define query DSL (from ECHO).
-    filter: S.array(
-      S.struct({
-        type: S.string,
-        props: S.optional(S.record(S.string, S.any)),
+    filter: S.Array(
+      S.Struct({
+        type: S.String,
+        props: S.optional(S.Record(S.String, S.Any)),
       }),
     ),
     options: S.optional(
-      S.struct({
+      S.Struct({
         // Watch changes to object (not just creation).
-        deep: S.optional(S.boolean),
+        deep: S.optional(S.Boolean),
         // Debounce changes (delay in ms).
-        delay: S.optional(S.number),
+        delay: S.optional(S.Number),
       }),
     ),
   }),
@@ -36,36 +36,36 @@ const SubscriptionTriggerSchema = S.mutable(
 export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
 
 const TimerTriggerSchema = S.mutable(
-  S.struct({
-    type: S.literal('timer'),
-    cron: S.string,
+  S.Struct({
+    type: S.Literal('timer'),
+    cron: S.String,
   }),
 );
 
 export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
 
 const WebhookTriggerSchema = S.mutable(
-  S.struct({
-    type: S.literal('webhook'),
-    method: S.string,
+  S.Struct({
+    type: S.Literal('webhook'),
+    method: S.String,
     // Assigned port.
-    port: S.optional(S.number),
+    port: S.optional(S.Number),
   }),
 );
 
 export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
 
 const WebsocketTriggerSchema = S.mutable(
-  S.struct({
-    type: S.literal('websocket'),
-    url: S.string,
-    init: S.optional(S.record(S.string, S.any)),
+  S.Struct({
+    type: S.Literal('websocket'),
+    url: S.String,
+    init: S.optional(S.Record(S.String, S.Any)),
   }),
 );
 
 export type WebsocketTrigger = S.Schema.Type<typeof WebsocketTriggerSchema>;
 
-const TriggerSpecSchema = S.union(
+const TriggerSpecSchema = S.Union(
   TimerTriggerSchema,
   WebhookTriggerSchema,
   WebsocketTriggerSchema,
@@ -81,10 +81,10 @@ export class FunctionDef extends TypedObject({
   typename: 'dxos.org/type/FunctionDef',
   version: '0.1.0',
 })({
-  uri: S.string,
-  description: S.optional(S.string),
-  route: S.string,
-  handler: S.string,
+  uri: S.String,
+  description: S.optional(S.String),
+  route: S.String,
+  handler: S.String,
 }) {}
 
 /**
@@ -94,19 +94,19 @@ export class FunctionTrigger extends TypedObject({
   typename: 'dxos.org/type/FunctionTrigger',
   version: '0.1.0',
 })({
-  enabled: S.optional(S.boolean),
-  function: S.string.pipe(S.description('Function URI.')),
+  enabled: S.optional(S.Boolean),
+  function: S.String.pipe(S.description('Function URI.')),
   // The `meta` property is merged into the event data passed to the function.
-  meta: S.optional(S.mutable(S.any)),
+  meta: S.optional(S.mutable(S.Any)),
   spec: TriggerSpecSchema,
 }) {}
 
 /**
  * Function manifest file.
  */
-export const FunctionManifestSchema = S.struct({
-  functions: S.optional(S.mutable(S.array(RawObject(FunctionDef)))),
-  triggers: S.optional(S.mutable(S.array(RawObject(FunctionTrigger)))),
+export const FunctionManifestSchema = S.Struct({
+  functions: S.optional(S.mutable(S.Array(RawObject(FunctionDef)))),
+  triggers: S.optional(S.mutable(S.Array(RawObject(FunctionTrigger)))),
 });
 
 export type FunctionManifest = S.Schema.Type<typeof FunctionManifestSchema>;