@dxos/functions 0.5.3-main.43e79dd → 0.5.3-main.495a683

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

@@ -0,0 +1,91 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import WebSocket from 'ws';
+
+import { sleep, Trigger } from '@dxos/async';
+import { type Context } from '@dxos/context';
+import { log } from '@dxos/log';
+
+import { type WebsocketTrigger } from '../../types';
+import { type TriggerCallback, type TriggerContext, type TriggerFactory } from '../trigger-registry';
+
+interface WebsocketTriggerOptions {
+  retryDelay: number;
+  maxAttempts: number;
+}
+
+/**
+ * Websocket.
+ * NOTE: The port must be unique, so the same hook cannot be used for multiple spaces.
+ */
+export const createWebsocketTrigger: TriggerFactory<WebsocketTrigger, WebsocketTriggerOptions> = async (
+  ctx: Context,
+  triggerCtx: TriggerContext,
+  spec: WebsocketTrigger,
+  callback: TriggerCallback,
+  options: WebsocketTriggerOptions = { retryDelay: 2, maxAttempts: 5 },
+) => {
+  const { url, init } = spec;
+
+  let ws: WebSocket;
+  for (let attempt = 1; attempt <= options.maxAttempts; attempt++) {
+    const open = new Trigger<boolean>();
+
+    ws = new WebSocket(url);
+    Object.assign(ws, {
+      onopen: () => {
+        log.info('opened', { url });
+        if (spec.init) {
+          ws.send(new TextEncoder().encode(JSON.stringify(init)));
+        }
+
+        open.wake(true);
+      },
+
+      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 createWebsocketTrigger(ctx, triggerCtx, spec, callback, options);
+          }, options.retryDelay * 1_000);
+        }
+
+        open.wake(false);
+      },
+
+      onerror: (event) => {
+        log.catch(event.error, { url });
+      },
+
+      onmessage: async (event) => {
+        try {
+          log.info('message');
+          const data = JSON.parse(new TextDecoder().decode(event.data as Uint8Array));
+          await callback({ data });
+        } catch (err) {
+          log.catch(err, { url });
+        }
+      },
+    } satisfies Partial<WebSocket>);
+
+    const isOpen = await open.wait();
+    if (isOpen) {
+      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);
+      }
+    }
+  }
+
+  ctx.onDispose(() => {
+    ws?.close();
+  });
+};

package/src/types.ts

@@ -0,0 +1,103 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { RawObject, S, TypedObject } from '@dxos/echo-schema';
+
+/**
+ * Type discriminator for TriggerSpec.
+ * Every spec has a type field of type FunctionTriggerType that we can use to understand which
+ * type we're working with.
+ * https://www.typescriptlang.org/docs/handbook/2/narrowing.html#discriminated-unions
+ */
+export type FunctionTriggerType = 'subscription' | 'timer' | 'webhook' | 'websocket';
+
+const SubscriptionTriggerSchema = 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)),
+    }),
+  ),
+  options: S.optional(
+    S.struct({
+      // Watch changes to object (not just creation).
+      deep: S.optional(S.boolean),
+      // Debounce changes (delay in ms).
+      delay: S.optional(S.number),
+    }),
+  ),
+});
+
+export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
+
+const TimerTriggerSchema = 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,
+    // Assigned port.
+    port: S.optional(S.number),
+  }),
+);
+
+export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
+
+const WebsocketTriggerSchema = 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(
+  TimerTriggerSchema,
+  WebhookTriggerSchema,
+  WebsocketTriggerSchema,
+  SubscriptionTriggerSchema,
+);
+
+export type TriggerSpec = TimerTrigger | WebhookTrigger | WebsocketTrigger | SubscriptionTrigger;
+
+/**
+ * Function definition.
+ */
+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,
+  // TODO(burdon): NPM/GitHub/Docker/CF URL?
+  handler: S.string,
+}) {}
+
+export class FunctionTrigger extends TypedObject({
+  typename: 'dxos.org/type/FunctionTrigger',
+  version: '0.1.0',
+})({
+  function: S.string.pipe(S.description('Function URI.')),
+  // Context is merged into the event data passed to the function.
+  meta: S.optional(S.object),
+  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 type FunctionManifest = S.Schema.Type<typeof FunctionManifestSchema>;

package/src/util.test.ts

@@ -0,0 +1,43 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { expect } from 'chai';
+
+import { describe, test } from '@dxos/test';
+
+import { diff, intersection } from './util';
+
+describe('diff', () => {
+  test('returns the difference between two sets', () => {
+    {
+      const { added, updated, removed } = diff<number>([], [], (a, b) => a === b);
+      expect(added).to.deep.eq([]);
+      expect(updated).to.deep.eq([]);
+      expect(removed).to.deep.eq([]);
+    }
+    {
+      const previous = [1, 2, 3];
+      const next = [2, 3, 4];
+      const { added, updated, removed } = diff(previous, next, (a, b) => a === b);
+      expect(added).to.deep.eq([4]);
+      expect(updated).to.deep.eq([2, 3]);
+      expect(removed).to.deep.eq([1]);
+    }
+    {
+      const previous = [{ x: 1 }, { x: 2 }, { x: 3 }];
+      const next = [{ x: 2 }, { x: 3 }, { x: 4 }];
+      const { added, updated, removed } = diff(previous, next, (a, b) => a.x === b.x);
+      expect(added).to.deep.eq([{ x: 4 }]);
+      expect(updated).to.deep.eq([{ x: 2 }, { x: 3 }]);
+      expect(removed).to.deep.eq([{ x: 1 }]);
+    }
+  });
+
+  test('intersection', () => {
+    expect(intersection([1, 2, 3], [2, 3, 4], (a, b) => a === b)).to.deep.eq([2, 3]);
+    expect(
+      intersection([{ x: 1 }, { x: 2 }, { x: 3 }], [{ x: 2 }, { x: 3 }, { x: 4 }], (a, b) => a.x === b.x),
+    ).to.deep.eq([{ x: 2 }, { x: 3 }]);
+  });
+});

package/src/util.ts

@@ -0,0 +1,48 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export type Comparator<A, B = A> = (a: A, b: B) => boolean;
+
+export type DiffResult<A, B = A> = {
+  added: B[];
+  updated: A[];
+  removed: A[];
+};
+
+/**
+ *
+ * @param previous
+ * @param next
+ * @param comparator
+ */
+// TODO(burdon): Factor out.
+export const diff = <A, B = A>(
+  previous: readonly A[],
+  next: readonly B[],
+  comparator: Comparator<A, B>,
+): DiffResult<A, B> => {
+  const remaining = [...previous];
+  const result: DiffResult<A, B> = {
+    added: [],
+    updated: [],
+    removed: remaining,
+  };
+
+  // TODO(burdon): Mark and sweep.
+  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;
+};
+
+// TODO(burdon): Factor out.
+export const intersection = <A, B = A>(a: A[], b: B[], comparator: Comparator<A, B>): A[] =>
+  a.filter((a) => b.find((b) => comparator(a, b)) !== undefined);

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

@@ -1,26 +0,0 @@
-export type FunctionDef = {
-    id: string;
-    name: string;
-    handler: string;
-    description?: string;
-};
-export type TriggerSubscription = {
-    type: string;
-    spaceKey: string;
-    props?: Record<string, any>;
-    deep?: boolean;
-    delay?: number;
-};
-export type FunctionTrigger = {
-    function: string;
-    schedule?: string;
-    subscriptions?: TriggerSubscription[];
-};
-/**
- * Function manifest file.
- */
-export type FunctionManifest = {
-    functions: FunctionDef[];
-    triggers: FunctionTrigger[];
-};
-//# sourceMappingURL=manifest.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../src/manifest.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,WAAW,GAAG;IAExB,EAAE,EAAE,MAAM,CAAC;IAEX,IAAI,EAAE,MAAM,CAAC;IAEb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAGF,MAAM,MAAM,mBAAmB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAKF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,mBAAmB,EAAE,CAAC;CACvC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B,CAAC"}

package/src/manifest.ts

@@ -1,42 +0,0 @@
-//
-// Copyright 2023 DXOS.org
-//
-
-// Lambda-like function definitions.
-// See: https://www.serverless.com/framework/docs/providers/aws/guide/serverless.yml/#functions
-
-export type FunctionDef = {
-  // FQ function name.
-  id: string;
-  // URL path.
-  name: string;
-  // File path of handler.
-  handler: string;
-  description?: string;
-};
-
-// TODO(burdon): Query DSL.
-export type TriggerSubscription = {
-  type: string;
-  spaceKey: string;
-  props?: Record<string, any>;
-  deep?: boolean; // Watch changes to object (not just creation).
-  delay?: number;
-};
-
-// TODO(burdon): Generalize binding.
-// https://www.npmjs.com/package/aws-lambda
-// https://docs.aws.amazon.com/lambda/latest/dg/typescript-handler.html
-export type FunctionTrigger = {
-  function: string;
-  schedule?: string;
-  subscriptions?: TriggerSubscription[];
-};
-
-/**
- * Function manifest file.
- */
-export type FunctionManifest = {
-  functions: FunctionDef[];
-  triggers: FunctionTrigger[];
-};