@opensumi/ide-connection 3.1.5-next-1721991901.0 → 3.1.5-next-1722006339.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/lib/common/server-handler.d.ts +2 -2
  2. package/lib/common/server-handler.d.ts.map +1 -1
  3. package/lib/common/server-handler.js +5 -5
  4. package/lib/common/server-handler.js.map +1 -1
  5. package/lib/electron/channel-handler.d.ts +3 -2
  6. package/lib/electron/channel-handler.d.ts.map +1 -1
  7. package/lib/electron/channel-handler.js +3 -2
  8. package/lib/electron/channel-handler.js.map +1 -1
  9. package/lib/node/common-channel-handler.d.ts +3 -3
  10. package/lib/node/common-channel-handler.d.ts.map +1 -1
  11. package/lib/node/common-channel-handler.js +4 -4
  12. package/lib/node/common-channel-handler.js.map +1 -1
  13. package/package.json +5 -5
  14. package/src/common/server-handler.ts +8 -5
  15. package/src/electron/channel-handler.ts +7 -3
  16. package/src/node/common-channel-handler.ts +8 -5
package/lib/common/server-handler.d.ts CHANGED
@@ -21,17 +21,17 @@ export declare class CommonChannelPathHandler {
21
21
  openChannel(path: string, channel: WSChannel, clientId: string): void;
22
22
  getAll(): IPathHandler[][];
23
23
  }
24
- export declare const commonChannelPathHandler: CommonChannelPathHandler;
25
24
  export interface ChannelHandlerOptions {
26
25
  serializer?: ISerializer<ChannelMessage, any>;
27
26
  }
28
27
  export declare abstract class BaseCommonChannelHandler {
29
28
  handlerId: string;
29
+ protected commonChannelPathHandler: CommonChannelPathHandler;
30
30
  protected logger: ILogger;
31
31
  protected channelMap: Map<string, WSServerChannel>;
32
32
  protected heartbeatTimer: NodeJS.Timeout | null;
33
33
  serializer: ISerializer<ChannelMessage, any>;
34
- constructor(handlerId: string, logger?: ILogger, options?: ChannelHandlerOptions);
34
+ constructor(handlerId: string, commonChannelPathHandler: CommonChannelPathHandler, logger?: ILogger, options?: ChannelHandlerOptions);
35
35
  abstract doHeartbeat(connection: any): void;
36
36
  private heartbeat;
37
37
  receiveConnection(connection: IConnectionShape<Uint8Array>): void;
package/lib/common/server-handler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server-handler.d.ts","sourceRoot":"","sources":["../../src/common/server-handler.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAoB,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE1D,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAC7F,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/D,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,qBAAa,wBAAwB;IACnC,OAAO,CAAC,UAAU,CAA0C;IAC5D,OAAO,CAAC,SAAS,CAAkC;IAEnD,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY;IAqBnD,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAUrE,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY;IAcxD,GAAG,CAAC,WAAW,EAAE,MAAM;IAGvB,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAOxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM;IAsB9D,MAAM;CAGP;AAED,eAAO,MAAM,wBAAwB,0BAAiC,CAAC;AAEvE,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;CAC/C;AAOD,8BAAsB,wBAAwB;IAMzB,SAAS,EAAE,MAAM;IAAE,SAAS,CAAC,MAAM,EAAE,OAAO;IAL/D,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAa;IAE/D,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAQ;IAEvD,UAAU,EAAE,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC,CAAkB;gBAC3C,SAAS,EAAE,MAAM,EAAY,MAAM,GAAE,OAAiB,EAAE,OAAO,GAAE,qBAA0B;IAM9G,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,GAAG,IAAI;IAE3C,OAAO,CAAC,SAAS;IAWjB,iBAAiB,CAAC,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;IAgE1D,OAAO;CAKR;AAED,eAAO,MAAM,qBAAqB,eAAe,CAAC"}
1
+ {"version":3,"file":"server-handler.d.ts","sourceRoot":"","sources":["../../src/common/server-handler.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAoB,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE1D,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAC7F,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/D,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,qBAAa,wBAAwB;IACnC,OAAO,CAAC,UAAU,CAA0C;IAC5D,OAAO,CAAC,SAAS,CAAkC;IAEnD,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY;IAqBnD,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAUrE,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY;IAcxD,GAAG,CAAC,WAAW,EAAE,MAAM;IAGvB,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAOxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM;IAsB9D,MAAM;CAGP;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,EAAE,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;CAC/C;AAOD,8BAAsB,wBAAwB;IAOnC,SAAS,EAAE,MAAM;IACxB,SAAS,CAAC,wBAAwB,EAAE,wBAAwB;IAC5D,SAAS,CAAC,MAAM,EAAE,OAAO;IAR3B,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAa;IAE/D,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAQ;IAEvD,UAAU,EAAE,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC,CAAkB;gBAErD,SAAS,EAAE,MAAM,EACd,wBAAwB,EAAE,wBAAwB,EAClD,MAAM,GAAE,OAAiB,EACnC,OAAO,GAAE,qBAA0B;IAOrC,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,GAAG,IAAI;IAE3C,OAAO,CAAC,SAAS;IAWjB,iBAAiB,CAAC,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;IAgE1D,OAAO;CAKR;AAED,eAAO,MAAM,qBAAqB,eAAe,CAAC"}
package/lib/common/server-handler.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.RPCServiceChannelPath = exports.BaseCommonChannelHandler = exports.commonChannelPathHandler = exports.CommonChannelPathHandler = void 0;
3
+ exports.RPCServiceChannelPath = exports.BaseCommonChannelHandler = exports.CommonChannelPathHandler = void 0;
4
4
  const types_1 = require("./channel/types");
5
5
  const serializer_1 = require("./serializer");
6
6
  const ws_channel_1 = require("./ws-channel");
@@ -89,15 +89,15 @@ class CommonChannelPathHandler {
89
89
  }
90
90
  }
91
91
  exports.CommonChannelPathHandler = CommonChannelPathHandler;
92
- exports.commonChannelPathHandler = new CommonChannelPathHandler();
93
92
  var ServerChannelCloseCode;
94
93
  (function (ServerChannelCloseCode) {
95
94
  ServerChannelCloseCode[ServerChannelCloseCode["ConnectionClosed"] = 1] = "ConnectionClosed";
96
95
  ServerChannelCloseCode[ServerChannelCloseCode["NewChannelOpened"] = 2] = "NewChannelOpened";
97
96
  })(ServerChannelCloseCode || (ServerChannelCloseCode = {}));
98
97
  class BaseCommonChannelHandler {
99
- constructor(handlerId, logger = console, options = {}) {
98
+ constructor(handlerId, commonChannelPathHandler, logger = console, options = {}) {
100
99
  this.handlerId = handlerId;
100
+ this.commonChannelPathHandler = commonChannelPathHandler;
101
101
  this.logger = logger;
102
102
  this.channelMap = new Map();
103
103
  this.heartbeatTimer = null;
@@ -133,7 +133,7 @@ class BaseCommonChannelHandler {
133
133
  }
134
134
  channel = new ws_channel_1.WSServerChannel(wrappedConnection, { id, clientId, logger: this.logger });
135
135
  this.channelMap.set(id, channel);
136
- exports.commonChannelPathHandler.openChannel(path, channel, clientId);
136
+ this.commonChannelPathHandler.openChannel(path, channel, clientId);
137
137
  channel.serverReady(traceId);
138
138
  break;
139
139
  }
@@ -161,7 +161,7 @@ class BaseCommonChannelHandler {
161
161
  });
162
162
  connection.onceClose(() => {
163
163
  this.logger.log(`connection ${clientId} is closed, dispose all channels`);
164
- exports.commonChannelPathHandler.disposeConnectionClientId(connection, clientId);
164
+ this.commonChannelPathHandler.disposeConnectionClientId(connection, clientId);
165
165
  Array.from(this.channelMap.values())
166
166
  .filter((channel) => channel.clientId === clientId)
167
167
  .forEach((channel) => {
package/lib/common/server-handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server-handler.js","sourceRoot":"","sources":["../../src/common/server-handler.ts"],"names":[],"mappings":";;;AAAA,2CAAmE;AAEnE,6CAA8D;AAG9D,6CAA0D;AAS1D,MAAa,wBAAwB;IAArC;QACU,eAAU,GAAgC,IAAI,GAAG,EAAE,CAAC;QACpD,cAAS,GAAwB,IAAI,GAAG,EAAE,CAAC;IAkFrD,CAAC;IAhFC,QAAQ,CAAC,WAAmB,EAAE,OAAqB;QACjD,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,SAAS,GAAG,WAAW,IAAI,CAAC,CAAC;QACnC,IAAI,YAAY,GAAG,WAAW,CAAC;QAC/B,IAAI,SAAS,EAAE;YACb,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;YACjD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC;SACtE;QACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;YACtC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;SACvC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAmB,CAAC;QACvE,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,UAAU,GAAG,CAAC,OAAkB,EAAE,QAAgB,EAAE,MAAW,EAAE,EAAE;YACvE,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC;YAC7B,SAAS,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QACvC,CAAC,CAAC;QACF,OAAO,CAAC,OAAO,GAAG,UAAU,CAAC;QAC7B,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAChD,CAAC;IACD,SAAS,CAAC,WAAmB,EAAE,KAAa;QAC1C,MAAM,MAAM,GAAG,EAA4B,CAAC;QAC5C,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;YACnC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC5C,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aACrB;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,aAAa,CAAC,WAAmB,EAAE,OAAqB;QACtD,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,WAAW,IAAI,CAAC,CAAC;QACnC,IAAI,YAAY,GAAG,WAAW,CAAC;QAC/B,IAAI,SAAS,EAAE;YACb,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;SAClD;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QAC3D,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE;YACtB,UAAU,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;SACnC;QACD,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IACD,GAAG,CAAC,WAAmB;QACrB,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC;IACD,yBAAyB,CAAC,OAAY,EAAE,QAAgB;QACtD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,UAA0B,EAAE,EAAE;YACrD,UAAU,CAAC,OAAO,CAAC,CAAC,OAAqB,EAAE,EAAE;gBAC3C,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IACD,WAAW,CAAC,IAAY,EAAE,OAAkB,EAAE,QAAgB;QAC5D,wBAAwB;QACxB,IAAI,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,MAA0C,CAAC;QAC/C,wCAAwC;QACxC,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACrC,MAAM,QAAQ,GAAG,UAAU,IAAI,CAAC,CAAC;YACjC,IAAI,QAAQ,EAAE;gBACZ,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;gBACjD,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC;aAChF;SACF;QAED,IAAI,UAAU,EAAE;YACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;gBACrD,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC9B,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;aAC5C;SACF;IACH,CAAC;IAED,MAAM;QACJ,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9C,CAAC;CACF;AApFD,4DAoFC;AAEY,QAAA,wBAAwB,GAAG,IAAI,wBAAwB,EAAE,CAAC;AAMvE,IAAK,sBAGJ;AAHD,WAAK,sBAAsB;IACzB,2FAAoB,CAAA;IACpB,2FAAoB,CAAA;AACtB,CAAC,EAHI,sBAAsB,KAAtB,sBAAsB,QAG1B;AAED,MAAsB,wBAAwB;IAM5C,YAAmB,SAAiB,EAAY,SAAkB,OAAO,EAAE,UAAiC,EAAE;QAA3F,cAAS,GAAT,SAAS,CAAQ;QAAY,WAAM,GAAN,MAAM,CAAmB;QAL/D,eAAU,GAAiC,IAAI,GAAG,EAAE,CAAC;QAErD,mBAAc,GAA0B,IAAI,CAAC;QAEvD,eAAU,GAAqC,2BAAc,CAAC;QAE5D,IAAI,OAAO,CAAC,UAAU,EAAE;YACtB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;SACtC;IACH,CAAC;IAIO,SAAS,CAAC,UAAe;QAC/B,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;YAC3C,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAC7B,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC7B,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;IAED,iBAAiB,CAAC,UAAwC;QACxD,IAAI,QAAgB,CAAC;QACrB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAE3B,MAAM,iBAAiB,GAAG,IAAA,2BAAc,EAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAEtE,iBAAiB,CAAC,SAAS,CAAC,CAAC,GAAmB,EAAE,EAAE;YAClD,IAAI;gBACF,QAAQ,GAAG,CAAC,IAAI,EAAE;oBAChB,KAAK,MAAM,CAAC,CAAC;wBACX,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;wBAClC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;wBAExB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iCAAiC,QAAQ,cAAc,IAAI,EAAE,CAAC,CAAC;wBAC/E,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBACtC,IAAI,OAAO,EAAE;4BACX,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,4CAA4C,CAAC,CAAC;4BACrG,OAAO,CAAC,OAAO,EAAE,CAAC;yBACnB;wBAED,OAAO,GAAG,IAAI,4BAAe,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;wBACxF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;wBACjC,gCAAwB,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;wBAC9D,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;wBAC7B,MAAM;qBACP;oBACD,OAAO,CAAC,CAAC;wBACP,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC;wBAEnB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBACxC,IAAI,OAAO,EAAE;4BACX,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;yBACvB;6BAAM;4BACL,iBAAiB,CAAC,IAAI,CAAC;gCACrB,IAAI,EAAE,OAAO;gCACb,EAAE;gCACF,IAAI,EAAE,wBAAgB,CAAC,eAAe;gCACtC,OAAO,EAAE,WAAW,EAAE,YAAY;6BACnC,CAAC,CAAC;4BAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;yBAChD;qBACF;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAC;aACzD;QACH,CAAC,CAAC,CAAC;QAEH,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE;YACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,QAAQ,kCAAkC,CAAC,CAAC;YAC1E,gCAAwB,CAAC,yBAAyB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YAEzE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;iBACjC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC;iBAClD,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACnB,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;gBAC5E,OAAO,CAAC,OAAO,EAAE,CAAC;gBAClB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;gBACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6BAA6B,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7D,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACnC;IACH,CAAC;CACF;AA9FD,4DA8FC;AAEY,QAAA,qBAAqB,GAAG,YAAY,CAAC"}
1
+ {"version":3,"file":"server-handler.js","sourceRoot":"","sources":["../../src/common/server-handler.ts"],"names":[],"mappings":"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"}
package/lib/electron/channel-handler.d.ts CHANGED
@@ -1,13 +1,14 @@
1
1
  /// <reference types="node" />
2
2
  import net from 'net';
3
3
  import { ILogger } from '../common';
4
- import { BaseCommonChannelHandler } from '../common/server-handler';
4
+ import { BaseCommonChannelHandler, CommonChannelPathHandler } from '../common/server-handler';
5
5
  /**
6
6
  * Channel Handler for electron backend
7
7
  */
8
8
  export declare class ElectronChannelHandler extends BaseCommonChannelHandler {
9
9
  private server;
10
- constructor(server: net.Server, logger?: ILogger);
10
+ protected commonChannelPathHandler: CommonChannelPathHandler;
11
+ constructor(server: net.Server, commonChannelPathHandler: CommonChannelPathHandler, logger?: ILogger);
11
12
  doHeartbeat(connection: any): void;
12
13
  listen(): void;
13
14
  }
package/lib/electron/channel-handler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"channel-handler.d.ts","sourceRoot":"","sources":["../../src/electron/channel-handler.ts"],"names":[],"mappings":";AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEpE;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB;IACtD,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAE,OAAiB;IAIjE,WAAW,CAAC,UAAU,EAAE,GAAG,GAAG,IAAI;IAIlC,MAAM;CAOP"}
1
+ {"version":3,"file":"channel-handler.d.ts","sourceRoot":"","sources":["../../src/electron/channel-handler.ts"],"names":[],"mappings":";AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAE9F;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB;IAEhE,OAAO,CAAC,MAAM;IACd,SAAS,CAAC,wBAAwB,EAAE,wBAAwB;gBADpD,MAAM,EAAE,GAAG,CAAC,MAAM,EAChB,wBAAwB,EAAE,wBAAwB,EAC5D,MAAM,GAAE,OAAiB;IAK3B,WAAW,CAAC,UAAU,EAAE,GAAG,GAAG,IAAI;IAIlC,MAAM;CAOP"}
package/lib/electron/channel-handler.js CHANGED
@@ -7,9 +7,10 @@ const server_handler_1 = require("../common/server-handler");
7
7
  * Channel Handler for electron backend
8
8
  */
9
9
  class ElectronChannelHandler extends server_handler_1.BaseCommonChannelHandler {
10
- constructor(server, logger = console) {
11
- super('electron-channel-handler', logger);
10
+ constructor(server, commonChannelPathHandler, logger = console) {
11
+ super('electron-channel-handler', commonChannelPathHandler, logger);
12
12
  this.server = server;
13
+ this.commonChannelPathHandler = commonChannelPathHandler;
13
14
  }
14
15
  doHeartbeat(connection) {
15
16
  // do nothing
package/lib/electron/channel-handler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"channel-handler.js","sourceRoot":"","sources":["../../src/electron/channel-handler.ts"],"names":[],"mappings":";;;AAGA,qDAA2D;AAC3D,6DAAoE;AAEpE;;GAEG;AACH,MAAa,sBAAuB,SAAQ,yCAAwB;IAClE,YAAoB,MAAkB,EAAE,SAAkB,OAAO;QAC/D,KAAK,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC;QADxB,WAAM,GAAN,MAAM,CAAY;IAEtC,CAAC;IAED,WAAW,CAAC,UAAe;QACzB,aAAa;IACf,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,UAAsB,EAAE,EAAE;YACtD,MAAM,aAAa,GAAG,IAAI,gCAAmB,CAAC,UAAU,CAAC,CAAC;YAC1D,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAhBD,wDAgBC"}
1
+ {"version":3,"file":"channel-handler.js","sourceRoot":"","sources":["../../src/electron/channel-handler.ts"],"names":[],"mappings":";;;AAGA,qDAA2D;AAC3D,6DAA8F;AAE9F;;GAEG;AACH,MAAa,sBAAuB,SAAQ,yCAAwB;IAClE,YACU,MAAkB,EAChB,wBAAkD,EAC5D,SAAkB,OAAO;QAEzB,KAAK,CAAC,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,CAAC,CAAC;QAJ5D,WAAM,GAAN,MAAM,CAAY;QAChB,6BAAwB,GAAxB,wBAAwB,CAA0B;IAI9D,CAAC;IAED,WAAW,CAAC,UAAe;QACzB,aAAa;IACf,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,UAAsB,EAAE,EAAE;YACtD,MAAM,aAAa,GAAG,IAAI,gCAAmB,CAAC,UAAU,CAAC,CAAC;YAC1D,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AApBD,wDAoBC"}
package/lib/node/common-channel-handler.d.ts CHANGED
@@ -2,9 +2,8 @@ import { MatchFunction } from 'path-to-regexp';
2
2
  import WebSocket from 'ws';
3
3
  import { ILogger } from '../common';
4
4
  import { WSWebSocketConnection } from '../common/connection';
5
- import { BaseCommonChannelHandler, commonChannelPathHandler } from '../common/server-handler';
5
+ import { BaseCommonChannelHandler, CommonChannelPathHandler } from '../common/server-handler';
6
6
  import { CommonChannelHandlerOptions, WebSocketHandler } from './ws';
7
- export { commonChannelPathHandler };
8
7
  export interface WebSocketConnection extends WebSocket {
9
8
  routeParam: {
10
9
  pathname: string;
@@ -14,10 +13,11 @@ export interface WebSocketConnection extends WebSocket {
14
13
  * Channel Handler for nodejs
15
14
  */
16
15
  export declare class CommonChannelHandler extends BaseCommonChannelHandler implements WebSocketHandler {
16
+ protected commonChannelPathHandler: CommonChannelPathHandler;
17
17
  private options;
18
18
  private wsServer;
19
19
  protected handlerRoute: MatchFunction;
20
- constructor(routePath: string, logger?: ILogger, options?: CommonChannelHandlerOptions);
20
+ constructor(routePath: string, commonChannelPathHandler: CommonChannelPathHandler, logger?: ILogger, options?: CommonChannelHandlerOptions);
21
21
  doHeartbeat(connection: WSWebSocketConnection): void;
22
22
  private initWSServer;
23
23
  handleUpgrade(pathname: string, request: any, socket: any, head: any): boolean;
package/lib/node/common-channel-handler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common-channel-handler.d.ts","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,gBAAgB,CAAC;AACtD,OAAO,SAAS,MAAM,IAAI,CAAC;AAE3B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAE9F,OAAO,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAErE,OAAO,EAAE,wBAAwB,EAAE,CAAC;AAEpC,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD,UAAU,EAAE;QACV,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,wBAAyB,YAAW,gBAAgB;IAIlC,OAAO,CAAC,OAAO;IAHzE,OAAO,CAAC,QAAQ,CAAmB;IACnC,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC;gBAE1B,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,OAAiB,EAAU,OAAO,GAAE,2BAAgC;IAM3G,WAAW,CAAC,UAAU,EAAE,qBAAqB,GAAG,IAAI;IAIpD,OAAO,CAAC,YAAY;IAYb,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO;CAgBtF"}
1
+ {"version":3,"file":"common-channel-handler.d.ts","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,gBAAgB,CAAC;AACtD,OAAO,SAAS,MAAM,IAAI,CAAC;AAE3B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAE9F,OAAO,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAErE,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD,UAAU,EAAE;QACV,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,wBAAyB,YAAW,gBAAgB;IAM1F,SAAS,CAAC,wBAAwB,EAAE,wBAAwB;IAE5D,OAAO,CAAC,OAAO;IAPjB,OAAO,CAAC,QAAQ,CAAmB;IACnC,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC;gBAGpC,SAAS,EAAE,MAAM,EACP,wBAAwB,EAAE,wBAAwB,EAC5D,MAAM,GAAE,OAAiB,EACjB,OAAO,GAAE,2BAAgC;IAOnD,WAAW,CAAC,UAAU,EAAE,qBAAqB,GAAG,IAAI;IAIpD,OAAO,CAAC,YAAY;IAYb,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO;CAgBtF"}
package/lib/node/common-channel-handler.js CHANGED
@@ -1,18 +1,18 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.CommonChannelHandler = exports.commonChannelPathHandler = void 0;
3
+ exports.CommonChannelHandler = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const path_to_regexp_1 = require("path-to-regexp");
6
6
  const ws_1 = tslib_1.__importDefault(require("ws"));
7
7
  const connection_1 = require("../common/connection");
8
8
  const server_handler_1 = require("../common/server-handler");
9
- Object.defineProperty(exports, "commonChannelPathHandler", { enumerable: true, get: function () { return server_handler_1.commonChannelPathHandler; } });
10
9
  /**
11
10
  * Channel Handler for nodejs
12
11
  */
13
12
  class CommonChannelHandler extends server_handler_1.BaseCommonChannelHandler {
14
- constructor(routePath, logger = console, options = {}) {
15
- super('node-channel-handler', logger);
13
+ constructor(routePath, commonChannelPathHandler, logger = console, options = {}) {
14
+ super('node-channel-handler', commonChannelPathHandler, logger);
15
+ this.commonChannelPathHandler = commonChannelPathHandler;
16
16
  this.options = options;
17
17
  this.handlerRoute = (0, path_to_regexp_1.match)(routePath, options.pathMatchOptions);
18
18
  this.initWSServer();
package/lib/node/common-channel-handler.js.map CHANGED
@@ -1 +1 @@
1
- {"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;AAQjC;;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,UAAkC,CAAC,UAAU,GAAG;oBAC/C,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"}
1
+ {"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;AAU9F;;GAEG;AACH,MAAa,oBAAqB,SAAQ,yCAAwB;IAIhE,YACE,SAAiB,EACP,wBAAkD,EAC5D,SAAkB,OAAO,EACjB,UAAuC,EAAE;QAEjD,KAAK,CAAC,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,CAAC,CAAC;QAJtD,6BAAwB,GAAxB,wBAAwB,CAA0B;QAEpD,YAAO,GAAP,OAAO,CAAkC;QAGjD,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,UAAkC,CAAC,UAAU,GAAG;oBAC/C,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;AA/CD,oDA+CC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opensumi/ide-connection",
3
- "version": "3.1.5-next-1721991901.0",
3
+ "version": "3.1.5-next-1722006339.0",
4
4
  "files": [
5
5
  "lib",
6
6
  "src"
@@ -19,16 +19,16 @@
19
19
  "dependencies": {
20
20
  "@furyjs/fury": "0.5.9-beta",
21
21
  "@opensumi/events": "^1.0.0",
22
- "@opensumi/ide-core-common": "3.1.5-next-1721991901.0",
22
+ "@opensumi/ide-core-common": "3.1.5-next-1722006339.0",
23
23
  "@opensumi/reconnecting-websocket": "^4.4.0",
24
24
  "@opensumi/vscode-jsonrpc": "^8.0.0-next.2",
25
25
  "path-to-regexp": "^6.2.1",
26
26
  "ws": "^8.16.0"
27
27
  },
28
28
  "devDependencies": {
29
- "@opensumi/ide-components": "3.1.5-next-1721991901.0",
30
- "@opensumi/ide-dev-tool": "3.1.5-next-1721991901.0",
29
+ "@opensumi/ide-components": "3.1.5-next-1722006339.0",
30
+ "@opensumi/ide-dev-tool": "3.1.5-next-1722006339.0",
31
31
  "@opensumi/mock-socket": "^9.3.1"
32
32
  },
33
- "gitHead": "e0397cacc021bb41c12c5bd4ab6c87e090a7b5c7"
33
+ "gitHead": "b7a8c9e527f1ba8b138a04940f126c3fc032bc44"
34
34
  }
package/src/common/server-handler.ts CHANGED
@@ -98,8 +98,6 @@ export class CommonChannelPathHandler {
98
98
  }
99
99
  }
100
100
 
101
- export const commonChannelPathHandler = new CommonChannelPathHandler();
102
-
103
101
  export interface ChannelHandlerOptions {
104
102
  serializer?: ISerializer<ChannelMessage, any>;
105
103
  }
@@ -115,7 +113,12 @@ export abstract class BaseCommonChannelHandler {
115
113
  protected heartbeatTimer: NodeJS.Timeout | null = null;
116
114
 
117
115
  serializer: ISerializer<ChannelMessage, any> = furySerializer;
118
- constructor(public handlerId: string, protected logger: ILogger = console, options: ChannelHandlerOptions = {}) {
116
+ constructor(
117
+ public handlerId: string,
118
+ protected commonChannelPathHandler: CommonChannelPathHandler,
119
+ protected logger: ILogger = console,
120
+ options: ChannelHandlerOptions = {},
121
+ ) {
119
122
  if (options.serializer) {
120
123
  this.serializer = options.serializer;
121
124
  }
@@ -156,7 +159,7 @@ export abstract class BaseCommonChannelHandler {
156
159
 
157
160
  channel = new WSServerChannel(wrappedConnection, { id, clientId, logger: this.logger });
158
161
  this.channelMap.set(id, channel);
159
- commonChannelPathHandler.openChannel(path, channel, clientId);
162
+ this.commonChannelPathHandler.openChannel(path, channel, clientId);
160
163
  channel.serverReady(traceId);
161
164
  break;
162
165
  }
@@ -185,7 +188,7 @@ export abstract class BaseCommonChannelHandler {
185
188
 
186
189
  connection.onceClose(() => {
187
190
  this.logger.log(`connection ${clientId} is closed, dispose all channels`);
188
- commonChannelPathHandler.disposeConnectionClientId(connection, clientId);
191
+ this.commonChannelPathHandler.disposeConnectionClientId(connection, clientId);
189
192
 
190
193
  Array.from(this.channelMap.values())
191
194
  .filter((channel) => channel.clientId === clientId)
package/src/electron/channel-handler.ts CHANGED
@@ -2,14 +2,18 @@ import net from 'net';
2
2
 
3
3
  import { ILogger } from '../common';
4
4
  import { NetSocketConnection } from '../common/connection';
5
- import { BaseCommonChannelHandler } from '../common/server-handler';
5
+ import { BaseCommonChannelHandler, CommonChannelPathHandler } from '../common/server-handler';
6
6
 
7
7
  /**
8
8
  * Channel Handler for electron backend
9
9
  */
10
10
  export class ElectronChannelHandler extends BaseCommonChannelHandler {
11
- constructor(private server: net.Server, logger: ILogger = console) {
12
- super('electron-channel-handler', logger);
11
+ constructor(
12
+ private server: net.Server,
13
+ protected commonChannelPathHandler: CommonChannelPathHandler,
14
+ logger: ILogger = console,
15
+ ) {
16
+ super('electron-channel-handler', commonChannelPathHandler, logger);
13
17
  }
14
18
 
15
19
  doHeartbeat(connection: any): void {
package/src/node/common-channel-handler.ts CHANGED
@@ -3,12 +3,10 @@ import WebSocket from 'ws';
3
3
 
4
4
  import { ILogger } from '../common';
5
5
  import { WSWebSocketConnection } from '../common/connection';
6
- import { BaseCommonChannelHandler, commonChannelPathHandler } from '../common/server-handler';
6
+ import { BaseCommonChannelHandler, CommonChannelPathHandler } from '../common/server-handler';
7
7
 
8
8
  import { CommonChannelHandlerOptions, WebSocketHandler } from './ws';
9
9
 
10
- export { commonChannelPathHandler };
11
-
12
10
  export interface WebSocketConnection extends WebSocket {
13
11
  routeParam: {
14
12
  pathname: string;
@@ -22,8 +20,13 @@ export class CommonChannelHandler extends BaseCommonChannelHandler implements We
22
20
  private wsServer: WebSocket.Server;
23
21
  protected handlerRoute: MatchFunction;
24
22
 
25
- constructor(routePath: string, logger: ILogger = console, private options: CommonChannelHandlerOptions = {}) {
26
- super('node-channel-handler', logger);
23
+ constructor(
24
+ routePath: string,
25
+ protected commonChannelPathHandler: CommonChannelPathHandler,
26
+ logger: ILogger = console,
27
+ private options: CommonChannelHandlerOptions = {},
28
+ ) {
29
+ super('node-channel-handler', commonChannelPathHandler, logger);
27
30
  this.handlerRoute = match(routePath, options.pathMatchOptions);
28
31
  this.initWSServer();
29
32
  }