@opensumi/ide-connection 2.27.3-next-1706686746.0 → 2.27.3-rc-1706687185.0

package/lib/browser/ws-channel-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws-channel-handler.d.ts","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAe,MAAM,2BAA2B,CAAC;AAE1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AAEtG,OAAO,EAAE,SAAS,EAAoB,MAAM,sBAAsB,CAAC;AAEnE;;GAEG;AACH,qBAAa,gBAAgB;IAWlB,UAAU,EAAE,+BAA+B,GAAG,mBAAmB;IAV1E,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,oBAAoB,CAAuC;IACnE,OAAO,CAAC,MAAM,CAAW;IAClB,QAAQ,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,qBAAqB,CAAwB;IACrD,OAAO,CAAC,eAAe,CAAmB;IAE1C,OAAO,SAAwB;gBAGtB,UAAU,EAAE,+BAA+B,GAAG,mBAAmB,EACxE,MAAM,EAAE,GAAG,EACX,QAAQ,CAAC,EAAE,MAAM;IAOnB,aAAa,CAAC,MAAM,EAAE,GAAG;IAKzB,WAAW,CAAC,eAAe,EAAE,gBAAgB;IAG7C,OAAO,CAAC,gBAAgB;IAeX,WAAW;IAgEX,WAAW,CAAC,WAAW,EAAE,MAAM;IA2BrC,OAAO;CAKf"}
+{"version":3,"file":"ws-channel-handler.d.ts","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAe,MAAM,2BAA2B,CAAC;AAE1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AAEtG,OAAO,EAAE,SAAS,EAAoB,MAAM,sBAAsB,CAAC;AAEnE;;GAEG;AACH,qBAAa,gBAAgB;IAWlB,UAAU,EAAE,+BAA+B,GAAG,mBAAmB;IAV1E,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,oBAAoB,CAAuC;IACnE,OAAO,CAAC,MAAM,CAAW;IAClB,QAAQ,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,qBAAqB,CAAwB;IACrD,OAAO,CAAC,eAAe,CAAmB;IAE1C,OAAO,SAAwB;gBAGtB,UAAU,EAAE,+BAA+B,GAAG,mBAAmB,EACxE,MAAM,EAAE,GAAG,EACX,QAAQ,CAAC,EAAE,MAAM;IAOnB,aAAa,CAAC,MAAM,EAAE,GAAG;IAKzB,WAAW,CAAC,eAAe,EAAE,gBAAgB;IAG7C,OAAO,CAAC,gBAAgB;IAeX,WAAW;IAoEX,WAAW,CAAC,WAAW,EAAE,MAAM;IA2BrC,OAAO;CAKf"}

package/lib/browser/ws-channel-handler.js

@@ -57,6 +57,10 @@ class WSChannelHandler {
             }
             const channel = this.channelMap.get(msg.id);
             if (channel) {
+                if (!channel.hasMessageListener()) {
+                    // 要求前端发送初始化消息，但后端最先发送消息时，前端并未准备好
+                    this.logger.error(this.LOG_TAG, 'channel not ready!', msg);
+                }
                 channel.handleMessage(msg);
             }
             else {

package/lib/browser/ws-channel-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"ws-channel-handler.js","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":";;;AAAA,+DAAiD;AACjD,+DAA0E;AAK1E,qDAAmE;AAEnE;;GAEG;AACH,MAAa,gBAAgB;IAU3B,YACS,UAAiE,EACxE,MAAW,EACX,QAAiB;QAFV,eAAU,GAAV,UAAU,CAAuD;QAVlE,eAAU,GAA2B,IAAI,GAAG,EAAE,CAAC;QAC/C,yBAAoB,GAA6B,IAAI,GAAG,EAAE,CAAC;QAC3D,WAAM,GAAG,OAAO,CAAC;QAKzB,YAAO,GAAG,oBAAoB,CAAC;QAO7B,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,aAAa,IAAA,sBAAI,GAAE,EAAE,CAAC;QAClD,IAAI,CAAC,OAAO,GAAG,iCAAiC,IAAI,CAAC,QAAQ,GAAG,CAAC;IACnE,CAAC;IACD,2BAA2B;IAC3B,aAAa,CAAC,MAAW;QACvB,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;IACH,CAAC;IACD,WAAW,CAAC,eAAiC;QAC3C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IACO,gBAAgB;QACtB,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC9B,YAAY,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QACD,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;YAClD,MAAM,GAAG,GAAG,IAAA,sBAAS,EAAC;gBACpB,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,EAAE,EAAE,IAAI,CAAC,QAAQ;aAClB,CAAC,CAAC;YACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;IAEM,KAAK,CAAC,WAAW;QACtB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;YACpC,2BAA2B;YAC3B,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAExB,MAAM,GAAG,GAAG,IAAA,kBAAK,EAAC,OAAO,CAAC,CAAC;YAE3B,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE;gBACvB,oCAAoC;gBACpC,OAAO;aACR;YAED,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;gBACX,kBAAkB;gBAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAC;gBACvD,OAAO;aACR;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC5C,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;aAC5B;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;aAC/D;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;gBACxB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAClC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;wBAClB,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC5D,IAAI,CAAC,eAAe;4BAClB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,6BAAW,CAAC,iBAAiB,EAAE,6BAAW,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;wBACtG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,qBAAqB,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;oBAC7F,CAAC,CAAC,CAAC;oBAEH,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACjD,qBAAqB;oBACrB,OAAO,CAAC,UAAU,EAAE,CAAC;gBACvB,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC;QACF,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;gBAC5B,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,OAAO,EAAE,CAAC;gBACV,mBAAmB,EAAE,CAAC;aACvB;iBAAM;gBACL,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE;oBAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBACxB,OAAO,EAAE,CAAC;oBACV,mBAAmB,EAAE,CAAC;gBACxB,CAAC,CAAC,CAAC;aACJ;YAED,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;gBACzC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;oBACxB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;wBAClC,OAAO,CAAC,KAAK,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAI,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,CAAC;oBAC5C,CAAC,CAAC,CAAC;iBACJ;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IACM,KAAK,CAAC,WAAW,CAAC,WAAmB;QAC1C,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,QAAQ,IAAI,WAAW,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,UAAU,EAAE;YAC7C,EAAE,EAAE,SAAS;YACb,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;gBAClB,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE;gBAC/C,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,SAAS,EAAE;oBACvC,WAAW;oBACX,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;oBAC5B,WAAW,EAAG,SAAiB,CAAC,UAA4B;iBAC7D,CAAC,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YACjE,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,OAAO;QACZ,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC9B,YAAY,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SAC1C;IACH,CAAC;CACF;AA3ID,4CA2IC"}
+{"version":3,"file":"ws-channel-handler.js","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":";;;AAAA,+DAAiD;AACjD,+DAA0E;AAK1E,qDAAmE;AAEnE;;GAEG;AACH,MAAa,gBAAgB;IAU3B,YACS,UAAiE,EACxE,MAAW,EACX,QAAiB;QAFV,eAAU,GAAV,UAAU,CAAuD;QAVlE,eAAU,GAA2B,IAAI,GAAG,EAAE,CAAC;QAC/C,yBAAoB,GAA6B,IAAI,GAAG,EAAE,CAAC;QAC3D,WAAM,GAAG,OAAO,CAAC;QAKzB,YAAO,GAAG,oBAAoB,CAAC;QAO7B,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,aAAa,IAAA,sBAAI,GAAE,EAAE,CAAC;QAClD,IAAI,CAAC,OAAO,GAAG,iCAAiC,IAAI,CAAC,QAAQ,GAAG,CAAC;IACnE,CAAC;IACD,2BAA2B;IAC3B,aAAa,CAAC,MAAW;QACvB,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;IACH,CAAC;IACD,WAAW,CAAC,eAAiC;QAC3C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IACO,gBAAgB;QACtB,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC9B,YAAY,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QACD,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;YAClD,MAAM,GAAG,GAAG,IAAA,sBAAS,EAAC;gBACpB,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,EAAE,EAAE,IAAI,CAAC,QAAQ;aAClB,CAAC,CAAC;YACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC;IAEM,KAAK,CAAC,WAAW;QACtB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;YACpC,2BAA2B;YAC3B,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAExB,MAAM,GAAG,GAAG,IAAA,kBAAK,EAAC,OAAO,CAAC,CAAC;YAE3B,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE;gBACvB,oCAAoC;gBACpC,OAAO;aACR;YAED,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE;gBACX,kBAAkB;gBAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAC;gBACvD,OAAO;aACR;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC5C,IAAI,OAAO,EAAE;gBACX,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE;oBACjC,iCAAiC;oBACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,oBAAoB,EAAE,GAAG,CAAC,CAAC;iBAC5D;gBACD,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;aAC5B;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;aAC/D;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;gBACxB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAClC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;wBAClB,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;wBAC5D,IAAI,CAAC,eAAe;4BAClB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,6BAAW,CAAC,iBAAiB,EAAE,6BAAW,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;wBACtG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,qBAAqB,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;oBAC7F,CAAC,CAAC,CAAC;oBAEH,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACjD,qBAAqB;oBACrB,OAAO,CAAC,UAAU,EAAE,CAAC;gBACvB,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC;QACF,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;gBAC5B,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACxB,OAAO,EAAE,CAAC;gBACV,mBAAmB,EAAE,CAAC;aACvB;iBAAM;gBACL,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE;oBAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBACxB,OAAO,EAAE,CAAC;oBACV,mBAAmB,EAAE,CAAC;gBACxB,CAAC,CAAC,CAAC;aACJ;YAED,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;gBACzC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE;oBACxB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;wBAClC,OAAO,CAAC,KAAK,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAI,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,CAAC;oBAC5C,CAAC,CAAC,CAAC;iBACJ;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IACM,KAAK,CAAC,WAAW,CAAC,WAAmB;QAC1C,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,QAAQ,IAAI,WAAW,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,UAAU,EAAE;YAC7C,EAAE,EAAE,SAAS;YACb,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;gBAClB,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE;gBAC/C,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,SAAS,EAAE;oBACvC,WAAW;oBACX,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;oBAC5B,WAAW,EAAG,SAAiB,CAAC,UAA4B;iBAC7D,CAAC,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;YACjE,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,OAAO;QACZ,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC9B,YAAY,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SAC1C;IACH,CAAC;CACF;AA/ID,4CA+IC"}

package/lib/common/connection/drivers/base.d.ts

@@ -4,5 +4,6 @@ export declare abstract class BaseConnection<T> implements IConnectionShape<T> {
     abstract send(data: T): void;
     abstract onMessage(cb: (data: T) => void): IDisposable;
     abstract onceClose(cb: () => void): IDisposable;
+    createQueue(): IConnectionShape<T>;
 }
 //# sourceMappingURL=base.d.ts.map

package/lib/common/connection/drivers/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/common/connection/drivers/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,8BAAsB,cAAc,CAAC,CAAC,CAAE,YAAW,gBAAgB,CAAC,CAAC,CAAC;IACpE,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,GAAG,WAAW;IACtD,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,WAAW;CAChD"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/common/connection/drivers/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAI5C,8BAAsB,cAAc,CAAC,CAAC,CAAE,YAAW,gBAAgB,CAAC,CAAC,CAAC;IACpE,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,GAAG,WAAW;IACtD,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,WAAW;IAE/C,WAAW,IAAI,gBAAgB,CAAC,CAAC,CAAC;CAGnC"}

package/lib/common/connection/drivers/base.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseConnection = void 0;
+const utils_1 = require("./utils");
 class BaseConnection {
+    createQueue() {
+        return (0, utils_1.createQueue)(this);
+    }
 }
 exports.BaseConnection = BaseConnection;
 //# sourceMappingURL=base.js.map

package/lib/common/connection/drivers/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/common/connection/drivers/base.ts"],"names":[],"mappings":";;;AAIA,MAAsB,cAAc;CAInC;AAJD,wCAIC"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/common/connection/drivers/base.ts"],"names":[],"mappings":";;;AAIA,mCAAsC;AAEtC,MAAsB,cAAc;IAKlC,WAAW;QACT,OAAO,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;CACF;AARD,wCAQC"}

package/lib/common/ext-rpc-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ext-rpc-protocol.d.ts","sourceRoot":"","sources":["../../src/common/ext-rpc-protocol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ext-rpc-protocol.d.ts","sourceRoot":"","sources":["../../src/common/ext-rpc-protocol.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,EAIN,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAKzC,oBAAY,cAAc;IACxB,IAAI,IAAA;IACJ,GAAG,IAAA;CACJ;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,eAAe,CAAC,CAAC,GAAG,GAAG;IAClC,OAAc,KAAK,SAAK;IAExB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,OAAO,EAAE,MAAM,CAAC;gBACpB,SAAS,EAAE,MAAM;CAI9B;AAED,wBAAgB,mCAAmC,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,CAG5F;AACD,wBAAgB,gCAAgC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,CAG1F;AACD,MAAM,WAAW,uBAAuB;IACtC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAiCD,yBAAiB,cAAc,CAAC;IAC9B,SAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,GAAG,OA4B3D;IACD,SAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,GAAG,OAU1D;CACF;AAED,qBAAa,SAAS;WACN,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,MAAM,GAAG,MAAM;WAIzD,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM;WAmBpF,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,GAAG,MAAM;WAiBhE,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,GAAG,GAAG,MAAM;CAatF;AAED,eAAO,MAAM,YAAY,eAAyB,CAAC;AACnD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC5C,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IACvD,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;CAC3C;AAQD,qBAAa,WAAY,YAAW,YAAY;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0B;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmB;IAC3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAuC;IACjF,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuC;IACvE,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,MAAM,CAAU;gBAEZ,UAAU,EAAE,uBAAuB,EAAE,MAAM,CAAC,EAAE,OAAO;IAa1D,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG;IAKpD,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;IAIrC,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;IAQ9C,OAAO,CAAC,YAAY;IAiBpB,OAAO,CAAC,WAAW;IA6BnB,OAAO,CAAC,kBAAkB;IA2B1B,OAAO,CAAC,cAAc;IAOtB,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,eAAe;IAwBvB,OAAO,CAAC,cAAc;YAOR,gBAAgB;IAY9B,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,cAAc;CAWvB;AAED,UAAU,wBAAwB;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,GAAE,wBAA6B,GAAG,WAAW,CAiBzG"}

package/lib/common/ext-rpc-protocol.js

@@ -9,7 +9,6 @@ var RPCProtocolEnv;
     RPCProtocolEnv[RPCProtocolEnv["MAIN"] = 0] = "MAIN";
     RPCProtocolEnv[RPCProtocolEnv["EXT"] = 1] = "EXT";
 })(RPCProtocolEnv = exports.RPCProtocolEnv || (exports.RPCProtocolEnv = {}));
-const CancellationTokenStr = 'add.cancellation.token';
 class ProxyIdentifier {
     constructor(serviceId) {
         this.serviceId = serviceId;
@@ -174,7 +173,7 @@ class RPCProtocol {
         const callId = String(++this._lastMessageId);
         const result = new ide_core_common_1.Deferred();
         if (cancellationToken) {
-            args.push(CancellationTokenStr);
+            args.push('add.cancellation.token');
             cancellationToken.onCancellationRequested(() => this._protocol.send(MessageIO.cancel(callId)));
         }
         this._pendingRPCReplies.set(callId, result);
@@ -246,7 +245,7 @@ class RPCProtocol {
         const rpcId = msg.proxyId;
         const method = msg.method;
         const args = msg.args.map((arg) => (arg === null ? undefined : arg));
-        const addToken = args.length && args[args.length - 1] === CancellationTokenStr ? args.pop() : false;
+        const addToken = args.length && args[args.length - 1] === 'add.cancellation.token' ? args.pop() : false;
         if (addToken) {
             const tokenSource = new ide_core_common_1.CancellationTokenSource();
             this._cancellationTokenSources.set(callId, tokenSource);

package/lib/common/ext-rpc-protocol.js.map

@@ -1 +1 @@
-{"version":3,"file":"ext-rpc-protocol.js","sourceRoot":"","sources":["../../src/common/ext-rpc-protocol.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ext-rpc-protocol.js","sourceRoot":"","sources":["../../src/common/ext-rpc-protocol.ts"],"names":[],"mappings":"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"}

package/lib/common/proxy/base.d.ts

@@ -1,30 +1,22 @@
 import { Deferred } from '@opensumi/ide-core-common';
 import { ILogger, IRPCServiceMap } from '../types';
-import type { ServiceRunner } from './runner';
+import { ICapturedMessage } from '../utils';
 interface IBaseConnection {
     listen(): void;
 }
 export declare abstract class ProxyBase<T extends IBaseConnection> {
-    runner: ServiceRunner;
+    target?: IRPCServiceMap | undefined;
+    protected proxyService: any;
     protected logger: ILogger;
     protected connection: T;
     protected connectionPromise: Deferred<void>;
-    protected abstract engine: 'legacy' | 'sumi';
-    constructor(runner: ServiceRunner, logger?: ILogger);
-    private capture;
-    protected nextRequestId(): string;
-    protected captureOnRequest(requestId: string, serviceMethod: string, args: any[]): void;
-    protected captureOnRequestResult(requestId: string, serviceMethod: string, data: any): void;
-    protected captureOnRequestFail(requestId: string, serviceMethod: string, error: any): void;
-    protected captureOnNotification(serviceMethod: string, args: any[]): void;
-    protected captureSendRequest(requestId: string, serviceMethod: string, args: any[]): void;
-    protected captureSendRequestResult(requestId: string, serviceMethod: string, data: any): void;
-    protected captureSendRequestFail(requestId: string, serviceMethod: string, error: any): void;
-    protected captureSendNotification(serviceMethod: string, args: any[]): void;
+    protected abstract engine: 'legacy';
+    constructor(target?: IRPCServiceMap | undefined, logger?: ILogger);
+    protected capture(message: ICapturedMessage): void;
     listen(connection: T): void;
     listenService(service: IRPCServiceMap): void;
-    abstract getInvokeProxy<T = any>(): T;
-    protected abstract bindMethods(services: string[]): void;
+    abstract getInvokeProxy(): any;
+    protected abstract bindOnRequest(service: IRPCServiceMap, cb: (service: IRPCServiceMap, prop: string) => void): void;
 }
 export {};
 //# sourceMappingURL=base.d.ts.map

package/lib/common/proxy/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/common/proxy/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAGnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,UAAU,eAAe;IACvB,MAAM,IAAI,IAAI,CAAC;CAChB;AAID,8BAAsB,SAAS,CAAC,CAAC,SAAS,eAAe;IAQpC,MAAM,EAAE,aAAa;IAPxC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC;IAExB,SAAS,CAAC,iBAAiB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAwB;IAEnE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,GAAG,MAAM,CAAC;gBAE1B,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,OAAO;IAW1D,OAAO,CAAC,OAAO;IAUf,SAAS,CAAC,aAAa;IAIvB,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAIvF,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,IAAI;IAU3F,SAAS,CAAC,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAY1F,SAAS,CAAC,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzE,SAAS,CAAC,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAIzF,SAAS,CAAC,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,IAAI;IAU7F,SAAS,CAAC,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAU5F,SAAS,CAAC,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAI3E,MAAM,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI;IAQpB,aAAa,CAAC,OAAO,EAAE,cAAc;IAI5C,QAAQ,CAAC,cAAc,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC;IACrC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;CACzD"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/common/proxy/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAa,MAAM,2BAA2B,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAkC,MAAM,UAAU,CAAC;AAE5E,UAAU,eAAe;IACvB,MAAM,IAAI,IAAI,CAAC;CAChB;AAED,8BAAsB,SAAS,CAAC,CAAC,SAAS,eAAe;IAUpC,MAAM,CAAC;IAT1B,SAAS,CAAC,YAAY,EAAE,GAAG,CAAM;IAEjC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1B,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC;IAExB,SAAS,CAAC,iBAAiB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAwB;IAEnE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;gBAEjB,MAAM,CAAC,4BAAgB,EAAE,MAAM,CAAC,EAAE,OAAO;IAK5D,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,GAAG,IAAI;IAUlD,MAAM,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI;IAWpB,aAAa,CAAC,OAAO,EAAE,cAAc;IAkB5C,QAAQ,CAAC,cAAc,IAAI,GAAG;IAE9B,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;CACrH"}

package/lib/common/proxy/base.js

@@ -3,17 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxyBase = void 0;
 const ide_core_common_1 = require("@opensumi/ide-core-common");
 const utils_1 = require("../utils");
-let requestId = 0;
 class ProxyBase {
-    constructor(runner, logger) {
-        this.runner = runner;
+    constructor(target, logger) {
+        this.target = target;
+        this.proxyService = {};
         this.connectionPromise = new ide_core_common_1.Deferred();
         this.logger = logger || console;
-        this.runner.onServicesUpdate((services) => {
-            if (this.connection) {
-                this.bindMethods(services);
-            }
-        });
     }
     // capture messages for opensumi devtools
     capture(message) {
@@ -22,66 +17,30 @@ class ProxyBase {
             capturer(Object.assign(Object.assign({}, message), { engine: this.engine }));
         }
     }
-    nextRequestId() {
-        return String(requestId++);
-    }
-    captureOnRequest(requestId, serviceMethod, args) {
-        this.capture({ type: utils_1.MessageType.OnRequest, requestId, serviceMethod, arguments: args });
-    }
-    captureOnRequestResult(requestId, serviceMethod, data) {
-        this.capture({
-            type: utils_1.MessageType.OnRequestResult,
-            status: utils_1.ResponseStatus.Success,
-            requestId,
-            serviceMethod,
-            data,
-        });
-    }
-    captureOnRequestFail(requestId, serviceMethod, error) {
-        this.logger.warn(`request exec ${serviceMethod} error`, error);
-        this.capture({
-            type: utils_1.MessageType.OnRequestResult,
-            status: utils_1.ResponseStatus.Fail,
-            requestId,
-            serviceMethod,
-            error,
-        });
-    }
-    captureOnNotification(serviceMethod, args) {
-        this.capture({ type: utils_1.MessageType.OnNotification, serviceMethod, arguments: args });
-    }
-    captureSendRequest(requestId, serviceMethod, args) {
-        this.capture({ type: utils_1.MessageType.SendRequest, requestId, serviceMethod, arguments: args });
-    }
-    captureSendRequestResult(requestId, serviceMethod, data) {
-        this.capture({
-            type: utils_1.MessageType.RequestResult,
-            status: utils_1.ResponseStatus.Success,
-            requestId,
-            serviceMethod,
-            data,
-        });
-    }
-    captureSendRequestFail(requestId, serviceMethod, error) {
-        this.capture({
-            type: utils_1.MessageType.RequestResult,
-            status: utils_1.ResponseStatus.Fail,
-            requestId,
-            serviceMethod,
-            error,
-        });
-    }
-    captureSendNotification(serviceMethod, args) {
-        this.capture({ type: utils_1.MessageType.SendNotification, serviceMethod, arguments: args });
-    }
     listen(connection) {
         this.connection = connection;
-        this.bindMethods(this.runner.getServices());
+        if (this.target) {
+            this.listenService(this.target);
+        }
         connection.listen();
         this.connectionPromise.resolve();
     }
     listenService(service) {
-        this.runner.registerService(service);
+        if (this.connection) {
+            this.bindOnRequest(service, (service, prop) => {
+                this.proxyService[prop] = service[prop].bind(service);
+            });
+        }
+        else {
+            if (!this.target) {
+                this.target = {};
+            }
+            const methods = (0, utils_1.getServiceMethods)(service);
+            for (const method of methods) {
+                // `getServiceMethods` ensure that method is a function
+                this.target[method] = service[method].bind(service);
+            }
+        }
     }
 }
 exports.ProxyBase = ProxyBase;

package/lib/common/proxy/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/common/proxy/base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/common/proxy/base.ts"],"names":[],"mappings":";;;AAAA,+DAAgE;AAGhE,oCAA4E;AAM5E,MAAsB,SAAS;IAU7B,YAAmB,MAAuB,EAAE,MAAgB;QAAzC,WAAM,GAAN,MAAM,CAAiB;QAThC,iBAAY,GAAQ,EAAE,CAAC;QAKvB,sBAAiB,GAAmB,IAAI,0BAAQ,EAAQ,CAAC;QAKjE,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,OAAO,CAAC;IAClC,CAAC;IAED,yCAAyC;IAC/B,OAAO,CAAC,OAAyB;QACzC,MAAM,QAAQ,GAAG,IAAA,mBAAW,GAAE,CAAC;QAC/B,IAAI,IAAA,2BAAS,EAAC,QAAQ,CAAC,EAAE;YACvB,QAAQ,iCACH,OAAO,KACV,MAAM,EAAE,IAAI,CAAC,MAAM,IACnB,CAAC;SACJ;IACH,CAAC;IAED,MAAM,CAAC,UAAa;QAClB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAE7B,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACjC;QAED,UAAU,CAAC,MAAM,EAAE,CAAC;QACpB,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;IACnC,CAAC;IAEM,aAAa,CAAC,OAAuB;QAC1C,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;gBAC5C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBAChB,IAAI,CAAC,MAAM,GAAG,EAAS,CAAC;aACzB;YAED,MAAM,OAAO,GAAG,IAAA,yBAAiB,EAAC,OAAO,CAAC,CAAC;YAC3C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC5B,uDAAuD;gBACtD,IAAI,CAAC,MAAc,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC/D;SACF;IACH,CAAC;CAKF;AAzDD,8BAyDC"}

package/lib/common/proxy/legacy.d.ts

@@ -1,9 +1,11 @@
 import { MessageConnection } from '@opensumi/vscode-jsonrpc';
+import { IRPCServiceMap } from '../types';
 import { ProxyBase } from './base';
 export declare class ProxyLegacy extends ProxyBase<MessageConnection> {
-    protected engine: "legacy";
-    protected bindMethods(methods: string[]): void;
-    getInvokeProxy<T = any>(): T;
+    engine: "legacy";
+    getInvokeProxy(): any;
+    get(target: any, p: PropertyKey): (...args: any[]) => Promise<any>;
+    protected bindOnRequest(service: IRPCServiceMap, cb?: ((service: IRPCServiceMap, prop: string) => void) | undefined): void;
     /**
      * 对于纯数组参数的情况，收到请求/通知后做展开操作
      * 因为在通信层会为每个 rpc 调用添加一个 CancellationToken 参数
@@ -14,6 +16,8 @@ export declare class ProxyLegacy extends ProxyBase<MessageConnection> {
      * @returns args
      */
     private serializeArguments;
+    private onRequest;
+    private onNotification;
     listen(connection: MessageConnection): void;
 }
 //# sourceMappingURL=legacy.d.ts.map

package/lib/common/proxy/legacy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"legacy.d.ts","sourceRoot":"","sources":["../../../src/common/proxy/legacy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAI7D,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAOnC,qBAAa,WAAY,SAAQ,SAAS,CAAC,iBAAiB,CAAC;IAC3D,SAAS,CAAC,MAAM,WAAqB;IAErC,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAyCvC,cAAc,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC;IAyDnC;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;IAa1B,MAAM,CAAC,UAAU,EAAE,iBAAiB,GAAG,IAAI;CAe5C"}
+{"version":3,"file":"legacy.d.ts","sourceRoot":"","sources":["../../../src/common/proxy/legacy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG1C,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAOnC,qBAAa,WAAY,SAAQ,SAAS,CAAC,iBAAiB,CAAC;IAC3D,MAAM,WAAqB;IAEpB,cAAc,IAAI,GAAG;IAIrB,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,WAAW,aAEb,GAAG,EAAE;IA0D9B,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS;IAiDnH;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;YAaZ,SAAS;IAmBvB,OAAO,CAAC,cAAc;IAQtB,MAAM,CAAC,UAAU,EAAE,iBAAiB,GAAG,IAAI;CAoB5C"}

package/lib/common/proxy/legacy.js

@@ -1,103 +1,118 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProxyLegacy = void 0;
+const ide_core_common_1 = require("@opensumi/ide-core-common");
 const constants_1 = require("../constants");
+const utils_1 = require("../utils");
 const base_1 = require("./base");
 class ProxyLegacy extends base_1.ProxyBase {
     constructor() {
         super(...arguments);
         this.engine = 'legacy';
     }
-    bindMethods(methods) {
-        for (const method of methods) {
-            if (method.startsWith('on')) {
-                this.connection.onNotification(method, async (...args) => {
-                    this.captureOnNotification(method, args);
-                    try {
-                        await this.runner.run(method, ...this.serializeArguments(args));
-                    }
-                    catch (e) {
-                        this.logger.warn(`notification exec ${method} error`, e);
-                    }
-                });
+    getInvokeProxy() {
+        return new Proxy(this, this);
+    }
+    get(target, p) {
+        const prop = p.toString();
+        return async (...args) => {
+            await this.connectionPromise.promise;
+            let isSingleArray = false;
+            if (args.length === 1 && Array.isArray(args[0])) {
+                isSingleArray = true;
+            }
+            // 调用方法为 on 开头时，作为单项通知
+            if (prop.startsWith('on')) {
+                if (isSingleArray) {
+                    this.connection.sendNotification(prop, [...args]);
+                }
+                else {
+                    this.connection.sendNotification(prop, ...args);
+                }
+                this.capture({ type: utils_1.MessageType.SendNotification, serviceMethod: prop, arguments: args });
             }
             else {
-                this.connection.onRequest(method, async (...args) => {
-                    const requestId = this.nextRequestId();
-                    this.captureOnRequest(requestId, method, args);
-                    try {
-                        const result = await this.runner.run(method, ...this.serializeArguments(args));
-                        this.captureOnRequestResult(requestId, method, result);
-                        return {
-                            error: false,
-                            data: result,
-                        };
-                    }
-                    catch (e) {
-                        this.captureOnRequestFail(requestId, method, e);
-                        return {
-                            error: true,
-                            data: {
-                                message: e.message,
-                                stack: e.stack,
-                            },
-                        };
+                let requestResult;
+                // generate a unique requestId to associate request and requestResult
+                const requestId = (0, ide_core_common_1.uuid)();
+                if (isSingleArray) {
+                    requestResult = this.connection.sendRequest(prop, [...args]);
+                }
+                else {
+                    requestResult = this.connection.sendRequest(prop, ...args);
+                }
+                this.capture({ type: utils_1.MessageType.SendRequest, requestId, serviceMethod: prop, arguments: args });
+                const result = await requestResult;
+                if (result.error) {
+                    const error = new Error(result.data.message);
+                    if (result.data.stack) {
+                        error.stack = result.data.stack;
                     }
-                });
+                    this.capture({
+                        type: utils_1.MessageType.RequestResult,
+                        status: utils_1.ResponseStatus.Fail,
+                        requestId,
+                        serviceMethod: prop,
+                        error: result.data,
+                    });
+                    throw error;
+                }
+                else {
+                    this.capture({
+                        type: utils_1.MessageType.RequestResult,
+                        status: utils_1.ResponseStatus.Success,
+                        requestId,
+                        serviceMethod: prop,
+                        data: result.data,
+                    });
+                    return result.data;
+                }
             }
-        }
+        };
     }
-    getInvokeProxy() {
-        return new Proxy(Object.create(null), {
-            get: (target, p) => {
-                const prop = p.toString();
-                if (!target[prop]) {
-                    target[prop] = async (...args) => {
-                        await this.connectionPromise.promise;
-                        let isSingleArray = false;
-                        if (args.length === 1 && Array.isArray(args[0])) {
-                            isSingleArray = true;
-                        }
-                        // 调用方法为 on 开头时，作为单项通知
-                        if (prop.startsWith('on')) {
-                            this.captureSendNotification(prop, args);
-                            if (isSingleArray) {
-                                this.connection.sendNotification(prop, [...args]);
-                            }
-                            else {
-                                this.connection.sendNotification(prop, ...args);
-                            }
-                        }
-                        else {
-                            // generate a unique requestId to associate request and requestResult
-                            const requestId = this.nextRequestId();
-                            let requestResult;
-                            if (isSingleArray) {
-                                requestResult = this.connection.sendRequest(prop, [...args]);
-                            }
-                            else {
-                                requestResult = this.connection.sendRequest(prop, ...args);
-                            }
-                            this.captureSendRequest(requestId, prop, args);
-                            const result = await requestResult;
-                            if (result.error) {
-                                const error = new Error(result.data.message);
-                                if (result.data.stack) {
-                                    error.stack = result.data.stack;
-                                }
-                                this.captureSendRequestFail(requestId, prop, result.data);
-                                throw error;
-                            }
-                            else {
-                                this.captureSendRequestResult(requestId, prop, result.data);
-                                return result.data;
-                            }
-                        }
-                    };
+    bindOnRequest(service, cb) {
+        if (this.connection) {
+            const connection = this.connection;
+            const methods = (0, utils_1.getServiceMethods)(service);
+            methods.forEach((method) => {
+                if (method.startsWith('on')) {
+                    connection.onNotification(method, (...args) => {
+                        this.onNotification(method, ...args);
+                        this.capture({ type: utils_1.MessageType.OnNotification, serviceMethod: method, arguments: args });
+                    });
                 }
-                return target[prop];
-            },
-        });
+                else {
+                    connection.onRequest(method, (...args) => {
+                        const requestId = (0, ide_core_common_1.uuid)();
+                        const result = this.onRequest(method, ...args);
+                        this.capture({ type: utils_1.MessageType.OnRequest, requestId, serviceMethod: method, arguments: args });
+                        result
+                            .then((result) => {
+                            this.capture({
+                                type: utils_1.MessageType.OnRequestResult,
+                                status: utils_1.ResponseStatus.Success,
+                                requestId,
+                                serviceMethod: method,
+                                data: result.data,
+                            });
+                        })
+                            .catch((err) => {
+                            this.capture({
+                                type: utils_1.MessageType.OnRequestResult,
+                                status: utils_1.ResponseStatus.Fail,
+                                requestId,
+                                serviceMethod: method,
+                                error: err.data,
+                            });
+                        });
+                        return result;
+                    });
+                }
+                if (cb) {
+                    cb(service, method);
+                }
+            });
+        }
     }
     /**
      * 对于纯数组参数的情况，收到请求/通知后做展开操作
@@ -117,16 +132,48 @@ class ProxyLegacy extends base_1.ProxyBase {
         }
         return args;
     }
+    async onRequest(prop, ...args) {
+        try {
+            const result = await this.proxyService[prop](...this.serializeArguments(args));
+            return {
+                error: false,
+                data: result,
+            };
+        }
+        catch (e) {
+            return {
+                error: true,
+                data: {
+                    message: e.message,
+                    stack: e.stack,
+                },
+            };
+        }
+    }
+    onNotification(prop, ...args) {
+        try {
+            this.proxyService[prop](...this.serializeArguments(args));
+        }
+        catch (e) {
+            this.logger.warn('notification', e);
+        }
+    }
     listen(connection) {
         super.listen(connection);
         connection.onRequest((method) => {
-            if (!this.runner.has(method)) {
-                const requestId = this.nextRequestId();
-                this.captureOnRequest(requestId, method, []);
+            if (!this.proxyService[method]) {
+                const requestId = (0, ide_core_common_1.uuid)();
+                this.capture({ type: utils_1.MessageType.OnRequest, requestId, serviceMethod: method });
                 const result = {
                     data: constants_1.METHOD_NOT_REGISTERED,
                 };
-                this.captureOnRequestFail(requestId, method, result.data);
+                this.capture({
+                    type: utils_1.MessageType.OnRequestResult,
+                    status: utils_1.ResponseStatus.Fail,
+                    requestId,
+                    serviceMethod: method,
+                    error: result.data,
+                });
                 return result;
             }
         });