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

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

@@ -1,22 +1,24 @@
-import { IReporterService, UrlProvider } from '@opensumi/ide-core-common';
+import { IReporterService } from '@opensumi/ide-core-common';
+import { NetSocketConnection } from '../common/connection';
+import { ReconnectingWebSocketConnection } from '../common/connection/drivers/reconnecting-websocket';
 import { WSChannel } from '../common/ws-channel';
+/**
+ * Channel Handler in browser
+ */
 export declare class WSChannelHandler {
-    wsPath: UrlProvider;
-    protocols?: string[] | undefined;
-    connection: WebSocket;
+    connection: ReconnectingWebSocketConnection | NetSocketConnection;
     private channelMap;
     private channelCloseEventMap;
     private logger;
     clientId: string;
     private heartbeatMessageTimer;
     private reporterService;
-    constructor(wsPath: UrlProvider, logger: any, protocols?: string[] | undefined, clientId?: string);
+    LOG_TAG: string;
+    constructor(connection: ReconnectingWebSocketConnection | NetSocketConnection, logger: any, clientId?: string);
     replaceLogger(logger: any): void;
     setReporter(reporterService: IReporterService): void;
-    private clientMessage;
     private heartbeatMessage;
     initHandler(): Promise<void>;
-    private getChannelSend;
     openChannel(channelPath: string): Promise<WSChannel>;
     dispose(): void;
 }

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":"AAGA,OAAO,EAAE,gBAAgB,EAAe,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGvF,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,gBAAgB;IASR,MAAM,EAAE,WAAW;IAAsB,SAAS,CAAC;IAR/D,UAAU,EAAE,SAAS,CAAC;IAC7B,OAAO,CAAC,UAAU,CAA8C;IAChE,OAAO,CAAC,oBAAoB,CAAgD;IAC5E,OAAO,CAAC,MAAM,CAAW;IAClB,QAAQ,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,qBAAqB,CAAsB;IACnD,OAAO,CAAC,eAAe,CAAmB;gBAEvB,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAS,SAAS,CAAC,sBAAU,EAAE,QAAQ,CAAC,EAAE,MAAM;IAMnG,aAAa,CAAC,MAAM,EAAE,GAAG;IAKzB,WAAW,CAAC,eAAe,EAAE,gBAAgB;IAG7C,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,gBAAgB;IAcX,WAAW;IAqDxB,OAAO,CAAC,cAAc,CAMpB;IACW,WAAW,CAAC,WAAW,EAAE,MAAM;IAwBrC,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

@@ -1,30 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WSChannelHandler = void 0;
-const tslib_1 = require("tslib");
-const reconnecting_websocket_1 = tslib_1.__importDefault(require("reconnecting-websocket"));
 const ide_core_common_1 = require("@opensumi/ide-core-common");
 const ide_core_common_2 = require("@opensumi/ide-core-common");
-const utils_1 = require("../common/utils");
 const ws_channel_1 = require("../common/ws-channel");
-// 前台链接管理类
+/**
+ * Channel Handler in browser
+ */
 class WSChannelHandler {
-    constructor(wsPath, logger, protocols, clientId) {
-        this.wsPath = wsPath;
-        this.protocols = protocols;
+    constructor(connection, logger, clientId) {
+        this.connection = connection;
         this.channelMap = new Map();
         this.channelCloseEventMap = new Map();
         this.logger = console;
-        this.getChannelSend = (connection) => (content) => {
-            connection.send(content, (err) => {
-                if (err) {
-                    this.logger.warn(err);
-                }
-            });
-        };
+        this.LOG_TAG = '[WSChannelHandler]';
         this.logger = logger || this.logger;
         this.clientId = clientId || `CLIENT_ID_${(0, ide_core_common_1.uuid)()}`;
-        this.connection = new reconnecting_websocket_1.default(wsPath, protocols, {}); // new WebSocket(wsPath, protocols);
+        this.LOG_TAG = `[WSChannelHandler] [client-id:${this.clientId}]`;
     }
     // 为解决建立连接之后，替换成可落盘的 logger
     replaceLogger(logger) {
@@ -35,84 +27,93 @@ class WSChannelHandler {
     setReporter(reporterService) {
         this.reporterService = reporterService;
     }
-    clientMessage() {
-        const clientMsg = (0, utils_1.stringify)({
-            kind: 'client',
-            clientId: this.clientId,
-        });
-        this.connection.send(clientMsg);
-    }
     heartbeatMessage() {
         if (this.heartbeatMessageTimer) {
             clearTimeout(this.heartbeatMessageTimer);
         }
         this.heartbeatMessageTimer = global.setTimeout(() => {
-            const msg = (0, utils_1.stringify)({
-                kind: 'heartbeat',
+            const msg = (0, ws_channel_1.stringify)({
+                kind: 'ping',
                 clientId: this.clientId,
+                id: this.clientId,
             });
             this.connection.send(msg);
             this.heartbeatMessage();
         }, 5000);
     }
     async initHandler() {
-        this.connection.onmessage = (e) => {
+        this.connection.onMessage((message) => {
             // 一个心跳周期内如果有收到消息，则不需要再发送心跳
             this.heartbeatMessage();
-            const msg = (0, utils_1.parse)(e.data);
-            if (msg.id) {
-                const channel = this.channelMap.get(msg.id);
-                if (channel) {
-                    if (msg.kind === 'data' && !channel.fireMessage) {
-                        // 要求前端发送初始化消息，但后端最先发送消息时，前端并未准备好
-                        this.logger.error('channel not ready!', msg);
-                    }
-                    channel.handleMessage(msg);
-                }
-                else {
-                    this.logger.warn(`channel ${msg.id} not found`);
+            const msg = (0, ws_channel_1.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) {
+                if (!channel.hasMessageListener()) {
+                    // 要求前端发送初始化消息，但后端最先发送消息时，前端并未准备好
+                    this.logger.error(this.LOG_TAG, 'channel not ready!', msg);
                 }
+                channel.handleMessage(msg);
+            }
+            else {
+                this.logger.warn(this.LOG_TAG, `channel ${msg.id} not found`);
+            }
+        });
+        const reopenExistsChannel = () => {
+            if (this.channelMap.size) {
+                this.channelMap.forEach((channel) => {
+                    channel.onOpen(() => {
+                        const closeInfo = this.channelCloseEventMap.get(channel.id);
+                        this.reporterService &&
+                            this.reporterService.point(ide_core_common_2.REPORT_NAME.CHANNEL_RECONNECT, ide_core_common_2.REPORT_NAME.CHANNEL_RECONNECT, closeInfo);
+                        this.logger.log(this.LOG_TAG, `channel reconnect ${this.clientId}:${channel.channelPath}`);
+                    });
+                    channel.open(channel.channelPath, this.clientId);
+                    // 针对前端需要重新设置下后台状态的情况
+                    channel.fireReopen();
+                });
             }
         };
         await new Promise((resolve) => {
-            this.connection.addEventListener('open', () => {
-                this.clientMessage();
+            if (this.connection.isOpen()) {
                 this.heartbeatMessage();
-                resolve(undefined);
-                // 重连 channel
-                if (this.channelMap.size) {
-                    this.channelMap.forEach((channel) => {
-                        channel.onOpen(() => {
-                            const closeInfo = this.channelCloseEventMap.get(channel.id);
-                            this.reporterService &&
-                                this.reporterService.point(ide_core_common_2.REPORT_NAME.CHANNEL_RECONNECT, ide_core_common_2.REPORT_NAME.CHANNEL_RECONNECT, closeInfo);
-                            this.logger && this.logger.log(`channel reconnect ${this.clientId}:${channel.channelPath}`);
-                        });
-                        channel.open(channel.channelPath);
-                        // 针对前端需要重新设置下后台状态的情况
-                        if (channel.fireReOpen) {
-                            channel.fireReOpen();
-                        }
-                    });
-                }
-            });
-            this.connection.addEventListener('close', (event) => {
+                resolve();
+                reopenExistsChannel();
+            }
+            else {
+                this.connection.onOpen(() => {
+                    this.heartbeatMessage();
+                    resolve();
+                    reopenExistsChannel();
+                });
+            }
+            this.connection.onceClose((code, reason) => {
                 if (this.channelMap.size) {
                     this.channelMap.forEach((channel) => {
-                        channel.close(event.code, event.reason);
+                        channel.close(code !== null && code !== void 0 ? code : 1000, reason !== null && reason !== void 0 ? reason : '');
                     });
                 }
             });
         });
     }
     async openChannel(channelPath) {
-        const channelSend = this.getChannelSend(this.connection);
         const channelId = `${this.clientId}:${channelPath}`;
-        const channel = new ws_channel_1.WSChannel(channelSend, channelId);
+        const channel = new ws_channel_1.WSChannel(this.connection, {
+            id: channelId,
+            logger: this.logger,
+        });
         this.channelMap.set(channel.id, channel);
         await new Promise((resolve) => {
             channel.onOpen(() => {
-                resolve(undefined);
+                resolve();
             });
             channel.onClose((code, reason) => {
                 this.channelCloseEventMap.set(channelId, {
@@ -120,9 +121,9 @@ class WSChannelHandler {
                     closeEvent: { code, reason },
                     connectInfo: navigator.connection,
                 });
-                this.logger.log('channel close: ', code, reason);
+                this.logger.log(this.LOG_TAG, 'channel close: ', code, reason);
             });
-            channel.open(channelPath);
+            channel.open(channelPath, this.clientId);
         });
         return channel;
     }

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":"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"}
+{"version":3,"file":"ws-channel-handler.js","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"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"}

package/lib/common/connect.d.ts

@@ -1,60 +1,9 @@
-import { MessageConnection } from '@opensumi/vscode-jsonrpc/lib/common/connection';
-import { RPCProxy, ILogger } from './proxy';
-export type RPCServiceMethod = (...args: any[]) => any;
-export type ServiceProxy = any;
-export declare enum ServiceType {
-    Service = 0,
-    Stub = 1
-}
-export declare class RPCServiceStub {
-    private serviceName;
-    private center;
-    private type;
-    constructor(serviceName: string, center: RPCServiceCenter, type: ServiceType);
-    ready(): Promise<void>;
-    getNotificationName(name: string): string;
-    getRequestName(name: string): string;
-    on(name: string, method: RPCServiceMethod): void;
-    getServiceMethod(service: any): string[];
-    onRequestService(service: any): void;
-    onRequest(name: string, method: RPCServiceMethod): void;
-    broadcast(name: string, ...args: any[]): Promise<any>;
-    getMethodName(name: string): string;
-    getProxy: <T>() => RPCServiceStub & T;
-}
+import { RPCServiceCenter, RPCServiceStub } from './rpc-service';
 export declare function initRPCService<T = void>(center: RPCServiceCenter): {
-    createRPCService: (name: string, service?: any) => RPCServiceStub & T;
-    getRPCService: (name: string) => RPCServiceStub & T;
+    createRPCService: (name: string, service?: any) => T extends void ? RPCServiceStub : RPCServiceStub & T;
+    getRPCService: (name: string) => T extends void ? RPCServiceStub : RPCServiceStub & T;
 };
-interface IBench {
-    registerService: (service: string) => void;
-}
-export interface RPCMessageConnection extends MessageConnection {
-    uid?: string;
-    writer?: any;
-    reader?: any;
-}
-export declare function createRPCService<T = void>(name: string, center: RPCServiceCenter): any;
-export declare function getRPCService<T = void>(name: string, center: RPCServiceCenter): any;
-export declare class RPCServiceCenter {
-    private bench?;
-    uid: string;
-    rpcProxy: RPCProxy[];
-    serviceProxy: ServiceProxy[];
-    private connection;
-    private serviceMethodMap;
-    private createService;
-    private getService;
-    private connectionPromise;
-    private connectionPromiseResolve;
-    private logger;
-    constructor(bench?: IBench | undefined, logger?: ILogger);
-    registerService(serviceName: string, type: ServiceType): void;
-    when(): Promise<void>;
-    setConnection(connection: MessageConnection): void;
-    removeConnection(connection: MessageConnection): boolean;
-    onRequest(name: string, method: RPCServiceMethod): void;
-    broadcast(name: string, ...args: any[]): Promise<any>;
-}
-export {};
+export declare function createRPCService<T = void>(name: string, center: RPCServiceCenter): T extends void ? RPCServiceStub : RPCServiceStub & T;
+export declare function getRPCService<T = void>(name: string, center: RPCServiceCenter): T extends void ? RPCServiceStub : RPCServiceStub & T;
+export * from './rpc-service';
 //# sourceMappingURL=connect.d.ts.map

package/lib/common/connect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/common/connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAEnF,OAAO,EAAE,QAAQ,EAAqB,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/D,MAAM,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AACvD,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC;AAE/B,oBAAY,WAAW;IACrB,OAAO,IAAA;IACP,IAAI,IAAA;CACL;AAED,qBAAa,cAAc;IACb,OAAO,CAAC,WAAW;IAAU,OAAO,CAAC,MAAM;IAAoB,OAAO,CAAC,IAAI;gBAAnE,WAAW,EAAE,MAAM,EAAU,MAAM,EAAE,gBAAgB,EAAU,IAAI,EAAE,WAAW;IAM9F,KAAK;IAGX,mBAAmB,CAAC,IAAI,EAAE,MAAM;IAGhC,cAAc,CAAC,IAAI,EAAE,MAAM;IAI3B,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB;IAGzC,gBAAgB,CAAC,OAAO,KAAA,GAAG,MAAM,EAAE;IAmBnC,gBAAgB,CAAC,OAAO,EAAE,GAAG;IAO7B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB;IAGhD,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,OAAA,GAAG,OAAO,CAAC,GAAG,CAAC;IAI9C,aAAa,CAAC,IAAI,EAAE,MAAM;IAG1B,QAAQ,8BAcH;CACN;AAED,wBAAgB,cAAc,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,gBAAgB;6BAEpC,MAAM,YAAY,GAAG;0BAQxB,MAAM;EAE/B;AAED,UAAU,MAAM;IACd,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C;AAED,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,GAAG,CAEtF;AAED,wBAAgB,aAAa,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,GAAG,CAEnF;AAED,qBAAa,gBAAgB;IAcf,OAAO,CAAC,KAAK,CAAC;IAbnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,QAAQ,EAAE,CAAM;IAC1B,YAAY,EAAE,YAAY,EAAE,CAAM;IACzC,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,gBAAgB,CAAyB;IAEjD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,iBAAiB,CAAgB;IACzC,OAAO,CAAC,wBAAwB,CAAa;IAC7C,OAAO,CAAC,MAAM,CAAU;gBAEJ,KAAK,CAAC,oBAAQ,EAAE,MAAM,CAAC,EAAE,OAAO;IAQpD,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI;IAW7D,IAAI;IAIJ,aAAa,CAAC,UAAU,EAAE,iBAAiB;IAc3C,gBAAgB,CAAC,UAAU,EAAE,iBAAiB;IAU9C,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB;IAS1C,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,OAAA,GAAG,OAAO,CAAC,GAAG,CAAC;CAwBrD"}
+{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/common/connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAGjE,wBAAgB,cAAc,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,gBAAgB;6BAEpC,MAAM,YAAY,GAAG;0BAQxB,MAAM;EAE/B;AAED,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,wDAEhF;AAED,wBAAgB,aAAa,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,wDAE7E;AAED,cAAc,eAAe,CAAC"}

package/lib/common/connect.js

@@ -1,188 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RPCServiceCenter = exports.getRPCService = exports.createRPCService = exports.initRPCService = exports.RPCServiceStub = exports.ServiceType = void 0;
-const proxy_1 = require("./proxy");
-var ServiceType;
-(function (ServiceType) {
-    ServiceType[ServiceType["Service"] = 0] = "Service";
-    ServiceType[ServiceType["Stub"] = 1] = "Stub";
-})(ServiceType = exports.ServiceType || (exports.ServiceType = {}));
-class RPCServiceStub {
-    constructor(serviceName, center, type) {
-        this.serviceName = serviceName;
-        this.center = center;
-        this.type = type;
-        this.getProxy = () => new Proxy(this, {
-            // 调用方
-            get: (target, prop) => {
-                if (!target[prop]) {
-                    if (typeof prop === 'symbol') {
-                        return Promise.resolve();
-                    }
-                    else {
-                        return (...args) => this.ready().then(() => this.broadcast(prop, ...args));
-                    }
-                }
-                else {
-                    return target[prop];
-                }
-            },
-        });
-        if (this.type === ServiceType.Service) {
-            this.center.registerService(serviceName, this.type);
-        }
-    }
-    async ready() {
-        return this.center.when();
-    }
-    getNotificationName(name) {
-        return `on:${this.serviceName}:${name}`;
-    }
-    getRequestName(name) {
-        return `${this.serviceName}:${name}`;
-    }
-    // 服务方
-    on(name, method) {
-        this.onRequest(name, method);
-    }
-    getServiceMethod(service) {
-        let props = [];
-        if (/^\s*class/.test(service.constructor.toString())) {
-            let obj = service;
-            do {
-                props = props.concat(Object.getOwnPropertyNames(obj));
-            } while ((obj = Object.getPrototypeOf(obj)));
-            props = props.sort().filter((e, i, arr) => e !== arr[i + 1] && typeof service[e] === 'function');
-        }
-        else {
-            for (const prop in service) {
-                if (service[prop] && typeof service[prop] === 'function') {
-                    props.push(prop);
-                }
-            }
-        }
-        return props;
-    }
-    onRequestService(service) {
-        const methods = this.getServiceMethod(service);
-        for (const method of methods) {
-            this.onRequest(method, service[method].bind(service));
-        }
-    }
-    onRequest(name, method) {
-        this.center.onRequest(this.getMethodName(name), method);
-    }
-    broadcast(name, ...args) {
-        return this.center.broadcast(this.getMethodName(name), ...args);
-    }
-    getMethodName(name) {
-        return name.startsWith('on') ? this.getNotificationName(name) : this.getRequestName(name);
-    }
-}
-exports.RPCServiceStub = RPCServiceStub;
+exports.getRPCService = exports.createRPCService = exports.initRPCService = void 0;
+const tslib_1 = require("tslib");
+const rpc_service_1 = require("./rpc-service");
+const types_1 = require("./types");
 function initRPCService(center) {
     return {
         createRPCService: (name, service) => {
-            const proxy = new RPCServiceStub(name, center, ServiceType.Service).getProxy();
+            const proxy = createRPCService(name, center);
             if (service) {
                 proxy.onRequestService(service);
             }
             return proxy;
         },
-        getRPCService: (name) => new RPCServiceStub(name, center, ServiceType.Stub).getProxy(),
+        getRPCService: (name) => getRPCService(name, center),
     };
 }
 exports.initRPCService = initRPCService;
 function createRPCService(name, center) {
-    return new RPCServiceStub(name, center, ServiceType.Service).getProxy();
+    return new rpc_service_1.RPCServiceStub(name, center, types_1.ServiceType.Service).getProxy();
 }
 exports.createRPCService = createRPCService;
 function getRPCService(name, center) {
-    return new RPCServiceStub(name, center, ServiceType.Stub).getProxy();
+    return new rpc_service_1.RPCServiceStub(name, center, types_1.ServiceType.Stub).getProxy();
 }
 exports.getRPCService = getRPCService;
-class RPCServiceCenter {
-    constructor(bench, logger) {
-        this.bench = bench;
-        this.rpcProxy = [];
-        this.serviceProxy = [];
-        this.connection = [];
-        this.serviceMethodMap = { client: undefined };
-        this.createService = [];
-        this.getService = [];
-        this.uid = 'RPCServiceCenter:' + process.pid;
-        this.connectionPromise = new Promise((resolve) => {
-            this.connectionPromiseResolve = resolve;
-        });
-        this.logger = logger || console;
-    }
-    registerService(serviceName, type) {
-        if (type === ServiceType.Service) {
-            this.createService.push(serviceName);
-            if (this.bench) {
-                this.bench.registerService(serviceName);
-            }
-        }
-        else if (type === ServiceType.Stub) {
-            this.getService.push(serviceName);
-        }
-    }
-    when() {
-        return this.connectionPromise;
-    }
-    setConnection(connection) {
-        if (!this.connection.length) {
-            this.connectionPromiseResolve();
-        }
-        this.connection.push(connection);
-        const rpcProxy = new proxy_1.RPCProxy(this.serviceMethodMap, this.logger);
-        rpcProxy.listen(connection);
-        this.rpcProxy.push(rpcProxy);
-        const serviceProxy = rpcProxy.createProxy();
-        this.serviceProxy.push(serviceProxy);
-    }
-    removeConnection(connection) {
-        const removeIndex = this.connection.indexOf(connection);
-        if (removeIndex !== -1) {
-            this.connection.splice(removeIndex, 1);
-            this.rpcProxy.splice(removeIndex, 1);
-            this.serviceProxy.splice(removeIndex, 1);
-        }
-        return removeIndex !== -1;
-    }
-    onRequest(name, method) {
-        if (!this.connection.length) {
-            this.serviceMethodMap[name] = method;
-        }
-        else {
-            this.rpcProxy.forEach((proxy) => {
-                proxy.listenService({ [name]: method });
-            });
-        }
-    }
-    async broadcast(name, ...args) {
-        const broadcastResult = this.serviceProxy.map((proxy) => proxy[name](...args));
-        if (!broadcastResult || broadcastResult.length === 0) {
-            throw new Error(`broadcast rpc \`${name}\` error: no remote service can handle this call`);
-        }
-        const doubtfulResult = [];
-        const result = [];
-        for (const i of broadcastResult) {
-            if (i === proxy_1.NOTREGISTERMETHOD) {
-                doubtfulResult.push(i);
-            }
-            else {
-                result.push(i);
-            }
-        }
-        if (doubtfulResult.length > 0) {
-            this.logger.warn(`broadcast rpc \`${name}\` getting doubtful responses: ${doubtfulResult.join(',')}`);
-        }
-        // FIXME: this is an unreasonable design, if remote service only returned doubtful result, we will return an empty array.
-        //        but actually we should throw an error to tell user that no remote service can handle this call.
-        //        or just return `undefined`.
-        return result.length === 1 ? result[0] : result;
-    }
-}
-exports.RPCServiceCenter = RPCServiceCenter;
+tslib_1.__exportStar(require("./rpc-service"), exports);
 //# sourceMappingURL=connect.js.map

package/lib/common/connect.js.map

@@ -1 +1 @@
-{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/common/connect.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/common/connect.ts"],"names":[],"mappings":";;;;AAAA,+CAAiE;AACjE,mCAAsC;AAEtC,SAAgB,cAAc,CAAW,MAAwB;IAC/D,OAAO;QACL,gBAAgB,EAAE,CAAC,IAAY,EAAE,OAAa,EAAE,EAAE;YAChD,MAAM,KAAK,GAAG,gBAAgB,CAAI,IAAI,EAAE,MAAM,CAAC,CAAC;YAChD,IAAI,OAAO,EAAE;gBACX,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;aACjC;YAED,OAAO,KAAK,CAAC;QACf,CAAC;QACD,aAAa,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,aAAa,CAAI,IAAI,EAAE,MAAM,CAAC;KAChE,CAAC;AACJ,CAAC;AAZD,wCAYC;AAED,SAAgB,gBAAgB,CAAW,IAAY,EAAE,MAAwB;IAC/E,OAAO,IAAI,4BAAc,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAW,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAK,CAAC;AAC7E,CAAC;AAFD,4CAEC;AAED,SAAgB,aAAa,CAAW,IAAY,EAAE,MAAwB;IAC5E,OAAO,IAAI,4BAAc,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAW,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAK,CAAC;AAC1E,CAAC;AAFD,sCAEC;AAED,wDAA8B"}

package/lib/common/connection/buffers.d.ts

@@ -0,0 +1,55 @@
+/**
+ * Treat a collection of Buffers as a single contiguous partially mutable Buffer.
+ *
+ * Where possible, operations execute without creating a new Buffer and copying everything over.
+ */
+export declare function copy(source: Uint8Array, target: Uint8Array, targetStart?: number, sourceStart?: number, sourceEnd?: number): void;
+export declare class Buffers {
+    buffers: Uint8Array[];
+    protected size: number;
+    get byteLength(): number;
+    push(buffer: Uint8Array): void;
+    unshift(buffer: Uint8Array): void;
+    slice(start?: number, end?: number): Uint8Array;
+    pos(i: number): {
+        buf: number;
+        offset: number;
+    };
+    copy(target: Uint8Array, targetStart?: number, sourceStart?: number, sourceEnd?: number): void;
+    splice(start: number, deleteCount: number, ...reps: Uint8Array[]): Buffers;
+    get(i: number): number;
+    set(i: number, v: number): void;
+    cursor(offset?: number): Cursor;
+    dispose(): void;
+}
+/**
+ * Remember the current position in a Buffers.
+ *
+ * The cursor will always point to the next byte to be read.
+ *
+ * The cursor is not safe to use after the Buffers is modified.
+ */
+export declare class Cursor {
+    protected buffers: Buffers;
+    offset: number;
+    protected chunkIndex: number;
+    protected chunkOffset: number;
+    constructor(buffers: Buffers, offset?: number);
+    protected updatePosition(): void;
+    /**
+     * Return this cursor's current line number.
+     */
+    get line(): number;
+    get lineWidth(): number;
+    get value(): number;
+    /**
+     * Return the cursor offset in the current line.
+     */
+    get lineOffset(): number;
+    iterator(): Generator<number, void, unknown>;
+    move(n: number): void;
+    moveTo(n: number): void;
+    dispose(): void;
+    reset(): void;
+}
+//# sourceMappingURL=buffers.d.ts.map

package/lib/common/connection/buffers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buffers.d.ts","sourceRoot":"","sources":["../../../src/common/connection/buffers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,wBAAgB,IAAI,CAClB,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,UAAU,EAClB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,CAAC,EAAE,MAAM,EACpB,SAAS,CAAC,EAAE,MAAM,QAGnB;AAED,qBAAa,OAAO;IAClB,OAAO,eAAsB;IAC7B,SAAS,CAAC,IAAI,SAAK;IAEnB,IAAI,UAAU,WAEb;IAED,IAAI,CAAC,MAAM,EAAE,UAAU;IAKvB,OAAO,CAAC,MAAM,EAAE,UAAU;IAK1B,KAAK,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM;IAsClC,GAAG,CAAC,CAAC,EAAE,MAAM,GAAG;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;IAkB/C,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,WAAW,SAAI,EAAE,WAAW,SAAI,EAAE,SAAS,SAAY;IAIhF,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE;IAiFhE,GAAG,CAAC,CAAC,EAAE,MAAM;IAKb,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;IAKxB,MAAM,CAAC,MAAM,SAAI;IAIjB,OAAO;CAIR;AAED;;;;;;GAMG;AACH,qBAAa,MAAM;IAIL,SAAS,CAAC,OAAO,EAAE,OAAO;IAAS,MAAM;IAHrD,SAAS,CAAC,UAAU,SAAK;IACzB,SAAS,CAAC,WAAW,SAAK;gBAEJ,OAAO,EAAE,OAAO,EAAS,MAAM,SAAI;IAIzD,SAAS,CAAC,cAAc;IAYxB;;OAEG;IACH,IAAI,IAAI,WAEP;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,KAAK,WAER;IAED;;OAEG;IACH,IAAI,UAAU,WAEb;IAEA,QAAQ;IAiBT,IAAI,CAAC,CAAC,EAAE,MAAM;IAKd,MAAM,CAAC,CAAC,EAAE,MAAM;IAKhB,OAAO;IAKP,KAAK;CAKN"}