1

server/httpgate/server/app.js

@@ -4,7 +4,6 @@ const config = require('j7/config');
 
 event.addListener(event.APP_INITIALIZED_EVENT, async () => {
   require('./metadata/factory').init();
-  await require('./blockchain').init();
   require('./middlewares/factory').init();
   require('./controllers/factory').init();
   require('./models/factory').init();

server/httpgate/server/package-lock.json

@@ -1,23 +1,36 @@
 {
-  "name": "web3helper",
+  "name": "httpgate_svr",
   "version": "1.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "name": "web3helper",
+      "name": "httpgate_svr",
       "version": "1.0.0",
       "dependencies": {
         "@metamask/eth-sig-util": "^4.0.0",
         "express": "^4.17.2",
-        "j7": "file:../../third_party/j7",
+        "j7": "file:../../..//third_party/j7",
         "log4js": "~6.3.0",
         "mysql": "~2.18.1",
+        "nodejs-websocket": "^1.7.2",
         "web3": "^1.6.1"
       }
     },
+    "../../../third_party/j7": {
+      "version": "1.0.0",
+      "dependencies": {
+        "axios": "^0.26.1",
+        "crc-32": "^1.2.1",
+        "express": "^4.17.2",
+        "mysql": "~2.18.1",
+        "querystring": "^0.2.1",
+        "urlencode": "^1.1.0"
+      }
+    },
     "../../third_party/j7": {
       "version": "1.0.0",
+      "extraneous": true,
       "dependencies": {
         "axios": "^0.26.1",
         "body-parser": "^1.20.0",
@@ -2244,7 +2257,7 @@
       }
     },
     "node_modules/j7": {
-      "resolved": "../../third_party/j7",
+      "resolved": "../../../third_party/j7",
       "link": true
     },
     "node_modules/js-sha3": {
@@ -2623,6 +2636,14 @@
         "node-gyp-build-test": "build-test.js"
       }
     },
+    "node_modules/nodejs-websocket": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/nodejs-websocket/-/nodejs-websocket-1.7.2.tgz",
+      "integrity": "sha512-PFX6ypJcCNDs7obRellR0DGTebfUhw1SXGKe2zpB+Ng1DQJhdzbzx1ob+AvJCLzy2TJF4r8cCDqMQqei1CZdPQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/normalize-url": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",
@@ -5850,15 +5871,12 @@
       }
     },
     "j7": {
-      "version": "file:../../third_party/j7",
+      "version": "file:../../../third_party/j7",
       "requires": {
         "axios": "^0.26.1",
-        "body-parser": "^1.20.0",
         "crc-32": "^1.2.1",
         "express": "^4.17.2",
-        "minimist": "^1.2.6",
         "mysql": "~2.18.1",
-        "node-xlsx": "^0.21.0",
         "querystring": "^0.2.1",
         "urlencode": "^1.1.0"
       }
@@ -6175,6 +6193,11 @@
       "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz",
       "integrity": "sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q=="
     },
+    "nodejs-websocket": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/nodejs-websocket/-/nodejs-websocket-1.7.2.tgz",
+      "integrity": "sha512-PFX6ypJcCNDs7obRellR0DGTebfUhw1SXGKe2zpB+Ng1DQJhdzbzx1ob+AvJCLzy2TJF4r8cCDqMQqei1CZdPQ=="
+    },
     "normalize-url": {
       "version": "4.5.1",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz",

server/httpgate/server/package.json

@@ -5,11 +5,12 @@
   "private": true,
   "scripts": {},
   "dependencies": {
-    "j7": "file:../../third_party/j7",
     "@metamask/eth-sig-util": "^4.0.0",
     "express": "^4.17.2",
+    "j7": "file:../../..//third_party/j7",
     "log4js": "~6.3.0",
     "mysql": "~2.18.1",
+    "nodejs-websocket": "^1.7.2",
     "web3": "^1.6.1"
   }
 }

server/httpgate/server/services/factory.js

@@ -12,12 +12,8 @@ function add(clsNames, modName) {
 }
 
 function init() {
-  add(['Present'], 'present');
+  add(['WsServer'], 'wsserver');
-  add(['EventCenter'], 'event_center');
+  create('WsServer', null).init();
-  add(['ExecConfirmOwner'], 'exec_confirm_owner');
-  add(['EventProcess'], 'event_process');
-  create('Present', null).init();
-  create('EventCenter', null).init();
 }
 
 function create(name, session) {

server/httpgate/server/services/wsserver.js

@@ -22,7 +22,7 @@ class WsServer extends BaseService {
             break;
           }
           const pkgLen = parseInt(data.slice(1, 7), 10);
-          if isNaN(pkgLen) {
+          if (isNaN(pkgLen)) {
             socket.close('error pkgLen');
             break;
           }

third_party/j7

@@ -1 +1 @@
-Subproject commit b48d506996787f8ecd00b3dfded4df10b41ddd88
+Subproject commit 786102288f4bd7e2184838531fc211803c2ce7e1