fix merge error

example/main.ts

-import { Client } from '../src/client';
+import { Client, WebSocketResp } from '../src/client';
 import { WebsocketError } from './error';
 
 const url = 'ws://127.0.0.1:8081';
     client
       .ping({})
       .then(
-        (res: string): void => {
+        (res: WebSocketResp): void => {
           console.log('ping sucessful:', res);
         },
       )
     client
       .request('/v1/healthy', {})
       .then(
-        (res: string): void => {
+        (res: WebSocketResp): void => {
           console.log('request successful:', res);
         },
       )

package.json

   "license": "private",
   "dependencies": {
     "crypto-js": "^3.1.9-1",
-    "node-int64": "^0.4.0",
-    "rimraf": "^2.6.3"
+    "node-int64": "^0.4.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
     "eslint-loader": "^2.1.2",
     "html-webpack-plugin": "^3.2.0",
     "jest": "^24.5.0",
+    "webpack-dev-server": "^3.3.1",
+    "rimraf": "^2.6.3",
     "ts-jest": "^24.0.0",
     "typescript": "^3.3.4000",
     "webpack": "^4.30.0",
-    "webpack-cli": "^3.3.2",
-    "webpack-dev-server": "^3.3.1"
+    "webpack-cli": "^3.3.2"
   },
   "files": [
     "dist/"

src/client.ts

   /**
    * 断线重连
    */
-  reconnect(): void {
+  private reconnect(): void {
     if (!this.reconnectLock) {
       this.reconnectLock = true;
       if (this._enableLogger) {
    * @param param 请求参数，比如{"hello":"world"}
    * @param callback 请求状态回调处理
    */
-  asyncSend(operator: string, param: object): Promise<WebSocketResp> {
+  private asyncSend(operator: string, param: object): Promise<WebSocketResp> {
     return new Promise(
       (
         resolve: (data: WebSocketResp) => void,
 
 let client: Client;
 
-function getClient(url: string, callback: ReadyStateCallback) {
+function getClient(url: string, callback: ReadyStateCallback): Client {
   if (!client) {
     client = new Client(url, callback);
   }

src/index.ts

-export { WebSocketClient } from './WebSocketClient';
 export { WebsocketError } from './error';
-export { Client } from './client';
+export { Client, WebSocketResp, getClient } from './client';
+export { ReadyStateCallback } from './types/callback';

src/types/callback.ts

-interface ReadyStateCallback {
+export interface ReadyStateCallback {
   onOpen(ev: Event): void;
   onError(ev: Event): void;
   onClose(ev: Event): void;
 }
-
-interface RequestCallback {
-  onStart(): void;
-  onSuccess(data: string): void;
-  onError(code: number, message: string): void;
-  onEnd(): void;
-}
-
-export { ReadyStateCallback, RequestCallback };