chore: lego改成从github直接下载

packages/core/acme-client/src/agents.js

@@ -50,8 +50,14 @@ class HttpError extends Error {
         super(error.message);
 
         this.message = error.message;
-        if (this.message && this.message.indexOf('ssl3_get_record:wrong version number') >= 0) {
-            this.message = 'http协议错误，服务端要求http协议，请检查是否使用了https请求';
+        const { message } = error;
+        if (message && typeof message === 'string') {
+            if (message.indexOf && message.indexOf('ssl3_get_record:wrong version number') >= 0) {
+                this.message = `${message}(http协议错误，服务端要求http协议，请检查是否使用了https请求)`;
+            }
+            else if (message.indexOf('getaddrinfo EAI_AGAIN')) {
+                this.message = `${message}(无法解析域名，请检查网络连接或dns配置)`;
+            }
         }
 
         this.name = error.name;

packages/core/basic/src/utils/util.request.ts

@@ -1,12 +1,12 @@
 import axios, { AxiosRequestConfig } from 'axios';
-import { logger } from './util.log.js';
+import { ILogger, logger } from './util.log.js';
 import { Logger } from 'log4js';
 import { HttpProxyAgent } from 'http-proxy-agent';
 import { HttpsProxyAgent } from 'https-proxy-agent';
 import nodeHttp from 'http';
 import * as https from 'node:https';
 import { merge } from 'lodash-es';
-import { safePromise } from './util.promise';
+import { safePromise } from './util.promise.js';
 import fs from 'fs';
 export class HttpError extends Error {
   status?: number;
@@ -21,8 +21,13 @@ export class HttpError extends Error {
     }
     super(error.message || error.response?.statusText);
 
-    if (error?.message?.indexOf && error?.message?.indexOf('ssl3_get_record:wrong version number') >= 0) {
-      this.message = 'http协议错误，服务端要求http协议，请检查是否使用了https请求';
+    const message = error?.message;
+    if (message && typeof message === 'string') {
+      if (message.indexOf && message.indexOf('ssl3_get_record:wrong version number') >= 0) {
+        this.message = `${message}(http协议错误，服务端要求http协议，请检查是否使用了https请求)`;
+      } else if (message.indexOf('getaddrinfo EAI_AGAIN')) {
+        this.message = `${message}(无法解析域名，请检查网络连接或dns配置，更换docker-compose.yaml中dns配置)`;
+      }
     }
 
     this.name = error.name;
@@ -115,7 +120,12 @@ export function createAxiosService({ logger }: { logger: Logger }) {
   service.interceptors.response.use(
     (response: any) => {
       if (response?.config?.logRes !== false) {
-        logger.info(`http response : status=${response?.status},data=${JSON.stringify(response?.data)}`);
+        let resData = response?.data;
+        try {
+          resData = JSON.stringify(response?.data);
+        } catch (e) {}
+
+        logger.info(`http response : status=${response?.status},data=${resData}`);
       } else {
         logger.info('http response status:', response?.status);
       }
@@ -217,36 +227,42 @@ export function createAgent(opts: CreateAgentOptions = {}) {
   };
 }
 
-export async function download(http: HttpClient, config: HttpRequestConfig, savePath: string) {
+export async function download(req: { http: HttpClient; config: HttpRequestConfig; savePath: string; logger: ILogger }) {
+  const { http, config, savePath, logger } = req;
   return safePromise((resolve, reject) => {
     http
       .request({
-        ...config,
+        logRes: false,
         responseType: 'stream',
+        ...config,
       })
       .then(res => {
         const writer = fs.createWriteStream(savePath);
-        res.data.pipe(writer);
+        res.pipe(writer);
         writer.on('close', () => {
-          console.log('文件下载成功');
+          logger.info('文件下载成功');
           resolve(true);
         });
         //error
         writer.on('error', err => {
-          console.error('下载失败', err);
+          logger.error('下载失败', err);
           reject(err);
         });
         //进度条打印
         const totalLength = res.headers['content-length'];
         let currentLength = 0;
-        res.data.on('data', (chunk: any) => {
+        // 每5%打印一次
+        const step = (totalLength / 100) * 5;
+        res.on('data', (chunk: any) => {
           currentLength += chunk.length;
-          const percent = ((currentLength / totalLength) * 100).toFixed(2);
-          console.log(`下载进度：${percent}%`);
+          if (currentLength % step < chunk.length) {
+            const percent = ((currentLength / totalLength) * 100).toFixed(2);
+            logger.info(`下载进度：${percent}%`);
+          }
         });
       })
       .catch(err => {
-        console.error('下载失败', err);
+        logger.info('下载失败', err);
         reject(err);
       });
   });

packages/core/pipeline/src/core/executor.ts

@@ -3,7 +3,7 @@ import { RunHistory, RunnableCollection } from "./run-history.js";
 import { AbstractTaskPlugin, PluginDefine, pluginRegistry, TaskInstanceContext, UserInfo } from "../plugin/index.js";
 import { ContextFactory, IContext } from "./context.js";
 import { IStorage } from "./storage.js";
-import { createAxiosService, hashUtils, logger, utils } from "@certd/basic";
+import { createAxiosService, hashUtils, HttpRequestConfig, logger, utils } from "@certd/basic";
 import { Logger } from "log4js";
 import { IAccessService } from "../access/index.js";
 import { RegistryItem } from "../registry/index.js";
@@ -290,11 +290,20 @@ export class Executor {
     }
 
     const http = createAxiosService({ logger: currentLogger });
+    const download = async (config: HttpRequestConfig, savePath: string) => {
+      await utils.download({
+        http,
+        logger: currentLogger,
+        config,
+        savePath,
+      });
+    };
     const taskCtx: TaskInstanceContext = {
       pipeline: this.pipeline,
       step,
       lastStatus,
       http,
+      download,
       logger: currentLogger,
       inputChanged,
       accessService: this.options.accessService,

packages/core/pipeline/src/core/index.ts

@@ -3,6 +3,5 @@ export * from "./run-history.js";
 export * from "./context.js";
 export * from "./storage.js";
 export * from "./file-store.js";
-export * from "./license.js";
 export * from "./handler.js";
 export * from "./exceptions.js";

packages/core/pipeline/src/core/license.ts

@@ -1,16 +0,0 @@
-import { logger } from "@certd/basic";
-import { setLogger, isPlus, isComm } from "@certd/plus-core";
-setLogger(logger);
-export * from "@certd/plus-core";
-
-export function checkPlus() {
-  if (!isPlus()) {
-    throw new Error("此为专业版功能，请升级到专业版");
-  }
-}
-
-export function checkComm() {
-  if (!isComm()) {
-    throw new Error("此为商业版功能，请升级到商业版");
-  }
-}

packages/core/pipeline/src/core/run-history.ts

@@ -117,8 +117,8 @@ export class RunHistory {
   }
 
   logError(runnable: Runnable, e: Error) {
-    delete e.stack;
-    delete e.cause;
+    // delete e.stack;
+    // delete e.cause;
     const errorInfo = runnable.runnableType === "step" ? e : e.message;
     this._loggers[runnable.id].error(`[${runnable.runnableType}] [${runnable.title}]<id:${runnable.id}> ：`, errorInfo);
   }

packages/core/pipeline/src/plugin/api.ts

@@ -5,7 +5,7 @@ import { Logger } from "log4js";
 import { IAccessService } from "../access/index.js";
 import { ICnameProxyService, IEmailService } from "../service/index.js";
 import { CancelError, IContext, PluginRequestHandleReq, RunnableCollection } from "../core/index.js";
-import { ILogger, logger, utils } from "@certd/basic";
+import { HttpRequestConfig, ILogger, logger, utils } from "@certd/basic";
 import { HttpClient } from "@certd/basic";
 import dayjs from "dayjs";
 import { IPluginConfigService } from "../service/config";
@@ -85,6 +85,8 @@ export type TaskInstanceContext = {
   userContext: IContext;
   //http请求客户端
   http: HttpClient;
+  //下载文件方法
+  download: (config: HttpRequestConfig, savePath: string) => Promise<void>;
   //文件存储
   fileStore: FileStore;
   //上一次执行结果状态