@based/server 10.0.3 → 10.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.
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createError } from '../../error/index.js';
|
|
2
|
-
import { encodeErrorResponse, valueToBuffer } from '../../protocol.js';
|
|
2
|
+
import { encodeErrorResponse, valueToBuffer, valueToBufferV1, } from '../../protocol.js';
|
|
3
3
|
import { BasedErrorCode } from '@based/errors';
|
|
4
4
|
export const errorListener = (server, obs, err) => {
|
|
5
5
|
delete obs.cache;
|
|
@@ -27,7 +27,7 @@ export const errorListener = (server, obs, err) => {
|
|
|
27
27
|
server.uwsApp.publish(String(obs.id), encodeErrorResponse(valueToBuffer(obs.error, true)), true, false);
|
|
28
28
|
}
|
|
29
29
|
if (obs.oldClients?.size) {
|
|
30
|
-
server.uwsApp.publish(String(obs.id) + '-v1', encodeErrorResponse(
|
|
30
|
+
server.uwsApp.publish(String(obs.id) + '-v1', encodeErrorResponse(valueToBufferV1(obs.error, true)), true, false);
|
|
31
31
|
}
|
|
32
32
|
// TODO: Change this make it one error handler
|
|
33
33
|
if (obs.functionObserveClients.size) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/query/start/error.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../../src/query/start/error.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,eAAe,GAChB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,MAAmB,EACnB,GAAqB,EACrB,GAA4B,EAC5B,EAAE;IACF,OAAO,GAAG,CAAC,KAAK,CAAA;IAChB,OAAO,GAAG,CAAC,SAAS,CAAA;IACpB,OAAO,GAAG,CAAC,QAAQ,CAAA;IACnB,OAAO,GAAG,CAAC,gBAAgB,CAAA;IAE3B,GAAG,CAAC,SAAS,GAAG,KAAK,CAAA;IACrB,GAAG,CAAC,WAAW,GAAG,KAAK,CAAA;IAEvB,GAAG,CAAC,KAAK;QACP,GAAG,YAAY,KAAK;YAClB,CAAC,CAAC,WAAW,CACT,MAAM,EACN;gBACE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;aACpE,EACD,cAAc,CAAC,aAAa,EAC5B;gBACE,GAAG;gBACH,YAAY,EAAE,GAAG,CAAC,EAAE;gBACpB,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,IAAI,EAAE,OAAO;iBACd;aACF,CACF;YACH,CAAC,CAAC,GAAG,CAAC,YAAY,KAAK,GAAG,CAAC,EAAE;gBAC3B,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,YAAY,EAAE,GAAG,CAAC,EAAE,EAAE;gBAClC,CAAC,CAAC,GAAG,CAAA;IAEX,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,MAAM,CAAC,MAAM,CAAC,OAAO,CACnB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EACd,mBAAmB,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EACnD,IAAI,EACJ,KAAK,CACN,CAAA;IACH,CAAC;IAED,IAAI,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;QACzB,MAAM,CAAC,MAAM,CAAC,OAAO,CACnB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EACtB,mBAAmB,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,EACrD,IAAI,EACJ,KAAK,CACN,CAAA;IACH,CAAC;IAED,8CAA8C;IAC9C,IAAI,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;QACpC,GAAG,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9C,QAAQ,CACN,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,QAAQ,EACZ,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,gBAAgB,EACpB,GAAG,CAAC,SAAS,CACd,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;QACnB,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;QACjC,OAAO,GAAG,CAAC,UAAU,CAAA;QACrB,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;IAC3C,CAAC;AACH,CAAC,CAAA"}
|
package/dist/sendError.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { end } from './sendHttpResponse.js';
|
|
2
2
|
import { isHttpContext, isWsSession, } from '@based/functions';
|
|
3
|
-
import { valueToBuffer, encodeErrorResponse } from './protocol.js';
|
|
3
|
+
import { valueToBuffer, encodeErrorResponse, valueToBufferV1, } from './protocol.js';
|
|
4
4
|
import { createError } from './error/index.js';
|
|
5
5
|
const sendHttpErrorData = (errorData, ctx) => {
|
|
6
6
|
const { code, message, statusCode, statusMessage } = errorData;
|
|
@@ -30,7 +30,9 @@ export function sendErrorData(ctx, errorData) {
|
|
|
30
30
|
sendHttpErrorData(errorData, ctx);
|
|
31
31
|
}
|
|
32
32
|
else if (isWsSession(ctx.session)) {
|
|
33
|
-
ctx.session.ws.send(encodeErrorResponse(
|
|
33
|
+
ctx.session.ws.send(encodeErrorResponse(ctx.session.v < 2
|
|
34
|
+
? valueToBufferV1(errorData, true)
|
|
35
|
+
: valueToBuffer(errorData, true)), true, false);
|
|
34
36
|
}
|
|
35
37
|
}
|
|
36
38
|
export function sendError(server, ctx, basedCode, payload) {
|
|
@@ -42,7 +44,9 @@ export function sendError(server, ctx, basedCode, payload) {
|
|
|
42
44
|
}
|
|
43
45
|
else if (isWsSession(ctx.session)) {
|
|
44
46
|
const errorData = createError(server, ctx, basedCode, payload);
|
|
45
|
-
ctx.session.ws.send(encodeErrorResponse(
|
|
47
|
+
ctx.session.ws.send(encodeErrorResponse(ctx.session.v < 2
|
|
48
|
+
? valueToBufferV1(errorData, true)
|
|
49
|
+
: valueToBuffer(errorData, true)), true, false);
|
|
46
50
|
}
|
|
47
51
|
}
|
|
48
52
|
export function sendSimpleError(server, ctx, basedCode, route, id, payload) {
|
|
@@ -73,7 +77,9 @@ export function sendSimpleError(server, ctx, basedCode, route, id, payload) {
|
|
|
73
77
|
}
|
|
74
78
|
else if (isWsSession(ctx.session)) {
|
|
75
79
|
const errorData = createError(server, ctx, basedCode, payload);
|
|
76
|
-
ctx.session.ws.send(encodeErrorResponse(
|
|
80
|
+
ctx.session.ws.send(encodeErrorResponse(ctx.session.v < 2
|
|
81
|
+
? valueToBufferV1(errorData, true)
|
|
82
|
+
: valueToBuffer(errorData, true)), true, false);
|
|
77
83
|
}
|
|
78
84
|
}
|
|
79
85
|
//# 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":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAA;AAE3C,OAAO,EAIL,aAAa,EACb,WAAW,GAEZ,MAAM,kBAAkB,CAAA;AACzB,OAAO,
|
|
1
|
+
{"version":3,"file":"sendError.js","sourceRoot":"","sources":["../src/sendError.ts"],"names":[],"mappings":"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"}
|