@things-factory/integration-headless 7.0.38 → 7.0.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-headless",
-  "version": "7.0.38",
+  "version": "7.0.39",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "heartyoh <heartyoh@hatiolab.com>",
@@ -27,5 +27,5 @@
     "ejs": "^3.1.10",
     "pdf-lib": "^1.17.1"
   },
-  "gitHead": "735942469a12f77ed857ad617b97148d178d162d"
+  "gitHead": "97f7588d477aa1d6083b51113d7666b42f530989"
 }

package/server/engine/task/headless-pdf-capture.ts

@@ -1,5 +1,4 @@
-import * as ejs from 'ejs'
-import { PDFDocument, rgb, degrees } from 'pdf-lib'
+import { PDFDocument } from 'pdf-lib'
 
 import { TaskRegistry } from '@things-factory/integration-base'
 import { ConnectionManager } from '@things-factory/integration-base'
@@ -11,28 +10,22 @@ async function HeadlessPDFCapture(step, context) {
     format,
     width,
     height,
-    margin,
+    marginTop,
+    marginBottom,
+    marginLeft,
+    marginRight,
     scale,
     printBackground,
     landscape,
-    displayHeaderFooter,
-    headerTemplate,
-    footerTemplate,
     preferCSSPageSize
   } = stepOptions || {}
-  var { domain, data, __headless_pdf } = context
+  var { domain, __headless_pdf } = context
 
   if (!__headless_pdf) {
-    throw new Error('it requires headless-pdf-open to be performed first')
+    throw new Error('It requires headless-pdf-open to be performed first')
   }
 
-  var {
-    pdf,
-    header: headerTemplateFromContext,
-    footer: footerTemplateFromContext,
-    watermark,
-    pageCount
-  } = __headless_pdf
+  var { pdf, pageCount } = __headless_pdf
 
   var headlessPool = ConnectionManager.getConnectionInstanceByName(domain, connectionName)
   let browser
@@ -55,13 +48,16 @@ async function HeadlessPDFCapture(step, context) {
       format,
       width,
       height,
-      margin,
+      margin: {
+        top: marginTop,
+        right: marginRight,
+        bottom: marginBottom,
+        left: marginLeft
+      },
       scale,
       printBackground,
       landscape,
-      displayHeaderFooter,
-      headerTemplate: displayHeaderFooter ? headerTemplate : undefined,
-      footerTemplate: displayHeaderFooter ? footerTemplate : undefined,
+      displayHeaderFooter: false, // 첫 번째 패스에서는 헤더/푸터를 렌더링하지 않음
       preferCSSPageSize
     }
 
@@ -72,51 +68,7 @@ async function HeadlessPDFCapture(step, context) {
     const pdfDoc = await PDFDocument.load(pageBuffer)
     const pages = await pdf.copyPages(pdfDoc, pdfDoc.getPageIndices())
 
-    pages.forEach((newPage, index) => {
-      const currentPageNumber = pageCount + index + 1
-
-      // 헤더와 푸터 렌더링 (페이지 번호 및 총 페이지 수 포함)
-      if (displayHeaderFooter && (headerTemplateFromContext || footerTemplateFromContext)) {
-        const renderedHeader = headerTemplateFromContext
-          ? ejs.render(headerTemplateFromContext, {
-              ...data,
-              pageNumber: currentPageNumber,
-              totalPages: pageCount + pages.length
-            })
-          : ''
-        const renderedFooter = footerTemplateFromContext
-          ? ejs.render(footerTemplateFromContext, {
-              ...data,
-              pageNumber: currentPageNumber,
-              totalPages: pageCount + pages.length
-            })
-          : ''
-
-        // Header/Footer 그리기
-        if (renderedHeader) {
-          newPage.drawText(renderedHeader, { x: 50, y: newPage.getHeight() - 30, size: 12, color: rgb(0, 0, 0) })
-        }
-        if (renderedFooter) {
-          newPage.drawText(renderedFooter, { x: 50, y: 30, size: 12, color: rgb(0, 0, 0) })
-        }
-      }
-
-      // 워터마크 추가
-      if (watermark) {
-        const fontSize = 50
-        const pageWidth = newPage.getWidth()
-        const pageHeight = newPage.getHeight()
-
-        newPage.drawText(watermark, {
-          x: pageWidth / 2 - (fontSize * watermark.length) / 4,
-          y: pageHeight / 2 - fontSize / 2,
-          size: fontSize,
-          color: rgb(0.75, 0.75, 0.75),
-          rotate: degrees(-45),
-          opacity: 0.5
-        })
-      }
-
+    pages.forEach(newPage => {
       pdf.addPage(newPage)
     })
 
@@ -150,6 +102,7 @@ HeadlessPDFCapture.parameterSpec = [
     label: 'page-format',
     property: {
       options: [
+        { display: '', value: '' },
         { display: 'A4', value: 'A4' },
         { display: 'A3', value: 'A3' },
         { display: 'Letter', value: 'Letter' },
@@ -173,21 +126,37 @@ HeadlessPDFCapture.parameterSpec = [
     description: 'Specify the height of the page (e.g., "11in", "29.7cm", "800px")'
   },
   {
-    type: 'json',
-    name: 'margin',
-    label: 'page-margins',
-    fields: [
-      { type: 'string', name: 'top', label: 'Top Margin', description: 'Top margin (e.g., "1in")' },
-      { type: 'string', name: 'right', label: 'Right Margin', description: 'Right margin (e.g., "1in")' },
-      { type: 'string', name: 'bottom', label: 'Bottom Margin', description: 'Bottom margin (e.g., "1in")' },
-      { type: 'string', name: 'left', label: 'Left Margin', description: 'Left margin (e.g., "1in")' }
-    ],
-    description: 'Set the margins for the page'
+    type: 'string',
+    name: 'marginTop',
+    label: 'page-margin-top',
+    placeholder: '(e.g., "0.5in", "1cm", "100px")',
+    description: 'Set the top margin for the page'
+  },
+  {
+    type: 'string',
+    name: 'marginBottom',
+    label: 'page-margin-bottom',
+    placeholder: '(e.g., "0.5in", "1cm", "100px")',
+    description: 'Set the bottom margin for the page'
+  },
+  {
+    type: 'string',
+    name: 'marginLeft',
+    label: 'page-margin-left',
+    placeholder: '(e.g., "0.5in", "1cm", "100px")',
+    description: 'Set the left margin for the page'
+  },
+  {
+    type: 'string',
+    name: 'marginRight',
+    label: 'page-margin-right',
+    placeholder: '(e.g., "0.5in", "1cm", "100px")',
+    description: 'Set the right margin for the page'
   },
   {
     type: 'number',
     name: 'scale',
-    label: 'scale',
+    label: 'page-scale',
     defaultValue: 1,
     description: 'Set the scale of the page content (default is 1)'
   },
@@ -205,13 +174,6 @@ HeadlessPDFCapture.parameterSpec = [
     defaultValue: false,
     description: 'Print the PDF in landscape orientation'
   },
-  {
-    type: 'boolean',
-    name: 'displayHeaderFooter',
-    label: 'display-header/footer',
-    defaultValue: false,
-    description: 'Display header and footer in the PDF'
-  },
   {
     type: 'boolean',
     name: 'preferCSSPageSize',

package/server/engine/task/headless-pdf-open.ts

@@ -76,24 +76,26 @@ HeadlessPDFOpen.parameterSpec = [
     label: 'pdf-last-page'
   },
   {
-    type: 'textarea',
+    type: 'string',
     name: 'header',
-    label: 'header' // header template
+    label: 'header',
+    placeholder: 'Page <%= pageNumber %> of <%= totalPages %>'
   },
   {
-    type: 'textarea',
+    type: 'string',
     name: 'footer',
-    label: 'footer' // footer template
+    label: 'footer',
+    placeholder: 'Page <%= pageNumber %> of <%= totalPages %>'
   },
   {
-    type: 'textarea',
+    type: 'string',
     name: 'watermark',
-    label: 'watermark' // watermark
+    label: 'watermark'
   },
   {
     type: 'string',
     name: 'fileName',
-    label: 'filename' // 파일 이름 지정
+    label: 'filename'
   }
 ]
 HeadlessPDFOpen.help = 'integration/task/headless-pdf-open'

package/server/engine/task/headless-pdf-save.ts

@@ -1,9 +1,71 @@
 import * as fs from 'fs'
 import * as path from 'path'
+import * as ejs from 'ejs'
 import { PDFDocument, rgb, degrees } from 'pdf-lib'
 
 import { TaskRegistry } from '@things-factory/integration-base'
 
+async function HeadlessPDFRenderHeadersAndFooters(pdf, headerTemplate, footerTemplate, watermark, totalPages) {
+  const pages = pdf.getPages()
+
+  pages.forEach((page, index) => {
+    const pageNumber = index + 1
+    const pageWidth = page.getWidth()
+
+    // 헤더와 푸터 렌더링 (페이지 번호 및 총 페이지 수 포함)
+    if (headerTemplate || footerTemplate) {
+      const renderedHeader = headerTemplate
+        ? ejs.render(headerTemplate, {
+            pageNumber,
+            totalPages
+          })
+        : ''
+      const renderedFooter = footerTemplate
+        ? ejs.render(footerTemplate, {
+            pageNumber,
+            totalPages
+          })
+        : ''
+
+      const fontSize = 12 // 폰트 크기 설정
+      const textWidthHeader = fontSize * renderedHeader.length * 0.5
+      const textWidthFooter = fontSize * renderedFooter.length * 0.5
+
+      // Header/Footer 그리기 (가운데 정렬)
+      if (renderedHeader) {
+        page.drawText(renderedHeader, {
+          x: (pageWidth - textWidthHeader) / 2,
+          y: page.getHeight() - 30,
+          size: fontSize,
+          color: rgb(0, 0, 0)
+        })
+      }
+      if (renderedFooter) {
+        page.drawText(renderedFooter, {
+          x: (pageWidth - textWidthFooter) / 2,
+          y: 30,
+          size: fontSize,
+          color: rgb(0, 0, 0)
+        })
+      }
+    }
+
+    // 워터마크 추가
+    if (watermark) {
+      const fontSize = 50
+
+      page.drawText(watermark, {
+        x: pageWidth / 2 - (fontSize * watermark.length) / 4,
+        y: page.getHeight() / 2 - fontSize / 2,
+        size: fontSize,
+        color: rgb(0.75, 0.75, 0.75),
+        rotate: degrees(-45),
+        opacity: 0.5
+      })
+    }
+  })
+}
+
 async function HeadlessPDFSave(step, context) {
   var { params: stepOptions } = step
   var { outputPath } = stepOptions || {}
@@ -11,16 +73,16 @@ async function HeadlessPDFSave(step, context) {
 
   var { pdf, coverPage, lastPage, watermark, fileName } = __headless_pdf
 
-  // 파일 이름이 설정되지 않았을 경우 기본 파일 이름 생성
+  const totalPages = pdf.getPages().length
+  await HeadlessPDFRenderHeadersAndFooters(pdf, __headless_pdf.header, __headless_pdf.footer, watermark, totalPages)
+
   const finalFileName = fileName || `document-${Date.now()}.pdf`
-  const savePath = path.join(outputPath || '/path/to/default/storage', finalFileName)
+  const savePath = path.join(outputPath || './attachments', finalFileName)
 
-  // PDF 문서에 coverPage 및 lastPage 추가
   if (coverPage) {
     const coverPageDoc = await PDFDocument.load(coverPage)
     const [cover] = await pdf.copyPages(coverPageDoc, [0])
 
-    // 커버 페이지에 워터마크 추가
     if (watermark) {
       const fontSize = 50
       const pageWidth = cover.getWidth()
@@ -43,7 +105,6 @@ async function HeadlessPDFSave(step, context) {
     const lastPageDoc = await PDFDocument.load(lastPage)
     const [last] = await pdf.copyPages(lastPageDoc, [0])
 
-    // 마지막 페이지에 워터마크 추가
     if (watermark) {
       const fontSize = 50
       const pageWidth = last.getWidth()
@@ -62,13 +123,12 @@ async function HeadlessPDFSave(step, context) {
     pdf.addPage(last)
   }
 
-  // PDF 파일로 저장
   const pdfBytes = await pdf.save()
   fs.writeFileSync(savePath, pdfBytes)
 
   return {
     data: {
-      link: savePath // 저장된 PDF 파일의 경로를 반환
+      link: savePath
     }
   }
 }
@@ -77,7 +137,7 @@ HeadlessPDFSave.parameterSpec = [
   {
     type: 'string',
     name: 'outputPath',
-    label: 'output-path' // PDF를 저장할 경로
+    label: 'output-path'
   }
 ]
 

package/translations/en.json

@@ -8,7 +8,10 @@
   "label.output-path": "output path",
   "label.page-format": "page format",
   "label.page-height": "page height",
-  "label.page-margins": "page margins",
+  "label.page-margin-top": "page margin top",
+  "label.page-margin-bottom": "page margin bottom",
+  "label.page-margin-left": "page margin left",
+  "label.page-margin-right": "page margins right",
   "label.page-width": "page width",
   "label.pdf-cover-page": "cover page template",
   "label.pdf-last-page": "last page template",
@@ -16,6 +19,6 @@
   "label.pool-size-min": "minimum pool size",
   "label.prefer-css-page-size": "prefer css page size",
   "label.print-background": "print background",
-  "label.scale": "scale",
+  "label.page-scale": "scale",
   "label.watermark": "watermark"
 }

package/translations/ja.json

@@ -8,7 +8,10 @@
   "label.output-path": "出力パス",
   "label.page-format": "ページ形式",
   "label.page-height": "ページ高さ",
-  "label.page-margins": "ページ余白",
+  "label.page-margin-top": "ページ上余白",
+  "label.page-margin-bottom": "ページ下余白",
+  "label.page-margin-left": "ページ左余白",
+  "label.page-margin-right": "ページ右余白",
   "label.page-width": "ページ幅",
   "label.pdf-cover-page": "表紙テンプレート",
   "label.pdf-last-page": "最終ページテンプレート",
@@ -16,6 +19,6 @@
   "label.pool-size-min": "最小プールサイズ",
   "label.prefer-css-page-size": "cssページサイズを優先",
   "label.print-background": "背景を印刷",
-  "label.scale": "スケール",
+  "label.page-scale": "スケール",
   "label.watermark": "透かし"
 }

package/translations/ko.json

@@ -8,7 +8,10 @@
   "label.output-path": "출력 패스",
   "label.page-format": "페이지 형식",
   "label.page-height": "페이지 높이",
-  "label.page-margins": "페이지 여백",
+  "label.page-margin-top": "페이지 여백 (위쪽)",
+  "label.page-margin-bottom": "페이지 여백 (아래쪽)",
+  "label.page-margin-left": "페이지 여백 (왼쪽)",
+  "label.page-margin-right": "페이지 여백 (오른쪽)",
   "label.page-width": "페이지 폭",
   "label.pdf-cover-page": "표지 템플릿",
   "label.pdf-last-page": "뒷표지 템플릿",
@@ -16,6 +19,6 @@
   "label.pool-size-min": "최대 풀(Pool) 사이즈",
   "label.prefer-css-page-size": "선호 CSS 페이지 크기",
   "label.print-background": "배경 포함여부",
-  "label.scale": "페이지 비율",
+  "label.page-scale": "페이지 비율",
   "label.watermark": "워터마크"
 }

package/translations/ms.json

@@ -8,7 +8,10 @@
   "label.output-path": "laluan output",
   "label.page-format": "format halaman",
   "label.page-height": "tinggi halaman",
-  "label.page-margins": "margin halaman",
+  "label.page-margin-top": "margin atas halaman",
+  "label.page-margin-bottom": "margin bawah halaman",
+  "label.page-margin-left": "margin kiri halaman",
+  "label.page-margin-right": "margin kanan halaman",
   "label.page-width": "lebar halaman",
   "label.pdf-cover-page": "templat muka surat depan",
   "label.pdf-last-page": "templat muka surat terakhir",
@@ -16,6 +19,6 @@
   "label.pool-size-min": "saiz pool minimum",
   "label.prefer-css-page-size": "utamakan saiz halaman css",
   "label.print-background": "cetak latar belakang",
-  "label.scale": "skala",
+  "label.page-scale": "skala",
   "label.watermark": "tanda air"
 }

package/translations/zh.json

@@ -8,7 +8,10 @@
   "label.output-path": "输出路径",
   "label.page-format": "页面格式",
   "label.page-height": "页面高度",
-  "label.page-margins": "页面边距",
+  "label.page-margin-top": "页面上边距",
+  "label.page-margin-bottom": "页面下边距",
+  "label.page-margin-left": "页面左边距",
+  "label.page-margin-right": "页面右边距",
   "label.page-width": "页面宽度",
   "label.pdf-cover-page": "封面模板",
   "label.pdf-last-page": "尾页模板",
@@ -16,6 +19,6 @@
   "label.pool-size-min": "最小池大小",
   "label.prefer-css-page-size": "偏好 css 页面大小",
   "label.print-background": "打印背景",
-  "label.scale": "缩放",
+  "label.page-scale": "缩放",
   "label.watermark": "水印"
 }