chore: update client

packages/cts-core/example/index.ts → packages/cts-api/example/index.ts

@@ -1,5 +1,5 @@
 import { Client } from '../src/client';
-import { WebsocketError } from './error';
+import { WebsocketError } from '../src/error';
 
 const url = 'ws://127.0.0.1:8081';
 const client = new Client(url, {
@@ -9,12 +9,12 @@ const client = new Client(url, {
       .then(
         (res: string): void => {
           console.log('ping sucessful:', res);
-        },
+        }
       )
       .catch(
         (reason: WebsocketError): void => {
           console.log('ping error:', reason.code, reason.msg);
-        },
+        }
       );
 
     client
@@ -22,12 +22,12 @@ const client = new Client(url, {
       .then(
         (res: string): void => {
           console.log('request successful:', res);
-        },
+        }
       )
       .catch(
         (reason: WebsocketError): void => {
           console.log('request error:', reason.code, reason.msg);
-        },
+        }
       );
   },
 
@@ -38,7 +38,7 @@ const client = new Client(url, {
 
   onError(): void {
     console.log('close connection');
-  },
+  }
 });
 
 client.enableLogger = true;

packages/cts-core/package.json → packages/cts-api/package.json

@@ -1,12 +1,12 @@
 {
   "author": "Chevalier",
-  "description": "cts-core",
+  "description": "cts-api",
   "license": "MIT",
   "keywords": [
     "webpack",
     "react"
   ],
-  "name": "cts-core",
+  "name": "cts-api",
   "version": "0.0.1-alpha.1",
   "repository": {
     "type": "git",

packages/cts-api/src/WebSocketClient.ts

@@ -0,0 +1 @@
+export class WebSocketClient {}

packages/cts-core/src/client.ts → packages/cts-api/src/client.ts

@@ -72,10 +72,7 @@ class Client {
    */
   public async ping(param: object): Promise<string> {
     return new Promise(
-      (
-        resolve: (data: string) => void,
-        reject: (err: WebsocketError) => void,
-      ): void => {
+      (resolve: (data: string) => void, reject: (err: WebsocketError) => void): void => {
         if (this.socket.readyState !== this.socket.OPEN) {
           if (this._enableLogger) {
             console.log('[ping]: connection refuse');
@@ -96,29 +93,16 @@ class Client {
             } else {
               resolve(data);
             }
-          },
+          }
         );
 
         const p = new Packet();
-        this.send(
-          p.pack(
-            heartbeatOperator,
-            0,
-            this.requestHeader,
-            JSON.stringify(param),
-          ),
-        );
+        this.send(p.pack(heartbeatOperator, 0, this.requestHeader, JSON.stringify(param)));
 
         if (this._enableLogger) {
-          console.info(
-            '[send data packet]',
-            heartbeatOperator,
-            0,
-            this.requestHeader,
-            param,
-          );
+          console.info('[send data packet]', heartbeatOperator, 0, this.requestHeader, param);
         }
-      },
+      }
     );
   }
 
@@ -138,10 +122,7 @@ class Client {
    * @param operator 消息监听地址
    * @param listener 定义如何处理从服务端返回的消息
    */
-  public addMessageListener(
-    operator: string,
-    listener: (data: string) => void,
-  ): void {
+  public addMessageListener(operator: string, listener: (data: string) => void): void {
     this.listeners.set(Utils.crc32(operator), listener);
   }
 
@@ -280,9 +261,7 @@ class Client {
 
               this.responseHeader = packet.header;
 
-              (this.listeners.get(operator) as (data: string) => void)(
-                JSON.parse(packet.body),
-              );
+              (this.listeners.get(operator) as (data: string) => void)(JSON.parse(packet.body));
             }
 
             if (this._enableLogger) {
@@ -328,9 +307,7 @@ class Client {
   private send(data: ArrayBuffer): void {
     if (this.socket.readyState !== this.socket.OPEN) {
       if (this._enableLogger) {
-        console.error(
-          '[send] WebSocket is already in CLOSING or CLOSED state.',
-        );
+        console.error('[send] WebSocket is already in CLOSING or CLOSED state.');
       }
 
       return;
@@ -351,18 +328,13 @@ class Client {
    */
   private asyncSend(operator: string, param: object): Promise<string> {
     return new Promise(
-      (
-        resolve: (data: string) => void,
-        reject: (err: WebsocketError) => void,
-      ): void => {
+      (resolve: (data: string) => void, reject: (err: WebsocketError) => void): void => {
         if (this.socket.readyState !== this.socket.OPEN) {
           if (this._enableLogger) {
             console.log('[ping]: connection refuse');
           }
 
-          reject(
-            new WebsocketError(clientError, 'asyncSend: connection refuse'),
-          );
+          reject(new WebsocketError(clientError, 'asyncSend: connection refuse'));
         }
 
         const sequence = new Date().getTime();
@@ -379,29 +351,18 @@ class Client {
             }
 
             delete this.listeners[listener];
-          },
+          }
         );
 
         const p = new Packet();
         this.send(
-          p.pack(
-            Utils.crc32(operator),
-            sequence,
-            this.requestHeader,
-            JSON.stringify(param),
-          ),
+          p.pack(Utils.crc32(operator), sequence, this.requestHeader, JSON.stringify(param))
         );
 
         if (this._enableLogger) {
-          console.info(
-            '[send data packet]',
-            operator,
-            sequence,
-            this.requestHeader,
-            param,
-          );
+          console.info('[send data packet]', operator, sequence, this.requestHeader, param);
         }
-      },
+      }
     );
   }
 }

packages/cts-api/src/config.ts

@@ -0,0 +1,2 @@
+// PING_INTERVAL 心跳包时间间隔
+const PING_INTERVAL = 50 * 1000;

packages/cts-api/src/index.ts

@@ -0,0 +1,3 @@
+export { WebSocketClient } from './WebSocketClient';
+export { WebsocketError } from './error';
+export { Client } from './client';

packages/cts-api/src/meta.ts

@@ -0,0 +1,77 @@
+export function getMetaData() {
+  const nAgt = navigator.userAgent;
+  let browserName = navigator.appName;
+  let fullVersion = `${parseFloat(navigator.appVersion)}`;
+  let majorVersion = parseInt(navigator.appVersion, 10);
+  let nameOffset;
+  let verOffset;
+  let ix;
+
+  // In Opera, the true version is after "Opera" or after "Version"
+  if ((verOffset = nAgt.indexOf('Opera')) !== -1) {
+    browserName = 'Opera';
+    fullVersion = nAgt.substring(verOffset + 6);
+    if ((verOffset = nAgt.indexOf('Version')) !== -1) fullVersion = nAgt.substring(verOffset + 8);
+  } else if ((verOffset = nAgt.indexOf('MSIE')) !== -1) {
+    // In MSIE, the true version is after "MSIE" in userAgent
+    browserName = 'Microsoft Internet Explorer';
+    fullVersion = nAgt.substring(verOffset + 5);
+  } else if ((verOffset = nAgt.indexOf('Chrome')) !== -1) {
+    // In Chrome, the true version is after "Chrome"
+    browserName = 'Chrome';
+    fullVersion = nAgt.substring(verOffset + 7);
+  } else if ((verOffset = nAgt.indexOf('Safari')) !== -1) {
+    // In Safari, the true version is after "Safari" or after "Version"
+    browserName = 'Safari';
+    fullVersion = nAgt.substring(verOffset + 7);
+    if ((verOffset = nAgt.indexOf('Version')) !== -1) fullVersion = nAgt.substring(verOffset + 8);
+  } else if ((verOffset = nAgt.indexOf('Firefox')) !== -1) {
+    // In Firefox, the true version is after "Firefox"
+    browserName = 'Firefox';
+    fullVersion = nAgt.substring(verOffset + 8);
+  } else if ((nameOffset = nAgt.lastIndexOf(' ') + 1) < (verOffset = nAgt.lastIndexOf('/'))) {
+    // In most other browsers, "name/version" is at the end of userAgent
+    browserName = nAgt.substring(nameOffset, verOffset);
+    fullVersion = nAgt.substring(verOffset + 1);
+    if (browserName.toLowerCase() === browserName.toUpperCase()) {
+      browserName = navigator.appName;
+    }
+  }
+  // trim the fullVersion string at semicolon/space if present
+  if ((ix = fullVersion.indexOf(';')) !== -1) fullVersion = fullVersion.substring(0, ix);
+  if ((ix = fullVersion.indexOf(' ')) !== -1) fullVersion = fullVersion.substring(0, ix);
+
+  majorVersion = parseInt(`${fullVersion}`, 10);
+  if (isNaN(majorVersion)) {
+    fullVersion = `${parseFloat(navigator.appVersion)}`;
+    majorVersion = parseInt(navigator.appVersion, 10);
+  }
+
+  let OSName = 'Unknown OS';
+  if (navigator.appVersion.indexOf('Win') !== -1) OSName = 'Windows';
+  if (navigator.appVersion.indexOf('Mac') !== -1) OSName = 'MacOS';
+  if (navigator.appVersion.indexOf('X11') !== -1) OSName = 'UNIX';
+  if (navigator.appVersion.indexOf('Linux') !== -1) OSName = 'Linux';
+
+  let isMobile = false; // initiate as false
+  // device detection
+  if (
+    /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|ipad|iris|kindle|Android|Silk|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i.test(
+      navigator.userAgent
+    ) ||
+    /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(
+      navigator.userAgent.substr(0, 4)
+    )
+  ) {
+    isMobile = true;
+  }
+
+  return {
+    device: isMobile ? 'mobile' : 'pc',
+    os: OSName,
+    os_version: '',
+    app: 'WebLiveClient',
+    app_version: fullVersion,
+    tag: {}
+  };
+}

packages/cts-core/types.d.ts

@@ -1,14 +0,0 @@
-declare module '*.less' {
-  const styles: Record<string, string>;
-  export = styles;
-}
-
-declare module '*.css' {
-  const content: any;
-  export default content;
-}
-
-declare module '*.svg' {
-  const content: string;
-  export default content;
-}