@things-factory/board-service 7.0.0-alpha.0 → 7.0.0-alpha.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/board-service",
-  "version": "7.0.0-alpha.0",
+  "version": "7.0.0-alpha.18",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,18 +24,18 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^7.0.0-alpha.0",
+    "@things-factory/auth-base": "^7.0.0-alpha.18",
     "@things-factory/env": "^7.0.0-alpha.0",
-    "@things-factory/fav-base": "^7.0.0-alpha.0",
-    "@things-factory/font-base": "^7.0.0-alpha.0",
-    "@things-factory/integration-base": "^7.0.0-alpha.0",
+    "@things-factory/fav-base": "^7.0.0-alpha.18",
+    "@things-factory/font-base": "^7.0.0-alpha.18",
+    "@things-factory/integration-base": "^7.0.0-alpha.18",
     "@things-factory/operato-license-checker": "^4.0.4",
     "content-disposition": "^0.5.3",
     "generic-pool": "^3.8.2"
   },
   "optionalDependencies": {
     "@thiagoelg/node-printer": "0.6.2",
-    "puppeteer": "^20.7.3"
+    "puppeteer": "^22.3.0"
   },
-  "gitHead": "0eb7f1db7ca559df530b3242c48456fc565ef4c0"
+  "gitHead": "f695ce9c0e3a8f2d715d27a2e7674c9b9c6b1ee1"
 }

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/headless-pool-for-board.ts

@@ -55,7 +55,7 @@ async function initializeChromium() {
 
     var launchSetting = {
       args: ['--hide-scrollbars', '--mute-audio', '--no-sandbox', '--use-gl=egl'],
-      headless: 'new'
+      headless: 'shell'
     }
 
     if (CHROMIUM_PATH) {

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

@@ -45,8 +45,8 @@ export function getHeadlessPool() {
     )
 
     setTimeout(async () => {
-      const it = pubsub.asyncIterator('notify-font-changed')
-      for await (const data of it) {
+      const eventSource = pubsub.subscribe('notify-font-changed')
+      for await (const data of eventSource) {
         headlessPool.clear()
       }
     })
@@ -65,7 +65,7 @@ async function initializeChromium() {
 
     var launchSetting = {
       args: ['--hide-scrollbars', '--mute-audio', '--no-sandbox', '--use-gl=egl'],
-      headless: 'new'
+      headless: 'shell'
     }
 
     if (CHROMIUM_PATH) {

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)
+})

package/server/service/board/board-subscription.ts

@@ -1,12 +1,12 @@
 import { Resolver, Subscription, Root, Arg } from 'type-graphql'
-import { withFilter } from 'graphql-subscriptions'
+import { filter, pipe } from 'graphql-yoga'
 import { pubsub } from '@things-factory/shell'
 import { Board } from './board'
 
 @Resolver(Board)
 export class BoardSubscription {
   @Subscription({
-    subscribe: (_, args, context, info) => {
+    subscribe: ({ args, context, info }) => {
       const { domain, user } = context.state
       const { id } = args
       const subdomain = domain?.subdomain
@@ -19,9 +19,9 @@ export class BoardSubscription {
         throw new Error(`domain(${subdomain}) is not working for user(${user.email}).`)
       }
 
-      return withFilter(
-        () => pubsub.asyncIterator('board'),
-        (payload, variables, context, info) => {
+      return pipe(
+        pubsub.subscribe('board'),
+        filter((payload: { board: Board }) => {
           const { domainId, id: boardId } = payload.board
 
           if (domainId !== domain.id) {
@@ -33,8 +33,8 @@ export class BoardSubscription {
           }
 
           return true
-        }
-      )(_, args, context, info)
+        })
+      )
     }
   })
   board(@Root() payload: { board: Board }, @Arg('id') id: string): Board {

package/server/service/play-group/play-group-subscription.ts

@@ -1,12 +1,12 @@
 import { Resolver, Subscription, Root, Arg } from 'type-graphql'
-import { withFilter } from 'graphql-subscriptions'
+import { filter, pipe } from 'graphql-yoga'
 import { pubsub } from '@things-factory/shell'
 import { PlayGroup } from './play-group'
 
 @Resolver(PlayGroup)
 export class PlayGroupSubscription {
   @Subscription({
-    subscribe: (_, args, context, info) => {
+    subscribe: ({ args, context, info }) => {
       const { domain, user } = context.state
       const { id } = args
       const subdomain = domain?.subdomain
@@ -19,9 +19,9 @@ export class PlayGroupSubscription {
         throw new Error(`domain(${subdomain}) is not working for user(${user.email}).`)
       }
 
-      return withFilter(
-        () => pubsub.asyncIterator('play-group'),
-        (payload, variables, context, info) => {
+      return pipe(
+        pubsub.subscribe('play-group'),
+        filter((payload: { playGroup: PlayGroup }) => {
           const { id: playGroupId, domainId } = payload.playGroup
 
           if (domainId !== domain.id) {
@@ -33,8 +33,8 @@ export class PlayGroupSubscription {
           }
 
           return true
-        }
-      )(_, args, context, info)
+        })
+      )
     }
   })
   playGroup(@Root() payload: { playGroup: PlayGroup }, @Arg('id') id: string): PlayGroup {