From eb640bf99e140f09278144c1d0a0c1d1b53b724f Mon Sep 17 00:00:00 2001 From: Fabio Di Stasio Date: Fri, 7 Apr 2023 17:56:48 +0200 Subject: [PATCH] refactor: i18n implementation --- assets/icon.ico | Bin 0 -> 3606 bytes src/common/interfaces.ts | 15 ++ src/main/libs/Sender.ts | 135 ++++++++-------- src/main/libs/Server.ts | 48 +++--- src/main/main.ts | 38 ++--- src/main/workers/clientProcess.ts | 44 +++--- src/main/workers/serverProcess.ts | 12 +- src/renderer/components/AppHeader.vue | 12 +- src/renderer/components/BaseConsole.vue | 12 +- .../{ModalMessages.vue => ClientMessages.vue} | 34 +++-- src/renderer/components/ClientTab.vue | 144 +++++++----------- src/renderer/components/ClientTabHosts.vue | 22 +-- src/renderer/components/ClientTabReports.vue | 26 ++-- src/renderer/components/ModalEditMessage.vue | 25 +-- src/renderer/components/ModalLoadConfig.vue | 73 --------- src/renderer/components/ModalNewHost.vue | 19 ++- src/renderer/components/ModalNewMessage.vue | 25 +-- src/renderer/components/ModalNewPort.vue | 19 ++- src/renderer/components/ModalSaveConfig.vue | 59 ------- src/renderer/components/ServerTab.vue | 55 ++++--- src/renderer/components/ServerTabPorts.vue | 19 ++- ...terTabReports.vue => ServerTabReports.vue} | 32 ++-- .../fonts/MaterialIcons-Regular.eot | Bin .../fonts/MaterialIcons-Regular.ttf | Bin .../fonts/MaterialIcons-Regular.woff | Bin .../fonts/MaterialIcons-Regular.woff2 | Bin .../{assets => }/fonts/Roboto-Regular.ttf | Bin .../{assets => }/fonts/RobotoMono-Regular.ttf | Bin src/renderer/i18n/en-US.ts | 69 +++++++++ src/renderer/scss/main.scss | 12 +- src/renderer/stores/client.ts | 13 +- src/renderer/stores/server.ts | 5 +- 32 files changed, 482 insertions(+), 485 deletions(-) create mode 100644 assets/icon.ico rename src/renderer/components/{ModalMessages.vue => ClientMessages.vue} (77%) delete mode 100644 src/renderer/components/ModalLoadConfig.vue delete mode 100644 src/renderer/components/ModalSaveConfig.vue rename src/renderer/components/{SerterTabReports.vue => ServerTabReports.vue} (60%) rename src/renderer/{assets => }/fonts/MaterialIcons-Regular.eot (100%) rename src/renderer/{assets => }/fonts/MaterialIcons-Regular.ttf (100%) rename src/renderer/{assets => }/fonts/MaterialIcons-Regular.woff (100%) rename src/renderer/{assets => }/fonts/MaterialIcons-Regular.woff2 (100%) rename src/renderer/{assets => }/fonts/Roboto-Regular.ttf (100%) rename src/renderer/{assets => }/fonts/RobotoMono-Regular.ttf (100%) diff --git a/assets/icon.ico b/assets/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..272293e42fd44e0b6be9f819ed4517f055e7e1d1 GIT binary patch literal 3606 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 { - return message.enabled === true; - }); - if (this.trace) this.sendLog(`Messaggi caricari: ${this.messages.length}`); + if (this.trace) + this.sendLog(null, '', 'messagesLoaded', { mNumber: this.messages.length }); } /** @@ -117,10 +122,15 @@ class Sender { * @param {string} [color=''] Colore del log (green, yellow, red) * @memberof Sender */ - sendLog (message: string, color = '') { + sendLog (message?: string, color = '', i18n?: string, i18nParams?: {[key: string]: string | number}) { const log = { event: 'log', - content: { message, color } + content: { + message, + color, + i18n, + params: i18nParams + } }; this.process.send(log); } @@ -145,7 +155,7 @@ class Sender { return msg; } - else return 'Nessun messaggio specificato'; + else return ''; } /** @@ -178,8 +188,11 @@ class Sender { const clientId = i + 1; try { + this.nTryConnect++; + client.connect(params, () => { - if (this.trace) this.sendLog(`Socket #${clientId} su ${params.host}:${params.port} aperto`); + if (this.trace) + this.sendLog(null, '', 'socketOpen', { number: clientId, host: params.host, port: params.port }); this.nHostClients[x]++; (async () => { @@ -190,7 +203,7 @@ class Sender { client.write(msg, (err: Error) => { if (err) - this.sendLog(`Socket #${clientId} su ${params.host}:${params.port}:\nErrore messaggio: ${err}`, 'red'); + this.sendLog(null, 'red', 'logOnSocket', { number: clientId, host: params.host, port: params.port, message: err.toString() }); else { this.nSent++; this.nHostMsgs[x]++; @@ -198,20 +211,19 @@ class Sender { } }); - if (this.trace) this.sendLog(`Socket #${clientId} su ${params.host}:${params.port} messaggio #${i + 1}`); + if (this.trace) this.sendLog(null, '', 'socketMessage', { number: clientId, host: params.host, port: params.port, mNumber: i + 1 }); if (i + 1 === this.nMsgs && !this.closeOnEcho && !this.persistentConnection) client.end(); }// <- msg for })(); }); } catch (err) { - this.sendLog(`Socket #${clientId} su ${params.host}:${params.port}:\n${err}`, 'red'); + this.sendLog(null, 'red', 'logOnSocket', { number: clientId, host: params.host, port: params.port, message: err.toString() }); } client.on('connect', (err: Error) => { - this.nTryConnect++; if (err) - this.sendLog(`Errore connessione #${clientId} su ${params.host}:${params.port}:\n${err}`, 'red'); + this.sendLog(null, 'red', 'logOnSocket', { number: clientId, host: params.host, port: params.port, message: err.toString() }); else this.nConnected++; // if (this.nConnected === (this.nClients * this.hosts.length)) this.getReport(); @@ -222,12 +234,14 @@ class Sender { if (this.closeOnEcho) client.end(); - if (this.trace) this.sendLog(`Socket #${clientId} su ${params.host}:${params.port} risposta: ${data}`); + if (this.trace) + this.sendLog(null, '', 'socketReply', { number: clientId, host: params.host, port: params.port, reply: data.toString() }); }); client.on('close', () => { this.nClosed++; - if (this.trace) this.sendLog(`Socket #${clientId} su ${params.host}:${params.port} chiuso`); + if (this.trace) + this.sendLog(null, '', 'socketClosed', { number: clientId, host: params.host, port: params.port }); // Misura tempo esecuzione if (this.nClosed === this.nTryConnect) { @@ -240,11 +254,10 @@ class Sender { switch (err.code) { case 'ECONNRESET': if (this.alertReset) - this.sendLog(`Socket #${clientId} su ${params.host}:${params.port}:\n${err}`, 'yellow'); - + this.sendLog(null, 'yellow', 'logOnSocket', { number: clientId, host: params.host, port: params.port, message: err.toString() }); break; default: - this.sendLog(`Socket #${clientId} su ${params.host}:${params.port}:\n${err}`, 'red'); + this.sendLog(null, 'red', 'logOnSocket', { number: clientId, host: params.host, port: params.port, message: err.toString() }); } }); }// <- clients for @@ -272,19 +285,20 @@ class Sender { const clientId = i + 1; try { + this.nTryConnect++; + client.connect(params, () => { - if (this.trace) this.sendLog(`Socket #${clientId} su ${params.host}:${params.port} aperto`); + if (this.trace) this.sendLog(null, '', 'socketOpen', { number: clientId, host: params.host, port: params.port }); this.nHostClients[x]++; }); } catch (err) { - this.sendLog(`Socket #${clientId} su ${params.host}:${params.port}:\n${err}`, 'red'); + this.sendLog(null, 'red', 'logOnSocket', { number: clientId, host: params.host, port: params.port, message: err.toString() }); } client.on('connect', (err: Error) => { - this.nTryConnect++; if (err) - this.sendLog(`Errore connessione #${clientId} su ${params.host}:${params.port}:\n${err}`, 'red'); + this.sendLog(null, 'red', 'logOnSocket', { number: clientId, host: params.host, port: params.port, message: err.toString() }); else this.nConnected++; // if (this.nConnected === (this.nClients * this.hosts.length)) this.getReport(); @@ -297,23 +311,24 @@ class Sender { if (this.closeOnEcho) client.end(); - if (this.trace) this.sendLog(`Socket #${clientId} su ${params.host}:${params.port} risposta: ${data}`); + if (this.trace) + this.sendLog(null, '', 'socketReply', { number: clientId, host: params.host, port: params.port, reply: data.toString() }); }); client.on('close', () => { this.nClosed++; - if (this.trace) this.sendLog(`Socket #${clientId} su ${params.host}:${params.port} chiuso`); + if (this.trace) + this.sendLog(null, '', 'socketClosed', { number: clientId, host: params.host, port: params.port }); }); client.on('error', (err: Error & { code: string }) => { switch (err.code) { case 'ECONNRESET': if (this.alertReset) - this.sendLog(`Socket #${clientId} su ${params.host}:${params.port}:\n${err}`, 'yellow'); - + this.sendLog(null, 'yellow', 'logOnSocket', { number: clientId, host: params.host, port: params.port, message: err.toString() }); break; default: - this.sendLog(`Socket #${clientId} su ${params.host}:${params.port}:\n${err}`, 'red'); + this.sendLog(null, 'red', 'logOnSocket', { number: clientId, host: params.host, port: params.port, message: err.toString() }); } }); }// <- clients for @@ -333,10 +348,10 @@ class Sender { this.nSent = 0; /** Applica uno sleep */ - function delay () { + const delay = () => { const wait = Math.floor((Math.random() * this.tMax) + this.tMin); return new Promise(resolve => setTimeout(resolve, wait)); - } + }; for (let x = 0; x < this.hosts.length; x++) { // hosts for for (let i = 0; i < this.hosts[x].clients.length; i++) { // clients for @@ -352,7 +367,7 @@ class Sender { client.write(msg, (err: Error) => { if (err) - this.sendLog(`Socket #${clientId} su ${params.host}:${params.port}:\nErrore messaggio: ${err}`, 'red'); + this.sendLog(null, 'red', 'logOnSocket', { number: clientId, host: params.host, port: params.port, error: err.toString() }); else { this.nSent++; this.nHostMsgs[x]++; @@ -361,7 +376,7 @@ class Sender { } }); - if (this.trace) this.sendLog(`Socket #${clientId} su ${params.host}:${params.port} messaggio #${i + 1}`); + if (this.trace) this.sendLog(null, '', 'socketMessage', { number: clientId, host: params.host, port: params.port, mNumber: i + 1 }); }// <- msg for })(); }// <- clients for @@ -370,10 +385,10 @@ class Sender { /** Genera il report su console */ getConsoleReports () { - const end = new Date().getMilliseconds() - this.timeStart.getMilliseconds(); - const report = `Durata del test: ${end}ms`; + const end = Number(new Date()) - Number(this.timeStart); + const i18n = 'testDuration'; - this.sendLog(report, 'green'); + this.sendLog(null, 'green', i18n, { ms: end }); } stopClients (callback: () => void) { diff --git a/src/main/libs/Server.ts b/src/main/libs/Server.ts index 9e20f88..d841e83 100644 --- a/src/main/libs/Server.ts +++ b/src/main/libs/Server.ts @@ -8,14 +8,14 @@ interface ServerParams { } class Server { - process: NodeJS.Process; - trace: boolean; - echo: boolean; - alertReset: boolean; - ports: ServerPort[]; - server: net.Server[]; - nBytes: number[]; - nMsgs: number[]; + private process: NodeJS.Process; + private trace: boolean; + private echo: boolean; + private alertReset: boolean; + private ports: ServerPort[]; + private server: net.Server[]; + private nBytes: number[]; + private nMsgs: number[]; constructor (process: NodeJS.Process) { this.process = process; @@ -45,10 +45,15 @@ class Server { * @param {string} [color=''] Colore del log (green, yellow, red) * @memberof Server */ - sendLog (message: string, color = '') { + sendLog (message?: string, color = '', i18n?: string, i18nParams?: {[key: string]: string | number}) { const log = { event: 'log', - content: { message, color } + content: { + message, + color, + i18n, + params: i18nParams + } }; this.process.send(log); } @@ -66,7 +71,8 @@ class Server { this.nMsgs[i] = 0; this.server[i].on('connection', (socket: net.Socket) => { - if (this.trace) this.sendLog(`Client connesso su porta ${port}`); + if (this.trace) + this.sendLog(null, '', 'clientConnectedOnPort', { port }); socket.on('data', (msg: Buffer) => { const msgString = msg.toString(); @@ -74,33 +80,36 @@ class Server { this.nBytes[i] += msg.length; this.nMsgs[i]++; - if (this.trace) this.sendLog(`Messaggio ricevuto su porta ${port}: ${msgString}`); + if (this.trace) + this.sendLog(null, '', 'messageReceivedOnPort', { port, message: msgString }); });// <- socket data socket.on('end', () => { - if (this.trace) this.sendLog(`Client disconnesso su porta ${port}`); + if (this.trace) + this.sendLog(null, '', 'clientDisonnectedOnPort', { port }); }); socket.on('error', (err: Error & { code: string }) => { switch (err.code) { case 'ECONNRESET': if (this.alertReset) - this.sendLog(`Errore client su porta ${port}: \n${err}`, 'yellow'); + this.sendLog(null, 'yellow', 'clientErrorOnPort', { port, error: err.toString() }); else - if (this.trace) this.sendLog(`Client disconnesso su porta ${port}`); + if (this.trace) + this.sendLog(null, '', 'clientDisonnectedOnPort', { port }); break; default: - this.sendLog(`Errore client su porta ${port}: \n${err}`, 'red'); + this.sendLog(null, 'red', 'clientErrorOnPort', { port, error: err.toString() }); } }); });// <- server this.server[i].on('error', (err: Error) => { - this.sendLog(`Errore server su porta ${port}: \n${err}`, 'red'); + this.sendLog(null, 'red', 'serverErrorOnPort', { port, error: err.toString() }); }); this.server[i].listen(port, () => { - this.sendLog(`In ascolto sulla porta ${port}`); + this.sendLog(null, '', 'listenindOnPort', { port }); }); } } @@ -127,7 +136,8 @@ class Server { }; this.server[i].getConnections((err: Error, nSockets: number) => { - if (err) this.sendLog(`Errore report: \n${err}`, 'red'); + if (err) + this.sendLog(null, 'red', 'reportError', { error: err.toString() }); report.sockets = nSockets; reportList.push(report); diff --git a/src/main/main.ts b/src/main/main.ts index b6e5e00..fdf3a65 100644 --- a/src/main/main.ts +++ b/src/main/main.ts @@ -148,8 +148,8 @@ else { // Client let clientProcess: ChildProcess; -ipcMain.on('startTest', (event, { params, hosts }) => { - event.sender.send('clientLog', { message: 'Test avviato', color: '' }); +ipcMain.on('start-test', (event, { params, hosts, messages }) => { + event.sender.send('client-log', { message: '', color: '', i18n: 'testStarted' }); clientProcess = fork(isDevelopment ? './dist/clientProcess.js' : path.resolve(__dirname, './clientProcess.js'), [], { execArgv: isDevelopment ? ['--inspect=9225'] : undefined }); @@ -159,8 +159,8 @@ ipcMain.on('startTest', (event, { params, hosts }) => { const testParams = { event: startEvent, params, - // storagePath, - hosts + hosts, + messages }; clientProcess.send(testParams); @@ -168,32 +168,32 @@ ipcMain.on('startTest', (event, { params, hosts }) => { if (!mainWindow) return; switch (message.event) { case 'log': - mainWindow.webContents.send('clientLog', message.content); + mainWindow.webContents.send('client-log', message.content); break; case 'finish': if (params.loop) clientProcess.send(testParams); else { - mainWindow.webContents.send('testFinish', message.content); + mainWindow.webContents.send('test-finish', message.content); clientProcess.kill(); } break; case 'report': - mainWindow.webContents.send('reportClientList', message.content); + mainWindow.webContents.send('report-client-list', message.content); break; } }); }); -ipcMain.on('sendMessages', (event) => { +ipcMain.on('send-messages', (event) => { clientProcess.send({ event: 'sendStep' }); - event.sender.send('clientLog', { message: 'Invio messaggi in corso', color: '' }); + event.sender.send('client-log', { i18n: 'sendingMessages', color: '' }); }); -ipcMain.on('stopTest', (event) => { +ipcMain.on('stop-test', (event) => { try { clientProcess.send({ event: 'stop' }); - event.sender.send('testFinish', 'Test interrotto'); + event.sender.send('test-finish', 'testAborted'); } catch (error) { clientProcess.kill(); @@ -202,8 +202,8 @@ ipcMain.on('stopTest', (event) => { // Server let serverProcess: ChildProcess; -ipcMain.on('startServer', (event, { params, ports }) => { - event.sender.send('serverLog', { message: 'Server avviato', color: '' }); +ipcMain.on('start-server', (event, { params, ports }) => { + event.sender.send('server-log', { i18n: 'serverStart', color: '' }); serverProcess = fork(isDevelopment ? './dist/serverProcess.js' : path.resolve(__dirname, './serverProcess.js'), [], { execArgv: isDevelopment ? ['--inspect=9224'] : undefined }); @@ -219,26 +219,26 @@ ipcMain.on('startServer', (event, { params, ports }) => { if (!mainWindow) return; switch (message.event) { case 'log': - mainWindow.webContents.send('serverLog', message.content); + mainWindow.webContents.send('server-log', message.content); break; case 'report': - mainWindow.webContents.send('reportServerList', message.content); + mainWindow.webContents.send('report-server-list', message.content); break; } }); }); -ipcMain.on('stopServer', (event) => { +ipcMain.on('stop-server', (event) => { try { serverProcess.send({ event: 'stop' }); - event.sender.send('serverFinish', 'Server stoppato'); + event.sender.send('server-finish', 'serverStop'); } catch (error) { serverProcess.kill(); } }); -ipcMain.on('resetReports', () => { +ipcMain.on('reset-reports', () => { if (!mainWindow) return; try { serverProcess.send({ event: 'reset' }); @@ -248,7 +248,7 @@ ipcMain.on('resetReports', () => { message: error.stack, color: 'red' }; - mainWindow.webContents.send('serverLog', data); + mainWindow.webContents.send('server-log', data); } }); diff --git a/src/main/workers/clientProcess.ts b/src/main/workers/clientProcess.ts index 72a13ef..a6eb56f 100644 --- a/src/main/workers/clientProcess.ts +++ b/src/main/workers/clientProcess.ts @@ -1,66 +1,68 @@ -import { ClientHost } from 'common/interfaces'; +import { ClientHost, ClientMessage } from 'common/interfaces'; import { Sender, SenderParams } from '../libs/Sender'; -const Sends = new Sender(process); +const sender = new Sender(process); let clientTimer: NodeJS.Timer; -process.on('message', (message: { event: string; hosts: ClientHost[]; params: SenderParams}) => { +process.on('message', (message: { event: string; hosts: ClientHost[]; messages: ClientMessage[]; params: SenderParams}) => { switch (message.event) { case 'start': - Sends.setHosts(message.hosts); - Sends.setParams(message.params); + sender.setHosts(message.hosts); + sender.setMessages(message.messages); + sender.setParams(message.params); - Sends.startFullTest(() => { + sender.startFullTest(() => { const response = { event: 'finish', - content: 'Test concluso' + content: 'testEnded' }; process.send(response); if (clientTimer !== undefined) clearInterval(clientTimer); - Sends.getReports(); + sender.getReports(); }); - Sends.getReports(); + sender.getReports(); if (clientTimer === undefined) { clientTimer = setInterval(() => { - Sends.getReports(); + sender.getReports(); }, 200); } break; case 'startStep': - Sends.setHosts(message.hosts); - Sends.setParams(message.params); + sender.setHosts(message.hosts); + sender.setMessages(message.messages); + sender.setParams(message.params); - Sends.connectClients(() => { + sender.connectClients(() => { const response = { event: 'log', - content: { message: 'Client connessi', color: '' } + content: { i18n: 'clientsConnected', color: '' } }; process.send(response); }); - Sends.getReports(); + sender.getReports(); if (clientTimer === undefined) { clientTimer = setInterval(() => { - Sends.getReports(); + sender.getReports(); }, 200); } break; - case 'sendStep': - Sends.sendMessages(() => { + case 'sendertep': + sender.sendMessages(() => { const response = { event: 'log', - content: { message: 'Messaggi inviati', color: '' } + content: { i18n: 'messagesSent', color: '' } }; process.send(response); }); break; case 'stop': - Sends.stopClients(() => { + sender.stopClients(() => { if (clientTimer !== undefined) clearInterval(clientTimer); - Sends.getReports(); + sender.getReports(); process.exit(); }); break; diff --git a/src/main/workers/serverProcess.ts b/src/main/workers/serverProcess.ts index 78cc62c..dbb48db 100644 --- a/src/main/workers/serverProcess.ts +++ b/src/main/workers/serverProcess.ts @@ -1,29 +1,29 @@ import { ServerPort } from 'common/interfaces'; import { Server, ServerParams } from '../libs/Server'; -const myServer = new Server(process); +const server = new Server(process); let serverTimer: NodeJS.Timer; process.on('message', (message: {event: string; ports: ServerPort[]; params: ServerParams}) => { switch (message.event) { case 'start': - myServer.setPorts(message.ports); - myServer.startServer(message.params); + server.setPorts(message.ports); + server.startServer(message.params); if (serverTimer === undefined) { serverTimer = setInterval(() => { - myServer.getReports(); + server.getReports(); }, 200); } break; case 'stop': - myServer.stopServer(() => { + server.stopServer(() => { if (serverTimer !== undefined) clearInterval(serverTimer); process.exit(); }); break; case 'reset': - myServer.resetReports(); + server.resetReports(); break; } }); diff --git a/src/renderer/components/AppHeader.vue b/src/renderer/components/AppHeader.vue index 0b802f1..589d7ce 100644 --- a/src/renderer/components/AppHeader.vue +++ b/src/renderer/components/AppHeader.vue @@ -6,12 +6,12 @@ :class="{ selected : selTab === 0 }" @click="selectTab(0)" > - Client + {{ t('word.client', 1) }} play_arrow @@ -20,12 +20,12 @@ :class="{ selected : selTab === 1 }" @click="selectTab(1)" > - Server + {{ t('word.server', 1) }} play_arrow @@ -34,6 +34,8 @@ diff --git a/src/renderer/components/ClientTabHosts.vue b/src/renderer/components/ClientTabHosts.vue index a095a8f..125e7a4 100644 --- a/src/renderer/components/ClientTabHosts.vue +++ b/src/renderer/components/ClientTabHosts.vue @@ -6,11 +6,12 @@ >

{{ checkIcon(checkStatus) - }}Hosts + }} + {{ t('word.host', 2) }}

- Aggiungi Host + {{ t('message.addHost') }} add
@@ -27,7 +28,7 @@ clear @@ -36,8 +37,9 @@ diff --git a/src/renderer/components/ModalLoadConfig.vue b/src/renderer/components/ModalLoadConfig.vue deleted file mode 100644 index bed1b40..0000000 --- a/src/renderer/components/ModalLoadConfig.vue +++ /dev/null @@ -1,73 +0,0 @@ - - - diff --git a/src/renderer/components/ModalNewHost.vue b/src/renderer/components/ModalNewHost.vue index 6d8b8de..89386c9 100644 --- a/src/renderer/components/ModalNewHost.vue +++ b/src/renderer/components/ModalNewHost.vue @@ -2,9 +2,9 @@
-

Nuovo Host

+

{{ t('message.addHost') }}

- +
- +
@@ -41,8 +41,9 @@ diff --git a/src/renderer/components/ServerTab.vue b/src/renderer/components/ServerTab.vue index ad56dea..ecf4489 100644 --- a/src/renderer/components/ServerTab.vue +++ b/src/renderer/components/ServerTab.vue @@ -5,8 +5,8 @@
@@ -14,10 +14,10 @@
@@ -27,7 +27,7 @@ type="checkbox" >
- Echo Server + {{ t('message.echoServer') }}
-
@@ -87,13 +87,16 @@ import { storeToRefs } from 'pinia'; import Console from './BaseConsole.vue'; import Ports from './ServerTabPorts.vue'; import NewPort from './ModalNewPort.vue'; -import SerterTabReports from './SerterTabReports.vue'; +import { ServerPort } from 'common/interfaces'; +import ServerTabReports from './ServerTabReports.vue'; import { ipcRenderer } from 'electron'; import { useServerStore } from '@/stores/server'; import { unproxify } from '../libs/unproxify'; -import { ServerPort } from 'common/interfaces'; +import { useI18n } from 'vue-i18n'; const emit = defineEmits(['serverStatus']); +const { t } = useI18n(); + const serverStore = useServerStore(); const { ports } = storeToRefs(serverStore); @@ -102,7 +105,7 @@ const { updatePorts: updateStorePorts } = serverStore; const running = ref(0); const params = ref({ trace: false, - echo: true, + echo: false, alertReset: false }); const logs = ref([]); @@ -131,12 +134,12 @@ const startServer = (e: MouseEvent) => { return port.enabled === true; }) }; - ipcRenderer.send('startServer', unproxify(obj)); + ipcRenderer.send('start-server', unproxify(obj)); }; const stopServer = (e: MouseEvent) => { e.preventDefault(); - ipcRenderer.send('stopServer'); + ipcRenderer.send('stop-server'); }; const updatePorts = () => { @@ -163,7 +166,7 @@ const deletePort = (portId: number) => { }; const resetReports = () => { - ipcRenderer.send('resetReports'); + ipcRenderer.send('reset-reports'); }; const togglePortCheck = (status: number) => { @@ -176,33 +179,35 @@ const togglePortCheck = (status: number) => { updateStorePorts(localPorts.value); }; -ipcRenderer.on('serverLog', (event, data) => { +ipcRenderer.on('server-log', (event, data) => { const time = new Date().toLocaleString(); - const { message, color } = data; + const { message, color, params, i18n } = data; const log = { time: time, message, - color + color, + params, + i18n }; logs.value.push(log); }); -ipcRenderer.on('serverFinish', (event, message) => { +ipcRenderer.on('server-finish', (event, message) => { running.value = 0; reportList.value = []; emit('serverStatus', running.value); const time = new Date().toLocaleString(); const log = { time: time, - message, + i18n: message, color: '' }; logs.value.push(log); }); -ipcRenderer.on('reportServerList', (event, reports) => { +ipcRenderer.on('report-server-list', (event, reports) => { reportList.value = reports; }); diff --git a/src/renderer/components/ServerTabPorts.vue b/src/renderer/components/ServerTabPorts.vue index d62ef03..3860745 100644 --- a/src/renderer/components/ServerTabPorts.vue +++ b/src/renderer/components/ServerTabPorts.vue @@ -4,10 +4,10 @@ ref="root" class="box-100" > -

{{ checkIcon(checkStatus) }}Porte

+

{{ checkIcon(checkStatus) }}{{ t('word.port', 2) }}

- Aggiungi Porta + {{ t('message.addPort') }} add
@@ -33,15 +33,18 @@ diff --git a/src/renderer/assets/fonts/MaterialIcons-Regular.eot b/src/renderer/fonts/MaterialIcons-Regular.eot similarity index 100% rename from src/renderer/assets/fonts/MaterialIcons-Regular.eot rename to src/renderer/fonts/MaterialIcons-Regular.eot diff --git a/src/renderer/assets/fonts/MaterialIcons-Regular.ttf b/src/renderer/fonts/MaterialIcons-Regular.ttf similarity index 100% rename from src/renderer/assets/fonts/MaterialIcons-Regular.ttf rename to src/renderer/fonts/MaterialIcons-Regular.ttf diff --git a/src/renderer/assets/fonts/MaterialIcons-Regular.woff b/src/renderer/fonts/MaterialIcons-Regular.woff similarity index 100% rename from src/renderer/assets/fonts/MaterialIcons-Regular.woff rename to src/renderer/fonts/MaterialIcons-Regular.woff diff --git a/src/renderer/assets/fonts/MaterialIcons-Regular.woff2 b/src/renderer/fonts/MaterialIcons-Regular.woff2 similarity index 100% rename from src/renderer/assets/fonts/MaterialIcons-Regular.woff2 rename to src/renderer/fonts/MaterialIcons-Regular.woff2 diff --git a/src/renderer/assets/fonts/Roboto-Regular.ttf b/src/renderer/fonts/Roboto-Regular.ttf similarity index 100% rename from src/renderer/assets/fonts/Roboto-Regular.ttf rename to src/renderer/fonts/Roboto-Regular.ttf diff --git a/src/renderer/assets/fonts/RobotoMono-Regular.ttf b/src/renderer/fonts/RobotoMono-Regular.ttf similarity index 100% rename from src/renderer/assets/fonts/RobotoMono-Regular.ttf rename to src/renderer/fonts/RobotoMono-Regular.ttf diff --git a/src/renderer/i18n/en-US.ts b/src/renderer/i18n/en-US.ts index b1ccc3c..f44c617 100644 --- a/src/renderer/i18n/en-US.ts +++ b/src/renderer/i18n/en-US.ts @@ -1,6 +1,75 @@ export const enUS = { word: { + client: 'Client | Clients', + server: 'Server | Servers', + host: 'Host | Hosts', + message: 'Message | Messages', + port: 'Port | Ports', + data: 'Data | Data', + name: 'Name | Names', + start: 'Start', + stop: 'Stop', + send: 'Send', + total: 'Total | Totals', + received: 'Received | Received', + sent: 'Sent | Sent', + socket: 'Socket | Sockets', + format: 'Format', + select: 'Select', + cancel: 'Cancel', + edit: 'Edit', + create: 'Create', + reset: 'Reset' }, message: { + running: 'Running', + numberOfMessages: 'Number of messages', + numberOfClients: 'Number of clients', + minInterval: 'Min. Interval (ms)', + maxInterval: 'Max Interval (ms)', + closeOnReply: 'Close on reply', + persistentConnection: 'Persistent Connection', + steptest: ' Step test', + enableTrace: 'Enable traces', + alertEconnreset: 'Alert ECONNRESET', + loopMode: 'Loop mode', + loopModeEsplaination: 'Repeat the test after its completion', + sendMessages: 'Send messages', + addHost: 'Add host', + deleteHost: 'Delete host {host}', + addMessage: 'Add message', + editMessage: 'Edit message {message}', + deleteMessage: 'Delete message {message}', + hostAddress: 'Host address', + addPort: 'Add port {port}', + echoServer: 'Echo server', + resetReceivedData: 'Reset received data', + serverStatus: 'Server status', + testReport: 'Test report', + testStarted: 'Test started', + testAborted: 'Test aborted', + testEnded: 'Test ended', + clientsConnected: 'Clients connected', + messagesSent: 'Messages sent', + testDuration: 'Test duration: {ms}ms', + noMessageSpecified: 'No message specified', + socketOpen: 'Socket #{number} on {host}:{port} open', + socketClosed: 'Socket #{number} on {host}:{port} closed', + socketMessage: 'Socket #{number} on {host}:{port} message #{mNumber}', + socketReply: 'Socket #{number} on {host}:{port} reply #{reply}', + logOnSocket: 'Socket #{number} on {host}:{port}: {message}', + loadingMessages: 'Loading messages', + messagesLoaded: 'Messages loaded: {mNumber}', + sendingMessages: 'Sending messages', + tracesDisabledMessage: 'Traces disabled, intervals too short', + clientConnectedOnPort: 'Client connected on port {port}', + clientDisonnectedOnPort: 'Client disconnected on port {port}', + messageReceivedOnPort: 'Message received on port {port}: {message}', + serverStart: 'Server start', + serverStop: 'Server stop', + listenindOnPort: 'Listening on port {port}', + clientErrorOnPort: 'Client error on port {port}: {error}', + serverErrorOnPort: 'Server error on port {port}: {error}', + reportError: 'Report error: {error}' } }; diff --git a/src/renderer/scss/main.scss b/src/renderer/scss/main.scss index 8117e00..fe77ab7 100644 --- a/src/renderer/scss/main.scss +++ b/src/renderer/scss/main.scss @@ -5,27 +5,27 @@ font-family: "Material Icons"; font-style: normal; font-weight: 400; - src: url("../assets/fonts/MaterialIcons-Regular.eot"); /* For IE6-8 */ + src: url("../fonts/MaterialIcons-Regular.eot"); /* For IE6-8 */ src: local("Material Icons"), local("MaterialIcons-Regular"), - url("../assets/fonts/MaterialIcons-Regular.woff2") format("woff2"), - url("../assets/fonts/MaterialIcons-Regular.woff") format("woff"), - url("../assets/fonts/MaterialIcons-Regular.ttf") format("truetype"); + url("../fonts/MaterialIcons-Regular.woff2") format("woff2"), + url("../fonts/MaterialIcons-Regular.woff") format("woff"), + url("../fonts/MaterialIcons-Regular.ttf") format("truetype"); } @font-face { font-family: "Roboto Regular"; font-style: normal; font-weight: 400; - src: url("../assets/fonts/Roboto-Regular.ttf") format("truetype"); + src: url("../fonts/Roboto-Regular.ttf") format("truetype"); } @font-face { font-family: "Roboto Mono"; font-style: normal; font-weight: 400; - src: url("../assets/fonts/RobotoMono-Regular.ttf") format("truetype"); + src: url("../fonts/RobotoMono-Regular.ttf") format("truetype"); } .material-icons { diff --git a/src/renderer/stores/client.ts b/src/renderer/stores/client.ts index ac24405..289eddf 100644 --- a/src/renderer/stores/client.ts +++ b/src/renderer/stores/client.ts @@ -6,8 +6,17 @@ const persistentStore = new ElectronStore({ name: 'client' }); export const useClientStore = defineStore('client', { state: () => ({ - hosts: persistentStore.get('hosts', []) as ClientHost[], - messages: persistentStore.get('messages', []) as ClientMessage[] + hosts: persistentStore.get('hosts', [{ + enabled: true, + host: 'localhost', + port: 8080 + }]) as ClientHost[], + messages: persistentStore.get('messages', [{ + enabled: true, + format: 'ascii', + message: 'Hello, World!', + name: 'Hello, World!' + }]) as ClientMessage[] }), actions: { updateHosts (payload: ClientHost[]) { diff --git a/src/renderer/stores/server.ts b/src/renderer/stores/server.ts index fc5121a..2f3f9b4 100644 --- a/src/renderer/stores/server.ts +++ b/src/renderer/stores/server.ts @@ -6,7 +6,10 @@ const persistentStore = new ElectronStore({ name: 'server' }); export const useServerStore = defineStore('server', { state: () => ({ - ports: persistentStore.get('ports', []) as ServerPort[] + ports: persistentStore.get('ports', [{ + enabled: true, + port: 8080 + }]) as ServerPort[] }), actions: { updatePorts (payload: ServerPort[]) {