@based/server 4.0.3 → 4.0.5
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/auth/defaultConfig.js +1 -1
- package/dist/auth/defaultConfig.js.map +1 -1
- package/dist/auth/index.d.ts +14 -2
- package/dist/auth/index.js +12 -5
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/parseJSONAuthState.d.ts +3 -0
- package/dist/auth/parseJSONAuthState.js +10 -0
- package/dist/auth/parseJSONAuthState.js.map +1 -0
- package/dist/authorize copy.d.ts +9 -0
- package/dist/authorize copy.js +69 -0
- package/dist/authorize copy.js.map +1 -0
- package/dist/authorize.d.ts +5 -5
- package/dist/authorize.js +33 -17
- package/dist/authorize.js.map +1 -1
- package/dist/authorizeAndInstall.d.ts +9 -0
- package/dist/authorizeAndInstall.js +69 -0
- package/dist/authorizeAndInstall.js.map +1 -0
- package/dist/channel/cleanup.d.ts +2 -0
- package/dist/channel/cleanup.js +53 -0
- package/dist/channel/cleanup.js.map +1 -0
- package/dist/channel/create.d.ts +3 -0
- package/dist/channel/create.js +33 -0
- package/dist/channel/create.js.map +1 -0
- package/dist/channel/destroy.d.ts +4 -0
- package/dist/channel/destroy.js +48 -0
- package/dist/channel/destroy.js.map +1 -0
- package/dist/channel/extend.d.ts +4 -0
- package/dist/channel/extend.js +16 -0
- package/dist/channel/extend.js.map +1 -0
- package/dist/channel/get.d.ts +4 -0
- package/dist/channel/get.js +15 -0
- package/dist/channel/get.js.map +1 -0
- package/dist/channel/index.d.ts +8 -0
- package/dist/channel/index.js +25 -0
- package/dist/channel/index.js.map +1 -0
- package/dist/channel/start.d.ts +2 -0
- package/dist/channel/start.js +76 -0
- package/dist/channel/start.js.map +1 -0
- package/dist/channel/subscribe.d.ts +4 -0
- package/dist/channel/subscribe.js +28 -0
- package/dist/channel/subscribe.js.map +1 -0
- package/dist/channel/types.d.ts +14 -0
- package/dist/channel/types.js +4 -0
- package/dist/channel/types.js.map +1 -0
- package/dist/channel/unsub.d.ts +5 -0
- package/dist/channel/unsub.js +49 -0
- package/dist/channel/unsub.js.map +1 -0
- package/dist/createSimpleServer.d.ts +18 -16
- package/dist/createSimpleServer.js +92 -26
- package/dist/createSimpleServer.js.map +1 -1
- package/dist/error/errorTypeHandlers.d.ts +1 -1
- package/dist/error/errorTypeHandlers.js +16 -46
- package/dist/error/errorTypeHandlers.js.map +1 -1
- package/dist/error/index.js +3 -0
- package/dist/error/index.js.map +1 -1
- package/dist/error/types.d.ts +22 -27
- package/dist/error/types.js +2 -6
- package/dist/error/types.js.map +1 -1
- package/dist/functionApi/channelSubscribe.d.ts +3 -0
- package/dist/functionApi/channelSubscribe.js +43 -0
- package/dist/functionApi/channelSubscribe.js.map +1 -0
- package/dist/functionApi/client/channel.d.ts +10 -0
- package/dist/functionApi/client/channel.js +33 -0
- package/dist/functionApi/client/channel.js.map +1 -0
- package/dist/functionApi/client/index.d.ts +5 -3
- package/dist/functionApi/client/index.js +10 -5
- package/dist/functionApi/client/index.js.map +1 -1
- package/dist/functionApi/get.js +2 -2
- package/dist/functionApi/get.js.map +1 -1
- package/dist/functionApi/index.d.ts +3 -0
- package/dist/functionApi/index.js +3 -1
- package/dist/functionApi/index.js.map +1 -1
- package/dist/functionApi/observe.js +2 -2
- package/dist/functionApi/observe.js.map +1 -1
- package/dist/functionApi/publish.d.ts +3 -0
- package/dist/functionApi/publish.js +29 -0
- package/dist/functionApi/publish.js.map +1 -0
- package/dist/functionApi/stream.d.ts +2 -2
- package/dist/functionApi/stream.js +44 -6
- package/dist/functionApi/stream.js.map +1 -1
- package/dist/functions/index.d.ts +3 -2
- package/dist/functions/index.js +55 -34
- package/dist/functions/index.js.map +1 -1
- package/dist/functions/timeout.js +4 -2
- package/dist/functions/timeout.js.map +1 -1
- package/dist/functions/types.d.ts +100 -56
- package/dist/functions/types.js +16 -5
- package/dist/functions/types.js.map +1 -1
- package/dist/incoming/http/function.js +26 -28
- package/dist/incoming/http/function.js.map +1 -1
- package/dist/incoming/http/index.js +33 -7
- package/dist/incoming/http/index.js.map +1 -1
- package/dist/incoming/http/publish.d.ts +3 -0
- package/dist/incoming/http/publish.js +82 -0
- package/dist/incoming/http/publish.js.map +1 -0
- package/dist/incoming/http/query.js +13 -23
- package/dist/incoming/http/query.js.map +1 -1
- package/dist/incoming/http/streamFunction/multiPart/index.js +9 -9
- package/dist/incoming/http/streamFunction/multiPart/index.js.map +1 -1
- package/dist/incoming/http/streamFunction/multiPart/readFormData.d.ts +1 -1
- package/dist/incoming/http/streamFunction/multiPart/readFormData.js +2 -2
- package/dist/incoming/http/streamFunction/multiPart/readFormData.js.map +1 -1
- package/dist/incoming/http/streamFunction/stream/createStream.d.ts +2 -3
- package/dist/incoming/http/streamFunction/stream/createStream.js +2 -2
- package/dist/incoming/http/streamFunction/stream/createStream.js.map +1 -1
- package/dist/incoming/http/streamFunction/stream/index.js +4 -3
- package/dist/incoming/http/streamFunction/stream/index.js.map +1 -1
- package/dist/incoming/index.d.ts +1 -1
- package/dist/incoming/index.js +66 -54
- package/dist/incoming/index.js.map +1 -1
- package/dist/incoming/upgrade.js +19 -12
- package/dist/incoming/upgrade.js.map +1 -1
- package/dist/incoming/ws/auth.d.ts +1 -1
- package/dist/incoming/ws/auth.js +70 -22
- package/dist/incoming/ws/auth.js.map +1 -1
- package/dist/incoming/ws/channelPublish.d.ts +2 -0
- package/dist/incoming/ws/channelPublish.js +60 -0
- package/dist/incoming/ws/channelPublish.js.map +1 -0
- package/dist/incoming/ws/channelSubscribe.d.ts +7 -0
- package/dist/incoming/ws/channelSubscribe.js +128 -0
- package/dist/incoming/ws/channelSubscribe.js.map +1 -0
- package/dist/incoming/ws/function.js +14 -7
- package/dist/incoming/ws/function.js.map +1 -1
- package/dist/incoming/ws/get.js +33 -29
- package/dist/incoming/ws/get.js.map +1 -1
- package/dist/incoming/ws/index.js +22 -2
- package/dist/incoming/ws/index.js.map +1 -1
- package/dist/incoming/ws/observable.js +24 -21
- package/dist/incoming/ws/observable.js.map +1 -1
- package/dist/incoming/ws/types.d.ts +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/installFn.js +32 -34
- package/dist/installFn.js.map +1 -1
- package/dist/observable/cleanup.d.ts +2 -0
- package/dist/observable/cleanup.js +66 -0
- package/dist/observable/cleanup.js.map +1 -0
- package/dist/observable/create.js +1 -0
- package/dist/observable/create.js.map +1 -1
- package/dist/observable/destroy.d.ts +2 -0
- package/dist/observable/destroy.js +26 -30
- package/dist/observable/destroy.js.map +1 -1
- package/dist/observable/extendCache.js +2 -3
- package/dist/observable/extendCache.js.map +1 -1
- package/dist/observable/genObservableId.js +3 -0
- package/dist/observable/genObservableId.js.map +1 -1
- package/dist/observable/get.d.ts +1 -1
- package/dist/observable/get.js +3 -3
- package/dist/observable/get.js.map +1 -1
- package/dist/observable/send.d.ts +1 -1
- package/dist/observable/send.js +2 -2
- package/dist/observable/send.js.map +1 -1
- package/dist/observable/start/error.d.ts +1 -1
- package/dist/observable/start/error.js +7 -2
- package/dist/observable/start/error.js.map +1 -1
- package/dist/observable/start/index.js +3 -1
- package/dist/observable/start/index.js.map +1 -1
- package/dist/observable/start/update.d.ts +1 -4
- package/dist/observable/start/update.js +0 -1
- package/dist/observable/start/update.js.map +1 -1
- package/dist/observable/subscribe.d.ts +1 -1
- package/dist/observable/subscribe.js +7 -8
- package/dist/observable/subscribe.js.map +1 -1
- package/dist/observable/types.d.ts +9 -9
- package/dist/observable/unsub.d.ts +1 -1
- package/dist/observable/unsub.js +9 -6
- package/dist/observable/unsub.js.map +1 -1
- package/dist/protocol.d.ts +1 -0
- package/dist/protocol.js +60 -48
- package/dist/protocol.js.map +1 -1
- package/dist/security.js +1 -0
- package/dist/security.js.map +1 -1
- package/dist/sendError.js +2 -4
- package/dist/sendError.js.map +1 -1
- package/dist/sendHttpResponse.js +16 -3
- package/dist/sendHttpResponse.js.map +1 -1
- package/dist/server.d.ts +24 -12
- package/dist/server.js +14 -8
- package/dist/server.js.map +1 -1
- package/dist/verifyRoute.d.ts +4 -3
- package/dist/verifyRoute.js +31 -20
- package/dist/verifyRoute.js.map +1 -1
- package/package.json +7 -7
- package/dist/functionApi/callFunction copy.d.ts +0 -3
- package/dist/functionApi/callFunction copy.js +0 -29
- package/dist/functionApi/callFunction copy.js.map +0 -1
- package/dist/incoming/http/get.d.ts +0 -4
- package/dist/incoming/http/get.js +0 -156
- package/dist/incoming/http/get.js.map +0 -1
- package/dist/incoming/http/streamFunction/DataStream.d.ts +0 -15
- package/dist/incoming/http/streamFunction/DataStream.js +0 -58
- package/dist/incoming/http/streamFunction/DataStream.js.map +0 -1
package/dist/incoming/upgrade.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.upgradeAuthorize = exports.upgrade = void 0;
|
|
|
4
4
|
const auth_1 = require("../auth");
|
|
5
5
|
const security_1 = require("../security");
|
|
6
6
|
const ip_1 = require("../ip");
|
|
7
|
-
|
|
7
|
+
// import { BasedErrorCode } from '../error'
|
|
8
8
|
let clientId = 0;
|
|
9
9
|
const upgradeInternal = (server, res, req,
|
|
10
10
|
// eslint-disable-next-line
|
|
@@ -12,14 +12,20 @@ ctx, ip) => {
|
|
|
12
12
|
const secWebSocketProtocol = req.getHeader('sec-websocket-protocol');
|
|
13
13
|
const ua = req.getHeader('user-agent');
|
|
14
14
|
if (!secWebSocketProtocol) {
|
|
15
|
-
server.emit(
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
15
|
+
// server.emit(
|
|
16
|
+
// 'error',
|
|
17
|
+
// {
|
|
18
|
+
// session: {
|
|
19
|
+
// ua,
|
|
20
|
+
// ip,
|
|
21
|
+
// },
|
|
22
|
+
// },
|
|
23
|
+
// { code: BasedErrorCode.MissingAuthStateProtocolHeader }
|
|
24
|
+
// )
|
|
25
|
+
// res.close()
|
|
26
|
+
// return
|
|
27
|
+
// TODO: fix this, no bueno
|
|
28
|
+
console.warn('No sec-websocket-protocol in handshake...');
|
|
23
29
|
}
|
|
24
30
|
const query = req.getQuery();
|
|
25
31
|
const secWebSocketKey = req.getHeader('sec-websocket-key');
|
|
@@ -30,9 +36,10 @@ ctx, ip) => {
|
|
|
30
36
|
ua,
|
|
31
37
|
ip,
|
|
32
38
|
id: ++clientId,
|
|
33
|
-
authState:
|
|
39
|
+
authState: secWebSocketProtocol
|
|
40
|
+
? (0, auth_1.parseAuthState)(secWebSocketProtocol)
|
|
41
|
+
: {},
|
|
34
42
|
obs: new Set(),
|
|
35
|
-
unauthorizedObs: new Set(),
|
|
36
43
|
}, secWebSocketKey, secWebSocketProtocol, secWebSocketExtensions, ctx);
|
|
37
44
|
};
|
|
38
45
|
const upgrade = (server, res, req,
|
|
@@ -56,7 +63,7 @@ ctx) => {
|
|
|
56
63
|
if ((0, security_1.blockIncomingRequest)(server, ip, res, req, server.rateLimit.ws, 10)) {
|
|
57
64
|
return;
|
|
58
65
|
}
|
|
59
|
-
server.auth.authorizeConnection(server.client, req).then((authorized) => {
|
|
66
|
+
server.auth.authorizeConnection(server.client, req, ip).then((authorized) => {
|
|
60
67
|
if (aborted) {
|
|
61
68
|
return;
|
|
62
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/incoming/upgrade.ts"],"names":[],"mappings":";;;AACA,kCAAwC;
|
|
1
|
+
{"version":3,"file":"upgrade.js","sourceRoot":"","sources":["../../src/incoming/upgrade.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,4 @@ import { BasedServer } from '../../server';
|
|
|
2
2
|
import { WebSocketSession, Context } from '@based/functions';
|
|
3
3
|
import { BinaryMessageHandler } from './types';
|
|
4
4
|
export declare const authMessage: BinaryMessageHandler;
|
|
5
|
-
export declare const sendAndVerifyAuthMessage: (server: BasedServer, ctx: Context<WebSocketSession>) => void
|
|
5
|
+
export declare const sendAndVerifyAuthMessage: (server: BasedServer, ctx: Context<WebSocketSession>) => Promise<void>;
|
package/dist/incoming/ws/auth.js
CHANGED
|
@@ -4,7 +4,9 @@ exports.sendAndVerifyAuthMessage = exports.authMessage = void 0;
|
|
|
4
4
|
const protocol_1 = require("../../protocol");
|
|
5
5
|
const observable_1 = require("./observable");
|
|
6
6
|
const security_1 = require("../../security");
|
|
7
|
-
const
|
|
7
|
+
const channelSubscribe_1 = require("./channelSubscribe");
|
|
8
|
+
const installFn_1 = require("../../installFn");
|
|
9
|
+
const sendAuthMessage = (ctx, payload) => ctx.session?.ws.send((0, protocol_1.encodeAuthResponse)((0, protocol_1.valueToBuffer)(payload)), true, false);
|
|
8
10
|
const parse = (payload) => {
|
|
9
11
|
try {
|
|
10
12
|
return JSON.parse(payload);
|
|
@@ -15,43 +17,89 @@ const parse = (payload) => {
|
|
|
15
17
|
};
|
|
16
18
|
const authMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
17
19
|
if ((0, security_1.rateLimitRequest)(server, ctx, 10, server.rateLimit.ws)) {
|
|
18
|
-
ctx.session.close();
|
|
20
|
+
ctx.session.ws.close();
|
|
19
21
|
return false;
|
|
20
22
|
}
|
|
21
23
|
// | 4 header | * payload |
|
|
22
24
|
const payload = (0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 4, start + len)), isDeflate);
|
|
23
25
|
const authState = parse(payload);
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
26
|
+
server.auth
|
|
27
|
+
.verifyAuthState(server.client, ctx, authState)
|
|
28
|
+
.then((verified) => {
|
|
29
|
+
const session = ctx.session;
|
|
30
|
+
if (!session) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
session.authState = verified === true ? authState : verified;
|
|
34
|
+
if (verified !== true && verified.error) {
|
|
35
|
+
sendAuthMessage(ctx, verified);
|
|
36
|
+
return true;
|
|
37
|
+
}
|
|
38
|
+
if (session.unauthorizedObs?.size) {
|
|
39
|
+
session.unauthorizedObs.forEach((obs) => {
|
|
40
|
+
const { id, name, checksum, payload } = obs;
|
|
41
|
+
const route = {
|
|
42
|
+
name,
|
|
43
|
+
query: true,
|
|
44
|
+
};
|
|
45
|
+
(0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
|
|
46
|
+
if (spec) {
|
|
47
|
+
(0, observable_1.enableSubscribe)(route, spec, server, ctx, payload, id, checksum);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
// someting wrong...
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
session.unauthorizedObs.clear();
|
|
55
|
+
}
|
|
56
|
+
if (session.unauthorizedChannels?.size) {
|
|
57
|
+
session.unauthorizedChannels.forEach((channel) => {
|
|
58
|
+
const { id, name, payload } = channel;
|
|
59
|
+
const route = {
|
|
60
|
+
name,
|
|
61
|
+
channel: true,
|
|
62
|
+
};
|
|
63
|
+
(0, installFn_1.installFn)(server, ctx, route, id).then((spec) => {
|
|
64
|
+
if (spec) {
|
|
65
|
+
(0, channelSubscribe_1.enableChannelSubscribe)(route, spec, server, ctx, payload, id);
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
session.unauthorizedChannels.clear();
|
|
70
|
+
}
|
|
27
71
|
sendAuthMessage(ctx, verified);
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
ctx
|
|
39
|
-
}
|
|
40
|
-
sendAuthMessage(ctx, verified);
|
|
72
|
+
})
|
|
73
|
+
.catch((err) => {
|
|
74
|
+
const session = ctx.session;
|
|
75
|
+
if (!session) {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
const authState = {
|
|
79
|
+
error: err.message,
|
|
80
|
+
};
|
|
81
|
+
session.authState = authState;
|
|
82
|
+
sendAuthMessage(ctx, authState);
|
|
83
|
+
});
|
|
41
84
|
return true;
|
|
42
85
|
};
|
|
43
86
|
exports.authMessage = authMessage;
|
|
44
87
|
// send and verify
|
|
45
|
-
const sendAndVerifyAuthMessage = (server, ctx) => {
|
|
46
|
-
|
|
88
|
+
const sendAndVerifyAuthMessage = async (server, ctx) => {
|
|
89
|
+
const session = ctx.session;
|
|
90
|
+
if (!session) {
|
|
47
91
|
return;
|
|
48
92
|
}
|
|
49
|
-
const verified = server.auth
|
|
93
|
+
const verified = await server.auth
|
|
94
|
+
.verifyAuthState(server.client, ctx, session.authState)
|
|
95
|
+
.catch((err) => {
|
|
96
|
+
return { error: err.message };
|
|
97
|
+
});
|
|
50
98
|
if (verified === true) {
|
|
51
99
|
sendAuthMessage(ctx, true);
|
|
52
100
|
return;
|
|
53
101
|
}
|
|
54
|
-
|
|
102
|
+
session.authState = verified;
|
|
55
103
|
sendAuthMessage(ctx, verified);
|
|
56
104
|
};
|
|
57
105
|
exports.sendAndVerifyAuthMessage = sendAndVerifyAuthMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/incoming/ws/auth.ts"],"names":[],"mappings":";;;AAAA,6CAIuB;AAEvB,6CAA8C;AAC9C,6CAAiD;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/incoming/ws/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.channelPublishMessage = void 0;
|
|
4
|
+
const protocol_1 = require("../../protocol");
|
|
5
|
+
const security_1 = require("../../security");
|
|
6
|
+
const verifyRoute_1 = require("../../verifyRoute");
|
|
7
|
+
const channel_1 = require("../../channel");
|
|
8
|
+
const authorize_1 = require("../../authorize");
|
|
9
|
+
const sendError_1 = require("../../sendError");
|
|
10
|
+
const error_1 = require("../../error");
|
|
11
|
+
const publish = (route, spec, server, ctx, payload, id) => {
|
|
12
|
+
const channel = server.activeChannelsById.get(id);
|
|
13
|
+
if (!channel) {
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
try {
|
|
17
|
+
spec.publish(server.client, channel.payload, payload, channel.id, ctx);
|
|
18
|
+
}
|
|
19
|
+
catch (err) {
|
|
20
|
+
(0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
|
|
21
|
+
channelId: id,
|
|
22
|
+
err,
|
|
23
|
+
route,
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
};
|
|
27
|
+
const channelPublishMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
28
|
+
// | 4 header | 8 id | * payload |
|
|
29
|
+
const id = (0, protocol_1.readUint8)(arr, start + 4, 8);
|
|
30
|
+
// how to determine it does not exist?
|
|
31
|
+
if (!(0, channel_1.hasChannel)(server, id)) {
|
|
32
|
+
if ((0, security_1.rateLimitRequest)(server, ctx, 1, server.rateLimit.ws)) {
|
|
33
|
+
ctx.session.ws.close();
|
|
34
|
+
return false;
|
|
35
|
+
}
|
|
36
|
+
ctx.session.ws.send(arr.slice(start, start + len), true, false);
|
|
37
|
+
return true;
|
|
38
|
+
}
|
|
39
|
+
const channel = server.activeChannelsById.get(id);
|
|
40
|
+
(0, channel_1.extendChannel)(server, channel);
|
|
41
|
+
const name = channel.name;
|
|
42
|
+
const route = (0, verifyRoute_1.verifyRoute)(server, ctx, 'channel', server.functions.route(name), name);
|
|
43
|
+
if (route === null) {
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.ws)) {
|
|
47
|
+
ctx.session.ws.close();
|
|
48
|
+
return false;
|
|
49
|
+
}
|
|
50
|
+
if (len > route.maxPayloadSize) {
|
|
51
|
+
return true;
|
|
52
|
+
}
|
|
53
|
+
const payload = len === 12
|
|
54
|
+
? undefined
|
|
55
|
+
: (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 12, start + len)), isDeflate));
|
|
56
|
+
(0, authorize_1.authorize)(route, server, ctx, payload, publish, id, undefined, route.publisher?.public);
|
|
57
|
+
return true;
|
|
58
|
+
};
|
|
59
|
+
exports.channelPublishMessage = channelPublishMessage;
|
|
60
|
+
//# sourceMappingURL=channelPublish.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channelPublish.js","sourceRoot":"","sources":["../../../src/incoming/ws/channelPublish.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { BasedChannelFunctionRoute } from '../../functions';
|
|
2
|
+
import { WebSocketSession } from '@based/functions';
|
|
3
|
+
import { IsAuthorizedHandler } from '../../authorize';
|
|
4
|
+
import { BinaryMessageHandler } from './types';
|
|
5
|
+
export declare const enableChannelSubscribe: IsAuthorizedHandler<WebSocketSession, BasedChannelFunctionRoute>;
|
|
6
|
+
export declare const channelSubscribeMessage: BinaryMessageHandler;
|
|
7
|
+
export declare const unsubscribeChannelMessage: BinaryMessageHandler;
|
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.unsubscribeChannelMessage = exports.channelSubscribeMessage = exports.enableChannelSubscribe = void 0;
|
|
4
|
+
const protocol_1 = require("../../protocol");
|
|
5
|
+
const error_1 = require("../../error");
|
|
6
|
+
const sendError_1 = require("../../sendError");
|
|
7
|
+
const security_1 = require("../../security");
|
|
8
|
+
const verifyRoute_1 = require("../../verifyRoute");
|
|
9
|
+
const installFn_1 = require("../../installFn");
|
|
10
|
+
const authorize_1 = require("../../authorize");
|
|
11
|
+
const channel_1 = require("../../channel");
|
|
12
|
+
const enableChannelSubscribe = (route, spec, server, ctx, payload, id) => {
|
|
13
|
+
if ((0, channel_1.hasChannel)(server, id)) {
|
|
14
|
+
(0, channel_1.subscribeChannel)(server, id, ctx);
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
const session = ctx.session;
|
|
18
|
+
if (!session || !session.obs.has(id)) {
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
if (!(0, channel_1.hasChannel)(server, id)) {
|
|
22
|
+
(0, channel_1.createChannel)(server, route.name, id, payload, true);
|
|
23
|
+
}
|
|
24
|
+
(0, channel_1.subscribeChannel)(server, id, ctx);
|
|
25
|
+
};
|
|
26
|
+
exports.enableChannelSubscribe = enableChannelSubscribe;
|
|
27
|
+
const isNotAuthorized = (route, server, ctx, payload, id) => {
|
|
28
|
+
const session = ctx.session;
|
|
29
|
+
if (!session.unauthorizedChannels) {
|
|
30
|
+
session.unauthorizedChannels = new Set();
|
|
31
|
+
}
|
|
32
|
+
session.unauthorizedChannels.add({
|
|
33
|
+
id,
|
|
34
|
+
name: route.name,
|
|
35
|
+
payload,
|
|
36
|
+
});
|
|
37
|
+
};
|
|
38
|
+
const channelSubscribeMessage = (arr, start, len,
|
|
39
|
+
// isDeflate is used differently here
|
|
40
|
+
isChannelIdRequester, ctx, server) => {
|
|
41
|
+
// | 4 header | 8 id | 1 name length | * name | * payload |
|
|
42
|
+
const nameLen = arr[start + 12];
|
|
43
|
+
const id = (0, protocol_1.readUint8)(arr, start + 4, 8);
|
|
44
|
+
const name = (0, protocol_1.decodeName)(arr, start + 13, start + 13 + nameLen);
|
|
45
|
+
if (!name || !id) {
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
const route = (0, verifyRoute_1.verifyRoute)(server, ctx, 'channel', server.functions.route(name), name);
|
|
49
|
+
const tmpRoute = route || {
|
|
50
|
+
rateLimitTokens: 10,
|
|
51
|
+
maxPayloadSize: 500,
|
|
52
|
+
name,
|
|
53
|
+
channel: true,
|
|
54
|
+
};
|
|
55
|
+
if ((0, security_1.rateLimitRequest)(server, ctx,
|
|
56
|
+
// Requesting the id multiple times is something that should not happen - so probably a bad actor
|
|
57
|
+
isChannelIdRequester
|
|
58
|
+
? tmpRoute.rateLimitTokens * 5
|
|
59
|
+
: tmpRoute.rateLimitTokens, server.rateLimit.ws)) {
|
|
60
|
+
return false;
|
|
61
|
+
}
|
|
62
|
+
if (isChannelIdRequester) {
|
|
63
|
+
if (len > tmpRoute.maxPayloadSize * 100) {
|
|
64
|
+
// if size is crazy large then do this must be a mallcontent
|
|
65
|
+
ctx.session.ws.close();
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
68
|
+
// TODO: Add authorization here....
|
|
69
|
+
if (!(0, channel_1.hasChannel)(server, id)) {
|
|
70
|
+
const payload = len === nameLen + 13
|
|
71
|
+
? undefined
|
|
72
|
+
: (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 13 + nameLen, start + len)), false));
|
|
73
|
+
// This has to be done instantly so publish can be received immediatly
|
|
74
|
+
const channel = (0, channel_1.createChannel)(server, name, id, payload, true);
|
|
75
|
+
(0, installFn_1.installFn)(server, ctx, tmpRoute, id).then((spec) => {
|
|
76
|
+
if (spec === null) {
|
|
77
|
+
channel.doesNotExist = true;
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
channel.doesNotExist = false;
|
|
81
|
+
}
|
|
82
|
+
(0, channel_1.destroyChannel)(server, id);
|
|
83
|
+
});
|
|
84
|
+
return true;
|
|
85
|
+
}
|
|
86
|
+
(0, channel_1.extendChannel)(server, server.activeChannelsById.get(id));
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
89
|
+
// // TODO: add strictness setting - if strict return false here
|
|
90
|
+
if (route === null) {
|
|
91
|
+
return true;
|
|
92
|
+
}
|
|
93
|
+
if (len > tmpRoute.maxPayloadSize) {
|
|
94
|
+
(0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.PayloadTooLarge, {
|
|
95
|
+
route: tmpRoute,
|
|
96
|
+
channelId: id,
|
|
97
|
+
});
|
|
98
|
+
return true;
|
|
99
|
+
}
|
|
100
|
+
const session = ctx.session;
|
|
101
|
+
if (session.obs.has(id)) {
|
|
102
|
+
// Allready subscribed to this id
|
|
103
|
+
return true;
|
|
104
|
+
}
|
|
105
|
+
const payload = len === nameLen + 13
|
|
106
|
+
? undefined
|
|
107
|
+
: (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 13 + nameLen, start + len)), false));
|
|
108
|
+
session.obs.add(id);
|
|
109
|
+
(0, authorize_1.authorize)(route, server, ctx, payload, exports.enableChannelSubscribe, id, 0, false, isNotAuthorized);
|
|
110
|
+
return true;
|
|
111
|
+
};
|
|
112
|
+
exports.channelSubscribeMessage = channelSubscribeMessage;
|
|
113
|
+
const unsubscribeChannelMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
114
|
+
// | 4 header | 8 id |
|
|
115
|
+
if (!ctx.session) {
|
|
116
|
+
return false;
|
|
117
|
+
}
|
|
118
|
+
const id = (0, protocol_1.readUint8)(arr, start + 4, 8);
|
|
119
|
+
if (!id) {
|
|
120
|
+
return false;
|
|
121
|
+
}
|
|
122
|
+
if ((0, channel_1.unsubscribeChannel)(server, id, ctx)) {
|
|
123
|
+
ctx.session.ws.unsubscribe(String(id));
|
|
124
|
+
}
|
|
125
|
+
return true;
|
|
126
|
+
};
|
|
127
|
+
exports.unsubscribeChannelMessage = unsubscribeChannelMessage;
|
|
128
|
+
//# sourceMappingURL=channelSubscribe.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channelSubscribe.js","sourceRoot":"","sources":["../../../src/incoming/ws/channelSubscribe.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,14 +6,19 @@ const error_1 = require("../../error");
|
|
|
6
6
|
const sendError_1 = require("../../sendError");
|
|
7
7
|
const security_1 = require("../../security");
|
|
8
8
|
const verifyRoute_1 = require("../../verifyRoute");
|
|
9
|
-
const installFn_1 = require("../../installFn");
|
|
10
9
|
const authorize_1 = require("../../authorize");
|
|
11
|
-
const
|
|
12
|
-
|
|
10
|
+
const stream_1 = require("stream");
|
|
11
|
+
const utils_1 = require("@saulx/utils");
|
|
12
|
+
// combine authorize with installfn AuthorizeAndInstall
|
|
13
|
+
const sendFunction = async (route, spec, server, ctx, payload, requestId) => {
|
|
13
14
|
spec
|
|
14
|
-
|
|
15
|
+
.function(server.client, payload, ctx)
|
|
15
16
|
.then(async (v) => {
|
|
16
|
-
|
|
17
|
+
// TODO: allow chunked reply!
|
|
18
|
+
if (v && (v instanceof stream_1.Duplex || v instanceof stream_1.Readable)) {
|
|
19
|
+
v = await (0, utils_1.readStream)(v);
|
|
20
|
+
}
|
|
21
|
+
ctx.session?.ws.send((0, protocol_1.encodeFunctionResponse)(requestId, (0, protocol_1.valueToBuffer)(v)), true, false);
|
|
17
22
|
})
|
|
18
23
|
.catch((err) => {
|
|
19
24
|
(0, sendError_1.sendError)(server, ctx, error_1.BasedErrorCode.FunctionError, {
|
|
@@ -37,7 +42,7 @@ const functionMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
|
37
42
|
return true;
|
|
38
43
|
}
|
|
39
44
|
if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.ws)) {
|
|
40
|
-
ctx.session.close();
|
|
45
|
+
ctx.session.ws.close();
|
|
41
46
|
return false;
|
|
42
47
|
}
|
|
43
48
|
if (len > route.maxPayloadSize) {
|
|
@@ -47,7 +52,9 @@ const functionMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
|
47
52
|
});
|
|
48
53
|
return true;
|
|
49
54
|
}
|
|
50
|
-
const payload =
|
|
55
|
+
const payload = len === nameLen + 8
|
|
56
|
+
? undefined
|
|
57
|
+
: (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 8 + nameLen, start + len)), isDeflate));
|
|
51
58
|
(0, authorize_1.authorize)(route, server, ctx, payload, sendFunction, requestId);
|
|
52
59
|
return true;
|
|
53
60
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/ws/function.ts"],"names":[],"mappings":";;;AAAA,6CAOuB;AACvB,uCAA4C;AAC5C,+CAA2C;AAG3C,6CAAiD;AACjD,mDAA+C;AAC/C,+
|
|
1
|
+
{"version":3,"file":"function.js","sourceRoot":"","sources":["../../../src/incoming/ws/function.ts"],"names":[],"mappings":"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"}
|
package/dist/incoming/ws/get.js
CHANGED
|
@@ -8,7 +8,6 @@ const sendError_1 = require("../../sendError");
|
|
|
8
8
|
const security_1 = require("../../security");
|
|
9
9
|
const verifyRoute_1 = require("../../verifyRoute");
|
|
10
10
|
const authorize_1 = require("../../authorize");
|
|
11
|
-
const installFn_1 = require("../../installFn");
|
|
12
11
|
const sendGetData = (server, id, obs, checksum, ctx) => {
|
|
13
12
|
if (!ctx.session) {
|
|
14
13
|
(0, observable_1.destroyObs)(server, id);
|
|
@@ -18,7 +17,7 @@ const sendGetData = (server, id, obs, checksum, ctx) => {
|
|
|
18
17
|
(0, observable_1.sendObsWs)(ctx, obs.cache, obs);
|
|
19
18
|
}
|
|
20
19
|
else if (checksum === obs.checksum) {
|
|
21
|
-
ctx.session.send((0, protocol_1.encodeGetResponse)(id), true, false);
|
|
20
|
+
ctx.session.ws.send((0, protocol_1.encodeGetResponse)(id), true, false);
|
|
22
21
|
}
|
|
23
22
|
else if (obs.diffCache && obs.previousChecksum === checksum) {
|
|
24
23
|
(0, observable_1.sendObsWs)(ctx, obs.diffCache, obs);
|
|
@@ -29,7 +28,7 @@ const sendGetData = (server, id, obs, checksum, ctx) => {
|
|
|
29
28
|
(0, observable_1.destroyObs)(server, id);
|
|
30
29
|
};
|
|
31
30
|
const getFromExisting = (server, id, ctx, checksum) => {
|
|
32
|
-
const obs = (0, observable_1.
|
|
31
|
+
const obs = (0, observable_1.getObsAndStopRemove)(server, id);
|
|
33
32
|
if (obs.error) {
|
|
34
33
|
(0, observable_1.sendObsGetError)(server, ctx, id, obs.error);
|
|
35
34
|
return;
|
|
@@ -47,35 +46,38 @@ const getFromExisting = (server, id, ctx, checksum) => {
|
|
|
47
46
|
}
|
|
48
47
|
});
|
|
49
48
|
};
|
|
50
|
-
const isAuthorized = (route, server, ctx, payload, id, checksum) => {
|
|
49
|
+
const isAuthorized = (route, spec, server, ctx, payload, id, checksum) => {
|
|
51
50
|
if ((0, observable_1.hasObs)(server, id)) {
|
|
52
51
|
getFromExisting(server, id, ctx, checksum);
|
|
53
52
|
return;
|
|
54
53
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
});
|
|
54
|
+
const session = ctx.session;
|
|
55
|
+
if (!session) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
if ((0, observable_1.hasObs)(server, id)) {
|
|
59
|
+
getFromExisting(server, id, ctx, checksum);
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
const obs = (0, observable_1.createObs)(server, route.name, id, payload, true);
|
|
63
|
+
if (!session.obs.has(id)) {
|
|
64
|
+
(0, observable_1.subscribeNext)(obs, (err) => {
|
|
65
|
+
if (err) {
|
|
66
|
+
(0, observable_1.sendObsGetError)(server, ctx, id, err);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
sendGetData(server, id, obs, checksum, ctx);
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
(0, observable_1.start)(server, id);
|
|
76
74
|
};
|
|
77
75
|
const isNotAuthorized = (route, server, ctx, payload, id, checksum) => {
|
|
78
|
-
ctx.session
|
|
76
|
+
const session = ctx.session;
|
|
77
|
+
if (!session.unauthorizedObs) {
|
|
78
|
+
session.unauthorizedObs = new Set();
|
|
79
|
+
}
|
|
80
|
+
session.unauthorizedObs.add({
|
|
79
81
|
id,
|
|
80
82
|
checksum,
|
|
81
83
|
name: route.name,
|
|
@@ -97,7 +99,7 @@ const getMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
|
97
99
|
return true;
|
|
98
100
|
}
|
|
99
101
|
if ((0, security_1.rateLimitRequest)(server, ctx, route.rateLimitTokens, server.rateLimit.ws)) {
|
|
100
|
-
ctx.session.close();
|
|
102
|
+
ctx.session.ws.close();
|
|
101
103
|
return false;
|
|
102
104
|
}
|
|
103
105
|
if (route.maxPayloadSize !== -1 && len > route.maxPayloadSize) {
|
|
@@ -107,8 +109,10 @@ const getMessage = (arr, start, len, isDeflate, ctx, server) => {
|
|
|
107
109
|
});
|
|
108
110
|
return true;
|
|
109
111
|
}
|
|
110
|
-
const payload =
|
|
111
|
-
|
|
112
|
+
const payload = len === nameLen + 21
|
|
113
|
+
? undefined
|
|
114
|
+
: (0, protocol_1.parsePayload)((0, protocol_1.decodePayload)(new Uint8Array(arr.slice(start + 21 + nameLen, start + len)), isDeflate));
|
|
115
|
+
(0, authorize_1.authorize)(route, server, ctx, payload, isAuthorized, id, checksum, false, isNotAuthorized);
|
|
112
116
|
return true;
|
|
113
117
|
};
|
|
114
118
|
exports.getMessage = getMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/incoming/ws/get.ts"],"names":[],"mappings":";;;AAAA,6CAMuB;AAEvB,iDAUyB;AAGzB,uCAA4C;AAC5C,+CAA2C;AAC3C,6CAAiD;AACjD,mDAA+C;AAC/C,+CAIwB;
|
|
1
|
+
{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../src/incoming/ws/get.ts"],"names":[],"mappings":"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"}
|