eservices-back-core 1.6.20 → 1.6.21
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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"connect-socket.d.ts","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,IAAI,CAAC;AAC7B,OAAO,MAAM,MAAM,WAAW,CAAC;AA4B/B;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,SAAS,EAAE,MAAM,QAuItD;AAkBD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAE,MAAU,QAMhG;AA0BD,MAAM,WAAW,cAAc;IAC9B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,YAAY,EAAE,MAAM,CAAA;IACpB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAA;CAChB"}
|
|
@@ -35,7 +35,6 @@ const communication_read_1 = require("./events/communication_read");
|
|
|
35
35
|
const communication_message_create_1 = require("./events/communication-message_create");
|
|
36
36
|
const communication_message_read_1 = require("./events/communication-message_read");
|
|
37
37
|
const socket_error_1 = __importDefault(require("../errors/socket-error"));
|
|
38
|
-
const auth_error_1 = __importDefault(require("../errors/auth-error"));
|
|
39
38
|
const constants_1 = require("../constants");
|
|
40
39
|
const debug = (0, debug_1.default)((0, utils_1.getCoreDebugMark)('socket'));
|
|
41
40
|
const SOCKET_EVENT_ERROR = 'request-error';
|
|
@@ -67,15 +66,21 @@ function connectSocket(webServer) {
|
|
|
67
66
|
ws.on('message', function message(stringData, isBinary) {
|
|
68
67
|
return __awaiter(this, void 0, void 0, function* () {
|
|
69
68
|
debug('UserId %d сообщение по web-socket получено, но ещё не проверено на авторизацию.', userId);
|
|
70
|
-
|
|
69
|
+
// Refresh token
|
|
71
70
|
try {
|
|
72
71
|
yield (0, auth_middleware_1.authModule)().useWSAuthMiddleware(req);
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
72
|
+
}
|
|
73
|
+
catch (e) {
|
|
74
|
+
return sendWSError(ws, { refresh: true });
|
|
75
|
+
}
|
|
76
|
+
debug('Socket-message from user(%d) authorize successfully.', userId);
|
|
77
|
+
if (isBinary && stringData[0] === constants_1.SOCKET_HEARTBEAT_VALUE) {
|
|
78
|
+
ws.isAlive = true;
|
|
79
|
+
debug('UserId %d socket соединение живо.', userId);
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
const info = JSON.parse(stringData.toString());
|
|
83
|
+
try {
|
|
79
84
|
const options = {
|
|
80
85
|
token: (0, use_auth_1.getFullAccessToken)(req),
|
|
81
86
|
usageContext: (0, get_usage_context_1.default)(info.url),
|
|
@@ -139,10 +144,6 @@ function connectSocket(webServer) {
|
|
|
139
144
|
}
|
|
140
145
|
catch (err) {
|
|
141
146
|
use_logger_1.Logger.info(`Socket request error. UserId %d. RequestId %d %o`, userId, info.requestId, err);
|
|
142
|
-
if (err instanceof auth_error_1.default)
|
|
143
|
-
return sendWSError(ws, {
|
|
144
|
-
refresh: true
|
|
145
|
-
}, info.requestId);
|
|
146
147
|
sendWSError(ws, err, info.requestId);
|
|
147
148
|
}
|
|
148
149
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAGA,6DAAsD;AACtD,mFAAyD;AACzD,iEAAoD;AACpD,2EAA8D;AAC9D,+DAA2D;AAC3D,8EAAoD;AACpD,gDAAwB;AACxB,kDAAgC;AAChC,yEAA+D;AAC/D,mEAAyD;AACzD,+CAA0G;AAC1G,qDAA4C;AAC5C,oCAA0C;AAC1C,oEAA2C;AAC3C,gEAAyD;AACzD,0DAA0D;AAC1D,sDAAsD;AACtD,wEAAkE;AAClE,oEAA8D;AAC9D,wFAAiF;AACjF,oFAA6E;AAC7E,0EAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"connect-socket.js","sourceRoot":"","sources":["../../src/socket/connect-socket.ts"],"names":[],"mappings":"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"}
|