yakuza0 2.22.34-beta.13 → 2.22.34-beta.15

package/nuxt/plugins/init_client.js

@@ -129,8 +129,9 @@ exports.default = function () {
           case 14:
 
             _yakuza.Cookies.remove(_config2.default.server.redirect.afkKey, { domain: $yk.appConf.cookieDomain });
+            $yk.firstRefresh = false;
 
-          case 15:
+          case 16:
           case 'end':
             return _context3.stop();
         }

package/package.json

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

package/template/redirect.plugin.js

@@ -22,6 +22,7 @@ const setCookie = (key, value, options) => {
 
 export default async (ctx, inject) => {
   const {redirect, $yk, req, res} = ctx
+  const appName = $yk.appName;
 
   const $redirect = (...args) => {
     let url = args[0]
@@ -39,13 +40,20 @@ export default async (ctx, inject) => {
     setCookie(yConf.server.redirect.afkKey, "true", {res, domain: $yk.appConf.cookieDomain})
 
     if (typeof url === 'string') {
+      const trimPrefix = $yk.hostname && $yk.hostname[appName] && $yk.hostname[appName].value || '__prefix';
+      if (_.startsWith(url, trimPrefix)) {
+        url = _.replace(url, trimPrefix, '');
+
+        if (!url.startsWith('/')) {
+          url = '/' + 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:',
@@ -791,41 +791,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,20 +832,20 @@ 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.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
@@ -946,7 +945,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 80;
+            _context2.next = 84;
             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 +1130,7 @@ var render = function () {
               };
             }());
 
-          case 80:
+          case 84:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1253,7 +1252,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 91:
+          case 95:
           case 'end':
             return _context2.stop();
         }