yakuza0 2.20.3 → 2.20.7

package/server/proxy/csrf.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
 var _keys = require('babel-runtime/core-js/object/keys');
 
 var _keys2 = _interopRequireDefault(_keys);
 
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
 var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
 
 var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
@@ -165,13 +165,13 @@ var ssrReqAllow = function ssrReqAllow(ctx) {
 var ddos = {};
 
 exports.default = function () {
-  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(_ref2) {
+  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(_ref2) {
     var app = _ref2.app,
         config = _ref2.config;
     var cspConnectSrcVerify, appCp, appCpApiV1, jwtVerC, omConf, cm;
-    return _regenerator2.default.wrap(function _callee10$(_context10) {
+    return _regenerator2.default.wrap(function _callee11$(_context11) {
       while (1) {
-        switch (_context10.prev = _context10.next) {
+        switch (_context11.prev = _context11.next) {
           case 0:
             // if (yConf.security.isTire) {
             //   const proxy = httpProxy.createServer({
@@ -336,10 +336,55 @@ exports.default = function () {
 
             app.use(function () {
               var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx, next) {
-                var keys;
                 return _regenerator2.default.wrap(function _callee$(_context) {
                   while (1) {
                     switch (_context.prev = _context.next) {
+                      case 0:
+                        if (!(ctx.method.toUpperCase() === 'GET' && ctx.path === '/sys/health-check')) {
+                          _context.next = 5;
+                          break;
+                        }
+
+                        ctx.status = 200;
+                        ctx.body = {
+                          response_status: 200,
+                          data: 'alive'
+                        };
+                        _context.next = 7;
+                        break;
+
+                      case 5:
+                        _context.next = 7;
+                        return next();
+
+                      case 7:
+                      case 'end':
+                        return _context.stop();
+                    }
+                  }
+                }, _callee, undefined);
+              }));
+
+              return function (_x3, _x4) {
+                return _ref4.apply(this, arguments);
+              };
+            }()
+            // if (ctx.method !== "/") {
+            //   const keys =  [...Object.keys(yConf.proxyServer.proxy), yConf.proxyServer.apiKey];
+            //   keys.forEach((key) => {
+            //     const tk = _.trim(key);
+            //     ctx.path = ctx.path.replace(config.appConf.server.basePath + "/" + tk, tk);
+            //   })
+            // }
+            // await next()
+            );
+
+            app.use(function () {
+              var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx, next) {
+                var keys;
+                return _regenerator2.default.wrap(function _callee2$(_context2) {
+                  while (1) {
+                    switch (_context2.prev = _context2.next) {
                       case 0:
                         if (config.appConf.server.basePath !== "/") {
                           keys = [].concat((0, _toConsumableArray3.default)((0, _keys2.default)(_config2.default.proxyServer.proxy)), [_config2.default.proxyServer.apiKey]);
@@ -349,19 +394,19 @@ exports.default = function () {
                             ctx.path = ctx.path.replace(config.appConf.server.basePath + "/" + tk, tk);
                           });
                         }
-                        _context.next = 3;
+                        _context2.next = 3;
                         return next();
 
                       case 3:
                       case 'end':
-                        return _context.stop();
+                        return _context2.stop();
                     }
                   }
-                }, _callee, undefined);
+                }, _callee2, undefined);
               }));
 
-              return function (_x3, _x4) {
-                return _ref4.apply(this, arguments);
+              return function (_x5, _x6) {
+                return _ref5.apply(this, arguments);
               };
             }());
 
@@ -381,69 +426,69 @@ exports.default = function () {
               _server.global.__cpm__ = (0, _httpProxyMiddleware.createProxyMiddleware)((0, _extends3.default)({}, cm));
 
               appCp(function () {
-                var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx, next) {
-                  return _regenerator2.default.wrap(function _callee2$(_context2) {
+                var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx, next) {
+                  return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
-                      switch (_context2.prev = _context2.next) {
+                      switch (_context3.prev = _context3.next) {
                         case 0:
                           if (!(0, _om.isOmOpen)(ctx.req)) {
-                            _context2.next = 9;
+                            _context3.next = 9;
                             break;
                           }
 
                           if (!((0, _keys2.default)(omConf.router).length > 0)) {
-                            _context2.next = 6;
+                            _context3.next = 6;
                             break;
                           }
 
-                          _context2.next = 4;
+                          _context3.next = 4;
                           return (0, _koa2Connect2.default)(_server.global.__cpm__)(ctx, next);
 
                         case 4:
-                          _context2.next = 7;
+                          _context3.next = 7;
                           break;
 
                         case 6:
                           ctx.body = _msg.errMsg['server.om.target.none'];
 
                         case 7:
-                          _context2.next = 11;
+                          _context3.next = 11;
                           break;
 
                         case 9:
-                          _context2.next = 11;
+                          _context3.next = 11;
                           return next();
 
                         case 11:
                         case 'end':
-                          return _context2.stop();
+                          return _context3.stop();
                       }
                     }
-                  }, _callee2, undefined);
+                  }, _callee3, undefined);
                 }));
 
-                return function (_x5, _x6) {
-                  return _ref5.apply(this, arguments);
+                return function (_x7, _x8) {
+                  return _ref6.apply(this, arguments);
                 };
               }());
             }
 
             appCp(function () {
-              var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx, next) {
-                return _regenerator2.default.wrap(function _callee3$(_context3) {
+              var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(ctx, next) {
+                return _regenerator2.default.wrap(function _callee4$(_context4) {
                   while (1) {
-                    switch (_context3.prev = _context3.next) {
+                    switch (_context4.prev = _context4.next) {
                       case 0:
                         if (!(ctx.method === 'GET' || ctx.method === 'POST' || jwtVerC(ctx.path))) {
-                          _context3.next = 5;
+                          _context4.next = 5;
                           break;
                         }
 
-                        _context3.next = 3;
+                        _context4.next = 3;
                         return next();
 
                       case 3:
-                        _context3.next = 6;
+                        _context4.next = 6;
                         break;
 
                       case 5:
@@ -454,26 +499,26 @@ exports.default = function () {
 
                       case 6:
                       case 'end':
-                        return _context3.stop();
+                        return _context4.stop();
                     }
                   }
-                }, _callee3, undefined);
+                }, _callee4, undefined);
               }));
 
-              return function (_x7, _x8) {
-                return _ref6.apply(this, arguments);
+              return function (_x9, _x10) {
+                return _ref7.apply(this, arguments);
               };
             }());
 
             app.use(function () {
-              var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(ctx, next) {
+              var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(ctx, next) {
                 var isInclude, include, exclude, referer;
-                return _regenerator2.default.wrap(function _callee4$(_context4) {
+                return _regenerator2.default.wrap(function _callee5$(_context5) {
                   while (1) {
-                    switch (_context4.prev = _context4.next) {
+                    switch (_context5.prev = _context5.next) {
                       case 0:
                         if (!_config2.default.server.hotLinking.enabled) {
-                          _context4.next = 21;
+                          _context5.next = 21;
                           break;
                         }
 
@@ -501,51 +546,51 @@ exports.default = function () {
                         // console.log(ctx.href, referer, ctx.href.indexOf(jsUrl('hostname', referer)), 11);
 
                         if (!isInclude) {
-                          _context4.next = 17;
+                          _context5.next = 17;
                           break;
                         }
 
                         if (!(typeof referer === 'string' && referer !== '' && ctx.href.indexOf((0, _server.jsUrl)('hostname', referer)) !== -1)) {
-                          _context4.next = 14;
+                          _context5.next = 14;
                           break;
                         }
 
-                        _context4.next = 12;
+                        _context5.next = 12;
                         return next();
 
                       case 12:
-                        _context4.next = 15;
+                        _context5.next = 15;
                         break;
 
                       case 14:
                         ctx.status = 404;
 
                       case 15:
-                        _context4.next = 19;
+                        _context5.next = 19;
                         break;
 
                       case 17:
-                        _context4.next = 19;
+                        _context5.next = 19;
                         return next();
 
                       case 19:
-                        _context4.next = 23;
+                        _context5.next = 23;
                         break;
 
                       case 21:
-                        _context4.next = 23;
+                        _context5.next = 23;
                         return next();
 
                       case 23:
                       case 'end':
-                        return _context4.stop();
+                        return _context5.stop();
                     }
                   }
-                }, _callee4, undefined);
+                }, _callee5, undefined);
               }));
 
-              return function (_x9, _x10) {
-                return _ref7.apply(this, arguments);
+              return function (_x11, _x12) {
+                return _ref8.apply(this, arguments);
               };
             }()
             // if (!yConf.security.stupid) {
@@ -557,16 +602,16 @@ exports.default = function () {
 
             if (config.appConf.server.sslify.redirect && !config.appConf.server.generate.enabled) {
               appCp(function () {
-                var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(ctx, next) {
+                var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(ctx, next) {
                   var isRedirected;
-                  return _regenerator2.default.wrap(function _callee5$(_context5) {
+                  return _regenerator2.default.wrap(function _callee6$(_context6) {
                     while (1) {
-                      switch (_context5.prev = _context5.next) {
+                      switch (_context6.prev = _context6.next) {
                         case 0:
                           isRedirected = (ctx.req.headers.cookie || '').indexOf(_config2.default.server.sslify.openKey) !== -1;
 
                           if (isRedirected) {
-                            _context5.next = 7;
+                            _context6.next = 7;
                             break;
                           }
 
@@ -574,37 +619,37 @@ exports.default = function () {
                             signed: false,
                             sameSite: _config2.default.server.cookieSameSite
                           });
-                          _context5.next = 5;
+                          _context6.next = 5;
                           return (0, _koaSslify2.default)((0, _extends3.default)({}, _config2.default.server.sslify.options))(ctx, next);
 
                         case 5:
-                          _context5.next = 9;
+                          _context6.next = 9;
                           break;
 
                         case 7:
-                          _context5.next = 9;
+                          _context6.next = 9;
                           return next();
 
                         case 9:
                         case 'end':
-                          return _context5.stop();
+                          return _context6.stop();
                       }
                     }
-                  }, _callee5, undefined);
+                  }, _callee6, undefined);
                 }));
 
-                return function (_x11, _x12) {
-                  return _ref8.apply(this, arguments);
+                return function (_x13, _x14) {
+                  return _ref9.apply(this, arguments);
                 };
               }());
             }
 
             appCp(function () {
-              var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(ctx, next) {
+              var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(ctx, next) {
                 var parser, result, browserType, bt, bs, url, isNext;
-                return _regenerator2.default.wrap(function _callee6$(_context6) {
+                return _regenerator2.default.wrap(function _callee7$(_context7) {
                   while (1) {
-                    switch (_context6.prev = _context6.next) {
+                    switch (_context7.prev = _context7.next) {
                       case 0:
                         parser = new _uaParserJs2.default();
 
@@ -635,23 +680,23 @@ exports.default = function () {
                         }
 
                         if (!isNext) {
-                          _context6.next = 14;
+                          _context7.next = 14;
                           break;
                         }
 
-                        _context6.next = 14;
+                        _context7.next = 14;
                         return next();
 
                       case 14:
                       case 'end':
-                        return _context6.stop();
+                        return _context7.stop();
                     }
                   }
-                }, _callee6, undefined);
+                }, _callee7, undefined);
               }));
 
-              return function (_x13, _x14) {
-                return _ref9.apply(this, arguments);
+              return function (_x15, _x16) {
+                return _ref10.apply(this, arguments);
               };
             }());
 
@@ -668,11 +713,11 @@ exports.default = function () {
 
               if (_config2.default.security.stupid) {
                 appCpApiV1(function () {
-                  var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(ctx, next) {
+                  var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(ctx, next) {
                     var isNext, rHost, rOrigin, rReferer;
-                    return _regenerator2.default.wrap(function _callee7$(_context7) {
+                    return _regenerator2.default.wrap(function _callee8$(_context8) {
                       while (1) {
-                        switch (_context7.prev = _context7.next) {
+                        switch (_context8.prev = _context8.next) {
                           case 0:
                             isNext = true;
                             rHost = (0, _server.jsUrl)('hostname', ctx.get('host'));
@@ -684,15 +729,15 @@ exports.default = function () {
                             }
 
                             if (!isNext) {
-                              _context7.next = 10;
+                              _context8.next = 10;
                               break;
                             }
 
-                            _context7.next = 8;
+                            _context8.next = 8;
                             return next();
 
                           case 8:
-                            _context7.next = 11;
+                            _context8.next = 11;
                             break;
 
                           case 10:
@@ -703,14 +748,14 @@ exports.default = function () {
 
                           case 11:
                           case 'end':
-                            return _context7.stop();
+                            return _context8.stop();
                         }
                       }
-                    }, _callee7, undefined);
+                    }, _callee8, undefined);
                   }));
 
-                  return function (_x15, _x16) {
-                    return _ref10.apply(this, arguments);
+                  return function (_x17, _x18) {
+                    return _ref11.apply(this, arguments);
                   };
                 }()
                 // if (ctx.method === 'GET' || ctx.method === 'POST' || jwtVerC(ctx.path)) {
@@ -724,29 +769,29 @@ exports.default = function () {
                 );
 
                 app.use(function () {
-                  var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(ctx, next) {
-                    return _regenerator2.default.wrap(function _callee8$(_context8) {
+                  var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(ctx, next) {
+                    return _regenerator2.default.wrap(function _callee9$(_context9) {
                       while (1) {
-                        switch (_context8.prev = _context8.next) {
+                        switch (_context9.prev = _context9.next) {
                           case 0:
                             // ctx.set('Surrogate-Control', 'no-store');
                             // ctx.set('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
                             // ctx.set('Pragma', 'no-cache');
                             // ctx.set('Expires', '0');
                             (0, _control.noCache)(ctx);
-                            _context8.next = 3;
+                            _context9.next = 3;
                             return next();
 
                           case 3:
                           case 'end':
-                            return _context8.stop();
+                            return _context9.stop();
                         }
                       }
-                    }, _callee8, undefined);
+                    }, _callee9, undefined);
                   }));
 
-                  return function (_x17, _x18) {
-                    return _ref11.apply(this, arguments);
+                  return function (_x19, _x20) {
+                    return _ref12.apply(this, arguments);
                   };
                 }());
               }
@@ -760,10 +805,10 @@ exports.default = function () {
             }
 
             app.use(function () {
-              var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(ctx, next) {
-                return _regenerator2.default.wrap(function _callee9$(_context9) {
+              var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(ctx, next) {
+                return _regenerator2.default.wrap(function _callee10$(_context10) {
                   while (1) {
-                    switch (_context9.prev = _context9.next) {
+                    switch (_context10.prev = _context10.next) {
                       case 0:
                         // const csrfCookie = ctx.cookies.get(variable.csrfCookie, {signed: false});
                         // console.log(ctx.path, ctx.req.headers.cookie, 111);
@@ -779,28 +824,28 @@ exports.default = function () {
                           cookieDomain: config.appConf.cookieDomain || _server.Cookies.getDefCookieDomain(ctx.hostname)
                         }, ctx.req.crossParams);
 
-                        _context9.next = 3;
+                        _context10.next = 3;
                         return next();
 
                       case 3:
                       case 'end':
-                        return _context9.stop();
+                        return _context10.stop();
                     }
                   }
-                }, _callee9, undefined);
+                }, _callee10, undefined);
               }));
 
-              return function (_x19, _x20) {
-                return _ref12.apply(this, arguments);
+              return function (_x21, _x22) {
+                return _ref13.apply(this, arguments);
               };
             }());
 
-          case 15:
+          case 16:
           case 'end':
-            return _context10.stop();
+            return _context11.stop();
         }
       }
-    }, _callee10, undefined);
+    }, _callee11, undefined);
   }));
 
   return function (_x) {

package/server/proxy/tire.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 _extends2 = require("babel-runtime/helpers/extends");
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -55,6 +59,8 @@ var express = require('express');
 var _require = require('http-proxy-middleware'),
     createProxyMiddleware = _require.createProxyMiddleware;
 
+var autoRefreshCapacity = {};
+
 var getCacheKey = function getCacheKey(str) {
   return str.split('?')[0];
 };
@@ -218,16 +224,18 @@ exports.default = function () {
             app.use((0, _compression2.default)());
 
             app.use(function (req, res, next) {
-              if (req.url !== '/__clearCache') {
-                next();
-              } else {
+              var method = req.method.toUpperCase();
+              var path = req.url;
+              if (method === "GET" && path === '/sys/health-check') {
+                res.status(200).send({
+                  response_status: 200,
+                  data: 'alive'
+                });
+              } else if (method === "GET" && path === '/__clearCache') {
                 (0, _secCache.secCacheClear)();
                 res.status(404).send("The page was not found ~~");
-                // if (!yConf.security.isTire) {
-                //   next()
-                // } else {
-                //
-                // }
+              } else {
+                next();
               }
             });
 
@@ -323,15 +331,22 @@ exports.default = function () {
 
                           res.send(data.body);
 
-                          if (server.generate.autoRefresh) {
+                          var arKey = req.url;
+                          autoRefreshCapacity[arKey] = autoRefreshCapacity[arKey] || 0;
+                          if (server.generate.autoRefresh && autoRefreshCapacity[arKey] < server.generate.capacity) {
+                            autoRefreshCapacity[arKey] += 1;
                             (0, _curl.curl)("http://127.0.0.1:" + config.appConf.port + req.url, {
                               method: 'GET',
                               headers: {
                                 "Cookie": req.get("cookie"),
                                 "x-gen-set": "true"
                               },
-                              timeout: timeout
-                            }).then();
+                              timeout: server.generate.autoRefreshTimeout
+                            }).then(function () {
+                              autoRefreshCapacity[arKey] -= 1;
+                            }).catch(function () {
+                              autoRefreshCapacity[arKey] -= 1;
+                            });
                           }
                         } else {
                           next();
@@ -398,23 +413,31 @@ exports.default = function () {
                       server.generate.exclude = server.generate.exclude.split(',');
                     }
 
-                    if (server.generate.include.length !== 0) {
-                      isCache = false;
-                      server.generate.include.forEach(function (path) {
+                    if (server.generate.exclude.length !== 0) {
+                      server.generate.exclude.forEach(function (path) {
                         if ((0, _server.minimatch)(req.url, path)) {
-                          isCache = true;
+                          isCache = false;
                         }
                       });
                     }
 
-                    if (server.generate.exclude.length !== 0) {
-                      server.generate.exclude.forEach(function (path) {
-                        if ((0, _server.minimatch)(req.url, path)) {
+                    if ((0, _keys2.default)(appConf.proxyServer.proxy || []).length > 0) {
+                      _server._.forEach(appConf.proxyServer.proxy, function (v, path) {
+                        if ((0, _server.minimatch)(req.url, "/" + path + "*") || (0, _server.minimatch)(req.url, "/" + path + "/**")) {
                           isCache = false;
                         }
                       });
                     }
 
+                    if (server.generate.include.length !== 0) {
+                      isCache = false;
+                      server.generate.include.forEach(function (path) {
+                        if ((0, _server.minimatch)(req.url, path)) {
+                          isCache = true;
+                        }
+                      });
+                    }
+
                     var libContentType = ['application/javascript; charset=utf-8', 'text/css; charset=utf-8', 'font/woff', 'image/png', 'image/jpeg', 'image/x-icon'];
 
                     var isTireSave = _config2.default.security.isTire && isCache && ['text/html; charset=utf-8'].concat(libContentType).includes((proxyRes.headers['content-type'] || '').toLowerCase());

package/template/yk.plugin.js

@@ -63,6 +63,7 @@ export default async (ctx, inject) => {
       ...nowProxyServer,
     },
     router,
+    gu: {},
     __options: {},
   }