@waline/vercel 1.31.13 → 1.31.14

package/Dockerfile

@@ -6,10 +6,10 @@ RUN set -eux; \
 	# npm config set registry https://registry.npm.taobao.org; \
 	npm install --production --silent @waline/vercel
 
-FROM node:lts-buster-slim
+FROM node:lts-slim
 WORKDIR /app
 ENV TZ Asia/Shanghai
 ENV NODE_ENV production
 COPY --from=build /app .
 EXPOSE 8360
-CMD ["node", "node_modules/@waline/vercel/vanilla.js"]
+CMD ["node", "node_modules/@waline/vercel/vanilla.js"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.31.13",
+  "version": "1.31.14",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -17,26 +17,26 @@
   "dependencies": {
     "@cloudbase/node-sdk": "^2.11.0",
     "@koa/cors": "^5.0.0",
-    "@mdit/plugin-katex": "^0.8.0",
-    "@mdit/plugin-mathjax": "^0.4.8",
-    "@mdit/plugin-sub": "^0.8.0",
-    "@mdit/plugin-sup": "^0.8.0",
+    "@mdit/plugin-katex": "0.8.0",
+    "@mdit/plugin-mathjax": "0.4.8",
+    "@mdit/plugin-sub": "0.8.0",
+    "@mdit/plugin-sup": "0.8.0",
     "akismet": "^2.0.7",
     "deta": "^2.0.0",
-    "dompurify": "^3.0.8",
+    "dompurify": "^3.1.3",
     "dy-node-ip2region": "^1.0.1",
     "fast-csv": "^5.0.1",
     "form-data": "^4.0.0",
     "jsdom": "^24.0.0",
     "jsonwebtoken": "^9.0.2",
-    "katex": "^0.16.9",
+    "katex": "^0.16.10",
     "koa-compose": "^4.1.0",
     "leancloud-storage": "^4.15.2",
-    "markdown-it": "^14.0.0",
+    "markdown-it": "^14.1.0",
     "markdown-it-emoji": "^3.0.0",
     "mathjax-full": "^3.2.2",
     "node-fetch": "^2.7.0",
-    "nodemailer": "^6.9.9",
+    "nodemailer": "^6.9.13",
     "nunjucks": "^3.2.4",
     "phpass": "^0.1.1",
     "prismjs": "^1.29.0",

package/src/config/adapter.js

@@ -82,9 +82,7 @@ if (MONGO_DB) {
 }
 
 const isVercelPostgres =
-  type === 'postgresql' &&
-  POSTGRES_HOST &&
-  POSTGRES_HOST.endsWith('vercel-storage.com');
+  type === 'postgresql' && POSTGRES_HOST?.endsWith('vercel-storage.com');
 
 exports.model = {
   type,

package/src/controller/article.js

@@ -37,15 +37,11 @@ module.exports = class extends BaseRest {
 
     const data = [];
 
-    for (let i = 0; i < path.length; i++) {
-      const url = path[i];
+    for (const url of path) {
       let counters = {};
 
-      for (let j = 0; j < type.length; j++) {
-        const field = type[j];
-
-        counters[field] =
-          respObj[url] && respObj[url][field] ? respObj[url][field] : 0;
+      for (const field of type) {
+        counters[field] = respObj[url]?.[field] ? respObj[url][field] : 0;
       }
 
       if (type.length === 1 && deprecated) {

package/src/controller/comment.js

@@ -29,10 +29,9 @@ async function formatCmt(
     comment.label = user.label;
   }
 
-  const avatarUrl =
-    user && user.avatar
-      ? user.avatar
-      : await think.service('avatar').stringify(comment);
+  const avatarUrl = user?.avatar
+    ? user.avatar
+    : await think.service('avatar').stringify(comment);
 
   comment.avatar =
     avatarProxy && !avatarUrl.includes(avatarProxy)
@@ -568,6 +567,21 @@ module.exports = class extends BaseRest {
               .reverse(),
           );
 
+          const childCommentsMap = new Map();
+
+          childCommentsMap.set(cmt.objectId, cmt);
+          cmt.children.forEach((c) => childCommentsMap.set(c.objectId, c));
+
+          cmt.children.forEach((c) => {
+            const parent = childCommentsMap.get(c.pid);
+
+            c.reply_user = {
+              nick: parent.nick,
+              link: parent.link,
+              avatar: parent.avatar,
+            };
+          });
+
           return cmt;
         }),
       ),

package/src/controller/db.js

@@ -14,8 +14,7 @@ module.exports = class extends BaseRest {
       },
     };
 
-    for (let i = 0; i < exportData.tables.length; i++) {
-      const tableName = exportData.tables[i];
+    for (const tableName of exportData.tables) {
       const model = this.getModel(tableName);
 
       const data = await model.select({});

package/src/controller/oauth.js

@@ -57,7 +57,7 @@ module.exports = class extends think.Controller {
       },
     ).then((resp) => resp.json());
 
-    if (!user || !user.id) {
+    if (!user?.id) {
       return this.fail(user);
     }
 

package/src/controller/rest.js

@@ -54,12 +54,12 @@ module.exports = class extends think.Controller {
       plugins.unshift(fn);
     }
 
-    for (let i = 0; i < plugins.length; i++) {
-      if (!think.isFunction(plugins[i])) {
+    for (const plugin of plugins) {
+      if (!think.isFunction(plugin)) {
         continue;
       }
 
-      const resp = await plugins[i].call(this, ...args);
+      const resp = await plugin.call(this, ...args);
 
       if (resp) {
         return resp;

package/src/controller/user.js

@@ -206,16 +206,15 @@ module.exports = class extends BaseRest {
         objectId: ['IN', userIds],
       });
 
-      for (let i = 0; i < users.length; i++) {
-        usersMap[users[i].objectId] = users;
+      for (const user of users) {
+        usersMap[user.objectId] = users;
       }
     }
 
     const users = [];
     const { avatarProxy } = this.config();
 
-    for (let i = 0; i < counts.length; i++) {
-      const count = counts[i];
+    for (const count of counts) {
       const user = {
         count: count.count,
       };

package/src/extend/controller.js

@@ -21,7 +21,7 @@ module.exports = {
     const { lang } = this.get();
     const locale = locales[(lang || 'zh-cn').toLowerCase()] || locales['zh-cn'];
 
-    if (locale && locale[message]) {
+    if (locale?.[message]) {
       message = locale[message];
     }
 

package/src/extend/think.js

@@ -92,10 +92,7 @@ module.exports = {
   uaParser(uaText) {
     const ua = parser(uaText);
 
-    if (
-      OS_VERSION_MAP[ua.os.name] &&
-      OS_VERSION_MAP[ua.os.name][ua.os.version]
-    ) {
+    if (OS_VERSION_MAP[ua.os.name]?.[ua.os.version]) {
       ua.os.version = OS_VERSION_MAP[ua.os.name][ua.os.version];
     }
 
@@ -121,10 +118,8 @@ module.exports = {
       return fns;
     }
 
-    for (let i = 0; i < plugins.length; i++) {
-      const plugin = plugins[i];
-
-      if (!plugin || !plugin[type]) {
+    for (const plugin of plugins) {
+      if (!plugin?.[type]) {
         continue;
       }
 

package/src/service/avatar.js

@@ -1,3 +1,5 @@
+const crypto = require('crypto');
+
 const nunjucks = require('nunjucks');
 const helper = require('think-helper');
 
@@ -6,6 +8,9 @@ const { GRAVATAR_STR } = process.env;
 const env = new nunjucks.Environment();
 
 env.addFilter('md5', (str) => helper.md5(str));
+env.addFilter('sha256', (str) =>
+  crypto.createHash('sha256').update(str).digest('hex'),
+);
 
 const DEFAULT_GRAVATAR_STR = `{%- set numExp = r/^[0-9]+$/g -%}
 {%- set qqMailExp = r/^[0-9]+@qq.com$/ig -%}

package/src/service/notify.js

@@ -487,13 +487,14 @@ module.exports = class extends think.Service {
 
     const mailList = [];
     const isAuthorComment = AUTHOR
-      ? comment.mail.toLowerCase() === AUTHOR.toLowerCase()
+      ? (comment.mail || '').toLowerCase() === AUTHOR.toLowerCase()
       : false;
     const isReplyAuthor = AUTHOR
-      ? parent && parent.mail.toLowerCase() === AUTHOR.toLowerCase()
+      ? parent && (parent.mail || '').toLowerCase() === AUTHOR.toLowerCase()
       : false;
     const isCommentSelf =
-      parent && parent.mail.toLowerCase() === comment.mail.toLowerCase();
+      parent &&
+      (parent.mail || '').toLowerCase() === (comment.mail || '').toLowerCase();
 
     const title = mailSubjectAdmin || 'MAIL_SUBJECT_ADMIN';
     const content = mailTemplateAdmin || 'MAIL_TEMPLATE_ADMIN';
@@ -539,9 +540,9 @@ module.exports = class extends think.Service {
       });
     }
 
-    for (let i = 0; i < mailList.length; i++) {
+    for (const mail of mailList) {
       try {
-        const response = await this.mail(mailList[i], comment, parent);
+        const response = await this.mail(mail, comment, parent);
 
         console.log('Notification mail send success: %s', response);
       } catch (e) {

package/src/service/storage/base.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable no-unused-vars */
 
 module.exports = class extends think.Service {

package/src/service/storage/deta.js

@@ -254,18 +254,18 @@ module.exports = class extends Base {
         groupFlatValue[group] = null;
       });
 
-      for (let j = 0; j < where._complex[groupName][1].length; j++) {
+      for (const item of where._complex[groupName][1]) {
         const groupWhere = {
           ...where,
           ...groupFlatValue,
           _complex: undefined,
-          [groupName]: where._complex[groupName][1][j],
+          [groupName]: item,
         };
         const num = await this.count(groupWhere);
 
         counts.push({
           ...groupFlatValue,
-          [groupName]: where._complex[groupName][1][j],
+          [groupName]: item,
           count: num,
         });
       }

package/src/service/storage/github.js

@@ -320,6 +320,8 @@ module.exports = class extends Base {
 
     const counts = {};
 
+    // FIXME: The loop is weird @lizheming
+    // eslint-disable-next-line @typescript-eslint/prefer-for-of
     for (let i = 0; i < data.length; i++) {
       const key = group.map((field) => data[field]).join();
 

package/src/service/storage/leancloud.js

@@ -271,18 +271,16 @@ module.exports = class extends Base {
       const counts = await this.select(where, { field: options.group });
       const countsMap = {};
 
-      for (let i = 0; i < counts.length; i++) {
+      for (const count of counts) {
         const key = options.group
-          .map((item) => counts[i][item] || undefined)
+          .map((item) => count[item] || undefined)
           .join('_');
 
         if (!countsMap[key]) {
           countsMap[key] = {};
 
-          for (let j = 0; j < options.group.length; j++) {
-            const field = options.group[j];
-
-            countsMap[key][field] = counts[i][field];
+          for (const field of options.group) {
+            countsMap[key][field] = count[field];
           }
           countsMap[key].count = 0;
         }
@@ -299,12 +297,12 @@ module.exports = class extends Base {
 
     const cacheDataMap = {};
 
-    for (let i = 0; i < cacheData.length; i++) {
+    for (const item of cacheData) {
       const key = options.group
-        .map((item) => cacheData[i][item] || undefined)
+        .map((item) => item[item] || undefined)
         .join('_');
 
-      cacheDataMap[key] = cacheData[i];
+      cacheDataMap[key] = item;
     }
 
     const counts = [];
@@ -323,13 +321,13 @@ module.exports = class extends Base {
         groupFlatValue[group] = undefined;
       });
 
-      for (let j = 0; j < where._complex[groupName][1].length; j++) {
+      for (const item of where._complex[groupName][1]) {
         const cacheKey = options.group
           .map(
             (item) =>
               ({
                 ...groupFlatValue,
-                [groupName]: where._complex[groupName][1][j],
+                [groupName]: item,
               })[item] || undefined,
           )
           .join('_');
@@ -342,7 +340,7 @@ module.exports = class extends Base {
           ...where,
           ...groupFlatValue,
           _complex: undefined,
-          [groupName]: where._complex[groupName][1][j],
+          [groupName]: item,
         };
         const countPromise = this.count(groupWhere, {
           ...options,
@@ -350,7 +348,7 @@ module.exports = class extends Base {
         }).then((num) => {
           counts.push({
             ...groupFlatValue,
-            [groupName]: where._complex[groupName][1][j],
+            [groupName]: item,
             count: num,
           });
         });

package/src/service/storage/postgresql.js

@@ -12,7 +12,7 @@ module.exports = class extends MySQL {
       lowerWhere[i.toLowerCase()] = where[i];
     }
 
-    if (options && options.desc) {
+    if (options?.desc) {
       options.desc = options.desc.toLowerCase();
     }
 

package/.eslintrc.yml

@@ -1,13 +0,0 @@
-globals:
-  think: readonly
-
-rules:
-  import/no-commonjs:
-    - off
-
-overrides:
-  - files:
-      - '__tests__/**/*.spec.js'
-
-    parserOptions:
-      sourceType: module