@things-factory/board-service 6.2.84 → 6.2.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/board-service",
-  "version": "6.2.84",
+  "version": "6.2.86",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -28,7 +28,7 @@
     "@things-factory/env": "^6.2.33",
     "@things-factory/fav-base": "^6.2.84",
     "@things-factory/font-base": "^6.2.84",
-    "@things-factory/integration-base": "^6.2.84",
+    "@things-factory/integration-base": "^6.2.86",
     "@things-factory/operato-license-checker": "^4.0.4",
     "content-disposition": "^0.5.3",
     "generic-pool": "^3.8.2"
@@ -37,5 +37,5 @@
     "@thiagoelg/node-printer": "0.6.2",
     "puppeteer": "^20.7.3"
   },
-  "gitHead": "3c272e989acc14bbd02f4ec79624dfd7dc4e6acd"
+  "gitHead": "f90a5c1ff2a93331bb6e375944972dc68dde8a1f"
 }

package/server/controllers/headless-model.ts

@@ -4,7 +4,7 @@ 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, devmode: boolean = false) => {
+export const headlessModel = async (target, draft: boolean = false) => {
   var { domain, id, model, name } = target || {}
 
   if (model) {
@@ -26,7 +26,7 @@ export const headlessModel = async (target, devmode: boolean = false) => {
       throw 'parameter model or id mandatory'
     }
 
-    if (!devmode && board) {
+    if (!draft && board) {
       const latestReleased =
         board.state == 'released'
           ? board
@@ -37,12 +37,12 @@ export const headlessModel = async (target, devmode: boolean = false) => {
               .limit(1)
               .getOne()
 
-      if (latestReleased) {
-        model = latestReleased.model
-      }
+      model = (latestReleased || board).model
+    } else {
+      model = board.model
     }
 
-    model = JSON.parse(board.model)
+    model = JSON.parse(model)
   }
 
   return {

package/server/controllers/headless-playlist.ts

@@ -3,7 +3,7 @@ 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, devmode: boolean = false) => {
+export const headlessPlaylist = async (target, draft: boolean = false) => {
   var { domain, id, name } = target || {}
 
   if (id || name) {
@@ -21,7 +21,7 @@ export const headlessPlaylist = async (target, devmode: boolean = false) => {
       })
     }
 
-    if (!devmode && playGroup) {
+    if (!draft && playGroup) {
       const { boards } = playGroup
       for (let board of boards) {
         const latestReleased =

package/server/controllers/label-command.ts

@@ -14,7 +14,7 @@ import { headlessModel } from './headless-model'
  * @param {boolean} mirror 좌우반전
  * @param {boolean} upsideDown 상하반전
  */
-export const labelcommand = async ({ id, model, data, orientation, mirror = false, upsideDown = false, context }) => {
+export const labelcommand = async ({ id, model, data, orientation, mirror = false, upsideDown = false, context, draft = false }) => {
   const { domain } = context.state
 
   const browser = (await getHeadlessPool().acquire()) as any
@@ -24,7 +24,7 @@ export const labelcommand = async ({ id, model, data, orientation, mirror = fals
 
   const { page } = browser
 
-  var { model } = await headlessModel({ domain, model, id })
+  var { model } = await headlessModel({ domain, model, id }, draft)
 
   const grf = await page.evaluate(
     async (model, data, orientation, mirror, upsideDown) => {

package/server/controllers/screenshot.ts

@@ -14,7 +14,8 @@ export const screenshot = async ({
   height: h = 0,
   options = { encoding: 'base64' } as any,
   isThumbnail = false,
-  context = {} as any
+  context = {} as any,
+  draft = false
 } = {}) => {
   const browser = (await getHeadlessPool().acquire()) as any
   var screenshot = null
@@ -24,7 +25,7 @@ export const screenshot = async ({
   }
   const { domain, user } = context.state
 
-  var { model, base } = await headlessModel({ domain, id, model })
+  var { model, base } = await headlessModel({ domain, id, model }, draft)
   const [fontsToUse, fontStyles] = await fonts(domain)
 
   model.fonts = fontsToUse

package/server/routers/board-print-router.ts

@@ -24,6 +24,7 @@ boardPrintRouter.post('/print', async (context, next) => {
   context.body = await printDirect(params.printerId, params.data)
 })
 
+// for webpage scrap => zpl image print(grf format) command for released version board
 boardPrintRouter.get('/print-label/:id', async (context, next) => {
   const { id } = context.params
   let data = Object.keys(context.query).length ? context.query : null
@@ -37,3 +38,18 @@ boardPrintRouter.get('/print-label/:id', async (context, next) => {
   // TODO: 동기화
   context.body = printDirect(data.printerId, grf)
 })
+
+// for webpage scrap => zpl image print(grf format) command for draft version board
+boardPrintRouter.get('/print-label-draft/:id', async (context, next) => {
+  const { id } = context.params
+  let data = Object.keys(context.query).length ? context.query : null
+
+  let orientation = data && data.orientation
+  let mirror = data && data.mirror
+  let upsideDown = data && data.upsideDown
+  let grf = await labelcommand({ id, data, orientation, mirror, upsideDown, context, draft: true } as any)
+
+  context.type = 'text/plain'
+  // TODO: 동기화
+  context.body = printDirect(data.printerId, grf)
+})

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

@@ -295,7 +295,7 @@ standaloneBoardServiceRouter.get('/board/pdf/:id', async (context, next) => {
   context.body = result
 })
 
-// for webpage scrap => zpl image print(grf format) command
+// for webpage scrap => zpl image print(grf format) command for released version board
 standaloneBoardServiceRouter.get('/label-command/:id', async (context, next) => {
   const { id } = context.params
 
@@ -309,3 +309,18 @@ standaloneBoardServiceRouter.get('/label-command/:id', async (context, next) =>
   context.type = 'text/plain'
   context.body = await labelcommand({ id, data, orientation, mirror, upsideDown, context } as any)
 })
+
+// for webpage scrap => zpl image print(grf format) command for draft version board
+standaloneBoardServiceRouter.get('/label-command-draft/:id', async (context, next) => {
+  const { id } = context.params
+
+  const data = context.query
+  delete data.access_token
+
+  const orientation = data && data.orientation
+  const mirror = data && data.mirror
+  const upsideDown = data && data.upsideDown
+
+  context.type = 'text/plain'
+  context.body = await labelcommand({ id, data, orientation, mirror, upsideDown, context, draft: true } as any)
+})