feat: hex or utf8 automatic conversion for server traces

Fabio286 · Apr 16, 2023 · 46e9d15 · 46e9d15
1 parent 45c9537
commit 46e9d15
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/src/common/interfaces.ts b/src/common/interfaces.ts
@@ -9,7 +9,7 @@ export interface ClientHost {
 
 export interface ClientMessage {
    enabled: boolean;
-   format: 'hex' | 'ascii' | 'binary';
+   format: 'hex' | 'utf-8' | 'binary';
    message: string;
    name: string;
 }

diff --git a/src/main/libs/Sender.ts b/src/main/libs/Sender.ts
@@ -142,8 +142,8 @@ class Sender {
          let msg;
 
          switch (this.messages[index].format) {
-            case 'ascii':
-               msg = Buffer.from(this.messages[index].message, 'ascii');
+            case 'utf-8':
+               msg = Buffer.from(this.messages[index].message, 'utf-8');
                break;
             case 'hex':
                msg = Buffer.from(this.messages[index].message.replace(/\s|0x/g, ''), 'hex');

diff --git a/src/main/libs/Server.ts b/src/main/libs/Server.ts
@@ -75,7 +75,16 @@ class Server {
                this.sendLog(null, '', 'clientConnectedOnPort', { port });
 
             socket.on('data', (msg: Buffer) => {
-               const msgString = msg.toString();
+               let msgString: string;
+
+               try {
+                  new TextDecoder('utf8', { fatal: true }).decode(msg);
+                  msgString = msg.toString('utf-8');
+               }
+               catch (err) {
+                  msgString = msg.toString('hex');
+               }
+
                if (this.echo) socket.write(msg);
                this.nBytes[i] += msg.length;
                this.nMsgs[i]++;

diff --git a/src/renderer/components/ModalEditMessage.vue b/src/renderer/components/ModalEditMessage.vue
@@ -27,8 +27,8 @@
                <option value="" disabled>
                   {{ t('word.select') }}
                </option>
-               <option value="ascii">
-                  ASCII
+               <option value="utf-8">
+                  UTF-8
                </option>
                <option value="hex">
                   HEX

diff --git a/src/renderer/components/ModalNewMessage.vue b/src/renderer/components/ModalNewMessage.vue
@@ -27,8 +27,8 @@
                <option value="" disabled>
                   {{ t('word.select') }}
                </option>
-               <option value="ascii">
-                  ASCII
+               <option value="utf-8">
+                  UTF-8
                </option>
                <option value="hex">
                   HEX

diff --git a/src/renderer/stores/client.ts b/src/renderer/stores/client.ts
@@ -13,7 +13,7 @@ export const useClientStore = defineStore('client', {
       }]) as ClientHost[],
       messages: persistentStore.get('messages', [{
          enabled: true,
-         format: 'ascii',
+         format: 'utf-8',
          message: 'Hello, World!',
          name: 'Hello, World!'
       }]) as ClientMessage[]