yakuza0 2.21.5 → 2.21.6-beta.2

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, './http.js'), _paths2.default.path.resolve(__dirname, './ws.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, './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/nuxt/modules/log.js

@@ -0,0 +1,19 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.default = function (moduleOptions) {
+  this.addPlugin({
+    src: _paths2.default.ykTemplate + 'log.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/ws.js

@@ -5,14 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 
 exports.default = function (moduleOptions) {
-  var appConf = this.options.appConf;
+  this.addPlugin({
+    src: _paths2.default.ykTemplate + 'ws.plugin.js'
+  });
+  // const appConf = this.options.appConf;
 
-  if (!appConf.standAlone) {
-    this.addPlugin({
-      src: _paths2.default.ykTemplate + 'ws.plugin.js',
-      ssr: false
-    });
-  }
+  // if (!appConf.standAlone) {
+  //   this.addPlugin({
+  //     src: paths.ykTemplate + 'ws.plugin.js',
+  //     ssr: false,
+  //   })
+  // }
 };
 
 var _paths = require('../../config/paths');

package/package.json

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

package/template/log.plugin.js

@@ -0,0 +1,89 @@
+import yConf from 'yakuza0/config';
+import {connect, req} from 'yakuza1/lib/ws';
+
+export default async (ctx, inject) => {
+  const { $utils, $http, $yk } = ctx;
+  const event = {
+    debug: () => {
+    },
+    info: () => {
+    },
+    warn: () => {
+    },
+    error: () => {
+    },
+    fatal: () => {
+    },
+  };
+
+  const send = async  (body) => {
+    if (!yConf.standAlone) {
+      if ($utils.checkServer()) {
+        try {
+          const result = await $http.post('$/feapiv1/log/publish', {
+            ...body,
+          }, {
+            hasHook: [],
+          })
+
+          return result && result.data
+        } catch (e) {
+          // console.log(e);
+        }
+      } else {
+        await connect();
+        await req('log/publish', {
+          body: {
+            ...body,
+          }
+        })
+      }
+    }
+  }
+
+  const nowLv = yConf.server.log.levels[yConf.server.log.level];
+  const msg = async ({head, detail, type}) => {
+    const body = {
+      head, detail, type,
+      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 : ''),
+    }
+
+    if (yConf.server.log.levels[type] >= nowLv) {
+      if (yConf.server.log.client && !$utils.checkServer()) {
+        console.log('%c['+type.toUpperCase()+']', "color:"+yConf.server.log.colors[type]+";", head)
+        console.log(detail)
+      }
+
+      if (yConf.server.log.onlySSR) {
+        if (yConf.server.log.server && $utils.checkServer()) {
+          await send(body)
+        }
+      } else {
+        if (yConf.server.log.server) {
+          await send(body)
+        }
+      }
+    }
+  }
+
+  event.debug = async (head, detail) => {
+    await msg({head, detail, type: 'debug'})
+  }
+  event.info = async (head, detail) => {
+    await msg({head, detail, type: 'info'})
+  }
+  event.warn = async (head, detail) => {
+    await msg({head, detail, type: 'warn'})
+  }
+  event.error = async (head, detail) => {
+    await msg({head, detail, type: 'error'})
+  }
+  event.fatal = async (head, detail) => {
+    await msg({head, detail, type: 'fatal'})
+  }
+
+  ctx.$log = event;
+  inject('log', event);
+}
+

package/template/ws.plugin.js

@@ -5,6 +5,7 @@ import {connect, req, decrypt} from 'yakuza1/lib/ws';
 import {mixin} from 'yakuza1/lib/encrypt';
 
 export default async (ctx, inject) => {
+  const { $http, $utils, $yk } = ctx;
   const event = {
     publish: () => {
     },
@@ -17,59 +18,76 @@ export default async (ctx, inject) => {
 
   const on = {};
 
-  try {
-    const client = await connect();
+  if (!yConf.standAlone) {
+    if ($utils.checkServer()) {
+      event.publish = async (topic, message) => {
+        try {
+          const result = await $http.post('$/feapiv1/mq/publish', {
+            topic,
+            message,
+          }, {
+            hasHook: [],
+          })
 
-    event.on = (topic, callback) => {
-      if (!_.isArray(on[topic])) {
-        on[topic] = []
+          return result && result.data
+        } catch (e) {}
       }
-      on[topic].push(callback);
-      req('mq/subscribe', { body: { topic } });
-    };
+    } else {
+      try {
+        const client = await connect();
 
-    event.off = (topic) => {
-      on[topic] = []
-      req('mq/unsubscribe', { body: { topic } });
-    };
+        event.on = (topic, callback) => {
+          if (!_.isArray(on[topic])) {
+            on[topic] = []
+          }
+          on[topic].push(callback);
+          req('mq/subscribe', { body: { topic } });
+        };
+
+        event.off = (topic) => {
+          on[topic] = []
+          req('mq/unsubscribe', { body: { topic } });
+        };
 
-    event.publish = (topic, message) => {
-      req('mq/publish', {
-        body: {
-          topic,
-          message,
+        event.publish = (topic, message) => {
+          req('mq/publish', {
+            body: {
+              topic,
+              message,
+            }
+          })
         }
-      })
-    }
 
-    event.history = async (topic, options = {}) => await req('mq/history', {
-      body: {
-        topic,
-        options,
-      }
-    });
-    client.on('mq/message', (res) => {
-      const key = mixin.getKey(client.id);
-      const { topic, message } = decrypt(res, key);
-      if (_.isArray(on[topic])) {
-        on[topic].forEach(callback => {
-          if (typeof callback === 'function') {
-            callback(message);
+        event.history = async (topic, options = {}) => await req('mq/history', {
+          body: {
+            topic,
+            options,
           }
-        })
-      }
-    });
+        });
+        client.on('mq/message', (res) => {
+          const key = mixin.getKey(client.id);
+          const { topic, message } = decrypt(res, key);
+          if (_.isArray(on[topic])) {
+            on[topic].forEach(callback => {
+              if (typeof callback === 'function') {
+                callback(message);
+              }
+            })
+          }
+        });
 
-    client.on('reconnect', (attemptNumber) => {
-      if (_.isPlainObject(on)) {
-        _.forEach(on, (arr, topic) => {
-          if (typeof topic === 'string') {
-            req('mq/subscribe', { body: { topic } });
+        client.on('reconnect', (attemptNumber) => {
+          if (_.isPlainObject(on)) {
+            _.forEach(on, (arr, topic) => {
+              if (typeof topic === 'string') {
+                req('mq/subscribe', { body: { topic } });
+              }
+            })
           }
-        })
+        });
+      } catch (e) {
       }
-    });
-  } catch (e) {
+    }
   }
 
   ctx.$ws = event;

package/utils/inclusive.js

@@ -302,6 +302,18 @@ var render = function () {
                 cookieSameSite: 'Lax',
                 // ...mainConf.server,
                 // ...ykConf.server,
+                log: {
+                  enabled: true,
+                  onlySSR: true,
+                  client: true,
+                  server: true,
+                  level: 'debug',
+                  levels: { debug: 0, info: 1, warn: 2, error: 3, fatal: 4 },
+                  colors: { debug: '#247a6a', info: '#879c22', warn: '#b09d40', error: '#d76b5c', fatal: '#8c7197' },
+                  sourceName: '',
+                  streamName: '',
+                  prefixSourceName: 'CLN框架日志'
+                },
                 csp: {
                   enabled: true,
                   strict: false,
@@ -884,6 +896,7 @@ var render = function () {
 
                         v.server = (0, _extends3.default)({}, conf.server, v.server, {
                           f5Offline: checkBool(conf.server.f5Offline, v.server && v.server.f5Offline),
+                          log: (0, _extends3.default)({}, conf.server.log, v.server && v.server.log),
                           browsers: {
                             redirect: (0, _extends3.default)({}, conf.server && conf.server.browsers && conf.server.browsers.redirect, v.server && v.server.browsers && v.server.browsers.redirect),
                             static: v.server && v.server.browsers && v.server.browsers.static || conf.server && conf.server.browsers && conf.server.browsers.static