@waline/vercel 1.34.2 → 1.35.1

package/Dockerfile

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

package/Dockerfile.alpine

@@ -1,15 +1,15 @@
 # https://github.com/nodejs/LTS
 FROM node:lts AS build
 WORKDIR /app
-ENV NODE_ENV production
+ENV NODE_ENV="production"
 RUN set -eux; \
 	# npm config set registry https://registry.npm.taobao.org; \
 	npm install --production --silent @waline/vercel
 
 FROM node:lts-alpine
 WORKDIR /app
-ENV TZ Asia/Shanghai
-ENV NODE_ENV production
+ENV TZ="Asia/Shanghai"
+ENV NODE_ENV="production"
 RUN set -eux; \
 	# sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories; \
 	apk add --no-cache bash; \

package/package.json

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

package/src/config/adapter.js

@@ -46,6 +46,7 @@ const {
   POSTGRES_USER,
   PG_SSL,
   POSTGRES_SSL,
+  POSTGRES_URL,
   MONGO_AUTHSOURCE,
   MONGO_DB,
   MONGO_HOST,
@@ -83,9 +84,6 @@ if (MONGO_DB) {
   type = 'tidb';
 }
 
-const isVercelPostgres =
-  type === 'postgresql' && POSTGRES_HOST?.endsWith('vercel-storage.com');
-
 exports.model = {
   type,
   common: {
@@ -116,11 +114,12 @@ exports.model = {
     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'),
+    port: PG_PORT || POSTGRES_PORT || '5432',
     connectionLimit: 1,
     prefix: PG_PREFIX || POSTGRES_PREFIX || 'wl_',
     ssl:
-      (PG_SSL || POSTGRES_SSL) == 'true' || isVercelPostgres
+      (PG_SSL || POSTGRES_SSL) == 'true' ||
+      POSTGRES_URL?.includes('sslmode=require')
         ? {
             rejectUnauthorized: false,
           }

package/src/service/notify.js

@@ -244,7 +244,7 @@ module.exports = class extends think.Service {
 
     return fetch(`${qmsgHost}/send/${QMSG_KEY}`, {
       method: 'POST',
-      header: form.getHeaders(),
+      headers: form.getHeaders(),
       body: form,
     }).then((resp) => resp.json());
   }
@@ -288,7 +288,7 @@ module.exports = class extends think.Service {
 \`\`\`
 {{-self.commentLink}}
 *邮箱：*\`{{self.mail}}\`
-*审核：*{{self.status}} 
+*审核：*{{self.status}}
 
 仅供评论预览，点击[查看完整內容]({{site.postUrl}})`;
 
@@ -306,18 +306,18 @@ module.exports = class extends think.Service {
       },
     };
 
-    const form = new FormData();
-
-    form.append('text', this.controller.locale(contentTG, data));
-    form.append('chat_id', TG_CHAT_ID);
-    form.append('parse_mode', 'MarkdownV2');
-
     const resp = await fetch(
       `https://api.telegram.org/bot${TG_BOT_TOKEN}/sendMessage`,
       {
         method: 'POST',
-        header: form.getHeaders(),
-        body: form,
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+          chat_id: TG_CHAT_ID,
+          text: this.controller.locale(contentTG, data),
+          parse_mode: 'MarkdownV2',
+        }),
       },
     ).then((resp) => resp.json());
 
@@ -367,7 +367,7 @@ module.exports = class extends think.Service {
 
     return fetch(`http://www.pushplus.plus/send/${PUSH_PLUS_KEY}`, {
       method: 'POST',
-      header: form.getHeaders(),
+      headers: form.getHeaders(),
       body: form,
     }).then((resp) => resp.json());
   }
@@ -406,7 +406,7 @@ module.exports = class extends think.Service {
 
     return fetch(DISCORD_WEBHOOK, {
       method: 'POST',
-      header: form.getHeaders(),
+      headers: form.getHeaders(),
       body: form,
     }).then((resp) => resp.statusText);
     // Expected return value: No Content