@waline/vercel 1.30.2 → 1.30.4

package/package.json

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

package/src/config/adapter.js

@@ -31,12 +31,19 @@ const {
   SQLITE_DB,
   SQLITE_PREFIX,
   PG_DB,
+  POSTGRES_DATABASE,
   PG_HOST,
+  POSTGRES_HOST,
   PG_PASSWORD,
+  POSTGRES_PASSWORD,
   PG_PORT,
+  POSTGRES_PORT,
   PG_PREFIX,
+  POSTGRES_PREFIX,
   PG_USER,
+  POSTGRES_USER,
   PG_SSL,
+  POSTGRES_SSL,
   MONGO_AUTHSOURCE,
   MONGO_DB,
   MONGO_HOST,
@@ -64,7 +71,7 @@ if (MONGO_DB) {
       mongoOpt[key] = process.env[envKeys];
     }
   }
-} else if (PG_DB) {
+} else if (PG_DB || POSTGRES_DATABASE) {
   type = 'postgresql';
 } else if (SQLITE_PATH) {
   type = 'sqlite';
@@ -74,6 +81,11 @@ if (MONGO_DB) {
   type = 'tidb';
 }
 
+const isVercelPostgres =
+  type === 'postgresql' &&
+  POSTGRES_HOST &&
+  POSTGRES_HOST.endsWith('vercel-storage.com');
+
 exports.model = {
   type,
   common: {
@@ -100,15 +112,15 @@ exports.model = {
 
   postgresql: {
     handle: Postgresql,
-    user: PG_USER,
-    password: PG_PASSWORD,
-    database: PG_DB,
-    host: PG_HOST || '127.0.0.1',
-    port: PG_PORT || '3211',
+    user: PG_USER || POSTGRES_USER,
+    password: PG_PASSWORD || POSTGRES_PASSWORD,
+    database: PG_DB || POSTGRES_DATABASE,
+    host: PG_HOST || POSTGRES_HOST || '127.0.0.1',
+    port: PG_PORT || POSTGRES_PORT || (isVercelPostgres ? '5432' : '3211'),
     connectionLimit: 1,
-    prefix: PG_PREFIX || 'wl_',
+    prefix: PG_PREFIX || POSTGRES_PREFIX || 'wl_',
     ssl:
-      PG_SSL == 'true'
+      (PG_SSL || POSTGRES_SSL) == 'true' || isVercelPostgres
         ? {
             rejectUnauthorized: false,
           }

package/src/config/config.js

@@ -7,7 +7,9 @@ const {
   TIDB_PASSWORD,
   SQLITE_PATH,
   PG_DB,
+  POSTGRES_DATABASE,
   PG_PASSWORD,
+  POSTGRES_PASSWORD,
   MONGO_DB,
   MONGO_PASSWORD,
   FORBIDDEN_WORDS,
@@ -53,9 +55,9 @@ if (LEAN_KEY) {
 } else if (MONGO_DB) {
   storage = 'mongodb';
   jwtKey = jwtKey || MONGO_PASSWORD;
-} else if (PG_DB) {
+} else if (PG_DB || POSTGRES_DATABASE) {
   storage = 'postgresql';
-  jwtKey = jwtKey || PG_PASSWORD;
+  jwtKey = jwtKey || PG_PASSWORD || POSTGRES_PASSWORD;
 } else if (SQLITE_PATH) {
   storage = 'sqlite';
 } else if (MYSQL_DB) {

package/src/config/extend.js

@@ -4,6 +4,8 @@ const Mongo = require('think-mongo');
 
 const { isNetlify, netlifyFunctionPrefix } = require('./netlify');
 
+const isDeta = think.env === 'deta' || process.env.DETA_RUNTIME === 'true';
+
 module.exports = [
   Model(think.app),
   Mongo(think.app),
@@ -22,6 +24,10 @@ module.exports = [
           return `${protocol}://${host}${netlifyFunctionPrefix}`;
         }
 
+        if (isDeta) {
+          return `https://${host}`;
+        }
+
         return `${protocol}://${host}`;
       },
       async webhook(type, data) {

package/src/controller/comment.js

@@ -493,7 +493,7 @@ module.exports = class extends BaseRest {
       user_id: this.ctx.state.userInfo.objectId,
     };
 
-    if (pid && this.ctx.deprecated) {
+    if (pid && this.ctx.state.deprecated) {
       data.comment = `[@${at}](#${pid}): ` + data.comment;
     }