@fecommunity/reactpress-server 3.0.4 → 4.0.0-beta.0

package/dist/modules/setting/setting.entity.js

@@ -15,118 +15,133 @@ const typeorm_1 = require("typeorm");
 let Setting = class Setting {
 };
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.PrimaryGeneratedColumn('uuid'),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
     __metadata("design:type", String)
 ], Setting.prototype, "id", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "i18n", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "globalSetting", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "systemUrl", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "systemTitle", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "systemSubTitle", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "systemLogo", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "systemBg", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "systemFavicon", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "systemNoticeInfo", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "systemFooterInfo", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
+    __metadata("design:type", String)
+], Setting.prototype, "aboutUsGithubUrl", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
+    __metadata("design:type", String)
+], Setting.prototype, "aboutUsCommentQr", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
+    __metadata("design:type", String)
+], Setting.prototype, "aboutUsWechatQr", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "adminSystemUrl", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "baiduAnalyticsId", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "googleAnalyticsId", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "seoKeyword", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "seoDesc", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "oss", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "smtpHost", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "smtpPort", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "smtpUser", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "smtpPass", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.Column({ type: 'text', default: null }),
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.Column)({ type: 'text', default: null }),
     __metadata("design:type", String)
 ], Setting.prototype, "smtpFromUser", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.CreateDateColumn({
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.CreateDateColumn)({
         type: 'datetime',
         comment: '创建时间',
         name: 'create_at',
@@ -134,8 +149,8 @@ __decorate([
     __metadata("design:type", Date)
 ], Setting.prototype, "createAt", void 0);
 __decorate([
-    swagger_1.ApiProperty(),
-    typeorm_1.UpdateDateColumn({
+    (0, swagger_1.ApiProperty)(),
+    (0, typeorm_1.UpdateDateColumn)({
         type: 'datetime',
         comment: '更新时间',
         name: 'update_at',
@@ -143,7 +158,7 @@ __decorate([
     __metadata("design:type", Date)
 ], Setting.prototype, "updateAt", void 0);
 Setting = __decorate([
-    typeorm_1.Entity()
+    (0, typeorm_1.Entity)()
 ], Setting);
 exports.Setting = Setting;
 //# sourceMappingURL=setting.entity.js.map

package/dist/modules/setting/setting.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"setting.entity.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setting.entity.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.entity.ts"],"names":[],"mappings":"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"}

package/dist/modules/setting/setting.module.js

@@ -17,8 +17,8 @@ const setting_service_1 = require("./setting.service");
 let SettingModule = class SettingModule {
 };
 SettingModule = __decorate([
-    common_1.Module({
-        imports: [typeorm_1.TypeOrmModule.forFeature([setting_entity_1.Setting]), common_1.forwardRef(() => user_module_1.UserModule), common_1.forwardRef(() => auth_module_1.AuthModule)],
+    (0, common_1.Module)({
+        imports: [typeorm_1.TypeOrmModule.forFeature([setting_entity_1.Setting]), (0, common_1.forwardRef)(() => user_module_1.UserModule), (0, common_1.forwardRef)(() => auth_module_1.AuthModule)],
         exports: [setting_service_1.SettingService],
         providers: [setting_service_1.SettingService],
         controllers: [setting_controller_1.SettingController],

package/dist/modules/setting/setting.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"setting.module.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAEhD,qDAAiD;AACjD,qDAAiD;AACjD,6DAAyD;AACzD,qDAA2C;AAC3C,uDAAmD;AAQnD,IAAa,aAAa,GAA1B,MAAa,aAAa;CAAG,CAAA;AAAhB,aAAa;IANzB,eAAM,CAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,wBAAO,CAAC,CAAC,EAAE,mBAAU,CAAC,GAAG,EAAE,CAAC,wBAAU,CAAC,EAAE,mBAAU,CAAC,GAAG,EAAE,CAAC,wBAAU,CAAC,CAAC;QAC1G,OAAO,EAAE,CAAC,gCAAc,CAAC;QACzB,SAAS,EAAE,CAAC,gCAAc,CAAC;QAC3B,WAAW,EAAE,CAAC,sCAAiB,CAAC;KACjC,CAAC;GACW,aAAa,CAAG;AAAhB,sCAAa"}
+{"version":3,"file":"setting.module.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAEhD,qDAAiD;AACjD,qDAAiD;AACjD,6DAAyD;AACzD,qDAA2C;AAC3C,uDAAmD;AAQ5C,IAAM,aAAa,GAAnB,MAAM,aAAa;CAAG,CAAA;AAAhB,aAAa;IANzB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,wBAAO,CAAC,CAAC,EAAE,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC,EAAE,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC,CAAC;QAC1G,OAAO,EAAE,CAAC,gCAAc,CAAC;QACzB,SAAS,EAAE,CAAC,gCAAc,CAAC;QAC3B,WAAW,EAAE,CAAC,sCAAiB,CAAC;KACjC,CAAC;GACW,aAAa,CAAG;AAAhB,sCAAa"}

package/dist/modules/setting/setting.service.d.ts

@@ -1,10 +1,21 @@
+import { OnModuleInit } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import { Repository } from 'typeorm';
 import { Setting } from './setting.entity';
-export declare class SettingService {
+export declare class SettingService implements OnModuleInit {
     private readonly settingRepository;
-    constructor(settingRepository: Repository<Setting>);
+    private readonly configService;
+    constructor(settingRepository: Repository<Setting>, configService: ConfigService);
+    onModuleInit(): void;
+    private runInitializers;
+    getSettingRow(): Promise<Setting>;
+    private settingRowScore;
+    private ensureSettingRow;
     initI18n(): Promise<void>;
     initGlobalConfig(): Promise<void>;
+    initSystemSettings(): Promise<void>;
+    migrateLegacyAppearance(): Promise<void>;
+    initThemeConfigurations(): Promise<void>;
     findAll(innerInvoke?: boolean, isAdmin?: boolean): Promise<Setting>;
     update(setting: Partial<Setting>): Promise<Setting>;
 }

package/dist/modules/setting/setting.service.js

@@ -13,22 +13,76 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SettingService = void 0;
+const theme_1 = require("../../../../toolkit/dist/theme");
 const common_1 = require("@nestjs/common");
+const config_1 = require("@nestjs/config");
 const typeorm_1 = require("@nestjs/typeorm");
 const merge = require("deepmerge");
 const typeorm_2 = require("typeorm");
 const setting_constant_1 = require("./setting.constant");
 const setting_entity_1 = require("./setting.entity");
+const bootstrap_constants_1 = require("../bootstrap/bootstrap.constants");
+const install_locale_1 = require("../bootstrap/install-locale");
+const THEMES_WITH_CONFIGURATION = ['reactpress-theme-starter'];
+function trimUrl(url) {
+    return url.replace(/\/+$/, '');
+}
 let SettingService = class SettingService {
-    constructor(settingRepository) {
+    constructor(settingRepository, configService) {
         this.settingRepository = settingRepository;
-        this.initI18n();
-        this.initGlobalConfig();
+        this.configService = configService;
+    }
+    onModuleInit() {
+        void this.runInitializers();
+    }
+    async runInitializers() {
+        try {
+            await this.initI18n();
+            await this.initGlobalConfig();
+            await this.initSystemSettings();
+            await this.migrateLegacyAppearance();
+            await this.initThemeConfigurations();
+        }
+        catch (error) {
+            console.error('[SettingService] initialization failed:', error);
+        }
+    }
+    async getSettingRow() {
+        return this.ensureSettingRow();
+    }
+    settingRowScore(row) {
+        var _a, _b, _c;
+        return ((((_a = row.globalSetting) === null || _a === void 0 ? void 0 : _a.trim()) ? 4 : 0) +
+            (((_b = row.i18n) === null || _b === void 0 ? void 0 : _b.trim()) ? 2 : 0) +
+            (((_c = row.systemTitle) === null || _c === void 0 ? void 0 : _c.trim()) ? 1 : 0));
+    }
+    async ensureSettingRow() {
+        const items = await this.settingRepository.find({ order: { createAt: 'ASC' } });
+        if (items.length === 0) {
+            return this.settingRepository.save(this.settingRepository.create({}));
+        }
+        if (items.length === 1)
+            return items[0];
+        const sorted = [...items].sort((a, b) => this.settingRowScore(b) - this.settingRowScore(a));
+        const primary = Object.assign({}, sorted[0]);
+        for (const row of sorted.slice(1)) {
+            for (const key of Object.keys(row)) {
+                if (key === 'id' || key === 'createAt' || key === 'updateAt')
+                    continue;
+                const val = row[key];
+                const current = primary[key];
+                if (val != null && String(val).trim() !== '' && (current == null || String(current).trim() === '')) {
+                    primary[key] = val;
+                }
+            }
+        }
+        const saved = await this.settingRepository.save(primary);
+        await this.settingRepository.remove(sorted.slice(1));
+        return saved;
     }
     async initI18n() {
         try {
-            const items = await this.settingRepository.find();
-            const target = (items && items[0]) || {};
+            const target = await this.ensureSettingRow();
             let data = {};
             try {
                 if (target.i18n) {
@@ -56,51 +110,142 @@ let SettingService = class SettingService {
         }
     }
     async initGlobalConfig() {
-        const items = await this.settingRepository.find();
-        const target = (items && items[0]) || {};
+        var _a;
+        const target = await this.ensureSettingRow();
         let data = {};
         try {
             if (target.globalSetting) {
                 data = JSON.parse(target.globalSetting);
             }
         }
-        catch (e) {
+        catch (_b) {
             data = {};
         }
-        const mergedSettings = merge({}, setting_constant_1.settings, data);
+        const themeState = (0, theme_1.getThemeStateFromGlobalSetting)(data);
+        const defaultTheme = (0, theme_1.getThemeStateFromGlobalSetting)(setting_constant_1.settings);
+        const mergedTheme = Object.assign(Object.assign(Object.assign({}, defaultTheme), themeState), { mods: Object.assign(Object.assign({}, defaultTheme.mods), themeState.mods), installedThemes: ((_a = themeState.installedThemes) === null || _a === void 0 ? void 0 : _a.length) > 0 ? themeState.installedThemes : defaultTheme.installedThemes });
+        const mergedSettings = Object.assign(Object.assign({}, data), { theme: mergedTheme });
         const mergedSettingsString = JSON.stringify(mergedSettings);
         if (!target.globalSetting || target.globalSetting !== mergedSettingsString) {
             target.globalSetting = mergedSettingsString;
             await this.settingRepository.save(target);
         }
     }
+    async initSystemSettings() {
+        const locale = (0, install_locale_1.resolveInstallLocale)(this.configService.get('REACTPRESS_LANG') || this.configService.get('LANG'));
+        const clientSiteUrl = this.configService.get('CLIENT_SITE_URL', 'http://localhost:3001');
+        const urlDefaults = {
+            systemUrl: clientSiteUrl,
+            adminSystemUrl: `${trimUrl(clientSiteUrl)}/admin/`,
+        };
+        const target = await this.ensureSettingRow();
+        let changed = false;
+        const merged = Object.assign(Object.assign({}, (0, bootstrap_constants_1.getSystemSettingSeedDefaults)(locale)), urlDefaults);
+        for (const [key, defaultValue] of Object.entries(merged)) {
+            const current = target[key];
+            if (current != null && String(current).trim() !== '')
+                continue;
+            target[key] = defaultValue;
+            changed = true;
+        }
+        if (!changed)
+            return;
+        await this.settingRepository.save(target);
+        console.log(`[SettingService] system settings seeded with built-in defaults (${locale})`);
+    }
+    async migrateLegacyAppearance() {
+        const target = await this.ensureSettingRow();
+        if (!target.id && !target.globalSetting)
+            return;
+        let gs = {};
+        try {
+            if (target.globalSetting) {
+                gs = JSON.parse(target.globalSetting);
+            }
+        }
+        catch (_a) {
+            gs = {};
+        }
+        const { global, changed } = (0, theme_1.migrateLegacyAppearanceToThemeMods)(gs, target);
+        if (changed) {
+            target.globalSetting = JSON.stringify(global);
+            await this.settingRepository.save(target);
+            console.log('[SettingService] legacy appearance migrated to theme mods');
+        }
+    }
+    async initThemeConfigurations() {
+        const target = await this.ensureSettingRow();
+        let gs = {};
+        try {
+            if (target.globalSetting) {
+                gs = JSON.parse(target.globalSetting);
+            }
+        }
+        catch (_a) {
+            gs = {};
+        }
+        const themeState = (0, theme_1.getThemeStateFromGlobalSetting)(gs);
+        const activeTheme = themeState.activeTheme || 'hello-world';
+        const config = gs.config && typeof gs.config === 'object'
+            ? Object.assign({}, gs.config)
+            : {};
+        let changed = false;
+        for (const themeId of THEMES_WITH_CONFIGURATION) {
+            const seed = (0, theme_1.getThemeConfigurationSeed)(themeId, 'zh');
+            if (!seed)
+                continue;
+            const current = config[themeId];
+            const merged = merge({}, seed, current && typeof current === 'object' ? current : {});
+            const mergedStr = JSON.stringify(merged);
+            const prevStr = JSON.stringify(current !== null && current !== void 0 ? current : {});
+            if (mergedStr !== prevStr) {
+                config[themeId] = merged;
+                changed = true;
+            }
+        }
+        if (!gs.config && Object.keys(config).length) {
+            changed = true;
+        }
+        if (changed) {
+            gs.config = config;
+            target.globalSetting = JSON.stringify(gs);
+            await this.settingRepository.save(target);
+            console.log(`[SettingService] theme config seeded (active: ${activeTheme})`);
+        }
+    }
     async findAll(innerInvoke = false, isAdmin = false) {
-        const data = await this.settingRepository.find();
-        const res = data[0];
+        const res = await this.ensureSettingRow().catch(() => null);
         if (!res) {
             return {};
         }
-        if (innerInvoke || isAdmin) {
+        if (isAdmin && !innerInvoke) {
             return res;
         }
-        const filterRes = setting_constant_1.UNPROTECTED_KEYS.reduce((a, c) => {
-            a[c] = res[c];
-            return a;
-        }, {});
-        return filterRes;
+        const effective = (0, theme_1.resolveEffectiveSettingRow)(res);
+        if (innerInvoke) {
+            return effective;
+        }
+        return (0, theme_1.buildPublicSettingView)(effective);
     }
     async update(setting) {
-        const old = await this.settingRepository.find();
-        const updatedTag = old && old[0]
-            ? await this.settingRepository.merge(old[0], setting)
-            : await this.settingRepository.create(setting);
+        var _a;
+        const old = await this.ensureSettingRow();
+        const sanitized = (0, theme_1.pickSystemSettingPatch)(setting);
+        if ('smtpPass' in sanitized && !String((_a = sanitized.smtpPass) !== null && _a !== void 0 ? _a : '').trim()) {
+            delete sanitized.smtpPass;
+        }
+        if (Object.keys(sanitized).length === 0) {
+            return old !== null && old !== void 0 ? old : {};
+        }
+        const updatedTag = await this.settingRepository.merge(old, sanitized);
         return this.settingRepository.save(updatedTag);
     }
 };
 SettingService = __decorate([
-    common_1.Injectable(),
-    __param(0, typeorm_1.InjectRepository(setting_entity_1.Setting)),
-    __metadata("design:paramtypes", [typeorm_2.Repository])
+    (0, common_1.Injectable)(),
+    __param(0, (0, typeorm_1.InjectRepository)(setting_entity_1.Setting)),
+    __metadata("design:paramtypes", [typeorm_2.Repository,
+        config_1.ConfigService])
 ], SettingService);
 exports.SettingService = SettingService;
 //# sourceMappingURL=setting.service.js.map

package/dist/modules/setting/setting.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/smtp/mail.util.d.ts

@@ -1,6 +1,7 @@
-export declare const sendEmail: (message: any, { host, port, user, pass }: {
-    host: any;
-    port: any;
-    user: any;
-    pass: any;
-}) => Promise<unknown>;
+export type SmtpTransportConfig = {
+    host: string;
+    port: string | number;
+    user: string;
+    pass: string;
+};
+export declare const sendEmail: (message: Record<string, unknown>, { host, port, user, pass }: SmtpTransportConfig) => Promise<unknown>;

package/dist/modules/smtp/mail.util.js

@@ -5,18 +5,14 @@ const nodemailer = require('nodemailer');
 const sendEmail = (message, { host, port, user, pass }) => {
     if (!host || !port || !user || !pass) {
         console.log('邮箱配置不正确，无法发送邮件');
-        return null;
+        return Promise.reject(new Error('SMTP configuration is incomplete'));
     }
-    const transport = nodemailer.createTransport({
-        host,
-        port,
-        secureConnection: true,
-        secure: true,
-        auth: {
+    const portNum = Number(port);
+    const secure = portNum === 465;
+    const transport = nodemailer.createTransport(Object.assign({ host, port: portNum, secure, auth: {
             user,
             pass,
-        },
-    });
+        } }, (portNum === 587 ? { requireTLS: true } : {})));
     return new Promise((resolve, reject) => {
         transport.sendMail(message, function (err, info) {
             if (err) {

package/dist/modules/smtp/mail.util.js.map

@@ -1 +1 @@
-{"version":3,"file":"mail.util.js","sourceRoot":"","sources":["../../../src/modules/smtp/mail.util.ts"],"names":[],"mappings":";;;AACA,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAElC,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;IAC/D,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC;KACb;IAED,MAAM,SAAS,GAAG,UAAU,CAAC,eAAe,CAAC;QAC3C,IAAI;QACJ,IAAI;QACJ,gBAAgB,EAAE,IAAI;QACtB,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE;YACJ,IAAI;YACJ,IAAI;SACL;KACF,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAS,GAAG,EAAE,IAAI;YAC5C,IAAI,GAAG,EAAE;gBACP,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAC3B,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA3BW,QAAA,SAAS,aA2BpB"}
+{"version":3,"file":"mail.util.js","sourceRoot":"","sources":["../../../src/modules/smtp/mail.util.ts"],"names":[],"mappings":";;;AACA,MAAM,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AASlC,MAAM,SAAS,GAAG,CACvB,OAAgC,EAChC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAuB,EAC/C,EAAE;IACF,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC,CAAC;KACtE;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,MAAM,GAAG,OAAO,KAAK,GAAG,CAAC;IAE/B,MAAM,SAAS,GAAG,UAAU,CAAC,eAAe,iBAC1C,IAAI,EACJ,IAAI,EAAE,OAAO,EACb,MAAM,EACN,IAAI,EAAE;YACJ,IAAI;YACJ,IAAI;SACL,IACE,CAAC,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAChD,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,EAAE,IAAI;YAC7C,IAAI,GAAG,EAAE;gBACP,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAC3B,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAjCW,QAAA,SAAS,aAiCpB"}

package/dist/modules/smtp/smtp.controller.d.ts

@@ -4,6 +4,9 @@ export declare class SMTPController {
     private readonly smtpService;
     constructor(smtpService: SMTPService);
     create(data: any): Promise<SMTP>;
+    testSend(data: any): Promise<{
+        ok: true;
+    }>;
     findAll(queryParam: any): Promise<[SMTP[], number]>;
     deleteById(id: any): Promise<SMTP>;
 }