@waline/vercel 1.32.0 → 1.32.2

package/index.js

@@ -22,7 +22,8 @@ module.exports = function (configParams = {}) {
 
   return function (req, res) {
     for (const k in config) {
-      think.config(k, config[k]);
+      // fix https://github.com/walinejs/waline/issues/2649 with alias model config name
+      think.config(k === 'model' ? 'customModel' : k, config[k]);
     }
 
     return think

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.32.0",
+  "version": "1.32.2",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -15,7 +15,7 @@
   "license": "MIT",
   "author": "lizheming <i@imnerd.org>",
   "dependencies": {
-    "@cloudbase/node-sdk": "^2.11.0",
+    "@cloudbase/node-sdk": "^3.3.7",
     "@koa/cors": "^5.0.0",
     "@mdit/plugin-katex": "0.8.0",
     "@mdit/plugin-mathjax": "0.4.8",
@@ -23,20 +23,20 @@
     "@mdit/plugin-sup": "0.8.0",
     "akismet": "^2.0.7",
     "deta": "^2.0.0",
-    "dompurify": "^3.1.4",
+    "dompurify": "^3.1.7",
     "dy-node-ip2region": "^1.0.1",
-    "fast-csv": "^5.0.1",
-    "form-data": "^4.0.0",
-    "jsdom": "^24.1.0",
+    "fast-csv": "^5.0.2",
+    "form-data": "^4.0.1",
+    "jsdom": "^25.0.1",
     "jsonwebtoken": "^9.0.2",
-    "katex": "^0.16.10",
+    "katex": "^0.16.11",
     "koa-compose": "^4.1.0",
     "leancloud-storage": "^4.15.2",
     "markdown-it": "^14.1.0",
     "markdown-it-emoji": "^3.0.0",
     "mathjax-full": "^3.2.2",
     "node-fetch": "^2.7.0",
-    "nodemailer": "^6.9.13",
+    "nodemailer": "^6.9.16",
     "nunjucks": "^3.2.4",
     "phpass": "^0.1.1",
     "prismjs": "^1.29.0",
@@ -51,7 +51,7 @@
     "think-mongo": "^2.2.1",
     "think-router-rest": "^1.0.5",
     "thinkjs": "^3.2.15",
-    "ua-parser-js": "^1.0.37"
+    "ua-parser-js": "^1.0.39"
   },
   "engines": {
     "node": ">=16"

package/src/controller/db.js

@@ -32,27 +32,21 @@ module.exports = class extends BaseRest {
     const model = this.getModel(table);
 
     if (storage === 'leancloud' || storage === 'mysql') {
-      item.insertedAt && (item.insertedAt = new Date(item.insertedAt));
-      item.createdAt && (item.createdAt = new Date(item.createdAt));
-      item.updatedAt && (item.updatedAt = new Date(item.updatedAt));
+      if (item.insertedAt) item.insertedAt = new Date(item.insertedAt);
+      if (item.createdAt) item.createdAt = new Date(item.createdAt);
+      if (item.updatedAt) item.updatedAt = new Date(item.updatedAt);
     }
 
     if (storage === 'mysql') {
-      item.insertedAt &&
-        (item.insertedAt = think.datetime(
+      if (item.insertedAt)
+        item.insertedAt = think.datetime(
           item.insertedAt,
           'YYYY-MM-DD HH:mm:ss',
-        ));
-      item.createdAt &&
-        (item.createdAt = think.datetime(
-          item.createdAt,
-          'YYYY-MM-DD HH:mm:ss',
-        ));
-      item.updatedAt &&
-        (item.updatedAt = think.datetime(
-          item.updatedAt,
-          'YYYY-MM-DD HH:mm:ss',
-        ));
+        );
+      if (item.createdAt)
+        item.createdAt = think.datetime(item.createdAt, 'YYYY-MM-DD HH:mm:ss');
+      if (item.updatedAt)
+        item.updatedAt = think.datetime(item.updatedAt, 'YYYY-MM-DD HH:mm:ss');
     }
 
     delete item.objectId;

package/src/extend/controller.js

@@ -38,10 +38,10 @@ module.exports = {
     return nunjucks.renderString(message, variables);
   },
   getModel(modelName) {
-    const { storage, model } = this.config();
+    const { storage, customModel } = this.config();
 
-    if (typeof model === 'function') {
-      const modelInstance = model(modelName, this);
+    if (typeof customModel === 'function') {
+      const modelInstance = customModel(modelName, this);
 
       if (modelInstance) {
         return modelInstance;

package/src/logic/comment.js

@@ -249,17 +249,10 @@ module.exports = class extends Base {
    */
   async putAction() {
     const { userInfo } = this.ctx.state;
-    const { like } = this.post();
-
-    // 1. like
-    if (think.isEmpty(userInfo) && think.isBoolean(like)) {
-      this.rules = {
-        like: {
-          required: true,
-          boolean: true,
-        },
-      };
+    const data = this.post();
 
+    // 1. like action
+    if (think.isBoolean(data.like) && Object.keys(data).toString() === 'like') {
       return;
     }
 

package/src/service/notify.js

@@ -111,7 +111,7 @@ module.exports = class extends think.Service {
   }
 
   async qywxAmWechat({ title, content }, self, parent) {
-    const { QYWX_AM, SITE_NAME, SITE_URL } = process.env;
+    const { QYWX_AM, QYWX_PROXY, QYWX_PROXY_PORT, SITE_NAME, SITE_URL } = process.env;
 
     if (!QYWX_AM) {
       return false;
@@ -136,6 +136,7 @@ module.exports = class extends think.Service {
         postUrl: SITE_URL + self.url + '#' + self.objectId,
       },
     };
+
     const contentWechat =
       think.config('WXTemplate') ||
       `💬 {{site.name|safe}}的文章《{{postName}}》有新评论啦 
@@ -154,8 +155,17 @@ module.exports = class extends think.Service {
     querystring.set('corpid', `${QYWX_AM_AY[0]}`);
     querystring.set('corpsecret', `${QYWX_AM_AY[1]}`);
 
+    let baseUrl = 'https://qyapi.weixin.qq.com';
+    if (QYWX_PROXY) {
+      if (!QYWX_PROXY_PORT) {
+        baseUrl = `http://${QYWX_PROXY}`;
+      } else {
+        baseUrl = `http://${QYWX_PROXY}:${QYWX_PROXY_PORT}`;
+      }
+    }
+
     const { access_token } = await fetch(
-      `https://qyapi.weixin.qq.com/cgi-bin/gettoken?${querystring.toString()}`,
+      `${baseUrl}/cgi-bin/gettoken?${querystring.toString()}`,
       {
         headers: {
           'content-type': 'application/json',
@@ -164,7 +174,7 @@ module.exports = class extends think.Service {
     ).then((resp) => resp.json());
 
     return fetch(
-      `https://qyapi.weixin.qq.com/cgi-bin/message/send?access_token=${access_token}`,
+      `${baseUrl}/cgi-bin/message/send?access_token=${access_token}`,
       {
         method: 'POST',
         headers: {
@@ -346,13 +356,13 @@ module.exports = class extends think.Service {
 
     const form = new FormData();
 
-    topic && form.append('topic', topic);
-    template && form.append('template', template);
-    channel && form.append('channel', channel);
-    webhook && form.append('webhook', webhook);
-    callbackUrl && form.append('callbackUrl', callbackUrl);
-    title && form.append('title', title);
-    content && form.append('content', content);
+    if (topic) form.append('topic', topic);
+    if (template) form.append('template', template);
+    if (channel) form.append('channel', channel);
+    if (webhook) form.append('webhook', webhook);
+    if (callbackUrl) form.append('callbackUrl', callbackUrl);
+    if (title) form.append('title', title);
+    if (content) form.append('content', content);
 
     return fetch(`http://www.pushplus.plus/send/${PUSH_PLUS_KEY}`, {
       method: 'POST',

package/src/service/storage/base.js

@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable no-unused-vars */
 
 module.exports = class extends think.Service {
   constructor(tableName) {

package/src/service/storage/deta.js

@@ -172,7 +172,7 @@ module.exports = class extends Base {
        */
       const item = await this.instance.get(conditions.key);
 
-      item && data.push(item);
+      if (item) data.push(item);
     } else if (offset) {
       /**
        * deta base need last data key when pagination

package/vanilla.js

@@ -15,7 +15,7 @@ let config = {};
 
 try {
   config = require('./config.js');
-} catch (e) {
+} catch {
   // do nothing
 }
 for (const k in config) {