page2pdf_server 1.1.1 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "page2pdf_server",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "文书打印转换器",
   "private": false,
   "authors": "herzhang",

package/src/components/home/controller.ts

@@ -1,8 +1,8 @@
 import { OK } from "http-status/lib";
-import { HomeServices } from "./services";
+import { Request, Response, NextFunction } from "express";
 import { getAppInfoQuery } from "../../types/request/home";
 import { apiResponse } from "../../helpers/apiResponse";
-import { Request, Response, NextFunction } from "express";
+import { HomeServices } from "./services";
 
 /**
  * 为何为了保证单步模式调试运行"test:watchAll": "cross-env NODE_ENV=development jest --watchAll --runInBand --detectOpenHandles",

package/src/components/home/pdfController.ts

@@ -1,9 +1,10 @@
 import { OK } from "http-status/lib";
+import { NextFunction, Request, Response } from "express";
 import { HeadFooter } from "../../types/request/config";
 import { apiResponse } from "../../helpers/apiResponse";
 import { RenderPDF } from "../../utils/pdfgen";
 import CONFIG from "../../configEnv";
-import { ConfigRoot, FileTransform } from "@/types";
+import { ConfigRoot, FileTransform } from "../../types";
 
 export class PdfController {
   /** node.js对比前端App 太严格了，一点小毛病页不行啊。
@@ -13,7 +14,11 @@ export class PdfController {
    * 正常分解成两大步：task.files每一个文件生成，最后才是task.merge合并(包括页码生成)。
    * @param next
    */
-  static postMakePdf = async (req: Req, res: Res, next: NextFn) => {
+  static postMakePdf = async (
+    req: Request,
+    res: Response,
+    next: NextFunction,
+  ) => {
     try {
       // const appInfoKey1 = req.query.key as getAppInfoQuery; 所有打印都走ConfigRoot配置包=task：可能有多个URL合并输出的。
       const task = req.body as ConfigRoot<FileTransform>;

package/src/components/home/splitController.ts

@@ -1,12 +1,13 @@
 import fs from "fs";
 import { OK } from "http-status/lib";
+import { NextFunction, Request, Response } from "express";
 import { HeadFooter } from "../../types/request/config";
 import { apiResponse } from "../../helpers/apiResponse";
 
 import { RenderPDF } from "../../utils/pdfgen";
 import CONFIG from "../../configEnv";
 import { SplitConfig, SplitPdfFile } from "../../types/request/split";
-import { ConfigRoot, FileTransform } from "@/types";
+import { ConfigRoot, FileTransform } from "../../types";
 // import CONFIG from "@/configEnv";
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { PDFDocument } = require("pdf-lib");
@@ -24,7 +25,11 @@ export class SplitController {
    * @param next
    */
   //仅仅测试的
-  static postMakePdf = async (req: Req, res: Res, next: NextFn) => {
+  static postMakePdf = async (
+    req: Request,
+    res: Response,
+    next: NextFunction,
+  ) => {
     try {
       // const appInfoKey1 = req.query.key as getAppInfoQuery;
       const task = req.body as ConfigRoot<FileTransform>;
@@ -73,7 +78,11 @@ export class SplitController {
   };
 
   /**拆分需要：支持pdf源文件的，抽取部分纸张页生成新文件*/
-  static postSplitPdf = async (req: Req, res: Res, next: NextFn) => {
+  static postSplitPdf = async (
+    req: Request,
+    res: Response,
+    next: NextFunction,
+  ) => {
     try {
       //也可能?用CDP:printPDF()来进行部分打印的后保存，就等于拆分pdf；
       const task = req.body as SplitConfig;

package/src/helpers/dataSanitizers.ts

@@ -1,13 +1,14 @@
 import { Result, ValidationChain, validationResult } from "express-validator";
 // @ts-ignore
 import { Middleware as ValidatorMiddleware } from "express-validator/src/base";
+import { NextFunction, Request, Response } from "express";
 import ValidationError from "./error/ValidationError";
 
 type MultiValidatorChain = ValidatorMiddleware & {
   run: (req: Request) => Promise<Result>;
 };
 
-const catchValidatorError = (req: Req, _: Res, next: NextFn): void => {
+const catchValidatorError = (req: Request, _: Response, next: NextFunction): void => {
   const errors = validationResult(req);
   if (!errors.isEmpty()) {
     const validationErrors = errors

package/src/index.ts

@@ -14,5 +14,5 @@ if (process.env.NODE_ENV !== "test") {
 
 //关键文档Chrome DevTools Protocol资料， https://chromedevtools.github.io/devtools-protocol/tot/Page
 export * from "./types/request/config";
-export { FileTransform } from "@/types";
-export { ConfigRoot } from "@/types";
+export { FileTransform } from "./types";
+export { ConfigRoot } from "./types";

package/src/utils/pdfgen.ts

@@ -8,7 +8,7 @@ import config from "config";
 import CONFIG from "../configEnv";
 import { MyPaperSize } from "../types/request/config";
 import { filePathToUrl } from "../utils/url";
-import { ConfigRoot, FileTransform } from "@/types";
+import { ConfigRoot, FileTransform } from "../types";
 
 //自定义纸张系列的：
 const paperSZs = config.get("size") as MyPaperSize[];

package/tsconfig.json

@@ -1,12 +1,12 @@
 {
   "compilerOptions": {
-    "declaration": false,  // 关闭自动生成声明文件
+    "rootDir": "./src",  // 输入文件根目录
     "outDir": "./dist",
-    "rootDir": "./src",
     "pretty": true,
     "removeComments": true,
 
-//    "declarationDir": "./dist/types",  // 声明文件输出目录
+    "declaration": true,
+    "declarationDir": "./dist/types",  // 声明文件输出目录
 //    "emitDeclarationOnly": true, // 仅生成声明文件
     "module": "ESNext",
     "target": "ES2021",