@waline/vercel 1.18.9 → 1.19.2

package/__tests__/katex.spec.js

@@ -48,6 +48,7 @@ describe('inline katex', () => {
   it('Should render error msg when content is wrong', () => {
     // eslint-disable-next-line @typescript-eslint/unbound-method
     const originalWarn = global.console.warn;
+
     global.console.warn = vi.fn();
 
     expect(markdownItWithError.render('$\\fra{a}{b}$')).toEqual(
@@ -119,6 +120,7 @@ $$
   it('Should render error msg when content is wrong', () => {
     // eslint-disable-next-line @typescript-eslint/unbound-method
     const originalWarn = global.console.warn;
+
     global.console.warn = vi.fn();
     expect(markdownItWithError.render('$$\\fra{a}{b}$$')).toMatch(
       /<p class='katex-block katex-error' title='[\s\S]*?'>[\s\S]*?<\/p>/

package/index.js

@@ -16,6 +16,7 @@ module.exports = function (configParams = {}) {
   });
 
   const loader = new Loader(app.options);
+
   loader.loadAll('worker');
 
   return function (req, res) {
@@ -30,6 +31,7 @@ module.exports = function (configParams = {}) {
       })
       .then(() => {
         const callback = think.app.callback();
+
         return callback(req, res);
       })
       .then(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.18.9",
+  "version": "1.19.2",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -19,31 +19,31 @@
     "@koa/cors": "3.3.0",
     "akismet": "2.0.7",
     "deta": "1.1.0",
-    "dompurify": "2.3.8",
+    "dompurify": "2.3.10",
     "dy-node-ip2region": "1.0.1",
     "fast-csv": "4.3.6",
+    "form-data": "4.0.0",
     "jsdom": "20.0.0",
     "jsonwebtoken": "8.5.1",
     "katex": "0.16.0",
-    "leancloud-storage": "4.12.3",
+    "leancloud-storage": "4.13.1",
     "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",
-    "nodemailer": "6.7.6",
+    "node-fetch": "2.6.7",
+    "nodemailer": "6.7.8",
     "nunjucks": "3.2.3",
     "phpass": "0.1.1",
     "prismjs": "1.28.0",
-    "request": "2.88.2",
-    "request-promise-native": "1.0.9",
     "speakeasy": "2.0.0",
-    "think-helper": "^1.1.3",
+    "think-helper": "1.1.3",
     "think-logger3": "1.3.1",
     "think-model": "1.5.4",
     "think-model-mysql": "1.1.7",
     "think-model-postgresql": "1.1.7",
-    "think-model-sqlite": "1.2.3",
+    "think-model-sqlite": "1.3.0",
     "think-mongo": "2.2.1",
     "think-router-rest": "1.0.5",
     "thinkjs": "3.2.14",

package/src/config/adapter.js

@@ -40,6 +40,7 @@ const {
 
 let type = 'common';
 const mongoOpt = {};
+
 if (MONGO_REPLICASET) mongoOpt.replicaSet = MONGO_REPLICASET;
 if (MONGO_AUTHSOURCE) mongoOpt.authSource = MONGO_AUTHSOURCE;
 
@@ -51,6 +52,7 @@ if (MONGO_DB) {
         .slice(10)
         .toLocaleLowerCase()
         .replace(/_([a-z])/g, (_, b) => b.toUpperCase());
+
       mongoOpt[key] = process.env[envKeys];
     }
   }

package/src/config/config.js

@@ -93,6 +93,7 @@ const markdown = {
 if (isFalse(MARKDOWN_HIGHLIGHT)) markdown.config.highlight = false;
 
 let avatarProxy = '';
+
 if (AVATAR_PROXY) {
   avatarProxy = !isFalse(AVATAR_PROXY) ? AVATAR_PROXY : '';
 }

package/src/config/extend.js

@@ -1,6 +1,6 @@
+const fetch = require('node-fetch');
 const Model = require('think-model');
 const Mongo = require('think-mongo');
-const request = require('request-promise-native');
 
 module.exports = [
   Model(think.app),
@@ -9,27 +9,29 @@ module.exports = [
     context: {
       get serverURL() {
         const { SERVER_URL } = process.env;
+
         if (SERVER_URL) {
           return SERVER_URL;
         }
 
         const { protocol, host } = this;
+
         return `${protocol}://${host}`;
       },
       async webhook(type, data) {
         const { WEBHOOK } = process.env;
+
         if (!WEBHOOK) {
           return;
         }
 
-        return request({
-          uri: WEBHOOK,
+        return fetch(WEBHOOK, {
           method: 'POST',
           headers: {
             'content-type': 'application/json',
           },
           body: JSON.stringify({ type, data }),
-        });
+        }).then((resp) => resp.json());
       },
     },
   },

package/src/controller/article.js

@@ -30,6 +30,7 @@ module.exports = class extends BaseRest {
 
     const respObj = resp.reduce((o, n) => {
       o[n.url] = n.time;
+
       return o;
     }, {});
 

package/src/controller/comment.js

@@ -4,6 +4,7 @@ const akismet = require('../service/akismet');
 const { getMarkdownParser } = require('../service/markdown');
 
 const markdownParser = getMarkdownParser();
+
 async function formatCmt(
   { ua, user_id, ip, ...comment },
   users = [],
@@ -20,6 +21,7 @@ async function formatCmt(
   }
 
   const user = users.find(({ objectId }) => user_id === objectId);
+
   if (!think.isEmpty(user)) {
     comment.nick = user.display_name;
     comment.mail = user.email;
@@ -32,12 +34,14 @@ async function formatCmt(
     user && user.avatar
       ? user.avatar
       : await think.service('avatar').stringify(comment);
+
   comment.avatar =
     avatarProxy && !avatarUrl.includes(avatarProxy)
       ? avatarProxy + '?url=' + encodeURIComponent(avatarUrl)
       : avatarUrl;
 
   const isAdmin = loginUser && loginUser.type === 'administrator';
+
   if (!isAdmin) {
     delete comment.mail;
   } else {
@@ -51,6 +55,7 @@ async function formatCmt(
   }
   comment.comment = markdownParser(comment.comment);
   comment.like = Number(comment.like) || 0;
+
   return comment;
 }
 
@@ -71,6 +76,7 @@ module.exports = class extends BaseRest {
       case 'recent': {
         const { count } = this.get();
         const where = {};
+
         if (think.isEmpty(userInfo) || this.config('storage') === 'deta') {
           where.status = ['NOT IN', ['waiting', 'spam']];
         } else {
@@ -111,6 +117,7 @@ module.exports = class extends BaseRest {
         );
 
         let users = [];
+
         if (user_ids.length) {
           users = await userModel.select(
             { objectId: ['IN', user_ids] },
@@ -139,6 +146,7 @@ module.exports = class extends BaseRest {
       case 'count': {
         const { url } = this.get();
         const where = { url: ['IN', url] };
+
         if (think.isEmpty(userInfo) || this.config('storage') === 'deta') {
           where.status = ['NOT IN', ['waiting', 'spam']];
         } else {
@@ -162,6 +170,7 @@ module.exports = class extends BaseRest {
 
         if (owner === 'mine') {
           const { userInfo } = this.ctx.state;
+
           where.mail = userInfo.email;
         }
 
@@ -198,6 +207,7 @@ module.exports = class extends BaseRest {
         );
 
         let users = [];
+
         if (user_ids.length) {
           users = await userModel.select(
             { objectId: ['IN', user_ids] },
@@ -231,6 +241,7 @@ module.exports = class extends BaseRest {
       default: {
         const { path: url, page, pageSize } = this.get();
         const where = { url };
+
         if (think.isEmpty(userInfo) || this.config('storage') === 'deta') {
           where.status = ['NOT IN', ['waiting', 'spam']];
         } else if (userInfo.type !== 'administrator') {
@@ -290,6 +301,7 @@ module.exports = class extends BaseRest {
             ...comments.filter(({ rid, sticky }) => !rid && !sticky),
           ].slice(pageOffset, pageOffset + pageSize);
           const rootIds = {};
+
           rootComments.forEach(({ objectId }) => {
             rootIds[objectId] = true;
           });
@@ -312,6 +324,7 @@ module.exports = class extends BaseRest {
             },
             selectOptions
           );
+
           comments = [...rootComments, ...children];
           rootCount = await this.modelInstance.count({
             ...where,
@@ -349,12 +362,14 @@ module.exports = class extends BaseRest {
             status: ['NOT IN', ['waiting', 'spam']],
             _complex: {},
           };
+
           if (user_ids.length) {
             countWhere._complex.user_id = ['IN', user_ids];
           }
           const mails = Array.from(
             new Set(comments.map(({ mail }) => mail).filter((v) => v))
           );
+
           if (mails.length) {
             countWhere._complex.mail = ['IN', mails];
           }
@@ -366,20 +381,24 @@ module.exports = class extends BaseRest {
           const counts = await this.modelInstance.count(countWhere, {
             group: ['user_id', 'mail'],
           });
+
           comments.forEach((cmt) => {
             const countItem = (counts || []).find(({ mail, user_id }) => {
               if (cmt.user_id) {
                 return user_id === cmt.user_id;
               }
+
               return mail === cmt.mail;
             });
 
             let level = 0;
+
             if (countItem) {
               const _level = think.findLastIndex(
                 this.config('levels'),
                 (l) => l <= countItem.count
               );
+
               if (_level !== -1) {
                 level = _level;
               }
@@ -401,12 +420,14 @@ module.exports = class extends BaseRest {
                 this.config(),
                 userInfo
               );
+
               cmt.children = await Promise.all(
                 comments
                   .filter(({ rid }) => rid === cmt.objectId)
                   .map((cmt) => formatCmt(cmt, users, this.config(), userInfo))
                   .reverse()
               );
+
               return cmt;
             })
           ),
@@ -486,6 +507,7 @@ module.exports = class extends BaseRest {
 
       if (!think.isEmpty(recent)) {
         think.logger.debug(`The author has posted in ${IPQPS} seconeds.`);
+
         return this.fail(this.locale('Comment too fast!'));
       }
 
@@ -520,6 +542,7 @@ module.exports = class extends BaseRest {
 
         if (!think.isEmpty(forbiddenWords)) {
           const regexp = new RegExp('(' + forbiddenWords.join('|') + ')', 'ig');
+
           if (regexp.test(comment)) {
             data.status = 'spam';
           }
@@ -544,9 +567,17 @@ module.exports = class extends BaseRest {
     think.logger.debug(`Comment have been added to storage.`);
 
     let parentComment;
+    let parentUser;
+
     if (pid) {
       parentComment = await this.modelInstance.select({ objectId: pid });
       parentComment = parentComment[0];
+      if (parentComment.user_id) {
+        parentUser = await this.model('User').select({
+          objectId: parentComment.user_id,
+        });
+        parentUser = parentUser[0];
+      }
     }
 
     await this.ctx.webhook('new_comment', {
@@ -554,13 +585,27 @@ module.exports = class extends BaseRest {
       reply: parentComment,
     });
 
+    const cmtReturn = await formatCmt(
+      resp,
+      [userInfo],
+      this.config(),
+      userInfo
+    );
+    const parentReturn = parentComment
+      ? await formatCmt(
+          parentComment,
+          parentUser ? [parentUser] : [],
+          this.config(),
+          userInfo
+        )
+      : undefined;
+
     if (comment.status !== 'spam') {
       const notify = this.service('notify');
+
       await notify.run(
-        { ...resp, comment: markdownParser(resp.comment), rawComment: comment },
-        parentComment
-          ? { ...parentComment, comment: markdownParser(parentComment.comment) }
-          : undefined
+        { ...cmtReturn, mail: resp.mail, rawComment: comment },
+        parentReturn ? { ...parentReturn, mail: parentComment.mail } : undefined
       );
     }
 
@@ -579,6 +624,7 @@ module.exports = class extends BaseRest {
     const { userInfo } = this.ctx.state;
     let data = this.post();
     let oldData = await this.modelInstance.select({ objectId: this.id });
+
     if (think.isEmpty(oldData)) {
       return this.success();
     }
@@ -590,6 +636,7 @@ module.exports = class extends BaseRest {
       }
 
       const likeIncMax = this.config('LIKE_INC_MAX') || 1;
+
       data = {
         like:
           (Number(oldData.like) || 0) +
@@ -615,15 +662,47 @@ module.exports = class extends BaseRest {
       data.status === 'approved' &&
       oldData.pid
     ) {
+      let cmtUser;
+
+      if (newData.user_id) {
+        cmtUser = await this.model('User').select({
+          objectId: newData.user_id,
+        });
+        cmtUser = cmtUser[0];
+      }
+
       let pComment = await this.modelInstance.select({
         objectId: oldData.pid,
       });
+
       pComment = pComment[0];
 
+      let pUser;
+
+      if (pComment.user_id) {
+        pUser = await this.model('User').select({
+          objectId: pComment.user_id,
+        });
+        pUser = pUser[0];
+      }
+
       const notify = this.service('notify');
+      const cmtReturn = await formatCmt(
+        newData,
+        cmtUser ? [cmtUser] : [],
+        this.config(),
+        userInfo
+      );
+      const pcmtReturn = await formatCmt(
+        pComment,
+        pUser ? [pUser] : [],
+        this.config(),
+        userInfo
+      );
+
       await notify.run(
-        { ...newData, comment: markdownParser(newData.comment) },
-        { ...pComment, comment: markdownParser(pComment.comment) },
+        { ...cmtReturn, mail: newData.mail },
+        { ...pcmtReturn, mail: pComment.mail },
         true
       );
     }

package/src/controller/db.js

@@ -6,8 +6,10 @@ const readFileAsync = util.promisify(fs.readFile);
 
 function formatID(data, idGenerator) {
   const objectIdMap = {};
+
   for (let i = 0; i < data.length; i++) {
     const { objectId } = data[i];
+
     objectIdMap[objectId] = idGenerator(data[i], i, data);
   }
 
@@ -21,6 +23,7 @@ function formatID(data, idGenerator) {
 
   return data;
 }
+
 module.exports = class extends BaseRest {
   async getAction() {
     const exportData = {
@@ -41,6 +44,7 @@ module.exports = class extends BaseRest {
       const model = this.service(`storage/${storage}`, tableName);
 
       const data = await model.select({});
+
       exportData.data[tableName] = data;
     }
 
@@ -49,36 +53,90 @@ module.exports = class extends BaseRest {
 
   async postAction() {
     const file = this.file('file');
+
     try {
       const jsonText = await readFileAsync(file.path, 'utf-8');
       const importData = JSON.parse(jsonText);
+
       if (!importData || importData.type !== 'waline') {
         return this.fail(this.locale('import data format not support!'));
       }
 
+      const idMaps = {};
+      const storage = this.config('storage');
+
       for (let i = 0; i < importData.tables.length; i++) {
         const tableName = importData.tables[i];
-        const storage = this.config('storage');
         const model = this.service(`storage/${storage}`, tableName);
 
+        idMaps[tableName] = new Map();
         let data = importData.data[tableName];
+
         if (['postgresql', 'mysql', 'sqlite'].includes(storage)) {
           let i = 0;
+
           data = formatID(data, () => (i = i + 1));
+        } else if (storage === 'leancloud') {
+          data
+            .filter(({ insertedAt }) => insertedAt)
+            .forEach((item) => {
+              item.insertedAt = new Date(item.insertedAt);
+            });
         }
 
         // delete all data at first
         await model.delete({});
         // then add data one by one
         for (let j = 0; j < data.length; j++) {
-          await model.add(data[j]);
+          const ret = await model.add(data[j]);
+
+          idMaps[tableName].set(data[j].objectId, ret.objectId);
         }
       }
+
+      const cmtModel = this.service(`storage/${storage}`, 'Comment');
+      const commentData = importData.data.Comment;
+      const willUpdateData = [];
+
+      for (let i = 0; i < commentData.length; i++) {
+        const cmt = commentData[i];
+        const willUpdateItem = {};
+
+        [
+          { tableName: 'Comment', field: 'pid' },
+          { tableName: 'Comment', field: 'rid' },
+          { tableName: 'Users', field: 'user_id' },
+        ].forEach(({ tableName, field }) => {
+          if (!cmt[field]) {
+            return;
+          }
+          const oldId = cmt[field];
+          const newId = idMaps[tableName].get(cmt[field]);
+
+          if (oldId !== newId) {
+            willUpdateItem[field] = newId;
+          }
+        });
+        if (!think.isEmpty(willUpdateItem)) {
+          willUpdateData.push([
+            willUpdateItem,
+            { objectId: idMaps.Comment.get(cmt.objectId) },
+          ]);
+        }
+      }
+      for (let i = 0; i < willUpdateData.length; i++) {
+        const [data, where] = willUpdateData[i];
+
+        await cmtModel.update(data, where);
+      }
+
       return this.success();
     } catch (e) {
       if (think.isPrevent(e)) {
         return this.success();
       }
+      console.log(e);
+
       return this.fail(e.message);
     }
   }

package/src/controller/oauth.js

@@ -1,7 +1,8 @@
-const qs = require('querystring');
 const jwt = require('jsonwebtoken');
+const fetch = require('node-fetch');
 const { PasswordHash } = require('phpass');
-const request = require('request-promise-native');
+const qs = require('querystring');
+
 module.exports = class extends think.Controller {
   constructor(ctx) {
     super(ctx);
@@ -17,12 +18,14 @@ module.exports = class extends think.Controller {
 
     const hasCode =
       type === 'twitter' ? oauth_token && oauth_verifier : Boolean(code);
+
     if (!hasCode) {
       const { serverURL } = this.ctx;
       const redirectUrl = `${serverURL}/oauth?${qs.stringify({
         redirect,
         type,
       })}`;
+
       return this.redirect(
         `${oauthUrl}/${type}?${qs.stringify({
           redirect: redirectUrl,
@@ -35,28 +38,29 @@ module.exports = class extends think.Controller {
      * user = { id, name, email, avatar,url };
      */
     const params = { code, oauth_verifier, oauth_token };
+
     if (type === 'facebook') {
       const { serverURL } = this.ctx;
       const redirectUrl = `${serverURL}/oauth?${qs.stringify({
         redirect,
         type,
       })}`;
+
       params.state = qs.stringify({
         redirect: redirectUrl,
         state: this.ctx.state.token || '',
       });
     }
 
-    const user = await request({
-      url: `${oauthUrl}/${type}?${qs.stringify(params)}`,
+    const user = await fetch(`${oauthUrl}/${type}?${qs.stringify(params)}`, {
       method: 'GET',
-      json: true,
       headers: {
-        'User-Agent': '@waline',
+        'user-agent': '@waline',
       },
-    });
+    }).then((resp) => resp.json());
+
     if (!user || !user.id) {
-      return this.fail();
+      return this.fail(user);
     }
 
     const userBySocial = await this.modelInstance.select({ [type]: user.id });
@@ -78,6 +82,7 @@ module.exports = class extends think.Controller {
     }
 
     const current = this.ctx.state.userInfo;
+
     if (!think.isEmpty(current)) {
       const updateData = { [type]: user.id };
 
@@ -93,6 +98,7 @@ module.exports = class extends think.Controller {
     }
 
     const userByEmail = await this.modelInstance.select({ email: user.email });
+
     if (think.isEmpty(userByEmail)) {
       const count = await this.modelInstance.count();
       const data = {

package/src/controller/rest.js

@@ -42,6 +42,7 @@ module.exports = class extends think.Controller {
 
   isLogin() {
     const { userInfo } = this.ctx.state;
+
     return think.isEmpty(userInfo);
   }
 

package/src/controller/token/2fa.js

@@ -19,10 +19,12 @@ module.exports = class extends BaseRest {
         }
       );
       const is2FAEnabled = !think.isEmpty(user) && Boolean(user[0]['2fa']);
+
       return this.success({ enable: is2FAEnabled });
     }
 
     const name = `waline_${userInfo.objectId}`;
+
     if (userInfo['2fa'] && userInfo['2fa'].length == 32) {
       return this.success({
         otpauth_url: `otpauth://totp/${name}?secret=${userInfo['2fa']}`,
@@ -34,6 +36,7 @@ module.exports = class extends BaseRest {
       length: 20,
       name,
     });
+
     return this.success({ otpauth_url, secret });
   }
 
@@ -55,6 +58,7 @@ module.exports = class extends BaseRest {
       'Users'
     );
     const { objectId } = this.ctx.state.userInfo;
+
     await userModel.update({ ['2fa']: data.secret }, { objectId });
 
     return this.success();