yakuza0 2.22.39-beta.0 → 2.22.39-beta.2

package/package.json

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

package/template/http.plugin.js

@@ -7,7 +7,7 @@ import urlib from 'yakuza1/lib/http';
 
 global.__yk_gu__ = global.__yk_gu__ || {};
 export default (ctx, inject) => {
-  const {$yk, req, $utils} = ctx;
+  const {$yk, req, $utils, route} = ctx;
   const cookieStr = Cookies.koaGetCookieStr({req});
   const options = JSON.parse('<%= options %>');
 
@@ -70,7 +70,15 @@ export default (ctx, inject) => {
         defaults.headers[variable.forwardedForHeader] = req.headers[variable.forwardedForHeader];
 
         if (!req.headers.Cookie || (typeof req.headers.Cookie === "string" && req.headers.Cookie.indexOf(variable.csrfCookie) === -1)) {
-          defaults.headers.Cookie = global.__http_bd__;
+          if (route.query && route.query.ticket) {
+            if (global.__http_bd__[route.query.ticket]) {
+              if (typeof req.headers.Cookie === "string" && req.headers.Cookie.length > 0) {
+                defaults.headers.Cookie = req.headers.Cookie + '; ' + global.__http_bd__[route.query.ticket].ucResC;
+              } else {
+                defaults.headers.Cookie = global.__http_bd__[route.query.ticket].ucResC;
+              }
+            }
+          }
         }
       }
     }

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__ = _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',
@@ -311,7 +311,7 @@ var set = exports.set = function set(_ref3) {
                       switch (_context4.prev = _context4.next) {
                         case 0:
                           if (!((0, _yakuza.checkServer)() || !$yk.appConf.ssr)) {
-                            _context4.next = 23;
+                            _context4.next = 22;
                             break;
                           }
 
@@ -347,57 +347,54 @@ var set = exports.set = function set(_ref3) {
                             Cookie: Cookie
                           }, _def.variable.clientKeyHeader, mixin.symmetry.CBC.encrypt((0, _yakuza.md5)((0, _yakuza.uuid)())));
                           _context4.prev = 11;
-
-                          _yakuza.global.__http_bd__ = '';
                           hs = "Set-Cookie";
-                          _context4.next = 16;
+                          _context4.next = 15;
                           return _universal2.default.post(($yk.appConf.ssr ? $yk.origin + '/' : $yk.server.basePathMU) + "apiv2/support/svc/uc", {
                             body: bodyStr,
                             headers: ucHeaders,
                             timeout: timeout
                           });
 
-                        case 16:
+                        case 15:
                           rs = _context4.sent;
                           resCookie = rs.headers.get(hs);
 
                           if (resCookie) {
-                            ucResC = _yakuza._.compact(resCookie.split(',').map(function (r) {
+                            resCookieArr = resCookie.split(',');
+
+                            ucResC = _yakuza._.compact(resCookieArr.map(function (r) {
                               var rt = r.substring(0, r.indexOf(";"));
                               var at = rt.split("=");
                               return at[1] ? rt : false;
-                            })).join(";");
-                            resCookieArr = resCookie.split(',');
-
-
-                            resCookieArr.forEach(function (r) {
-                              var single_rc = r.split(';');
-                              if (single_rc.length > 0) {
-                                var single_bd = single_rc[0].split(_def.variable.csrfCookie)[1];
-                                if (single_bd.length > 2) {
-                                  if (_yakuza.global.__http_bd__) {
-                                    _yakuza.global.__http_bd__ += '; ';
-                                  }
-
-                                  _yakuza.global.__http_bd__ += _yakuza._.trim(single_rc[0]);
-                                }
+                            })).join("; ");
+                            if (route.query && route.query.ticket) {
+                              if (_yakuza.global.__http_bd__[route.query.ticket]) {
+                                res.setHeader(hs, _yakuza.global.__http_bd__[route.query.ticket].resCookieArr);
+                                ucResC = _yakuza.global.__http_bd__[route.query.ticket].ucResC;
+                              } else {
+                                _yakuza.global.__http_bd__[route.query.ticket] = {
+                                  resCookieArr: resCookieArr,
+                                  ucResC: ucResC
+                                };
+                                res.setHeader(hs, resCookieArr);
                               }
-                            });
-                            res.setHeader(hs, resCookieArr);
+                            } else {
+                              res.setHeader(hs, resCookieArr);
+                            }
                           }
-                          _context4.next = 23;
+                          _context4.next = 22;
                           break;
 
-                        case 21:
-                          _context4.prev = 21;
+                        case 20:
+                          _context4.prev = 20;
                           _context4.t0 = _context4["catch"](11);
 
-                        case 23:
+                        case 22:
                         case "end":
                           return _context4.stop();
                       }
                     }
-                  }, _callee4, undefined, [[11, 21]]);
+                  }, _callee4, undefined, [[11, 20]]);
                 }));
 
                 return function getUc() {