@waline/vercel 1.34.1 → 1.35.0

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.1",
+  "version": "1.35.0",
   "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

@@ -5,10 +5,10 @@ const nodemailer = require('nodemailer');
 const nunjucks = require('nunjucks');
 
 module.exports = class extends think.Service {
-  constructor(ctx) {
-    super(ctx);
+  constructor(controller) {
+    super(controller);
 
-    this.ctx = ctx;
+    this.controller = controller;
     const {
       SMTP_USER,
       SMTP_PASS,
@@ -55,8 +55,8 @@ module.exports = class extends think.Service {
       },
     };
 
-    title = this.ctx.locale(title, data);
-    content = this.ctx.locale(content, data);
+    title = this.controller.locale(title, data);
+    content = this.controller.locale(content, data);
 
     return this.transporter.sendMail({
       from:
@@ -94,8 +94,8 @@ module.exports = class extends think.Service {
 【内容】：{{self.comment}}
 【地址】：{{site.postUrl}}`;
 
-    title = this.ctx.locale(title, data);
-    content = this.ctx.locale(contentWechat, data);
+    title = this.controller.locale(title, data);
+    content = this.controller.locale(contentWechat, data);
 
     const form = new FormData();
 
@@ -145,8 +145,8 @@ module.exports = class extends think.Service {
 【内容】：{{self.comment}} 
 <a href='{{site.postUrl}}'>查看详情</a>`;
 
-    title = this.ctx.locale(title, data);
-    const desp = this.ctx.locale(contentWechat, data);
+    title = this.controller.locale(title, data);
+    const desp = this.controller.locale(contentWechat, data);
 
     content = desp.replace(/\n/g, '<br/>');
 
@@ -235,7 +235,7 @@ module.exports = class extends think.Service {
 
     const form = new FormData();
 
-    form.append('msg', this.ctx.locale(contentQQ, data));
+    form.append('msg', this.controller.locale(contentQQ, data));
     form.append('qq', QQ_ID);
 
     const qmsgHost = QMSG_HOST
@@ -308,7 +308,7 @@ module.exports = class extends think.Service {
 
     const form = new FormData();
 
-    form.append('text', this.ctx.locale(contentTG, data));
+    form.append('text', this.controller.locale(contentTG, data));
     form.append('chat_id', TG_CHAT_ID);
     form.append('parse_mode', 'MarkdownV2');
 
@@ -352,8 +352,8 @@ module.exports = class extends think.Service {
       },
     };
 
-    title = this.ctx.locale(title, data);
-    content = this.ctx.locale(content, data);
+    title = this.controller.locale(title, data);
+    content = this.controller.locale(content, data);
 
     const form = new FormData();
 
@@ -389,8 +389,8 @@ module.exports = class extends think.Service {
       },
     };
 
-    title = this.ctx.locale(title, data);
-    content = this.ctx.locale(
+    title = this.controller.locale(title, data);
+    content = this.controller.locale(
       think.config('DiscordTemplate') ||
         `💬 {{site.name|safe}} 有新评论啦 
     【评论者昵称】：{{self.nick}}
@@ -440,7 +440,7 @@ module.exports = class extends think.Service {
 
     const post = {
       en_us: {
-        title: this.ctx.locale(title, data),
+        title: this.controller.locale(title, data),
         content: [
           [
             {
@@ -532,7 +532,7 @@ module.exports = class extends think.Service {
       }
     }
 
-    const disallowList = this.ctx.state.oauthServices.map(
+    const disallowList = this.controller.ctx.state.oauthServices.map(
       ({ name }) => 'mail.' + name,
     );
     const fakeMail = new RegExp(`@(${disallowList.join('|')})$`, 'i');