@things-factory/integration-headless 7.0.56 → 7.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-headless",
-  "version": "7.0.56",
+  "version": "7.0.58",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "heartyoh <heartyoh@hatiolab.com>",
@@ -29,5 +29,5 @@
     "ejs": "^3.1.10",
     "pdf-lib": "^1.17.1"
   },
-  "gitHead": "79b01a9ad44568f3b807cbddef256b262a0aa5df"
+  "gitHead": "b0eea04d732f7fa30e7e7803cca8e3258b750f17"
 }

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

@@ -1,6 +1,7 @@
 import { TaskRegistry } from '@things-factory/integration-base'
 import { PDFCaptureUtil, getCommonParameterSpec } from './pdf-capture-util'
 import { BoardFunc } from '@things-factory/board-service'
+import { access } from '@things-factory/utils'
 
 const PAGE_FORMATS = {
   A4: { width: 595.28, height: 841.89 },
@@ -9,73 +10,138 @@ const PAGE_FORMATS = {
   Legal: { width: 612, height: 1008 }
 }
 
-type PageFormat = keyof typeof PAGE_FORMATS
+function convertToPixels(value: string): number {
+  const dpi = 96 // PDF에서 기본적으로 사용하는 DPI
+
+  if (value.endsWith('px')) {
+    return parseFloat(value)
+  } else if (value.endsWith('in')) {
+    const inches = parseFloat(value)
+    return inches * dpi
+  } else if (value.endsWith('cm')) {
+    const cm = parseFloat(value)
+    return cm * (dpi / 2.54)
+  }
+
+  return 0
+}
 
 export async function HeadlessPDFCaptureBoard(step, context) {
   const pdfUtil = new PDFCaptureUtil(context)
   await pdfUtil.initBrowser(step.connection)
 
   try {
-    const { board, draft, format = 'A4', landscape, preferCSSPageSize } = step.params
-
-    if (!board || !board.id) {
+    var {
+      board: boardObject,
+      accessor,
+      boardAccessor,
+      draft,
+      format = 'A4',
+      width,
+      height,
+      landscape,
+      marginLeft = 0,
+      marginRight = 0,
+      marginTop = 0,
+      marginBottom = 0
+    } = step.params
+    var { domain, data, user, logger } = context
+
+    const boardId = boardAccessor ? access(boardAccessor, data) : boardObject?.id
+
+    if (!boardId) {
       throw new Error('The board property must be set')
     }
 
-    const { model, base } = await BoardFunc.headlessModel({ domain: context.domain, id: board.id }, draft)
-    const [fontsToUse, fontStyles] = await BoardFunc.fonts(context.domain)
+    const boardInput = access(accessor, data)
+
+    const { model, base } = await BoardFunc.headlessModel({ domain, id: boardId }, draft)
+    const [fontsToUse, fontStyles] = await BoardFunc.fonts(domain)
 
     model.fonts = fontsToUse
     model.fontStyles = fontStyles
 
-    let width: number | undefined = PAGE_FORMATS[format as PageFormat]?.width
-    let height: number | undefined = PAGE_FORMATS[format as PageFormat]?.height
+    var widthN = width ? convertToPixels(width) : 0
+    var heightN = height ? convertToPixels(height) : 0
 
-    if (preferCSSPageSize) {
-      width = undefined
-      height = undefined
+    if (!widthN && !heightN && PAGE_FORMATS[format]) {
+      const pageDimensions = PAGE_FORMATS[format]
+      widthN = pageDimensions.width * (96 / 72)
+      heightN = pageDimensions.height * (96 / 72)
     }
 
-    if (landscape && width && height) {
-      ;[width, height] = [height, width]
+    if (landscape && widthN && heightN) {
+      ;[widthN, heightN] = [heightN, widthN]
     }
 
+    marginLeft = convertToPixels(marginLeft)
+    marginTop = convertToPixels(marginTop)
+    marginBottom = convertToPixels(marginBottom)
+    marginRight = convertToPixels(marginRight)
+
+    const contentWidth = widthN - marginLeft - marginRight
+    const contentHeight = heightN - marginTop - marginBottom
+
+    const page = await pdfUtil.browser!.newPage()
+
+    await page.setViewport({ width: Math.round(contentWidth), height: Math.round(contentHeight) })
+    await page.setRequestInterception(true)
+    await page.setDefaultTimeout(10000)
+
+    page.on('console', async msg => {
+      console.log(`[browser ${msg.type()}] ${msg.text()}`)
+    })
+
+    page.on('requestfailed', request => {
+      console.log('Request failed:', request.url())
+    })
+
     const protocol = 'http'
     const host = 'localhost'
     const port = process.env.PORT ? `:${process.env.PORT}` : ''
     const path = '/internal-board-service-view'
     const url = `${protocol}://${host}${port}${path}`
 
-    const page = await pdfUtil.browser!.newPage()
-
-    await page.setViewport({
-      width: Math.round(width || 800), // Fallback for width if not defined
-      height: Math.round(height || 600) // Fallback for height if not defined
+    const token = await user?.sign()
+
+    page.on('request', request => {
+      if (request.url() === url) {
+        request.continue({
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'x-things-factory-domain': domain?.subdomain,
+            Authorization: 'Bearer ' + token
+          },
+          postData: JSON.stringify({
+            model,
+            base
+          })
+        })
+      } else if (request.url().startsWith(`${protocol}://${host}${port}`)) {
+        request.continue({
+          headers: {
+            ...request.headers(),
+            'x-things-factory-domain': domain?.subdomain,
+            Authorization: 'Bearer ' + token
+          }
+        })
+      } else {
+        request.continue()
+      }
     })
 
     await page.goto(url)
 
-    await page.evaluate(
-      data => {
-        //@ts-ignore
-        s.data = data
-        return new Promise(resolve => {
-          requestAnimationFrame(() => resolve(0))
-        })
-      },
-      { model, base }
-    )
-
-    // 페이지 옵션 설정
-    const pageOptions = pdfUtil.buildPageOptions({
-      ...step.params,
-      width: width ? `${width}px` : undefined,
-      height: height ? `${height}px` : undefined
-    })
+    await page.evaluate(data => {
+      //@ts-ignore
+      s.data = data
+      return new Promise(resolve => {
+        requestAnimationFrame(() => resolve(0))
+      })
+    }, boardInput)
 
-    // PDF 생성 및 추가
-    const htmlContent = '' // 보드에서 직접 렌더링되므로 HTML 컨텐츠가 비어있음
-    await pdfUtil.processPageAndGeneratePDF(pageOptions, htmlContent) // pageOptions 사용
+    await pdfUtil.processPageAndGeneratePDF(step.params, null, page)
 
     return {
       data: context.__headless_pdf
@@ -89,6 +155,11 @@ export async function HeadlessPDFCaptureBoard(step, context) {
 
 HeadlessPDFCaptureBoard.parameterSpec = [
   ...getCommonParameterSpec(),
+  {
+    type: 'string',
+    name: 'boardAccessor',
+    label: 'board-accessor'
+  },
   {
     type: 'resource-object',
     name: 'board',

package/server/engine/task/index.ts

@@ -3,3 +3,7 @@ import './headless-pdf-capture-markdown'
 import './headless-pdf-capture-board'
 import './headless-pdf-open'
 import './headless-pdf-save'
+import './pdf-capture-util'
+
+export * from './pdf-capture-util'
+export * from './headless-pdf-capture-board'

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

@@ -70,13 +70,17 @@ export class PDFCaptureUtil {
     this.context.__headless_pdf.pageCount += copiedPages.length
   }
 
-  async processPageAndGeneratePDF(stepOptions: StepOptions, htmlContent: string) {
+  async processPageAndGeneratePDF(stepOptions: StepOptions, htmlContent: string, page?: Page) {
     if (!this.browser) throw new Error('Browser not initialized. Call initBrowser() first.')
 
-    const page = await this.browser.newPage()
+    if (!page) {
+      page = page || (await this.browser.newPage())
+    }
 
-    // 페이지 컨텐츠 설정
-    await page.setContent(htmlContent, { waitUntil: 'networkidle0' }) // HTML 컨텐츠가 완전히 로드될 때까지 대기
+    if (htmlContent) {
+      // 페이지 컨텐츠 설정
+      await page.setContent(htmlContent, { waitUntil: 'networkidle0' }) // HTML 컨텐츠가 완전히 로드될 때까지 대기
+    }
 
     // 페이지가 완전히 로드된 후에 워터마크와 머릿글 적용
     const { __headless_pdf } = this.context

package/server/index.ts

@@ -1 +1,3 @@
 import './engine'
+
+export * from './engine/task'

package/translations/en.json

@@ -1,6 +1,7 @@
 {
-  "label.display-header/footer": "display header/footer",
+  "label.board-accessor": "board ID accessor",
   "label.board-draft": "draft board",
+  "label.display-header/footer": "display header/footer",
   "label.filename": "filename",
   "label.footer": "footer template",
   "label.header": "header template",

package/translations/ja.json

@@ -1,4 +1,6 @@
 {
+  "label.board-accessor": "かんばんIDアクセサー",
+  "label.board-draft": "編集版対象",
   "label.display-header/footer": "ヘッダー/フッターを表示",
   "label.filename": "ファイル名",
   "label.footer": "フッターテンプレート",

package/translations/ko.json

@@ -1,5 +1,6 @@
 {
   "label.display-header/footer": "머릿글/바닥글 표시여부",
+  "label.board-accessor": "보드 ID 접근자",
   "label.board-draft": "편집본 대상",
   "label.filename": "파일이름",
   "label.footer": "바닥글 템플릿",

package/translations/ms.json

@@ -1,4 +1,6 @@
 {
+  "label.board-accessor": "kanban ID akses",
+  "label.board-draft": "sasaran draf",
   "label.display-header/footer": "papar pengepala/pengaki",
   "label.filename": "nama fail",
   "label.footer": "templat pengaki",

package/translations/zh.json

@@ -1,4 +1,6 @@
 {
+  "label.board-accessor": "看板ID访问者",
+  "label.board-draft": "编辑草案对象",
   "label.display-header/footer": "显示页眉/页脚",
   "label.filename": "文件名",
   "label.footer": "页脚模板",