yakuza0 2.22.34-beta.0 → 2.22.34-beta.2
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/package.json +1 -1
- package/server/proxy/conf.js +8 -2
- package/server/proxy/tire.js +6 -1
- package/utils/inclusive.js +2 -1
package/package.json
CHANGED
package/server/proxy/conf.js
CHANGED
|
@@ -191,12 +191,18 @@ var ng_conf = exports.ng_conf = function ng_conf(_ref6) {
|
|
|
191
191
|
port = _ref6.port,
|
|
192
192
|
yk4Addr = _ref6.yk4Addr,
|
|
193
193
|
basePath = _ref6.basePath,
|
|
194
|
-
name = _ref6.name
|
|
194
|
+
name = _ref6.name,
|
|
195
|
+
resolver = _ref6.resolver;
|
|
195
196
|
|
|
196
197
|
var confRoot = '/etc/nginx/extra';
|
|
197
198
|
if (_os2.default.platform() === 'darwin') {
|
|
198
199
|
confRoot = '/opt/homebrew/etc/nginx/extra';
|
|
199
200
|
}
|
|
201
|
+
if (!resolver) {
|
|
202
|
+
resolver = '';
|
|
203
|
+
} else {
|
|
204
|
+
resolver = 'resolver ' + _server._.trimEnd(resolver, ';') + ';';
|
|
205
|
+
}
|
|
200
206
|
|
|
201
|
-
return '\n server {\n listen ' + port + ';\n server_name localhost;\n include ' + confRoot + '/server.conf;\n\n location ' + basePath + ' {\n proxy_pass ' + appUrl + ';\n }\n\n location ' + basePath + 'apiv1 {\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 include ' + confRoot + '/proxy.conf;\n proxy_pass ' + yk4Addr + '/apiv1/' + name + '/client/backend;\n }\n\n location ' + basePath + 'apiv2 {\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 ';
|
|
207
|
+
return '\n ' + resolver + '\n\n server {\n listen ' + port + ';\n server_name localhost;\n include ' + confRoot + '/server.conf;\n\n location ' + basePath + ' {\n proxy_pass ' + appUrl + ';\n }\n\n location ' + basePath + 'apiv1 {\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 include ' + confRoot + '/proxy.conf;\n proxy_pass ' + yk4Addr + '/apiv1/' + name + '/client/backend;\n }\n\n location ' + basePath + 'apiv2 {\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 ';
|
|
202
208
|
};
|
package/server/proxy/tire.js
CHANGED
|
@@ -458,11 +458,16 @@ exports.default = function () {
|
|
|
458
458
|
yk4Addr: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
|
|
459
459
|
basePath: basePath,
|
|
460
460
|
name: _config2.default.name,
|
|
461
|
-
port: guPort
|
|
461
|
+
port: guPort,
|
|
462
|
+
resolver: _config2.default.server.tire.resolver
|
|
462
463
|
});
|
|
463
464
|
|
|
464
465
|
_paths2.default.write(_config2.default.server.tire.clnConf, conf);
|
|
465
466
|
// spawn(yConf.server.tire.guPath, ['-c', yConf.server.tire.guConf]);
|
|
467
|
+
|
|
468
|
+
try {
|
|
469
|
+
(0, _child_process.exec)(_config2.default.server.tire.guPath + ' -s stop');
|
|
470
|
+
} catch (e) {}
|
|
466
471
|
(0, _child_process.exec)(_config2.default.server.tire.guPath + ' -c ' + _config2.default.server.tire.guConf + ' -g "daemon off;"');
|
|
467
472
|
} else {
|
|
468
473
|
app.use(basePath + "apiv1", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
|
package/utils/inclusive.js
CHANGED