@based/server 6.8.0 → 7.0.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/auth/defaultConfig.js +4 -9
- package/dist/auth/defaultConfig.js.map +1 -1
- package/dist/auth/index.d.ts +3 -3
- package/dist/auth/index.js +21 -24
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/parseAuthState.js +3 -5
- package/dist/auth/parseAuthState.js.map +1 -1
- package/dist/auth/parseJSONAuthState.js +1 -3
- package/dist/auth/parseJSONAuthState.js.map +1 -1
- package/dist/authorize.d.ts +2 -2
- package/dist/authorize.js +17 -22
- package/dist/authorize.js.map +1 -1
- package/dist/channel/cleanup.d.ts +1 -1
- package/dist/channel/cleanup.js +2 -6
- package/dist/channel/cleanup.js.map +1 -1
- package/dist/channel/create.d.ts +2 -2
- package/dist/channel/create.js +5 -9
- package/dist/channel/create.js.map +1 -1
- package/dist/channel/destroy.d.ts +2 -2
- package/dist/channel/destroy.js +7 -12
- package/dist/channel/destroy.js.map +1 -1
- package/dist/channel/extend.d.ts +3 -3
- package/dist/channel/extend.js +2 -7
- package/dist/channel/extend.js.map +1 -1
- package/dist/channel/get.d.ts +2 -2
- package/dist/channel/get.js +4 -9
- package/dist/channel/get.js.map +1 -1
- package/dist/channel/index.d.ts +8 -8
- package/dist/channel/index.js +8 -24
- package/dist/channel/index.js.map +1 -1
- package/dist/channel/start.d.ts +1 -1
- package/dist/channel/start.js +10 -15
- package/dist/channel/start.js.map +1 -1
- package/dist/channel/subscribe.d.ts +1 -1
- package/dist/channel/subscribe.js +8 -13
- package/dist/channel/subscribe.js.map +1 -1
- package/dist/channel/types.js +1 -2
- package/dist/channel/types.js.map +1 -1
- package/dist/channel/unsub.d.ts +1 -1
- package/dist/channel/unsub.js +7 -13
- package/dist/channel/unsub.js.map +1 -1
- package/dist/compress.d.ts +1 -1
- package/dist/compress.js +9 -16
- package/dist/compress.js.map +1 -1
- package/dist/error/errorTypeHandlers.d.ts +1 -1
- package/dist/error/errorTypeHandlers.js +20 -23
- package/dist/error/errorTypeHandlers.js.map +1 -1
- package/dist/error/index.d.ts +4 -4
- package/dist/error/index.js +10 -29
- package/dist/error/index.js.map +1 -1
- package/dist/error/types.js +3 -6
- package/dist/error/types.js.map +1 -1
- package/dist/functionApi/callFunction.d.ts +1 -1
- package/dist/functionApi/callFunction.js +10 -14
- package/dist/functionApi/callFunction.js.map +1 -1
- package/dist/functionApi/channelSubscribe.d.ts +1 -1
- package/dist/functionApi/channelSubscribe.js +14 -18
- package/dist/functionApi/channelSubscribe.js.map +1 -1
- package/dist/functionApi/client/channel.js +12 -12
- package/dist/functionApi/client/channel.js.map +1 -1
- package/dist/functionApi/client/index.d.ts +4 -4
- package/dist/functionApi/client/index.js +15 -21
- package/dist/functionApi/client/index.js.map +1 -1
- package/dist/functionApi/client/query.d.ts +1 -1
- package/dist/functionApi/client/query.js +9 -10
- package/dist/functionApi/client/query.js.map +1 -1
- package/dist/functionApi/get.d.ts +1 -1
- package/dist/functionApi/get.js +17 -21
- package/dist/functionApi/get.js.map +1 -1
- package/dist/functionApi/index.d.ts +7 -8
- package/dist/functionApi/index.js +7 -26
- package/dist/functionApi/index.js.map +1 -1
- package/dist/functionApi/observe.d.ts +2 -2
- package/dist/functionApi/observe.js +15 -19
- package/dist/functionApi/observe.js.map +1 -1
- package/dist/functionApi/publish.d.ts +1 -1
- package/dist/functionApi/publish.js +7 -11
- package/dist/functionApi/publish.js.map +1 -1
- package/dist/functionApi/stream.d.ts +1 -1
- package/dist/functionApi/stream.js +13 -17
- package/dist/functionApi/stream.js.map +1 -1
- package/dist/functions/genVersion.js +8 -12
- package/dist/functions/genVersion.js.map +1 -1
- package/dist/functions/index.d.ts +5 -4
- package/dist/functions/index.js +54 -59
- package/dist/functions/index.js.map +1 -1
- package/dist/functions/timeout.js +2 -7
- package/dist/functions/timeout.js.map +1 -1
- package/dist/functions/types.d.ts +1 -1
- package/dist/functions/types.js +1 -2
- package/dist/incoming/http/function.d.ts +1 -1
- package/dist/incoming/http/function.js +13 -17
- package/dist/incoming/http/function.js.map +1 -1
- package/dist/incoming/http/handleRequest.d.ts +3 -0
- package/dist/incoming/http/handleRequest.js +11 -0
- package/dist/incoming/http/handleRequest.js.map +1 -0
- package/dist/incoming/http/index.d.ts +1 -1
- package/dist/incoming/http/index.js +54 -90
- package/dist/incoming/http/index.js.map +1 -1
- package/dist/incoming/http/parseQuery.d.ts +2 -2
- package/dist/incoming/http/parseQuery.js +9 -8
- package/dist/incoming/http/parseQuery.js.map +1 -1
- package/dist/incoming/http/publish.d.ts +1 -1
- package/dist/incoming/http/publish.js +16 -20
- package/dist/incoming/http/publish.js.map +1 -1
- package/dist/incoming/http/query.d.ts +1 -1
- package/dist/incoming/http/query.js +32 -46
- package/dist/incoming/http/query.js.map +1 -1
- package/dist/incoming/http/readBody.d.ts +1 -1
- package/dist/incoming/http/readBody.js +17 -25
- package/dist/incoming/http/readBody.js.map +1 -1
- package/dist/incoming/http/streamFunction/getExtension.js +3 -8
- package/dist/incoming/http/streamFunction/getExtension.js.map +1 -1
- package/dist/incoming/http/streamFunction/index.d.ts +1 -1
- package/dist/incoming/http/streamFunction/index.js +8 -12
- package/dist/incoming/http/streamFunction/index.js.map +1 -1
- package/dist/incoming/http/streamFunction/multiPart/index.d.ts +1 -1
- package/dist/incoming/http/streamFunction/multiPart/index.js +12 -19
- 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 +11 -16
- package/dist/incoming/http/streamFunction/multiPart/readFormData.js.map +1 -1
- package/dist/incoming/http/streamFunction/stream/createStream.d.ts +1 -1
- package/dist/incoming/http/streamFunction/stream/createStream.js +13 -18
- package/dist/incoming/http/streamFunction/stream/createStream.js.map +1 -1
- package/dist/incoming/http/streamFunction/stream/index.d.ts +1 -1
- package/dist/incoming/http/streamFunction/stream/index.js +19 -26
- package/dist/incoming/http/streamFunction/stream/index.js.map +1 -1
- package/dist/incoming/index.d.ts +1 -1
- package/dist/incoming/index.js +19 -24
- package/dist/incoming/index.js.map +1 -1
- package/dist/incoming/upgrade.d.ts +1 -1
- package/dist/incoming/upgrade.js +8 -13
- package/dist/incoming/upgrade.js.map +1 -1
- package/dist/incoming/ws/auth.d.ts +2 -2
- package/dist/incoming/ws/auth.js +19 -25
- package/dist/incoming/ws/auth.js.map +1 -1
- package/dist/incoming/ws/channelPublish.d.ts +1 -1
- package/dist/incoming/ws/channelPublish.js +17 -21
- package/dist/incoming/ws/channelPublish.js.map +1 -1
- package/dist/incoming/ws/channelSubscribe.d.ts +2 -2
- package/dist/incoming/ws/channelSubscribe.js +32 -38
- package/dist/incoming/ws/channelSubscribe.js.map +1 -1
- package/dist/incoming/ws/function.d.ts +1 -1
- package/dist/incoming/ws/function.js +23 -27
- package/dist/incoming/ws/function.js.map +1 -1
- package/dist/incoming/ws/get.d.ts +1 -1
- package/dist/incoming/ws/get.js +34 -38
- package/dist/incoming/ws/get.js.map +1 -1
- package/dist/incoming/ws/index.d.ts +1 -1
- package/dist/incoming/ws/index.js +19 -23
- package/dist/incoming/ws/index.js.map +1 -1
- package/dist/incoming/ws/query.d.ts +2 -2
- package/dist/incoming/ws/query.js +26 -32
- package/dist/incoming/ws/query.js.map +1 -1
- package/dist/incoming/ws/types.d.ts +1 -1
- package/dist/incoming/ws/types.js +1 -2
- package/dist/index.d.ts +9 -9
- package/dist/index.js +9 -29
- package/dist/index.js.map +1 -1
- package/dist/installFn.d.ts +3 -3
- package/dist/installFn.js +10 -14
- package/dist/installFn.js.map +1 -1
- package/dist/protocol.d.ts +1 -1
- package/dist/protocol.js +55 -78
- package/dist/protocol.js.map +1 -1
- package/dist/query/cleanup.d.ts +1 -1
- package/dist/query/cleanup.js +2 -6
- package/dist/query/cleanup.js.map +1 -1
- package/dist/query/create.d.ts +2 -2
- package/dist/query/create.js +5 -9
- package/dist/query/create.js.map +1 -1
- package/dist/query/destroy.d.ts +2 -2
- package/dist/query/destroy.js +7 -12
- package/dist/query/destroy.js.map +1 -1
- package/dist/query/extendCache.d.ts +1 -1
- package/dist/query/extendCache.js +1 -5
- package/dist/query/extendCache.js.map +1 -1
- package/dist/query/genObservableId.js +4 -8
- package/dist/query/genObservableId.js.map +1 -1
- package/dist/query/get.d.ts +2 -2
- package/dist/query/get.js +4 -9
- package/dist/query/get.js.map +1 -1
- package/dist/query/index.d.ts +10 -10
- package/dist/query/index.js +10 -26
- package/dist/query/index.js.map +1 -1
- package/dist/query/send.d.ts +2 -2
- package/dist/query/send.js +8 -13
- package/dist/query/send.js.map +1 -1
- package/dist/query/start/error.d.ts +2 -2
- package/dist/query/start/error.js +6 -10
- package/dist/query/start/error.js.map +1 -1
- package/dist/query/start/index.d.ts +1 -1
- package/dist/query/start/index.js +14 -19
- package/dist/query/start/index.js.map +1 -1
- package/dist/query/start/relay.d.ts +2 -2
- package/dist/query/start/relay.js +3 -7
- package/dist/query/start/relay.js.map +1 -1
- package/dist/query/start/update.d.ts +2 -2
- package/dist/query/start/update.js +18 -19
- package/dist/query/start/update.js.map +1 -1
- package/dist/query/subscribe.d.ts +3 -3
- package/dist/query/subscribe.js +13 -19
- package/dist/query/subscribe.js.map +1 -1
- package/dist/query/types.d.ts +1 -1
- package/dist/query/types.js +1 -2
- package/dist/query/unsub.d.ts +2 -2
- package/dist/query/unsub.js +7 -13
- package/dist/query/unsub.js.map +1 -1
- package/dist/security.d.ts +1 -1
- package/dist/security.js +8 -14
- package/dist/security.js.map +1 -1
- package/dist/sendError.d.ts +2 -2
- package/dist/sendError.js +21 -28
- package/dist/sendError.js.map +1 -1
- package/dist/sendHttpResponse.d.ts +1 -1
- package/dist/sendHttpResponse.js +11 -17
- package/dist/sendHttpResponse.js.map +1 -1
- package/dist/server.d.ts +8 -8
- package/dist/server.js +73 -64
- package/dist/server.js.map +1 -1
- package/dist/verifyRoute.d.ts +2 -2
- package/dist/verifyRoute.js +13 -17
- package/dist/verifyRoute.js.map +1 -1
- package/package.json +10 -14
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
1
|
+
import { updateId, valueToBuffer, encodeObservableResponse, encodeObservableDiffResponse, } from '../../protocol.js';
|
|
2
|
+
import { deepCopy } from '@saulx/utils';
|
|
3
|
+
import { hashObjectIgnoreKeyOrder, hash } from '@saulx/hash';
|
|
4
|
+
import { createPatch } from '@saulx/diff';
|
|
5
|
+
export const updateListener = (server, obs, data, checksum, reusedData, diff, previousChecksum, isDeflate) => {
|
|
6
|
+
if (!server.uwsApp) {
|
|
7
|
+
return;
|
|
8
|
+
}
|
|
9
9
|
if (checksum === undefined) {
|
|
10
10
|
if (data === undefined) {
|
|
11
11
|
checksum = 0;
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
14
14
|
if (typeof data === 'object' && data !== null) {
|
|
15
|
-
checksum =
|
|
15
|
+
checksum = hashObjectIgnoreKeyOrder(data);
|
|
16
16
|
}
|
|
17
17
|
else {
|
|
18
|
-
checksum =
|
|
18
|
+
checksum = hash(data);
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
21
|
}
|
|
@@ -38,7 +38,7 @@ const updateListener = (server, obs, data, checksum, reusedData, diff, previousC
|
|
|
38
38
|
}
|
|
39
39
|
else {
|
|
40
40
|
obs.reusedCache = false;
|
|
41
|
-
const buff =
|
|
41
|
+
const buff = valueToBuffer(data);
|
|
42
42
|
const t = typeof data;
|
|
43
43
|
if (t === 'string' || t === 'number' || t === 'boolean') {
|
|
44
44
|
obs.rawData = data;
|
|
@@ -62,10 +62,10 @@ const updateListener = (server, obs, data, checksum, reusedData, diff, previousC
|
|
|
62
62
|
else if (previousChecksum === undefined) {
|
|
63
63
|
if (t === 'object' && data !== null) {
|
|
64
64
|
if (obs.rawData) {
|
|
65
|
-
diff =
|
|
65
|
+
diff = createPatch(obs.rawData, data);
|
|
66
66
|
obs.previousChecksum = obs.checksum;
|
|
67
67
|
}
|
|
68
|
-
obs.rawData =
|
|
68
|
+
obs.rawData = deepCopy(data);
|
|
69
69
|
}
|
|
70
70
|
else if (obs.rawData) {
|
|
71
71
|
delete obs.rawData;
|
|
@@ -73,10 +73,10 @@ const updateListener = (server, obs, data, checksum, reusedData, diff, previousC
|
|
|
73
73
|
}
|
|
74
74
|
// TODO: Keep track globally of total mem usage
|
|
75
75
|
;
|
|
76
|
-
[encodedData, isDeflate] =
|
|
76
|
+
[encodedData, isDeflate] = encodeObservableResponse(obs.id, checksum, buff);
|
|
77
77
|
if (diff) {
|
|
78
|
-
const diffBuff =
|
|
79
|
-
const encodedDiffData =
|
|
78
|
+
const diffBuff = valueToBuffer(diff);
|
|
79
|
+
const encodedDiffData = encodeObservableDiffResponse(obs.id, checksum, obs.previousChecksum, diffBuff);
|
|
80
80
|
obs.diffCache = encodedDiffData;
|
|
81
81
|
}
|
|
82
82
|
}
|
|
@@ -88,13 +88,13 @@ const updateListener = (server, obs, data, checksum, reusedData, diff, previousC
|
|
|
88
88
|
if (obs.clients.size) {
|
|
89
89
|
if (obs.diffCache) {
|
|
90
90
|
if (obs.reusedCache) {
|
|
91
|
-
prevDiffId =
|
|
91
|
+
prevDiffId = updateId(obs.diffCache, obs.id);
|
|
92
92
|
}
|
|
93
93
|
server.uwsApp.publish(String(obs.id), obs.diffCache, true, false);
|
|
94
94
|
}
|
|
95
95
|
else {
|
|
96
96
|
if (obs.reusedCache) {
|
|
97
|
-
prevId =
|
|
97
|
+
prevId = updateId(encodedData, obs.id);
|
|
98
98
|
}
|
|
99
99
|
server.uwsApp.publish(String(obs.id), encodedData, true, false);
|
|
100
100
|
}
|
|
@@ -117,5 +117,4 @@ const updateListener = (server, obs, data, checksum, reusedData, diff, previousC
|
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
119
|
};
|
|
120
|
-
exports.updateListener = updateListener;
|
|
121
120
|
//# sourceMappingURL=update.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/query/start/update.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/query/start/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BasedServer } from '../server';
|
|
2
|
-
import { ActiveObservable, ObservableUpdateFunction } from './types';
|
|
3
|
-
import { BasedErrorCode, BasedErrorData } from '../error';
|
|
1
|
+
import { BasedServer } from '../server.js';
|
|
2
|
+
import { ActiveObservable, ObservableUpdateFunction } from './types.js';
|
|
3
|
+
import { BasedErrorCode, BasedErrorData } from '../error/index.js';
|
|
4
4
|
import { WebSocketSession, Context } from '@based/functions';
|
|
5
5
|
export declare const subscribeWs: (server: BasedServer, id: number, checksum: number, ctx: Context<WebSocketSession>) => void;
|
|
6
6
|
export declare const subscribeFunction: (server: BasedServer, id: number, update: ObservableUpdateFunction) => void;
|
package/dist/query/subscribe.js
CHANGED
|
@@ -1,21 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const
|
|
6
|
-
const get_1 = require("./get");
|
|
7
|
-
const sendError_1 = require("../sendError");
|
|
8
|
-
const subscribeWs = (server, id, checksum, ctx) => {
|
|
1
|
+
import { extendCache } from './extendCache.js';
|
|
2
|
+
import { sendObsWs } from './send.js';
|
|
3
|
+
import { getObsAndStopRemove } from './get.js';
|
|
4
|
+
import { sendErrorData } from '../sendError.js';
|
|
5
|
+
export const subscribeWs = (server, id, checksum, ctx) => {
|
|
9
6
|
const session = ctx.session;
|
|
10
7
|
if (!session) {
|
|
11
8
|
return;
|
|
12
9
|
}
|
|
13
10
|
ctx.session.ws.subscribe(String(id));
|
|
14
|
-
const obs =
|
|
11
|
+
const obs = getObsAndStopRemove(server, id);
|
|
15
12
|
session.obs.add(id);
|
|
16
13
|
obs.clients.add(session.id);
|
|
17
14
|
if (obs.error) {
|
|
18
|
-
|
|
15
|
+
sendErrorData(ctx, obs.error);
|
|
19
16
|
return;
|
|
20
17
|
}
|
|
21
18
|
if (server.queryEvents) {
|
|
@@ -23,16 +20,15 @@ const subscribeWs = (server, id, checksum, ctx) => {
|
|
|
23
20
|
}
|
|
24
21
|
if (obs.cache && obs.checksum !== checksum) {
|
|
25
22
|
if (obs.diffCache && obs.previousChecksum === checksum) {
|
|
26
|
-
|
|
23
|
+
sendObsWs(ctx, obs.diffCache, obs);
|
|
27
24
|
}
|
|
28
25
|
else {
|
|
29
|
-
|
|
26
|
+
sendObsWs(ctx, obs.cache, obs);
|
|
30
27
|
}
|
|
31
28
|
}
|
|
32
29
|
};
|
|
33
|
-
|
|
34
|
-
const
|
|
35
|
-
const obs = (0, get_1.getObsAndStopRemove)(server, id);
|
|
30
|
+
export const subscribeFunction = (server, id, update) => {
|
|
31
|
+
const obs = getObsAndStopRemove(server, id);
|
|
36
32
|
if (obs.functionObserveClients.add(update)) {
|
|
37
33
|
if (server.queryEvents) {
|
|
38
34
|
server.queryEvents.subscribe(obs);
|
|
@@ -42,13 +38,11 @@ const subscribeFunction = (server, id, update) => {
|
|
|
42
38
|
}
|
|
43
39
|
}
|
|
44
40
|
};
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
(0, extendCache_1.extendCache)(obs);
|
|
41
|
+
export const subscribeNext = (obs, onNext) => {
|
|
42
|
+
extendCache(obs);
|
|
48
43
|
if (!obs.onNextData) {
|
|
49
44
|
obs.onNextData = new Set();
|
|
50
45
|
}
|
|
51
46
|
obs.onNextData.add(onNext);
|
|
52
47
|
};
|
|
53
|
-
exports.subscribeNext = subscribeNext;
|
|
54
48
|
//# sourceMappingURL=subscribe.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/query/subscribe.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"subscribe.js","sourceRoot":"","sources":["../../src/query/subscribe.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACrC,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG/C,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,MAAmB,EACnB,EAAU,EACV,QAAgB,EAChB,GAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAE3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IAED,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACpC,MAAM,GAAG,GAAG,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE3C,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACnB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAE3B,IAAI,GAAG,CAAC,KAAK,EAAE;QACb,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;QAC7B,OAAM;KACP;IAED,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KACvC;IAED,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,EAAE;QAC1C,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,gBAAgB,KAAK,QAAQ,EAAE;YACtD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;SACnC;aAAM;YACL,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;SAC/B;KACF;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,MAAmB,EACnB,EAAU,EACV,MAAgC,EAChC,EAAE;IACF,MAAM,GAAG,GAAG,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAE3C,IAAI,GAAG,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC1C,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;SAClC;QAED,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,MAAM,CACJ,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,QAAQ,EACZ,IAAI,EACJ,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,CACd,CAAA;SACF;KACF;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,GAAqB,EACrB,MAAoE,EACpE,EAAE;IACF,WAAW,CAAC,GAAG,CAAC,CAAA;IAChB,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE;QACnB,GAAG,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAA;KAC3B;IACD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC5B,CAAC,CAAA"}
|
package/dist/query/types.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BasedErrorCode, BasedErrorData } from '../error';
|
|
1
|
+
import { BasedErrorCode, BasedErrorData } from '../error/index.js';
|
|
2
2
|
export type ObservableError = BasedErrorData<BasedErrorCode.FunctionError> | BasedErrorData<BasedErrorCode.FunctionIsWrongType> | BasedErrorData<BasedErrorCode.FunctionNotFound>;
|
|
3
3
|
export type ObservableUpdateFunction = (data: any, checksum?: number, err?: null | ObservableError, cache?: Uint8Array, diff?: any, fromChecksum?: number, isDeflate?: boolean) => void;
|
|
4
4
|
export type ObserveErrorListener = (err: ObservableError) => void;
|
package/dist/query/types.js
CHANGED
package/dist/query/unsub.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BasedServer } from '../server';
|
|
1
|
+
import { BasedServer } from '../server.js';
|
|
2
2
|
import { WebSocketSession, Context } from '@based/functions';
|
|
3
|
-
import { ObservableUpdateFunction } from './types';
|
|
3
|
+
import { ObservableUpdateFunction } from './types.js';
|
|
4
4
|
export declare const unsubscribeFunction: (server: BasedServer, id: number, update: ObservableUpdateFunction) => true | void;
|
|
5
5
|
export declare const unsubscribeWs: (server: BasedServer, id: number, ctx: Context<WebSocketSession>) => true | void;
|
|
6
6
|
export declare const unsubscribeWsIgnoreClient: (server: BasedServer, id: number, ctx: Context<WebSocketSession>) => true | void;
|
package/dist/query/unsub.js
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.unsubscribeWsIgnoreClient = exports.unsubscribeWs = exports.unsubscribeFunction = void 0;
|
|
4
|
-
const destroy_1 = require("./destroy");
|
|
5
|
-
const unsubscribeFunction = (server, id, update) => {
|
|
1
|
+
import { destroyObs } from './destroy.js';
|
|
2
|
+
export const unsubscribeFunction = (server, id, update) => {
|
|
6
3
|
const obs = server.activeObservablesById.get(id);
|
|
7
4
|
if (!obs) {
|
|
8
5
|
return;
|
|
@@ -11,12 +8,11 @@ const unsubscribeFunction = (server, id, update) => {
|
|
|
11
8
|
if (server.queryEvents) {
|
|
12
9
|
server.queryEvents.unsubscribe(obs);
|
|
13
10
|
}
|
|
14
|
-
|
|
11
|
+
destroyObs(server, id);
|
|
15
12
|
return true;
|
|
16
13
|
}
|
|
17
14
|
};
|
|
18
|
-
|
|
19
|
-
const unsubscribeWs = (server, id, ctx) => {
|
|
15
|
+
export const unsubscribeWs = (server, id, ctx) => {
|
|
20
16
|
const session = ctx.session;
|
|
21
17
|
if (!session || !session.obs.has(id)) {
|
|
22
18
|
return;
|
|
@@ -31,12 +27,11 @@ const unsubscribeWs = (server, id, ctx) => {
|
|
|
31
27
|
if (server.queryEvents) {
|
|
32
28
|
server.queryEvents.unsubscribe(obs, ctx);
|
|
33
29
|
}
|
|
34
|
-
|
|
30
|
+
destroyObs(server, id);
|
|
35
31
|
return true;
|
|
36
32
|
}
|
|
37
33
|
};
|
|
38
|
-
|
|
39
|
-
const unsubscribeWsIgnoreClient = (server, id, ctx) => {
|
|
34
|
+
export const unsubscribeWsIgnoreClient = (server, id, ctx) => {
|
|
40
35
|
const session = ctx.session;
|
|
41
36
|
if (!session) {
|
|
42
37
|
return;
|
|
@@ -48,7 +43,6 @@ const unsubscribeWsIgnoreClient = (server, id, ctx) => {
|
|
|
48
43
|
if (obs.clients.delete(session.id) && server.queryEvents) {
|
|
49
44
|
server.queryEvents.unsubscribe(obs, ctx);
|
|
50
45
|
}
|
|
51
|
-
|
|
46
|
+
destroyObs(server, id);
|
|
52
47
|
};
|
|
53
|
-
exports.unsubscribeWsIgnoreClient = unsubscribeWsIgnoreClient;
|
|
54
48
|
//# sourceMappingURL=unsub.js.map
|
package/dist/query/unsub.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/query/unsub.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"unsub.js","sourceRoot":"","sources":["../../src/query/unsub.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,MAAmB,EACnB,EAAU,EACV,MAAgC,EACnB,EAAE;IACf,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QAC7C,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;SACpC;QACD,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QACpC,OAAM;KACP;IACD,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACtB,IAAI,CAAC,GAAG,EAAE;QACR,OAAM;KACP;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QAClC,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;SACzC;QACD,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QACtB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,MAAmB,EACnB,EAAU,EACV,GAA8B,EACjB,EAAE;IACf,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAA;IAC3B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAM;KACP;IACD,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,IAAI,CAAA;KACZ;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE;QACxD,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;KACzC;IACD,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC,CAAA"}
|
package/dist/security.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { BasedServer } from './server';
|
|
1
|
+
import type { BasedServer } from './server.js';
|
|
2
2
|
import uws from '@based/uws';
|
|
3
3
|
import { HttpSession, WebSocketSession, Context } from '@based/functions';
|
|
4
4
|
export declare const rateLimitRequest: (server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, tokens: number, max: number) => boolean;
|
package/dist/security.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.blockIncomingRequest = exports.endRateLimitHttp = exports.rateLimitRequest = void 0;
|
|
4
|
-
const error_1 = require("./error");
|
|
1
|
+
import { BasedErrorCode } from './error/index.js';
|
|
5
2
|
var IsBlocked;
|
|
6
3
|
(function (IsBlocked) {
|
|
7
4
|
IsBlocked[IsBlocked["notBlocked"] = 0] = "notBlocked";
|
|
@@ -26,7 +23,7 @@ const drainRequestCounter = (server) => {
|
|
|
26
23
|
}
|
|
27
24
|
if (blockedEvents.size) {
|
|
28
25
|
server.emit('error', server.client.ctx, {
|
|
29
|
-
code:
|
|
26
|
+
code: BasedErrorCode.Block,
|
|
30
27
|
blockedEvents,
|
|
31
28
|
});
|
|
32
29
|
blockedEvents.clear();
|
|
@@ -55,7 +52,7 @@ const incomingRequestCounter = (server, ip, tokens, max) => {
|
|
|
55
52
|
}
|
|
56
53
|
return 0;
|
|
57
54
|
};
|
|
58
|
-
const rateLimitRequest = (server, ctx, tokens, max) => {
|
|
55
|
+
export const rateLimitRequest = (server, ctx, tokens, max) => {
|
|
59
56
|
if (!ctx.session) {
|
|
60
57
|
return false;
|
|
61
58
|
}
|
|
@@ -65,19 +62,17 @@ const rateLimitRequest = (server, ctx, tokens, max) => {
|
|
|
65
62
|
return false;
|
|
66
63
|
}
|
|
67
64
|
if (code === 2) {
|
|
68
|
-
server.emit('error', ctx, { code:
|
|
65
|
+
server.emit('error', ctx, { code: BasedErrorCode.RateLimit });
|
|
69
66
|
}
|
|
70
67
|
return true;
|
|
71
68
|
};
|
|
72
|
-
|
|
73
|
-
const endRateLimitHttp = (res) => {
|
|
69
|
+
export const endRateLimitHttp = (res) => {
|
|
74
70
|
res.cork(() => {
|
|
75
71
|
res.writeStatus('429 Too Many Requests');
|
|
76
72
|
res.end();
|
|
77
73
|
});
|
|
78
74
|
};
|
|
79
|
-
|
|
80
|
-
const blockIncomingRequest = (server, ip, res, req, max, tokens) => {
|
|
75
|
+
export const blockIncomingRequest = (server, ip, res, req, max, tokens) => {
|
|
81
76
|
if (server.allowedIps.has(ip)) {
|
|
82
77
|
return false;
|
|
83
78
|
}
|
|
@@ -100,10 +95,9 @@ const blockIncomingRequest = (server, ip, res, req, max, tokens) => {
|
|
|
100
95
|
ua: req.getHeader('user-agent'),
|
|
101
96
|
ip,
|
|
102
97
|
},
|
|
103
|
-
}, { code:
|
|
98
|
+
}, { code: BasedErrorCode.RateLimit });
|
|
104
99
|
}
|
|
105
|
-
|
|
100
|
+
endRateLimitHttp(res);
|
|
106
101
|
return true;
|
|
107
102
|
};
|
|
108
|
-
exports.blockIncomingRequest = blockIncomingRequest;
|
|
109
103
|
//# sourceMappingURL=security.js.map
|
package/dist/security.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../src/security.ts"],"names":[],"mappings":"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"}
|
package/dist/sendError.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { BasedServer } from './server';
|
|
1
|
+
import { BasedServer } from './server.js';
|
|
2
2
|
import { HttpSession, WebSocketSession, Context, BasedRoute } from '@based/functions';
|
|
3
|
-
import { BasedErrorCode, ErrorPayload, BasedErrorData } from './error';
|
|
3
|
+
import { BasedErrorCode, ErrorPayload, BasedErrorData } from './error/index.js';
|
|
4
4
|
export declare function sendHttpError<T extends BasedErrorCode>(server: BasedServer, ctx: Context<HttpSession>, basedCode: T, payload: ErrorPayload[T]): void;
|
|
5
5
|
export declare function sendErrorData(ctx: Context<WebSocketSession | HttpSession>, errorData: BasedErrorData): void;
|
|
6
6
|
export declare function sendError<T extends BasedErrorCode>(server: BasedServer, ctx: Context<WebSocketSession | HttpSession>, basedCode: T, payload: ErrorPayload[T]): void;
|
package/dist/sendError.js
CHANGED
|
@@ -1,10 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const functions_1 = require("@based/functions");
|
|
6
|
-
const protocol_1 = require("./protocol");
|
|
7
|
-
const error_1 = require("./error");
|
|
1
|
+
import { end } from './sendHttpResponse.js';
|
|
2
|
+
import { isHttpContext, isWsSession, } from '@based/functions';
|
|
3
|
+
import { valueToBuffer, encodeErrorResponse } from './protocol.js';
|
|
4
|
+
import { createError, } from './error/index.js';
|
|
8
5
|
const sendHttpErrorData = (errorData, ctx) => {
|
|
9
6
|
const { code, message, statusCode, statusMessage } = errorData;
|
|
10
7
|
ctx.session.res.cork(() => {
|
|
@@ -12,46 +9,43 @@ const sendHttpErrorData = (errorData, ctx) => {
|
|
|
12
9
|
if (ctx.session.method !== 'options') {
|
|
13
10
|
ctx.session.res.writeHeader('Content-Type', 'application/json');
|
|
14
11
|
}
|
|
15
|
-
|
|
12
|
+
end(ctx, JSON.stringify({
|
|
16
13
|
error: message,
|
|
17
14
|
code,
|
|
18
15
|
}));
|
|
19
16
|
});
|
|
20
17
|
};
|
|
21
|
-
function sendHttpError(server, ctx, basedCode, payload) {
|
|
18
|
+
export function sendHttpError(server, ctx, basedCode, payload) {
|
|
22
19
|
if (!ctx.session) {
|
|
23
20
|
return;
|
|
24
21
|
}
|
|
25
|
-
const errData =
|
|
22
|
+
const errData = createError(server, ctx, basedCode, payload);
|
|
26
23
|
sendHttpErrorData(errData, ctx);
|
|
27
24
|
}
|
|
28
|
-
|
|
29
|
-
function sendErrorData(ctx, errorData) {
|
|
25
|
+
export function sendErrorData(ctx, errorData) {
|
|
30
26
|
if (!ctx.session) {
|
|
31
27
|
return;
|
|
32
28
|
}
|
|
33
|
-
if (
|
|
29
|
+
if (isHttpContext(ctx)) {
|
|
34
30
|
sendHttpErrorData(errorData, ctx);
|
|
35
31
|
}
|
|
36
|
-
else if (
|
|
37
|
-
ctx.session.ws.send(
|
|
32
|
+
else if (isWsSession(ctx.session)) {
|
|
33
|
+
ctx.session.ws.send(encodeErrorResponse(valueToBuffer(errorData)), true, false);
|
|
38
34
|
}
|
|
39
35
|
}
|
|
40
|
-
|
|
41
|
-
function sendError(server, ctx, basedCode, payload) {
|
|
36
|
+
export function sendError(server, ctx, basedCode, payload) {
|
|
42
37
|
if (!ctx.session) {
|
|
43
38
|
return;
|
|
44
39
|
}
|
|
45
|
-
if (
|
|
40
|
+
if (isHttpContext(ctx)) {
|
|
46
41
|
return sendHttpError(server, ctx, basedCode, payload);
|
|
47
42
|
}
|
|
48
|
-
else if (
|
|
49
|
-
const errorData =
|
|
50
|
-
ctx.session.ws.send(
|
|
43
|
+
else if (isWsSession(ctx.session)) {
|
|
44
|
+
const errorData = createError(server, ctx, basedCode, payload);
|
|
45
|
+
ctx.session.ws.send(encodeErrorResponse(valueToBuffer(errorData)), true, false);
|
|
51
46
|
}
|
|
52
47
|
}
|
|
53
|
-
|
|
54
|
-
function sendSimpleError(server, ctx, basedCode, route, id, payload) {
|
|
48
|
+
export function sendSimpleError(server, ctx, basedCode, route, id, payload) {
|
|
55
49
|
if (!ctx.session) {
|
|
56
50
|
return;
|
|
57
51
|
}
|
|
@@ -74,13 +68,12 @@ function sendSimpleError(server, ctx, basedCode, route, id, payload) {
|
|
|
74
68
|
}
|
|
75
69
|
: { route };
|
|
76
70
|
}
|
|
77
|
-
if (
|
|
71
|
+
if (isHttpContext(ctx)) {
|
|
78
72
|
return sendHttpError(server, ctx, basedCode, payload);
|
|
79
73
|
}
|
|
80
|
-
else if (
|
|
81
|
-
const errorData =
|
|
82
|
-
ctx.session.ws.send(
|
|
74
|
+
else if (isWsSession(ctx.session)) {
|
|
75
|
+
const errorData = createError(server, ctx, basedCode, payload);
|
|
76
|
+
ctx.session.ws.send(encodeErrorResponse(valueToBuffer(errorData)), true, false);
|
|
83
77
|
}
|
|
84
78
|
}
|
|
85
|
-
exports.sendSimpleError = sendSimpleError;
|
|
86
79
|
//# sourceMappingURL=sendError.js.map
|
package/dist/sendError.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendError.js","sourceRoot":"","sources":["../src/sendError.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sendError.js","sourceRoot":"","sources":["../src/sendError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAE3C,OAAO,EAIL,aAAa,EACb,WAAW,GAEZ,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AAClE,OAAO,EAGL,WAAW,GAEZ,MAAM,kBAAkB,CAAA;AAEzB,MAAM,iBAAiB,GAAG,CACxB,SAAyB,EACzB,GAAyB,EACzB,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;IAC9D,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE;QACxB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,UAAU,IAAI,aAAa,EAAE,CAAC,CAAA;QAC7D,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;YACpC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAA;SAChE;QACD,GAAG,CACD,GAAG,EACH,IAAI,CAAC,SAAS,CAAC;YACb,KAAK,EAAE,OAAO;YACd,IAAI;SACL,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,UAAU,aAAa,CAC3B,MAAmB,EACnB,GAAyB,EACzB,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;IAC5D,iBAAiB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA;AACjC,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAA4C,EAC5C,SAAyB;IAEzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE;QACtB,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;KAClC;SAAM,IAAI,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CACjB,mBAAmB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,MAAmB,EACnB,GAA4C,EAC5C,SAAY,EACZ,OAAwB;IAExB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE;QACtB,OAAO,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;KACtD;SAAM,IAAI,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC9D,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CACjB,mBAAmB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,MAAmB,EACnB,GAA4C,EAC5C,SAAY,EACZ,KAAiB,EACjB,EAAW,EACX,OAAyB;IAEzB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE;QAChB,OAAM;KACP;IACD,IAAI,CAAC,OAAO,EAAE;QACZ,yBAAyB;QACzB,OAAO,GAAG,EAAE;YACV,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO;gBACtB,CAAC,CAAC;oBACE,KAAK;oBACL,YAAY,EAAE,EAAE;iBACjB;gBACH,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS;oBAC1B,CAAC,CAAC;wBACE,KAAK;wBACL,SAAS,EAAE,EAAE;qBACd;oBACH,CAAC,CAAC;wBACE,KAAK;wBACL,SAAS,EAAE,EAAE;qBACd;YACL,CAAC,CAAC,EAAE,KAAK,EAAE,CAAA;KACd;IAED,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE;QACtB,OAAO,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;KACtD;SAAM,IAAI,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QACnC,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC9D,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CACjB,mBAAmB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAC7C,IAAI,EACJ,KAAK,CACN,CAAA;KACF;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import { Context, HttpSession, HttpHeaders } from '@based/functions';
|
|
3
3
|
export declare const end: (ctx: Context<HttpSession>, payload?: string | Buffer | Uint8Array) => void;
|
|
4
4
|
export declare const sendHeaders: (ctx: Context<HttpSession>, headers: HttpHeaders) => void;
|
package/dist/sendHttpResponse.js
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const stream_1 = require("stream");
|
|
5
|
-
const compress_1 = require("./compress");
|
|
6
|
-
const end = (ctx, payload) => {
|
|
1
|
+
import { Duplex, Readable } from 'stream';
|
|
2
|
+
import { compress } from './compress.js';
|
|
3
|
+
export const end = (ctx, payload) => {
|
|
7
4
|
if (!ctx.session) {
|
|
8
5
|
return;
|
|
9
6
|
}
|
|
@@ -22,8 +19,7 @@ const end = (ctx, payload) => {
|
|
|
22
19
|
ctx.session.req = null;
|
|
23
20
|
ctx.session = null;
|
|
24
21
|
};
|
|
25
|
-
|
|
26
|
-
const sendHeaders = (ctx, headers) => {
|
|
22
|
+
export const sendHeaders = (ctx, headers) => {
|
|
27
23
|
for (const header in headers) {
|
|
28
24
|
const value = headers[header];
|
|
29
25
|
ctx.session.res.writeHeader(header, Array.isArray(value)
|
|
@@ -33,8 +29,7 @@ const sendHeaders = (ctx, headers) => {
|
|
|
33
29
|
: String(value));
|
|
34
30
|
}
|
|
35
31
|
};
|
|
36
|
-
|
|
37
|
-
const sendHttpResponse = (ctx, result, headers, statusCode = '200 OK') => {
|
|
32
|
+
export const sendHttpResponse = (ctx, result, headers, statusCode = '200 OK') => {
|
|
38
33
|
// handle custom http response here...
|
|
39
34
|
if (!ctx.session) {
|
|
40
35
|
return;
|
|
@@ -45,7 +40,7 @@ const sendHttpResponse = (ctx, result, headers, statusCode = '200 OK') => {
|
|
|
45
40
|
ctx.session.res.cork(() => {
|
|
46
41
|
ctx.session.res.writeStatus(statusCode);
|
|
47
42
|
if (headers) {
|
|
48
|
-
|
|
43
|
+
sendHeaders(ctx, headers);
|
|
49
44
|
}
|
|
50
45
|
ctx.session.res.end();
|
|
51
46
|
});
|
|
@@ -56,11 +51,11 @@ const sendHttpResponse = (ctx, result, headers, statusCode = '200 OK') => {
|
|
|
56
51
|
parsed = result;
|
|
57
52
|
// TODO: more check here
|
|
58
53
|
}
|
|
59
|
-
else if (result instanceof
|
|
54
|
+
else if (result instanceof Readable || result instanceof Duplex) {
|
|
60
55
|
ctx.session.res.cork(() => {
|
|
61
56
|
ctx.session.res.writeStatus(statusCode);
|
|
62
57
|
if (headers) {
|
|
63
|
-
|
|
58
|
+
sendHeaders(ctx, headers);
|
|
64
59
|
}
|
|
65
60
|
});
|
|
66
61
|
result.on('data', (d) => {
|
|
@@ -75,14 +70,14 @@ const sendHttpResponse = (ctx, result, headers, statusCode = '200 OK') => {
|
|
|
75
70
|
cType = 'application/json';
|
|
76
71
|
parsed = JSON.stringify(result);
|
|
77
72
|
}
|
|
78
|
-
|
|
73
|
+
compress(parsed, headers && ('Content-Encoding' in headers || 'content-encoding' in headers)
|
|
79
74
|
? undefined
|
|
80
75
|
: ctx.session.headers.encoding).then(({ payload, encoding }) => {
|
|
81
76
|
if (ctx.session?.res) {
|
|
82
77
|
ctx.session.res.cork(() => {
|
|
83
78
|
ctx.session.res.writeStatus(statusCode);
|
|
84
79
|
if (headers) {
|
|
85
|
-
|
|
80
|
+
sendHeaders(ctx, headers);
|
|
86
81
|
if (!('Cache-Control' in headers || 'cache-control' in headers)) {
|
|
87
82
|
ctx.session.res.writeHeader('Cache-Control', 'max-age=0, must-revalidate');
|
|
88
83
|
}
|
|
@@ -96,10 +91,9 @@ const sendHttpResponse = (ctx, result, headers, statusCode = '200 OK') => {
|
|
|
96
91
|
if (encoding) {
|
|
97
92
|
ctx.session.res.writeHeader('Content-Encoding', encoding);
|
|
98
93
|
}
|
|
99
|
-
|
|
94
|
+
end(ctx, payload);
|
|
100
95
|
});
|
|
101
96
|
}
|
|
102
97
|
});
|
|
103
98
|
};
|
|
104
|
-
exports.sendHttpResponse = sendHttpResponse;
|
|
105
99
|
//# sourceMappingURL=sendHttpResponse.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendHttpResponse.js","sourceRoot":"","sources":["../src/sendHttpResponse.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sendHttpResponse.js","sourceRoot":"","sources":["../src/sendHttpResponse.ts"],"names":[],"mappings":"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"}
|