yakuza0 2.21.6-beta.7 → 2.21.6

package/package.json

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

package/server/proxy/web.js

@@ -269,8 +269,9 @@ exports.default = function () {
                   //   })
                   // }
                 }
-
-                proxyReq.setHeader('host', proxyReq.host);
+                if (!_config2.default.security.isStupid) {
+                  proxyReq.setHeader('host', proxyReq.host);
+                }
               }
             });
 
@@ -354,7 +355,7 @@ exports.default = function () {
                     nuxtAppName: config.appName,
                     nuxtAppConf: config.appConf || {}
                   };
-                  if (req.url.indexOf(_config2.default.proxyServer.ws.key) !== -1) {
+                  if (req.url.startsWith('/' + _config2.default.proxyServer.ws.key)) {
                     var headers = {
                       Host: _config2.default.server.orbHost
                     };

package/template/log.plugin.js

@@ -53,8 +53,10 @@ export default async (ctx, inject) => {
 
     const body = {
       head, detail, level,
-      sourceName: yConf.server.log.prefixSourceName + ' -> ' + yConf.name + (yConf.server.log.sourceName ? ' -> ' + yConf.server.log.sourceName : ''),
-      streamName: ' -> ' + $yk.appName + (yConf.server.log.streamName ? ' -> ' + yConf.server.log.streamName : ''),
+      // sourceName: yConf.server.log.prefixSourceName + ' -> ' + yConf.name + (yConf.server.log.sourceName ? ' -> ' + yConf.server.log.sourceName : ''),
+      // streamName: ' -> ' + yConf.name + ' -> ' + $yk.appName + (yConf.server.log.streamName ? ' -> ' + yConf.server.log.streamName : ''),
+      sourceName: '',
+      streamName: ' -> ' + (yConf.server.log.sourceName ? ' -> ' + yConf.server.log.sourceName : '') + yConf.name + ' -> ' + $yk.appName + (yConf.server.log.streamName ? ' -> ' + yConf.server.log.streamName : ''),
     }
 
     if (yConf.server.log.levels[level] >= nowLv) {
@@ -65,16 +67,16 @@ export default async (ctx, inject) => {
 
       if (yConf.server.log.onlySSR) {
         if (yConf.server.log.server && $utils.checkServer()) {
-          body.sourceName += ' -> server'
+          body.streamName += ' -> server'
           await send(body)
         }
       } else {
         if (yConf.server.log.server && $utils.checkServer()) {
-          body.sourceName += ' -> server'
+          body.streamName += ' -> server'
           await send(body)
         }
         if (yConf.server.log.client && !$utils.checkServer()) {
-          body.sourceName += ' -> client'
+          body.streamName += ' -> client'
           await send(body)
         }
       }

package/utils/ws.o28.js

@@ -0,0 +1,144 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ws = undefined;
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _typeof2 = require('babel-runtime/helpers/typeof');
+
+var _typeof3 = _interopRequireDefault(_typeof2);
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _createClass2 = require('babel-runtime/helpers/createClass');
+
+var _createClass3 = _interopRequireDefault(_createClass2);
+
+var _socket = require('socket.io-client');
+
+var _socket2 = _interopRequireDefault(_socket);
+
+var _yakuza = require('yakuza1');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// import yConf from '../config';
+var Bac = function () {
+  function Bac(uri, opts) {
+    (0, _classCallCheck3.default)(this, Bac);
+
+    if ((typeof uri === 'undefined' ? 'undefined' : (0, _typeof3.default)(uri)) === 'object') {
+      opts = uri;
+      uri = undefined;
+    }
+
+    this.opts = (0, _extends3.default)({
+      path: uri,
+      wsPath: 'proxy-ws-o28',
+      transports: ['websocket'],
+      key: '__ws__',
+      lite: true,
+
+      receive: null
+    }, opts);
+    this.listen = {
+      receive: []
+    };
+    this.before();
+  }
+
+  (0, _createClass3.default)(Bac, [{
+    key: 'before',
+    value: function before() {
+      var _this = this;
+
+      this.ws = {
+        sock: null,
+        receiveEv: {}
+      };
+
+      this.sequence();
+
+      this.ws.sock.on('connect', function () {
+        // if (this.opts.lite) {
+        //   const protocol = jsUrl('protocol', yConf.proxyServer.baseURL);
+        //   this.opts.path = `ws${yConf.proxyServer.baseURL.replace(protocol, '')}${jsUrl('path', this.opts.path)}`;
+        // }
+        _this.event = (0, _yakuza.md5)(_this.opts.path + _this.ws.sock.id);
+        if (typeof _this.opts.receive === 'function') {
+          _this.listen.receive.push(_this.opts.receive);
+        }
+        _this.init();
+      });
+    }
+  }, {
+    key: 'sequence',
+    value: function sequence() {
+      var path = '/' + this.opts.wsPath + '/pxdl';
+      this.ws.sock = (0, _socket2.default)(path, {
+        path: path,
+        transports: this.opts.transports
+      });
+    }
+  }, {
+    key: 'init',
+    value: function init() {
+      var _this2 = this;
+
+      if (!this.ws.receiveEv[this.event]) {
+        this.ws.sock.emit('init', {
+          path: this.opts.path,
+          lite: this.opts.lite
+        });
+        this.ws.receiveEv[this.event] = true;
+        this.ws.sock.off(this.event);
+        this.ws.sock.on(this.event, function (msg) {
+          _this2.listen.receive.forEach(function (fn) {
+            return fn(msg);
+          });
+        });
+      }
+    }
+  }, {
+    key: 'send',
+    value: function send(event, msg) {
+      if (msg) {
+        this.ws.sock.emit(event, msg);
+      } else {
+        this.ws.sock.emit(this.event, event);
+      }
+    }
+  }, {
+    key: 'receive',
+    value: function receive(callback) {
+      if (typeof callback === 'function') {
+        this.listen.receive.push(callback);
+      }
+    }
+  }, {
+    key: 'io',
+    get: function get() {
+      return this.ws.sock;
+    }
+  }]);
+  return Bac;
+}();
+
+exports.default = function (uri, opts) {
+  return new Bac(uri, opts);
+};
+
+var ws = exports.ws = function ws(url, opt) {
+  var path = '/proxy-ws-o28/api-ws' + url;
+  return (0, _socket2.default)('/', (0, _extends3.default)({
+    path: path,
+    transports: ['websocket']
+  }, opt));
+};