Merge branch 'dev' into stable

package.json

@@ -36,6 +36,7 @@
     "dockerode": "^3.3.4",
     "fastify": "^4.16.0",
     "fastify-decorators": "^3.15.0",
+    "iconv-lite": "^0.6.3",
     "ioredis": "^5.3.1",
     "reflect-metadata": "^0.1.13"
   },

src/realms/rest/emitter.ts

@@ -4,6 +4,7 @@ import { Static, Type } from "@sinclair/typebox"
 import { SocketStream } from "@fastify/websocket"
 import { WebSocket } from "ws"
 import RedisClient from "../../clients/Redis"
+import iconv from 'iconv-lite'
 
 export const websockets = new Map<SocketStream, Set<EmitterMessageType>>()
 
@@ -91,11 +92,11 @@ export const emitterMessage = Type.Union(
 
 export type EmitterMessage = Static<typeof emitterMessage>
 
-// eslint-disable-next-line no-control-regex
-const ANSI_ESCAPE = /\x1b\[*m/g;
-
-function removeAnsiColorCodes(str: string):string {
-  return str.replace(ANSI_ESCAPE, "");
+function ANSItoUTF8(text: string): string {
+  // convert string to buffer for iconv
+  const buffer = Buffer.from(text, 'binary');
+  const res_buff = iconv.encode(iconv.decode(buffer, 'win1251'), 'utf8');
+  return res_buff.toString('utf8');
 }
 
 export const prepareRedisListeners = () => {
@@ -105,7 +106,7 @@ export const prepareRedisListeners = () => {
     if (channel === "emitter") {
       const body = JSON.parse(message.toString()) as EmitterMessage
       if (body.type === "serverLog") {
-        body.payload.message = removeAnsiColorCodes(body.payload.message)
+        body.payload.message = ANSItoUTF8(body.payload.message)
       }
       emitter.emit(body.type, body.payload)
     }