yakuza0 2.23.26-beta.1 → 2.23.26-beta.3

package/nuxt/store/init.js

@@ -3,6 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.actions = exports.mutations = exports.state = exports.namespaced = undefined;
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var namespaced = exports.namespaced = true;
 var state = exports.state = function state() {
   return {
@@ -10,12 +18,16 @@ var state = exports.state = function state() {
       group: '',
       name: '',
       ver: ''
-    }
+    },
+    extendHeaders: {}
   };
 };
 var mutations = exports.mutations = {
   SET_GU: function SET_GU(state, gu) {
     state.gu = gu;
+  },
+  SET_EXTEND_HEADERS: function SET_EXTEND_HEADERS(state, extendHeaders) {
+    state.extendHeaders = (0, _extends3.default)({}, state.extendHeaders, extendHeaders);
   }
 };
 var actions = exports.actions = {
@@ -23,5 +35,10 @@ var actions = exports.actions = {
     var commit = _ref.commit;
 
     commit('SET_GU', gu);
+  },
+  setExtendHeaders: function setExtendHeaders(_ref2, extendHeaders) {
+    var commit = _ref2.commit;
+
+    commit('SET_EXTEND_HEADERS', extendHeaders);
   }
 };

package/package.json

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

package/template/yk.plugin.js

@@ -55,6 +55,8 @@ export default async (ctx, inject) => {
       svcKey: appConf.svcKey,
       f5Offline: conf.server && conf.server.f5Offline,
       tfs,
+      extendHeaders: {},
+      geo: {},
     },
     api: {v3: {}},
     encrypt: conf.security && conf.security.encrypt,

package/utils/secret.js

@@ -13,6 +13,14 @@ var _stringify = require("babel-runtime/core-js/json/stringify");
 
 var _stringify2 = _interopRequireDefault(_stringify);
 
+var _slicedToArray2 = require("babel-runtime/helpers/slicedToArray");
+
+var _slicedToArray3 = _interopRequireDefault(_slicedToArray2);
+
+var _entries = require("babel-runtime/core-js/object/entries");
+
+var _entries2 = _interopRequireDefault(_entries);
+
 var _extends2 = require("babel-runtime/helpers/extends");
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -169,7 +177,7 @@ 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, clientIp, spi, spiQuery, spiSecret, parser, setUniversal, ucResC, timeout, universalBody, getUc, getSvcInSsrWithServer, getSvc;
+      var w, mixin, yc, hostname, spiData, clientIp, geo, 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,7 +206,7 @@ var set = exports.set = function set(_ref3) {
                 break;
               }
 
-              hostname = {}, spiData = {}, clientIp = {};
+              hostname = {}, spiData = {}, clientIp = {}, geo = {};
               spi = $yk.appConf.spi;
 
               $yk.api.v3.ready = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
@@ -242,6 +250,10 @@ var set = exports.set = function set(_ref3) {
                   writable: true
                 });
 
+                _yakuza._.readOnly($yk.server, 'geo', geo, {
+                  writable: true
+                });
+
                 var result = parser.getResult();
                 $yk.browser = (0, _extends3.default)({}, $yk.browser, {
                   type: result.browser.name + parseInt(result.browser.version, 10)
@@ -257,10 +269,19 @@ var set = exports.set = function set(_ref3) {
                   [_def.variable.guRouteVerHeader, _def.variable.guRouteNameHeader, _def.variable.guRouteGroupHeader].forEach(function (v) {
                     _yakuza.global.__yk_gu__[v] = h[v] || _yakuza.global.__yk_gu__[v];
                   });
+                  var extendHeaders = Object.fromEntries((0, _entries2.default)(h || {}).filter(function (_ref6) {
+                    var _ref7 = (0, _slicedToArray3.default)(_ref6, 1),
+                        key = _ref7[0];
+
+                    return key.toLowerCase().startsWith('x-');
+                  }));
                   store.dispatch('__yk_init__/setGU', _yakuza.global.__yk_gu__);
+                  store.dispatch('__yk_init__/setExtendHeaders', extendHeaders);
                   $yk.gu = _yakuza.global.__yk_gu__;
+                  $yk.server.extendHeaders = extendHeaders;
                 } else {
                   $yk.gu = store.state.__yk_init__ && store.state.__yk_init__.gu || {};
+                  $yk.server.extendHeaders = store.state.__yk_init__ && store.state.__yk_init__.extendHeaders || {};
                 }
 
                 if (_yakuza.global.__enc_csrfInfo__) {
@@ -280,7 +301,7 @@ var set = exports.set = function set(_ref3) {
               };
 
               getUc = function () {
-                var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
+                var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
                   var ucBody, _spi, _spiQuery, _spiSecret, defDomain, bodyStr, Cookie, ucHeaders, hs, rs, resCookie, resCookieArr, __isc;
 
                   return _regenerator2.default.wrap(function _callee4$(_context4) {
@@ -382,12 +403,12 @@ var set = exports.set = function set(_ref3) {
                 }));
 
                 return function getUc() {
-                  return _ref6.apply(this, arguments);
+                  return _ref8.apply(this, arguments);
                 };
               }();
 
               getSvcInSsrWithServer = function () {
-                var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
+                var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
                   var svcRes, ssrBody, rs, resTxt, data;
                   return _regenerator2.default.wrap(function _callee5$(_context5) {
                     while (1) {
@@ -454,12 +475,12 @@ var set = exports.set = function set(_ref3) {
                 }));
 
                 return function getSvcInSsrWithServer() {
-                  return _ref7.apply(this, arguments);
+                  return _ref9.apply(this, arguments);
                 };
               }();
 
               getSvc = function () {
-                var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
+                var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
                   var finger, _require, fingerprint, secretBody, secretData, secretReq, setData, setFinger, query, ping;
 
                   return _regenerator2.default.wrap(function _callee8$(_context8) {
@@ -497,7 +518,7 @@ var set = exports.set = function set(_ref3) {
                           secretData = {};
 
                           secretReq = function () {
-                            var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
+                            var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
                               var secretBodyStr, rs, resTxt;
                               return _regenerator2.default.wrap(function _callee6$(_context6) {
                                 while (1) {
@@ -540,7 +561,7 @@ var set = exports.set = function set(_ref3) {
                             }));
 
                             return function secretReq() {
-                              return _ref9.apply(this, arguments);
+                              return _ref11.apply(this, arguments);
                             };
                           }();
 
@@ -562,6 +583,9 @@ var set = exports.set = function set(_ref3) {
                             if (_yakuza._.isPlainObject(secretData.ClientIp)) {
                               clientIp = secretData.ClientIp;
                             }
+                            if (_yakuza._.isPlainObject(secretData.IPGeoInfo)) {
+                              geo = secretData.IPGeoInfo;
+                            }
                             _yakuza._.readOnly(_yakuza.global, '__enc__', secretData.Encryption === 1, {
                               writable: opt.writable
                             });
@@ -610,7 +634,7 @@ var set = exports.set = function set(_ref3) {
                           return (0, _ws.connect)({
                             query: query,
                             onConnect: function () {
-                              var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
+                              var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
                                 return _regenerator2.default.wrap(function _callee7$(_context7) {
                                   while (1) {
                                     switch (_context7.prev = _context7.next) {
@@ -637,7 +661,7 @@ var set = exports.set = function set(_ref3) {
                               }));
 
                               function onConnect() {
-                                return _ref10.apply(this, arguments);
+                                return _ref12.apply(this, arguments);
                               }
 
                               return onConnect;
@@ -682,7 +706,7 @@ var set = exports.set = function set(_ref3) {
                 }));
 
                 return function getSvc() {
-                  return _ref8.apply(this, arguments);
+                  return _ref10.apply(this, arguments);
                 };
               }();