@things-factory/board-service 6.0.49 → 6.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/board-service",
-  "version": "6.0.49",
+  "version": "6.0.52",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -36,5 +36,5 @@
   "devDependencies": {
     "@types/puppeteer": "^5.4.6"
   },
-  "gitHead": "e107d6f692d008add950e000d2653bcbbd711a24"
+  "gitHead": "be223b9a3f3a093cba2f97110e109597c9f9b21f"
 }

package/server/controllers/fonts.ts

@@ -1,11 +1,70 @@
 import { SelectQueryBuilder } from 'typeorm'
 
 import { Font } from '@things-factory/font-base'
-import { getRepository } from '@things-factory/shell'
+import { Attachment } from '@things-factory/attachment-base'
+import { getRepository, Domain } from '@things-factory/shell'
 
-export const fonts = async () => {
+export const fonts = async (domain?: Domain) => {
   const qb: SelectQueryBuilder<Font> = await getRepository(Font).createQueryBuilder('FONT')
-  return (await qb.select('name').distinct(true).where({ active: true }).getRawMany()).map(
-    (f: { name: string }) => f.name
-  )
+
+  const fonts = domain
+    ? await qb
+        .select('name')
+        .distinct(true)
+        .addSelect('provider')
+        .addSelect('id')
+        .addSelect('uri')
+        .where({ domain: { id: domain.id }, active: true })
+        .getRawMany()
+    : await qb.select('name').distinct(true).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 [
+    {
+      google: {
+        families: googleFonts.map(({ name }) => name)
+      },
+      custom: {
+        families: customFonts.map(({ name }) => name)
+      }
+    },
+    customFontCSS
+  ]
 }

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

@@ -95,7 +95,7 @@ async function initializeScenePage() {
   const url = `${protocol}://${host}:${port}${path}`
 
   const page = await browser.newPage()
-  const fontsToUse = await fonts()
+  const [fontsToUse, fontStyles] = await fonts()
 
   await page.setRequestInterception(true)
   page.on('console', msg => {
@@ -111,7 +111,8 @@ async function initializeScenePage() {
           'Content-Type': 'application/json'
         },
         postData: JSON.stringify({
-          fonts: fontsToUse
+          fonts: fontsToUse,
+          fontStyles
         })
       })
     } else {

package/server/controllers/pdf.ts

@@ -24,7 +24,10 @@ export const pdf = async ({
   const { domain, user } = context.state
 
   var { model, base } = await headlessModel({ domain, id, model })
-  model.fonts = await fonts()
+  const [fontsToUse, fontStyles] = await fonts(domain)
+
+  model.fonts = fontsToUse
+  model.fontStyles = fontStyles
 
   let { width, height } = model
 

package/server/controllers/screenshot.ts

@@ -25,7 +25,10 @@ export const screenshot = async ({
   const { domain, user } = context.state
 
   var { model, base } = await headlessModel({ domain, id, model })
-  model.fonts = await fonts()
+  const [fontsToUse, fontStyles] = await fonts(domain)
+
+  model.fonts = fontsToUse
+  model.fontStyles = fontStyles
 
   var { width, height } = model
 

package/server/routers/standalone-board-service-router.ts

@@ -13,13 +13,16 @@ import { Board } from '../service/board/board'
 
 export const standaloneBoardServiceRouter = new Router()
 
-// for board headless
+// for board headless-full
 standaloneBoardServiceRouter.get('/headless-full/:id', async (context, next) => {
   const { domain, user } = context.state
   const { id } = context.params
 
   const { model, base } = await headlessModel({ domain, id })
-  model.fonts = await fonts()
+  const [fontsToUse, fontStyles] = await fonts(domain)
+
+  model.fonts = fontsToUse
+  model.fontStyles = fontStyles
 
   setAccessTokenCookie(context, await user.sign({ domain }))
 
@@ -32,7 +35,10 @@ standaloneBoardServiceRouter.get('/headless/:id', async (context, next) => {
   const { id } = context.params
 
   const { model, base } = await headlessModel({ domain, id })
-  model.fonts = await fonts()
+  const [fontsToUse, fontStyles] = await fonts(domain)
+
+  model.fonts = fontsToUse
+  model.fontStyles = fontStyles
 
   setAccessTokenCookie(context, await user.sign({ domain }))
 

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

@@ -34,9 +34,19 @@
 
     <script>
       var model = <%- JSON.stringify(model) %>;
+
+      let style = document.head.querySelector('#custom-fonts')
+      if (!style) {
+        style = document.createElement('style')
+        style.id = 'custom-fonts'
+        document.head.appendChild(style)
+      }
+      style.innerHTML = model.fontStyles
+
       WebFont.load({
-        google: {
-          families: model.fonts || []
+        ...model.fonts,
+        fontactive: () => {
+          window.dispatchEvent(new CustomEvent('resize'))
         }
       })
     </script>

package/views/internal-board-service-view.html

@@ -25,9 +25,19 @@
     <script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js"></script>
     <script>
       var model = <%- JSON.stringify(model) %>;
+
+      let style = document.head.querySelector('#custom-fonts')
+      if (!style) {
+        style = document.createElement('style')
+        style.id = 'custom-fonts'
+        document.head.appendChild(style)
+      }
+      style.innerHTML = model.fontStyles
+
       WebFont.load({
-        google: {
-          families: model.fonts || []
+        ...model.fonts,
+        fontactive: () => {
+          window.dispatchEvent(new CustomEvent('resize'))
         }
       })
     </script>

package/views/internal-label-command-view.html

@@ -23,9 +23,19 @@
     <script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js"></script>
     <script>
       var model = <%- JSON.stringify(model) %>;
+
+      let style = document.head.querySelector('#custom-fonts')
+      if (!style) {
+        style = document.createElement('style')
+        style.id = 'custom-fonts'
+        document.head.appendChild(style)
+      }
+      style.innerHTML = model.fontStyles
+
       WebFont.load({
-        google: {
-          families: model.fonts || []
+        ...model.fonts,
+        fontactive: () => {
+          window.dispatchEvent(new CustomEvent('resize'))
         }
       })
     </script>