gamerpc 8.0.7 → 8.0.8

package/README.md

@@ -57,3 +57,15 @@ import toolkit from require('gamerpc')
 ```
 
 范例参见 ./test/test.html (请在必要时手工修改页面包含文件的链接地址)
+
+注意：如下写法无法在页面嵌套中引用到内部对象，但在NPM依赖包引入模式下没有影响
+```bash
+module.exports = Remote;
+```
+
+页面嵌入建议改成如下模式
+```bash
+const toolkit = exports;
+toolkit.conn = Remote;
+global.toolkit = toolkit;
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gamerpc",
-  "version": "8.0.7",
+  "version": "8.0.8",
   "author": "bookmansoft <ceo@920.cc>",
   "contributors": [
     "bookmansoft <ceo@920.cc>"

package/src/index.js

@@ -48,17 +48,18 @@ class Remote {
      * @param {*} ip 
      * @param {*} port 
      */
-    async createSocket(ip, port) {
-        if(!ip) {
-            ip = this.config.webserver.host;
-        }
-        if(!port) {
-            port = this.config.webserver.port;
-        }
+    async createSocket() {
+        let port = this.config.webserver.port;
+        let host = this.config.webserver.host;
+        let url = this.config.webserver.url;
 
         this.close();
 
-        this.socket = io(`${this.config.UrlHead}://${ip}:${port}`, {'force new connection': true});
+        if(!url) {
+            this.socket = io(`${this.config.UrlHead}://${host}:${port}`, {'force new connection': true});
+        } else {
+            this.socket = io(`${this.config.UrlHead}://${url}`, {'force new connection': true});
+        }
         this.socket.on('notify', ret => {//监听推送消息
             if(this.notifyHandles[ret.type]) {
                 this.notifyHandles[ret.type](ret.info);
@@ -95,33 +96,6 @@ class Remote {
         return prom;
     }
 
-    /**
-     * 获取OpenId
-     */
-    async getOpenId() {
-        //此处根据实际需要，发起了基于HTTP请求的认证访问，和本身创建时指定的通讯模式无关。
-        console.log('gameconn: getOpenId');
-        let msg = await this.getRequest({
-            port: this.configOri.webserver.authPort, 
-            openkey: this.userInfo.openkey, 
-        }, this.userInfo.domain);
-
-        //客户端从模拟网关取得了签名集
-        if(!msg) {
-            return false;
-        }
-
-        if(!msg.unionid) {
-            msg.unionid = msg.openid;
-        }
-
-        this.userInfo.openid = msg.unionid;
-        this.userInfo.openkey = msg.access_token;
-
-        console.log('gameconn: getOpenId', msg.unionid);
-        return true;
-    }
-
     /**
      * 获取签名数据集
      */
@@ -226,13 +200,12 @@ class Remote {
         this.status.init();
 
         console.log('gameconn: lb');
-        let msg = await this.locate(this.configOri.webserver.host, this.configOri.webserver.port)
-        .getRequest({"func": "lb.getServerInfo", "oemInfo":{"domain": this.userInfo.domain, "openid": this.userInfo.openid}});
+        let msg = await this.locate(this.configOri.webserver.host, this.configOri.webserver.port, this.configOri.webserver.url).getRequest({"func": "lb.getServerInfo", "oemInfo":{"domain": this.userInfo.domain, "openid": this.userInfo.openid}});
 
         if(!!msg && msg.code == ReturnCode.Success) {
             console.log('gameconn: lb', msg.data);
             this.status.set(CommStatus.lb);
-            this.locate(msg.data.ip, msg.data.port);
+            this.locate(msg.data.ip, msg.data.port, msg.data.url);
             return true;
         }
 
@@ -316,17 +289,6 @@ class Remote {
             return false;
         }
 
-        //检测执行微信所需要的KeyId转换
-        if(this.loginMode.check(CommStatus.reqOpenId)) {
-            if(!this.status.check(CommStatus.OpenId)) {
-                if(!(await this.getOpenId())) {
-                    throw(new Error('keyId error'));
-                } else {
-                    this.status.set(CommStatus.OpenId);
-                }
-            }
-        }
-
         //检测执行负载均衡
         if(this.loginMode.check(CommStatus.reqLb)) {
             if(!this.status.check(CommStatus.lb)) {
@@ -504,7 +466,7 @@ class Remote {
         switch(this.rpcMode) {
             case CommMode.ws:
                 if(!this.socket) {
-                    await this.createSocket(this.config.webserver.host, this.config.webserver.port);
+                    await this.createSocket();
                 }
                 return new Promise((resolve, reject) => {
                     this.socket.emit('req', params, msg => {
@@ -524,13 +486,14 @@ class Remote {
 
     /**
      * 设定远程服务器地址
-     * @param ip
+     * @param host
      * @param port
      * @returns {Remote}
      */
-    locate(ip, port){
-        this.config.webserver.host = ip;
+    locate(host, port, url) {
+        this.config.webserver.host = host;
         this.config.webserver.port = port;
+        this.config.webserver.url = url;    
 
         return this;
     }
@@ -656,15 +619,21 @@ class Remote {
     async getRequest(params, authControl) {
         this.parseParams(params);
 
-        let port = !!params.port ? params.port : this.config.webserver.port;
-        let url = !!authControl ? `${this.config.UrlHead}://${this.config.webserver.host}:${port}/${authControl}` : `${this.config.UrlHead}://${this.config.webserver.host}:${port}/index.html`;
+        let url = null;
+        if(!this.config.webserver.url) {
+            let port = !!params.port ? params.port : this.config.webserver.port;
+            url = !!authControl ? `${this.config.UrlHead}://${this.config.webserver.host}:${port}/${authControl}` : `${this.config.UrlHead}://${this.config.webserver.host}:${port}/index.html`;
+        } else {
+            url = !!authControl ? `${this.config.UrlHead}://${this.config.webserver.url}/${authControl}` : `${this.config.UrlHead}://${this.config.webserver.url}/index.html`;
+        }
+
         url += "?" + Object.keys(params).reduce((ret, next)=>{
-                if(ret != '') { 
-                    ret += '&';
-                }
-                //增加了字段编译，避免特殊字符如汉字对URL拼接造成干扰
-                return ret + next + "=" + ((typeof params[next]) == "object" ? encodeURIComponent(JSON.stringify(params[next])) : encodeURIComponent(params[next]));
-            }, '');
+            if(ret != '') { 
+                ret += '&';
+            }
+            //增加了字段编译，避免特殊字符如汉字对URL拼接造成干扰
+            return ret + next + "=" + ((typeof params[next]) == "object" ? encodeURIComponent(JSON.stringify(params[next])) : encodeURIComponent(params[next]));
+        }, '');
 
         return this.get(url);
     }
@@ -676,8 +645,13 @@ class Remote {
     async postRequest(params, authControl) {
         this.parseParams(params);
 
-        let port = !!params.port ? params.port : this.config.webserver.port;
-        let url = !!authControl ? `${this.config.UrlHead}://${this.config.webserver.host}:${port}/${authControl}` : `${this.config.UrlHead}://${this.config.webserver.host}:${port}/index.html`;
+        let url = null;
+        if(!this.config.webserver.url) {
+            let port = !!params.port ? params.port : this.config.webserver.port;
+            url = !!authControl ? `${this.config.UrlHead}://${this.config.webserver.host}:${port}/${authControl}` : `${this.config.UrlHead}://${this.config.webserver.host}:${port}/index.html`;
+        } else {
+            url = !!authControl ? `${this.config.UrlHead}://${this.config.webserver.url}/${authControl}` : `${this.config.UrlHead}://${this.config.webserver.url}/index.html`;
+        }
 
         return this.post(url, params);
     }