yakuza0 2.22.39-beta.4 → 2.22.39-beta.6

package/package.json

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

package/template/http.plugin.js

@@ -77,12 +77,17 @@ export default (ctx, inject) => {
           // }
           if (route.query.ticket || route.query.__isc) {
             const __isc = route.query.ticket ? md5(route.query.ticket).substring(0, 6) : route.query.__isc
-            if (global.__http_bd__[__isc]) {
+            if (global.__http_bd__ && global.__http_bd__[__isc] && global.__http_bd__[__isc].ucResC) {
+              let defC = defaults.headers.Cookie || '';
+              if (defC && defC.length > 0) {
+                defC += '; '
+              }
               if (typeof req.headers.Cookie === "string" && req.headers.Cookie.length > 0) {
-                defaults.headers.Cookie = req.headers.Cookie + '; ' + global.__http_bd__[__isc].ucResC;
+                defC = defC + global.__http_bd__[__isc].ucResC;
               } else {
-                defaults.headers.Cookie = global.__http_bd__[__isc].ucResC;
+                defC = defC + global.__http_bd__[__isc].ucResC;
               }
+              defaults.headers.Cookie = defC;
             }
           }
         }

package/utils/secret.js

@@ -62,7 +62,7 @@ var secret = {};
 // import {asymmetric, getKey, symmetry} from "yakuza1/lib/encrypt/sm";
 
 _yakuza.global.__yk_gu__ = _yakuza.global.__yk_gu__ || {};
-_yakuza.global.__http_bd__ = _yakuza.global.__http_bd__ || {};
+_yakuza.global.__http_bd__ = {};
 
 // const allowHeaders = {
 //   'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36',
@@ -191,12 +191,12 @@ var set = exports.set = function set(_ref3) {
       req = _ref3.req,
       res = _ref3.res,
       route = _ref3.route,
-      $redirect = _ref3.$redirect,
+      redirect = _ref3.redirect,
       store = _ref3.store;
 
   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, hostname, spiData, spi, spiQuery, spiSecret, parser, setUniversal, ucResC, timeout, universalBody, getUc, getSvcInSsrWithServer, getSvc, q, ci;
       return _regenerator2.default.wrap(function _callee9$(_context9) {
         while (1) {
           switch (_context9.prev = _context9.next) {
@@ -221,7 +221,7 @@ var set = exports.set = function set(_ref3) {
               }
 
               if ($yk.standAlone) {
-                _context9.next = 29;
+                _context9.next = 30;
                 break;
               }
 
@@ -292,7 +292,7 @@ var set = exports.set = function set(_ref3) {
               };
 
               if (!w) {
-                _context9.next = 29;
+                _context9.next = 30;
                 break;
               }
 
@@ -715,6 +715,59 @@ var set = exports.set = function set(_ref3) {
               return getSvc();
 
             case 29:
+
+              if (route.query.__isc) {
+                q = _yakuza._.omit(route.query, ['__isc']);
+                // route.query.__isc = ''
+                // console.log(route.path, q, 2222);
+                // const fu = location.href.replace('__isc=' + route.query.__isc ,'')
+                // // console.log(fu, 221);
+                // history.pushState(q, "", location.href.split('?')[0]);
+                // history.pushState(q, "", route.path);
+
+                ci = setInterval(function () {
+                  // history.replaceState(q, '', route.path)
+                  if (location.href.indexOf("__isc") !== -1) {
+                    history.pushState(q, "", location.href.split('?')[0]);
+                  }
+                }, 100);
+
+                setTimeout(function () {
+                  clearInterval(ci);
+                }, 10000);
+                // const a = route.path + '?' + qs.stringify(q)
+                // console.log(a);
+                // console.log(route.path, q, 111);
+                // redirect(location.href.split('?')[0], q)
+              }
+              // if (!checkServer() && yConf.security.isStupid) {
+              //   function sc() {
+              //     const sc = Cookies.get('__sc')
+              //     if (!sc) {
+              //       Cookies.set('__sc', gPwd(), { expires: 7 });
+              //     }
+              //   }
+              //
+              //   const main = document.getElementsByTagName('body')[0]
+              //   main.onkeydown = sc;
+              //   main.myKeyUp = sc;
+              //   main.onclick = sc;
+              //   main.ondblclick = sc;
+              //   main.onmousedown = sc;
+              //   main.onmouseover = sc;
+              //   main.onmousemove = sc;
+              //   main.onmouseenter = sc;
+              //   main.onmouseup = sc;
+              //   main.onmouseout = sc;
+              //   main.onmouseleave = sc;
+              //   if (document.addEventListener) {
+              //     document.addEventListener('DOMMouseScroll', sc, false);
+              //   }//W3C
+              //   window.onmousewheel = document.onmousewheel = sc
+              //   document.onmousemove = sc
+              // }
+
+            case 30:
             case "end":
               return _context9.stop();
           }