yakuza0 2.21.10-beta.21 → 2.21.10-beta.24

package/cli/index.js

@@ -451,6 +451,9 @@ var run = exports.run = function () {
                     msg = _ref16.msg,
                     yk0BuildApp = _ref16.yk0BuildApp,
                     env = _ref16.env;
+
+                var _ref18, conf;
+
                 return _regenerator2.default.wrap(function _callee10$(_context10) {
                   while (1) {
                     switch (_context10.prev = _context10.next) {
@@ -467,29 +470,48 @@ var run = exports.run = function () {
 
                       case 4:
                         _context10.t0 = cmd;
-                        _context10.next = _context10.t0 === "commit-init" ? 7 : 10;
+                        _context10.next = _context10.t0 === "commit-init" ? 7 : 18;
                         break;
 
                       case 7:
                         _context10.next = 9;
-                        return (0, _verify.commitInit)();
+                        return gi({ app: yk0BuildApp, ykServerEnv: env, appsNoneExit: false });
 
                       case 9:
-                        return _context10.abrupt('break', 16);
+                        _ref18 = _context10.sent;
+                        conf = _ref18.conf;
 
-                      case 10:
-                        _context10.next = 12;
-                        return (0, _verify.commitEsLint)({ edit: edit });
+                        if (!conf.extend.plugins.husky.enabled) {
+                          _context10.next = 16;
+                          break;
+                        }
 
-                      case 12:
                         _context10.next = 14;
-                        return (0, _verify.commitStyleLint)({ edit: edit });
+                        return (0, _verify.commitInit)();
 
                       case 14:
-                        _context10.next = 16;
-                        return (0, _verify.commitMsg)({ edit: msg });
+                        _context10.next = 17;
+                        break;
 
                       case 16:
+                        _paths2.default.rm(_paths2.default.gitHooksCommitMsg);
+
+                      case 17:
+                        return _context10.abrupt('break', 24);
+
+                      case 18:
+                        _context10.next = 20;
+                        return (0, _verify.commitEsLint)({ edit: edit });
+
+                      case 20:
+                        _context10.next = 22;
+                        return (0, _verify.commitStyleLint)({ edit: edit });
+
+                      case 22:
+                        _context10.next = 24;
+                        return (0, _verify.commitMsg)({ edit: msg });
+
+                      case 24:
                       case 'end':
                         return _context10.stop();
                     }
@@ -513,11 +535,11 @@ var run = exports.run = function () {
             );
 
             _commander2.default.command('server <cmd>').alias('s').option('-y0ba, --yk0-build-app <appName>', 'Building a specified application').option('-e, --env <envName>', 'yk server env').description('service control').action(function () {
-              var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(cmd, _ref18) {
-                var yk0BuildApp = _ref18.yk0BuildApp,
-                    env = _ref18.env;
+              var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(cmd, _ref19) {
+                var yk0BuildApp = _ref19.yk0BuildApp,
+                    env = _ref19.env;
 
-                var _ref20, apps;
+                var _ref21, apps;
 
                 return _regenerator2.default.wrap(function _callee12$(_context12) {
                   while (1) {
@@ -538,8 +560,8 @@ var run = exports.run = function () {
                         return gi({ app: yk0BuildApp, ykServerEnv: env });
 
                       case 7:
-                        _ref20 = _context12.sent;
-                        apps = _ref20.apps;
+                        _ref21 = _context12.sent;
+                        apps = _ref21.apps;
 
                         if (!['start', 'stop', 'restart', 'lite', 'container'].includes(cmd)) {
                           _context12.next = 21;
@@ -561,7 +583,7 @@ var run = exports.run = function () {
                       case 17:
                         _context12.next = 19;
                         return _server._.asyncMap(apps, function () {
-                          var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(key, j) {
+                          var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(key, j) {
                             return _regenerator2.default.wrap(function _callee11$(_context11) {
                               while (1) {
                                 switch (_context11.prev = _context11.next) {
@@ -579,7 +601,7 @@ var run = exports.run = function () {
                           }));
 
                           return function (_x15, _x16) {
-                            return _ref21.apply(this, arguments);
+                            return _ref22.apply(this, arguments);
                           };
                         }());
 
@@ -600,7 +622,7 @@ var run = exports.run = function () {
               }));
 
               return function (_x13, _x14) {
-                return _ref19.apply(this, arguments);
+                return _ref20.apply(this, arguments);
               };
             }()).on('--help', function () {
               console.log('');
@@ -612,7 +634,7 @@ var run = exports.run = function () {
             });
 
             _commander2.default.command('publish').alias('pub').description('Publish to server').action(function () {
-              var _ref22 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(env, options) {
+              var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(env, options) {
                 return _regenerator2.default.wrap(function _callee13$(_context13) {
                   while (1) {
                     switch (_context13.prev = _context13.next) {
@@ -634,7 +656,7 @@ var run = exports.run = function () {
               }));
 
               return function (_x17, _x18) {
-                return _ref22.apply(this, arguments);
+                return _ref23.apply(this, arguments);
               };
             }());
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.21.10-beta.21",
+  "version": "2.21.10-beta.24",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
@@ -105,12 +105,12 @@
     "tcp-port-used": "^1.0.1",
     "ua-parser-js": "^0.7.20",
     "v8-compile-cache": "^2.0.2",
-    "yakuza1": "2.6.10-beta.3"
+    "yakuza1": "2.6.10-beta.4"
   },
   "peerDependencies": {
     "@rdc/nuxt": "2.15.8-0",
     "core-js": "3.10.1",
     "eslint": "7.2.0",
-    "yakuza1": "2.6.10-beta.3"
+    "yakuza1": "2.6.10-beta.4"
   }
 }

package/server/proxy/tire.js

@@ -8,13 +8,9 @@ var _keys = require("babel-runtime/core-js/object/keys");
 
 var _keys2 = _interopRequireDefault(_keys);
 
-var _extends2 = require("babel-runtime/helpers/extends");
+var _extends4 = require("babel-runtime/helpers/extends");
 
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _defineProperty2 = require("babel-runtime/helpers/defineProperty");
-
-var _defineProperty3 = _interopRequireDefault(_defineProperty2);
+var _extends5 = _interopRequireDefault(_extends4);
 
 var _regenerator = require("babel-runtime/regenerator");
 
@@ -24,6 +20,10 @@ var _stringify = require("babel-runtime/core-js/json/stringify");
 
 var _stringify2 = _interopRequireDefault(_stringify);
 
+var _defineProperty2 = require("babel-runtime/helpers/defineProperty");
+
+var _defineProperty3 = _interopRequireDefault(_defineProperty2);
+
 var _asyncToGenerator2 = require("babel-runtime/helpers/asyncToGenerator");
 
 var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
@@ -69,7 +69,7 @@ exports.default = function () {
   var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(_ref) {
     var config = _ref.config;
 
-    var appConf, appName, server, pIp, pHost, timeout, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers2;
+    var appConf, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers;
 
     return _regenerator2.default.wrap(function _callee3$(_context3) {
       while (1) {
@@ -81,9 +81,19 @@ exports.default = function () {
             pIp = _server.ip.address();
             pHost = server.protocol + "//" + pIp + ":" + appConf.port;
             timeout = _config2.default.server.infoTimeout + 5000;
+            commonHeaders = {};
+
+            getHeader = function getHeader(req) {
+              if (req && req.headers) {
+                var _ref3;
+
+                return _ref3 = {}, (0, _defineProperty3.default)(_ref3, _def.variable.guRouteGroupHeader, req.headers[_def.variable.guRouteGroupHeader] === undefined ? commonHeaders[_def.variable.guRouteGroupHeader] : req.headers[_def.variable.guRouteGroupHeader]), (0, _defineProperty3.default)(_ref3, _def.variable.guRouteNameHeader, req.headers[_def.variable.guRouteNameHeader] === undefined ? commonHeaders[_def.variable.guRouteNameHeader] : req.headers[_def.variable.guRouteNameHeader]), (0, _defineProperty3.default)(_ref3, _def.variable.guRouteVerHeader, req.headers[_def.variable.guRouteVerHeader] === undefined ? commonHeaders[_def.variable.guRouteVerHeader] : req.headers[_def.variable.guRouteVerHeader]), _ref3;
+              }
+              return {};
+            };
 
             if (!server.generate.enabled) {
-              _context3.next = 24;
+              _context3.next = 26;
               break;
             }
 
@@ -102,7 +112,7 @@ exports.default = function () {
             // }
 
             getUc = function () {
-              var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(req, res) {
+              var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(req, res) {
                 var ucBody, defDomain, bodyStr, Cookie, ucHeaders, hs, rs, resCookie;
                 return _regenerator2.default.wrap(function _callee$(_context) {
                   while (1) {
@@ -156,12 +166,12 @@ exports.default = function () {
               }));
 
               return function getUc(_x2, _x3) {
-                return _ref3.apply(this, arguments);
+                return _ref4.apply(this, arguments);
               };
             }();
 
             build = function () {
-              var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
+              var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2() {
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
@@ -198,19 +208,19 @@ exports.default = function () {
               }));
 
               return function build() {
-                return _ref4.apply(this, arguments);
+                return _ref5.apply(this, arguments);
               };
             }();
 
             if (_config2.default.security.isTire) {
-              _context3.next = 14;
+              _context3.next = 16;
               break;
             }
 
-            _context3.next = 14;
+            _context3.next = 16;
             return build();
 
-          case 14:
+          case 16:
             baseConfig = {
               // changeOrigin: true,
               secure: false,
@@ -235,6 +245,7 @@ exports.default = function () {
                 (0, _secCache.secCacheClear)();
                 res.status(404).send("The page was not found ~~");
               } else {
+                commonHeaders = getHeader(req);
                 next();
               }
             });
@@ -300,10 +311,9 @@ exports.default = function () {
                         timeout: timeout,
                         json: true,
                         resolveWithFullResponse: true,
-                        headers: (0, _defineProperty3.default)({
-                          // Cookie: Cookies.koaGetCookieStr({req}),
+                        headers: (0, _extends5.default)({}, commonHeaders, (0, _defineProperty3.default)({
                           Cookie: req.get("cookie")
-                        }, _def.variable.childKeyHeader, _config2.default.childKey)
+                        }, _def.variable.childKeyHeader, _config2.default.childKey))
                       }).then(function (response) {
                         // console.log(response);
                         var data = response.body;
@@ -312,7 +322,7 @@ exports.default = function () {
                           // console.log(req.url, "req res have");
                           data.body = Buffer.from(data.body);
                           if (response.headers['set-cookie']) {
-                            data.resHeaders = (0, _extends3.default)({}, data.resHeaders, {
+                            data.resHeaders = (0, _extends5.default)({}, data.resHeaders, {
                               'set-cookie': response.headers['set-cookie']
                             });
                           }
@@ -366,15 +376,15 @@ exports.default = function () {
             });
 
             if (_config2.default.security.isTire) {
-              app.use('/apiv1', createProxyMiddleware((0, _extends3.default)({}, baseConfig, {
+              app.use('/apiv1', createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
                 target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
-                headers: (_headers2 = {}, (0, _defineProperty3.default)(_headers2, _def.variable.ipHeader, '127.0.0.1'), (0, _defineProperty3.default)(_headers2, _def.variable.appCodeHeader, config.appConf.appCode), _headers2),
+                headers: (_headers = {}, (0, _defineProperty3.default)(_headers, _def.variable.ipHeader, '127.0.0.1'), (0, _defineProperty3.default)(_headers, _def.variable.appCodeHeader, config.appConf.appCode), _headers),
                 pathRewrite: {
                   '^/apiv1': "/" + _config2.default.proxyServer.apiKey + "/" + _config2.default.name + "/client/backend" // rewrite path
                 }
               })));
 
-              app.use('/apiv2', createProxyMiddleware((0, _extends3.default)({}, baseConfig, {
+              app.use('/apiv2', createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
                 target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort
               })));
             }
@@ -384,7 +394,7 @@ exports.default = function () {
             // app.use(`/_nuxt`, express.static(clientPath))
             // app.use(`${_.bothAddFix(server.basePath, "/")}_nuxt`, express.static(clientPath))
 
-            app.use('/', createProxyMiddleware((0, _extends3.default)({}, baseConfig, {
+            app.use('/', createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
               target: "http://127.0.0.1:" + config.appConf.appPort,
               ws: true,
               onProxyRes: function onProxyRes(proxyRes, req, res) {
@@ -480,10 +490,10 @@ exports.default = function () {
                           },
                           timeout: timeout,
                           json: true,
-                          headers: (0, _defineProperty3.default)({
+                          headers: (0, _extends5.default)({}, commonHeaders, (0, _defineProperty3.default)({
                             // Cookie: Cookies.koaGetCookieStr({req}),
                             Cookie: req.get("cookie")
-                          }, _def.variable.childKeyHeader, _config2.default.childKey)
+                          }, _def.variable.childKeyHeader, _config2.default.childKey))
                         }).then(function () {}).catch(function (e) {});
                       }
                     }
@@ -524,7 +534,7 @@ exports.default = function () {
               }, server.generate.maxAge * 1000);
             }
 
-          case 24:
+          case 26:
           case "end":
             return _context3.stop();
         }

package/template/http.plugin.js

@@ -57,8 +57,16 @@ export default (ctx, inject) => {
     // Don't accept brotli encoding because Node can't parse it
     defaults.headers['accept-encoding'] = 'gzip, deflate';
 
-    const {getClientIP} = require("yakuza1/server");
-    defaults.headers[variable.adjoinIpHeader] = getClientIP(req, {stupid: true});
+    if (req) {
+      const {getClientIP} = require('yakuza1/server');
+      defaults.headers[variable.adjoinIpHeader] = getClientIP(req, {stupid: true});
+
+      if (req.headers) {
+        defaults.headers[variable.guRouteGroupHeader] = req.headers[variable.guRouteGroupHeader];
+        defaults.headers[variable.guRouteNameHeader] = req.headers[variable.guRouteNameHeader];
+        defaults.headers[variable.guRouteVerHeader] = req.headers[variable.guRouteVerHeader];
+      }
+    }
   }
   // Create new HTTP instance
   const http = urlib({

package/template/log.plugin.js

@@ -4,11 +4,11 @@ import {dayjs} from 'yakuza1';
 import colors from 'colors/safe';
 
 colors.setTheme({
-  debug: yConf.server.log.colors.debug,
-  info: yConf.server.log.colors.info,
-  warn: yConf.server.log.colors.warn,
-  error: yConf.server.log.colors.error,
-  fatal: yConf.server.log.colors.fatal,
+  debug: yConf.server && yConf.server.log && yConf.server.log.colors && yConf.server.log.colors.debug || "cyan",
+  info: yConf.server && yConf.server.log && yConf.server.log.colors && yConf.server.log.colors.info || "green",
+  warn: yConf.server && yConf.server.log && yConf.server.log.colors && yConf.server.log.colors.warn || "yellow",
+  error: yConf.server && yConf.server.log && yConf.server.log.colors && yConf.server.log.colors.error || "red",
+  fatal: yConf.server && yConf.server.log && yConf.server.log.colors && yConf.server.log.colors.fatal || "magenta",
 });
 
 const logFormat = (level, head, detail) => {