@opensumi/ide-connection 2.27.3-rc-1708399099.0 → 2.27.3-rc-1710386185.0

package/lib/node/common-channel-handler.js

@@ -1,173 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommonChannelHandler = exports.commonChannelPathHandler = exports.CommonChannelPathHandler = void 0;
+exports.CommonChannelHandler = exports.commonChannelPathHandler = void 0;
 const tslib_1 = require("tslib");
 const path_to_regexp_1 = require("path-to-regexp");
 const ws_1 = tslib_1.__importDefault(require("ws"));
 const connection_1 = require("../common/connection");
-const ws_channel_1 = require("../common/ws-channel");
-const ws_2 = require("./ws");
-class CommonChannelPathHandler {
-    constructor() {
-        this.handlerMap = new Map();
-        this.paramsKey = new Map();
-    }
-    register(channelPath, handler) {
-        const paramsIndex = channelPath.indexOf('/:');
-        const hasParams = paramsIndex >= 0;
-        let channelToken = channelPath;
-        if (hasParams) {
-            channelToken = channelPath.slice(0, paramsIndex);
-            this.paramsKey.set(channelToken, channelPath.slice(paramsIndex + 2));
-        }
-        if (!this.handlerMap.has(channelToken)) {
-            this.handlerMap.set(channelToken, []);
-        }
-        const handlerArr = this.handlerMap.get(channelToken);
-        const handlerFn = handler.handler.bind(handler);
-        const setHandler = (channel, clientId, params) => {
-            handler.connection = channel;
-            handlerFn(channel, clientId, params);
-        };
-        handler.handler = setHandler;
-        handlerArr.push(handler);
-        this.handlerMap.set(channelToken, handlerArr);
-    }
-    getParams(channelPath, value) {
-        const params = {};
-        if (this.paramsKey.has(channelPath)) {
-            const key = this.paramsKey.get(channelPath);
-            if (key) {
-                params[key] = value;
-            }
-        }
-        return params;
-    }
-    removeHandler(channelPath, handler) {
-        const paramsIndex = channelPath.indexOf(':');
-        const hasParams = paramsIndex >= 0;
-        let channelToken = channelPath;
-        if (hasParams) {
-            channelToken = channelPath.slice(0, paramsIndex);
-        }
-        const handlerArr = this.handlerMap.get(channelToken) || [];
-        const removeIndex = handlerArr.indexOf(handler);
-        if (removeIndex !== -1) {
-            handlerArr.splice(removeIndex, 1);
-        }
-        this.handlerMap.set(channelPath, handlerArr);
-    }
-    get(channelPath) {
-        return this.handlerMap.get(channelPath);
-    }
-    disposeConnectionClientId(connection, clientId) {
-        this.handlerMap.forEach((handlerArr) => {
-            handlerArr.forEach((handler) => {
-                handler.dispose(connection, clientId);
-            });
-        });
-    }
-    getAll() {
-        return Array.from(this.handlerMap.values());
-    }
-}
-exports.CommonChannelPathHandler = CommonChannelPathHandler;
-exports.commonChannelPathHandler = new CommonChannelPathHandler();
+const server_handler_1 = require("../common/server-handler");
+Object.defineProperty(exports, "commonChannelPathHandler", { enumerable: true, get: function () { return server_handler_1.commonChannelPathHandler; } });
 /**
  * Channel Handler for nodejs
  */
-class CommonChannelHandler extends ws_2.WebSocketHandler {
+class CommonChannelHandler extends server_handler_1.BaseCommonChannelHandler {
     constructor(routePath, logger = console, options = {}) {
-        super();
-        this.logger = logger;
+        super('node-channel-handler', logger);
         this.options = options;
-        this.handlerId = 'common-channel';
-        this.channelMap = new Map();
-        this.heartbeatMap = new Map();
         this.handlerRoute = (0, path_to_regexp_1.match)(routePath, options.pathMatchOptions);
         this.initWSServer();
     }
-    heartbeat(connectionId, connection) {
-        const timer = global.setTimeout(() => {
-            connection.ping();
-            this.heartbeat(connectionId, connection);
-        }, 5000);
-        this.heartbeatMap.set(connectionId, timer);
+    doHeartbeat(connection) {
+        connection.socket.ping();
     }
     initWSServer() {
         this.logger.log('init Common Channel Handler');
         this.wsServer = new ws_1.default.Server(Object.assign({ noServer: true }, this.options.wsServerOptions));
         this.wsServer.on('connection', (connection) => {
-            let clientId;
-            connection.on('message', (msg) => {
-                let msgObj;
-                try {
-                    msgObj = (0, ws_channel_1.parse)(msg);
-                    if (msgObj.kind === 'ping') {
-                        connection.send((0, ws_channel_1.stringify)({
-                            kind: 'pong',
-                            id: msgObj.id,
-                            clientId,
-                        }));
-                    }
-                    else if (msgObj.kind === 'open') {
-                        const { id, path } = msgObj;
-                        clientId = msgObj.clientId;
-                        this.logger.log(`open a new connection channel ${clientId} with path ${path}`);
-                        this.heartbeat(id, connection);
-                        const channel = new ws_channel_1.WSChannel(new connection_1.WSWebSocketConnection(connection), { id });
-                        this.channelMap.set(id, channel);
-                        // 根据 path 拿到注册的 handler
-                        let handlerArr = exports.commonChannelPathHandler.get(path);
-                        let params;
-                        // 尝试通过父路径查找处理函数，如server/:id方式注册的handler
-                        if (!handlerArr) {
-                            const slashIndex = path.indexOf('/');
-                            const hasSlash = slashIndex >= 0;
-                            if (hasSlash) {
-                                handlerArr = exports.commonChannelPathHandler.get(path.slice(0, slashIndex));
-                                params = exports.commonChannelPathHandler.getParams(path.slice(0, slashIndex), path.slice(slashIndex + 1));
-                            }
-                        }
-                        if (handlerArr) {
-                            for (let i = 0, len = handlerArr.length; i < len; i++) {
-                                const handler = handlerArr[i];
-                                handler.handler(channel, clientId, params);
-                            }
-                        }
-                        channel.serverReady();
-                    }
-                    else {
-                        const { id } = msgObj;
-                        const channel = this.channelMap.get(id);
-                        if (channel) {
-                            channel.dispatchChannelMessage(msgObj);
-                        }
-                        else {
-                            this.logger.warn(`The channel(${id}) was not found`);
-                        }
-                    }
-                }
-                catch (e) {
-                    this.logger.error('handle connection message error', e);
-                }
-            });
-            connection.once('close', () => {
-                exports.commonChannelPathHandler.disposeConnectionClientId(connection, clientId);
-                if (this.heartbeatMap.has(clientId)) {
-                    clearTimeout(this.heartbeatMap.get(clientId));
-                    this.heartbeatMap.delete(clientId);
-                    this.logger.log(`Clear heartbeat from channel ${clientId}`);
-                }
-                Array.from(this.channelMap.values())
-                    .filter((channel) => channel.id.toString().indexOf(clientId) !== -1)
-                    .forEach((channel) => {
-                    channel.close(1, 'close');
-                    channel.dispose();
-                    this.channelMap.delete(channel.id);
-                    this.logger.log(`Remove connection channel ${channel.id}`);
-                });
-            });
+            const wsConnection = new connection_1.WSWebSocketConnection(connection);
+            this.receiveConnection(wsConnection);
         });
     }
     handleUpgrade(pathname, request, socket, head) {

package/lib/node/common-channel-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"common-channel-handler.js","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"common-channel-handler.js","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":";;;;AAAA,mDAAsD;AACtD,oDAA2B;AAG3B,qDAA6D;AAC7D,6DAA8F;AAIrF,yGAJ0B,yCAAwB,OAI1B;AAEjC;;GAEG;AACH,MAAa,oBAAqB,SAAQ,yCAAwB;IAIhE,YAAY,SAAiB,EAAE,SAAkB,OAAO,EAAU,UAAuC,EAAE;QACzG,KAAK,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;QAD0B,YAAO,GAAP,OAAO,CAAkC;QAEzG,IAAI,CAAC,YAAY,GAAG,IAAA,sBAAK,EAAC,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED,WAAW,CAAC,UAAiC;QAC3C,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ,GAAG,IAAI,YAAS,CAAC,MAAM,iBAClC,QAAQ,EAAE,IAAI,IACX,IAAI,CAAC,OAAO,CAAC,eAAe,EAC/B,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,UAAqB,EAAE,EAAE;YACvD,MAAM,YAAY,GAAG,IAAI,kCAAqB,CAAC,UAAU,CAAC,CAAC;YAC3D,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,aAAa,CAAC,QAAgB,EAAE,OAAY,EAAE,MAAW,EAAE,IAAS;QACzE,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEhD,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,UAAU,EAAE,EAAE;gBAC/D,UAAkB,CAAC,UAAU,GAAG;oBAC/B,QAAQ;iBACT,CAAC;gBAEF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA1CD,oDA0CC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-connection",
-  "version": "2.27.3-rc-1708399099.0",
+  "version": "2.27.3-rc-1710386185.0",
   "files": [
     "lib",
     "src"
@@ -17,18 +17,18 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@furyjs/fury": "0.5.7-beta",
+    "@furyjs/fury": "0.5.9-beta",
     "@opensumi/events": "^1.0.0",
-    "@opensumi/ide-core-common": "2.27.3-rc-1708399099.0",
+    "@opensumi/ide-core-common": "2.27.3-rc-1710386185.0",
     "@opensumi/vscode-jsonrpc": "^8.0.0-next.2",
     "path-match": "^1.2.4",
     "reconnecting-websocket": "^4.4.0",
     "ws": "^8.15.1"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.27.3-rc-1708399099.0",
+    "@opensumi/ide-components": "2.27.3-rc-1710386185.0",
     "@opensumi/ide-dev-tool": "1.3.1",
     "@opensumi/mock-socket": "^9.3.1"
   },
-  "gitHead": "4f7c1cb8da7cbdb691b5e56a5c5c4674af5ed7b6"
+  "gitHead": "466204f2cce511e0db35f0c6f28afc210ff65ccc"
 }

package/src/browser/ws-channel-handler.ts

@@ -1,10 +1,9 @@
-import { uuid } from '@opensumi/ide-core-common';
 import { IReporterService, REPORT_NAME } from '@opensumi/ide-core-common';
 
 import { NetSocketConnection } from '../common/connection';
 import { ReconnectingWebSocketConnection } from '../common/connection/drivers/reconnecting-websocket';
-import { WSCloseInfo, ConnectionInfo } from '../common/utils';
-import { WSChannel, stringify, parse } from '../common/ws-channel';
+import { ConnectionInfo, WSCloseInfo } from '../common/types';
+import { WSChannel, parse, pingMessage } from '../common/ws-channel';
 
 /**
  * Channel Handler in browser
@@ -17,15 +16,11 @@ export class WSChannelHandler {
   private heartbeatMessageTimer: NodeJS.Timeout | null;
   private reporterService: IReporterService;
 
-  LOG_TAG = '[WSChannelHandler]';
+  LOG_TAG: string;
 
-  constructor(
-    public connection: ReconnectingWebSocketConnection | NetSocketConnection,
-    logger: any,
-    clientId?: string,
-  ) {
+  constructor(public connection: ReconnectingWebSocketConnection | NetSocketConnection, logger: any, clientId: string) {
     this.logger = logger || this.logger;
-    this.clientId = clientId || `CLIENT_ID_${uuid()}`;
+    this.clientId = clientId;
     this.LOG_TAG = `[WSChannelHandler] [client-id:${this.clientId}]`;
   }
   // 为解决建立连接之后，替换成可落盘的 logger
@@ -42,12 +37,7 @@ export class WSChannelHandler {
       clearTimeout(this.heartbeatMessageTimer);
     }
     this.heartbeatMessageTimer = global.setTimeout(() => {
-      const msg = stringify({
-        kind: 'ping',
-        clientId: this.clientId,
-        id: this.clientId,
-      });
-      this.connection.send(msg);
+      this.connection.send(pingMessage);
       this.heartbeatMessage();
     }, 5000);
   }
@@ -59,22 +49,17 @@ export class WSChannelHandler {
 
       const msg = parse(message);
 
-      if (msg.kind === 'pong') {
-        // ignore server2client pong message
-        return;
-      }
-
-      if (!msg.id) {
-        // unknown message
-        this.logger.warn(this.LOG_TAG, 'unknown message', msg);
-        return;
-      }
-
-      const channel = this.channelMap.get(msg.id);
-      if (channel) {
-        channel.dispatchChannelMessage(msg);
-      } else {
-        this.logger.warn(this.LOG_TAG, `channel ${msg.id} not found`);
+      switch (msg.kind) {
+        case 'pong':
+          break;
+        default: {
+          const channel = this.channelMap.get(msg.id);
+          if (channel) {
+            channel.dispatchChannelMessage(msg);
+          } else {
+            this.logger.warn(this.LOG_TAG, `channel ${msg.id} not found`);
+          }
+        }
       }
     });
 
@@ -94,6 +79,7 @@ export class WSChannelHandler {
         });
       }
     };
+
     await new Promise<void>((resolve) => {
       if (this.connection.isOpen()) {
         this.heartbeatMessage();
@@ -106,14 +92,14 @@ export class WSChannelHandler {
           reopenExistsChannel();
         });
       }
+    });
 
-      this.connection.onceClose((code, reason) => {
-        if (this.channelMap.size) {
-          this.channelMap.forEach((channel) => {
-            channel.close(code ?? 1000, reason ?? '');
-          });
-        }
-      });
+    this.connection.onceClose((code, reason) => {
+      if (this.channelMap.size) {
+        this.channelMap.forEach((channel) => {
+          channel.close(code ?? 1000, reason ?? '');
+        });
+      }
     });
   }
   public async openChannel(channelPath: string) {
@@ -135,7 +121,7 @@ export class WSChannelHandler {
           closeEvent: { code, reason },
           connectInfo: (navigator as any).connection as ConnectionInfo,
         });
-        this.logger.log(this.LOG_TAG, 'channel close: ', code, reason);
+        this.logger.log(this.LOG_TAG, 'channel close: ', `code: ${code}, reason: ${reason}`);
       });
       channel.open(channelPath, this.clientId);
     });

package/src/common/buffers/buffers.ts

@@ -4,7 +4,7 @@
  * Where possible, operations execute without creating a new Buffer and copying everything over.
  */
 
-const emptyBuffer = new Uint8Array(0);
+export const emptyBuffer = new Uint8Array(0);
 
 export function copy(
   source: Uint8Array,

package/src/common/capturer.ts

@@ -0,0 +1,36 @@
+declare global {
+  interface Window {
+    __OPENSUMI_DEVTOOLS_GLOBAL_HOOK__: any;
+  }
+}
+
+export enum MessageType {
+  SendNotification = 'sendNotification',
+  SendRequest = 'sendRequest',
+  RequestResult = 'requestResult',
+  OnNotification = 'onNotification',
+  OnRequest = 'onRequest',
+  OnRequestResult = 'onRequestResult',
+}
+
+export enum ResponseStatus {
+  Success = 'success',
+  Fail = 'fail',
+}
+
+export interface ICapturedMessage {
+  type: MessageType;
+  serviceMethod: string;
+  arguments?: any;
+  requestId?: string;
+  status?: ResponseStatus;
+  data?: any;
+  error?: any;
+}
+
+export function getCapturer() {
+  if (typeof window !== 'undefined' && window.__OPENSUMI_DEVTOOLS_GLOBAL_HOOK__?.captureRPC) {
+    return window.__OPENSUMI_DEVTOOLS_GLOBAL_HOOK__.captureRPC;
+  }
+  return;
+}

package/src/common/connection/drivers/frame-decoder.ts

@@ -1,11 +1,9 @@
 import { BinaryWriter } from '@furyjs/fury/dist/lib/writer';
 
-import { readUInt32LE, Emitter } from '@opensumi/ide-core-common';
+import { Emitter, readUInt32LE } from '@opensumi/ide-core-common';
 
 import { Buffers } from '../../buffers/buffers';
 
-const writer = BinaryWriter({});
-
 /**
  * You can use `Buffer.from('\r\n\r\n')` to get this indicator.
  */
@@ -15,14 +13,6 @@ export const indicator = new Uint8Array([0x0d, 0x0a, 0x0d, 0x0a]);
  * sticky packet unpacking problems are generally problems at the transport layer.
  * we use a length field to represent the length of the data, and then read the data according to the length
  */
-export function prependLengthField(content: Uint8Array) {
-  writer.reset();
-  writer.buffer(indicator);
-  writer.uint32(content.byteLength);
-  writer.buffer(content);
-  return writer.dump();
-}
-
 export class LengthFieldBasedFrameDecoder {
   protected dataEmitter = new Emitter<Uint8Array>();
   onData = this.dataEmitter.event;
@@ -167,4 +157,14 @@ export class LengthFieldBasedFrameDecoder {
     this.dataEmitter.dispose();
     this.buffers.dispose();
   }
+
+  static writer = BinaryWriter({});
+
+  static construct(content: Uint8Array) {
+    LengthFieldBasedFrameDecoder.writer.reset();
+    LengthFieldBasedFrameDecoder.writer.buffer(indicator);
+    LengthFieldBasedFrameDecoder.writer.uint32(content.byteLength);
+    LengthFieldBasedFrameDecoder.writer.buffer(content);
+    return LengthFieldBasedFrameDecoder.writer.dump();
+  }
 }

package/src/common/connection/drivers/index.ts

@@ -1,5 +1,4 @@
 export * from './base';
-export * from './utils';
 export * from './node-message-port';
 export * from './socket';
 export * from './ws-websocket';

package/src/common/connection/drivers/message-port.ts

@@ -5,10 +5,7 @@ import { BaseConnection } from './base';
 export class MessagePortConnection extends BaseConnection<Uint8Array> {
   constructor(public port: MessagePort) {
     super();
-    if (typeof port.start === 'function') {
-      // compatible with nodejs in unittest, nodejs does not have start method
-      port.start();
-    }
+    port.start();
   }
 
   send(data: Uint8Array): void {

package/src/common/connection/drivers/node-message-port.ts

@@ -1,9 +1,9 @@
-import type { MessagePort } from 'worker_threads';
-
 import { IDisposable } from '@opensumi/ide-core-common';
 
 import { BaseConnection } from './base';
 
+import type { MessagePort } from 'worker_threads';
+
 export class NodeMessagePortConnection extends BaseConnection<Uint8Array> {
   constructor(private port: MessagePort) {
     super();

package/src/common/connection/drivers/reconnecting-websocket.ts

@@ -1,10 +1,11 @@
 import ReconnectingWebSocket, { Options as ReconnectingWebSocketOptions, UrlProvider } from 'reconnecting-websocket';
-import type { ErrorEvent } from 'reconnecting-websocket';
 
 import { IDisposable } from '@opensumi/ide-core-common';
 
 import { BaseConnection } from './base';
 
+import type { ErrorEvent } from 'reconnecting-websocket';
+
 export class ReconnectingWebSocketConnection extends BaseConnection<Uint8Array> {
   constructor(private socket: ReconnectingWebSocket) {
     super();
@@ -40,7 +41,7 @@ export class ReconnectingWebSocketConnection extends BaseConnection<Uint8Array>
       } else {
         throw new Error('unknown message type, expect Blob or ArrayBuffer, received: ' + typeof e.data);
       }
-      buffer.then((v) => cb(new Uint8Array(v)));
+      buffer.then((v) => cb(new Uint8Array(v, 0, v.byteLength)));
     };
 
     this.socket.addEventListener('message', handler);

package/src/common/connection/drivers/socket.ts

@@ -1,44 +1,18 @@
-import type net from 'net';
-
 import { IDisposable } from '@opensumi/ide-core-common';
 
-import { BaseConnection } from './base';
-import { LengthFieldBasedFrameDecoder, prependLengthField } from './frame-decoder';
+import { StreamConnection } from './stream';
 
-export class NetSocketConnection extends BaseConnection<Uint8Array> {
-  protected decoder = new LengthFieldBasedFrameDecoder();
+import type net from 'net';
 
+export class NetSocketConnection extends StreamConnection {
   constructor(private socket: net.Socket) {
-    super();
-    this.socket.on('data', (chunk) => {
-      this.decoder.push(chunk);
-    });
-    this.socket.once('close', () => {
-      this.decoder.dispose();
-    });
+    super(socket, socket);
   }
 
   isOpen(): boolean {
     return this.socket.readyState === 'open';
   }
 
-  send(data: Uint8Array): void {
-    this.socket.write(prependLengthField(data));
-  }
-
-  onMessage(cb: (data: Uint8Array) => void): IDisposable {
-    return this.decoder.onData(cb);
-  }
-
-  onceClose(cb: () => void): IDisposable {
-    this.socket.once('close', cb);
-    return {
-      dispose: () => {
-        this.socket.off('close', cb);
-      },
-    };
-  }
-
   onOpen(cb: () => void): IDisposable {
     this.socket.on('connect', cb);
     return {
@@ -48,18 +22,6 @@ export class NetSocketConnection extends BaseConnection<Uint8Array> {
     };
   }
 
-  onError(cb: (err: Error) => void): IDisposable {
-    this.socket.on('error', cb);
-    return {
-      dispose: () => {
-        this.socket.off('error', cb);
-      },
-    };
-  }
-  dispose(): void {
-    this.decoder.dispose();
-  }
-
   destroy(): void {
     this.socket.destroy();
   }

package/src/common/connection/drivers/stream.ts

@@ -0,0 +1,76 @@
+import { IDisposable } from '@opensumi/ide-core-common';
+
+import { BaseConnection } from './base';
+import { LengthFieldBasedFrameDecoder } from './frame-decoder';
+
+import type { Readable, Writable } from 'stream';
+
+export class StreamConnection extends BaseConnection<Uint8Array> {
+  protected decoder = new LengthFieldBasedFrameDecoder();
+
+  constructor(public readable: Readable, public writable: Writable) {
+    super();
+    const decode = (chunk: Uint8Array) => {
+      this.decoder.push(chunk);
+    };
+    this.readable.on('data', decode);
+    this.readable.once('close', () => {
+      this.decoder.dispose();
+      this.readable.off('data', decode);
+    });
+  }
+
+  send(data: Uint8Array): void {
+    const result = LengthFieldBasedFrameDecoder.construct(data);
+    this.writable.write(result, () => {
+      // TODO: logger error
+    });
+  }
+
+  onMessage(cb: (data: Uint8Array) => void): IDisposable {
+    return this.decoder.onData(cb);
+  }
+
+  onceClose(cb: (code?: number, reason?: string) => void): IDisposable {
+    const wrapper = (hadError: boolean) => {
+      const code: number = hadError ? 1 : 0;
+      const reason: string = hadError ? 'had error' : '';
+      cb(code, reason);
+      dispose();
+    };
+
+    const dispose = () => {
+      this.readable.off('close', wrapper);
+      if ((this.writable as any) !== (this.readable as any)) {
+        this.writable.off('close', wrapper);
+      }
+    };
+
+    this.readable.once('close', wrapper);
+    if ((this.writable as any) !== (this.readable as any)) {
+      this.writable.once('close', wrapper);
+    }
+
+    return {
+      dispose,
+    };
+  }
+
+  onError(cb: (err: Error) => void): IDisposable {
+    this.readable.on('error', cb);
+    if ((this.writable as any) !== (this.readable as any)) {
+      this.writable.on('error', cb);
+    }
+    return {
+      dispose: () => {
+        this.readable.off('error', cb);
+        if ((this.writable as any) !== (this.readable as any)) {
+          this.writable.off('error', cb);
+        }
+      },
+    };
+  }
+  dispose(): void {
+    this.decoder.dispose();
+  }
+}

package/src/common/connection/drivers/ws-websocket.ts

@@ -1,9 +1,9 @@
-import type WebSocket from 'ws';
-
 import { IDisposable } from '@opensumi/ide-core-common';
 
 import { BaseConnection } from './base';
 
+import type WebSocket from 'ws';
+
 export class WSWebSocketConnection extends BaseConnection<Uint8Array> {
   constructor(public socket: WebSocket) {
     super();