From 574f62c47b8ab3aa849fbe43e9dbfdf02bff8676 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 4 May 2022 00:48:02 +0800
Subject: [PATCH] 1

---
 server/httpgate/server/controllers/factory.js |  1 +
 server/httpgate/server/controllers/gm.js      | 51 +++++++++++++++++++
 server/httpgate/server/services/wsserver.js   | 36 ++++++++++---
 third_party/j7                                |  2 +-
 4 files changed, 82 insertions(+), 8 deletions(-)
 create mode 100644 server/httpgate/server/controllers/gm.js

diff --git a/server/httpgate/server/controllers/factory.js b/server/httpgate/server/controllers/factory.js
index b57ba95..0e662f9 100644
--- a/server/httpgate/server/controllers/factory.js
+++ b/server/httpgate/server/controllers/factory.js
@@ -6,6 +6,7 @@ function add(name) {
 }
 
 function init() {
+  add('gm');
 }
 
 exports.init = init;
diff --git a/server/httpgate/server/controllers/gm.js b/server/httpgate/server/controllers/gm.js
new file mode 100644
index 0000000..f2c274e
--- /dev/null
+++ b/server/httpgate/server/controllers/gm.js
@@ -0,0 +1,51 @@
+const ws = require("nodejs-websocket")
+const app = require('j7/app');
+const http = require('j7/http');
+const utils = require('j7/utils');
+const cmdHash = {};
+
+let seqId = 0;
+let conn = null;
+
+async function test(session, params) {
+  const msg = {
+    'url': 'https://game2006api-z1-test.cebg.games/webapp/index.php',
+    'params': {
+      'c': 'Ops',
+      'a': 'selfChecking'
+    },
+    'seqId': ++seqId,
+    'payload': ''
+  };
+  const msgText = utils.jsonEncode(msg);
+  const text = '#' + utils.pad(msgText.length, 7) + msgText;
+  if (!conn) {
+    conn = await ws.connect('ws://127.0.0.1:8381');
+    conn.on('connect', () => {
+      console.log('connect');
+      conn.sendText(text);
+    });
+  }
+  if (conn.readyState == conn.OPEN) {
+    conn.sendText(text);
+  }
+  session.rspOk();
+}
+
+async function execCmd(session) {
+  const cmdLine = session.request('cmd').split('.');
+  const cmd = cmdLine[0];
+  const params = cmdLine.length > 1 ? cmdLine.slice(1) : [] ;
+  if (cmdHash[cmd]) {
+    cmdHash[cmd](session, params);
+  } else {
+    session.rspErr(404, 'not found');
+  }
+}
+
+function init() {
+  app.registerHandler('GM', 'execCmd', execCmd);
+  cmdHash['test'] = test;
+}
+
+exports.init = init;
diff --git a/server/httpgate/server/services/wsserver.js b/server/httpgate/server/services/wsserver.js
index 4255d04..b51925d 100644
--- a/server/httpgate/server/services/wsserver.js
+++ b/server/httpgate/server/services/wsserver.js
@@ -3,17 +3,19 @@ const ws = require('nodejs-websocket');
 const app = require('j7/app');
 const utils = require('j7/utils');
 const log = require('j7/log');
+const config = require('j7/config');
+const http = require('j7/http');
 const BaseService = require('./baseservice');
 const metaFactory = require('../metadata/factory');
 
 class WsServer extends BaseService {
 
   async init() {
-    const data = '';
+    let data = '';
     const server = ws.createServer((socket) => {
 
       socket.on('text', (str) => {
-        console.log(str);
+        //console.log(str);
         data += str;
         //#0000000
         while (data.length >= 8) {
@@ -21,14 +23,16 @@ class WsServer extends BaseService {
             socket.close('error package');
             break;
           }
-          const pkgLen = parseInt(data.slice(1, 7), 10);
+          const pkgLen = parseInt(data.slice(1, 8), 10);
           if (isNaN(pkgLen)) {
             socket.close('error pkgLen');
             break;
           }
+          //console.log(data, pkgLen, data.slice(1,8));
           if (data.length >= 8 + pkgLen) {
-            this.parsePackage(data[8, 8 + pkgLen]);
+            this.parsePackage(socket, data.slice(8, 8 + pkgLen));
             data = data.slice(8 + pkgLen);
+            console.log(data);
           }
         }
       });
@@ -37,11 +41,29 @@ class WsServer extends BaseService {
         console.log('connection close', code, reason);
       });
 
-    }).listen(3000);
+    }).listen(config('ws_listen_port'));
   }
 
-  async parsePackage(data) {
-    console.log(data);
+  async parsePackage(socket, data) {
+    console.log('parsePackage', data);
+    const msg = utils.jsonDecode(data);
+    {
+      const beginTick = utils.getTickCount();
+      const {err, data} = await http.get(msg['url'], msg['params']);
+      const endTick = utils.getTickCount();
+      if (socket.readyState == socket.OPEN) {
+        const rspText = utils.jsonEncode({
+          'seqId': msg['seqId'],
+          'payload': msg['payload'],
+          'time_cost': endTick - beginTick,
+          'err': err,
+          'data': data
+        });
+        const text = '#' + utils.pad(rspText.length, 7) + rspText;
+        console.log(text);
+        socket.sendText(text);
+      }
+    }
   }
 
 }
diff --git a/third_party/j7 b/third_party/j7
index 7861022..59b3ef2 160000
--- a/third_party/j7
+++ b/third_party/j7
@@ -1 +1 @@
-Subproject commit 786102288f4bd7e2184838531fc211803c2ce7e1
+Subproject commit 59b3ef222d3468ccb7096a801a43da7d9b158412