cgserver 12.3.0 → 12.3.1

package/README.md

@@ -1,5 +1,9 @@
 # 版本更新日志
 
+## v12.3.1
+- bugfix
+- serverwebsocket支持wss
+
 ## v12.3.0
 - 中型版本更新
 - webserver websocketserver socketserver均取消默认数据库初始化，打算还是剥离

package/dist/lib/Framework/Server/RpcWebSocketServer/CgMq.js

@@ -88,6 +88,7 @@ class RpcConfig {
     timeout = 0;
     host = "";
     port = -1;
+    wss = false;
 }
 exports.RpcConfig = RpcConfig;
 class CgMq {
@@ -134,7 +135,7 @@ class CgMq {
             this._ws = new CgMqServerWebsocket(this);
         }
         return new Promise(async (resolve, reject) => {
-            this._ws.connect(cfg.host, cfg.port);
+            this._ws.connect(cfg.wss, cfg.host, cfg.port);
             let pretime = Date.now();
             while (true) {
                 if (this._ws.connected) {

package/dist/lib/Framework/Server/WebSocketServer/IServerWebSocket.js

@@ -73,11 +73,16 @@ class IServerWebSocket extends IWebSocket_1.IWebSocket {
     get extraRequestOptions() {
         return this._extraRequestOptions;
     }
+    _wss = false;
+    get wss() {
+        return this._wss;
+    }
     _need_close = false;
     constructor(protoType = IProtoFilter_1.EProtoType.Json, protoPath = "") {
         super(protoType, protoPath);
     }
-    connect(domain, port, requestedProtocols = null, origin = null, headers = null, extraRequestOptions = null) {
+    connect(wss, domain, port, requestedProtocols = null, origin = null, headers = null, extraRequestOptions = null) {
+        this._wss = wss;
         this._host = domain || this._host;
         this._port = port || this._port;
         this._requestedProtocols = requestedProtocols || this._requestedProtocols;
@@ -87,7 +92,7 @@ class IServerWebSocket extends IWebSocket_1.IWebSocket {
         this._connect();
     }
     _connect() {
-        let url = "ws://" + this._host + ":" + this._port + "/";
+        let url = (this._wss ? "wss://" : "ws://") + this._host + ":" + this._port + "/";
         Log_1.gLog.info("Trying to connect to server : " + url);
         let _ws = new ws.client();
         _ws.on("connect", this.onConnect.bind(this));

package/dist/types/Framework/Server/RpcWebSocketServer/CgMq.d.ts

@@ -31,6 +31,7 @@ export declare class RpcConfig {
     timeout: number;
     host: string;
     port: number;
+    wss: boolean;
 }
 export declare class CgMq {
     protected _ws: CgMqServerWebsocket;

package/dist/types/Framework/Server/WebSocketServer/IServerWebSocket.d.ts

@@ -25,9 +25,11 @@ export declare class IServerWebSocket extends IWebSocket {
     get headers(): http.OutgoingHttpHeaders;
     protected _extraRequestOptions: http.RequestOptions;
     get extraRequestOptions(): http.RequestOptions;
+    protected _wss: boolean;
+    get wss(): boolean;
     protected _need_close: boolean;
     constructor(protoType?: EProtoType, protoPath?: string);
-    connect(domain: string, port: number, requestedProtocols?: string | string[], origin?: string, headers?: http.OutgoingHttpHeaders, extraRequestOptions?: http.RequestOptions): void;
+    connect(wss: boolean, domain: string, port: number, requestedProtocols?: string | string[], origin?: string, headers?: http.OutgoingHttpHeaders, extraRequestOptions?: http.RequestOptions): void;
     protected _connect(): void;
     onOpen(e?: any): void;
     onClose(reasonCode: number, description: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "12.3.0",
+  "version": "12.3.1",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",