@waline/vercel 1.31.14 → 1.32.1

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.31.14",
+  "version": "1.32.1",
   "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.2.0",
     "@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.3",
+    "dompurify": "^3.1.6",
     "dy-node-ip2region": "^1.0.1",
     "fast-csv": "^5.0.1",
     "form-data": "^4.0.0",
-    "jsdom": "^24.0.0",
+    "jsdom": "^24.1.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.14",
     "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.38"
   },
   "engines": {
     "node": ">=16"

package/src/controller/article.js

@@ -18,14 +18,28 @@ module.exports = class extends BaseRest {
     const resp = await this.modelInstance.select({ url: ['IN', path] });
 
     if (think.isEmpty(resp)) {
-      const data = type.reduce((o, field) => {
-        o[field] = 0;
-
-        return o;
-      }, {});
+      const counters = new Array(path.length).fill(
+        type.length === 1 && deprecated
+          ? 0
+          : type.reduce((o, field) => {
+              o[field] = 0;
+
+              return o;
+            }, {}),
+      );
 
+      // - deprecated:
+      //   - single path and single type: 0
+      //   - single path and multiple type: {[type]: 0}
+      //   - multiple path and single type: [0, 0]
+      //   - multiple path and multiple type: [{[type]: 0},{[type]: 0}]
+      // - latest
+      //   - single path and single type: [{[type]: 0}]
+      //   - single path and multiple type: [{[type]: 0}]
+      //   - multiple path and single type: [{[type]: 0}]
+      //   - multiple path and multiple type: [{[type]: 0}]
       return this.jsonOrSuccess(
-        type.length === 1 && deprecated ? data[type[0]] : data,
+        path.length === 1 && deprecated ? counters[0] : counters,
       );
     }
 

package/src/controller/comment.js

@@ -575,10 +575,15 @@ module.exports = class extends BaseRest {
           cmt.children.forEach((c) => {
             const parent = childCommentsMap.get(c.pid);
 
+            // fix https://github.com/walinejs/waline/issues/2518 avoid some abnormal comment data
+            if (!parent) {
+              return;
+            }
+
             c.reply_user = {
-              nick: parent.nick,
-              link: parent.link,
-              avatar: parent.avatar,
+              nick: parent?.nick,
+              link: parent?.link,
+              avatar: parent?.avatar,
             };
           });
 

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

@@ -1,7 +1,9 @@
 const nunjucks = require('nunjucks');
 const { PasswordHash } = require('phpass');
 
-const locales = require('../locales/index.js');
+const defaultLocales = require('../locales/index.js');
+
+const defaultLang = 'en-us';
 
 module.exports = {
   success(...args) {
@@ -18,20 +20,28 @@ module.exports = {
     return this[this.ctx.state.deprecated ? 'json' : 'success'](...args);
   },
   locale(message, variables) {
-    const { lang } = this.get();
-    const locale = locales[(lang || 'zh-cn').toLowerCase()] || locales['zh-cn'];
+    const { userLang } = this.get();
+    const lang = (userLang || defaultLang).toLowerCase();
+
+    const customLocales = this.config('locales');
+    const locales = customLocales || defaultLocales;
+
+    const localMessage =
+      locales?.[lang]?.[message] ||
+      defaultLocales?.[lang]?.[message] ||
+      defaultLocales[defaultLang][message];
 
-    if (locale?.[message]) {
-      message = locale[message];
+    if (localMessage) {
+      message = localMessage;
     }
 
     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/service/markdown/index.js

@@ -1,14 +1,11 @@
 const { katex: katexPlugin } = require('@mdit/plugin-katex');
-const {
-  createMathjaxInstance,
-  mathjax: mathjaxPlugin,
-} = require('@mdit/plugin-mathjax');
 const { sub: subPlugin } = require('@mdit/plugin-sub');
 const { sup: supPlugin } = require('@mdit/plugin-sup');
 const MarkdownIt = require('markdown-it');
 const emojiPlugin = require('markdown-it-emoji');
 
 const { resolveHighlighter } = require('./highlight.js');
+const { mathjaxPlugin } = require('./mathjax.js');
 const { sanitize } = require('./xss.js');
 
 const getMarkdownParser = () => {
@@ -58,10 +55,7 @@ const getMarkdownParser = () => {
       output: 'mathml',
     });
   } else if (tex !== false) {
-    markdownIt.use(
-      mathjaxPlugin,
-      createMathjaxInstance({ ...mathjax, output: 'svg' }),
-    );
+    markdownIt.use(mathjaxPlugin, mathjax);
   }
 
   return (content) => sanitize(markdownIt.render(content));

package/src/service/notify.js

@@ -346,13 +346,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) {