@dxos/functions 0.5.3-main.bc67fdb → 0.5.3-main.bfb5bca
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.
- package/dist/lib/browser/chunk-4D4I3YMJ.mjs +86 -0
- package/dist/lib/browser/chunk-4D4I3YMJ.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +752 -480
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/types.mjs +14 -0
- package/dist/lib/browser/types.mjs.map +7 -0
- package/dist/lib/node/chunk-3UYUR5N5.cjs +103 -0
- package/dist/lib/node/chunk-3UYUR5N5.cjs.map +7 -0
- package/dist/lib/node/index.cjs +739 -473
- package/dist/lib/node/index.cjs.map +4 -4
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node/types.cjs +35 -0
- package/dist/lib/node/types.cjs.map +7 -0
- package/dist/types/src/browser/index.d.ts +2 -0
- package/dist/types/src/browser/index.d.ts.map +1 -0
- package/dist/types/src/function/function-registry.d.ts +24 -0
- package/dist/types/src/function/function-registry.d.ts.map +1 -0
- package/dist/types/src/function/function-registry.test.d.ts +2 -0
- package/dist/types/src/function/function-registry.test.d.ts.map +1 -0
- package/dist/types/src/function/index.d.ts +2 -0
- package/dist/types/src/function/index.d.ts.map +1 -0
- package/dist/types/src/handler.d.ts.map +1 -1
- package/dist/types/src/index.d.ts +2 -0
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/runtime/dev-server.d.ts +7 -10
- package/dist/types/src/runtime/dev-server.d.ts.map +1 -1
- package/dist/types/src/runtime/scheduler.d.ts +11 -59
- package/dist/types/src/runtime/scheduler.d.ts.map +1 -1
- package/dist/types/src/testing/functions-integration.test.d.ts +2 -0
- package/dist/types/src/testing/functions-integration.test.d.ts.map +1 -0
- package/dist/types/src/testing/index.d.ts +4 -0
- package/dist/types/src/testing/index.d.ts.map +1 -0
- package/dist/types/src/testing/setup.d.ts +5 -0
- package/dist/types/src/testing/setup.d.ts.map +1 -0
- package/dist/types/src/testing/test/handler.d.ts +1 -0
- package/dist/types/src/testing/test/handler.d.ts.map +1 -1
- package/dist/types/src/testing/types.d.ts +9 -0
- package/dist/types/src/testing/types.d.ts.map +1 -0
- package/dist/types/src/testing/util.d.ts +3 -0
- package/dist/types/src/testing/util.d.ts.map +1 -0
- package/dist/types/src/trigger/index.d.ts +2 -0
- package/dist/types/src/trigger/index.d.ts.map +1 -0
- package/dist/types/src/trigger/trigger-registry.d.ts +37 -0
- package/dist/types/src/trigger/trigger-registry.d.ts.map +1 -0
- package/dist/types/src/trigger/trigger-registry.test.d.ts +2 -0
- package/dist/types/src/trigger/trigger-registry.test.d.ts.map +1 -0
- package/dist/types/src/trigger/type/index.d.ts +5 -0
- package/dist/types/src/trigger/type/index.d.ts.map +1 -0
- package/dist/types/src/trigger/type/subscription-trigger.d.ts +4 -0
- package/dist/types/src/trigger/type/subscription-trigger.d.ts.map +1 -0
- package/dist/types/src/trigger/type/timer-trigger.d.ts +4 -0
- package/dist/types/src/trigger/type/timer-trigger.d.ts.map +1 -0
- package/dist/types/src/trigger/type/webhook-trigger.d.ts +4 -0
- package/dist/types/src/trigger/type/webhook-trigger.d.ts.map +1 -0
- package/dist/types/src/trigger/type/websocket-trigger.d.ts +13 -0
- package/dist/types/src/trigger/type/websocket-trigger.d.ts.map +1 -0
- package/dist/types/src/types.d.ts +152 -119
- package/dist/types/src/types.d.ts.map +1 -1
- package/package.json +30 -14
- package/schema/functions.json +144 -116
- package/src/browser/index.ts +5 -0
- package/src/function/function-registry.test.ts +105 -0
- package/src/function/function-registry.ts +90 -0
- package/src/function/index.ts +5 -0
- package/src/index.ts +2 -0
- package/src/runtime/dev-server.test.ts +15 -35
- package/src/runtime/dev-server.ts +38 -21
- package/src/runtime/scheduler.test.ts +59 -75
- package/src/runtime/scheduler.ts +70 -297
- package/src/testing/functions-integration.test.ts +100 -0
- package/src/testing/index.ts +7 -0
- package/src/testing/setup.ts +43 -0
- package/src/testing/test/handler.ts +8 -2
- package/src/testing/types.ts +9 -0
- package/src/testing/util.ts +16 -0
- package/src/trigger/index.ts +5 -0
- package/src/trigger/trigger-registry.test.ts +272 -0
- package/src/trigger/trigger-registry.ts +211 -0
- package/src/trigger/type/index.ts +8 -0
- package/src/trigger/type/subscription-trigger.ts +86 -0
- package/src/trigger/type/timer-trigger.ts +45 -0
- package/src/trigger/type/webhook-trigger.ts +48 -0
- package/src/trigger/type/websocket-trigger.ts +92 -0
- package/src/types.ts +82 -54
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
//
|
|
2
|
+
// Copyright 2024 DXOS.org
|
|
3
|
+
//
|
|
4
|
+
|
|
5
|
+
import WebSocket from 'ws';
|
|
6
|
+
|
|
7
|
+
import { sleep, Trigger } from '@dxos/async';
|
|
8
|
+
import { type Space } from '@dxos/client/echo';
|
|
9
|
+
import { type Context } from '@dxos/context';
|
|
10
|
+
import { log } from '@dxos/log';
|
|
11
|
+
|
|
12
|
+
import { type WebsocketTrigger } from '../../types';
|
|
13
|
+
import { type TriggerCallback, type TriggerFactory } from '../trigger-registry';
|
|
14
|
+
|
|
15
|
+
interface WebsocketTriggerOptions {
|
|
16
|
+
retryDelay: number;
|
|
17
|
+
maxAttempts: number;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Websocket.
|
|
22
|
+
* NOTE: The port must be unique, so the same hook cannot be used for multiple spaces.
|
|
23
|
+
*/
|
|
24
|
+
export const createWebsocketTrigger: TriggerFactory<WebsocketTrigger, WebsocketTriggerOptions> = async (
|
|
25
|
+
ctx: Context,
|
|
26
|
+
space: Space,
|
|
27
|
+
spec: WebsocketTrigger,
|
|
28
|
+
callback: TriggerCallback,
|
|
29
|
+
options: WebsocketTriggerOptions = { retryDelay: 2, maxAttempts: 5 },
|
|
30
|
+
) => {
|
|
31
|
+
const { url, init } = spec;
|
|
32
|
+
|
|
33
|
+
let ws: WebSocket;
|
|
34
|
+
for (let attempt = 1; attempt <= options.maxAttempts; attempt++) {
|
|
35
|
+
const open = new Trigger<boolean>();
|
|
36
|
+
|
|
37
|
+
ws = new WebSocket(url);
|
|
38
|
+
Object.assign(ws, {
|
|
39
|
+
onopen: () => {
|
|
40
|
+
log.info('opened', { url });
|
|
41
|
+
if (spec.init) {
|
|
42
|
+
ws.send(new TextEncoder().encode(JSON.stringify(init)));
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
open.wake(true);
|
|
46
|
+
},
|
|
47
|
+
|
|
48
|
+
onclose: (event) => {
|
|
49
|
+
log.info('closed', { url, code: event.code });
|
|
50
|
+
// Reconnect if server closes (e.g., CF restart).
|
|
51
|
+
// https://developer.mozilla.org/en-US/docs/Web/API/CloseEvent/code
|
|
52
|
+
if (event.code === 1006) {
|
|
53
|
+
setTimeout(async () => {
|
|
54
|
+
log.info(`reconnecting in ${options.retryDelay}s...`, { url });
|
|
55
|
+
await createWebsocketTrigger(ctx, space, spec, callback, options);
|
|
56
|
+
}, options.retryDelay * 1_000);
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
open.wake(false);
|
|
60
|
+
},
|
|
61
|
+
|
|
62
|
+
onerror: (event) => {
|
|
63
|
+
log.catch(event.error, { url });
|
|
64
|
+
},
|
|
65
|
+
|
|
66
|
+
onmessage: async (event) => {
|
|
67
|
+
try {
|
|
68
|
+
log.info('message');
|
|
69
|
+
const data = JSON.parse(new TextDecoder().decode(event.data as Uint8Array));
|
|
70
|
+
await callback({ data });
|
|
71
|
+
} catch (err) {
|
|
72
|
+
log.catch(err, { url });
|
|
73
|
+
}
|
|
74
|
+
},
|
|
75
|
+
} satisfies Partial<WebSocket>);
|
|
76
|
+
|
|
77
|
+
const isOpen = await open.wait();
|
|
78
|
+
if (isOpen) {
|
|
79
|
+
break;
|
|
80
|
+
} else {
|
|
81
|
+
const wait = Math.pow(attempt, 2) * options.retryDelay;
|
|
82
|
+
if (attempt < options.maxAttempts) {
|
|
83
|
+
log.warn(`failed to connect; trying again in ${wait}s`, { attempt });
|
|
84
|
+
await sleep(wait * 1_000);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
ctx.onDispose(() => {
|
|
90
|
+
ws?.close();
|
|
91
|
+
});
|
|
92
|
+
};
|
package/src/types.ts
CHANGED
|
@@ -2,86 +2,114 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import
|
|
5
|
+
import { RawObject, S, TypedObject } from '@dxos/echo-schema';
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
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';
|
|
14
|
+
|
|
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
|
+
);
|
|
35
|
+
|
|
36
|
+
export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
|
|
37
|
+
|
|
38
|
+
const TimerTriggerSchema = S.mutable(
|
|
39
|
+
S.struct({
|
|
40
|
+
type: S.literal('timer'),
|
|
41
|
+
cron: S.string,
|
|
42
|
+
}),
|
|
43
|
+
);
|
|
44
|
+
|
|
45
|
+
export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
|
|
10
46
|
|
|
11
47
|
const WebhookTriggerSchema = S.mutable(
|
|
12
48
|
S.struct({
|
|
49
|
+
type: S.literal('webhook'),
|
|
13
50
|
method: S.string,
|
|
14
51
|
// Assigned port.
|
|
15
52
|
port: S.optional(S.number),
|
|
16
53
|
}),
|
|
17
54
|
);
|
|
18
55
|
|
|
19
|
-
|
|
20
|
-
url: S.string,
|
|
21
|
-
init: S.optional(S.record(S.string, S.any)),
|
|
22
|
-
});
|
|
23
|
-
|
|
24
|
-
const SubscriptionTriggerSchema = S.struct({
|
|
25
|
-
spaceKey: S.optional(S.string),
|
|
26
|
-
// TODO(burdon): Define query DSL.
|
|
27
|
-
filter: S.array(
|
|
28
|
-
S.struct({
|
|
29
|
-
type: S.string,
|
|
30
|
-
props: S.optional(S.record(S.string, S.any)),
|
|
31
|
-
}),
|
|
32
|
-
),
|
|
33
|
-
options: S.optional(
|
|
34
|
-
S.struct({
|
|
35
|
-
// Watch changes to object (not just creation).
|
|
36
|
-
deep: S.optional(S.boolean),
|
|
37
|
-
// Debounce changes (delay in ms).
|
|
38
|
-
delay: S.optional(S.number),
|
|
39
|
-
}),
|
|
40
|
-
),
|
|
41
|
-
});
|
|
56
|
+
export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
|
|
42
57
|
|
|
43
|
-
const
|
|
44
|
-
|
|
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
|
+
);
|
|
45
65
|
|
|
46
|
-
|
|
47
|
-
meta: S.optional(S.record(S.string, S.any)),
|
|
66
|
+
export type WebsocketTrigger = S.Schema.Type<typeof WebsocketTriggerSchema>;
|
|
48
67
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
68
|
+
const TriggerSpecSchema = S.union(
|
|
69
|
+
TimerTriggerSchema,
|
|
70
|
+
WebhookTriggerSchema,
|
|
71
|
+
WebsocketTriggerSchema,
|
|
72
|
+
SubscriptionTriggerSchema,
|
|
73
|
+
);
|
|
55
74
|
|
|
56
|
-
export type
|
|
57
|
-
|
|
58
|
-
export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
|
|
59
|
-
export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
|
|
60
|
-
export type WebsocketTrigger = S.Schema.Type<typeof WebsocketTriggerSchema>;
|
|
61
|
-
export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
|
|
75
|
+
export type TriggerSpec = TimerTrigger | WebhookTrigger | WebsocketTrigger | SubscriptionTrigger;
|
|
62
76
|
|
|
63
77
|
/**
|
|
64
78
|
* Function definition.
|
|
65
79
|
*/
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
80
|
+
export class FunctionDef extends TypedObject({
|
|
81
|
+
typename: 'dxos.org/type/FunctionDef',
|
|
82
|
+
version: '0.1.0',
|
|
83
|
+
})({
|
|
84
|
+
uri: S.string,
|
|
70
85
|
description: S.optional(S.string),
|
|
71
|
-
|
|
72
|
-
path: S.string,
|
|
73
|
-
// TODO(burdon): NPM/GitHub/Docker/CF URL?
|
|
86
|
+
route: S.string,
|
|
74
87
|
handler: S.string,
|
|
75
|
-
})
|
|
88
|
+
}) {}
|
|
76
89
|
|
|
77
|
-
|
|
90
|
+
/**
|
|
91
|
+
* Function trigger.
|
|
92
|
+
*/
|
|
93
|
+
export class FunctionTrigger extends TypedObject({
|
|
94
|
+
typename: 'dxos.org/type/FunctionTrigger',
|
|
95
|
+
version: '0.1.0',
|
|
96
|
+
})({
|
|
97
|
+
enabled: S.optional(S.boolean),
|
|
98
|
+
function: S.string.pipe(S.description('Function URI.')),
|
|
99
|
+
// The `meta` property is merged into the event data passed to the function.
|
|
100
|
+
meta: S.optional(S.mutable(S.any)),
|
|
101
|
+
spec: TriggerSpecSchema,
|
|
102
|
+
}) {}
|
|
78
103
|
|
|
79
104
|
/**
|
|
80
105
|
* Function manifest file.
|
|
81
106
|
*/
|
|
82
107
|
export const FunctionManifestSchema = S.struct({
|
|
83
|
-
functions: S.mutable(S.array(
|
|
84
|
-
triggers: S.optional(S.mutable(S.array(
|
|
108
|
+
functions: S.optional(S.mutable(S.array(RawObject(FunctionDef)))),
|
|
109
|
+
triggers: S.optional(S.mutable(S.array(RawObject(FunctionTrigger)))),
|
|
85
110
|
});
|
|
86
111
|
|
|
87
112
|
export type FunctionManifest = S.Schema.Type<typeof FunctionManifestSchema>;
|
|
113
|
+
|
|
114
|
+
// TODO(burdon): Standards?
|
|
115
|
+
export const FUNCTION_SCHEMA = [FunctionDef, FunctionTrigger];
|