@dxos/functions 0.5.3-main.e76d664 → 0.5.3-main.eb56347

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (92) hide show
  1. package/dist/lib/browser/chunk-P3HPDHNI.mjs +86 -0
  2. package/dist/lib/browser/chunk-P3HPDHNI.mjs.map +7 -0
  3. package/dist/lib/browser/index.mjs +852 -462
  4. package/dist/lib/browser/index.mjs.map +4 -4
  5. package/dist/lib/browser/meta.json +1 -1
  6. package/dist/lib/browser/types.mjs +14 -0
  7. package/dist/lib/browser/types.mjs.map +7 -0
  8. package/dist/lib/node/chunk-KTLM3JNV.cjs +103 -0
  9. package/dist/lib/node/chunk-KTLM3JNV.cjs.map +7 -0
  10. package/dist/lib/node/index.cjs +836 -452
  11. package/dist/lib/node/index.cjs.map +4 -4
  12. package/dist/lib/node/meta.json +1 -1
  13. package/dist/lib/node/types.cjs +35 -0
  14. package/dist/lib/node/types.cjs.map +7 -0
  15. package/dist/types/src/browser/index.d.ts +2 -0
  16. package/dist/types/src/browser/index.d.ts.map +1 -0
  17. package/dist/types/src/function/function-registry.d.ts +24 -0
  18. package/dist/types/src/function/function-registry.d.ts.map +1 -0
  19. package/dist/types/src/function/function-registry.test.d.ts +2 -0
  20. package/dist/types/src/function/function-registry.test.d.ts.map +1 -0
  21. package/dist/types/src/function/index.d.ts +2 -0
  22. package/dist/types/src/function/index.d.ts.map +1 -0
  23. package/dist/types/src/handler.d.ts +33 -12
  24. package/dist/types/src/handler.d.ts.map +1 -1
  25. package/dist/types/src/index.d.ts +2 -0
  26. package/dist/types/src/index.d.ts.map +1 -1
  27. package/dist/types/src/runtime/dev-server.d.ts +16 -13
  28. package/dist/types/src/runtime/dev-server.d.ts.map +1 -1
  29. package/dist/types/src/runtime/dev-server.test.d.ts +2 -0
  30. package/dist/types/src/runtime/dev-server.test.d.ts.map +1 -0
  31. package/dist/types/src/runtime/scheduler.d.ts +13 -27
  32. package/dist/types/src/runtime/scheduler.d.ts.map +1 -1
  33. package/dist/types/src/testing/functions-integration.test.d.ts +2 -0
  34. package/dist/types/src/testing/functions-integration.test.d.ts.map +1 -0
  35. package/dist/types/src/testing/index.d.ts +4 -0
  36. package/dist/types/src/testing/index.d.ts.map +1 -0
  37. package/dist/types/src/testing/setup.d.ts +5 -0
  38. package/dist/types/src/testing/setup.d.ts.map +1 -0
  39. package/dist/types/src/testing/test/handler.d.ts +4 -0
  40. package/dist/types/src/testing/test/handler.d.ts.map +1 -0
  41. package/dist/types/src/testing/test/index.d.ts +3 -0
  42. package/dist/types/src/testing/test/index.d.ts.map +1 -0
  43. package/dist/types/src/testing/types.d.ts +9 -0
  44. package/dist/types/src/testing/types.d.ts.map +1 -0
  45. package/dist/types/src/testing/util.d.ts +3 -0
  46. package/dist/types/src/testing/util.d.ts.map +1 -0
  47. package/dist/types/src/trigger/index.d.ts +2 -0
  48. package/dist/types/src/trigger/index.d.ts.map +1 -0
  49. package/dist/types/src/trigger/trigger-registry.d.ts +40 -0
  50. package/dist/types/src/trigger/trigger-registry.d.ts.map +1 -0
  51. package/dist/types/src/trigger/trigger-registry.test.d.ts +2 -0
  52. package/dist/types/src/trigger/trigger-registry.test.d.ts.map +1 -0
  53. package/dist/types/src/trigger/type/index.d.ts +5 -0
  54. package/dist/types/src/trigger/type/index.d.ts.map +1 -0
  55. package/dist/types/src/trigger/type/subscription-trigger.d.ts +4 -0
  56. package/dist/types/src/trigger/type/subscription-trigger.d.ts.map +1 -0
  57. package/dist/types/src/trigger/type/timer-trigger.d.ts +4 -0
  58. package/dist/types/src/trigger/type/timer-trigger.d.ts.map +1 -0
  59. package/dist/types/src/trigger/type/webhook-trigger.d.ts +4 -0
  60. package/dist/types/src/trigger/type/webhook-trigger.d.ts.map +1 -0
  61. package/dist/types/src/trigger/type/websocket-trigger.d.ts +13 -0
  62. package/dist/types/src/trigger/type/websocket-trigger.d.ts.map +1 -0
  63. package/dist/types/src/types.d.ts +152 -109
  64. package/dist/types/src/types.d.ts.map +1 -1
  65. package/package.json +33 -15
  66. package/schema/functions.json +140 -104
  67. package/src/browser/index.ts +5 -0
  68. package/src/function/function-registry.test.ts +105 -0
  69. package/src/function/function-registry.ts +90 -0
  70. package/src/function/index.ts +5 -0
  71. package/src/handler.ts +54 -31
  72. package/src/index.ts +2 -0
  73. package/src/runtime/dev-server.test.ts +60 -0
  74. package/src/runtime/dev-server.ts +104 -53
  75. package/src/runtime/scheduler.test.ts +56 -73
  76. package/src/runtime/scheduler.ts +91 -270
  77. package/src/testing/functions-integration.test.ts +99 -0
  78. package/src/testing/index.ts +7 -0
  79. package/src/testing/setup.ts +45 -0
  80. package/src/testing/test/handler.ts +15 -0
  81. package/src/testing/test/index.ts +7 -0
  82. package/src/testing/types.ts +9 -0
  83. package/src/testing/util.ts +16 -0
  84. package/src/trigger/index.ts +5 -0
  85. package/src/trigger/trigger-registry.test.ts +255 -0
  86. package/src/trigger/trigger-registry.ts +201 -0
  87. package/src/trigger/type/index.ts +8 -0
  88. package/src/trigger/type/subscription-trigger.ts +80 -0
  89. package/src/trigger/type/timer-trigger.ts +44 -0
  90. package/src/trigger/type/webhook-trigger.ts +47 -0
  91. package/src/trigger/type/websocket-trigger.ts +91 -0
  92. package/src/types.ts +84 -48
@@ -0,0 +1,80 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ import { TextV0Type } from '@braneframe/types';
6
+ import { debounce, UpdateScheduler } from '@dxos/async';
7
+ import { type Context } from '@dxos/context';
8
+ import { createSubscription, Filter, getAutomergeObjectCore, type Query } from '@dxos/echo-db';
9
+ import { log } from '@dxos/log';
10
+
11
+ import type { SubscriptionTrigger } from '../../types';
12
+ import { type TriggerCallback, type TriggerContext, type TriggerFactory } from '../trigger-registry';
13
+
14
+ export const createSubscriptionTrigger: TriggerFactory<SubscriptionTrigger> = async (
15
+ ctx: Context,
16
+ triggerCtx: TriggerContext,
17
+ spec: SubscriptionTrigger,
18
+ callback: TriggerCallback,
19
+ ) => {
20
+ const objectIds = new Set<string>();
21
+ const task = new UpdateScheduler(
22
+ ctx,
23
+ async () => {
24
+ if (objectIds.size > 0) {
25
+ const objects = Array.from(objectIds);
26
+ objectIds.clear();
27
+ await callback({ objects });
28
+ }
29
+ },
30
+ { maxFrequency: 4 },
31
+ );
32
+
33
+ // TODO(burdon): Don't fire initially?
34
+ // TODO(burdon): Create queue. Only allow one invocation per trigger at a time?
35
+ const subscriptions: (() => void)[] = [];
36
+ const subscription = createSubscription(({ added, updated }) => {
37
+ const sizeBefore = objectIds.size;
38
+ for (const object of added) {
39
+ objectIds.add(object.id);
40
+ }
41
+ for (const object of updated) {
42
+ objectIds.add(object.id);
43
+ }
44
+ if (objectIds.size > sizeBefore) {
45
+ log.info('updated', { added: added.length, updated: updated.length });
46
+ task.trigger();
47
+ }
48
+ });
49
+
50
+ subscriptions.push(() => subscription.unsubscribe());
51
+
52
+ // TODO(burdon): Disable trigger if keeps failing.
53
+ const { filter, options: { deep, delay } = {} } = spec;
54
+ const update = ({ objects }: Query) => {
55
+ subscription.update(objects);
56
+
57
+ // TODO(burdon): Hack to monitor changes to Document's text object.
58
+ if (deep) {
59
+ log.info('update', { objects: objects.length });
60
+ for (const object of objects) {
61
+ const content = object.content;
62
+ if (content instanceof TextV0Type) {
63
+ subscriptions.push(
64
+ getAutomergeObjectCore(content).updates.on(debounce(() => subscription.update([object]), 1_000)),
65
+ );
66
+ }
67
+ }
68
+ }
69
+ };
70
+
71
+ // TODO(burdon): Is Filter.or implemented?
72
+ // TODO(burdon): [Bug]: all callbacks are fired on the first mutation.
73
+ // TODO(burdon): [Bug]: not updated when document is deleted (either top or hierarchically).
74
+ const query = triggerCtx.space.db.query(Filter.or(filter.map(({ type, props }) => Filter.typename(type, props))));
75
+ subscriptions.push(query.subscribe(delay ? debounce(update, delay) : update));
76
+
77
+ ctx.onDispose(() => {
78
+ subscriptions.forEach((unsubscribe) => unsubscribe());
79
+ });
80
+ };
@@ -0,0 +1,44 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ import { CronJob } from 'cron';
6
+
7
+ import { DeferredTask } from '@dxos/async';
8
+ import { type Context } from '@dxos/context';
9
+ import { log } from '@dxos/log';
10
+
11
+ import type { TimerTrigger } from '../../types';
12
+ import { type TriggerCallback, type TriggerContext, type TriggerFactory } from '../trigger-registry';
13
+
14
+ export const createTimerTrigger: TriggerFactory<TimerTrigger> = async (
15
+ ctx: Context,
16
+ triggerContext: TriggerContext,
17
+ spec: TimerTrigger,
18
+ callback: TriggerCallback,
19
+ ) => {
20
+ const task = new DeferredTask(ctx, async () => {
21
+ await callback({});
22
+ });
23
+
24
+ let last = 0;
25
+ let run = 0;
26
+ // https://www.npmjs.com/package/cron#constructor
27
+ const job = CronJob.from({
28
+ cronTime: spec.cron,
29
+ runOnInit: false,
30
+ onTick: () => {
31
+ // TODO(burdon): Check greater than 30s (use cron-parser).
32
+ const now = Date.now();
33
+ const delta = last ? now - last : 0;
34
+ last = now;
35
+
36
+ run++;
37
+ log.info('tick', { space: triggerContext.space.key.truncate(), count: run, delta });
38
+ task.schedule();
39
+ },
40
+ });
41
+
42
+ job.start();
43
+ ctx.onDispose(() => job.stop());
44
+ };
@@ -0,0 +1,47 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ import { getPort } from 'get-port-please';
6
+ import http from 'node:http';
7
+
8
+ import { type Context } from '@dxos/context';
9
+ import { log } from '@dxos/log';
10
+
11
+ import type { WebhookTrigger } from '../../types';
12
+ import { type TriggerCallback, type TriggerContext, type TriggerFactory } from '../trigger-registry';
13
+
14
+ export const createWebhookTrigger: TriggerFactory<WebhookTrigger> = async (
15
+ ctx: Context,
16
+ _: TriggerContext,
17
+ spec: WebhookTrigger,
18
+ callback: TriggerCallback,
19
+ ) => {
20
+ // TODO(burdon): Enable POST hook with payload.
21
+ const server = http.createServer(async (req, res) => {
22
+ if (req.method !== spec.method) {
23
+ res.statusCode = 405;
24
+ return res.end();
25
+ }
26
+ res.statusCode = await callback({});
27
+ res.end();
28
+ });
29
+
30
+ // TODO(burdon): Not used.
31
+ // const DEF_PORT_RANGE = { min: 7500, max: 7599 };
32
+ // const portRange = Object.assign({}, trigger.port, DEF_PORT_RANGE) as WebhookTrigger['port'];
33
+ const port = await getPort({
34
+ random: true,
35
+ // portRange: [portRange!.min, portRange!.max],
36
+ });
37
+
38
+ // TODO(burdon): Update trigger object with actual port.
39
+ server.listen(port, () => {
40
+ log.info('started webhook', { port });
41
+ spec.port = port;
42
+ });
43
+
44
+ ctx.onDispose(() => {
45
+ server.close();
46
+ });
47
+ };
@@ -0,0 +1,91 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ import WebSocket from 'ws';
6
+
7
+ import { sleep, Trigger } from '@dxos/async';
8
+ import { type Context } from '@dxos/context';
9
+ import { log } from '@dxos/log';
10
+
11
+ import { type WebsocketTrigger } from '../../types';
12
+ import { type TriggerCallback, type TriggerContext, type TriggerFactory } from '../trigger-registry';
13
+
14
+ interface WebsocketTriggerOptions {
15
+ retryDelay: number;
16
+ maxAttempts: number;
17
+ }
18
+
19
+ /**
20
+ * Websocket.
21
+ * NOTE: The port must be unique, so the same hook cannot be used for multiple spaces.
22
+ */
23
+ export const createWebsocketTrigger: TriggerFactory<WebsocketTrigger, WebsocketTriggerOptions> = async (
24
+ ctx: Context,
25
+ triggerCtx: TriggerContext,
26
+ spec: WebsocketTrigger,
27
+ callback: TriggerCallback,
28
+ options: WebsocketTriggerOptions = { retryDelay: 2, maxAttempts: 5 },
29
+ ) => {
30
+ const { url, init } = spec;
31
+
32
+ let ws: WebSocket;
33
+ for (let attempt = 1; attempt <= options.maxAttempts; attempt++) {
34
+ const open = new Trigger<boolean>();
35
+
36
+ ws = new WebSocket(url);
37
+ Object.assign(ws, {
38
+ onopen: () => {
39
+ log.info('opened', { url });
40
+ if (spec.init) {
41
+ ws.send(new TextEncoder().encode(JSON.stringify(init)));
42
+ }
43
+
44
+ open.wake(true);
45
+ },
46
+
47
+ onclose: (event) => {
48
+ log.info('closed', { url, code: event.code });
49
+ // Reconnect if server closes (e.g., CF restart).
50
+ // https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent/code
51
+ if (event.code === 1006) {
52
+ setTimeout(async () => {
53
+ log.info(`reconnecting in ${options.retryDelay}s...`, { url });
54
+ await createWebsocketTrigger(ctx, triggerCtx, spec, callback, options);
55
+ }, options.retryDelay * 1_000);
56
+ }
57
+
58
+ open.wake(false);
59
+ },
60
+
61
+ onerror: (event) => {
62
+ log.catch(event.error, { url });
63
+ },
64
+
65
+ onmessage: async (event) => {
66
+ try {
67
+ log.info('message');
68
+ const data = JSON.parse(new TextDecoder().decode(event.data as Uint8Array));
69
+ await callback({ data });
70
+ } catch (err) {
71
+ log.catch(err, { url });
72
+ }
73
+ },
74
+ } satisfies Partial<WebSocket>);
75
+
76
+ const isOpen = await open.wait();
77
+ if (isOpen) {
78
+ break;
79
+ } else {
80
+ const wait = Math.pow(attempt, 2) * options.retryDelay;
81
+ if (attempt < options.maxAttempts) {
82
+ log.warn(`failed to connect; trying again in ${wait}s`, { attempt });
83
+ await sleep(wait * 1_000);
84
+ }
85
+ }
86
+ }
87
+
88
+ ctx.onDispose(() => {
89
+ ws?.close();
90
+ });
91
+ };
package/src/types.ts CHANGED
@@ -2,75 +2,111 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
- import * as S from '@effect/schema/Schema';
5
+ import { RawObject, S, TypedObject } from '@dxos/echo-schema';
6
6
 
7
- const TimerTriggerSchema = S.struct({
8
- cron: S.string,
9
- });
7
+ /**
8
+ * Type discriminator for TriggerSpec.
9
+ * Every spec has a type field of type FunctionTriggerType that we can use to understand which
10
+ * type we're working with.
11
+ * https://www.typescriptlang.org/docs/handbook/2/narrowing.html#discriminated-unions
12
+ */
13
+ export type FunctionTriggerType = 'subscription' | 'timer' | 'webhook' | 'websocket';
10
14
 
11
- const WebhookTriggerSchema = S.struct({
12
- port: S.number,
13
- });
15
+ const SubscriptionTriggerSchema = S.mutable(
16
+ S.struct({
17
+ type: S.literal('subscription'),
18
+ // TODO(burdon): Define query DSL (from ECHO).
19
+ filter: S.array(
20
+ S.struct({
21
+ type: S.string,
22
+ props: S.optional(S.record(S.string, S.any)),
23
+ }),
24
+ ),
25
+ options: S.optional(
26
+ S.struct({
27
+ // Watch changes to object (not just creation).
28
+ deep: S.optional(S.boolean),
29
+ // Debounce changes (delay in ms).
30
+ delay: S.optional(S.number),
31
+ }),
32
+ ),
33
+ }),
34
+ );
14
35
 
15
- const WebsocketTriggerSchema = S.struct({
16
- url: S.string,
17
- init: S.optional(S.record(S.string, S.any)),
18
- });
36
+ export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
19
37
 
20
- const SubscriptionTriggerSchema = S.struct({
21
- spaceKey: S.optional(S.string),
22
- // TODO(burdon): Define query DSL.
23
- filter: S.array(
24
- S.struct({
25
- type: S.string,
26
- props: S.optional(S.record(S.string, S.any)),
27
- }),
28
- ),
29
- options: S.optional(
30
- S.struct({
31
- // Watch changes to object (not just creation).
32
- deep: S.optional(S.boolean),
33
- // Debounce changes (delay in ms).
34
- delay: S.optional(S.number),
35
- }),
36
- ),
37
- });
38
+ const TimerTriggerSchema = S.mutable(
39
+ S.struct({
40
+ type: S.literal('timer'),
41
+ cron: S.string,
42
+ }),
43
+ );
38
44
 
39
- const FunctionTriggerSchema = S.struct({
40
- function: S.string.pipe(S.description('Function ID/URI.')),
45
+ export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
41
46
 
42
- timer: S.optional(TimerTriggerSchema),
43
- webhook: S.optional(WebhookTriggerSchema),
44
- websocket: S.optional(WebsocketTriggerSchema),
45
- subscription: S.optional(SubscriptionTriggerSchema),
46
- });
47
+ const WebhookTriggerSchema = S.mutable(
48
+ S.struct({
49
+ type: S.literal('webhook'),
50
+ method: S.string,
51
+ // Assigned port.
52
+ port: S.optional(S.number),
53
+ }),
54
+ );
47
55
 
48
- export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
49
56
  export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
57
+
58
+ const WebsocketTriggerSchema = S.mutable(
59
+ S.struct({
60
+ type: S.literal('websocket'),
61
+ url: S.string,
62
+ init: S.optional(S.record(S.string, S.any)),
63
+ }),
64
+ );
65
+
50
66
  export type WebsocketTrigger = S.Schema.Type<typeof WebsocketTriggerSchema>;
51
- export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
52
- export type FunctionTrigger = S.Schema.Type<typeof FunctionTriggerSchema>;
67
+
68
+ const TriggerSpecSchema = S.union(
69
+ TimerTriggerSchema,
70
+ WebhookTriggerSchema,
71
+ WebsocketTriggerSchema,
72
+ SubscriptionTriggerSchema,
73
+ );
74
+
75
+ export type TriggerSpec = TimerTrigger | WebhookTrigger | WebsocketTrigger | SubscriptionTrigger;
53
76
 
54
77
  /**
55
78
  * Function definition.
56
79
  */
57
- // TODO(burdon): Name vs. path?
58
- const FunctionDefSchema = S.struct({
59
- id: S.string,
80
+ export class FunctionDef extends TypedObject({
81
+ typename: 'dxos.org/type/FunctionDef',
82
+ version: '0.1.0',
83
+ })({
84
+ uri: S.string,
60
85
  description: S.optional(S.string),
61
- name: S.string,
62
- // TODO(burdon): NPM/GitHub URL?
86
+ route: S.string,
87
+ // TODO(burdon): NPM/GitHub/Docker/CF URL?
63
88
  handler: S.string,
64
- });
89
+ }) {}
65
90
 
66
- export type FunctionDef = S.Schema.Type<typeof FunctionDefSchema>;
91
+ export class FunctionTrigger extends TypedObject({
92
+ typename: 'dxos.org/type/FunctionTrigger',
93
+ version: '0.1.0',
94
+ })({
95
+ function: S.string.pipe(S.description('Function URI.')),
96
+ // Context is merged into the event data passed to the function.
97
+ meta: S.optional(S.object),
98
+ spec: TriggerSpecSchema,
99
+ }) {}
67
100
 
68
101
  /**
69
102
  * Function manifest file.
70
103
  */
71
104
  export const FunctionManifestSchema = S.struct({
72
- functions: S.mutable(S.array(FunctionDefSchema)),
73
- triggers: S.mutable(S.array(FunctionTriggerSchema)),
105
+ functions: S.optional(S.mutable(S.array(RawObject(FunctionDef)))),
106
+ triggers: S.optional(S.mutable(S.array(RawObject(FunctionTrigger)))),
74
107
  });
75
108
 
76
109
  export type FunctionManifest = S.Schema.Type<typeof FunctionManifestSchema>;
110
+
111
+ // TODO(burdon): Standards?
112
+ export const FUNCTION_SCHEMA = [FunctionDef, FunctionTrigger];