@things-factory/board-service 8.0.0 → 9.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/board-service",
-  "version": "8.0.0",
+  "version": "9.0.0-beta.3",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "",
@@ -23,15 +23,15 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^8.0.0",
-    "@things-factory/env": "^8.0.0",
-    "@things-factory/fav-base": "^8.0.0",
-    "@things-factory/font-base": "^8.0.0",
-    "@things-factory/integration-base": "^8.0.0",
+    "@things-factory/auth-base": "^9.0.0-beta.3",
+    "@things-factory/env": "^8.0.0-beta.4",
+    "@things-factory/fav-base": "^9.0.0-beta.3",
+    "@things-factory/font-base": "^9.0.0-beta.3",
+    "@things-factory/integration-base": "^9.0.0-beta.3",
     "@things-factory/operato-license-checker": "^4.0.4",
     "content-disposition": "^0.5.3",
     "generic-pool": "^3.8.2",
     "puppeteer": "^23.0.0"
   },
-  "gitHead": "07ef27d272dd9a067a9648ac7013748510556a18"
+  "gitHead": "1d7e0dd4c88f3c3f3bd311c00e4b1d1542d53634"
 }

package/views/internal-board-full-feature-view.html

@@ -69,7 +69,7 @@
       const startSubscribingForAutoRefresh = window.startSubscribingForAutoRefresh
 
       const board = {
-        id: '---',
+        id: (new URL(window.location.href)).pathname.split('/').at(-1),
         model
       }
 

package/server/constants/error-code.ts

@@ -1,2 +0,0 @@
-export const VERIFICATION_ERROR = 'error.license token not valid'
-export const OVER_LIMIT = 'error.count over license limit'

package/server/controllers/analyzer/analyze-integration.ts

@@ -1,142 +0,0 @@
-import uniq from 'lodash/uniq'
-
-import { Domain, getRepository } from '@things-factory/shell'
-import { analyzeIntegration } from '@things-factory/integration-base'
-import { Board } from '../../service/board/board'
-
-function findObjectsWithCondition(container, condition: (component: any) => boolean) {
-  let result = []
-
-  if (condition(container)) {
-    result.push(container)
-  }
-
-  if (container.components) {
-    for (const component of container.components) {
-      result = result.concat(findObjectsWithCondition(component, condition))
-    }
-  }
-
-  return result
-}
-
-function getRelationsInBoard(board: Board) {
-  try {
-    const model = JSON.parse(board.model) || {}
-
-    const scenarioNames = findObjectsWithCondition(model, component => component.scenarioName).map(
-      component => component.scenarioName
-    )
-
-    const tags = findObjectsWithCondition(model, component => component.tag).map(component => component.tag)
-
-    return {
-      scenarioNames: uniq(scenarioNames.filter(Boolean)),
-      tags: uniq(tags.filter(Boolean))
-    }
-  } catch (err) {
-    console.error('analyze-integration::getRelationsInBoard error', err)
-    return {
-      scenarioNames: [],
-      tags: []
-    }
-  }
-}
-
-export async function analyzeBoardIntegration(domain: Domain) {
-  const model = await analyzeIntegration(domain)
-
-  var id = 0
-
-  const boards = await getRepository(Board).find({
-    where: { domain: { id: domain.id } }
-  })
-
-  model.nodes = model.nodes.concat(
-    boards.map(board => {
-      return {
-        id: board.id,
-        labels: ['Board'],
-        text: board.name,
-        icon: 'dashboard',
-        properties: {
-          name: board.name,
-          description: board.description
-        }
-      }
-    })
-  )
-
-  boards.forEach(board => {
-    const { scenarioNames, tags } = getRelationsInBoard(board)
-
-    var scenarioNodes = scenarioNames.map(name =>
-      model.nodes.find(node => node.labels.includes('Scenario') && node.properties?.name == name)
-    )
-    var tagNodes = tags.map(tag => model.nodes.find(node => node.labels.includes('Tag') && node.properties?.tag == tag))
-
-    const missingScenarioNodes = scenarioNodes
-      .filter(node => !node)
-      .map((_, i) => scenarioNames[i])
-      .map(missingScenario => {
-        return {
-          id: `missing-scenario-${missingScenario}`,
-          labels: ['Scenario'],
-          text: missingScenario,
-          icon: 'settings',
-          properties: {
-            name: missingScenario,
-            missing: true
-          }
-        }
-      })
-
-    model.nodes = model.nodes.concat(missingScenarioNodes)
-
-    const missingTagNodes = tagNodes
-      .filter(node => !node)
-      .map((_, i) => tags[i])
-      .map(missingTag => {
-        return {
-          id: `missing-tag-${missingTag}`,
-          labels: ['Tag'],
-          text: missingTag,
-          icon: 'label',
-          properties: {
-            name: missingTag,
-            missing: true
-          }
-        }
-      })
-
-    model.nodes = model.nodes.concat(missingTagNodes)
-
-    tagNodes.filter(node => !node).map((_, i) => tags[i])
-
-    var relationships = [...scenarioNodes.filter(Boolean), ...missingScenarioNodes].map(node => {
-      return {
-        id: `bsce-${++id}`,
-        type: 'call',
-        startNode: board.id,
-        endNode: node.id,
-        properties: {}
-      }
-    })
-
-    model.relationships = model.relationships.concat(relationships)
-
-    relationships = [...tagNodes.filter(Boolean), ...missingTagNodes].map(node => {
-      return {
-        id: `btag-${++id}`,
-        type: 'subscribe',
-        startNode: board.id,
-        endNode: node.id,
-        properties: {}
-      }
-    })
-
-    model.relationships = model.relationships.concat(relationships)
-  })
-
-  return model
-}

package/server/controllers/fonts.ts

@@ -1,83 +0,0 @@
-import { SelectQueryBuilder } from 'typeorm'
-
-import { Font } from '@things-factory/font-base'
-import { Attachment } from '@things-factory/attachment-base'
-import { getRepository, Domain } from '@things-factory/shell'
-
-export const fonts = async (domain?: Domain) => {
-  const qb: SelectQueryBuilder<Font> = await getRepository(Font).createQueryBuilder('FONT')
-
-  var fonts = domain
-    ? await qb
-        .select('FONT.name', 'name')
-        .distinct(true)
-        .addSelect('FONT.provider', 'provider')
-        .addSelect('FONT.id', 'id')
-        .addSelect('FONT.uri', 'uri')
-        .where({ domain: { id: domain.id }, active: true })
-        .getRawMany()
-    : await qb
-        .select('FONT.name', 'name')
-        .distinct(true)
-        .addSelect('FONT.provider', 'provider')
-        .addSelect('FONT.id', 'id')
-        .addSelect('FONT.uri', 'uri')
-        .where({ active: true })
-        .getRawMany()
-
-  var googleFonts = fonts.filter(({ provider }) => provider == 'google')
-  var customFonts = fonts.filter(({ provider }) => provider == 'custom')
-
-  var customFontCSS: string = ''
-
-  for (const font of customFonts) {
-    var files: Attachment[] = domain
-      ? await getRepository(Attachment).findBy({
-          domain: { id: domain.id },
-          refBy: font.id
-        })
-      : await getRepository(Attachment).findBy({
-          refBy: font.id
-        })
-
-    if (files && files.length > 0) {
-      customFontCSS += files
-        .map(file => {
-          const { name: filename, fullpath } = file
-          const bold = filename.toUpperCase().indexOf('BOLD') !== -1
-
-          return `@font-face {
-            font-family: '${font.name}';
-            src: local('${font.name}'), url(${fullpath});
-            font-weight: ${bold ? 'bold' : 'normal'};
-          }
-          `
-        })
-        .join('\n')
-    } else {
-      customFontCSS += `@font-face {
-          font-family: '${font.name}';
-          src: local('${font.name}')${font.uri ? `, url(${font.uri})` : ''};
-        }
-        `
-    }
-  }
-
-  return googleFonts.length > 0 || customFonts.length > 0
-    ? [
-        {
-          ...(googleFonts.length > 0 && {
-            google: {
-              families: googleFonts.map(({ name }) => name)
-            }
-          }),
-          ...(customFonts.length > 0 && {
-            custom: {
-              families: customFonts.map(({ name }) => name)
-            }
-          })
-        },
-        customFonts.length > 0 ? customFontCSS : null
-      ]
-    : []
-}

package/server/controllers/headless-model.ts

@@ -1,53 +0,0 @@
-import { In } from 'typeorm'
-import { getContextPath, getRepository } from '@things-factory/shell'
-
-import { Board } from '../service/board/board'
-import { BoardHistory } from '../service/board/board-history'
-
-export const headlessModel = async (target, draft: boolean = false) => {
-  var { domain, id, model, name } = target || {}
-
-  if (model) {
-    if (typeof model == 'string') {
-      model = JSON.parse(model)
-    } else if (typeof model !== 'object') {
-      throw 'model should be a string or object'
-    }
-  } else {
-    if (id) {
-      var board = await getRepository(Board).findOne({
-        where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id }
-      })
-    } else if (name) {
-      var board = await getRepository(Board).findOne({
-        where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, name }
-      })
-    } else {
-      throw 'parameter model or id mandatory'
-    }
-
-    if (!draft && board) {
-      const latestReleased =
-        board.state == 'released'
-          ? board
-          : await getRepository(BoardHistory)
-              .createQueryBuilder('history')
-              .where('history.originalId = :originalId', { originalId: board.id })
-              .orderBy('history.version', 'DESC')
-              .limit(1)
-              .getOne()
-
-      model = (latestReleased || board).model
-    } else {
-      model = board.model
-    }
-
-    model = JSON.parse(model)
-  }
-
-  return {
-    base: getContextPath(domain?.subdomain) + (domain ? '/' : ''),
-    model,
-    board
-  }
-}

package/server/controllers/headless-pdf-to-image.ts

@@ -1,103 +0,0 @@
-const puppeteer = require('puppeteer')
-const { Readable } = require('stream')
-const ejs = require('ejs')
-
-export const pdfToImage = async ({ pdfPath, fileName, extension = 'png', quality = 2, defaultViewport = null }) => {
-  const browser = await puppeteer.launch({
-    headless: true,
-    args: [
-      '--disable-web-security',
-      '--disable-features=IsolateOrigins',
-      '--disable-site-isolation-trials',
-      '--no-sandbox'
-    ],
-    defaultViewport
-  })
-
-  try {
-    const protocol = 'http'
-    const host = 'localhost'
-    const port = process.env.PORT
-    const pdfUrl = `${protocol}://${host}:${port}${pdfPath}`
-
-    const page = await browser.newPage()
-    const html = await ejs.render(getPdfHtmlTemplate(), { data: { pdfUrl, quality } })
-
-    // 페이지 로딩시 까지 기다리고 스크린샷
-    await page.setContent(html, { waitUntil: 'networkidle0' })
-    await page.waitForNetworkIdle()
-    await page.$('#page')
-    const screenshot = await page.screenshot({
-      type: extension,
-      omitBackground: true
-    })
-
-    // graphql fileupload형태로 return을 위해 stream 생성
-    const stream = new Readable()
-    stream.push(screenshot)
-    stream.push(null)
-
-    await browser.close()
-
-    // file upload 형태로 return
-    return {
-      filename: `${fileName}.${extension}`,
-      mimetype: `image/${extension}`,
-      encoding: '7bit',
-      createReadStream: () => stream
-    }
-  } catch (e) {
-    await browser.close()
-    console.log('Error creating thumbnail', e)
-    throw new Error('Error creating thumbnail')
-  }
-}
-
-function getPdfHtmlTemplate() {
-  return `
-    <html lang="en">
-      <head>
-        <meta charset="UTF-8" />
-        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
-        <style nonce="<%= nonce %>">
-          body {
-            width: 100vw;
-            height: 100vh;
-            margin: 0;
-          }
-          #page {
-            display: flex;
-            width: 100%;
-            height: 100%;
-          }
-        </style>
-
-      </head>
-      <body>
-        <canvas id="page"></canvas>
-        <script src="https://unpkg.com/pdfjs-dist@2.0.489/build/pdf.min.js"></script>
-        <script nonce="<%= nonce %>">
-          ;(async () => {
-            const pdf = await pdfjsLib.getDocument('<%= data.pdfUrl %>')
-            const page = await pdf.getPage(1)
-            const viewport = page.getViewport('<%= data.quality %>')
-            const canvas = document.getElementById('page')
-            const context = canvas.getContext('2d')
-
-            canvas.height = viewport.height
-            canvas.width = viewport.width
-
-            const renderContext = {
-              canvasContext: context,
-              viewport: viewport
-            }
-
-            page.render(renderContext)
-          })()
-        </script>
-      </body>
-    </html>
-  `
-}

package/server/controllers/headless-playlist.ts

@@ -1,71 +0,0 @@
-import { getContextPath, getRepository } from '@things-factory/shell'
-
-import { PlayGroup } from '../service/play-group/play-group'
-import { BoardHistory } from '../service/board/board-history'
-
-export const headlessPlaylist = async (target, draft: boolean = false) => {
-  var { domain, id, name } = target || {}
-
-  if (id || name) {
-    const repository = getRepository(PlayGroup)
-
-    if (id) {
-      var playGroup = await repository.findOne({
-        where: { domain: { id: domain.id }, id },
-        relations: ['boards']
-      })
-    } else if (name) {
-      var playGroup = await repository.findOne({
-        where: { domain: { id: domain.id }, name },
-        relations: ['boards']
-      })
-    }
-
-    if (!draft && playGroup) {
-      const { boards } = playGroup
-      for (let board of boards) {
-        const latestReleased =
-          board.state == 'released'
-            ? board
-            : await getRepository(BoardHistory)
-                .createQueryBuilder('history')
-                .where('history.originalId = :originalId', { originalId: board.id })
-                .orderBy('history.version', 'DESC')
-                .limit(1)
-                .getOne()
-
-        if (latestReleased) {
-          board.model = latestReleased.model
-        }
-      }
-    }
-
-    playGroup.boards = playGroup.boards.sort((a, b) => {
-      // 배열 A에 포함된 아이디의 순서를 가져옵니다.
-      const indexOfOrder = (playGroup.order || []).indexOf(a.id)
-      const indexOfBoards = (playGroup.order || []).indexOf(b.id)
-
-      // 두 아이디의 순서를 비교하여 정렬합니다.
-      if (indexOfOrder === -1 && indexOfBoards === -1) {
-        // 두 아이디 모두 배열 A에 없는 경우, 그대로 유지합니다.
-        return 0
-      } else if (indexOfOrder === -1) {
-        // 아이디 A만 배열 A에 없는 경우, 아이디 B를 먼저 정렬합니다.
-        return 1
-      } else if (indexOfBoards === -1) {
-        // 아이디 B만 배열 A에 없는 경우, 아이디 A를 먼저 정렬합니다.
-        return -1
-      } else {
-        // 두 아이디 모두 배열 A에 있는 경우, 배열 A의 아이디 순서대로 정렬합니다.
-        return indexOfOrder - indexOfBoards
-      }
-    })
-  } else {
-    throw 'parameter id or name mandatory'
-  }
-
-  return {
-    base: getContextPath(domain?.subdomain) + (domain ? '/' : ''),
-    playGroup
-  }
-}

package/server/controllers/headless-pool-for-board.ts

@@ -1,71 +0,0 @@
-import * as genericPool from 'generic-pool'
-
-import { config, logger } from '@things-factory/env'
-
-try {
-  var puppeteer = require('puppeteer')
-} catch (err) {
-  logger.error(err)
-}
-
-var headlessPool
-
-export function getHeadlessPool() {
-  if (!headlessPool) {
-    headlessPool = genericPool.createPool(
-      {
-        create() {
-          console.log('headless instance in headless-pool-for-board about to create')
-          return initializeChromium()
-        },
-        validate(browser) {
-          return Promise.race([
-            new Promise(res => setTimeout(() => res(false), 1500)),
-            browser
-              //@ts-ignore
-              .version()
-              .then(_ => true)
-              .catch(_ => false)
-          ])
-        },
-        destroy(browser) {
-          //@ts-ignore
-          return browser.close()
-        }
-      },
-      {
-        min: 2,
-        max: 10,
-        testOnBorrow: true,
-        acquireTimeoutMillis: 15000
-      }
-    )
-  }
-
-  return headlessPool
-}
-
-const CHROMIUM_PATH = config.get('CHROMIUM_PATH')
-
-async function initializeChromium() {
-  try {
-    if (!puppeteer) {
-      return
-    }
-
-    var launchSetting = {
-      args: ['--hide-scrollbars', '--mute-audio', '--no-sandbox', '--use-gl=egl'],
-      headless: 'shell'
-    }
-
-    if (CHROMIUM_PATH) {
-      launchSetting['executablePath'] = CHROMIUM_PATH
-    }
-
-    const browser = await puppeteer.launch(launchSetting)
-
-    return browser
-  } catch (err) {
-    logger.error(err)
-  }
-}