@waline/vercel 1.32.1 → 1.32.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.32.1",
+  "version": "1.32.3",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -15,7 +15,7 @@
   "license": "MIT",
   "author": "lizheming <i@imnerd.org>",
   "dependencies": {
-    "@cloudbase/node-sdk": "^3.2.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,11 +23,11 @@
     "@mdit/plugin-sup": "0.8.0",
     "akismet": "^2.0.7",
     "deta": "^2.0.0",
-    "dompurify": "^3.1.6",
+    "dompurify": "^3.2.2",
     "dy-node-ip2region": "^1.0.1",
-    "fast-csv": "^5.0.1",
-    "form-data": "^4.0.0",
-    "jsdom": "^24.1.1",
+    "fast-csv": "^5.0.2",
+    "form-data": "^4.0.1",
+    "jsdom": "^25.0.1",
     "jsonwebtoken": "^9.0.2",
     "katex": "^0.16.11",
     "koa-compose": "^4.1.0",
@@ -36,7 +36,7 @@
     "markdown-it-emoji": "^3.0.0",
     "mathjax-full": "^3.2.2",
     "node-fetch": "^2.7.0",
-    "nodemailer": "^6.9.14",
+    "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.38"
+    "ua-parser-js": "^2.0.0"
   },
   "engines": {
     "node": ">=16"

package/src/extend/controller.js

@@ -20,7 +20,7 @@ module.exports = {
     return this[this.ctx.state.deprecated ? 'json' : 'success'](...args);
   },
   locale(message, variables) {
-    const { userLang } = this.get();
+    const { lang: userLang } = this.get();
     const lang = (userLang || defaultLang).toLowerCase();
 
     const customLocales = this.config('locales');

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,8 @@ 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 +137,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 +156,18 @@ 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 +176,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: {

package/src/service/storage/postgresql.js

@@ -1,5 +1,21 @@
 const MySQL = require('./mysql.js');
 
+function mapKeys({ insertedat, createdat, updatedat, ...item }) {
+  const mapFields = {
+    insertedAt: insertedat,
+    createdAt: createdat,
+    updatedAt: updatedat,
+  };
+
+  for (const field in mapFields) {
+    if (!mapFields[field]) {
+      continue;
+    }
+    item[field] = mapFields[field];
+  }
+
+  return item;
+}
 module.exports = class extends MySQL {
   model(tableName) {
     return super.model(tableName.toLowerCase());
@@ -22,22 +38,7 @@ module.exports = class extends MySQL {
 
     const data = await super.select(lowerWhere, options);
 
-    return data.map(({ insertedat, createdat, updatedat, ...item }) => {
-      const mapFields = {
-        insertedAt: insertedat,
-        createdAt: createdat,
-        updatedAt: updatedat,
-      };
-
-      for (const field in mapFields) {
-        if (!mapFields[field]) {
-          continue;
-        }
-        item[field] = mapFields[field];
-      }
-
-      return item;
-    });
+    return data.map(mapKeys);
   }
 
   async add(data) {
@@ -53,7 +54,7 @@ module.exports = class extends MySQL {
         delete data[key];
       });
 
-    return super.add(data);
+    return super.add(data).then(mapKeys);
   }
 
   async count(...args) {