yakuza0 2.23.40 → 2.23.41

package/nuxt/build/index.js

@@ -40,6 +40,10 @@ var _replace = require('./replace');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// Remove e-mail addresses left in bundled dependency banners/comments. The
+// optional backslashes also cover addresses escaped by some bundlers/scanners.
+var emailAddressPattern = /[a-z0-9.!#$%&'*+/=?^_`{|}~-]+\\?@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/ig;
+
 var customExtend = function customExtend(_ref) {
   var eslint = _ref.eslint,
       alias = _ref.alias,
@@ -86,6 +90,9 @@ exports.default = function (config) {
       // test: /package.json/,
       test: /\.js$/,
       rules: [{
+        search: emailAddressPattern,
+        replace: ''
+      }, {
         // search: /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/ig,
         search: '@indutny.com',
         replace: ''

package/package.json

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

package/server/proxy/web.js

@@ -68,9 +68,16 @@ var appAtSameDir = _paths2.default.appAtSameDir,
     access = _paths2.default.access,
     ykCert = _paths2.default.ykCert;
 
+var passthroughApiKeys = ['apiv5', 'apiv6'];
+var isPassthroughApiPath = function isPassthroughApiPath(path) {
+  return passthroughApiKeys.some(function (apiKey) {
+    var prefix = '/' + apiKey;
+    return path === prefix || path.startsWith(prefix + '/') || path.startsWith(prefix + '?');
+  });
+};
+
 // cert verify
 // fs.readFileSync(`${appAtSameDir}${yConf.name.toLocaleString()}.pfx`)
-
 var getCert = function getCert() {
   var custom = {
     pfx: '' + appAtSameDir + _config2.default.name.toLocaleString() + '.pfx',
@@ -120,12 +127,18 @@ exports.default = function () {
         proxyConf = _ref.proxyConf,
         nuxt = _ref.nuxt,
         config = _ref.config;
-    var pKey, servers, wsProxyKeys;
+    var webProxyConf, pKey, servers, wsProxyKeys;
     return _regenerator2.default.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            _server._.forEach(proxyConf, function (proxyOpts, key) {
+            webProxyConf = proxyConf.apiv3 ? (0, _extends3.default)({}, proxyConf, {
+              apiv5: proxyConf.apiv3,
+              apiv6: proxyConf.apiv3
+            }) : proxyConf;
+
+
+            _server._.forEach(webProxyConf, function (proxyOpts, key) {
               var baseUrl = typeof proxyOpts === "string" ? proxyOpts : proxyOpts && proxyOpts.target || '';
               var proxyOptions = typeof proxyOpts !== "string" ? proxyOpts : {};
               var local = _config2.default.proxyServer.apiKey === key;
@@ -160,7 +173,7 @@ exports.default = function () {
                       // if (!path.startsWith('/apiv3/')) {
                       // console.log(path);
                       // if (!['/apiv2/', '/apiv3/'].includes(path)) {
-                      if (!path.startsWith('/apiv2/') && !path.startsWith('/apiv3/') && !path.startsWith('/api-ws/')) {
+                      if (!path.startsWith('/apiv2/') && !path.startsWith('/apiv3/') && !isPassthroughApiPath(path) && !path.startsWith('/api-ws/')) {
                         path = path.replace('/' + key, '');
                       }
 
@@ -169,7 +182,9 @@ exports.default = function () {
                       }
 
                       return path;
-                    } }, proxyOptions))(ctx, next);
+                    } }, proxyOptions, passthroughApiKeys.includes(key) ? { rewrite: function rewrite(path) {
+                      return path;
+                    } } : {}))(ctx, next);
                 });
               }
             });
@@ -392,6 +407,8 @@ exports.default = function () {
 
             servers.forEach(function (ser) {
               ser.on('upgrade', function (req, socket, head) {
+                socket.on('error', function (err) {});
+
                 if (_config2.default.server.om.enabled && _server.global.__cpm__ && (0, _om.isOmOpen)(req)) {
                   _server.global.__cpm__.upgrade(req, socket, head);
                 } else {
@@ -400,6 +417,21 @@ exports.default = function () {
                     nuxtAppName: config.appName,
                     nuxtAppConf: config.appConf || {}
                   };
+                  var requestPath = req.url.split('?')[0];
+                  var basePath = config.appConf.server.basePathMU || '/';
+                  var passthroughApiKey = passthroughApiKeys.find(function (key) {
+                    return ['/' + key, '' + basePath + key].some(function (prefix) {
+                      return requestPath === prefix || requestPath.startsWith(prefix + '/');
+                    });
+                  });
+
+                  if (passthroughApiKey && webProxyConf.apiv3) {
+                    var apiv3ProxyConf = typeof webProxyConf.apiv3 === 'string' ? { target: webProxyConf.apiv3 } : webProxyConf.apiv3;
+                    var apiv3ProxyOptions = _server._.omit(apiv3ProxyConf, ['logs', 'rewrite', 'events']);
+                    _mid.proxy.ws(req, socket, head, (0, _extends3.default)({}, defProxyOpt, apiv3ProxyOptions));
+                    return;
+                  }
+
                   if (req.url.startsWith('/' + _config2.default.proxyServer.ws.key)) {
                     var headers = {
                       Host: _config2.default.server.orbHost
@@ -441,12 +473,10 @@ exports.default = function () {
                     }, defProxyOpt));
                   }
                 }
-
-                socket.on('error', function (err) {});
               });
             });
 
-          case 8:
+          case 9:
           case 'end':
             return _context3.stop();
         }

package/utils/inclusive.js

@@ -975,6 +975,8 @@ var render = function () {
 
             conf.proxyServer.proxy.apiv2 = orbAddr;
             conf.proxyServer.proxy.apiv3 = orbAddr;
+            conf.proxyServer.proxy.apiv5 = orbAddr;
+            conf.proxyServer.proxy.apiv6 = orbAddr;
             conf.proxyServer.proxy[conf.proxyServer.ws.key] = orbAddr;
             conf.server.orbAddr = orbAddr;
 
@@ -1001,7 +1003,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 87;
+            _context2.next = 89;
             return _yakuza._.asyncMap(conf.router.config, function () {
               var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(v, key) {
                 var name, arr, length, num;
@@ -1188,7 +1190,7 @@ var render = function () {
               };
             }());
 
-          case 87:
+          case 89:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1310,7 +1312,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 98:
+          case 100:
           case 'end':
             return _context2.stop();
         }