@waline/vercel 1.30.5 → 1.31.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.30.5",
+  "version": "1.31.0",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -19,21 +19,22 @@
     "@koa/cors": "^4.0.0",
     "akismet": "^2.0.7",
     "deta": "^1.1.0",
-    "dompurify": "^3.0.2",
+    "dompurify": "^3.0.3",
     "dy-node-ip2region": "^1.0.1",
     "fast-csv": "^4.3.6",
     "form-data": "^4.0.0",
-    "jsdom": "^21.1.1",
+    "jsdom": "^22.1.0",
     "jsonwebtoken": "^9.0.0",
-    "katex": "^0.16.6",
+    "katex": "^0.16.7",
+    "koa-compose": "^4.1.0",
     "leancloud-storage": "^4.15.0",
     "markdown-it": "^13.0.1",
     "markdown-it-emoji": "^2.0.2",
     "markdown-it-sub": "^1.0.0",
     "markdown-it-sup": "^1.0.0",
     "mathjax-full": "^3.2.2",
-    "node-fetch": "^2.6.9",
-    "nodemailer": "^6.9.1",
+    "node-fetch": "^2.6.11",
+    "nodemailer": "^6.9.2",
     "nunjucks": "^3.2.4",
     "phpass": "^0.1.1",
     "prismjs": "^1.29.0",

package/src/config/config.js

@@ -45,6 +45,7 @@ const {
   LARK_TEMPLATE,
 
   LEVELS,
+  COMMENT_AUDIT,
 } = process.env;
 
 let storage = 'leancloud';
@@ -121,6 +122,8 @@ module.exports = {
     !LEVELS || isFalse(LEVELS)
       ? false
       : LEVELS.split(/\s*,\s*/).map((v) => Number(v)),
+
+  audit: !isFalse(COMMENT_AUDIT),
   avatarProxy,
   oauthUrl,
   markdown,

package/src/config/middleware.js

@@ -71,5 +71,8 @@ module.exports = [
   { handle: routerREST },
 
   'logic',
+  {
+    handle: 'plugin',
+  },
   'controller',
 ];

package/src/controller/comment.js

@@ -171,9 +171,7 @@ module.exports = class extends BaseRest {
       think.logger.debug(`Comment post frequency check OK!`);
 
       /** Akismet */
-      const { COMMENT_AUDIT } = process.env;
-
-      data.status = COMMENT_AUDIT ? 'waiting' : 'approved';
+      data.status = this.config('audit') ? 'waiting' : 'approved';
 
       think.logger.debug(`Comment initial status is ${data.status}`);
 

package/src/controller/rest.js

@@ -48,12 +48,22 @@ module.exports = class extends think.Controller {
 
   async hook(name, ...args) {
     const fn = this.config(name);
+    const plugins = think.getPluginHook(name);
 
-    if (!think.isFunction(fn)) {
-      return;
+    if (think.isFunction(fn)) {
+      plugins.unshift(fn);
     }
 
-    return fn.call(this, ...args);
+    for(let i = 0; i < plugins.length; i++) {
+      if (!think.isFunction(plugins[i])) {
+        continue;
+      }
+      
+      const resp = await plugins[i].call(this, ...args);
+      if (resp) {
+        return resp;
+      }
+    }
   }
 
   __call() {}

package/src/extend/think.js

@@ -113,4 +113,46 @@ module.exports = {
 
     return level === -1 ? defaultLevel : level;
   },
+  pluginMap(type, callback) {
+    const plugins = think.config('plugins');
+    const fns = [];
+
+    if (!think.isArray(plugins)) {
+      return fns;
+    }
+  
+
+    for (let i = 0; i < plugins.length; i++) {
+      const plugin = plugins[i];
+  
+      if (!plugin || !plugin[type]) {
+        continue;
+      }
+
+      const res = callback(plugin[type]);
+      if (!res) {
+        continue;
+      }
+
+      fns.push(res);
+    }
+
+    return fns;
+  },
+  getPluginMiddlewares() {
+    const middlewares = think.pluginMap('middlewares', (middleware) => {
+      if (think.isFunction(middleware)) {
+        return middleware;
+      }
+  
+      if (think.isArray(middleware)) {
+       return middleware.filter((m) => think.isFunction(m));
+      }
+    });
+    
+    return middlewares.flat();
+  },
+  getPluginHook(hookName) {
+    return think.pluginMap('hooks', (hook) => think.isFunction(hook[hookName]) ? hook[hookName] : undefined).filter(v => v);
+  }
 };

package/src/middleware/plugin.js

@@ -0,0 +1,12 @@
+const compose = require('koa-compose');
+
+module.exports = function() {
+  return (ctx, next) => {
+    const middlewares = think.getPluginMiddlewares();
+    if (!think.isArray(middlewares) || !middlewares.length) {
+      next();
+    }
+  
+    compose(middlewares)(ctx, next);
+  };
+}