@waline/vercel 1.26.3 → 1.26.4

package/dist/src/service/storage/postgresql.js

@@ -0,0 +1,84 @@
+const MySQL = require('./mysql');
+
+module.exports = class extends MySQL {
+  model(tableName) {
+    return super.model(tableName.toLowerCase());
+  }
+
+  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(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;
+    });
+  }
+
+  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 {
+      if (Array.isArray(result)) {
+        result.forEach((r) => {
+          r.count = parseInt(r.count);
+        });
+      } else {
+        result = parseInt(result);
+      }
+    } catch (e) {
+      console.log(e);
+    }
+
+    return result;
+  }
+
+  async setSeqId(id) {
+    const instance = this.model(this.tableName);
+
+    return instance.query(
+      `ALTER SEQUENCE ${instance.tableName}_seq RESTART WITH ${id};`
+    );
+  }
+};

package/dist/src/service/storage/sqlite.js

@@ -0,0 +1,11 @@
+const MySQL = require('./mysql');
+
+module.exports = class extends MySQL {
+  async setSeqId(id) {
+    const instance = this.model(this.tableName);
+
+    return instance.query(
+      `UPDATE SQLITE_SEQUENCE SET SEQ=${id} WHERE NAME='${instance.tableName}';`
+    );
+  }
+};

package/dist/src/service/storage/tidb.js

@@ -0,0 +1,3 @@
+const MySQL = require('./mysql');
+
+module.exports = class extends MySQL {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waline/vercel",
-  "version": "1.26.3",
+  "version": "1.26.4",
   "description": "vercel server for waline comment system",
   "keywords": [
     "waline",

package/src/controller/comment.js

@@ -1,4 +1,3 @@
-const parser = require('ua-parser-js');
 const BaseRest = require('./rest');
 const akismet = require('../service/akismet');
 const { getMarkdownParser } = require('../service/markdown');
@@ -11,7 +10,7 @@ async function formatCmt(
   { avatarProxy },
   loginUser
 ) {
-  ua = parser(ua);
+  ua = think.uaParser(ua);
   if (!think.config('disableUserAgent')) {
     comment.browser = `${ua.browser.name || ''}${(ua.browser.version || '')
       .split('.')

package/src/extend/think.js

@@ -1,9 +1,16 @@
+const parser = require('ua-parser-js');
 const ip2region = require('dy-node-ip2region');
 const helper = require('think-helper');
 const preventMessage = 'PREVENT_NEXT_PROCESS';
 
 const regionSearch = ip2region.create(process.env.IP2REGION_DB);
 
+const OS_VERSION_MAP = {
+  'Windows': {
+    'NT 11.0': '11',
+  },
+};
+
 module.exports = {
   prevent() {
     throw new Error(preventMessage);
@@ -81,4 +88,16 @@ module.exports = {
       return '';
     }
   },
+  uaParser(uaText) {
+    const ua = parser(uaText);
+
+    if (
+      OS_VERSION_MAP[ua.os.name] &&
+      OS_VERSION_MAP[ua.os.name][ua.os.version]
+    ) {
+      ua.os.version = OS_VERSION_MAP[ua.os.name][ua.os.version];
+    }
+
+    return ua;
+  },
 };