yakuza0 2.23.0 → 2.23.1-beta.1

package/image/Dockerfile_DEP

@@ -10,6 +10,8 @@ ENV YK_SERVER_ENV $YK_ENV
 
 ARG DEP
 ADD $DEP ./
+RUN pxnpm i
+RUN rm -rf ./node_modules/.pxnpm-store
 ADD ./.ykServer ./.ykServer
 ADD ./config ./config
 ADD ./common.static ./common.static

package/package.json

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

package/server/proxy/conf.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ng_conf = exports.apiV3PathRewrite = exports.serverHeaders = exports.usedPort = exports.includesTypePath = exports.crossPath = undefined;
+exports.ng_conf = exports.apiV3PathRewrite = exports.serverHeaders = exports.adjoinIpFunc = exports.usedPort = exports.includesTypePath = exports.crossPath = undefined;
 
 var _stringify = require('babel-runtime/core-js/json/stringify');
 
@@ -140,11 +140,17 @@ var usedPort = exports.usedPort = function () {
   };
 }();
 
-var serverHeaders = exports.serverHeaders = function serverHeaders(_ref4) {
-  var _ref5;
+var adjoinIpFunc = exports.adjoinIpFunc = function adjoinIpFunc(_ref4) {
+  var req = _ref4.req;
 
-  var req = _ref4.req,
-      config = _ref4.config;
+  return req.headers[_def.variable.adjoinIpHeader.toLowerCase()] || (0, _server.getClientIP)(req, { stupid: true }) || '127.0.0.1';
+};
+
+var serverHeaders = exports.serverHeaders = function serverHeaders(_ref5) {
+  var _ref6;
+
+  var req = _ref5.req,
+      config = _ref5.config;
 
   var conf = _config2.default;
   if (_config2.default.dev) {
@@ -166,7 +172,7 @@ var serverHeaders = exports.serverHeaders = function serverHeaders(_ref4) {
   // console.log(nuxtAppConf);
   // console.log(nuxtAppConf.server.gray, 123);
   var appCode = req.headers[_def.variable.appCodeHeader.toLowerCase()] || nuxtAppConf.appCode;
-  var adjoinIp = req.headers[_def.variable.adjoinIpHeader.toLowerCase()] || (0, _server.getClientIP)(req, { stupid: true }) || '127.0.0.1';
+  var adjoinIp = adjoinIpFunc({ req: req });
   // const isAfk = Cookies.getByStr(yConf.server.redirect.afkKey, req.headers.cookie) === '';
   // console.log(req.url, isAfk, 1111);
   var isAfk = false;
@@ -177,9 +183,9 @@ var serverHeaders = exports.serverHeaders = function serverHeaders(_ref4) {
   //   // console.log(v2023_12_aMark, 'v2023_12_aMark222');
   // }
   // console.log(req.url, nuxtAppConf.server && nuxtAppConf.server.f5Offline, !isAfk, 666);
-  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, {
+  return _ref6 = {}, (0, _defineProperty3.default)(_ref6, _def.variable.isDevHeader, { data: conf.dev ? '1' : '0' }), (0, _defineProperty3.default)(_ref6, _def.variable.akHeader, { data: conf.ak, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.ipHeader, { data: (0, _server.getClientIP)(req, { stupid: false }) }), (0, _defineProperty3.default)(_ref6, _def.variable.adjoinIpHeader, { data: adjoinIp }), (0, _defineProperty3.default)(_ref6, _def.variable.svcKeyHeader, { data: nuxtAppConf.svcKey, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.domainHeader, { data: nuxtAppConf.domain, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.cookieHeader, { data: crossParams.cookie, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.cookieDomainHeader, { data: crossParams.cookieDomain, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.cookieSameSiteHeader, { data: conf.server.cookieSameSite, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.appKeyHeader, { data: crossParams.nuxtAppKey }), (0, _defineProperty3.default)(_ref6, _def.variable.appNameHeader, { data: crossParams.nuxtAppName }), (0, _defineProperty3.default)(_ref6, _def.variable.encryptSwitchHeader, { data: encryptSwitch, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.encryptTypeHeader, { data: conf.security.encrypt, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.helmetHeader, { data: conf.security.helmet.toString(), noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.projectNameHeader, { data: conf.name, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.shareRuleHeader, { data: (0, _stringify2.default)(conf.shareRule) }), (0, _defineProperty3.default)(_ref6, _def.variable.baseURLHeader, { data: baseURL, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.isHttpsHeader, { data: conf.https ? '1' : '0' }), (0, _defineProperty3.default)(_ref6, _def.variable.appCodeHeader, { data: appCode, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.processKeyHeader, { data: conf.processKey, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.childKeyHeader, { data: conf.childKey, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.orbCsrfHeader, { data: verifyTk.csrf, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.f5OfflineHeader, { data: nuxtAppConf.server && nuxtAppConf.server.f5Offline && !isAfk, noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.servicesHeader, { data: req.headers[_def.variable.servicesHeader], noWarn: true }), (0, _defineProperty3.default)(_ref6, 'Cookie', { data: _server.Cookies.setByStr((0, _defineProperty3.default)({}, _def.variable.orbCsrfCookie, verifyTk.csrf), req.headers.cookie), noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.ddosSwitchHeader, { data: crossParams.ddosSwitch || '', noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.yk0VersionHeader, { data: conf.version || '', noWarn: true }), (0, _defineProperty3.default)(_ref6, _def.variable.stpV23Header, {
     data: (0, _stringify2.default)(_config2.default.server.stupid.v23), noWarn: true
-  }), (0, _defineProperty3.default)(_ref5, "x-referrer-none", { data: _config2.default.server.stupid.referrerPolicy.policy === "no-referrer", noWarn: true }), _ref5;
+  }), (0, _defineProperty3.default)(_ref6, "x-referrer-none", { data: _config2.default.server.stupid.referrerPolicy.policy === "no-referrer", noWarn: true }), _ref6;
 };
 
 var apiV3PathRewrite = exports.apiV3PathRewrite = function apiV3PathRewrite(path) {
@@ -195,14 +201,14 @@ var apiV3PathRewrite = exports.apiV3PathRewrite = function apiV3PathRewrite(path
   return path;
 };
 
-var ng_conf = exports.ng_conf = function ng_conf(_ref6) {
-  var appUrl = _ref6.appUrl,
-      th = _ref6.th,
-      port = _ref6.port,
-      yk4Addr = _ref6.yk4Addr,
-      basePath = _ref6.basePath,
-      name = _ref6.name,
-      resolver = _ref6.resolver;
+var ng_conf = exports.ng_conf = function ng_conf(_ref7) {
+  var appUrl = _ref7.appUrl,
+      th = _ref7.th,
+      port = _ref7.port,
+      yk4Addr = _ref7.yk4Addr,
+      basePath = _ref7.basePath,
+      name = _ref7.name,
+      resolver = _ref7.resolver;
 
   var confRoot = '/etc/nginx/extra';
   if (_os2.default.platform() === 'darwin') {

package/server/proxy/web.js

@@ -258,7 +258,7 @@ exports.default = function () {
                   // }
 
                   if (_config2.default.security.isStupid) {
-                    proxyReq.setHeader(_def.variable.adjoinIpHeader, (0, _server.getClientIP)(req, { stupid: true }));
+                    proxyReq.setHeader(_def.variable.adjoinIpHeader, (0, _conf.adjoinIpFunc)({ req: req }));
                   }
 
                   // const keys = Object.keys(yConf.proxyServer.proxy).join('|')

package/utils/inclusive.js

@@ -542,7 +542,7 @@ var render = function () {
                 tire: {
                   guPath: '/gu',
                   guConf: '/etc/nginx/nginx.conf',
-                  clnConf: '/etc/nginx/conf.d/cln2.conf',
+                  clnConf: '/tmp/conf.d/cln2.conf',
                   resolve: ''
                 }
               },