@certd/lib-server 1.39.13 → 1.39.16

package/dist/system/settings/service/models.d.ts

@@ -50,6 +50,7 @@ export declare class SysPrivateSettings extends BaseSettings {
     encryptSecret?: string;
     httpsProxy?: string;
     httpProxy?: string;
+    commonHeaders?: string;
     reverseProxies?: Record<string, string>;
     dnsResultOrder?: string;
     commonCnameEnabled?: boolean;

package/dist/system/settings/service/models.js

@@ -57,6 +57,7 @@ export class SysPrivateSettings extends BaseSettings {
     encryptSecret;
     httpsProxy = '';
     httpProxy = '';
+    commonHeaders = '';
     reverseProxies = {};
     dnsResultOrder = '';
     commonCnameEnabled = true;

package/dist/system/settings/service/sys-settings-service.d.ts

@@ -21,6 +21,7 @@ export declare class SysSettingsService extends BaseService<SysSettingsEntity> {
     reloadSettings(): Promise<void>;
     reloadPublicSettings(): Promise<void>;
     reloadPrivateSettings(): Promise<void>;
+    parseKeyValueText(text: string): {};
     setEnvironmentVars(vars: string): void;
     updateByKey(key: string, setting: any): Promise<void>;
     backupSecret(): Promise<void>;

package/dist/system/settings/service/sys-settings-service.js

@@ -13,7 +13,7 @@ import { Repository } from 'typeorm';
 import { SysSettingsEntity } from '../entity/sys-settings.js';
 import { SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecret, SysSecretBackup } from './models.js';
 import { getAllSslProviderDomains, setSslProviderReverseProxies, setWalkFromAuthoritative } from '@certd/acme-client';
-import { cache, logger, mergeUtils, setGlobalProxy } from '@certd/basic';
+import { cache, logger, mergeUtils, setGlobalHeaders, setGlobalProxy } from '@certd/basic';
 import { isPlus } from '@certd/plus-core';
 import * as dns from 'node:dns';
 import { BaseService, setAdminMode } from '../../../basic/index.js';
@@ -154,6 +154,7 @@ let SysSettingsService = class SysSettingsService extends BaseService {
             httpsProxy: privateSetting.httpsProxy,
         };
         setGlobalProxy(opts);
+        setGlobalHeaders(this.parseKeyValueText(privateSetting.commonHeaders));
         if (privateSetting.dnsResultOrder) {
             dns.setDefaultResultOrder(privateSetting.dnsResultOrder);
         }
@@ -165,12 +166,12 @@ let SysSettingsService = class SysSettingsService extends BaseService {
         this.setEnvironmentVars(privateSetting.environmentVars);
         setWalkFromAuthoritative(privateSetting.acmeWalkFromAuthoritative);
     }
-    setEnvironmentVars(vars) {
-        const envVars = {};
-        if (typeof vars !== 'string') {
-            vars = "";
+    parseKeyValueText(text) {
+        const values = {};
+        if (typeof text !== 'string') {
+            text = "";
         }
-        vars.split('\n').forEach(line => {
+        text.split('\n').forEach(line => {
             line = line.trim();
             if (!line || line.startsWith('#')) {
                 return;
@@ -182,11 +183,17 @@ let SysSettingsService = class SysSettingsService extends BaseService {
             if (!line.includes("=")) {
                 return;
             }
-            const [key, value] = line.split('=');
+            const eqIndex = line.indexOf('=');
+            const key = line.substring(0, eqIndex).trim();
+            const value = line.substring(eqIndex + 1).trim();
             if (key && value) {
-                envVars[key.trim()] = value.trim();
+                values[key] = value;
             }
         });
+        return values;
+    }
+    setEnvironmentVars(vars) {
+        const envVars = this.parseKeyValueText(vars);
         //先删除旧环境变量
         if (lastSaveEnvVars) {
             for (const key in lastSaveEnvVars) {

package/dist/user/access/service/encrypt-service.d.ts

@@ -5,7 +5,7 @@ import { Encryptor, SysSettingsService } from '../../../system/index.js';
 export declare class EncryptService {
     encryptor: Encryptor;
     sysSettingService: SysSettingsService;
-    init(): Promise<void>;
+    doInit(): Promise<void>;
     encrypt(text: string): string;
     decrypt(encryptedText: string): string;
 }

package/dist/user/access/service/encrypt-service.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Init, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
+import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import { Encryptor, SysSettingsService } from '../../../system/index.js';
 /**
  * 授权
@@ -15,7 +15,7 @@ import { Encryptor, SysSettingsService } from '../../../system/index.js';
 let EncryptService = class EncryptService {
     encryptor;
     sysSettingService;
-    async init() {
+    async doInit() {
         const secret = await this.sysSettingService.getSecret();
         this.encryptor = new Encryptor(secret.encryptSecret);
     }
@@ -32,12 +32,6 @@ __decorate([
     Inject(),
     __metadata("design:type", SysSettingsService)
 ], EncryptService.prototype, "sysSettingService", void 0);
-__decorate([
-    Init(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], EncryptService.prototype, "init", null);
 EncryptService = __decorate([
     Provide(),
     Scope(ScopeEnum.Singleton)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/lib-server",
-  "version": "1.39.13",
+  "version": "1.39.16",
   "description": "midway with flyway, sql upgrade way ",
   "private": false,
   "type": "module",
@@ -29,11 +29,11 @@
   ],
   "license": "AGPL",
   "dependencies": {
-    "@certd/acme-client": "^1.39.13",
-    "@certd/basic": "^1.39.13",
-    "@certd/pipeline": "^1.39.13",
-    "@certd/plugin-lib": "^1.39.13",
-    "@certd/plus-core": "^1.39.13",
+    "@certd/acme-client": "^1.39.16",
+    "@certd/basic": "^1.39.16",
+    "@certd/pipeline": "^1.39.16",
+    "@certd/plugin-lib": "^1.39.16",
+    "@certd/plus-core": "^1.39.16",
     "@midwayjs/cache": "3.14.0",
     "@midwayjs/core": "3.20.11",
     "@midwayjs/i18n": "3.20.13",
@@ -69,5 +69,5 @@
     "typeorm": "^0.3.11",
     "typescript": "^5.4.2"
   },
-  "gitHead": "9f7d766cb386b299d4098141f4a47d23e16975e3"
+  "gitHead": "1c6dc169ac04fd09ef94404a912a15cbb17e1452"
 }