yakuza0 2.20.7 → 2.20.11

package/nuxt/buildModules/stylelint.js

@@ -42,7 +42,6 @@ module.exports = function (moduleOptions) {
   //   ...filesToWatch.map(p => (paths.appDirectory + paths.sep + p))
   // )
 
-  console.warn = function () {};
   this.extendBuild(function (config, _ref) {
     var isDev = _ref.isDev,
         isClient = _ref.isClient;

package/nuxt/style.js

@@ -37,6 +37,7 @@ exports.default = function (config) {
 
   config.buildModules = ['@rdc/nuxtjs-style-resources'];
 
+  console.warn = function () {};
   if (stylelint.enabled) {
     var sm = ['yakuza0/nuxt/buildModules/stylelint', stylelint.options];
     config.buildModules.push(sm);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "yakuza0",
-  "version": "2.20.7",
+  "version": "2.20.11",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
     "build": "babel --no-babelrc src -d . --presets=env --plugins=transform-runtime,transform-object-rest-spread,add-module-exports",
-    "pub:beta": "npm run build && npm version prerelease --preid=beta && npm publish --tag beta",
+    "pub:beta": "npm run build && npm version prerelease --preid=beta && pxnpm publish --tag beta",
     "pub": "npm run build && npm version patch && npm publish",
     "postinstall": "yk verify commit-init",
     "test": "jest"
@@ -97,12 +97,12 @@
     "tcp-port-used": "^1.0.1",
     "ua-parser-js": "^0.7.20",
     "v8-compile-cache": "^2.0.2",
-    "yakuza1": "2.6.5"
+    "yakuza1": "2.6.6"
   },
   "peerDependencies": {
     "@rdc/nuxt": "2.15.8-0",
     "core-js": "3.10.1",
     "eslint": "7.2.0",
-    "yakuza1": "2.6.5"
+    "yakuza1": "2.6.6"
   }
 }

package/server/proxy/web.js

@@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
 var _regenerator = require('babel-runtime/regenerator');
 
 var _regenerator2 = _interopRequireDefault(_regenerator);
@@ -101,7 +105,7 @@ exports.default = function () {
         proxyConf = _ref.proxyConf,
         nuxt = _ref.nuxt,
         config = _ref.config;
-    var pKey, servers;
+    var pKey, servers, wsProxyKeys;
     return _regenerator2.default.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -240,6 +244,10 @@ exports.default = function () {
                     }
                   });
 
+                  if (_config2.default.security.isStupid) {
+                    proxyReq.setHeader(_def.variable.adjoinIpHeader, (0, _server.getClientIP)(req, { stupid: true }));
+                  }
+
                   // const keys = Object.keys(yConf.proxyServer.proxy).join('|')
                   // if (req.crossParams.originUrl.match(new RegExp(`^\/(${keys})\/`))) {
                   //   _.forEach(yConf.proxyServer.proxyHeaders, dt => {
@@ -323,6 +331,8 @@ exports.default = function () {
               }, getCert()), app.callback()).listen(config.appConf.appPort));
             }
 
+            wsProxyKeys = (0, _keys2.default)(_config2.default.proxyServer.ws.proxy);
+
             servers.forEach(function (ser) {
               ser.on('upgrade', function (req, socket, head) {
                 if (_config2.default.server.om.enabled && _server.global.__cpm__ && (0, _om.isOmOpen)(req)) {
@@ -349,13 +359,26 @@ exports.default = function () {
                       headers: headers
                     }, defProxyOpt));
                   }
+
+                  var wsProxyKey = '';
+                  wsProxyKeys.forEach(function (key) {
+                    if (req.url.indexOf(key) !== -1) {
+                      wsProxyKey = key;
+                    }
+                  });
+                  if (wsProxyKey && wsProxyKey.startsWith(_config2.default.proxyServer.ws.prefix)) {
+                    req.url = req.url.replace('/' + wsProxyKey, '');
+                    _mid.proxy.ws(req, socket, head, (0, _extends3.default)({
+                      target: _config2.default.proxyServer.ws.proxy[wsProxyKey]
+                    }, defProxyOpt));
+                  }
                 }
 
                 socket.on('error', function (err) {});
               });
             });
 
-          case 7:
+          case 8:
           case 'end':
             return _context3.stop();
         }

package/utils/inclusive.js

@@ -193,6 +193,7 @@ var render = function () {
               version: ykPkg.version,
               ak: 'ak_TjfAV7I',
               name: pkg.name,
+              group: '',
               dev: processEnv.NODE_ENV === 'development',
               cmd: process.env.NODE_CMD,
               processKey: '.' + (0, _yakuza.md5)(appDirectory).substring(2, 18),
@@ -494,7 +495,9 @@ var render = function () {
                 baseUrl: {},
                 lp: false,
                 ws: {
-                  key: 'api-ws'
+                  key: 'api-ws',
+                  prefix: 'proxy-ws-',
+                  proxy: {}
                 },
                 app: {},
                 // ...(mainConf && mainConf.proxyServer ? mainConf.proxyServer : {}),
@@ -725,6 +728,10 @@ var render = function () {
               }
             }
 
+            if (conf.group) {
+              conf.imageKey = (0, _yakuza.md5)(conf.group);
+            }
+
             if (conf.ak.startsWith('ak_docker') || conf.inImage) {
               // conf.env = 'docker';
               conf.server.mockIP = true;
@@ -772,11 +779,11 @@ var render = function () {
 
             conf.proxyServer.proxy.apiv2 = orbAddr;
             conf.proxyServer.proxy.apiv3 = orbAddr;
-            conf.proxyServer.proxy['api-ws'] = orbAddr;
+            conf.proxyServer.proxy[conf.proxyServer.ws.key] = orbAddr;
 
             conf.server.csp.imgSrc = _yakuza._.uniq([].concat((0, _toConsumableArray3.default)(conf.server.csp.imgSrc || []), (0, _toConsumableArray3.default)(conf.server.tfs.fastdfs.domain)));
 
-            _context2.next = 48;
+            _context2.next = 49;
             return _yakuza._.asyncMap(conf.router.config, function () {
               var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(v, key) {
                 var name, arr, length, num;
@@ -933,7 +940,7 @@ var render = function () {
               };
             }());
 
-          case 48:
+          case 49:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1014,7 +1021,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 55:
+          case 56:
           case 'end':
             return _context2.stop();
         }