@waline/vercel 1.18.6 → 1.18.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.18.6",
+  "version": "1.18.9",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",
@@ -22,16 +22,16 @@
     "dompurify": "2.3.8",
     "dy-node-ip2region": "1.0.1",
     "fast-csv": "4.3.6",
-    "jsdom": "19.0.0",
+    "jsdom": "20.0.0",
     "jsonwebtoken": "8.5.1",
-    "katex": "0.15.6",
-    "leancloud-storage": "4.12.2",
+    "katex": "0.16.0",
+    "leancloud-storage": "4.12.3",
     "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.1",
-    "nodemailer": "6.7.5",
+    "mathjax-full": "3.2.2",
+    "nodemailer": "6.7.6",
     "nunjucks": "3.2.3",
     "phpass": "0.1.1",
     "prismjs": "1.28.0",
@@ -42,7 +42,7 @@
     "think-logger3": "1.3.1",
     "think-model": "1.5.4",
     "think-model-mysql": "1.1.7",
-    "think-model-postgresql": "1.1.6",
+    "think-model-postgresql": "1.1.7",
     "think-model-sqlite": "1.2.3",
     "think-mongo": "2.2.1",
     "think-router-rest": "1.0.5",

package/src/config/adapter.js

@@ -18,6 +18,7 @@ const {
   MYSQL_PASSWORD,
   MYSQL_PREFIX,
   MYSQL_CHARSET,
+  MYSQL_SSL,
   SQLITE_PATH,
   SQLITE_DB,
   SQLITE_PREFIX,
@@ -27,6 +28,7 @@ const {
   PG_PORT,
   PG_PREFIX,
   PG_USER,
+  PG_SSL,
   MONGO_AUTHSOURCE,
   MONGO_DB,
   MONGO_HOST,
@@ -93,6 +95,12 @@ exports.model = {
     port: PG_PORT || '3211',
     connectionLimit: 1,
     prefix: PG_PREFIX || 'wl_',
+    ssl:
+      PG_SSL == 'true'
+        ? {
+            rejectUnauthorized: false,
+          }
+        : null,
   },
 
   sqlite: {
@@ -113,6 +121,12 @@ exports.model = {
     password: MYSQL_PASSWORD,
     prefix: MYSQL_PREFIX || 'wl_',
     charset: MYSQL_CHARSET || 'utf8mb4',
+    ssl:
+      MYSQL_SSL === 'true'
+        ? {
+            rejectUnauthorized: false,
+          }
+        : null,
   },
 };
 

package/src/config/config.js

@@ -97,7 +97,7 @@ if (AVATAR_PROXY) {
   avatarProxy = !isFalse(AVATAR_PROXY) ? AVATAR_PROXY : '';
 }
 
-const oauthUrl = OAUTH_URL || 'https://user.75.team';
+const oauthUrl = OAUTH_URL || 'https://oauth.lithub.cc';
 
 module.exports = {
   workers: 1,

package/src/controller/db.js

@@ -3,6 +3,24 @@ const util = require('util');
 const BaseRest = require('./rest');
 
 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);
+  }
+
+  for (let i = 0; i < data.length; i++) {
+    ['objectId', 'pid', 'rid']
+      .filter((k) => data[i][k])
+      .forEach((k) => {
+        data[i][k] = objectIdMap[data[i][k]];
+      });
+  }
+
+  return data;
+}
 module.exports = class extends BaseRest {
   async getAction() {
     const exportData = {
@@ -43,11 +61,17 @@ module.exports = class extends BaseRest {
         const storage = this.config('storage');
         const model = this.service(`storage/${storage}`, tableName);
 
+        let data = importData.data[tableName];
+        if (['postgresql', 'mysql', 'sqlite'].includes(storage)) {
+          let i = 0;
+          data = formatID(data, () => (i = i + 1));
+        }
+
         // delete all data at first
         await model.delete({});
         // then add data one by one
-        for (let j = 0; j < importData.data[tableName].length; j++) {
-          await model.add(importData.data[tableName][j]);
+        for (let j = 0; j < data.length; j++) {
+          await model.add(data[j]);
         }
       }
       return this.success();

package/src/controller/user/password.js

@@ -36,7 +36,7 @@ module.exports = class extends BaseRest {
           ? `"${SENDER_NAME}" <${SENDER_EMAIL}>`
           : SMTP_USER,
       to: user[0].email,
-      subject: this.locale('[{{name}}] Reset Password', {
+      subject: this.locale('[{{name | safe}}] Reset Password', {
         name: SITE_NAME || 'Waline',
       }),
       html: this.locale(

package/src/controller/user.js

@@ -89,7 +89,7 @@ module.exports = class extends BaseRest {
             ? `"${SENDER_NAME}" <${SENDER_EMAIL}>`
             : SMTP_USER,
         to: data.email,
-        subject: this.locale('[{{name}}] Registration Confirm Mail', {
+        subject: this.locale('[{{name | safe}}] Registration Confirm Mail', {
           name: SITE_NAME || 'Waline',
         }),
         html: this.locale(

package/src/extend/think.js

@@ -55,7 +55,7 @@ module.exports = {
     });
   },
   async ip2region(ip, { depth = 1 }) {
-    if (!ip) return '';
+    if (!ip || ip.includes(':')) return '';
 
     try {
       const search = helper.promisify(regionSearch.btreeSearch, regionSearch);

package/src/locales/en.json

@@ -5,9 +5,9 @@
   "USER_REGISTED": "USER_REGISTED",
   "TOKEN_EXPIRED": "TOKEN_EXPIRED",
   "TWO_FACTOR_AUTH_ERROR_DETAIL": "TWO_FACTOR_AUTH_ERROR_DETAIL",
-  "[{{name}}] Registration Confirm Mail": "[{{name}}] Registration Confirm Mail",
+  "[{{name | safe}}] Registration Confirm Mail": "[{{name | safe}}] Registration Confirm Mail",
   "Please click <a href=\"{{url}}\">{{url}}<a/> to confirm registration, the link is valid for 1 hour. If you are not registering, please ignore this email.": "Please click <a href=\"{{url}}\">{{url}}<a/> to confirm registration, the link is valid for 1 hour. If you are not registering, please ignore this email.",
-  "[{{name}}] Reset Password": "[{{name}}] Reset Password",
+  "[{{name | safe}}] Reset Password": "[{{name | safe}}] Reset Password",
   "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!",
   "Duplicate Content": "Duplicate Content",
   "Comment too fast": "Comment too fast",

package/src/locales/zh-CN.json

@@ -5,9 +5,9 @@
   "USER_REGISTED": "用户已注册",
   "TOKEN_EXPIRED": "密钥已过期",
   "TWO_FACTOR_AUTH_ERROR_DETAIL": "二步验证失败",
-  "[{{name}}] Registration Confirm Mail": "【{{name}}】注册确认邮件",
+  "[{{name | safe}}] Registration Confirm Mail": "【{{name | safe}}】注册确认邮件",
   "Please click <a href=\"{{url}}\">{{url}}<a/> to confirm registration, the link is valid for 1 hour. If you are not registering, please ignore this email.": "请点击 <a href=\"{{url}}\">{{url}}</a> 确认注册，链接有效时间为 1 个小时。如果不是你在注册，请忽略这封邮件。",
-  "[{{name}}] Reset Password": "【{{name}}】重置密码",
+  "[{{name | safe}}] Reset Password": "【{{name | safe}}】重置密码",
   "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "请尽快点击链接 <a href=\"{{url}}\">{{url}}</a> 登录并修改你的密码！",
   "Duplicate Content": "发送的内容之前已经发过",
   "Comment too fast": "评论太快啦，请慢点！",

package/src/locales/zh-TW.json

@@ -5,9 +5,9 @@
   "USER_REGISTED": "用戶已註冊",
   "TOKEN_EXPIRED": "密鑰已過期",
   "TWO_FACTOR_AUTH_ERROR_DETAIL": "二步驗證失敗",
-  "[{{name}}] Registration Confirm Mail": "『{{name}}』註冊確認郵件",
+  "[{{name | safe}}] Registration Confirm Mail": "『{{name | safe}}』註冊確認郵件",
   "Please click <a href=\"{{url}}\">{{url}}<a/> to confirm registration, the link is valid for 1 hour. If you are not registering, please ignore this email.": "請點擊 <a href=\"{{url}}\">{{url}}</a> 確認註冊，鏈接有效時間為 1 個小時。如果不是你在註冊，請忽略這封郵件。",
-  "[{{name}}] Reset Password": "『{{name}}』重置密碼",
+  "[{{name | safe}}] Reset Password": "『{{name | safe}}』重置密碼",
   "Please click <a href=\"{{url}}\">{{url}}</a> to login and change your password as soon as possible!": "請盡快點擊鏈接 <a href=\"{{url}}\">{{url}}</a> 登錄並修改你的密碼！",
   "Duplicate Content": "發送的內容之前已經發過",
   "Comment too fast": "評論太快啦，請慢點！",

package/src/logic/base.js

@@ -1,3 +1,4 @@
+const path = require('path');
 const jwt = require('jsonwebtoken');
 const helper = require('think-helper');
 
@@ -8,6 +9,7 @@ module.exports = class extends think.Logic {
       `storage/${this.config('storage')}`,
       'Users'
     );
+    this.resource = this.getResource();
     this.id = this.getId();
   }
 
@@ -92,6 +94,13 @@ module.exports = class extends think.Logic {
     this.ctx.state.token = token;
   }
 
+  getResource() {
+    const filename = this.__filename || __filename;
+    const last = filename.lastIndexOf(path.sep);
+
+    return filename.substr(last + 1, filename.length - last - 4);
+  }
+
   getId() {
     const id = this.get('id');
 

package/src/service/storage/postgresql.js

@@ -5,8 +5,21 @@ module.exports = class extends MySQL {
     return super.model(tableName.toLowerCase());
   }
 
-  async select(...args) {
-    const data = await super.select(...args);
+  async select(where, options = {}) {
+    const lowerWhere = {};
+    for (const i in where) {
+      lowerWhere[i.toLowerCase()] = where[i];
+    }
+
+    if (options && options.desc) {
+      options.desc = options.desc.toLowerCase();
+    }
+
+    if (Array.isArray(options.field)) {
+      options.field = options.field.map((field) => field.toLowerCase());
+    }
+
+    const data = await super.select(where, options);
     return data.map(({ insertedat, createdat, updatedat, ...item }) => {
       const mapFields = {
         insertedAt: insertedat,
@@ -23,6 +36,20 @@ module.exports = class extends MySQL {
     });
   }
 
+  async add(data) {
+    ['insertedAt', 'createdAt', 'updatedAt']
+      .filter((key) => data[key])
+      .forEach((key) => {
+        const val = data[key];
+        data[key.toLowerCase()] =
+          val instanceof Date
+            ? think.datetime(val, 'YYYY-MM-DD HH:mm:ss')
+            : val;
+        delete data[key];
+      });
+    return super.add(data);
+  }
+
   async count(...args) {
     let result = await super.count(...args);
     try {