Skip to content

Commit eb9638c

Browse files
WebSocket error messages clarification
1 parent 29d6607 commit eb9638c

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"printableName": "Cache Web Terminal",
66
"description": "Web-based terminal emulator for Caché administering.",
77
"author": "ZitRo",
8-
"version": "4.0.0-beta.5",
8+
"version": "4.0.0-beta.6",
99
"gaID": "UA-83005064-2",
1010
"releaseNumber": 26,
1111
"scripts": {

src/client/js/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ function initialize () {
113113
key: obj.key
114114
});
115115
} catch (e) {
116-
output.printLine(locale.get(`wsErr`, e.toString()));
116+
output.printLine(locale.get(`jsErr`, e.message));
117117
}
118118
});
119119
}

src/client/js/localization/dictionary.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ export default {
5151
ru: "Невозможно запустить новый Job"
5252
},
5353
"wsConnLost": {
54-
en: "WebTerminal lost connection with server (code %n).",
55-
ru: "Веб-терминал потерял соединение с сервером (код %n)"
54+
en: "WebTerminal lost connection with server (code %n%s).",
55+
ru: "Веб-терминал потерял соединение с сервером (код %n%s)"
5656
},
5757
"plRefPageSes": {
5858
en: "Please, refresh the web page to start a new session.",
@@ -326,5 +326,9 @@ export default {
326326
"noFav": {
327327
en: "Command \x1b[(constant)m%s\x1b[0m has never been saved.",
328328
ru: "Команда \x1b[(constant)m%s\x1b[0m не была сохранена ранее."
329+
},
330+
"jsErr": {
331+
en: "JavaScript error occurred: %s",
332+
ru: "Произошла ошибка JavaScript: %s"
329333
}
330334
};

src/client/js/server/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function onOpen () {
6767
}
6868

6969
function onError (e) {
70-
printLine(localize(`wsErr`, e.toString()));
70+
printLine(localize(`wsErr`, e.data || e));
7171
}
7272

7373
function reconnect () {
@@ -79,7 +79,7 @@ function reconnect () {
7979
function onClose (e) {
8080
CONNECTED = false;
8181
if (e.code !== 1000) {
82-
printLine(`\r\n${ localize(`wsConnLost`, e.code) }`);
82+
printLine(`\r\n${ localize(`wsConnLost`, e.code, e.reason ? " " + e.reason : "") }`);
8383
printLine(localize(`reConn`, RECONNECT_IN / 1000));
8484
reconnectTimeout = setTimeout(reconnect, RECONNECT_IN);
8585
} else {

0 commit comments

Comments
 (0)