MA-22157: fix header parser and pinned stable yarn version

Author: pavel-nikitin-2022

.yarn/install-state.gz

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.5.3.cjs

.yarn/releases/yarn-4.5.3.cjs

@@ -1,3 +1,7 @@
+## v0.2.6
+
+- Исправлены проблемы с обработкой `cookies` в проксировании.
+
 ## v0.2.5
 
 - Исправили замечания `npm audit`:

.yarnrc.yml

@@ -2,9 +2,7 @@
   "name": "@vkontakte/vk-tunnel",
   "license": "MIT",
   "version": "0.2.5",
-  "bin": {
-    "vk-tunnel": "./bin/vk-tunnel.js"
-  },
+  "bin": "./bin/vk-tunnel.js",
   "scripts": {
     "build": "tsc && esbuild src/vk-tunnel.ts --bundle --platform=node --target=node16.0 --outfile=bin/vk-tunnel.js",
     "lint:eslint": "eslint ./src --ext=ts",
@@ -48,5 +46,6 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "prettier": "^2.7.1",
     "typescript": "5.1.6"
-  }
+  },
+  "packageManager": "yarn@4.5.3"
 }

CHANGELOG.md

@@ -35,7 +35,11 @@ export async function fetchTunnelData({
   staging,
   endpoints,
 }: FetchTunnelDataRequest) {
-  const params: Record<string, string | number | boolean> = { access_token, version, v };
+  const params: Record<string, string | number | boolean> = {
+    access_token,
+    version,
+    v,
+  };
 
   if (app_id) params['app_id'] = app_id;
   if (staging) params['staging'] = staging;

package.json

@@ -55,7 +55,7 @@ export class TunnelClient {
     this.socket.send(data, callback);
   }
 
-  private transformPayload(payload: Buffer[] | ArrayBuffer) {
+  private transformPayload(payload: Buffer[] | ArrayBuffer | Buffer) {
     return payload
       .toString()
       .replace(/Accept-Encoding:.*/, this.ACCEPT_ENCODING + ': ' + this.DISABLE_COMPRESS)

src/api/fetchTunnelData.ts

@@ -52,7 +52,12 @@ export class WsProxy {
       websocket.on('message', (data, isBinary) => {
         logger.debug('incoming ws message from service', seq, data, isBinary);
 
-        const dataBuf = Array.isArray(data) ? Buffer.concat(data) : Buffer.from(data);
+        const dataBuf = Array.isArray(data)
+          ? Buffer.concat(data)
+          : Buffer.isBuffer(data)
+          ? data
+          : Buffer.from(new Uint8Array(data));
+
         const seqBuf = Buffer.from(seq, 'utf8');
         const typeBuf = Buffer.from(MessageTypeToSend.WEBSOCKET, 'utf8');
         const stringMessage = `${seq}${MessageTypeToSend.WEBSOCKET}${data}`;

src/entities/TunnelClient.ts

@@ -57,7 +57,7 @@ export interface UserData {
 
 export interface ProxiedNetworkPacket {
   seq: string;
-  payload: ArrayBuffer | Buffer[] | string;
+  payload: ArrayBuffer | Buffer[] | string | Buffer;
   endpoint: string;
   messageType: MessageTypeFromBack;
   isWebsocketUpgrade: boolean;

src/entities/WsProxy.ts

@@ -10,7 +10,10 @@ async function vkTunnel() {
   const vkProxyServerUrl = `${tunnelData.tunnelHost}/${tunnelData.url}`;
 
   const socket = new WebsocketClient(vkProxyServerUrl, {
-    headers: { UserID: String(tunnelData.userId), Token: tunnelData.tunnelToken },
+    headers: {
+      UserID: String(tunnelData.userId),
+      Token: tunnelData.tunnelToken,
+    },
   });
 
   const tunnelClient = new TunnelClient(socket, tunnelData, userSettings);