stop using String.fromCharCode.apply in favor of Buffer.from to avoid…

… errors
marcj · Oct 11, 2019 · 32a229a · 32a229a
1 parent aff78e4
commit 32a229a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/packages/server/src/exchange-prot.ts b/packages/server/src/exchange-prot.ts
@@ -69,7 +69,7 @@ export function encodeMessage(messageId: number, type: string, arg: any, payload
 }
 
 export function uintToString(array: Uint8Array): string {
-    return String.fromCharCode.apply(null, array as any);
+    return Buffer.from(array).toString();
 }
 
 export function str2ab(str: string): ArrayBuffer {

diff --git a/packages/server/src/exchange-server.ts b/packages/server/src/exchange-server.ts
@@ -34,14 +34,10 @@ export class ExchangeServer {
             idleTimeout: 0,
             /* Handlers */
             open: (ws, req) => {
-                console.log('new exchange client');
             },
             message: async (ws, message: ArrayBuffer, isBinary) => {
                 this.onMessage(ws, message);
             },
-            drain: (ws) => {
-                console.log('WebSocket exchange backpressure: ' + ws.getBufferedAmount());
-            },
             close: (ws, code, message) => {
             }
         });

diff --git a/packages/server/src/worker.ts b/packages/server/src/worker.ts
@@ -53,12 +53,9 @@ export class Worker {
                     injectorMap.set(ws, this.mainInjector.resolveAndCreateChild(provider));
                 },
                 message: async (ws, message: ArrayBuffer, isBinary) => {
-                    const json = String.fromCharCode.apply(null, new Uint8Array(message) as any);
+                    const json = Buffer.from(message).toString();
                     await injectorMap.get(ws)!.get(ClientConnection).onMessage(json);
                 },
-                drain: (ws) => {
-                    console.log('WebSocket backpressure: ' + ws.getBufferedAmount());
-                },
                 close: (ws, code, message) => {
                     injectorMap.get(ws)!.get(ClientConnection).destroy();
                     injectorMap.delete(ws);