patches v1.3.11 #83

Merged
jkeffects merged 11 commits from develop into main 2025-04-10 10:47:13 +00:00
2 changed files with 66 additions and 26 deletions
Showing only changes of commit 8e80901c0f - Show all commits

View file

@ -1,10 +1,47 @@
import puppeteer from "puppeteer"; import puppeteer, { Browser } from "puppeteer";
import { TemplateHelper } from "./templateHelper"; import { TemplateHelper } from "./templateHelper";
import { PermissionModule } from "../type/permissionTypes"; import { PermissionModule } from "../type/permissionTypes";
import { FileSystemHelper } from "./fileSystemHelper"; import { FileSystemHelper } from "./fileSystemHelper";
import { PDFDocument } from "pdf-lib"; import { PDFDocument } from "pdf-lib";
import { StringHelper } from "./stringHelper";
export abstract class PdfExport { export abstract class PdfExport {
private static browserInstance: undefined | Browser = undefined;
private static timeout: undefined | NodeJS.Timeout = undefined;
private static printing = new Map<string, string>();
private static async renderTemplate(
template: `${PermissionModule}` | `${PermissionModule}.${string}`,
title: string,
data: any,
customTemplate?: {
headerId?: number;
footerId?: number;
bodyId?: string | number;
headerHeight: number;
footerHeight: number;
}
): Promise<{ header: string; footer: string; body: string; headerMargin?: number; footerMargin?: number }> {
if (!customTemplate) {
return await TemplateHelper.renderFileForModule({
module: template,
headerData: data,
bodyData: data,
footerData: data,
title: title,
});
} else {
return await TemplateHelper.renderFileForCustom({
module: template,
customTemplate,
headerData: data,
bodyData: data,
footerData: data,
title: title,
});
}
}
static async renderFile({ static async renderFile({
template, template,
title = "pdf-export FF Admin", title = "pdf-export FF Admin",
@ -28,33 +65,25 @@ export abstract class PdfExport {
footerHeight: number; footerHeight: number;
}; };
}) { }) {
try {
clearTimeout(this.timeout);
} catch (err) {}
let id = StringHelper.random(32);
this.printing.set(id, "printing");
if (folder != "") FileSystemHelper.createFolder(folder); if (folder != "") FileSystemHelper.createFolder(folder);
let header: string, footer: string, body: string, headerMargin: number, footerMargin: number; const renderedTemplate = await this.renderTemplate(template, title, data, customTemplate);
if (!customTemplate) { let { header, footer, body, headerMargin, footerMargin } = renderedTemplate;
({ header, footer, body, headerMargin, footerMargin } = await TemplateHelper.renderFileForModule({
module: template, if (!this.browserInstance || !this.browserInstance.connected) {
headerData: data, this.browserInstance = await puppeteer.launch({
bodyData: data, headless: true,
footerData: data, args: ["--no-sandbox", "--disable-gpu", "--disable-setuid-sandbox"],
title: title, });
}));
} else {
({ header, footer, body, headerMargin, footerMargin } = await TemplateHelper.renderFileForCustom({
module: template,
customTemplate,
headerData: data,
bodyData: data,
footerData: data,
title: title,
}));
} }
const browser = await puppeteer.launch({ const page = await this.browserInstance.newPage();
headless: true,
args: ["--no-sandbox", "--disable-gpu", "--disable-setuid-sandbox"],
});
const page = await browser.newPage();
await page.setContent(body, { waitUntil: "domcontentloaded" }); await page.setContent(body, { waitUntil: "domcontentloaded" });
const exportPath = FileSystemHelper.formatPath(folder, `${filename}.pdf`); const exportPath = FileSystemHelper.formatPath(folder, `${filename}.pdf`);
@ -74,7 +103,16 @@ export abstract class PdfExport {
footerTemplate: footer, footerTemplate: footer,
}); });
await browser.close(); await page.close();
this.printing.delete(id);
if (this.printing.size == 0) {
this.timeout = setTimeout(() => {
this.browserInstance.close();
this.browserInstance = undefined;
}, 5000);
}
return pdf; return pdf;
} }

View file

@ -11,7 +11,9 @@ export abstract class TemplateHelper {
try { try {
tmpFile = FileSystemHelper.readTemplateFile(`/src/templates/${template}.template.html`); tmpFile = FileSystemHelper.readTemplateFile(`/src/templates/${template}.template.html`);
} catch (err) { } catch (err) {
tmpFile = FileSystemHelper.readTemplateFile(`/src/templates/${template.split(".")[1]}.template.html`); tmpFile = FileSystemHelper.readTemplateFile(
`/src/templates/${template.split(".")[template.split(".").length - 1]}.template.html`
);
} }
return tmpFile; return tmpFile;
} }