yakuza0 2.22.34-beta.9 → 2.22.35-beta.0
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.
- package/nuxt/head.js +1 -1
- package/nuxt/plugins/init_client.js +8 -3
- package/package.json +3 -3
- package/server/cache/control.js +9 -1
- package/server/index.js +1 -1
- package/server/mode/normal.js +1 -1
- package/server/proxy/conf.js +15 -3
- package/server/proxy/csrf.js +15 -19
- package/server/proxy/tire.js +6 -4
- package/template/http.plugin.js +7 -6
- package/template/redirect.plugin.js +40 -4
- package/template/storage.plugin.js +1 -1
- package/template/yk.plugin.js +1 -0
- package/utils/inclusive.js +40 -23
- package/utils/secret.js +75 -42
package/nuxt/head.js
CHANGED
|
@@ -44,7 +44,7 @@ exports.default = function (config) {
|
|
|
44
44
|
|
|
45
45
|
if (config.commonConfig.head !== false) {
|
|
46
46
|
pkgHead = (0, _extends3.default)({}, _config2.default.nuxt && _config2.default.nuxt.head, {
|
|
47
|
-
script: [{ src: "/cln/init.js?info=" + (0, _yakuza.md5)(_config2.default.scKey).substring(2, 8) }].concat((0, _toConsumableArray3.default)(_config2.default.nuxt && _config2.default.nuxt.head && _config2.default.nuxt.head.script || []))
|
|
47
|
+
script: [{ src: "/cln/init.js?info=" + (0, _yakuza.md5)(_config2.default.scKey + config.appName).substring(2, 8) }].concat((0, _toConsumableArray3.default)(_config2.default.nuxt && _config2.default.nuxt.head && _config2.default.nuxt.head.script || []))
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
50
|
|
|
@@ -28,12 +28,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
28
28
|
|
|
29
29
|
exports.default = function () {
|
|
30
30
|
var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx) {
|
|
31
|
-
var store, $yk, $ws, keys, cs, clientKey;
|
|
31
|
+
var store, $yk, $ws, app, keys, cs, clientKey;
|
|
32
32
|
return _regenerator2.default.wrap(function _callee3$(_context3) {
|
|
33
33
|
while (1) {
|
|
34
34
|
switch (_context3.prev = _context3.next) {
|
|
35
35
|
case 0:
|
|
36
|
-
store = ctx.store, $yk = ctx.$yk, $ws = ctx.$ws;
|
|
36
|
+
store = ctx.store, $yk = ctx.$yk, $ws = ctx.$ws, app = ctx.app;
|
|
37
37
|
|
|
38
38
|
// await set(ctx);
|
|
39
39
|
|
|
@@ -129,8 +129,13 @@ exports.default = function () {
|
|
|
129
129
|
case 14:
|
|
130
130
|
|
|
131
131
|
_yakuza.Cookies.remove(_config2.default.server.redirect.afkKey, { domain: $yk.appConf.cookieDomain });
|
|
132
|
+
app.router.afterEach(function (to, from) {
|
|
133
|
+
_yakuza.Cookies.remove(_config2.default.server.redirect.afkKey, { domain: $yk.appConf.cookieDomain });
|
|
134
|
+
});
|
|
135
|
+
// Cookies.set(yConf.server.stupid.v2023_12.aMark, "", {domain: $yk.appConf.cookieDomain})
|
|
136
|
+
$yk.firstRefresh = false;
|
|
132
137
|
|
|
133
|
-
case
|
|
138
|
+
case 17:
|
|
134
139
|
case 'end':
|
|
135
140
|
return _context3.stop();
|
|
136
141
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "yakuza0",
|
|
3
|
-
"version": "2.22.
|
|
3
|
+
"version": "2.22.35-beta.0",
|
|
4
4
|
"description": "yakuza0 with nuxt",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -112,13 +112,13 @@
|
|
|
112
112
|
"ua-parser-js": "^0.7.20",
|
|
113
113
|
"uglify-js": "^3.17.4",
|
|
114
114
|
"v8-compile-cache": "^2.0.2",
|
|
115
|
-
"yakuza1": "^2.6.
|
|
115
|
+
"yakuza1": "^2.6.16"
|
|
116
116
|
},
|
|
117
117
|
"peerDependencies": {
|
|
118
118
|
"@rdc/nuxt": "2.15.8",
|
|
119
119
|
"core-js": "3.10.1",
|
|
120
120
|
"eslint": "7.2.0",
|
|
121
|
-
"yakuza1": "^2.6.
|
|
121
|
+
"yakuza1": "^2.6.16"
|
|
122
122
|
},
|
|
123
123
|
"__npminstall_done": false
|
|
124
124
|
}
|
package/server/cache/control.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.useCache = exports.noCache = undefined;
|
|
6
|
+
exports.clnInitCache = exports.useCache = exports.noCache = undefined;
|
|
7
7
|
|
|
8
8
|
var _regenerator = require('babel-runtime/regenerator');
|
|
9
9
|
|
|
@@ -144,4 +144,12 @@ var useCache = exports.useCache = function useCache(ctx, options) {
|
|
|
144
144
|
if (cacheControl.length) {
|
|
145
145
|
ctx.set('Cache-Control', cacheControl.join(','));
|
|
146
146
|
}
|
|
147
|
+
};
|
|
148
|
+
|
|
149
|
+
var clnInitCache = exports.clnInitCache = function clnInitCache(ctx) {
|
|
150
|
+
useCache(ctx, {
|
|
151
|
+
maxAge: 60 * 60 * 24 * 66, // 66天
|
|
152
|
+
sMaxAge: 60 * 60 * 24, // 1天
|
|
153
|
+
public: true
|
|
154
|
+
});
|
|
147
155
|
};
|
package/server/index.js
CHANGED
|
@@ -344,7 +344,7 @@ exports.default = function () {
|
|
|
344
344
|
|
|
345
345
|
case 56:
|
|
346
346
|
|
|
347
|
-
appHref.push(' - ' + key + ': ' + _chalk2.default.cyan(_config2.default.server.host + ':' + options.config.appConf.port));
|
|
347
|
+
appHref.push(' - ' + key + ': ' + _chalk2.default.cyan((config.appConf.server && config.appConf.server.domain || _config2.default.server.host) + ':' + options.config.appConf.port));
|
|
348
348
|
|
|
349
349
|
case 57:
|
|
350
350
|
case 'end':
|
package/server/mode/normal.js
CHANGED
|
@@ -71,7 +71,7 @@ var server = function () {
|
|
|
71
71
|
_config$appConf = config.appConf, host = _config$appConf.host, port = _config$appConf.port;
|
|
72
72
|
proxyConf = (0, _conf2.default)();
|
|
73
73
|
urls = {
|
|
74
|
-
localUrlForBrowser: _config2.default.server.protocol + '//' + host + ':' + port,
|
|
74
|
+
localUrlForBrowser: _config2.default.server.protocol + '//' + (config.appConf.server && config.appConf.server.domain || host) + ':' + port,
|
|
75
75
|
lanUrlForTerminal: _config2.default.server.protocol + '//' + _address2.default.ip() + ':' + port
|
|
76
76
|
};
|
|
77
77
|
|
package/server/proxy/conf.js
CHANGED
|
@@ -167,9 +167,19 @@ var serverHeaders = exports.serverHeaders = function serverHeaders(_ref4) {
|
|
|
167
167
|
// console.log(nuxtAppConf.server.gray, 123);
|
|
168
168
|
var appCode = req.headers[_def.variable.appCodeHeader.toLowerCase()] || nuxtAppConf.appCode;
|
|
169
169
|
var adjoinIp = req.headers[_def.variable.adjoinIpHeader.toLowerCase()] || (0, _server.getClientIP)(req, { stupid: true }) || '127.0.0.1';
|
|
170
|
-
|
|
170
|
+
// const isAfk = Cookies.getByStr(yConf.server.redirect.afkKey, req.headers.cookie) === '';
|
|
171
|
+
// console.log(req.url, isAfk, 1111);
|
|
172
|
+
var isAfk = false;
|
|
173
|
+
// console.log(isAfk, 'isAfk');
|
|
174
|
+
// console.log(v2023_12_aMark, 'v2023_12_aMark');
|
|
175
|
+
// if (yConf.server.stupid.standard === 'v2023_12') {
|
|
176
|
+
// v2023_12_aMark = Cookies.getByStr(yConf.server.stupid.v2023_12.aMark, req.headers.cookie) === '';
|
|
177
|
+
// // console.log(v2023_12_aMark, 'v2023_12_aMark222');
|
|
178
|
+
// }
|
|
171
179
|
// console.log(req.url, nuxtAppConf.server && nuxtAppConf.server.f5Offline, !isAfk, 666);
|
|
172
|
-
return _ref5 = {}, (0, _defineProperty3.default)(_ref5, _def.variable.isDevHeader, { data: conf.dev ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.akHeader, { data: conf.ak, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ipHeader, { data: (0, _server.getClientIP)(req, { stupid: false }) }), (0, _defineProperty3.default)(_ref5, _def.variable.adjoinIpHeader, { data: adjoinIp }), (0, _defineProperty3.default)(_ref5, _def.variable.svcKeyHeader, { data: nuxtAppConf.svcKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.domainHeader, { data: nuxtAppConf.domain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieHeader, { data: crossParams.cookie, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieDomainHeader, { data: crossParams.cookieDomain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieSameSiteHeader, { data: conf.server.cookieSameSite, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.appKeyHeader, { data: crossParams.nuxtAppKey }), (0, _defineProperty3.default)(_ref5, _def.variable.appNameHeader, { data: crossParams.nuxtAppName }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptSwitchHeader, { data: encryptSwitch, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptTypeHeader, { data: conf.security.encrypt, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.helmetHeader, { data: conf.security.helmet.toString(), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.projectNameHeader, { data: conf.name, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.shareRuleHeader, { data: (0, _stringify2.default)(conf.shareRule) }), (0, _defineProperty3.default)(_ref5, _def.variable.baseURLHeader, { data: baseURL, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.isHttpsHeader, { data: conf.https ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.appCodeHeader, { data: appCode, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.processKeyHeader, { data: conf.processKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.childKeyHeader, { data: conf.childKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.orbCsrfHeader, { data: verifyTk.csrf, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.f5OfflineHeader, { data: nuxtAppConf.server && nuxtAppConf.server.f5Offline && !isAfk, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.servicesHeader, { data: req.headers[_def.variable.servicesHeader], noWarn: true }), (0, _defineProperty3.default)(_ref5, 'Cookie', { data: _server.Cookies.setByStr((0, _defineProperty3.default)({}, _def.variable.orbCsrfCookie, verifyTk.csrf), req.headers.cookie), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ddosSwitchHeader, { data: crossParams.ddosSwitch || '', noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.yk0VersionHeader, { data: conf.version || '', noWarn: true }), _ref5
|
|
180
|
+
return _ref5 = {}, (0, _defineProperty3.default)(_ref5, _def.variable.isDevHeader, { data: conf.dev ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.akHeader, { data: conf.ak, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ipHeader, { data: (0, _server.getClientIP)(req, { stupid: false }) }), (0, _defineProperty3.default)(_ref5, _def.variable.adjoinIpHeader, { data: adjoinIp }), (0, _defineProperty3.default)(_ref5, _def.variable.svcKeyHeader, { data: nuxtAppConf.svcKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.domainHeader, { data: nuxtAppConf.domain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieHeader, { data: crossParams.cookie, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieDomainHeader, { data: crossParams.cookieDomain, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.cookieSameSiteHeader, { data: conf.server.cookieSameSite, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.appKeyHeader, { data: crossParams.nuxtAppKey }), (0, _defineProperty3.default)(_ref5, _def.variable.appNameHeader, { data: crossParams.nuxtAppName }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptSwitchHeader, { data: encryptSwitch, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.encryptTypeHeader, { data: conf.security.encrypt, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.helmetHeader, { data: conf.security.helmet.toString(), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.projectNameHeader, { data: conf.name, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.shareRuleHeader, { data: (0, _stringify2.default)(conf.shareRule) }), (0, _defineProperty3.default)(_ref5, _def.variable.baseURLHeader, { data: baseURL, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.isHttpsHeader, { data: conf.https ? '1' : '0' }), (0, _defineProperty3.default)(_ref5, _def.variable.appCodeHeader, { data: appCode, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.processKeyHeader, { data: conf.processKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.childKeyHeader, { data: conf.childKey, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.orbCsrfHeader, { data: verifyTk.csrf, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.f5OfflineHeader, { data: nuxtAppConf.server && nuxtAppConf.server.f5Offline && !isAfk, noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.servicesHeader, { data: req.headers[_def.variable.servicesHeader], noWarn: true }), (0, _defineProperty3.default)(_ref5, 'Cookie', { data: _server.Cookies.setByStr((0, _defineProperty3.default)({}, _def.variable.orbCsrfCookie, verifyTk.csrf), req.headers.cookie), noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.ddosSwitchHeader, { data: crossParams.ddosSwitch || '', noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.yk0VersionHeader, { data: conf.version || '', noWarn: true }), (0, _defineProperty3.default)(_ref5, _def.variable.stpV23Header, {
|
|
181
|
+
data: (0, _stringify2.default)(_config2.default.server.stupid.v23), noWarn: true
|
|
182
|
+
}), _ref5;
|
|
173
183
|
};
|
|
174
184
|
|
|
175
185
|
var apiV3PathRewrite = exports.apiV3PathRewrite = function apiV3PathRewrite(path) {
|
|
@@ -204,5 +214,7 @@ var ng_conf = exports.ng_conf = function ng_conf(_ref6) {
|
|
|
204
214
|
resolver = 'resolver ' + _server._.trimEnd(resolver, ';') + ';';
|
|
205
215
|
}
|
|
206
216
|
|
|
207
|
-
|
|
217
|
+
var headers = '\n proxy_set_header ' + _def.variable.projectNameHeader + ' \'' + th[_def.variable.projectNameHeader] + '\';\n proxy_set_header ' + _def.variable.ipHeader + ' \'' + th[_def.variable.ipHeader] + '\';\n proxy_set_header ' + _def.variable.childKeyHeader + ' \'' + th[_def.variable.childKeyHeader] + '\';\n proxy_set_header ' + _def.variable.appCodeHeader + ' \'' + th[_def.variable.appCodeHeader] + '\';\n proxy_set_header ' + _def.variable.appKeyHeader + ' \'' + th[_def.variable.appKeyHeader] + '\';\n proxy_set_header ' + _def.variable.shareRuleHeader + ' \'' + th[_def.variable.shareRuleHeader] + '\';\n proxy_set_header ' + _def.variable.baseURLHeader + ' \'' + th[_def.variable.baseURLHeader] + '\';\n ';
|
|
218
|
+
|
|
219
|
+
return '\n ' + resolver + '\n\n server {\n listen ' + port + ';\n server_name cln-tire.lan;\n include ' + confRoot + '/server.conf;\n\n location ' + basePath + ' {\n proxy_pass ' + appUrl + ';\n }\n\n location ' + basePath + 'apiv1 {\n ' + headers + '\n include ' + confRoot + '/proxy.conf;\n proxy_pass ' + yk4Addr + '/apiv1/' + name + '/client/backend;\n }\n\n location ' + basePath + 'apiv1/feapiv1 {\n ' + headers + '\n include ' + confRoot + '/proxy.conf;\n proxy_pass ' + yk4Addr + '/apiv1/' + name + '/client/feapiv1;\n }\n\n location ' + basePath + 'apiv2 {\n ' + headers + '\n include ' + confRoot + '/proxy.conf;\n proxy_pass ' + yk4Addr + '/apiv2;\n }\n\n location ~ ' + basePath + 'apiv3/cln_.*feapiv1/ {\n rewrite ^' + basePath + 'apiv3/cln_(.*)feapiv1/(.*)$ ' + basePath + 'apiv3/fe/$2 last;\n include ' + confRoot + '/proxy.conf;\n proxy_pass ' + yk4Addr + ';\n }\n location ~ ' + basePath + 'apiv3/cln_[a-z]+/ {\n rewrite ^' + basePath + 'apiv3/cln_[a-z]+/(.*)$ ' + basePath + 'apiv3/backend/$1 last;\n include ' + confRoot + '/proxy.conf;\n proxy_pass ' + yk4Addr + ';\n }\n }\n ';
|
|
208
220
|
};
|
package/server/proxy/csrf.js
CHANGED
|
@@ -8,6 +8,10 @@ var _keys = require('babel-runtime/core-js/object/keys');
|
|
|
8
8
|
|
|
9
9
|
var _keys2 = _interopRequireDefault(_keys);
|
|
10
10
|
|
|
11
|
+
var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
|
|
12
|
+
|
|
13
|
+
var _defineProperty3 = _interopRequireDefault(_defineProperty2);
|
|
14
|
+
|
|
11
15
|
var _regenerator = require('babel-runtime/regenerator');
|
|
12
16
|
|
|
13
17
|
var _regenerator2 = _interopRequireDefault(_regenerator);
|
|
@@ -174,7 +178,7 @@ exports.default = function () {
|
|
|
174
178
|
var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(_ref2) {
|
|
175
179
|
var app = _ref2.app,
|
|
176
180
|
config = _ref2.config;
|
|
177
|
-
var cspConnectSrcVerify, appCp, appCpApiV1, jwtVerC, omConf, helmetOptions,
|
|
181
|
+
var cspConnectSrcVerify, appCp, appCpApiV1, jwtVerC, omConf, helmetOptions, cm;
|
|
178
182
|
return _regenerator2.default.wrap(function _callee13$(_context13) {
|
|
179
183
|
while (1) {
|
|
180
184
|
switch (_context13.prev = _context13.next) {
|
|
@@ -416,17 +420,6 @@ exports.default = function () {
|
|
|
416
420
|
}());
|
|
417
421
|
|
|
418
422
|
// cln init
|
|
419
|
-
_server.global.__yk_cln_init_client__ = '';
|
|
420
|
-
_server.global.__yk_cln_init_server__ = '';
|
|
421
|
-
|
|
422
|
-
clnInitCache = function clnInitCache(ctx) {
|
|
423
|
-
(0, _control.useCache)(ctx, {
|
|
424
|
-
maxAge: 60 * 60 * 24 * 66, // 66天
|
|
425
|
-
sMaxAge: 60 * 60 * 24, // 1天
|
|
426
|
-
public: true
|
|
427
|
-
});
|
|
428
|
-
};
|
|
429
|
-
|
|
430
423
|
if (_config2.default.security.helmet && _config2.default.security.isStupid) {
|
|
431
424
|
if (typeof _config2.default.server.csp.custom === "string") {
|
|
432
425
|
app.use(function () {
|
|
@@ -455,6 +448,9 @@ exports.default = function () {
|
|
|
455
448
|
}
|
|
456
449
|
}
|
|
457
450
|
|
|
451
|
+
_server.global.__yk_cln_init_client__ = (0, _defineProperty3.default)({}, config.appName, '');
|
|
452
|
+
_server.global.__yk_cln_init_server__ = (0, _defineProperty3.default)({}, config.appName, '');
|
|
453
|
+
|
|
458
454
|
app.use(function () {
|
|
459
455
|
var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx, next) {
|
|
460
456
|
var ycp;
|
|
@@ -471,10 +467,10 @@ exports.default = function () {
|
|
|
471
467
|
|
|
472
468
|
(0, _control.noCache)(ctx);
|
|
473
469
|
// clnInitCache(ctx)
|
|
474
|
-
_server.global.__yk_cln_init_client__ = _server.global.__yk_cln_init_client__ || _paths2.default.read(ycp.confClient);
|
|
470
|
+
_server.global.__yk_cln_init_client__[config.appName] = _server.global.__yk_cln_init_client__[config.appName] || _paths2.default.read(ycp.confClient);
|
|
475
471
|
// const str = paths.read(ycp.confClient);
|
|
476
472
|
ctx.status = 200;
|
|
477
|
-
ctx.body = _server.global.__yk_cln_init_client__;
|
|
473
|
+
ctx.body = _server.global.__yk_cln_init_client__[config.appName];
|
|
478
474
|
ctx.type = 'application/javascript; charset=utf-8';
|
|
479
475
|
_context3.next = 18;
|
|
480
476
|
break;
|
|
@@ -486,12 +482,12 @@ exports.default = function () {
|
|
|
486
482
|
}
|
|
487
483
|
|
|
488
484
|
// noCache(ctx);
|
|
489
|
-
clnInitCache(ctx);
|
|
485
|
+
(0, _control.clnInitCache)(ctx);
|
|
490
486
|
// const str = paths.read(ycp.confServer);
|
|
491
|
-
_server.global.__yk_cln_init_server__ = _server.global.__yk_cln_init_server__ || _paths2.default.read(ycp.confServer);
|
|
487
|
+
_server.global.__yk_cln_init_server__[config.appName] = _server.global.__yk_cln_init_server__[config.appName] || _paths2.default.read(ycp.confServer);
|
|
492
488
|
// global.__yk_cln_init_server__ = paths.read(ycp.confServer)
|
|
493
489
|
ctx.status = 200;
|
|
494
|
-
ctx.body = _server.global.__yk_cln_init_server__;
|
|
490
|
+
ctx.body = _server.global.__yk_cln_init_server__[config.appName];
|
|
495
491
|
_context3.next = 18;
|
|
496
492
|
break;
|
|
497
493
|
|
|
@@ -748,7 +744,7 @@ exports.default = function () {
|
|
|
748
744
|
break;
|
|
749
745
|
}
|
|
750
746
|
|
|
751
|
-
ctx.cookies.set(_config2.default.server.sslify.openKey, '
|
|
747
|
+
ctx.cookies.set(_config2.default.server.sslify.openKey, '_', {
|
|
752
748
|
signed: false,
|
|
753
749
|
sameSite: _config2.default.server.cookieSameSite
|
|
754
750
|
});
|
|
@@ -973,7 +969,7 @@ exports.default = function () {
|
|
|
973
969
|
};
|
|
974
970
|
}());
|
|
975
971
|
|
|
976
|
-
case
|
|
972
|
+
case 21:
|
|
977
973
|
case 'end':
|
|
978
974
|
return _context13.stop();
|
|
979
975
|
}
|
package/server/proxy/tire.js
CHANGED
|
@@ -92,7 +92,7 @@ exports.default = function () {
|
|
|
92
92
|
var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(_ref) {
|
|
93
93
|
var config = _ref.config;
|
|
94
94
|
|
|
95
|
-
var appConf, guPort, appConfPort, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _th, th, basePath, conf, _pathRewrite;
|
|
95
|
+
var appConf, guPort, appConfPort, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _th, baseURL, th, basePath, conf, _pathRewrite;
|
|
96
96
|
|
|
97
97
|
return _regenerator2.default.wrap(function _callee4$(_context4) {
|
|
98
98
|
while (1) {
|
|
@@ -304,13 +304,13 @@ exports.default = function () {
|
|
|
304
304
|
// app.use((req, res, next) => {
|
|
305
305
|
// const ycp = paths.ykConfigJsonClient(config.appName);
|
|
306
306
|
// if (req.method.toUpperCase() === 'GET' && req.path === `${config.appConf.server.basePathMU}cln/init.js`) {
|
|
307
|
-
//
|
|
307
|
+
// noCache(res);
|
|
308
308
|
// global.__yk_cln_init_client__ = global.__yk_cln_init_client__ || paths.read(ycp.confClient)
|
|
309
309
|
// res.setHeader('Content-Type', 'application/javascript; charset=utf-8')
|
|
310
310
|
// res.status(200).send(global.__yk_cln_init_client__)
|
|
311
311
|
// } else if (req.method.toUpperCase() === 'GET' && req.path === `${config.appConf.server.basePathMU}cln/ini`){
|
|
312
312
|
// // noCache(ctx);
|
|
313
|
-
//
|
|
313
|
+
// clnInitCache(res)
|
|
314
314
|
// global.__yk_cln_init_server__ = global.__yk_cln_init_server__ || paths.read(ycp.confServer)
|
|
315
315
|
// res.status(200).send(global.__yk_cln_init_server__)
|
|
316
316
|
// } else {
|
|
@@ -451,7 +451,8 @@ exports.default = function () {
|
|
|
451
451
|
(0, _child_process.exec)(_config2.default.server.tire.guPath + ' -s stop');
|
|
452
452
|
// spawn(yConf.server.tire.guPath, ['-s', 'stop']);
|
|
453
453
|
} catch (e) {}
|
|
454
|
-
|
|
454
|
+
baseURL = _config2.default.router.config[appName] && _config2.default.router.config[appName].proxyServer.baseURL || _config2.default.proxyServer.baseURL;
|
|
455
|
+
th = (_th = {}, (0, _defineProperty3.default)(_th, _def.variable.projectNameHeader, _config2.default.name), (0, _defineProperty3.default)(_th, _def.variable.ipHeader, '127.0.0.1'), (0, _defineProperty3.default)(_th, _def.variable.childKeyHeader, _config2.default.childKey), (0, _defineProperty3.default)(_th, _def.variable.appCodeHeader, config.appConf.appCode), (0, _defineProperty3.default)(_th, _def.variable.appKeyHeader, config.appKey), (0, _defineProperty3.default)(_th, _def.variable.shareRuleHeader, (0, _stringify2.default)(_config2.default.shareRule)), (0, _defineProperty3.default)(_th, _def.variable.baseURLHeader, baseURL), _th);
|
|
455
456
|
basePath = _server._.bothAddFix(config.appConf.server.basePath, "/");
|
|
456
457
|
|
|
457
458
|
|
|
@@ -477,6 +478,7 @@ exports.default = function () {
|
|
|
477
478
|
})));
|
|
478
479
|
|
|
479
480
|
app.use(basePath + "apiv2", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
|
|
481
|
+
headers: th,
|
|
480
482
|
target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
|
|
481
483
|
pathRewrite: (0, _defineProperty3.default)({}, "^" + basePath + "apiv2", "/apiv2")
|
|
482
484
|
})));
|
package/template/http.plugin.js
CHANGED
|
@@ -5,6 +5,7 @@ import {variable} from 'yakuza1/lib/config/def';
|
|
|
5
5
|
import {symmetry, asymmetric, abstract} from 'yakuza1/lib/encrypt';
|
|
6
6
|
import urlib from 'yakuza1/lib/http';
|
|
7
7
|
|
|
8
|
+
global.__yk_gu__ = global.__yk_gu__ || {};
|
|
8
9
|
export default (ctx, inject) => {
|
|
9
10
|
const {$yk, req, $utils} = ctx;
|
|
10
11
|
const cookieStr = Cookies.koaGetCookieStr({req});
|
|
@@ -62,17 +63,17 @@ export default (ctx, inject) => {
|
|
|
62
63
|
// defaults.headers[variable.adjoinIpHeader] = getClientIP(req, {stupid: true});
|
|
63
64
|
|
|
64
65
|
if (req.headers) {
|
|
65
|
-
global.
|
|
66
|
-
global.
|
|
67
|
-
global.
|
|
68
|
-
defaults.headers[variable.guRouteGroupHeader] = global.__gu_group__;
|
|
69
|
-
defaults.headers[variable.guRouteNameHeader] = global.__gu_name__;
|
|
70
|
-
defaults.headers[variable.guRouteVerHeader] = global.__gu_ver__;
|
|
66
|
+
global.__yk_gu__[variable.guRouteGroupHeader] = req.headers[variable.guRouteGroupHeader] || global.__yk_gu__[variable.guRouteGroupHeader];
|
|
67
|
+
global.__yk_gu__[variable.guRouteNameHeader] = req.headers[variable.guRouteNameHeader] || global.__yk_gu__[variable.guRouteNameHeader];
|
|
68
|
+
global.__yk_gu__[variable.guRouteVerHeader] = req.headers[variable.guRouteVerHeader] || global.__yk_gu__[variable.guRouteVerHeader];
|
|
71
69
|
defaults.headers[variable.adjoinIpHeader] = req.headers[variable.adjoinIpHeader];
|
|
72
70
|
defaults.headers[variable.forwardedForHeader] = req.headers[variable.forwardedForHeader];
|
|
73
71
|
}
|
|
74
72
|
}
|
|
75
73
|
}
|
|
74
|
+
defaults.headers[variable.guRouteGroupHeader] = global.__yk_gu__[variable.guRouteGroupHeader];
|
|
75
|
+
defaults.headers[variable.guRouteNameHeader] = global.__yk_gu__[variable.guRouteNameHeader];
|
|
76
|
+
defaults.headers[variable.guRouteVerHeader] = global.__yk_gu__[variable.guRouteVerHeader];
|
|
76
77
|
// Create new HTTP instance
|
|
77
78
|
const http = urlib({
|
|
78
79
|
...defaults,
|
|
@@ -8,12 +8,13 @@ const setCookie = (key, value, options) => {
|
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
if (checkServer()) {
|
|
11
|
-
let cs = `${key}=${value}
|
|
11
|
+
let cs = `${key}=${value}`;
|
|
12
12
|
if (opt.domain) {
|
|
13
13
|
cs += '; Domain=' + opt.domain
|
|
14
14
|
}
|
|
15
15
|
if (opt.res) {
|
|
16
|
-
opt.res.
|
|
16
|
+
const rc = opt.res.getHeader && opt.res.getHeader('Set-Cookie');
|
|
17
|
+
opt.res.setHeader('Set-Cookie', [cs, ...(_.isArray(rc) ? rc : [])]);
|
|
17
18
|
}
|
|
18
19
|
} else {
|
|
19
20
|
Cookies.set(key, value, {domain: opt.domain})
|
|
@@ -22,6 +23,39 @@ const setCookie = (key, value, options) => {
|
|
|
22
23
|
|
|
23
24
|
export default async (ctx, inject) => {
|
|
24
25
|
const {redirect, $yk, req, res} = ctx
|
|
26
|
+
const appName = $yk.appName;
|
|
27
|
+
|
|
28
|
+
const matchLocal = (url) => {
|
|
29
|
+
if (typeof url === 'string') {
|
|
30
|
+
let isMatch = false;
|
|
31
|
+
let hostname = _.cloneDeep($yk.hostname);
|
|
32
|
+
const trimPrefix = $yk.hostname && $yk.hostname[appName] && $yk.hostname[appName].value || '__prefix';
|
|
33
|
+
const basePath = $yk.appConf.server.basePath;
|
|
34
|
+
if (_.startsWith(url, trimPrefix)) {
|
|
35
|
+
isMatch = true;
|
|
36
|
+
}
|
|
37
|
+
if (basePath === '/') {
|
|
38
|
+
hostname = _.omit(hostname, appName);
|
|
39
|
+
|
|
40
|
+
for (const ap in hostname) {
|
|
41
|
+
if (_.startsWith(url, hostname[ap].value)) {
|
|
42
|
+
isMatch = false
|
|
43
|
+
break;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
if (isMatch) {
|
|
49
|
+
url = _.replace(url, trimPrefix, '');
|
|
50
|
+
|
|
51
|
+
if (!url.startsWith('/')) {
|
|
52
|
+
url = '/' + url
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
return url;
|
|
58
|
+
}
|
|
25
59
|
|
|
26
60
|
const $redirect = (...args) => {
|
|
27
61
|
let url = args[0]
|
|
@@ -36,16 +70,18 @@ export default async (ctx, inject) => {
|
|
|
36
70
|
}
|
|
37
71
|
let prefix = '';
|
|
38
72
|
|
|
39
|
-
|
|
73
|
+
if (!$yk.firstRefresh) {
|
|
74
|
+
setCookie(yConf.server.redirect.afkKey, '', {res, domain: $yk.appConf.cookieDomain})
|
|
75
|
+
}
|
|
40
76
|
|
|
41
77
|
if (typeof url === 'string') {
|
|
78
|
+
url = matchLocal(url);
|
|
42
79
|
const parse = _.urlParse(url)
|
|
43
80
|
|
|
44
81
|
if (parse.host) {
|
|
45
82
|
isOuter = true;
|
|
46
83
|
prefix = parse.protocols ? parse.protocols : 'http://'
|
|
47
84
|
}
|
|
48
|
-
|
|
49
85
|
url = prefix + parse.crop
|
|
50
86
|
}
|
|
51
87
|
|
|
@@ -48,7 +48,7 @@ export default async (ctx, inject) => {
|
|
|
48
48
|
if (!yConf.standAlone) {
|
|
49
49
|
if ($utils.checkServer() || !yConf.server.heartbeat.enabled) {
|
|
50
50
|
event.set = async (...args) => {
|
|
51
|
-
console.log(args);
|
|
51
|
+
// console.log(args);
|
|
52
52
|
let [key, data, options] = [null, null, {}];
|
|
53
53
|
|
|
54
54
|
switch (args.length) {
|
package/template/yk.plugin.js
CHANGED
package/utils/inclusive.js
CHANGED
|
@@ -25,6 +25,10 @@ var _extends2 = require('babel-runtime/helpers/extends');
|
|
|
25
25
|
|
|
26
26
|
var _extends3 = _interopRequireDefault(_extends2);
|
|
27
27
|
|
|
28
|
+
var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
|
|
29
|
+
|
|
30
|
+
var _defineProperty3 = _interopRequireDefault(_defineProperty2);
|
|
31
|
+
|
|
28
32
|
var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
|
|
29
33
|
|
|
30
34
|
var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
|
|
@@ -195,6 +199,8 @@ var appPool = _yakuza._.range(26000, 26100);
|
|
|
195
199
|
|
|
196
200
|
var render = function () {
|
|
197
201
|
var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(_ref) {
|
|
202
|
+
var _headers;
|
|
203
|
+
|
|
198
204
|
var apps = _ref.apps,
|
|
199
205
|
enabledAll = _ref.enabledAll,
|
|
200
206
|
ykServerEnv = _ref.ykServerEnv,
|
|
@@ -303,7 +309,7 @@ var render = function () {
|
|
|
303
309
|
|
|
304
310
|
// docker: false,
|
|
305
311
|
mockIP: false,
|
|
306
|
-
f5Offline:
|
|
312
|
+
f5Offline: undefined,
|
|
307
313
|
passphrase: '',
|
|
308
314
|
orbProtocol: {
|
|
309
315
|
ws: 'ws:',
|
|
@@ -397,7 +403,11 @@ var render = function () {
|
|
|
397
403
|
cookie_key: "__GU_VER",
|
|
398
404
|
ver: "",
|
|
399
405
|
expires: 30,
|
|
400
|
-
routeGroup: ""
|
|
406
|
+
routeGroup: "",
|
|
407
|
+
debug: {
|
|
408
|
+
enabled: false,
|
|
409
|
+
headers: (_headers = {}, (0, _defineProperty3.default)(_headers, _def.variable.guRouteGroupHeader, ""), (0, _defineProperty3.default)(_headers, _def.variable.guRouteNameHeader, ""), (0, _defineProperty3.default)(_headers, _def.variable.guRouteVerHeader, ""), _headers)
|
|
410
|
+
}
|
|
401
411
|
},
|
|
402
412
|
console: {
|
|
403
413
|
enabled: true,
|
|
@@ -518,10 +528,17 @@ var render = function () {
|
|
|
518
528
|
},
|
|
519
529
|
stupid: {
|
|
520
530
|
referrerPolicy: { policy: "strict-origin-when-cross-origin" },
|
|
521
|
-
crossOriginResourcePolicy: { policy: "same-origin" }
|
|
531
|
+
crossOriginResourcePolicy: { policy: "same-origin" },
|
|
532
|
+
standard: "v23", // v13
|
|
533
|
+
v23: {
|
|
534
|
+
// aMark: '__cfo_complete_',
|
|
535
|
+
enabled: true,
|
|
536
|
+
tsLoading: 5000,
|
|
537
|
+
tsLoaded: 120000
|
|
538
|
+
}
|
|
522
539
|
},
|
|
523
540
|
tire: {
|
|
524
|
-
guPath: '/
|
|
541
|
+
guPath: '/gu',
|
|
525
542
|
guConf: '/etc/nginx/nginx.conf',
|
|
526
543
|
clnConf: '/etc/nginx/conf.d/cln2.conf',
|
|
527
544
|
resolve: ''
|
|
@@ -791,41 +808,40 @@ var render = function () {
|
|
|
791
808
|
|
|
792
809
|
case 28:
|
|
793
810
|
_context2.t1 = conf.dkyMode;
|
|
794
|
-
_context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ?
|
|
811
|
+
_context2.next = _context2.t1 === "dev" ? 31 : _context2.t1 === "normal" ? 35 : _context2.t1 === "prod" ? 39 : _context2.t1 === "stupid" ? 46 : _context2.t1 === "tire" ? 56 : 63;
|
|
795
812
|
break;
|
|
796
813
|
|
|
797
814
|
case 31:
|
|
798
815
|
// conf.security.encrypt = "none";
|
|
799
816
|
// conf.security.stupid = false;
|
|
800
817
|
// conf.security.helmet = true;
|
|
801
|
-
|
|
818
|
+
conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
|
|
802
819
|
conf.security.isDev = true;
|
|
803
820
|
conf.dev = true;
|
|
804
|
-
return _context2.abrupt('break',
|
|
821
|
+
return _context2.abrupt('break', 63);
|
|
805
822
|
|
|
806
|
-
case
|
|
823
|
+
case 35:
|
|
807
824
|
// conf.security.encrypt = "none";
|
|
808
825
|
// conf.security.stupid = false;
|
|
809
826
|
// conf.security.helmet = true;
|
|
810
|
-
|
|
827
|
+
conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
|
|
811
828
|
conf.security.isNormal = true;
|
|
812
829
|
conf.dev = false;
|
|
813
|
-
return _context2.abrupt('break',
|
|
830
|
+
return _context2.abrupt('break', 63);
|
|
814
831
|
|
|
815
|
-
case
|
|
832
|
+
case 39:
|
|
816
833
|
conf.security.encrypt = "sm";
|
|
817
834
|
conf.security.stupid = false;
|
|
818
835
|
conf.security.helmet = true;
|
|
819
|
-
|
|
836
|
+
conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
|
|
820
837
|
conf.security.isProd = true;
|
|
821
838
|
conf.dev = false;
|
|
822
|
-
return _context2.abrupt('break',
|
|
839
|
+
return _context2.abrupt('break', 63);
|
|
823
840
|
|
|
824
|
-
case
|
|
841
|
+
case 46:
|
|
825
842
|
conf.security.encrypt = "sm";
|
|
826
843
|
conf.security.stupid = true;
|
|
827
844
|
conf.security.helmet = true;
|
|
828
|
-
// conf.server.f5Offline = false;
|
|
829
845
|
conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, true);
|
|
830
846
|
conf.security.isStupid = true;
|
|
831
847
|
conf.server.csp.enabled = true;
|
|
@@ -833,21 +849,22 @@ var render = function () {
|
|
|
833
849
|
conf.server.csp.decoration = checkBoolSingle(conf.server.csp.decoration, true);
|
|
834
850
|
conf.server.sri.enabled = true;
|
|
835
851
|
// conf.dev = false;
|
|
836
|
-
return _context2.abrupt('break',
|
|
852
|
+
return _context2.abrupt('break', 63);
|
|
837
853
|
|
|
838
|
-
case
|
|
854
|
+
case 56:
|
|
839
855
|
conf.security.encrypt = "none";
|
|
840
856
|
conf.security.stupid = false;
|
|
841
857
|
conf.security.helmet = false;
|
|
842
|
-
|
|
858
|
+
conf.server.f5Offline = checkBoolSingle(conf.server.f5Offline, false);
|
|
843
859
|
conf.security.isTire = true;
|
|
844
860
|
// conf.server.heartbeat.enabled = checkBoolSingle(conf.server.heartbeat.enabled, false);
|
|
845
861
|
conf.server.heartbeat.enabled = false;
|
|
846
862
|
// conf.dev = false;
|
|
847
|
-
return _context2.abrupt('break',
|
|
863
|
+
return _context2.abrupt('break', 63);
|
|
848
864
|
|
|
849
|
-
case
|
|
865
|
+
case 63:
|
|
850
866
|
|
|
867
|
+
conf.server.stupid.v23.enabled = conf.server.stupid.standard === 'v23';
|
|
851
868
|
// conf.router.config['app.examples'].enabled = true;
|
|
852
869
|
if (conf.server.yk4Addr) {
|
|
853
870
|
conf.server.orbAddr = conf.server.yk4Addr;
|
|
@@ -946,7 +963,7 @@ var render = function () {
|
|
|
946
963
|
conf.server.csp.directives = directives;
|
|
947
964
|
|
|
948
965
|
// const appPortUsed = [];
|
|
949
|
-
_context2.next =
|
|
966
|
+
_context2.next = 85;
|
|
950
967
|
return _yakuza._.asyncMap(conf.router.config, function () {
|
|
951
968
|
var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(v, key) {
|
|
952
969
|
var name, arr, length, num;
|
|
@@ -1131,7 +1148,7 @@ var render = function () {
|
|
|
1131
1148
|
};
|
|
1132
1149
|
}());
|
|
1133
1150
|
|
|
1134
|
-
case
|
|
1151
|
+
case 85:
|
|
1135
1152
|
// console.log(conf.router.config);
|
|
1136
1153
|
|
|
1137
1154
|
conf.shareRule.app = conf.shareRule.app.map(function (ap) {
|
|
@@ -1253,7 +1270,7 @@ var render = function () {
|
|
|
1253
1270
|
|
|
1254
1271
|
return _context2.abrupt('return', { conf: conf });
|
|
1255
1272
|
|
|
1256
|
-
case
|
|
1273
|
+
case 96:
|
|
1257
1274
|
case 'end':
|
|
1258
1275
|
return _context2.stop();
|
|
1259
1276
|
}
|
package/utils/secret.js
CHANGED
|
@@ -61,7 +61,7 @@ var secret = {};
|
|
|
61
61
|
// import {mixin} from "yakuza1/lib/encrypt";
|
|
62
62
|
// import {asymmetric, getKey, symmetry} from "yakuza1/lib/encrypt/sm";
|
|
63
63
|
|
|
64
|
-
|
|
64
|
+
_yakuza.global.__yk_gu__ = _yakuza.global.__yk_gu__ || {};
|
|
65
65
|
|
|
66
66
|
// const allowHeaders = {
|
|
67
67
|
// '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',
|
|
@@ -155,23 +155,33 @@ var toLowerObjKey = function toLowerObjKey(data) {
|
|
|
155
155
|
});
|
|
156
156
|
};
|
|
157
157
|
|
|
158
|
-
var
|
|
159
|
-
var
|
|
158
|
+
var addCookieStr = function addCookieStr(req, oc, key) {
|
|
159
|
+
var match = '';
|
|
160
160
|
if ((0, _yakuza.checkServer)() && req && req.headers && req.headers.cookie) {
|
|
161
|
-
|
|
161
|
+
match = _yakuza.Cookies.getByStr(key, req.headers.cookie);
|
|
162
162
|
} else {
|
|
163
|
-
|
|
163
|
+
match = _yakuza.Cookies.get(key);
|
|
164
164
|
}
|
|
165
165
|
|
|
166
|
-
if (
|
|
167
|
-
var rs =
|
|
168
|
-
if (oc) {
|
|
169
|
-
oc
|
|
166
|
+
if (match === '') {
|
|
167
|
+
var rs = key + "=";
|
|
168
|
+
if (typeof oc === "string" && oc.length > 0) {
|
|
169
|
+
if (oc.endsWith(";") || oc.endsWith("; ")) {
|
|
170
|
+
oc += rs;
|
|
171
|
+
} else {
|
|
172
|
+
oc += '; ' + rs;
|
|
173
|
+
}
|
|
170
174
|
} else {
|
|
171
175
|
oc = rs;
|
|
172
176
|
}
|
|
173
177
|
}
|
|
174
|
-
return oc
|
|
178
|
+
return oc;
|
|
179
|
+
};
|
|
180
|
+
|
|
181
|
+
var setOfflineCookie = function setOfflineCookie(req, oc) {
|
|
182
|
+
oc = addCookieStr(req, oc, _config2.default.server.redirect.afkKey);
|
|
183
|
+
// oc = addCookieStr(req, oc, yConf.server.stupid.v2023_12.aMark)
|
|
184
|
+
return oc;
|
|
175
185
|
};
|
|
176
186
|
|
|
177
187
|
var set = exports.set = function set(_ref3) {
|
|
@@ -198,9 +208,19 @@ var set = exports.set = function set(_ref3) {
|
|
|
198
208
|
|
|
199
209
|
yc.proxyServer = $yk.proxyServer;
|
|
200
210
|
_yakuza._.readOnly(_yakuza.global, '__yk_conf__', yc);
|
|
211
|
+
// let f5OfflineHeaders = {};
|
|
212
|
+
// if (checkServer()) {
|
|
213
|
+
// f5OfflineHeaders = {
|
|
214
|
+
// [variable.f5OfflineHeader]: $yk.server.f5Offline,
|
|
215
|
+
// [variable.stpV23Header]: yConf.server.stupid.v23,
|
|
216
|
+
// }
|
|
217
|
+
// }
|
|
218
|
+
if (yc.server.gray && yc.server.gray.debug && yc.server.gray.debug.enabled) {
|
|
219
|
+
_yakuza.global.__yk_gu__ = yc.server.gray.debug.headers;
|
|
220
|
+
}
|
|
201
221
|
|
|
202
222
|
if ($yk.standAlone) {
|
|
203
|
-
_context9.next =
|
|
223
|
+
_context9.next = 29;
|
|
204
224
|
break;
|
|
205
225
|
}
|
|
206
226
|
|
|
@@ -224,6 +244,15 @@ var set = exports.set = function set(_ref3) {
|
|
|
224
244
|
_yakuza._.readOnly($yk.api.v3, 'secretKey', spiSecret);
|
|
225
245
|
parser = new _uaParserJs2.default();
|
|
226
246
|
|
|
247
|
+
// if (!checkServer()) {
|
|
248
|
+
// window.addEventListener('unload', async () => {
|
|
249
|
+
// // 执行一些清理工作或显示警告
|
|
250
|
+
// var message = '您有未保存的更改,确定要离开吗?';
|
|
251
|
+
// event.returnValue = message; // 兼容旧版浏览器
|
|
252
|
+
// return message;
|
|
253
|
+
// });
|
|
254
|
+
// }
|
|
255
|
+
|
|
227
256
|
setUniversal = function setUniversal() {
|
|
228
257
|
if (spiData && spiData.SpiCgiBinData) {
|
|
229
258
|
_yakuza._.readOnly($yk.api.v3, 'cgiBin', spiData.SpiCgiBinData, {
|
|
@@ -247,11 +276,11 @@ var set = exports.set = function set(_ref3) {
|
|
|
247
276
|
// name: h['x-gu-route-name'] || secret_gu['x-gu-route-name'],
|
|
248
277
|
// ver: h['x-gu-route-ver'] || secret_gu['x-gu-route-ver'],
|
|
249
278
|
// };
|
|
250
|
-
[
|
|
251
|
-
|
|
279
|
+
[_def.variable.guRouteVerHeader, _def.variable.guRouteNameHeader, _def.variable.guRouteGroupHeader].forEach(function (v) {
|
|
280
|
+
_yakuza.global.__yk_gu__[v] = h[v] || _yakuza.global.__yk_gu__[v];
|
|
252
281
|
});
|
|
253
|
-
store.dispatch('__yk_init__/setGU',
|
|
254
|
-
$yk.gu =
|
|
282
|
+
store.dispatch('__yk_init__/setGU', _yakuza.global.__yk_gu__);
|
|
283
|
+
$yk.gu = _yakuza.global.__yk_gu__;
|
|
255
284
|
} else {
|
|
256
285
|
$yk.gu = store.state.__yk_init__ && store.state.__yk_init__.gu || {};
|
|
257
286
|
}
|
|
@@ -262,7 +291,7 @@ var set = exports.set = function set(_ref3) {
|
|
|
262
291
|
};
|
|
263
292
|
|
|
264
293
|
if (!w) {
|
|
265
|
-
_context9.next =
|
|
294
|
+
_context9.next = 29;
|
|
266
295
|
break;
|
|
267
296
|
}
|
|
268
297
|
|
|
@@ -312,7 +341,7 @@ var set = exports.set = function set(_ref3) {
|
|
|
312
341
|
|
|
313
342
|
Cookie = _yakuza.Cookies.koaGetCookieStr({ req: req });
|
|
314
343
|
|
|
315
|
-
Cookie =
|
|
344
|
+
Cookie = setOfflineCookie(req, Cookie);
|
|
316
345
|
ucHeaders = (0, _defineProperty3.default)({
|
|
317
346
|
Cookie: Cookie
|
|
318
347
|
}, _def.variable.clientKeyHeader, mixin.symmetry.CBC.encrypt((0, _yakuza.md5)((0, _yakuza.uuid)())));
|
|
@@ -374,13 +403,14 @@ var set = exports.set = function set(_ref3) {
|
|
|
374
403
|
appName: $yk.appName
|
|
375
404
|
});
|
|
376
405
|
|
|
377
|
-
ucResC =
|
|
406
|
+
ucResC = setOfflineCookie(req, ucResC);
|
|
378
407
|
_context5.prev = 4;
|
|
379
408
|
_context5.next = 7;
|
|
380
409
|
return _universal2.default.post($yk.origin + "/apiv2/support/svc/svcInSsrWithServer", {
|
|
381
410
|
json: ssrBody,
|
|
382
411
|
headers: {
|
|
383
412
|
Cookie: ucResC
|
|
413
|
+
// ...f5OfflineHeaders,
|
|
384
414
|
},
|
|
385
415
|
timeout: timeout
|
|
386
416
|
});
|
|
@@ -427,14 +457,14 @@ var set = exports.set = function set(_ref3) {
|
|
|
427
457
|
|
|
428
458
|
getSvc = function () {
|
|
429
459
|
var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
|
|
430
|
-
var finger, _require, fingerprint, secretBody, secretData, secretReq, setData, setFinger, query;
|
|
460
|
+
var finger, _require, fingerprint, secretBody, secretData, secretReq, setData, setFinger, query, ping;
|
|
431
461
|
|
|
432
462
|
return _regenerator2.default.wrap(function _callee8$(_context8) {
|
|
433
463
|
while (1) {
|
|
434
464
|
switch (_context8.prev = _context8.next) {
|
|
435
465
|
case 0:
|
|
436
466
|
if ((0, _yakuza.checkServer)()) {
|
|
437
|
-
_context8.next =
|
|
467
|
+
_context8.next = 30;
|
|
438
468
|
break;
|
|
439
469
|
}
|
|
440
470
|
|
|
@@ -458,7 +488,8 @@ var set = exports.set = function set(_ref3) {
|
|
|
458
488
|
finger: finger,
|
|
459
489
|
timestamp: (0, _yakuza.dayjs)().unix()
|
|
460
490
|
}, spi, {
|
|
461
|
-
spiSecret: spiSecret
|
|
491
|
+
spiSecret: spiSecret,
|
|
492
|
+
offline: 0
|
|
462
493
|
});
|
|
463
494
|
secretData = {};
|
|
464
495
|
|
|
@@ -563,7 +594,7 @@ var set = exports.set = function set(_ref3) {
|
|
|
563
594
|
};
|
|
564
595
|
|
|
565
596
|
if (!_config2.default.server.heartbeat.enabled) {
|
|
566
|
-
_context8.next =
|
|
597
|
+
_context8.next = 27;
|
|
567
598
|
break;
|
|
568
599
|
}
|
|
569
600
|
|
|
@@ -586,11 +617,12 @@ var set = exports.set = function set(_ref3) {
|
|
|
586
617
|
case 2:
|
|
587
618
|
secretData = _context7.sent;
|
|
588
619
|
|
|
620
|
+
secretBody.offline = 0;
|
|
589
621
|
|
|
590
622
|
setData();
|
|
591
623
|
setFinger();
|
|
592
624
|
|
|
593
|
-
case
|
|
625
|
+
case 6:
|
|
594
626
|
case "end":
|
|
595
627
|
return _context7.stop();
|
|
596
628
|
}
|
|
@@ -607,39 +639,40 @@ var set = exports.set = function set(_ref3) {
|
|
|
607
639
|
});
|
|
608
640
|
|
|
609
641
|
case 17:
|
|
610
|
-
|
|
642
|
+
ping = _context8.sent;
|
|
643
|
+
_context8.next = 25;
|
|
611
644
|
break;
|
|
612
645
|
|
|
613
|
-
case
|
|
614
|
-
_context8.prev =
|
|
646
|
+
case 20:
|
|
647
|
+
_context8.prev = 20;
|
|
615
648
|
_context8.t0 = _context8["catch"](14);
|
|
616
|
-
_context8.next =
|
|
649
|
+
_context8.next = 24;
|
|
617
650
|
return secretReq();
|
|
618
651
|
|
|
619
|
-
case
|
|
652
|
+
case 24:
|
|
620
653
|
setData();
|
|
621
654
|
|
|
622
|
-
case
|
|
623
|
-
_context8.next =
|
|
655
|
+
case 25:
|
|
656
|
+
_context8.next = 30;
|
|
624
657
|
break;
|
|
625
658
|
|
|
626
|
-
case
|
|
627
|
-
_context8.next =
|
|
659
|
+
case 27:
|
|
660
|
+
_context8.next = 29;
|
|
628
661
|
return secretReq();
|
|
629
662
|
|
|
630
|
-
case
|
|
663
|
+
case 29:
|
|
631
664
|
setData();
|
|
632
665
|
|
|
633
|
-
case
|
|
666
|
+
case 30:
|
|
634
667
|
|
|
635
668
|
setUniversal();
|
|
636
669
|
|
|
637
|
-
case
|
|
670
|
+
case 31:
|
|
638
671
|
case "end":
|
|
639
672
|
return _context8.stop();
|
|
640
673
|
}
|
|
641
674
|
}
|
|
642
|
-
}, _callee8, undefined, [[14,
|
|
675
|
+
}, _callee8, undefined, [[14, 20]]);
|
|
643
676
|
}));
|
|
644
677
|
|
|
645
678
|
return function getSvc() {
|
|
@@ -647,18 +680,18 @@ var set = exports.set = function set(_ref3) {
|
|
|
647
680
|
};
|
|
648
681
|
}();
|
|
649
682
|
|
|
650
|
-
_context9.next =
|
|
683
|
+
_context9.next = 25;
|
|
651
684
|
return getUc();
|
|
652
685
|
|
|
653
|
-
case
|
|
654
|
-
_context9.next =
|
|
686
|
+
case 25:
|
|
687
|
+
_context9.next = 27;
|
|
655
688
|
return getSvcInSsrWithServer();
|
|
656
689
|
|
|
657
|
-
case
|
|
658
|
-
_context9.next =
|
|
690
|
+
case 27:
|
|
691
|
+
_context9.next = 29;
|
|
659
692
|
return getSvc();
|
|
660
693
|
|
|
661
|
-
case
|
|
694
|
+
case 29:
|
|
662
695
|
case "end":
|
|
663
696
|
return _context9.stop();
|
|
664
697
|
}
|