chore: 整理依赖

packages/plugins/plugin-cert/fix-esm-import-paths.js

@@ -1,96 +0,0 @@
-import * as fs from "fs";
-import * as path from "path";
-
-// https://gist.github.com/lovasoa/8691344
-async function* walk(dir) {
-  for await (const d of await fs.promises.opendir(dir)) {
-    const entry = path.join(dir, d.name);
-    if (d.isDirectory()) {
-      yield* walk(entry);
-    } else if (d.isFile()) {
-      yield entry;
-    }
-  }
-}
-
-function resolveImportPath(sourceFile, importPath, options) {
-  const sourceFileAbs = path.resolve(process.cwd(), sourceFile);
-  const root = path.dirname(sourceFileAbs);
-  const { moduleFilter = defaultModuleFilter } = options;
-
-  if (moduleFilter(importPath)) {
-    const importPathAbs = path.resolve(root, importPath);
-    let possiblePath = [path.resolve(importPathAbs, "./index.ts"), path.resolve(importPathAbs, "./index.js"), importPathAbs + ".ts", importPathAbs + ".js"];
-
-    if (possiblePath.length) {
-      for (let i = 0; i < possiblePath.length; i++) {
-        let entry = possiblePath[i];
-        if (fs.existsSync(entry)) {
-          const resolved = path.relative(root, entry.replace(/\.ts$/, ".js"));
-
-          if (!resolved.startsWith(".")) {
-            return "./" + resolved;
-          }
-
-          return resolved;
-        }
-      }
-    }
-  }
-
-  return null;
-}
-
-function replace(filePath, outFilePath, options) {
-  const code = fs.readFileSync(filePath).toString();
-  const newCode = code.replace(/(import|export) (.+?) from ('[^\n']+'|"[^\n"]+");/gs, function (found, action, imported, from) {
-    const importPath = from.slice(1, -1);
-    let resolvedPath = resolveImportPath(filePath, importPath, options);
-
-    if (resolvedPath) {
-      resolvedPath = resolvedPath.replaceAll("\\", "/");
-      console.log("\t", importPath, resolvedPath);
-      return `${action} ${imported} from "${resolvedPath}";`;
-    }
-
-    return found;
-  });
-
-  if (code !== newCode) {
-    fs.writeFileSync(outFilePath, newCode);
-  }
-}
-
-// Then, use it with a simple async for loop
-async function run(srcDir, options = defaultOptions) {
-  const { sourceFileFilter = defaultSourceFileFilter } = options;
-
-  for await (const entry of walk(srcDir)) {
-    if (sourceFileFilter(entry)) {
-      console.log(entry);
-      replace(entry, entry, options);
-    }
-  }
-}
-
-const defaultSourceFileFilter = function (sourceFilePath) {
-  return /\.(js|ts)$/.test(sourceFilePath) && !/node_modules/.test(sourceFilePath);
-};
-
-const defaultModuleFilter = function (importedModule) {
-  return !path.isAbsolute(importedModule) && !importedModule.startsWith("@") && !importedModule.endsWith(".js");
-};
-
-const defaultOptions = {
-  sourceFileFilter: defaultSourceFileFilter,
-  moduleFilter: defaultModuleFilter,
-};
-
-// Switch this to test on one file or directly run on a directory.
-const DEBUG = false;
-
-if (DEBUG) {
-  replace("./src/index.ts", "./out.ts", defaultOptions);
-} else {
-  await run("./src/", defaultOptions);
-}

packages/plugins/plugin-cert/package.json

@@ -21,41 +21,24 @@
     "@google-cloud/publicca": "^1.3.0",
     "dayjs": "^1.11.7",
     "jszip": "^3.10.1",
-    "node-forge": "^0.10.0",
     "psl": "^1.9.0",
-    "rimraf": "^5.0.5"
+    "rimraf": "^5.0.5",
+    "lodash-es": "^4.17.21"
   },
   "devDependencies": {
-    "@alicloud/openapi-client": "^0.4.0",
-    "@alicloud/pop-core": "^1.7.10",
-    "@rollup/plugin-commonjs": "^23.0.4",
-    "@rollup/plugin-json": "^6.0.0",
-    "@rollup/plugin-node-resolve": "^15.0.1",
-    "@rollup/plugin-terser": "^0.4.3",
-    "@rollup/plugin-typescript": "^11.0.0",
     "@types/chai": "^4.3.3",
     "@types/mocha": "^10.0.0",
-    "@types/node-forge": "^1.3.0",
     "@types/psl": "^1.1.3",
     "@typescript-eslint/eslint-plugin": "^5.38.1",
     "@typescript-eslint/parser": "^5.38.1",
     "chai": "^4.3.6",
     "eslint": "^8.24.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "lodash-es": "^4.17.21",
-    "log4js": "^6.7.1",
     "mocha": "^10.1.0",
     "prettier": "^2.8.8",
-    "rollup": "^3.7.4",
-    "rollup-plugin-visualizer": "^5.8.2",
-    "ts-node": "^10.9.1",
-    "tslib": "^2.5.2",
     "typescript": "^5.4.2",
-    "vite": "^3.1.0",
-    "vue-tsc": "^0.38.9"
+    "tslib": "^2.8.1"
   },
   "gitHead": "1d8515bce0b3ce5ece84db53ca57cfbd0c3f4d5a"
 }

packages/plugins/plugin-cert/rollup.config.js

@@ -1,43 +0,0 @@
-const resolve = require("@rollup/plugin-node-resolve");
-const commonjs = require("@rollup/plugin-commonjs");
-//const Typescript = require("rollup-plugin-typescript2");
-const Typescript = require("@rollup/plugin-typescript");
-const json = require("@rollup/plugin-json");
-const terser = require("@rollup/plugin-terser");
-module.exports = {
-  input: "src/index.ts",
-  output: {
-    file: "dist/bundle.js",
-    format: "cjs",
-  },
-  plugins: [
-    // 解析第三方依赖
-    resolve(),
-    // 识别 commonjs 模式第三方依赖
-    commonjs(),
-    Typescript({
-      target: "esnext",
-      rootDir: "src",
-      declaration: true,
-      declarationDir: "dist/d",
-      exclude: ["./node_modules/**", "./src/**/*.vue"],
-      allowSyntheticDefaultImports: true,
-    }),
-    json(),
-    terser(),
-  ],
-  external: [
-    "vue",
-    "lodash-es",
-    "dayjs",
-    "@certd/acme-client",
-    "@certd/pipeline",
-    "@certd/plugin-cert",
-    "@certd/plugin-aliyun",
-    "@certd/plugin-tencent",
-    "@certd/plugin-huawei",
-    "@certd/plugin-host",
-    "@certd/plugin-tencent",
-    "@certd/plugin-util",
-  ],
-};

packages/plugins/plugin-cert/src/plugin/cert-plugin/acme.ts

@@ -3,9 +3,8 @@ import * as acme from "@certd/acme-client";
 import { ClientExternalAccountBindingOptions, UrlMapping } from "@certd/acme-client";
 import _ from "lodash-es";
 import { Challenge } from "@certd/acme-client/types/rfc8555";
-import { Logger } from "log4js";
 import { IContext } from "@certd/pipeline";
-import { utils } from "@certd/basic";
+import { ILogger, utils } from "@certd/basic";
 import { IDnsProvider, parseDomain } from "../../dns-provider/index.js";
 
 export type CnameVerifyPlan = {
@@ -37,7 +36,7 @@ export type SSLProvider = "letsencrypt" | "google" | "zerossl";
 export type PrivateKeyType = "rsa_1024" | "rsa_2048" | "rsa_3072" | "rsa_4096" | "ec_256" | "ec_384" | "ec_521";
 type AcmeServiceOptions = {
   userContext: IContext;
-  logger: Logger;
+  logger: ILogger;
   sslProvider: SSLProvider;
   eab?: ClientExternalAccountBindingOptions;
   skipLocalVerify?: boolean;
@@ -50,7 +49,7 @@ type AcmeServiceOptions = {
 export class AcmeService {
   options: AcmeServiceOptions;
   userContext: IContext;
-  logger: Logger;
+  logger: ILogger;
   sslProvider: SSLProvider;
   skipLocalVerify = true;
   eab?: ClientExternalAccountBindingOptions;

packages/plugins/plugin-cert/vite.config.ts

@@ -1,56 +0,0 @@
-import { defineConfig } from "vite";
-import visualizer from "rollup-plugin-visualizer";
-import typescript from "@rollup/plugin-typescript";
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: "src/index.ts",
-      name: "CertdPluginCert",
-    },
-    rollupOptions: {
-      plugins: [
-        // @ts-ignore
-        visualizer(),
-        // @ts-ignore
-        typescript({
-          target: "esnext",
-          rootDir: "src",
-          declaration: true,
-          declarationDir: "dist/d",
-          exclude: ["./node_modules/**", "./src/**/*.vue"],
-          allowSyntheticDefaultImports: true,
-        }),
-      ],
-      external: [
-        "vue",
-        "lodash-es",
-        "dayjs",
-        "@certd/acme-client",
-        "@certd/pipeline",
-        "@certd/plugin-cert",
-        "@certd/plugin-aliyun",
-        "@certd/plugin-tencent",
-        "@certd/plugin-huawei",
-        "@certd/plugin-host",
-        "@certd/plugin-tencent",
-        "@certd/plugin-util",
-      ],
-      output: {
-        globals: {
-          vue: "Vue",
-          lodash: "_",
-          dayjs: "dayjs",
-          "@certd/plugin-cert": "CertdPluginCert",
-          "@certd/acme-client": "CertdAcmeClient",
-          "@certd/pipeline": "CertdPluginPipeline",
-          "@certd/plugin-aliyun": "CertdPluginAliyun",
-          "@certd/plugin-host": "CertdPluginHost",
-          "@certd/plugin-huawei": "CertdPluginHuawei",
-          "@certd/plugin-util": "CertdPluginUtil",
-        },
-      },
-    },
-  },
-});