yakuza0 2.23.33 → 2.23.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/package.json +4 -3
  2. package/pxnpm-lock.yaml +3 -3
  3. package/server/proxy/csrf.js +64 -46
  4. package/utils/ck.js +22 -1
  5. package/utils/secret.js +159 -87
package/package.json CHANGED
@@ -1,9 +1,10 @@
1
1
  {
2
2
  "name": "yakuza0",
3
- "version": "2.23.33",
3
+ "version": "2.23.37",
4
4
  "description": "yakuza0 with nuxt",
5
5
  "main": "index.js",
6
6
  "scripts": {
7
+ "base": "babel --no-babelrc src -d /Users/ningfujun/work/repo/web/CLN_BASE_TEST/node_modules/yakuza0 -w --presets=env --plugins=transform-runtime,transform-object-rest-spread,add-module-exports",
7
8
  "build": "babel --no-babelrc src -d . --presets=env --plugins=transform-runtime,transform-object-rest-spread,add-module-exports",
8
9
  "pub:beta": "npm run build && npm version prerelease --preid=beta && pxnpm publish --no-git-check",
9
10
  "pub:hotfix": "npm run build && npm version prerelease --preid=hotfix && npm publish --tag hotfix",
@@ -66,7 +67,7 @@
66
67
  "get-port": "^5.0.0",
67
68
  "html-loader": "^1.3.2",
68
69
  "http-proxy": "^1.18.1",
69
- "http-proxy-middleware": "^2.0.6",
70
+ "http-proxy-middleware": "^2.0.7",
70
71
  "isomorphic-fetch": "^2.2.1",
71
72
  "json-format": "^1.0.1",
72
73
  "koa": "^2.13.3",
@@ -111,7 +112,7 @@
111
112
  "stylus-loader": "^3.0.2",
112
113
  "sync-request": "^6.1.0",
113
114
  "tcp-port-used": "^1.0.1",
114
- "ua-parser-js": "^0.7.20",
115
+ "ua-parser-js": "^0.7.40",
115
116
  "uglify-js": "^3.17.4",
116
117
  "v8-compile-cache": "^2.0.2",
117
118
  "yakuza1": "^2.6.21"
package/pxnpm-lock.yaml CHANGED
@@ -141,7 +141,7 @@ dependencies:
141
141
  specifier: ^1.18.1
142
142
  version: 1.18.1
143
143
  http-proxy-middleware:
144
- specifier: ^2.0.6
144
+ specifier: ^2.0.7
145
145
  version: 2.0.7
146
146
  isomorphic-fetch:
147
147
  specifier: ^2.2.1
@@ -231,7 +231,7 @@ dependencies:
231
231
  specifier: ^2.2.0
232
232
  version: 2.5.0
233
233
  string-replace-loader:
234
- specifier: ^3.1.0
234
+ specifier: 3.1.0
235
235
  version: 3.1.0(webpack@4.47.0)
236
236
  stylelint:
237
237
  specifier: ^14.1.0
@@ -276,7 +276,7 @@ dependencies:
276
276
  specifier: ^1.0.1
277
277
  version: 1.0.2
278
278
  ua-parser-js:
279
- specifier: ^0.7.20
279
+ specifier: ^0.7.40
280
280
  version: 0.7.40
281
281
  uglify-js:
282
282
  specifier: ^3.17.4
package/server/proxy/csrf.js CHANGED
@@ -88,10 +88,6 @@ var _koaSslify2 = _interopRequireDefault(_koaSslify);
88
88
 
89
89
  var _koaMid = require('../../utils/koaMid');
90
90
 
91
- var _universal = require('yakuza1/lib/ky/universal');
92
-
93
- var _universal2 = _interopRequireDefault(_universal);
94
-
95
91
  var _fraud = require('./fraud');
96
92
 
97
93
  var fraud = _interopRequireWildcard(_fraud);
@@ -106,10 +102,14 @@ var _httpProxy2 = _interopRequireDefault(_httpProxy);
106
102
 
107
103
  var _csp = require('../../utils/csp');
108
104
 
105
+ var _ck = require('../../utils/ck');
106
+
109
107
  function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
110
108
 
111
109
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
112
110
 
111
+ // import helmet from 'helmet';
112
+
113
113
  // import {symmetry as gs, asymmetric as as} from 'yakuza1/lib/encrypt/general';
114
114
  // import koaJwt from 'koa-jwt';
115
115
  var codeMessage = {
@@ -129,8 +129,6 @@ var codeMessage = {
129
129
  503: '服务不可用，服务器暂时过载或维护。',
130
130
  504: '网关超时。'
131
131
  };
132
- // import helmet from 'helmet';
133
-
134
132
  // import {getCache, keys} from "../cache/conf";
135
133
  // import csrfPri from "./csrfPri";
136
134
  // import csrfPub from "yakuza1/lib/cert/csrfPub";
@@ -176,6 +174,23 @@ var ssrReqAllow = function ssrReqAllow(ctx) {
176
174
  return ak && ak === _server.global.__yConf_ak__ && isSsr;
177
175
  };
178
176
 
177
+ var parseBrowserType = function parseBrowserType() {
178
+ var userAgent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
179
+
180
+ if (typeof userAgent !== 'string' || userAgent.length > 512) {
181
+ return '';
182
+ }
183
+
184
+ try {
185
+ var parser = new _uaParserJs2.default();
186
+ parser.setUA(userAgent);
187
+ var result = parser.getResult();
188
+ return result.browser.name + parseInt(result.browser.version, 10);
189
+ } catch (e) {
190
+ return '';
191
+ }
192
+ };
193
+
179
194
  var ddos = {};
180
195
 
181
196
  exports.default = function () {
@@ -420,7 +435,7 @@ exports.default = function () {
420
435
  }, _callee, undefined);
421
436
  }));
422
437
 
423
- return function (_x3, _x4) {
438
+ return function (_x4, _x5) {
424
439
  return _ref4.apply(this, arguments);
425
440
  };
426
441
  }());
@@ -447,7 +462,7 @@ exports.default = function () {
447
462
  }, _callee2, undefined);
448
463
  }));
449
464
 
450
- return function (_x5, _x6) {
465
+ return function (_x6, _x7) {
451
466
  return _ref5.apply(this, arguments);
452
467
  };
453
468
  }());
@@ -509,7 +524,7 @@ exports.default = function () {
509
524
  }, _callee3, undefined);
510
525
  }));
511
526
 
512
- return function (_x7, _x8) {
527
+ return function (_x8, _x9) {
513
528
  return _ref6.apply(this, arguments);
514
529
  };
515
530
  }());
@@ -540,7 +555,7 @@ exports.default = function () {
540
555
  }, _callee4, undefined);
541
556
  }));
542
557
 
543
- return function (_x9, _x10) {
558
+ return function (_x10, _x11) {
544
559
  return _ref7.apply(this, arguments);
545
560
  };
546
561
  }());
@@ -602,7 +617,7 @@ exports.default = function () {
602
617
  }, _callee5, undefined);
603
618
  }));
604
619
 
605
- return function (_x11, _x12) {
620
+ return function (_x12, _x13) {
606
621
  return _ref8.apply(this, arguments);
607
622
  };
608
623
  }());
@@ -640,7 +655,7 @@ exports.default = function () {
640
655
  }, _callee6, undefined);
641
656
  }));
642
657
 
643
- return function (_x13, _x14) {
658
+ return function (_x14, _x15) {
644
659
  return _ref9.apply(this, arguments);
645
660
  };
646
661
  }());
@@ -737,7 +752,7 @@ exports.default = function () {
737
752
  }, _callee7, undefined);
738
753
  }));
739
754
 
740
- return function (_x15, _x16) {
755
+ return function (_x16, _x17) {
741
756
  return _ref10.apply(this, arguments);
742
757
  };
743
758
  }()
@@ -786,7 +801,7 @@ exports.default = function () {
786
801
  }, _callee8, undefined);
787
802
  }));
788
803
 
789
- return function (_x17, _x18) {
804
+ return function (_x18, _x19) {
790
805
  return _ref11.apply(this, arguments);
791
806
  };
792
807
  }());
@@ -794,16 +809,12 @@ exports.default = function () {
794
809
 
795
810
  appCp(function () {
796
811
  var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(ctx, next) {
797
- var parser, result, browserType, bt, bs, url, isNext;
812
+ var browserType, bt, bs, url, isNext;
798
813
  return _regenerator2.default.wrap(function _callee9$(_context9) {
799
814
  while (1) {
800
815
  switch (_context9.prev = _context9.next) {
801
816
  case 0:
802
- parser = new _uaParserJs2.default();
803
-
804
- parser.setUA(ctx.get('user-agent'));
805
- result = parser.getResult();
806
- browserType = result.browser.name + parseInt(result.browser.version, 10);
817
+ browserType = parseBrowserType(ctx.get('user-agent'));
807
818
  bt = config.appConf.server.browsers.redirect;
808
819
  bs = config.appConf.server.browsers.static;
809
820
  url = null;
@@ -828,14 +839,14 @@ exports.default = function () {
828
839
  }
829
840
 
830
841
  if (!isNext) {
831
- _context9.next = 14;
842
+ _context9.next = 11;
832
843
  break;
833
844
  }
834
845
 
835
- _context9.next = 14;
846
+ _context9.next = 11;
836
847
  return next();
837
848
 
838
- case 14:
849
+ case 11:
839
850
  case 'end':
840
851
  return _context9.stop();
841
852
  }
@@ -843,7 +854,7 @@ exports.default = function () {
843
854
  }, _callee9, undefined);
844
855
  }));
845
856
 
846
- return function (_x19, _x20) {
857
+ return function (_x20, _x21) {
847
858
  return _ref12.apply(this, arguments);
848
859
  };
849
860
  }());
@@ -878,7 +889,7 @@ exports.default = function () {
878
889
  }, _callee10, undefined);
879
890
  }));
880
891
 
881
- return function (_x21, _x22) {
892
+ return function (_x22, _x23) {
882
893
  return _ref13.apply(this, arguments);
883
894
  };
884
895
  }());
@@ -911,58 +922,65 @@ exports.default = function () {
911
922
  }
912
923
  Cookie = _server.Cookies.koaGetCookieStr({ req: ctx.req });
913
924
 
925
+ (0, _ck.logDebugSuError)(Cookie, 'rHost: ' + rHost);
926
+ (0, _ck.logDebugSuError)(Cookie, 'rOrigin: ' + rOrigin);
927
+ (0, _ck.logDebugSuError)(Cookie, 'rReferer: ' + rReferer);
928
+ (0, _ck.logDebugSuError)(Cookie, 'rx isNext: ' + isNext);
929
+
914
930
  if (!Cookie) {
915
- _context11.next = 15;
931
+ _context11.next = 20;
916
932
  break;
917
933
  }
918
934
 
919
- _context11.prev = 7;
920
- _context11.next = 10;
921
- return _universal2.default.post(_config2.default.server.orbAddr + '/apiv2/cln/verify/ck', {
935
+ _context11.prev = 11;
936
+ _context11.next = 14;
937
+ return (0, _server.curl)(_config2.default.server.orbAddr + '/apiv2/cln/verify/ck', {
938
+ method: 'POST',
922
939
  headers: {
923
940
  Cookie: Cookie
924
941
  },
925
942
  timeout: 2000
926
943
  });
927
944
 
928
- case 10:
929
- _context11.next = 15;
945
+ case 14:
946
+ _context11.next = 20;
930
947
  break;
931
948
 
932
- case 12:
933
- _context11.prev = 12;
934
- _context11.t0 = _context11['catch'](7);
949
+ case 16:
950
+ _context11.prev = 16;
951
+ _context11.t0 = _context11['catch'](11);
935
952
 
953
+ (0, _ck.logDebugSuError)(Cookie, _context11.t0);
936
954
  isNext = false;
937
955
 
938
- case 15:
956
+ case 20:
939
957
  if (!isNext) {
940
- _context11.next = 20;
958
+ _context11.next = 25;
941
959
  break;
942
960
  }
943
961
 
944
- _context11.next = 18;
962
+ _context11.next = 23;
945
963
  return next();
946
964
 
947
- case 18:
948
- _context11.next = 21;
965
+ case 23:
966
+ _context11.next = 26;
949
967
  break;
950
968
 
951
- case 20:
969
+ case 25:
952
970
  ctx.body = apiErr({
953
971
  status: 500,
954
972
  data: '请求完整性校验错误，连接被拒绝'
955
973
  }, ctx);
956
974
 
957
- case 21:
975
+ case 26:
958
976
  case 'end':
959
977
  return _context11.stop();
960
978
  }
961
979
  }
962
- }, _callee11, undefined, [[7, 12]]);
980
+ }, _callee11, undefined, [[11, 16]]);
963
981
  }));
964
982
 
965
- return function (_x23, _x24) {
983
+ return function (_x24, _x25) {
966
984
  return _ref14.apply(this, arguments);
967
985
  };
968
986
  }()
@@ -998,7 +1016,7 @@ exports.default = function () {
998
1016
  }, _callee12, undefined);
999
1017
  }));
1000
1018
 
1001
- return function (_x25, _x26) {
1019
+ return function (_x26, _x27) {
1002
1020
  return _ref15.apply(this, arguments);
1003
1021
  };
1004
1022
  }());
@@ -1043,7 +1061,7 @@ exports.default = function () {
1043
1061
  }, _callee13, undefined);
1044
1062
  }));
1045
1063
 
1046
- return function (_x27, _x28) {
1064
+ return function (_x28, _x29) {
1047
1065
  return _ref16.apply(this, arguments);
1048
1066
  };
1049
1067
  }());
@@ -1056,7 +1074,7 @@ exports.default = function () {
1056
1074
  }, _callee14, undefined);
1057
1075
  }));
1058
1076
 
1059
- return function (_x) {
1077
+ return function (_x2) {
1060
1078
  return _ref3.apply(this, arguments);
1061
1079
  };
1062
1080
  }();
package/utils/ck.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.setOfflineCookie = exports.addCookieStr = undefined;
6
+ exports.setOfflineCookie = exports.addCookieStr = exports.logDebugSuError = exports.hasCookieKey = exports.DEBUG_SU_COOKIE_KEY = undefined;
7
7
 
8
8
  var _config = require("../config");
9
9
 
@@ -13,6 +13,27 @@ var _yakuza = require("yakuza1");
13
13
 
14
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
15
 
16
+ var DEBUG_SU_COOKIE_KEY = exports.DEBUG_SU_COOKIE_KEY = '__yk0_debug_su_';
17
+
18
+ var hasCookieKey = exports.hasCookieKey = function hasCookieKey(cookieStr, key) {
19
+ if (!cookieStr || !key) {
20
+ return false;
21
+ }
22
+
23
+ return cookieStr.split(';').some(function (item) {
24
+ var cookieKey = item.trim().split('=')[0];
25
+ return cookieKey === key;
26
+ });
27
+ };
28
+
29
+ var logDebugSuError = exports.logDebugSuError = function logDebugSuError(cookieStr, err) {
30
+ var message = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '[yk0 csrf verify cookie error]';
31
+
32
+ if (hasCookieKey(cookieStr, DEBUG_SU_COOKIE_KEY)) {
33
+ console.error(message, err);
34
+ }
35
+ };
36
+
16
37
  var addCookieStr = exports.addCookieStr = function addCookieStr(req, oc, key) {
17
38
  var match = '';
18
39
  if ((0, _yakuza.checkServer)() && req && req.headers && req.headers.cookie) {
package/utils/secret.js CHANGED
@@ -13,6 +13,10 @@ var _stringify = require("babel-runtime/core-js/json/stringify");
13
13
 
14
14
  var _stringify2 = _interopRequireDefault(_stringify);
15
15
 
16
+ var _objectWithoutProperties2 = require("babel-runtime/helpers/objectWithoutProperties");
17
+
18
+ var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
19
+
16
20
  var _slicedToArray2 = require("babel-runtime/helpers/slicedToArray");
17
21
 
18
22
  var _slicedToArray3 = _interopRequireDefault(_slicedToArray2);
@@ -166,7 +170,7 @@ var toLowerObjKey = function toLowerObjKey(data) {
166
170
  });
167
171
  };
168
172
 
169
- var set = exports.set = function set(_ref3) {
173
+ var set = function set(_ref3) {
170
174
  var $yk = _ref3.$yk,
171
175
  $utils = _ref3.$utils,
172
176
  req = _ref3.req,
@@ -176,11 +180,11 @@ var set = exports.set = function set(_ref3) {
176
180
  store = _ref3.store;
177
181
 
178
182
  return new _promise2.default(function () {
179
- var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(resolve, reject) {
180
- var w, mixin, yc, hostname, spiData, clientIp, geo, spi, spiQuery, spiSecret, parser, setUniversal, ucResC, timeout, universalBody, getUc, getSvcInSsrWithServer, getSvc;
181
- return _regenerator2.default.wrap(function _callee9$(_context9) {
183
+ var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(resolve, reject) {
184
+ var w, mixin, yc, hostname, spiData, clientIp, geo, spi, spiQuery, spiSecret, parser, setUniversal, ucResC, timeout, universalBody, postWithFetch, getUc, getSvcInSsrWithServer, getSvc;
185
+ return _regenerator2.default.wrap(function _callee10$(_context10) {
182
186
  while (1) {
183
- switch (_context9.prev = _context9.next) {
187
+ switch (_context10.prev = _context10.next) {
184
188
  case 0:
185
189
  w = _yakuza.global;
186
190
  mixin = $utils.cipher.mixin;
@@ -202,7 +206,7 @@ var set = exports.set = function set(_ref3) {
202
206
  }
203
207
 
204
208
  if ($yk.standAlone) {
205
- _context9.next = 29;
209
+ _context10.next = 30;
206
210
  break;
207
211
  }
208
212
 
@@ -290,7 +294,7 @@ var set = exports.set = function set(_ref3) {
290
294
  };
291
295
 
292
296
  if (!w) {
293
- _context9.next = 29;
297
+ _context10.next = 30;
294
298
  break;
295
299
  }
296
300
 
@@ -300,16 +304,83 @@ var set = exports.set = function set(_ref3) {
300
304
  svcKey: $yk.server.svcKey
301
305
  };
302
306
 
307
+ postWithFetch = function () {
308
+ var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(url) {
309
+ var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
310
+ var body, json, headers, requestTimeout, rest, requestHeaders, requestBody, fetchOptions, controller, timer;
311
+ return _regenerator2.default.wrap(function _callee4$(_context4) {
312
+ while (1) {
313
+ switch (_context4.prev = _context4.next) {
314
+ case 0:
315
+ body = options.body, json = options.json, headers = options.headers, requestTimeout = options.timeout, rest = (0, _objectWithoutProperties3.default)(options, ["body", "json", "headers", "timeout"]);
316
+ requestHeaders = (0, _extends3.default)({}, headers || {});
317
+ requestBody = body;
318
+
319
+
320
+ if (!_yakuza._.isUndefined(json)) {
321
+ requestBody = (0, _stringify2.default)(json);
322
+ if (_yakuza._.isUndefined(requestHeaders['Content-Type'])) {
323
+ requestHeaders['Content-Type'] = 'application/json';
324
+ }
325
+ }
326
+
327
+ fetchOptions = (0, _extends3.default)({
328
+ method: 'POST'
329
+ }, rest, {
330
+ headers: requestHeaders,
331
+ body: requestBody
332
+ });
333
+
334
+ if (!((0, _yakuza.checkServer)() && requestTimeout && _yakuza.global.AbortController)) {
335
+ _context4.next = 15;
336
+ break;
337
+ }
338
+
339
+ controller = new _yakuza.global.AbortController();
340
+ timer = setTimeout(function () {
341
+ return controller.abort();
342
+ }, requestTimeout);
343
+ _context4.prev = 8;
344
+ _context4.next = 11;
345
+ return _yakuza.global.fetch(url, (0, _extends3.default)({}, fetchOptions, {
346
+ signal: controller.signal
347
+ }));
348
+
349
+ case 11:
350
+ return _context4.abrupt("return", _context4.sent);
351
+
352
+ case 12:
353
+ _context4.prev = 12;
354
+
355
+ clearTimeout(timer);
356
+ return _context4.finish(12);
357
+
358
+ case 15:
359
+ return _context4.abrupt("return", _yakuza.global.fetch(url, fetchOptions));
360
+
361
+ case 16:
362
+ case "end":
363
+ return _context4.stop();
364
+ }
365
+ }
366
+ }, _callee4, undefined, [[8,, 12, 15]]);
367
+ }));
368
+
369
+ return function postWithFetch(_x7) {
370
+ return _ref8.apply(this, arguments);
371
+ };
372
+ }();
373
+
303
374
  getUc = function () {
304
- var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
375
+ var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
305
376
  var ucBody, _spi, _spiQuery, _spiSecret, defDomain, bodyStr, Cookie, ucHeaders, hs, rs, resCookie, resCookieArr, __isc;
306
377
 
307
- return _regenerator2.default.wrap(function _callee4$(_context4) {
378
+ return _regenerator2.default.wrap(function _callee5$(_context5) {
308
379
  while (1) {
309
- switch (_context4.prev = _context4.next) {
380
+ switch (_context5.prev = _context5.next) {
310
381
  case 0:
311
382
  if (!((0, _yakuza.checkServer)() || !$yk.appConf.ssr)) {
312
- _context4.next = 22;
383
+ _context5.next = 22;
313
384
  break;
314
385
  }
315
386
 
@@ -344,17 +415,17 @@ var set = exports.set = function set(_ref3) {
344
415
  ucHeaders = (0, _defineProperty3.default)({
345
416
  Cookie: Cookie
346
417
  }, _def.variable.clientKeyHeader, mixin.symmetry.CBC.encrypt((0, _yakuza.md5)((0, _yakuza.uuid)())));
347
- _context4.prev = 11;
418
+ _context5.prev = 11;
348
419
  hs = "Set-Cookie";
349
- _context4.next = 15;
350
- return _universal2.default.post(($yk.appConf.ssr ? $yk.origin + '/' : $yk.server.basePathMU) + "apiv2/support/svc/uc", {
420
+ _context5.next = 15;
421
+ return postWithFetch(($yk.appConf.ssr ? $yk.origin + '/' : $yk.server.basePathMU) + "apiv2/support/svc/uc", {
351
422
  body: bodyStr,
352
423
  headers: ucHeaders,
353
424
  timeout: timeout
354
425
  });
355
426
 
356
427
  case 15:
357
- rs = _context4.sent;
428
+ rs = _context5.sent;
358
429
  resCookie = rs.headers.get(hs);
359
430
 
360
431
  if (resCookie) {
@@ -387,35 +458,35 @@ var set = exports.set = function set(_ref3) {
387
458
  res.setHeader(hs, resCookieArr);
388
459
  }
389
460
  }
390
- _context4.next = 22;
461
+ _context5.next = 22;
391
462
  break;
392
463
 
393
464
  case 20:
394
- _context4.prev = 20;
395
- _context4.t0 = _context4["catch"](11);
465
+ _context5.prev = 20;
466
+ _context5.t0 = _context5["catch"](11);
396
467
 
397
468
  case 22:
398
469
  case "end":
399
- return _context4.stop();
470
+ return _context5.stop();
400
471
  }
401
472
  }
402
- }, _callee4, undefined, [[11, 20]]);
473
+ }, _callee5, undefined, [[11, 20]]);
403
474
  }));
404
475
 
405
476
  return function getUc() {
406
- return _ref8.apply(this, arguments);
477
+ return _ref9.apply(this, arguments);
407
478
  };
408
479
  }();
409
480
 
410
481
  getSvcInSsrWithServer = function () {
411
- var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
482
+ var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
412
483
  var svcRes, ssrBody, rs, resTxt, data;
413
- return _regenerator2.default.wrap(function _callee5$(_context5) {
484
+ return _regenerator2.default.wrap(function _callee6$(_context6) {
414
485
  while (1) {
415
- switch (_context5.prev = _context5.next) {
486
+ switch (_context6.prev = _context6.next) {
416
487
  case 0:
417
488
  if (!(0, _yakuza.checkServer)()) {
418
- _context5.next = 22;
489
+ _context6.next = 22;
419
490
  break;
420
491
  }
421
492
 
@@ -425,9 +496,9 @@ var set = exports.set = function set(_ref3) {
425
496
  });
426
497
 
427
498
  ucResC = (0, _ck.setOfflineCookie)(req, ucResC);
428
- _context5.prev = 4;
429
- _context5.next = 7;
430
- return _universal2.default.post($yk.origin + "/apiv2/support/svc/svcInSsrWithServer", {
499
+ _context6.prev = 4;
500
+ _context6.next = 7;
501
+ return postWithFetch($yk.origin + "/apiv2/support/svc/svcInSsrWithServer", {
431
502
  json: ssrBody,
432
503
  headers: {
433
504
  Cookie: ucResC
@@ -437,20 +508,20 @@ var set = exports.set = function set(_ref3) {
437
508
  });
438
509
 
439
510
  case 7:
440
- rs = _context5.sent;
441
- _context5.next = 10;
511
+ rs = _context6.sent;
512
+ _context6.next = 10;
442
513
  return rs.text();
443
514
 
444
515
  case 10:
445
- resTxt = _context5.sent;
516
+ resTxt = _context6.sent;
446
517
 
447
518
  svcRes = JSON.parse(resTxt);
448
- _context5.next = 16;
519
+ _context6.next = 16;
449
520
  break;
450
521
 
451
522
  case 14:
452
- _context5.prev = 14;
453
- _context5.t0 = _context5["catch"](4);
523
+ _context6.prev = 14;
524
+ _context6.t0 = _context6["catch"](4);
454
525
 
455
526
  case 16:
456
527
  data = (0, _extends3.default)({}, svcRes && svcRes.data);
@@ -468,43 +539,43 @@ var set = exports.set = function set(_ref3) {
468
539
 
469
540
  case 22:
470
541
  case "end":
471
- return _context5.stop();
542
+ return _context6.stop();
472
543
  }
473
544
  }
474
- }, _callee5, undefined, [[4, 14]]);
545
+ }, _callee6, undefined, [[4, 14]]);
475
546
  }));
476
547
 
477
548
  return function getSvcInSsrWithServer() {
478
- return _ref9.apply(this, arguments);
549
+ return _ref10.apply(this, arguments);
479
550
  };
480
551
  }();
481
552
 
482
553
  getSvc = function () {
483
- var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
554
+ var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9() {
484
555
  var finger, _require, fingerprint, secretBody, secretData, secretReq, setData, setFinger, query, ping;
485
556
 
486
- return _regenerator2.default.wrap(function _callee8$(_context8) {
557
+ return _regenerator2.default.wrap(function _callee9$(_context9) {
487
558
  while (1) {
488
- switch (_context8.prev = _context8.next) {
559
+ switch (_context9.prev = _context9.next) {
489
560
  case 0:
490
561
  if ((0, _yakuza.checkServer)()) {
491
- _context8.next = 30;
562
+ _context9.next = 30;
492
563
  break;
493
564
  }
494
565
 
495
566
  finger = (0, _yakuza.gPwd)();
496
567
 
497
568
  if (!$yk.security.stupid) {
498
- _context8.next = 7;
569
+ _context9.next = 7;
499
570
  break;
500
571
  }
501
572
 
502
573
  _require = require('yakuza1/spa'), fingerprint = _require.fingerprint;
503
- _context8.next = 6;
574
+ _context9.next = 6;
504
575
  return fingerprint();
505
576
 
506
577
  case 6:
507
- finger = _context8.sent;
578
+ finger = _context9.sent;
508
579
 
509
580
  case 7:
510
581
  secretBody = (0, _extends3.default)({
@@ -518,17 +589,17 @@ var set = exports.set = function set(_ref3) {
518
589
  secretData = {};
519
590
 
520
591
  secretReq = function () {
521
- var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
592
+ var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
522
593
  var secretBodyStr, rs, resTxt;
523
- return _regenerator2.default.wrap(function _callee6$(_context6) {
594
+ return _regenerator2.default.wrap(function _callee7$(_context7) {
524
595
  while (1) {
525
- switch (_context6.prev = _context6.next) {
596
+ switch (_context7.prev = _context7.next) {
526
597
  case 0:
527
- _context6.prev = 0;
598
+ _context7.prev = 0;
528
599
  secretBodyStr = (0, _stringify2.default)(secretBody);
529
600
 
530
601
  secretBodyStr = mixin.symmetry.CBC.encrypt(secretBodyStr);
531
- _context6.next = 5;
602
+ _context7.next = 5;
532
603
  return _universal2.default.post($yk.server.basePathMU + "apiv2/support/svc/getClient", {
533
604
  body: secretBodyStr,
534
605
  timeout: _config2.default.server.infoTimeout + 9000,
@@ -536,32 +607,32 @@ var set = exports.set = function set(_ref3) {
536
607
  });
537
608
 
538
609
  case 5:
539
- rs = _context6.sent;
540
- _context6.next = 8;
610
+ rs = _context7.sent;
611
+ _context7.next = 8;
541
612
  return rs.text();
542
613
 
543
614
  case 8:
544
- resTxt = _context6.sent;
615
+ resTxt = _context7.sent;
545
616
 
546
617
  resTxt = mixin.symmetry.CBC.decrypt(resTxt);
547
618
  secretData = JSON.parse(resTxt);
548
- _context6.next = 15;
619
+ _context7.next = 15;
549
620
  break;
550
621
 
551
622
  case 13:
552
- _context6.prev = 13;
553
- _context6.t0 = _context6["catch"](0);
623
+ _context7.prev = 13;
624
+ _context7.t0 = _context7["catch"](0);
554
625
 
555
626
  case 15:
556
627
  case "end":
557
- return _context6.stop();
628
+ return _context7.stop();
558
629
  }
559
630
  }
560
- }, _callee6, undefined, [[0, 13]]);
631
+ }, _callee7, undefined, [[0, 13]]);
561
632
  }));
562
633
 
563
634
  return function secretReq() {
564
- return _ref11.apply(this, arguments);
635
+ return _ref12.apply(this, arguments);
565
636
  };
566
637
  }();
567
638
 
@@ -624,28 +695,28 @@ var set = exports.set = function set(_ref3) {
624
695
  };
625
696
 
626
697
  if (!_config2.default.server.heartbeat.enabled) {
627
- _context8.next = 27;
698
+ _context9.next = 27;
628
699
  break;
629
700
  }
630
701
 
631
702
  query = {};
632
- _context8.prev = 14;
633
- _context8.next = 17;
703
+ _context9.prev = 14;
704
+ _context9.next = 17;
634
705
  return (0, _ws.connect)({
635
706
  query: query,
636
707
  onConnect: function () {
637
- var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7() {
638
- return _regenerator2.default.wrap(function _callee7$(_context7) {
708
+ var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
709
+ return _regenerator2.default.wrap(function _callee8$(_context8) {
639
710
  while (1) {
640
- switch (_context7.prev = _context7.next) {
711
+ switch (_context8.prev = _context8.next) {
641
712
  case 0:
642
- _context7.next = 2;
713
+ _context8.next = 2;
643
714
  return (0, _ws.req)('init/secret', {
644
715
  body: secretBody
645
716
  });
646
717
 
647
718
  case 2:
648
- secretData = _context7.sent;
719
+ secretData = _context8.sent;
649
720
 
650
721
  secretBody.offline = 0;
651
722
 
@@ -654,14 +725,14 @@ var set = exports.set = function set(_ref3) {
654
725
 
655
726
  case 6:
656
727
  case "end":
657
- return _context7.stop();
728
+ return _context8.stop();
658
729
  }
659
730
  }
660
- }, _callee7, undefined);
731
+ }, _callee8, undefined);
661
732
  }));
662
733
 
663
734
  function onConnect() {
664
- return _ref12.apply(this, arguments);
735
+ return _ref13.apply(this, arguments);
665
736
  }
666
737
 
667
738
  return onConnect;
@@ -669,25 +740,25 @@ var set = exports.set = function set(_ref3) {
669
740
  });
670
741
 
671
742
  case 17:
672
- ping = _context8.sent;
673
- _context8.next = 25;
743
+ ping = _context9.sent;
744
+ _context9.next = 25;
674
745
  break;
675
746
 
676
747
  case 20:
677
- _context8.prev = 20;
678
- _context8.t0 = _context8["catch"](14);
679
- _context8.next = 24;
748
+ _context9.prev = 20;
749
+ _context9.t0 = _context9["catch"](14);
750
+ _context9.next = 24;
680
751
  return secretReq();
681
752
 
682
753
  case 24:
683
754
  setData();
684
755
 
685
756
  case 25:
686
- _context8.next = 30;
757
+ _context9.next = 30;
687
758
  break;
688
759
 
689
760
  case 27:
690
- _context8.next = 29;
761
+ _context9.next = 29;
691
762
  return secretReq();
692
763
 
693
764
  case 29:
@@ -699,34 +770,34 @@ var set = exports.set = function set(_ref3) {
699
770
 
700
771
  case 31:
701
772
  case "end":
702
- return _context8.stop();
773
+ return _context9.stop();
703
774
  }
704
775
  }
705
- }, _callee8, undefined, [[14, 20]]);
776
+ }, _callee9, undefined, [[14, 20]]);
706
777
  }));
707
778
 
708
779
  return function getSvc() {
709
- return _ref10.apply(this, arguments);
780
+ return _ref11.apply(this, arguments);
710
781
  };
711
782
  }();
712
783
 
713
- _context9.next = 25;
784
+ _context10.next = 26;
714
785
  return getUc();
715
786
 
716
- case 25:
717
- _context9.next = 27;
787
+ case 26:
788
+ _context10.next = 28;
718
789
  return getSvcInSsrWithServer();
719
790
 
720
- case 27:
721
- _context9.next = 29;
791
+ case 28:
792
+ _context10.next = 30;
722
793
  return getSvc();
723
794
 
724
- case 29:
795
+ case 30:
725
796
  case "end":
726
- return _context9.stop();
797
+ return _context10.stop();
727
798
  }
728
799
  }
729
- }, _callee9, undefined);
800
+ }, _callee10, undefined);
730
801
  }));
731
802
 
732
803
  return function (_x4, _x5) {
@@ -735,6 +806,7 @@ var set = exports.set = function set(_ref3) {
735
806
  }());
736
807
  };
737
808
 
809
+ exports.set = set;
738
810
  secret.set = set;
739
811
 
740
812
  exports.default = secret;