yakuza0 2.22.34-beta.2 → 2.22.34-beta.20

package/nuxt/head.js

@@ -44,7 +44,7 @@ exports.default = function (config) {
 
   if (config.commonConfig.head !== false) {
     pkgHead = (0, _extends3.default)({}, _config2.default.nuxt && _config2.default.nuxt.head, {
-      script: [{ src: "/cln/init.js?info=" + (0, _yakuza.md5)(_config2.default.scKey).substring(2, 8) }].concat((0, _toConsumableArray3.default)(_config2.default.nuxt && _config2.default.nuxt.head && _config2.default.nuxt.head.script || []))
+      script: [{ src: "/cln/init.js?info=" + (0, _yakuza.md5)(_config2.default.scKey + config.appName).substring(2, 8) }].concat((0, _toConsumableArray3.default)(_config2.default.nuxt && _config2.default.nuxt.head && _config2.default.nuxt.head.script || []))
     });
   }
 

package/nuxt/plugins/init_client.js

@@ -28,12 +28,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 exports.default = function () {
   var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) {
-    var store, $yk, $ws, keys, cs, clientKey;
+    var store, $yk, $ws, app, keys, cs, clientKey;
     return _regenerator2.default.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            store = ctx.store, $yk = ctx.$yk, $ws = ctx.$ws;
+            store = ctx.store, $yk = ctx.$yk, $ws = ctx.$ws, app = ctx.app;
 
             // await set(ctx);
 
@@ -129,8 +129,13 @@ exports.default = function () {
           case 14:
 
             _yakuza.Cookies.remove(_config2.default.server.redirect.afkKey, { domain: $yk.appConf.cookieDomain });
+            app.router.afterEach(function (to, from) {
+              _yakuza.Cookies.remove(_config2.default.server.redirect.afkKey, { domain: $yk.appConf.cookieDomain });
+            });
+            // Cookies.set(yConf.server.stupid.v2023_12.aMark, "", {domain: $yk.appConf.cookieDomain})
+            $yk.firstRefresh = false;
 
-          case 15:
+          case 17:
           case 'end':
             return _context3.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.22.34-beta.2",
+  "version": "2.22.34-beta.20",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
@@ -112,13 +112,13 @@
     "ua-parser-js": "^0.7.20",
     "uglify-js": "^3.17.4",
     "v8-compile-cache": "^2.0.2",
-    "yakuza1": "^2.6.14"
+    "yakuza1": "^2.6.16"
   },
   "peerDependencies": {
     "@rdc/nuxt": "2.15.8",
     "core-js": "3.10.1",
     "eslint": "7.2.0",
-    "yakuza1": "^2.6.14"
+    "yakuza1": "^2.6.16"
   },
   "__npminstall_done": false
 }

package/server/cache/control.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useCache = exports.noCache = undefined;
+exports.clnInitCache = exports.useCache = exports.noCache = undefined;
 
 var _regenerator = require('babel-runtime/regenerator');
 
@@ -144,4 +144,12 @@ var useCache = exports.useCache = function useCache(ctx, options) {
   if (cacheControl.length) {
     ctx.set('Cache-Control', cacheControl.join(','));
   }
+};
+
+var clnInitCache = exports.clnInitCache = function clnInitCache(ctx) {
+  useCache(ctx, {
+    maxAge: 60 * 60 * 24 * 66, // 66天
+    sMaxAge: 60 * 60 * 24, // 1天
+    public: true
+  });
 };

package/server/index.js

@@ -344,7 +344,7 @@ exports.default = function () {
 
                       case 56:
 
-                        appHref.push('  - ' + key + ':   ' + _chalk2.default.cyan(_config2.default.server.host + ':' + options.config.appConf.port));
+                        appHref.push('  - ' + key + ':   ' + _chalk2.default.cyan((config.appConf.server && config.appConf.server.domain || _config2.default.server.host) + ':' + options.config.appConf.port));
 
                       case 57:
                       case 'end':

package/server/mode/normal.js

@@ -71,7 +71,7 @@ var server = function () {
             _config$appConf = config.appConf, host = _config$appConf.host, port = _config$appConf.port;
             proxyConf = (0, _conf2.default)();
             urls = {
-              localUrlForBrowser: _config2.default.server.protocol + '//' + host + ':' + port,
+              localUrlForBrowser: _config2.default.server.protocol + '//' + (config.appConf.server && config.appConf.server.domain || host) + ':' + port,
               lanUrlForTerminal: _config2.default.server.protocol + '//' + _address2.default.ip() + ':' + port
             };
 

package/server/proxy/conf.js

@@ -167,9 +167,18 @@ var serverHeaders = exports.serverHeaders = function serverHeaders(_ref4) {
   // console.log(nuxtAppConf.server.gray, 123);
   var appCode = req.headers[_def.variable.appCodeHeader.toLowerCase()] || nuxtAppConf.appCode;
   var adjoinIp = req.headers[_def.variable.adjoinIpHeader.toLowerCase()] || (0, _server.getClientIP)(req, { stupid: true }) || '127.0.0.1';
-  var isAfk = _server.Cookies.getByStr(_config2.default.server.redirect.afkKey, req.headers.cookie);
+  var isAfk = _server.Cookies.getByStr(_config2.default.server.redirect.afkKey, req.headers.cookie) === '';
+  // let v23_aMark = false;
+  // console.log(isAfk, 'isAfk');
+  // console.log(v2023_12_aMark, 'v2023_12_aMark');
+  // if (yConf.server.stupid.standard === 'v2023_12') {
+  //   v2023_12_aMark = Cookies.getByStr(yConf.server.stupid.v2023_12.aMark, req.headers.cookie) === '';
+  //   // console.log(v2023_12_aMark, 'v2023_12_aMark222');
+  // }
   // console.log(req.url, nuxtAppConf.server && nuxtAppConf.server.f5Offline, !isAfk, 666);
-  return _ref5 = {}, (0, _defineProperty3.default)(_ref5, _def.variable.isDevHeader, { data: conf.dev ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.akHeader, { data: conf.ak, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ipHeader, { data: (0, _server.getClientIP)(req, { stupid: false }) }), (0, _defineProperty3.default)(_ref5, _def.variable.adjoinIpHeader, { data: adjoinIp }), (0, _defineProperty3.default)(_ref5, _def.variable.svcKeyHeader, { data: nuxtAppConf.svcKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.domainHeader, { data: nuxtAppConf.domain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieHeader, { data: crossParams.cookie, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieDomainHeader, { data: crossParams.cookieDomain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieSameSiteHeader, { data: conf.server.cookieSameSite, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.appKeyHeader, { data: crossParams.nuxtAppKey }), (0, _defineProperty3.default)(_ref5, _def.variable.appNameHeader, { data: crossParams.nuxtAppName }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptSwitchHeader, { data: encryptSwitch, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptTypeHeader, { data: conf.security.encrypt, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.helmetHeader, { data: conf.security.helmet.toString(), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.projectNameHeader, { data: conf.name, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.shareRuleHeader, { data: (0, _stringify2.default)(conf.shareRule) }), (0, _defineProperty3.default)(_ref5, _def.variable.baseURLHeader, { data: baseURL, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.isHttpsHeader, { data: conf.https ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.appCodeHeader, { data: appCode, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.processKeyHeader, { data: conf.processKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.childKeyHeader, { data: conf.childKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.orbCsrfHeader, { data: verifyTk.csrf, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.f5OfflineHeader, { data: nuxtAppConf.server && nuxtAppConf.server.f5Offline && !isAfk, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.servicesHeader, { data: req.headers[_def.variable.servicesHeader], noWarn: true }), (0, _defineProperty3.default)(_ref5, 'Cookie', { data: _server.Cookies.setByStr((0, _defineProperty3.default)({}, _def.variable.orbCsrfCookie, verifyTk.csrf), req.headers.cookie), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ddosSwitchHeader, { data: crossParams.ddosSwitch || '', noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.yk0VersionHeader, { data: conf.version || '', noWarn: true }), _ref5;
+  return _ref5 = {}, (0, _defineProperty3.default)(_ref5, _def.variable.isDevHeader, { data: conf.dev ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.akHeader, { data: conf.ak, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ipHeader, { data: (0, _server.getClientIP)(req, { stupid: false }) }), (0, _defineProperty3.default)(_ref5, _def.variable.adjoinIpHeader, { data: adjoinIp }), (0, _defineProperty3.default)(_ref5, _def.variable.svcKeyHeader, { data: nuxtAppConf.svcKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.domainHeader, { data: nuxtAppConf.domain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieHeader, { data: crossParams.cookie, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieDomainHeader, { data: crossParams.cookieDomain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieSameSiteHeader, { data: conf.server.cookieSameSite, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.appKeyHeader, { data: crossParams.nuxtAppKey }), (0, _defineProperty3.default)(_ref5, _def.variable.appNameHeader, { data: crossParams.nuxtAppName }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptSwitchHeader, { data: encryptSwitch, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptTypeHeader, { data: conf.security.encrypt, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.helmetHeader, { data: conf.security.helmet.toString(), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.projectNameHeader, { data: conf.name, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.shareRuleHeader, { data: (0, _stringify2.default)(conf.shareRule) }), (0, _defineProperty3.default)(_ref5, _def.variable.baseURLHeader, { data: baseURL, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.isHttpsHeader, { data: conf.https ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.appCodeHeader, { data: appCode, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.processKeyHeader, { data: conf.processKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.childKeyHeader, { data: conf.childKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.orbCsrfHeader, { data: verifyTk.csrf, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.f5OfflineHeader, { data: nuxtAppConf.server && nuxtAppConf.server.f5Offline && !isAfk, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.servicesHeader, { data: req.headers[_def.variable.servicesHeader], noWarn: true }), (0, _defineProperty3.default)(_ref5, 'Cookie', { data: _server.Cookies.setByStr((0, _defineProperty3.default)({}, _def.variable.orbCsrfCookie, verifyTk.csrf), req.headers.cookie), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ddosSwitchHeader, { data: crossParams.ddosSwitch || '', noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.yk0VersionHeader, { data: conf.version || '', noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.stpV23Header, {
+    data: (0, _stringify2.default)(_config2.default.server.stupid.v23), noWarn: true
+  }), _ref5;
 };
 
 var apiV3PathRewrite = exports.apiV3PathRewrite = function apiV3PathRewrite(path) {
@@ -204,5 +213,5 @@ var ng_conf = exports.ng_conf = function ng_conf(_ref6) {
     resolver = 'resolver ' + _server._.trimEnd(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  ';
+  return '\n    ' + resolver + '\n\n    server {\n      listen       ' + port + ';\n      server_name  cln-tire.lan;\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 + 'apiv1/feapiv1 {\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/feapiv1;\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/csrf.js

@@ -8,6 +8,10 @@ var _keys = require('babel-runtime/core-js/object/keys');
 
 var _keys2 = _interopRequireDefault(_keys);
 
+var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
+
+var _defineProperty3 = _interopRequireDefault(_defineProperty2);
+
 var _regenerator = require('babel-runtime/regenerator');
 
 var _regenerator2 = _interopRequireDefault(_regenerator);
@@ -174,7 +178,7 @@ exports.default = function () {
   var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(_ref2) {
     var app = _ref2.app,
         config = _ref2.config;
-    var cspConnectSrcVerify, appCp, appCpApiV1, jwtVerC, omConf, helmetOptions, clnInitCache, cm;
+    var cspConnectSrcVerify, appCp, appCpApiV1, jwtVerC, omConf, helmetOptions, cm;
     return _regenerator2.default.wrap(function _callee13$(_context13) {
       while (1) {
         switch (_context13.prev = _context13.next) {
@@ -416,17 +420,6 @@ exports.default = function () {
             }());
 
             // cln init
-            _server.global.__yk_cln_init_client__ = '';
-            _server.global.__yk_cln_init_server__ = '';
-
-            clnInitCache = function clnInitCache(ctx) {
-              (0, _control.useCache)(ctx, {
-                maxAge: 60 * 60 * 24 * 66, // 66天
-                sMaxAge: 60 * 60 * 24, // 1天
-                public: true
-              });
-            };
-
             if (_config2.default.security.helmet && _config2.default.security.isStupid) {
               if (typeof _config2.default.server.csp.custom === "string") {
                 app.use(function () {
@@ -455,6 +448,9 @@ exports.default = function () {
               }
             }
 
+            _server.global.__yk_cln_init_client__ = (0, _defineProperty3.default)({}, config.appName, '');
+            _server.global.__yk_cln_init_server__ = (0, _defineProperty3.default)({}, config.appName, '');
+
             app.use(function () {
               var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx, next) {
                 var ycp;
@@ -471,10 +467,10 @@ exports.default = function () {
 
                         (0, _control.noCache)(ctx);
                         // clnInitCache(ctx)
-                        _server.global.__yk_cln_init_client__ = _server.global.__yk_cln_init_client__ || _paths2.default.read(ycp.confClient);
+                        _server.global.__yk_cln_init_client__[config.appName] = _server.global.__yk_cln_init_client__[config.appName] || _paths2.default.read(ycp.confClient);
                         // const str = paths.read(ycp.confClient);
                         ctx.status = 200;
-                        ctx.body = _server.global.__yk_cln_init_client__;
+                        ctx.body = _server.global.__yk_cln_init_client__[config.appName];
                         ctx.type = 'application/javascript; charset=utf-8';
                         _context3.next = 18;
                         break;
@@ -486,12 +482,12 @@ exports.default = function () {
                         }
 
                         // noCache(ctx);
-                        clnInitCache(ctx);
+                        (0, _control.clnInitCache)(ctx);
                         // const str = paths.read(ycp.confServer);
-                        _server.global.__yk_cln_init_server__ = _server.global.__yk_cln_init_server__ || _paths2.default.read(ycp.confServer);
+                        _server.global.__yk_cln_init_server__[config.appName] = _server.global.__yk_cln_init_server__[config.appName] || _paths2.default.read(ycp.confServer);
                         // global.__yk_cln_init_server__ = paths.read(ycp.confServer)
                         ctx.status = 200;
-                        ctx.body = _server.global.__yk_cln_init_server__;
+                        ctx.body = _server.global.__yk_cln_init_server__[config.appName];
                         _context3.next = 18;
                         break;
 
@@ -973,7 +969,7 @@ exports.default = function () {
               };
             }());
 
-          case 22:
+          case 21:
           case 'end':
             return _context13.stop();
         }

package/server/proxy/tire.js

@@ -92,7 +92,7 @@ exports.default = function () {
   var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(_ref) {
     var config = _ref.config;
 
-    var appConf, guPort, appConfPort, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _th, th, basePath, conf;
+    var appConf, guPort, appConfPort, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _th, th, basePath, conf, _pathRewrite;
 
     return _regenerator2.default.wrap(function _callee4$(_context4) {
       while (1) {
@@ -304,13 +304,13 @@ exports.default = function () {
             //   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);
+            //       noCache(res);
             //       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)
+            //       clnInitCache(res)
             //       global.__yk_cln_init_server__ = global.__yk_cln_init_server__ || paths.read(ycp.confServer)
             //       res.status(200).send(global.__yk_cln_init_server__)
             //     } else {
@@ -447,6 +447,10 @@ exports.default = function () {
             });
 
             if (_config2.default.security.isTire) {
+              try {
+                (0, _child_process.exec)(_config2.default.server.tire.guPath + ' -s stop');
+                // spawn(yConf.server.tire.guPath, ['-s', 'stop']);
+              } catch (e) {}
               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, "/");
 
@@ -463,17 +467,13 @@ exports.default = function () {
                 });
 
                 _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;"');
+                // spawn(yConf.server.tire.guPath, ['-c', yConf.server.tire.guConf]);
               } 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")
+                  pathRewrite: (_pathRewrite = {}, (0, _defineProperty3.default)(_pathRewrite, "^" + basePath + "apiv1/feapiv1", "/" + _config2.default.proxyServer.apiKey + "/" + _config2.default.name + "/client/feapiv1"), (0, _defineProperty3.default)(_pathRewrite, "^" + basePath + "apiv1", "/" + _config2.default.proxyServer.apiKey + "/" + _config2.default.name + "/client/backend"), _pathRewrite)
                 })));
 
                 app.use(basePath + "apiv2", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {

package/template/redirect.plugin.js

@@ -8,12 +8,13 @@ const setCookie = (key, value, options) => {
   }
 
   if (checkServer()) {
-    let cs = `${key}=${value}`
+    let cs = `${key}=${value}`;
     if (opt.domain) {
       cs += '; Domain=' + opt.domain
     }
     if (opt.res) {
-      opt.res.setHeader('Set-Cookie', [cs]);
+      const rc = opt.res.getHeader && opt.res.getHeader('Set-Cookie');
+      opt.res.setHeader('Set-Cookie', [cs, ...(_.isArray(rc) ? rc : [])]);
     }
   } else {
     Cookies.set(key, value, {domain: opt.domain})
@@ -22,6 +23,39 @@ const setCookie = (key, value, options) => {
 
 export default async (ctx, inject) => {
   const {redirect, $yk, req, res} = ctx
+  const appName = $yk.appName;
+
+  const matchLocal = (url) => {
+    if (typeof url === 'string') {
+      let isMatch = false;
+      let hostname = _.cloneDeep($yk.hostname);
+      const trimPrefix = $yk.hostname && $yk.hostname[appName] && $yk.hostname[appName].value || '__prefix';
+      const basePath = $yk.appConf.server.basePath;
+      if (_.startsWith(url, trimPrefix)) {
+        isMatch = true;
+      }
+      if (basePath === '/') {
+        hostname = _.omit(hostname, appName);
+
+        for (const ap in hostname) {
+          if (_.startsWith(url, hostname[ap].value)) {
+            isMatch = false
+            break;
+          }
+        }
+      }
+
+      if (isMatch) {
+        url = _.replace(url, trimPrefix, '');
+
+        if (!url.startsWith('/')) {
+          url = '/' + url
+        }
+      }
+    }
+
+    return url;
+  }
 
   const $redirect = (...args) => {
     let url = args[0]
@@ -36,16 +70,18 @@ export default async (ctx, inject) => {
     }
     let prefix = '';
 
-    setCookie(yConf.server.redirect.afkKey, "true", {res, domain: $yk.appConf.cookieDomain})
+    if (!$yk.firstRefresh) {
+      setCookie(yConf.server.redirect.afkKey, '', {res, domain: $yk.appConf.cookieDomain})
+    }
 
     if (typeof url === 'string') {
+      url = matchLocal(url);
       const parse = _.urlParse(url)
 
       if (parse.host) {
         isOuter = true;
         prefix = parse.protocols ? parse.protocols : 'http://'
       }
-
       url = prefix + parse.crop
     }
 

package/template/yk.plugin.js

@@ -43,6 +43,7 @@ export default async (ctx, inject) => {
     fe: conf.fe,
     standAlone: appConf.standAlone,
     dkyMode: yConf.dkyMode,
+    firstRefresh: true,
     // finger: '16',
     browser: { key: '16' },
     hostname: {},

package/utils/inclusive.js

@@ -303,7 +303,7 @@ var render = function () {
 
                 // docker: false,
                 mockIP: false,
-                f5Offline: false,
+                f5Offline: undefined,
                 passphrase: '',
                 orbProtocol: {
                   ws: 'ws:',
@@ -518,10 +518,16 @@ var render = function () {
                 },
                 stupid: {
                   referrerPolicy: { policy: "strict-origin-when-cross-origin" },
-                  crossOriginResourcePolicy: { policy: "same-origin" }
+                  crossOriginResourcePolicy: { policy: "same-origin" },
+                  standard: "v23", // v13
+                  v23: {
+                    // aMark: '__cfo_complete_',
+                    enabled: true,
+                    threshold: 2000
+                  }
                 },
                 tire: {
-                  guPath: '/nginx',
+                  guPath: '/gu',
                   guConf: '/etc/nginx/nginx.conf',
                   clnConf: '/etc/nginx/conf.d/cln2.conf',
                   resolve: ''
@@ -791,41 +797,40 @@ var render = function () {
 
           case 28:
             _context2.t1 = conf.dkyMode;
-            _context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ? 34 : _context2.t1 === "prod" ? 37 : _context2.t1 === "stupid" ? 43 : _context2.t1 === "tire" ? 53 : 59;
+            _context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ? 35 : _context2.t1 === "prod" ? 39 : _context2.t1 === "stupid" ? 46 : _context2.t1 === "tire" ? 56 : 63;
             break;
 
           case 31:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
-            // conf.server.f5Offline = false;
+            conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
             conf.security.isDev = true;
             conf.dev = true;
-            return _context2.abrupt('break', 59);
+            return _context2.abrupt('break', 63);
 
-          case 34:
+          case 35:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
-            // conf.server.f5Offline = false;
+            conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
             conf.security.isNormal = true;
             conf.dev = false;
-            return _context2.abrupt('break', 59);
+            return _context2.abrupt('break', 63);
 
-          case 37:
+          case 39:
             conf.security.encrypt = "sm";
             conf.security.stupid = false;
             conf.security.helmet = true;
-            // conf.server.f5Offline = false;
+            conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
             conf.security.isProd = true;
             conf.dev = false;
-            return _context2.abrupt('break', 59);
+            return _context2.abrupt('break', 63);
 
-          case 43:
+          case 46:
             conf.security.encrypt = "sm";
             conf.security.stupid = true;
             conf.security.helmet = true;
-            // conf.server.f5Offline = false;
             conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, true);
             conf.security.isStupid = true;
             conf.server.csp.enabled = true;
@@ -833,21 +838,22 @@ var render = function () {
             conf.server.csp.decoration = checkBoolSingle(conf.server.csp.decoration, true);
             conf.server.sri.enabled = true;
             // conf.dev = false;
-            return _context2.abrupt('break', 59);
+            return _context2.abrupt('break', 63);
 
-          case 53:
+          case 56:
             conf.security.encrypt = "none";
             conf.security.stupid = false;
             conf.security.helmet = false;
-            // conf.server.f5Offline = false;
+            conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
             conf.security.isTire = true;
             // conf.server.heartbeat.enabled = checkBoolSingle(conf.server.heartbeat.enabled, false);
             conf.server.heartbeat.enabled = false;
             // conf.dev = false;
-            return _context2.abrupt('break', 59);
+            return _context2.abrupt('break', 63);
 
-          case 59:
+          case 63:
 
+            conf.server.stupid.v23.enabled = conf.server.stupid.standard === 'v23';
             // conf.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
               conf.server.orbAddr = conf.server.yk4Addr;
@@ -946,7 +952,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 80;
+            _context2.next = 85;
             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;
@@ -1131,7 +1137,7 @@ var render = function () {
               };
             }());
 
-          case 80:
+          case 85:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1253,7 +1259,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 91:
+          case 96:
           case 'end':
             return _context2.stop();
         }

package/utils/secret.js

@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.set = undefined;
 
-var _defineProperty2 = require("babel-runtime/helpers/defineProperty");
-
-var _defineProperty3 = _interopRequireDefault(_defineProperty2);
-
 var _stringify = require("babel-runtime/core-js/json/stringify");
 
 var _stringify2 = _interopRequireDefault(_stringify);
 
-var _extends2 = require("babel-runtime/helpers/extends");
+var _extends3 = require("babel-runtime/helpers/extends");
 
-var _extends3 = _interopRequireDefault(_extends2);
+var _extends4 = _interopRequireDefault(_extends3);
+
+var _defineProperty2 = require("babel-runtime/helpers/defineProperty");
+
+var _defineProperty3 = _interopRequireDefault(_defineProperty2);
 
 var _promise = require("babel-runtime/core-js/promise");
 
@@ -155,23 +155,33 @@ var toLowerObjKey = function toLowerObjKey(data) {
   });
 };
 
-var setAfkCookie = function setAfkCookie(req, oc) {
-  var afk = '';
+var addCookieStr = function addCookieStr(req, oc, key) {
+  var match = '';
   if ((0, _yakuza.checkServer)() && req && req.headers && req.headers.cookie) {
-    afk = _yakuza.Cookies.getByStr(_config2.default.server.redirect.afkKey, req.headers.cookie);
+    match = _yakuza.Cookies.getByStr(key, req.headers.cookie);
   } else {
-    afk = _yakuza.Cookies.get(_config2.default.server.redirect.afkKey);
+    match = _yakuza.Cookies.get(key);
   }
 
-  if (afk) {
-    var rs = _config2.default.server.redirect.afkKey + "=true";
-    if (oc) {
-      oc += rs;
+  if (match === '') {
+    var rs = key + "=";
+    if (typeof oc === "string" && oc.length > 0) {
+      if (oc.endsWith(";") || oc.endsWith("; ")) {
+        oc += rs;
+      } else {
+        oc += '; ' + rs;
+      }
     } else {
       oc = rs;
     }
   }
-  return oc || '';
+  return oc;
+};
+
+var setOfflineCookie = function setOfflineCookie(req, oc) {
+  oc = addCookieStr(req, oc, _config2.default.server.redirect.afkKey);
+  // oc = addCookieStr(req, oc, yConf.server.stupid.v2023_12.aMark)
+  return oc;
 };
 
 var set = exports.set = function set(_ref3) {
@@ -185,7 +195,8 @@ var set = exports.set = function set(_ref3) {
 
   return new _promise2.default(function () {
     var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(resolve, reject) {
-      var w, mixin, yc, hostname, spiData, spi, spiQuery, spiSecret, parser, setUniversal, ucResC, timeout, universalBody, getUc, getSvcInSsrWithServer, getSvc;
+      var w, mixin, yc, f5OfflineHeaders, _f5OfflineHeaders, hostname, spiData, spi, spiQuery, spiSecret, parser, setUniversal, ucResC, timeout, universalBody, getUc, getSvcInSsrWithServer, getSvc;
+
       return _regenerator2.default.wrap(function _callee9$(_context9) {
         while (1) {
           switch (_context9.prev = _context9.next) {
@@ -198,9 +209,14 @@ var set = exports.set = function set(_ref3) {
 
               yc.proxyServer = $yk.proxyServer;
               _yakuza._.readOnly(_yakuza.global, '__yk_conf__', yc);
+              f5OfflineHeaders = {};
+
+              if ((0, _yakuza.checkServer)()) {
+                f5OfflineHeaders = (_f5OfflineHeaders = {}, (0, _defineProperty3.default)(_f5OfflineHeaders, _def.variable.f5OfflineHeader, $yk.server.f5Offline), (0, _defineProperty3.default)(_f5OfflineHeaders, _def.variable.stpV23Header, _config2.default.server.stupid.v23), _f5OfflineHeaders);
+              }
 
               if ($yk.standAlone) {
-                _context9.next = 28;
+                _context9.next = 30;
                 break;
               }
 
@@ -224,6 +240,15 @@ var set = exports.set = function set(_ref3) {
               _yakuza._.readOnly($yk.api.v3, 'secretKey', spiSecret);
               parser = new _uaParserJs2.default();
 
+              // if (!checkServer()) {
+              //   window.addEventListener('unload', async () => {
+              //     // 执行一些清理工作或显示警告
+              //     var message = '您有未保存的更改，确定要离开吗？';
+              //     event.returnValue = message; // 兼容旧版浏览器
+              //     return message;
+              //   });
+              // }
+
               setUniversal = function setUniversal() {
                 if (spiData && spiData.SpiCgiBinData) {
                   _yakuza._.readOnly($yk.api.v3, 'cgiBin', spiData.SpiCgiBinData, {
@@ -236,7 +261,7 @@ var set = exports.set = function set(_ref3) {
                 });
 
                 var result = parser.getResult();
-                $yk.browser = (0, _extends3.default)({}, $yk.browser, {
+                $yk.browser = (0, _extends4.default)({}, $yk.browser, {
                   type: result.browser.name + parseInt(result.browser.version, 10)
                 }, _yakuza._.omit(result, ['browser', 'ua']));
                 _yakuza.global.browserKey = $yk.browser.key;
@@ -262,7 +287,7 @@ var set = exports.set = function set(_ref3) {
               };
 
               if (!w) {
-                _context9.next = 28;
+                _context9.next = 30;
                 break;
               }
 
@@ -285,7 +310,7 @@ var set = exports.set = function set(_ref3) {
                             break;
                           }
 
-                          ucBody = (0, _extends3.default)({}, universalBody, {
+                          ucBody = (0, _extends4.default)({}, universalBody, {
                             childKey: _config2.default.childKey
                           });
                           _spi = $yk.appConf.spi;
@@ -294,7 +319,7 @@ var set = exports.set = function set(_ref3) {
                             _spiQuery = _yakuza.qs.stringify($yk.appConf.spi || {});
                             _spiSecret = mixin.getKey(_spiQuery);
 
-                            ucBody = (0, _extends3.default)({}, ucBody, {
+                            ucBody = (0, _extends4.default)({}, ucBody, {
                               spiSecret: _spiSecret
                             }, _spi);
                           }
@@ -312,10 +337,10 @@ var set = exports.set = function set(_ref3) {
 
                           Cookie = _yakuza.Cookies.koaGetCookieStr({ req: req });
 
-                          Cookie = setAfkCookie(req, Cookie);
-                          ucHeaders = (0, _defineProperty3.default)({
+                          Cookie = setOfflineCookie(req, Cookie);
+                          ucHeaders = (0, _extends4.default)((0, _defineProperty3.default)({
                             Cookie: Cookie
-                          }, _def.variable.clientKeyHeader, mixin.symmetry.CBC.encrypt((0, _yakuza.md5)((0, _yakuza.uuid)())));
+                          }, _def.variable.clientKeyHeader, mixin.symmetry.CBC.encrypt((0, _yakuza.md5)((0, _yakuza.uuid)()))), f5OfflineHeaders);
                           _context4.prev = 11;
                           hs = "Set-Cookie";
                           _context4.next = 15;
@@ -370,18 +395,18 @@ var set = exports.set = function set(_ref3) {
                           }
 
                           svcRes = {};
-                          ssrBody = (0, _extends3.default)({}, universalBody, {
+                          ssrBody = (0, _extends4.default)({}, universalBody, {
                             appName: $yk.appName
                           });
 
-                          ucResC = setAfkCookie(req, ucResC);
+                          ucResC = setOfflineCookie(req, ucResC);
                           _context5.prev = 4;
                           _context5.next = 7;
                           return _universal2.default.post($yk.origin + "/apiv2/support/svc/svcInSsrWithServer", {
                             json: ssrBody,
-                            headers: {
+                            headers: (0, _extends4.default)({
                               Cookie: ucResC
-                            },
+                            }, f5OfflineHeaders),
                             timeout: timeout
                           });
 
@@ -402,7 +427,7 @@ var set = exports.set = function set(_ref3) {
                           _context5.t0 = _context5["catch"](4);
 
                         case 16:
-                          data = (0, _extends3.default)({}, svcRes && svcRes.data);
+                          data = (0, _extends4.default)({}, svcRes && svcRes.data);
 
                           if (_yakuza._.isPlainObject(data.hostname)) {
                             hostname = data.hostname;
@@ -427,14 +452,14 @@ var set = exports.set = function set(_ref3) {
 
               getSvc = function () {
                 var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
-                  var finger, _require, fingerprint, secretBody, secretData, secretReq, setData, setFinger, query;
+                  var finger, _require, fingerprint, secretBody, secretData, secretReq, setData, setFinger, query, ping;
 
                   return _regenerator2.default.wrap(function _callee8$(_context8) {
                     while (1) {
                       switch (_context8.prev = _context8.next) {
                         case 0:
                           if ((0, _yakuza.checkServer)()) {
-                            _context8.next = 29;
+                            _context8.next = 30;
                             break;
                           }
 
@@ -453,12 +478,13 @@ var set = exports.set = function set(_ref3) {
                           finger = _context8.sent;
 
                         case 7:
-                          secretBody = (0, _extends3.default)({
+                          secretBody = (0, _extends4.default)({
                             svcKey: $yk.server.svcKey,
                             finger: finger,
                             timestamp: (0, _yakuza.dayjs)().unix()
                           }, spi, {
-                            spiSecret: spiSecret
+                            spiSecret: spiSecret,
+                            offline: 0
                           });
                           secretData = {};
 
@@ -512,7 +538,7 @@ var set = exports.set = function set(_ref3) {
 
                           setData = function setData(options) {
                             secretData = secretData || {};
-                            var opt = (0, _extends3.default)({
+                            var opt = (0, _extends4.default)({
                               writable: true
                             }, options);
                             $yk.browser = toLowerObjKey(secretData.Browser || {});
@@ -563,7 +589,7 @@ var set = exports.set = function set(_ref3) {
                           };
 
                           if (!_config2.default.server.heartbeat.enabled) {
-                            _context8.next = 26;
+                            _context8.next = 27;
                             break;
                           }
 
@@ -586,11 +612,12 @@ var set = exports.set = function set(_ref3) {
                                       case 2:
                                         secretData = _context7.sent;
 
+                                        secretBody.offline = 0;
 
                                         setData();
                                         setFinger();
 
-                                      case 5:
+                                      case 6:
                                       case "end":
                                         return _context7.stop();
                                     }
@@ -607,39 +634,40 @@ var set = exports.set = function set(_ref3) {
                           });
 
                         case 17:
-                          _context8.next = 24;
+                          ping = _context8.sent;
+                          _context8.next = 25;
                           break;
 
-                        case 19:
-                          _context8.prev = 19;
+                        case 20:
+                          _context8.prev = 20;
                           _context8.t0 = _context8["catch"](14);
-                          _context8.next = 23;
+                          _context8.next = 24;
                           return secretReq();
 
-                        case 23:
+                        case 24:
                           setData();
 
-                        case 24:
-                          _context8.next = 29;
+                        case 25:
+                          _context8.next = 30;
                           break;
 
-                        case 26:
-                          _context8.next = 28;
+                        case 27:
+                          _context8.next = 29;
                           return secretReq();
 
-                        case 28:
+                        case 29:
                           setData();
 
-                        case 29:
+                        case 30:
 
                           setUniversal();
 
-                        case 30:
+                        case 31:
                         case "end":
                           return _context8.stop();
                       }
                     }
-                  }, _callee8, undefined, [[14, 19]]);
+                  }, _callee8, undefined, [[14, 20]]);
                 }));
 
                 return function getSvc() {
@@ -647,18 +675,18 @@ var set = exports.set = function set(_ref3) {
                 };
               }();
 
-              _context9.next = 24;
-              return getUc();
-
-            case 24:
               _context9.next = 26;
-              return getSvcInSsrWithServer();
+              return getUc();
 
             case 26:
               _context9.next = 28;
-              return getSvc();
+              return getSvcInSsrWithServer();
 
             case 28:
+              _context9.next = 30;
+              return getSvc();
+
+            case 30:
             case "end":
               return _context9.stop();
           }