promise

example/main.ts

@@ -1,52 +1,36 @@
 import { Client } from '../src/client';
+import { WebsocketError } from './error';
 
 const url = 'ws://127.0.0.1:8081';
 const client = new Client(
   url,
   new (class {
     public onOpen(): void {
-      client.ping(
-        {},
-        new (class {
-          public onStart(): void {
-            console.log('start ping');
-          }
-
-          public onSuccess(data: string): void {
-            console.log('ping successful:', data);
-          }
-
-          public onError(code: number, message: string): void {
-            console.log('ping error:', message);
-          }
-
-          public onEnd(): void {
-            console.log('end ping');
-          }
-        })(),
-      );
-
-      client.asyncSend(
-        '/v1/healthy',
-        {},
-        new (class {
-          public onStart(): void {
-            console.log('start request');
-          }
-
-          public onSuccess(data: string): void {
-            console.log('request successful:', data);
-          }
-
-          public onError(code: number, message: string): void {
-            console.log('request error:', message);
-          }
-
-          public onEnd(): void {
-            console.log('end request');
-          }
-        })(),
-      );
+      client
+        .ping({})
+        .then(
+          (res: string): void => {
+            console.log('ping sucessful:', res);
+          },
+        )
+        .catch(
+          (reason: WebsocketError): void => {
+            console.log('ping error:', reason.code, reason.msg);
+          },
+        );
+
+      client
+        .request('/v1/healthy/a', {})
+        .then(
+          (res: string): void => {
+            console.log('request successful:', res);
+          },
+        )
+        .catch(
+          (reason: WebsocketError): void => {
+            console.log('request error:', reason.code, reason.msg);
+          },
+        );
     }
 
     public onClose(ev: Event): void {

src/client.ts

@@ -1,6 +1,7 @@
 import { Packet } from './packet';
 import { Utils } from './utils';
-import { ReadyStateCallback, RequestCallback } from './types/callback';
+import { ReadyStateCallback } from './types/callback';
+import { WebsocketError } from './error';
 
 /**
  * 初始化链接以及收发数据
@@ -35,34 +36,43 @@ class Client {
   /**
    * 发送ping请求，来保持长连接
    * @param param 请求参数,比如{"hello":"world"}
-   * @param requestCallback 请求状态回调
    */
-  public ping(param: object, requestCallback: RequestCallback): void {
-    if (this.socket.readyState !== this.socket.OPEN) {
-      throw new Error('asyncSend: connection refuse');
-    }
-
-    const heartbeatOperator = 0;
-
-    this.listeners.set(
-      heartbeatOperator,
-      (data: string): void => {
-        const code = this.getResponseProperty('code');
-        if (code !== '') {
-          const message = this.getResponseProperty('message');
-          requestCallback.onError(Number(code), message);
-        } else {
-          requestCallback.onSuccess(data);
+  public async ping(param: object): Promise<string> {
+    return new Promise(
+      (
+        resolve: (data: string) => void,
+        reject: (err: WebsocketError) => void,
+      ): void => {
+        if (this.socket.readyState !== this.socket.OPEN) {
+          reject(new WebsocketError(400, 'asyncSend: connection refuse'));
         }
 
-        requestCallback.onEnd();
+        const heartbeatOperator = 0;
+
+        this.listeners.set(
+          heartbeatOperator,
+          (data: string): void => {
+            const code = this.getResponseProperty('code');
+            if (code !== '') {
+              const message = this.getResponseProperty('message');
+              reject(new WebsocketError(Number(code), message));
+            } else {
+              resolve(data);
+            }
+          },
+        );
+
+        const p = new Packet();
+        this.send(
+          p.pack(
+            heartbeatOperator,
+            0,
+            this.requestHeader,
+            JSON.stringify(param),
+          ),
+        );
       },
     );
-
-    const p = new Packet();
-    this.send(
-      p.pack(heartbeatOperator, 0, this.requestHeader, JSON.stringify(param)),
-    );
   }
 
   /**
@@ -71,47 +81,44 @@ class Client {
    * @param param 请求参数，比如{"hello":"world"}
    * @param callback 请求状态回调处理
    */
-  public asyncSend(
-    operator: string,
-    param: object,
-    callback: RequestCallback,
-  ): void {
-    console.info('websocket send data', operator, this.requestHeader, param);
-
-    if (this.socket.readyState !== this.socket.OPEN) {
-      throw new Error('asyncSend: connection refuse');
-    }
-
-    callback.onStart();
-
-    const sequence = new Date().getTime();
-    const listener = Utils.crc32(operator) + sequence;
-    this.listeners.set(
-      listener,
-      (data: string): void => {
-        const code = this.getResponseProperty('code');
-        if (code !== '') {
-          const message = this.getResponseProperty('message');
-          callback.onError(Number(code), message);
-        } else {
-          callback.onSuccess(data);
+  private asyncSend(operator: string, param: object): Promise<string> {
+    return new Promise(
+      (
+        resolve: (data: string) => void,
+        reject: (err: WebsocketError) => void,
+      ): void => {
+        if (this.socket.readyState !== this.socket.OPEN) {
+          reject(new WebsocketError(400, 'asyncSend: connection refuse'));
         }
 
-        callback.onEnd();
+        const sequence = new Date().getTime();
+        const listener = Utils.crc32(operator) + sequence;
+        this.listeners.set(
+          listener,
+          (data: string): void => {
+            const code = this.getResponseProperty('code');
+            if (code !== '') {
+              const message = this.getResponseProperty('message');
+              reject(new WebsocketError(Number(code), message));
+            } else {
+              resolve(data);
+            }
 
-        delete this.listeners[listener];
+            delete this.listeners[listener];
+          },
+        );
+
+        const p = new Packet();
+        this.send(
+          p.pack(
+            Utils.crc32(operator),
+            sequence,
+            this.requestHeader,
+            JSON.stringify(param),
+          ),
+        );
       },
     );
-
-    const p = new Packet();
-    this.send(
-      p.pack(
-        Utils.crc32(operator),
-        sequence,
-        this.requestHeader,
-        JSON.stringify(param),
-      ),
-    );
   }
 
   /**
@@ -120,12 +127,8 @@ class Client {
    * @param param 请求参数，比如{"hello":"world"}
    * @param callback 请求状态回调处理
    */
-  public async syncSend(
-    operator: string,
-    param: object,
-    callback: RequestCallback,
-  ): Promise<void> {
-    await this.asyncSend(operator, param, callback);
+  public async request(operator: string, param: object): Promise<string> {
+    return await this.asyncSend(operator, param);
   }
 
   /**

src/error.ts

@@ -0,0 +1,26 @@
+export class WebsocketError {
+  private _code: number;
+  private _msg: string;
+
+  /**
+   * 构造函数
+   */
+  public constructor(code: number, msg: string) {
+    this._code = code;
+    this._msg = msg;
+  }
+
+  /**
+   * 返回错误码
+   */
+  public get code(): number {
+    return this._code;
+  }
+
+  /**
+   * 返回具体的错误信息
+   */
+  public get msg(): string {
+    return this._msg;
+  }
+}