yakuza0 2.23.6-beta.3 → 2.23.6-beta.5

package/nuxt/modules/clientIp.js

@@ -0,0 +1,19 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.default = function (moduleOptions) {
+  this.addPlugin({
+    src: _paths2.default.ykTemplate + 'clientIp.plugin.js'
+  });
+};
+
+var _paths = require('../../config/paths');
+
+var _paths2 = _interopRequireDefault(_paths);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = exports['default'];

package/nuxt/modules/index.js

@@ -48,7 +48,7 @@ exports.default = function (config) {
   // '@nuxtjs/style-resources',
   // 'nuxt-polyfill',
   // ['nuxt-svg-sprite-loader', {symbolId: 'icon-[name]'}],
-  _paths2.default.path.resolve(__dirname, './md.js'), _paths2.default.path.resolve(__dirname, './tfs.js'), _paths2.default.path.resolve(__dirname, './services.js'), _paths2.default.path.resolve(__dirname, './storage.js'), _paths2.default.path.resolve(__dirname, './log.js'), _paths2.default.path.resolve(__dirname, './ws.js'), _paths2.default.path.resolve(__dirname, './http.js'), _paths2.default.path.resolve(__dirname, './console.js'), _paths2.default.path.resolve(__dirname, './init.js'), _paths2.default.path.resolve(__dirname, './redirect.js'), _paths2.default.path.resolve(__dirname, './utils.js'), _paths2.default.path.resolve(__dirname, './yk.js'), _paths2.default.path.resolve(__dirname, './first.js')]);
+  _paths2.default.path.resolve(__dirname, './clientIp.js'), _paths2.default.path.resolve(__dirname, './md.js'), _paths2.default.path.resolve(__dirname, './tfs.js'), _paths2.default.path.resolve(__dirname, './services.js'), _paths2.default.path.resolve(__dirname, './storage.js'), _paths2.default.path.resolve(__dirname, './log.js'), _paths2.default.path.resolve(__dirname, './ws.js'), _paths2.default.path.resolve(__dirname, './http.js'), _paths2.default.path.resolve(__dirname, './console.js'), _paths2.default.path.resolve(__dirname, './init.js'), _paths2.default.path.resolve(__dirname, './redirect.js'), _paths2.default.path.resolve(__dirname, './utils.js'), _paths2.default.path.resolve(__dirname, './yk.js'), _paths2.default.path.resolve(__dirname, './first.js')]);
 
   // if (yConf.pkg.yk.nuxt.mds.svg) {
   //   mds.push(['nuxt-svg-sprite-loader', {symbolId: 'icon-[name]'}]);

package/package.json

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

package/server/proxy/web.js

@@ -123,7 +123,9 @@ exports.default = function () {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            _server._.forEach(proxyConf, function (baseUrl, key) {
+            _server._.forEach(proxyConf, 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;
               if (local) {
                 app.use(function (ctx, next) {
@@ -165,8 +167,7 @@ exports.default = function () {
                       }
 
                       return path;
-                    }
-                  }))(ctx, next);
+                    } }, proxyOptions))(ctx, next);
                 });
               }
             });
@@ -248,6 +249,16 @@ exports.default = function () {
                       });
                     }
                   });
+                  // _.forEach(yConf.proxyServer.proxyOptions, dt => {
+                  //   if (dt.match && minimatch(key, dt.match)) {
+                  //     if (dt.pathRewrite === true) {
+                  //       console.log(proxyReq, 11);
+                  //     }
+                  //     _.forEach(dt.headers, (v, k) => {
+                  //       proxyReq.setHeader(k, v);
+                  //     })
+                  //   }
+                  // })
 
                   // proxyReq.setHeader('host', proxyReq.host);
                   // proxyReq.setHeader('host', proxyReq.host);

package/template/clientIp.plugin.js

@@ -0,0 +1,9 @@
+import {clientIp} from 'yakuza0/utils/clientIp'
+
+export default async (ctx, inject) => {
+  const cip = await clientIp({ctx})
+
+  ctx.$clientIp = cip;
+  inject('clientIp', cip);
+}
+

package/utils/clientIp.js

@@ -0,0 +1,97 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.clientIp = undefined;
+
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
+var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
+var _ws = require('yakuza1/lib/ws');
+
+var _config = require('../config');
+
+var _config2 = _interopRequireDefault(_config);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var clientIp = exports.clientIp = function () {
+  var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(_ref) {
+    var ctx = _ref.ctx;
+    var $http, $utils;
+    return _regenerator2.default.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            $http = ctx.$http, $utils = ctx.$utils;
+            return _context2.abrupt('return', (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
+              var result;
+              return _regenerator2.default.wrap(function _callee$(_context) {
+                while (1) {
+                  switch (_context.prev = _context.next) {
+                    case 0:
+                      if (_config2.default.standAlone) {
+                        _context.next = 18;
+                        break;
+                      }
+
+                      if (!($utils.checkServer() || !_config2.default.server.heartbeat.enabled)) {
+                        _context.next = 8;
+                        break;
+                      }
+
+                      _context.next = 4;
+                      return $http.post('$/feapiv1/func/clientIp', {
+                        hasHook: []
+                      });
+
+                    case 4:
+                      result = _context.sent;
+                      return _context.abrupt('return', result && result.data);
+
+                    case 8:
+                      _context.prev = 8;
+                      _context.next = 11;
+                      return (0, _ws.connect)();
+
+                    case 11:
+                      _context.next = 15;
+                      break;
+
+                    case 13:
+                      _context.prev = 13;
+                      _context.t0 = _context['catch'](8);
+
+                    case 15:
+                      _context.next = 17;
+                      return (0, _ws.req)('yk0/func/clientIp');
+
+                    case 17:
+                      return _context.abrupt('return', _context.sent);
+
+                    case 18:
+                    case 'end':
+                      return _context.stop();
+                  }
+                }
+              }, _callee, undefined, [[8, 13]]);
+            })));
+
+          case 2:
+          case 'end':
+            return _context2.stop();
+        }
+      }
+    }, _callee2, undefined);
+  }));
+
+  return function clientIp(_x) {
+    return _ref2.apply(this, arguments);
+  };
+}();