yakuza0 2.22.33 → 2.22.34-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.22.33",
+  "version": "2.22.34-beta.1",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {

package/server/mode/stop.js

@@ -29,6 +29,9 @@ var _chalk2 = _interopRequireDefault(_chalk);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var _require = require('child_process'),
+    exec = _require.exec;
+
 var stat = exports.stat = function stat(_ref) {
   var config = _ref.config;
 
@@ -63,6 +66,9 @@ exports.default = function (_ref2) {
     _consola2.default.log('| ' + _chalk2.default.cyan(name) + ' is shutting down...');
   }
   return new _promise2.default(function (resolve) {
+    try {
+      exec(_config2.default.server.tire.guPath + ' -s stop');
+    } catch (e) {}
     try {
       _pm2.default.delete(_config2.default.name + processName);
     } catch (e) {}

package/server/proxy/conf.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.apiV3PathRewrite = exports.serverHeaders = exports.usedPort = exports.includesTypePath = exports.crossPath = undefined;
+exports.ng_conf = exports.apiV3PathRewrite = exports.serverHeaders = exports.usedPort = exports.includesTypePath = exports.crossPath = undefined;
 
 var _stringify = require('babel-runtime/core-js/json/stringify');
 
@@ -41,6 +41,10 @@ var _tcpPortUsed2 = _interopRequireDefault(_tcpPortUsed);
 
 var _def = require('yakuza1/lib/config/def');
 
+var _os = require('os');
+
+var _os2 = _interopRequireDefault(_os);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 exports.default = function () {
@@ -179,4 +183,26 @@ var apiV3PathRewrite = exports.apiV3PathRewrite = function apiV3PathRewrite(path
     path = path.replace(backendReg, 'apiv3/backend/');
   }
   return path;
+};
+
+var ng_conf = exports.ng_conf = function ng_conf(_ref6) {
+  var appUrl = _ref6.appUrl,
+      th = _ref6.th,
+      port = _ref6.port,
+      yk4Addr = _ref6.yk4Addr,
+      basePath = _ref6.basePath,
+      name = _ref6.name,
+      resolver = _ref6.resolver;
+
+  var confRoot = '/etc/nginx/extra';
+  if (_os2.default.platform() === 'darwin') {
+    confRoot = '/opt/homebrew/etc/nginx/extra';
+  }
+  if (!resolver) {
+    resolver = '';
+  } else {
+    resolver = 'resolver ' + resolver + ';';
+  }
+
+  return '\n    ' + resolver + '\n\n    server {\n      listen       ' + port + ';\n      server_name  localhost;\n      include ' + confRoot + '/server.conf;\n\n      location ' + basePath + ' {\n          proxy_pass ' + appUrl + ';\n      }\n\n      location ' + basePath + 'apiv1 {\n          proxy_set_header ' + _def.variable.ipHeader + ' \'' + th[_def.variable.ipHeader] + '\';\n          proxy_set_header ' + _def.variable.childKeyHeader + ' \'' + th[_def.variable.childKeyHeader] + '\';\n          proxy_set_header ' + _def.variable.appCodeHeader + ' \'' + th[_def.variable.appCodeHeader] + '\';\n          proxy_set_header ' + _def.variable.appKeyHeader + ' \'' + th[_def.variable.appKeyHeader] + '\';\n          proxy_set_header ' + _def.variable.shareRuleHeader + ' \'' + th[_def.variable.shareRuleHeader] + '\';\n          include ' + confRoot + '/proxy.conf;\n          proxy_pass ' + yk4Addr + '/apiv1/' + name + '/client/backend;\n      }\n\n      location ' + basePath + 'apiv2 {\n          include ' + confRoot + '/proxy.conf;\n          proxy_pass ' + yk4Addr + '/apiv2;\n      }\n\n      location ~ ' + basePath + 'apiv3/cln_.*feapiv1/ {\n        rewrite ^' + basePath + 'apiv3/cln_(.*)feapiv1/(.*)$ ' + basePath + 'apiv3/fe/$2 last;\n        include ' + confRoot + '/proxy.conf;\n        proxy_pass ' + yk4Addr + ';\n      }\n      location ~ ' + basePath + 'apiv3/cln_[a-z]+/ {\n        rewrite ^' + basePath + 'apiv3/cln_[a-z]+/(.*)$ ' + basePath + 'apiv3/backend/$1 last;\n        include ' + confRoot + '/proxy.conf;\n        proxy_pass ' + yk4Addr + ';\n      }\n  }\n  ';
 };

package/server/proxy/tire.js

@@ -54,6 +54,12 @@ var _control = require("../cache/control");
 
 var _conf = require("./conf");
 
+var _paths = require("../../config/paths");
+
+var _paths2 = _interopRequireDefault(_paths);
+
+var _child_process = require("child_process");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // import paths from '../../config/paths';
@@ -86,17 +92,23 @@ exports.default = function () {
   var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(_ref) {
     var config = _ref.config;
 
-    var appConf, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _th, th, basePath;
+    var appConf, guPort, appConfPort, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _th, th, basePath, conf;
 
     return _regenerator2.default.wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
             appConf = config.appConf;
+            guPort = appConf.port;
+            appConfPort = appConf.port;
+
+            if (_config2.default.security.isTire && _paths2.default.access(_config2.default.server.tire.guPath)) {
+              appConfPort = appConfPort + 1;
+            }
             appName = config.appName;
             server = appConf.server;
             pIp = _server.ip.address();
-            pHost = server.protocol + "//" + pIp + ":" + appConf.port;
+            pHost = server.protocol + "//" + pIp + ":" + appConfPort;
             timeout = _config2.default.server.infoTimeout + 5000;
             commonHeaders = {};
 
@@ -128,7 +140,7 @@ exports.default = function () {
             };
 
             if (!server.generate.enabled) {
-              _context4.next = 25;
+              _context4.next = 28;
               break;
             }
 
@@ -248,14 +260,14 @@ exports.default = function () {
             }();
 
             if (_config2.default.security.isTire) {
-              _context4.next = 16;
+              _context4.next = 19;
               break;
             }
 
-            _context4.next = 16;
+            _context4.next = 19;
             return build();
 
-          case 16:
+          case 19:
             baseConfig = {
               // changeOrigin: true,
               secure: false,
@@ -288,6 +300,25 @@ exports.default = function () {
               });
             }
 
+            // if (yConf.security.isTire) {
+            //   app.use((req, res, next) => {
+            //     const ycp = paths.ykConfigJsonClient(config.appName);
+            //     if (req.method.toUpperCase() === 'GET' && req.path === `${config.appConf.server.basePathMU}cln/init.js`) {
+            //       // noCache(ctx);
+            //       global.__yk_cln_init_client__ = global.__yk_cln_init_client__ || paths.read(ycp.confClient)
+            //       res.setHeader('Content-Type', 'application/javascript; charset=utf-8')
+            //       res.status(200).send(global.__yk_cln_init_client__)
+            //     } else if (req.method.toUpperCase() === 'GET' && req.path === `${config.appConf.server.basePathMU}cln/ini`){
+            //       // noCache(ctx);
+            //       // clnInitCache(ctx)
+            //       global.__yk_cln_init_server__ = global.__yk_cln_init_server__ || paths.read(ycp.confServer)
+            //       res.status(200).send(global.__yk_cln_init_server__)
+            //     } else {
+            //       next();
+            //     }
+            //   })
+            // }
+
             app.use(function (req, res, next) {
               if (_config2.default.security.isTire) {
                 var data = (0, _secCache.secCacheGet)(getCacheKey(req.url));
@@ -385,7 +416,7 @@ exports.default = function () {
                           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, {
+                            (0, _curl.curl)("http://127.0.0.1:" + appConfPort + req.url, {
                               method: 'GET',
                               headers: {
                                 "Cookie": req.get("cookie"),
@@ -419,42 +450,63 @@ exports.default = function () {
               th = (_th = {}, (0, _defineProperty3.default)(_th, _def.variable.ipHeader, '127.0.0.1'), (0, _defineProperty3.default)(_th, _def.variable.childKeyHeader, _config2.default.childKey), (0, _defineProperty3.default)(_th, _def.variable.appCodeHeader, config.appConf.appCode), (0, _defineProperty3.default)(_th, _def.variable.appKeyHeader, config.appKey), (0, _defineProperty3.default)(_th, _def.variable.shareRuleHeader, (0, _stringify2.default)(_config2.default.shareRule)), _th);
               basePath = _server._.bothAddFix(config.appConf.server.basePath, "/");
 
-              app.use(basePath + "apiv1", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
-                target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
-                headers: th,
-                pathRewrite: (0, _defineProperty3.default)({}, "^" + basePath + "apiv1", "/" + _config2.default.proxyServer.apiKey + "/" + _config2.default.name + "/client/backend")
-              })));
-
-              app.use(basePath + "apiv2", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
-                target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
-                pathRewrite: (0, _defineProperty3.default)({}, "^" + basePath + "apiv2", "/apiv2")
-              })));
-
-              app.use(basePath + "apiv3", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
-                target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
-                pathRewrite: function () {
-                  var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(path, req) {
-                    return _regenerator2.default.wrap(function _callee3$(_context3) {
-                      while (1) {
-                        switch (_context3.prev = _context3.next) {
-                          case 0:
-                            return _context3.abrupt("return", (0, _conf.apiV3PathRewrite)(path));
-
-                          case 1:
-                          case "end":
-                            return _context3.stop();
+
+              if (_paths2.default.access(_config2.default.server.tire.guPath)) {
+                conf = (0, _conf.ng_conf)({
+                  appUrl: 'http://127.0.0.1:' + appConfPort,
+                  th: th,
+                  yk4Addr: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
+                  basePath: basePath,
+                  name: _config2.default.name,
+                  port: guPort,
+                  resolver: _config2.default.server.tire.resolver
+                });
+
+                _paths2.default.write(_config2.default.server.tire.clnConf, conf);
+                // spawn(yConf.server.tire.guPath, ['-c', yConf.server.tire.guConf]);
+
+                try {
+                  (0, _child_process.exec)(_config2.default.server.tire.guPath + ' -s stop');
+                } catch (e) {}
+                (0, _child_process.exec)(_config2.default.server.tire.guPath + ' -c ' + _config2.default.server.tire.guConf + ' -g "daemon off;"');
+              } else {
+                app.use(basePath + "apiv1", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
+                  target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
+                  headers: th,
+                  pathRewrite: (0, _defineProperty3.default)({}, "^" + basePath + "apiv1", "/" + _config2.default.proxyServer.apiKey + "/" + _config2.default.name + "/client/backend")
+                })));
+
+                app.use(basePath + "apiv2", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
+                  target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
+                  pathRewrite: (0, _defineProperty3.default)({}, "^" + basePath + "apiv2", "/apiv2")
+                })));
+
+                app.use(basePath + "apiv3", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
+                  target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
+                  pathRewrite: function () {
+                    var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(path, req) {
+                      return _regenerator2.default.wrap(function _callee3$(_context3) {
+                        while (1) {
+                          switch (_context3.prev = _context3.next) {
+                            case 0:
+                              return _context3.abrupt("return", (0, _conf.apiV3PathRewrite)(path));
+
+                            case 1:
+                            case "end":
+                              return _context3.stop();
+                          }
                         }
-                      }
-                    }, _callee3, this);
-                  }));
+                      }, _callee3, this);
+                    }));
 
-                  function pathRewrite(_x4, _x5) {
-                    return _ref6.apply(this, arguments);
-                  }
+                    function pathRewrite(_x4, _x5) {
+                      return _ref6.apply(this, arguments);
+                    }
 
-                  return pathRewrite;
-                }()
-              })));
+                    return pathRewrite;
+                  }()
+                })));
+              }
             }
 
             // let {main} = paths.appBuildDir(appName);
@@ -591,8 +643,8 @@ exports.default = function () {
                 });
               }
             })));
-            app.listen(config.appConf.port);
-            // const sv = app.listen(config.appConf.port);
+
+            app.listen(appConfPort);
             // sv.keepAliveTimeout = server.generate.keepAliveTimeout;
             // sv.headersTimeout = server.generate.headersTimeout;
 
@@ -602,7 +654,7 @@ exports.default = function () {
               }, server.generate.maxAge * 1000);
             }
 
-          case 25:
+          case 28:
           case "end":
             return _context4.stop();
         }

package/utils/inclusive.js

@@ -519,6 +519,12 @@ var render = function () {
                 stupid: {
                   referrerPolicy: { policy: "strict-origin-when-cross-origin" },
                   crossOriginResourcePolicy: { policy: "same-origin" }
+                },
+                tire: {
+                  guPath: '/nginx',
+                  guConf: '/etc/nginx/nginx.conf',
+                  clnConf: '/etc/nginx/conf.d/cln2.conf',
+                  resolve: ''
                 }
               },
               extend: {