@based/server 10.1.1 → 10.2.1
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/authorize.d.ts +6 -8
- package/dist/authorize.js +56 -41
- package/dist/authorize.js.map +1 -1
- package/dist/functionApi/callFunction.js +1 -1
- package/dist/functionApi/callFunction.js.map +1 -1
- package/dist/functionApi/channelSubscribe.js +2 -2
- package/dist/functionApi/channelSubscribe.js.map +1 -1
- package/dist/functionApi/client/channel.js +2 -2
- package/dist/functionApi/client/channel.js.map +1 -1
- package/dist/functionApi/client/index.d.ts +3 -2
- package/dist/functionApi/client/index.js +5 -5
- package/dist/functionApi/client/index.js.map +1 -1
- package/dist/functionApi/client/query.d.ts +9 -4
- package/dist/functionApi/client/query.js +23 -5
- package/dist/functionApi/client/query.js.map +1 -1
- package/dist/functionApi/get.d.ts +2 -3
- package/dist/functionApi/get.js +20 -20
- package/dist/functionApi/get.js.map +1 -1
- package/dist/functionApi/observe.d.ts +2 -3
- package/dist/functionApi/observe.js +10 -10
- package/dist/functionApi/observe.js.map +1 -1
- package/dist/functionApi/publish.js +1 -1
- package/dist/functionApi/publish.js.map +1 -1
- package/dist/functionApi/stream.js +1 -1
- package/dist/functionApi/stream.js.map +1 -1
- package/dist/incoming/http/basicFunction.d.ts +3 -3
- package/dist/incoming/http/basicFunction.js +1 -1
- package/dist/incoming/http/basicFunction.js.map +1 -1
- package/dist/incoming/http/fakeWs/handleBinary.js +22 -30
- package/dist/incoming/http/fakeWs/handleBinary.js.map +1 -1
- package/dist/incoming/http/fakeWs/index.js +1 -1
- package/dist/incoming/http/fakeWs/index.js.map +1 -1
- package/dist/incoming/http/httpFunction.d.ts +3 -3
- package/dist/incoming/http/httpFunction.js +1 -1
- package/dist/incoming/http/httpFunction.js.map +1 -1
- package/dist/incoming/http/index.js +8 -3
- package/dist/incoming/http/index.js.map +1 -1
- package/dist/incoming/http/publish.d.ts +3 -3
- package/dist/incoming/http/publish.js +5 -5
- package/dist/incoming/http/publish.js.map +1 -1
- package/dist/incoming/http/query.js +41 -8
- package/dist/incoming/http/query.js.map +1 -1
- package/dist/incoming/http/streamFunction/multiPart/index.js +2 -2
- package/dist/incoming/http/streamFunction/multiPart/index.js.map +1 -1
- package/dist/incoming/http/streamFunction/stream/index.js +28 -25
- package/dist/incoming/http/streamFunction/stream/index.js.map +1 -1
- package/dist/incoming/upgrade.js +0 -1
- package/dist/incoming/upgrade.js.map +1 -1
- package/dist/incoming/ws/auth.js +56 -26
- package/dist/incoming/ws/auth.js.map +1 -1
- package/dist/incoming/ws/channelPublish.js +10 -10
- package/dist/incoming/ws/channelPublish.js.map +1 -1
- package/dist/incoming/ws/channelSubscribe.d.ts +2 -2
- package/dist/incoming/ws/channelSubscribe.js +23 -16
- package/dist/incoming/ws/channelSubscribe.js.map +1 -1
- package/dist/incoming/ws/function.js +27 -19
- package/dist/incoming/ws/function.js.map +1 -1
- package/dist/incoming/ws/get.js +49 -27
- package/dist/incoming/ws/get.js.map +1 -1
- package/dist/incoming/ws/index.js +17 -23
- package/dist/incoming/ws/index.js.map +1 -1
- package/dist/incoming/ws/query.d.ts +4 -2
- package/dist/incoming/ws/query.js +60 -26
- package/dist/incoming/ws/query.js.map +1 -1
- package/dist/incoming/ws/stream.js +22 -14
- package/dist/incoming/ws/stream.js.map +1 -1
- package/dist/installFn.d.ts +3 -3
- package/dist/installFn.js +14 -13
- package/dist/installFn.js.map +1 -1
- package/dist/protocol.d.ts +4 -2
- package/dist/protocol.js +28 -41
- package/dist/protocol.js.map +1 -1
- package/dist/query/attachCtx.d.ts +8 -0
- package/dist/query/attachCtx.js +113 -0
- package/dist/query/attachCtx.js.map +1 -0
- package/dist/query/cleanup.js +4 -4
- package/dist/query/cleanup.js.map +1 -1
- package/dist/query/create.d.ts +4 -3
- package/dist/query/create.js +12 -9
- package/dist/query/create.js.map +1 -1
- package/dist/query/destroy.d.ts +1 -1
- package/dist/query/destroy.js +7 -7
- package/dist/query/destroy.js.map +1 -1
- package/dist/query/index.d.ts +0 -1
- package/dist/query/index.js +0 -1
- package/dist/query/index.js.map +1 -1
- package/dist/query/send.js +4 -2
- package/dist/query/send.js.map +1 -1
- package/dist/query/start/error.js +13 -7
- package/dist/query/start/error.js.map +1 -1
- package/dist/query/start/genChecksum.js +11 -0
- package/dist/query/start/genChecksum.js.map +1 -1
- package/dist/query/start/index.js +5 -3
- package/dist/query/start/index.js.map +1 -1
- package/dist/query/start/relay.js +1 -1
- package/dist/query/start/relay.js.map +1 -1
- package/dist/query/start/update.js +12 -11
- package/dist/query/start/update.js.map +1 -1
- package/dist/query/subscribe.js +12 -6
- package/dist/query/subscribe.js.map +1 -1
- package/dist/query/types.d.ts +11 -1
- package/dist/query/unsub.js +35 -3
- package/dist/query/unsub.js.map +1 -1
- package/dist/server.d.ts +2 -2
- package/dist/server.js +2 -2
- package/dist/server.js.map +1 -1
- package/dist/types.d.ts +18 -0
- package/dist/types.js +2 -0
- package/dist/types.js.map +1 -0
- package/package.json +5 -5
- package/dist/incoming/http/fakeWs/function.d.ts +0 -2
- package/dist/incoming/http/fakeWs/function.js +0 -50
- package/dist/incoming/http/fakeWs/function.js.map +0 -1
- package/dist/incoming/http/fakeWs/query.d.ts +0 -2
- package/dist/incoming/http/fakeWs/query.js +0 -78
- package/dist/incoming/http/fakeWs/query.js.map +0 -1
- package/dist/query/genObservableId.d.ts +0 -1
- package/dist/query/genObservableId.js +0 -8
- package/dist/query/genObservableId.js.map +0 -1
|
@@ -9,58 +9,52 @@ import { channelPublishMessage } from './channelPublish.js';
|
|
|
9
9
|
import { receiveChunkStream, registerStream } from './stream.js';
|
|
10
10
|
import { BasedErrorCode } from '@based/errors';
|
|
11
11
|
import { readUint32 } from '@based/utils';
|
|
12
|
+
import { FunctionServerType, FunctionServerSubType, } from '@based/protocol/client-server';
|
|
12
13
|
const reader = (server, ctx, arr, start) => {
|
|
13
|
-
//
|
|
14
|
+
// Decode from buffer
|
|
14
15
|
const { len, isDeflate, type } = decodeHeader(readUint32(arr, start));
|
|
15
16
|
const next = len + start;
|
|
16
|
-
|
|
17
|
-
|
|
17
|
+
if (type === FunctionServerType.function &&
|
|
18
|
+
functionMessage(arr, start, len, isDeflate, ctx, server)) {
|
|
18
19
|
return next;
|
|
19
20
|
}
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
if (type === FunctionServerType.subscribe &&
|
|
22
|
+
subscribeMessage(arr, start, len, isDeflate, ctx, server)) {
|
|
22
23
|
return next;
|
|
23
24
|
}
|
|
24
|
-
|
|
25
|
-
if (type === 2 &&
|
|
25
|
+
if (type === FunctionServerType.unsubscribe &&
|
|
26
26
|
unsubscribeMessage(arr, start, len, isDeflate, ctx, server)) {
|
|
27
27
|
return next;
|
|
28
28
|
}
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
if (type === FunctionServerType.get &&
|
|
30
|
+
getMessage(arr, start, len, isDeflate, ctx, server)) {
|
|
31
31
|
return next;
|
|
32
32
|
}
|
|
33
|
-
|
|
34
|
-
|
|
33
|
+
if (type === FunctionServerType.auth &&
|
|
34
|
+
authMessage(arr, start, len, isDeflate, ctx, server)) {
|
|
35
35
|
return next;
|
|
36
36
|
}
|
|
37
|
-
|
|
38
|
-
if (type === 5 &&
|
|
37
|
+
if (type === FunctionServerType.channelSubscribe &&
|
|
39
38
|
channelSubscribeMessage(arr, start, len, isDeflate, ctx, server)) {
|
|
40
39
|
return next;
|
|
41
40
|
}
|
|
42
|
-
|
|
43
|
-
if (type === 6 &&
|
|
41
|
+
if (type === FunctionServerType.channelPublish &&
|
|
44
42
|
channelPublishMessage(arr, start, len, isDeflate, ctx, server)) {
|
|
45
43
|
return next;
|
|
46
44
|
}
|
|
47
|
-
|
|
48
|
-
if (type === 7) {
|
|
45
|
+
if (type === FunctionServerType.subType) {
|
|
49
46
|
const subType = arr[start + 4];
|
|
50
|
-
|
|
51
|
-
if (subType === 0) {
|
|
47
|
+
if (subType === FunctionServerSubType.channelUnsubscribe) {
|
|
52
48
|
if (unsubscribeChannelMessage(arr, start, len, isDeflate, ctx, server)) {
|
|
53
49
|
return next;
|
|
54
50
|
}
|
|
55
51
|
}
|
|
56
|
-
|
|
57
|
-
if (subType === 1) {
|
|
52
|
+
if (subType === FunctionServerSubType.registerStream) {
|
|
58
53
|
if (registerStream(arr, start, len, isDeflate, ctx, server)) {
|
|
59
54
|
return next;
|
|
60
55
|
}
|
|
61
56
|
}
|
|
62
|
-
|
|
63
|
-
if (subType === 2) {
|
|
57
|
+
if (subType === FunctionServerSubType.chunk) {
|
|
64
58
|
if (receiveChunkStream(arr, start, len, isDeflate, ctx, server)) {
|
|
65
59
|
return next;
|
|
66
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/ws/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EACL,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/incoming/ws/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { WebSocketSession, BasedRoute } from '@based/functions';
|
|
2
|
-
import { IsAuthorizedHandler } from '../../authorize.js';
|
|
3
2
|
import { BinaryMessageHandler } from './types.js';
|
|
4
|
-
|
|
3
|
+
import { FunctionErrorHandler, FunctionHandler } from '../../types.js';
|
|
4
|
+
export declare const enableSubscribe: FunctionHandler<WebSocketSession, BasedRoute<'query'>>;
|
|
5
|
+
export declare const queryIsNotAuthorized: FunctionErrorHandler<WebSocketSession, BasedRoute<'query'>>;
|
|
6
|
+
export declare const subscribeQuery: FunctionHandler;
|
|
5
7
|
export declare const subscribeMessage: BinaryMessageHandler;
|
|
6
8
|
export declare const unsubscribeMessage: BinaryMessageHandler;
|
|
@@ -1,40 +1,45 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { decodeName, parseIncomingQueryPayload, } from '../../protocol.js';
|
|
2
2
|
import { createObs, unsubscribeWs, subscribeWs, hasObs, } from '../../query/index.js';
|
|
3
3
|
import { BasedErrorCode } from '@based/errors';
|
|
4
4
|
import { sendError } from '../../sendError.js';
|
|
5
5
|
import { rateLimitRequest } from '../../security.js';
|
|
6
6
|
import { verifyRoute } from '../../verifyRoute.js';
|
|
7
|
-
import { authorize
|
|
7
|
+
import { authorize } from '../../authorize.js';
|
|
8
8
|
import { readUint64 } from '@based/utils';
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
import { attachCtx } from '../../query/attachCtx.js';
|
|
10
|
+
import { genObserveId } from '@based/protocol/client-server';
|
|
11
|
+
export const enableSubscribe = (props) => {
|
|
12
|
+
if (hasObs(props.server, props.id)) {
|
|
13
|
+
subscribeWs(props.server, props.id, props.checksum, props.ctx);
|
|
12
14
|
return;
|
|
13
15
|
}
|
|
14
|
-
const session = ctx.session;
|
|
15
|
-
if (!session.obs.has(id)) {
|
|
16
|
+
const session = props.ctx.session;
|
|
17
|
+
if (!session.obs.has(props.id)) {
|
|
16
18
|
return;
|
|
17
19
|
}
|
|
18
|
-
if (!hasObs(server, id)) {
|
|
19
|
-
|
|
20
|
+
if (!hasObs(props.server, props.id)) {
|
|
21
|
+
const obs = createObs(props);
|
|
20
22
|
}
|
|
21
|
-
subscribeWs(server, id, checksum, ctx);
|
|
23
|
+
subscribeWs(props.server, props.id, props.checksum, props.ctx);
|
|
22
24
|
};
|
|
23
|
-
const
|
|
24
|
-
const session = ctx.session;
|
|
25
|
+
export const queryIsNotAuthorized = (props) => {
|
|
26
|
+
const session = props.ctx.session;
|
|
25
27
|
if (!session.unauthorizedObs) {
|
|
26
28
|
session.unauthorizedObs = new Set();
|
|
27
29
|
}
|
|
30
|
+
// session.obs.delete(props.id)
|
|
28
31
|
session.unauthorizedObs.add({
|
|
29
|
-
id,
|
|
30
|
-
checksum,
|
|
31
|
-
|
|
32
|
-
payload,
|
|
32
|
+
id: props.attachedCtx ? props.attachedCtx.fromId : props.id,
|
|
33
|
+
checksum: props.checksum,
|
|
34
|
+
route: props.route,
|
|
35
|
+
payload: props.payload,
|
|
33
36
|
});
|
|
34
37
|
};
|
|
38
|
+
export const subscribeQuery = () => { };
|
|
35
39
|
export const subscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
36
40
|
// | 4 header | 8 id | 8 checksum | 1 name length | * name | * payload |
|
|
37
41
|
const nameLen = arr[start + 20];
|
|
42
|
+
// get id maybe
|
|
38
43
|
const id = readUint64(arr, start + 4);
|
|
39
44
|
const checksum = readUint64(arr, start + 12);
|
|
40
45
|
const name = decodeName(arr, start + 21, start + 21 + nameLen);
|
|
@@ -54,22 +59,51 @@ export const subscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
|
54
59
|
sendError(server, ctx, BasedErrorCode.PayloadTooLarge, {
|
|
55
60
|
route,
|
|
56
61
|
observableId: id,
|
|
57
|
-
});
|
|
62
|
+
}); // just call it id and add function type
|
|
58
63
|
return true;
|
|
59
64
|
}
|
|
60
|
-
const
|
|
61
|
-
if (
|
|
62
|
-
//
|
|
65
|
+
const payload = parseIncomingQueryPayload(arr, start, nameLen + 21, len, ctx.session, isDeflate);
|
|
66
|
+
if (genObserveId(route.name, payload) !== id) {
|
|
67
|
+
// Check if the payload has been altered (potential attack to target other ids)
|
|
68
|
+
ctx.session.ws.close();
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
if (route.ctx) {
|
|
72
|
+
const attachedCtx = attachCtx(server, route, ctx, id);
|
|
73
|
+
if (ctx.session.obs.has(attachedCtx.id)) {
|
|
74
|
+
return true;
|
|
75
|
+
}
|
|
76
|
+
ctx.session.obs.add(attachedCtx.id);
|
|
77
|
+
authorize({
|
|
78
|
+
route,
|
|
79
|
+
server,
|
|
80
|
+
ctx,
|
|
81
|
+
payload,
|
|
82
|
+
id: attachedCtx.id,
|
|
83
|
+
checksum,
|
|
84
|
+
error: queryIsNotAuthorized,
|
|
85
|
+
attachedCtx,
|
|
86
|
+
}).then(enableSubscribe);
|
|
63
87
|
return true;
|
|
64
88
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
89
|
+
else {
|
|
90
|
+
if (ctx.session.obs.has(id)) {
|
|
91
|
+
return true;
|
|
92
|
+
}
|
|
93
|
+
ctx.session.obs.add(id);
|
|
94
|
+
authorize({
|
|
95
|
+
route,
|
|
96
|
+
server,
|
|
97
|
+
ctx,
|
|
98
|
+
payload,
|
|
99
|
+
id,
|
|
100
|
+
checksum,
|
|
101
|
+
error: queryIsNotAuthorized,
|
|
102
|
+
}).then(enableSubscribe);
|
|
103
|
+
}
|
|
70
104
|
return true;
|
|
71
105
|
};
|
|
72
|
-
export const unsubscribeMessage = (arr, start,
|
|
106
|
+
export const unsubscribeMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
73
107
|
// | 4 header | 8 id |
|
|
74
108
|
if (!ctx.session) {
|
|
75
109
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/incoming/ws/query.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/incoming/ws/query.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,16 +8,18 @@ import { sendError } from '../../sendError.js';
|
|
|
8
8
|
import { BasedErrorCode } from '@based/errors';
|
|
9
9
|
import zlib from 'node:zlib';
|
|
10
10
|
import { readUint24, readUint32 } from '@based/utils';
|
|
11
|
-
const startStreamFunction = (
|
|
12
|
-
spec
|
|
13
|
-
.fn(server.client, payload, ctx)
|
|
11
|
+
const startStreamFunction = (props) => {
|
|
12
|
+
props.spec
|
|
13
|
+
.fn(props.server.client, props.payload, props.ctx)
|
|
14
14
|
.then(async (v) => {
|
|
15
|
-
ctx.session?.ws.send(encodeStreamFunctionResponse(
|
|
15
|
+
props.ctx.session?.ws.send(encodeStreamFunctionResponse(props.id, props.ctx.session.v < 2
|
|
16
|
+
? valueToBufferV1(v, true)
|
|
17
|
+
: valueToBuffer(v, true)), true, false);
|
|
16
18
|
})
|
|
17
19
|
.catch((err) => {
|
|
18
|
-
sendError(server, ctx, BasedErrorCode.FunctionError, {
|
|
19
|
-
route,
|
|
20
|
-
streamRequestId,
|
|
20
|
+
sendError(props.server, props.ctx, BasedErrorCode.FunctionError, {
|
|
21
|
+
route: props.route,
|
|
22
|
+
streamRequestId: props.id,
|
|
21
23
|
err,
|
|
22
24
|
});
|
|
23
25
|
});
|
|
@@ -97,12 +99,19 @@ export const registerStream = (arr, start, len, isDeflate, ctx, server) => {
|
|
|
97
99
|
seqId: 0,
|
|
98
100
|
};
|
|
99
101
|
ctx.session.streams[reqId] = streamPayload;
|
|
100
|
-
authorize(
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
102
|
+
authorize({
|
|
103
|
+
route,
|
|
104
|
+
server,
|
|
105
|
+
ctx,
|
|
106
|
+
payload: streamPayload,
|
|
107
|
+
id: reqId,
|
|
108
|
+
error: () => {
|
|
109
|
+
if (!ctx.session) {
|
|
110
|
+
return true;
|
|
111
|
+
}
|
|
112
|
+
delete ctx.session.streams[reqId];
|
|
113
|
+
},
|
|
114
|
+
}).then(startStreamFunction);
|
|
106
115
|
return true;
|
|
107
116
|
};
|
|
108
117
|
const getMaxChunkSize = (server) => {
|
|
@@ -144,7 +153,6 @@ export const receiveChunkStream = (arr, start, len, isDeflate, ctx, server) => {
|
|
|
144
153
|
return true;
|
|
145
154
|
}
|
|
146
155
|
streamPayload.seqId = seqId === 255 ? 0 : seqId;
|
|
147
|
-
// encoding can still be a thing for streams test with png's
|
|
148
156
|
const chunk = !isDeflate
|
|
149
157
|
? arr.slice(infoLen + start, start + len)
|
|
150
158
|
: zlib.inflateRawSync(arr.slice(infoLen + start, start + len));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../src/incoming/ws/stream.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,UAAU,EACV,4BAA4B,EAC5B,aAAa,EACb,iCAAiC,EACjC,eAAe,GAChB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,SAAS,MAAM,YAAY,CAAA;AAClC,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../src/incoming/ws/stream.ts"],"names":[],"mappings":"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"}
|
package/dist/installFn.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
export declare const installFn: <R extends BasedRoute
|
|
1
|
+
import { BasedRoute, BasedFunctionConfig, Session } from '@based/functions';
|
|
2
|
+
import { FunctionProps } from './types.js';
|
|
3
|
+
export declare const installFn: <S extends Session = Session, R extends BasedRoute = BasedRoute, P = any>(props: FunctionProps<S, R, P>) => Promise<null | BasedFunctionConfig<R["type"]>>;
|
package/dist/installFn.js
CHANGED
|
@@ -1,38 +1,39 @@
|
|
|
1
1
|
import { isClientContext, isBasedFunctionConfig, } from '@based/functions';
|
|
2
2
|
import { sendSimpleError } from './sendError.js';
|
|
3
3
|
import { BasedErrorCode } from '@based/errors';
|
|
4
|
-
const functionNotFound = (
|
|
5
|
-
if (!isClientContext(ctx)) {
|
|
4
|
+
const functionNotFound = (props) => {
|
|
5
|
+
if (!isClientContext(props.ctx)) {
|
|
6
6
|
return;
|
|
7
7
|
}
|
|
8
|
-
sendSimpleError(server, ctx, BasedErrorCode.FunctionNotFound, { type: route.type, name: route.name }, id);
|
|
8
|
+
sendSimpleError(props.server, props.ctx, BasedErrorCode.FunctionNotFound, { type: props.route.type, name: props.route.name }, props.id);
|
|
9
9
|
};
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
// make this a function hander as well
|
|
11
|
+
export const installFn = async (props) => {
|
|
12
|
+
if (!props.route) {
|
|
12
13
|
return null;
|
|
13
14
|
}
|
|
14
|
-
const { type, name } = route;
|
|
15
|
+
const { type, name } = props.route;
|
|
15
16
|
try {
|
|
16
|
-
const spec = await server.functions.install(name);
|
|
17
|
-
if (!ctx.session) {
|
|
17
|
+
const spec = await props.server.functions.install(name);
|
|
18
|
+
if (!props.ctx.session) {
|
|
18
19
|
return null;
|
|
19
20
|
}
|
|
20
21
|
if (spec === null) {
|
|
21
|
-
functionNotFound(
|
|
22
|
+
functionNotFound(props);
|
|
22
23
|
return null;
|
|
23
24
|
}
|
|
24
|
-
if (!isBasedFunctionConfig(type, route)) {
|
|
25
|
-
if (!isClientContext(ctx)) {
|
|
25
|
+
if (!isBasedFunctionConfig(type, props.route)) {
|
|
26
|
+
if (!isClientContext(props.ctx)) {
|
|
26
27
|
return null;
|
|
27
28
|
}
|
|
28
|
-
sendSimpleError(server, ctx, BasedErrorCode.FunctionIsWrongType, { name, type }, id);
|
|
29
|
+
sendSimpleError(props.server, props.ctx, BasedErrorCode.FunctionIsWrongType, { name, type }, props.id);
|
|
29
30
|
return null;
|
|
30
31
|
}
|
|
31
32
|
// @ts-ignore Fixed by chekcing the specs
|
|
32
33
|
return spec;
|
|
33
34
|
}
|
|
34
35
|
catch (err) {
|
|
35
|
-
functionNotFound(
|
|
36
|
+
functionNotFound(props);
|
|
36
37
|
}
|
|
37
38
|
return null;
|
|
38
39
|
};
|
package/dist/installFn.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installFn.js","sourceRoot":"","sources":["../src/installFn.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EAGf,qBAAqB,
|
|
1
|
+
{"version":3,"file":"installFn.js","sourceRoot":"","sources":["../src/installFn.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EAGf,qBAAqB,GAGtB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAG9C,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAwB,EAAE;IACvD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,OAAM;IACR,CAAC;IACD,eAAe,CACb,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,GAAG,EACT,cAAc,CAAC,gBAAgB,EAC/B,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,EAClD,KAAK,CAAC,EAAE,CACT,CAAA;AACH,CAAC,CAAA;AAED,sCAAsC;AACtC,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAK5B,KAA6B,EACmB,EAAE;IAClD,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACjB,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,KAAK,CAAA;IAClC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACvD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACvB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,gBAAgB,CAAC,KAAK,CAAC,CAAA;YACvB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,OAAO,IAAI,CAAA;YACb,CAAC;YACD,eAAe,CACb,KAAK,CAAC,MAAM,EACZ,KAAK,CAAC,GAAG,EACT,cAAc,CAAC,mBAAmB,EAClC,EAAE,IAAI,EAAE,IAAI,EAAE,EACd,KAAK,CAAC,EAAE,CACT,CAAA;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,yCAAyC;QACzC,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,gBAAgB,CAAC,KAAK,CAAC,CAAA;IACzB,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}
|
package/dist/protocol.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { FunctionServerType } from '@based/protocol/client-server';
|
|
2
|
+
import { WebSocketSession } from '@based/functions';
|
|
1
3
|
export declare const COMPRESS_FROM_BYTES = 150;
|
|
2
4
|
export declare const decodeHeader: (nr: number) => {
|
|
3
|
-
type:
|
|
5
|
+
type: FunctionServerType;
|
|
4
6
|
isDeflate: boolean;
|
|
5
7
|
len: number;
|
|
6
8
|
};
|
|
@@ -11,6 +13,7 @@ export declare const CONTENT_TYPE_UNDEFINED_U8: Uint8Array<ArrayBuffer>;
|
|
|
11
13
|
export declare const CONTENT_TYPE_NULL_U8: Uint8Array<ArrayBuffer>;
|
|
12
14
|
export declare const CONTENT_TYPE_VERSION_1_U8: Uint8Array<ArrayBuffer>;
|
|
13
15
|
export declare const CONTENT_TYPE_DB_QUERY: Uint8Array<ArrayBuffer>;
|
|
16
|
+
export declare const parseIncomingQueryPayload: (arr: Uint8Array, start: number, headerLen: number, len: number, session: WebSocketSession, isDeflate: boolean) => any;
|
|
14
17
|
export declare const cacheV2toV1: (buf: Uint8Array) => Uint8Array;
|
|
15
18
|
export declare const diffV2toV1: (buf: Uint8Array) => Uint8Array;
|
|
16
19
|
export type ValueBuffer = {
|
|
@@ -34,4 +37,3 @@ export declare const encodeAuthResponse: (val: ValueBuffer) => Uint8Array;
|
|
|
34
37
|
export declare const encodeErrorResponse: (val: ValueBuffer) => Uint8Array;
|
|
35
38
|
export declare const encodeChannelMessage: (id: number, val: ValueBuffer) => Uint8Array;
|
|
36
39
|
export declare const encodeReload: (type: number, seqId: number) => Uint8Array;
|
|
37
|
-
export declare const decode: (buffer: Uint8Array, isOldClient: boolean) => any;
|