@things-factory/board-service 7.1.22 → 7.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/board-service",
-  "version": "7.1.22",
+  "version": "7.1.24",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "",
@@ -23,18 +23,15 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^7.1.22",
+    "@things-factory/auth-base": "^7.1.24",
     "@things-factory/env": "^7.1.16",
-    "@things-factory/fav-base": "^7.1.22",
-    "@things-factory/font-base": "^7.1.22",
-    "@things-factory/integration-base": "^7.1.22",
+    "@things-factory/fav-base": "^7.1.24",
+    "@things-factory/font-base": "^7.1.24",
+    "@things-factory/integration-base": "^7.1.24",
     "@things-factory/operato-license-checker": "^4.0.4",
     "content-disposition": "^0.5.3",
-    "generic-pool": "^3.8.2"
+    "generic-pool": "^3.8.2",
+    "puppeteer": "^23.0.0"
   },
-  "optionalDependencies": {
-    "@thiagoelg/node-printer": "0.6.2",
-    "puppeteer": "22.12.1"
-  },
-  "gitHead": "b4b8efde4096ab1ec02bcf7623e32131254cbfd0"
+  "gitHead": "1838925b39cce3caa8e49a6dd2c15796af567695"
 }

package/server/controllers/index.ts

@@ -1,14 +1,8 @@
-import { printDirect, getPrinters } from './print'
 import { labelcommand as boardToZpl } from './label-command'
 import { pdf as boardToPdf } from './pdf'
 import { headlessModel } from './headless-model'
 import { fonts } from './fonts'
 
-export const Printer = {
-  printDirect,
-  getPrinters
-}
-
 export const BoardFunc = {
   boardToZpl,
   boardToPdf,

package/server/routes.ts

@@ -1,4 +1,3 @@
-import { boardPrintRouter } from './routers/board-print-router'
 import { config } from '@things-factory/env'
 import { getHeadlessPool as getHeadlessPoolForBoard } from './controllers/headless-pool-for-board'
 import { getHeadlessPool as getHeadlessPoolForLabel } from './controllers/headless-pool-for-label'
@@ -15,14 +14,12 @@ process.on('bootstrap-module-global-public-route' as any, (app, domainGlobalPubl
 
 process.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRouter) => {
   if (isPathBaseDomain) {
-    domainPrivateRouter.use('/domain/:domain', boardPrintRouter.routes(), boardPrintRouter.allowedMethods())
     domainPrivateRouter.use(
       '/domain/:domain',
       standaloneBoardServiceRouter.routes(),
       standaloneBoardServiceRouter.allowedMethods()
     )
   } else {
-    domainPrivateRouter.use('', boardPrintRouter.routes(), boardPrintRouter.allowedMethods())
     domainPrivateRouter.use('', standaloneBoardServiceRouter.routes(), standaloneBoardServiceRouter.allowedMethods())
   }
 })

package/dist-server/controllers/print.d.ts

@@ -1,21 +0,0 @@
-/**
- * shoot raw data to printer
- *
- * @param printer Printer ID
- * @param command Raw command
- */
-export declare function printDirect(printer: any, command: any): Promise<void>;
-/**
- * get all installed printers
- */
-export declare function getPrinters(): any;
-/**
- * get specific printer by name
- * @param printerName printer name
- */
-export declare function getPrinter(printerName: any): any;
-/**
- * get default printer name
- */
-export declare function getDefaultPrinterName(): any;
-export declare function getSupportedPrintFormats(): any;

package/dist-server/controllers/print.js

@@ -1,57 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.printDirect = printDirect;
-exports.getPrinters = getPrinters;
-exports.getPrinter = getPrinter;
-exports.getDefaultPrinterName = getDefaultPrinterName;
-exports.getSupportedPrintFormats = getSupportedPrintFormats;
-const env_1 = require("@things-factory/env");
-try {
-    var print = require('@thiagoelg/node-printer');
-}
-catch (e) {
-    env_1.logger.error(e);
-}
-/**
- * shoot raw data to printer
- *
- * @param printer Printer ID
- * @param command Raw command
- */
-async function printDirect(printer, command) {
-    print &&
-        (await print.printDirect({
-            data: command,
-            printer,
-            docname: 'RAW print',
-            success: function (jobId) {
-                console.log(`Job ID: ${jobId}`);
-            },
-            error: function (error) {
-                env_1.logger.error(error);
-            }
-        }));
-}
-/**
- * get all installed printers
- */
-function getPrinters() {
-    return (print === null || print === void 0 ? void 0 : print.getPrinters()) || [];
-}
-/**
- * get specific printer by name
- * @param printerName printer name
- */
-function getPrinter(printerName) {
-    return print === null || print === void 0 ? void 0 : print.getPrinter(printerName);
-}
-/**
- * get default printer name
- */
-function getDefaultPrinterName() {
-    return print === null || print === void 0 ? void 0 : print.getDefaultPrinterName();
-}
-function getSupportedPrintFormats() {
-    return print === null || print === void 0 ? void 0 : print.getSupportedPrintFormats();
-}
-//# sourceMappingURL=print.js.map

package/dist-server/controllers/print.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"print.js","sourceRoot":"","sources":["../../server/controllers/print.ts"],"names":[],"mappings":";;AAcA,kCAaC;AAKD,kCAEC;AAMD,gCAEC;AAKD,sDAEC;AAED,4DAEC;AArDD,6CAA4C;AAE5C,IAAI,CAAC;IACH,IAAI,KAAK,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;AAChD,CAAC;AAAC,OAAO,CAAC,EAAE,CAAC;IACX,YAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,WAAW,CAAC,OAAO,EAAE,OAAO;IAChD,KAAK;QACH,CAAC,MAAM,KAAK,CAAC,WAAW,CAAC;YACvB,IAAI,EAAE,OAAO;YACb,OAAO;YACP,OAAO,EAAE,WAAW;YACpB,OAAO,EAAE,UAAU,KAAK;gBACtB,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,EAAE,CAAC,CAAA;YACjC,CAAC;YACD,KAAK,EAAE,UAAU,KAAK;gBACpB,YAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACrB,CAAC;SACF,CAAC,CAAC,CAAA;AACP,CAAC;AAED;;GAEG;AACH,SAAgB,WAAW;IACzB,OAAO,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,EAAE,KAAI,EAAE,CAAA;AACnC,CAAC;AAED;;;GAGG;AACH,SAAgB,UAAU,CAAC,WAAW;IACpC,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,CAAC,WAAW,CAAC,CAAA;AACvC,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB;IACnC,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,qBAAqB,EAAE,CAAA;AACvC,CAAC;AAED,SAAgB,wBAAwB;IACtC,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,wBAAwB,EAAE,CAAA;AAC1C,CAAC","sourcesContent":["import { logger } from '@things-factory/env'\n\ntry {\n  var print = require('@thiagoelg/node-printer')\n} catch (e) {\n  logger.error(e)\n}\n\n/**\n * shoot raw data to printer\n *\n * @param printer Printer ID\n * @param command Raw command\n */\nexport async function printDirect(printer, command) {\n  print &&\n    (await print.printDirect({\n      data: command,\n      printer,\n      docname: 'RAW print',\n      success: function (jobId) {\n        console.log(`Job ID: ${jobId}`)\n      },\n      error: function (error) {\n        logger.error(error)\n      }\n    }))\n}\n\n/**\n * get all installed printers\n */\nexport function getPrinters() {\n  return print?.getPrinters() || []\n}\n\n/**\n * get specific printer by name\n * @param printerName printer name\n */\nexport function getPrinter(printerName) {\n  return print?.getPrinter(printerName)\n}\n\n/**\n * get default printer name\n */\nexport function getDefaultPrinterName() {\n  return print?.getDefaultPrinterName()\n}\n\nexport function getSupportedPrintFormats() {\n  return print?.getSupportedPrintFormats()\n}\n"]}

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

@@ -1 +0,0 @@
-export declare const boardPrintRouter: any;

package/dist-server/routers/board-print-router.js

@@ -1,48 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.boardPrintRouter = void 0;
-const tslib_1 = require("tslib");
-const koa_router_1 = tslib_1.__importDefault(require("koa-router"));
-const label_command_1 = require("../controllers/label-command");
-const print_1 = require("../controllers/print");
-exports.boardPrintRouter = new koa_router_1.default();
-/**
- * ?printerId=printer_id&data=grf_string
- */
-exports.boardPrintRouter.get('/print', async (context, next) => {
-    let data = Object.keys(context.query).length ? context.query : null;
-    context.body = await (0, print_1.printDirect)(data.printerId, data.data);
-});
-/**
- * { printerId: 'printer driver ID', data: 'grf string' }
- */
-exports.boardPrintRouter.post('/print', async (context, next) => {
-    let params = context.request.body;
-    context.type = 'text/plain';
-    context.body = await (0, print_1.printDirect)(params.printerId, params.data);
-});
-// for webpage scrap => zpl image print(grf format) command for released version board
-exports.boardPrintRouter.get('/print-label/: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 (0, label_command_1.labelcommand)({ id, data, orientation, mirror, upsideDown, context });
-    context.type = 'text/plain';
-    // TODO: 동기화
-    context.body = (0, print_1.printDirect)(data.printerId, grf);
-});
-// for webpage scrap => zpl image print(grf format) command for draft version board
-exports.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 (0, label_command_1.labelcommand)({ id, data, orientation, mirror, upsideDown, context, draft: true });
-    context.type = 'text/plain';
-    // TODO: 동기화
-    context.body = (0, print_1.printDirect)(data.printerId, grf);
-});
-//# sourceMappingURL=board-print-router.js.map

package/dist-server/routers/board-print-router.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"board-print-router.js","sourceRoot":"","sources":["../../server/routers/board-print-router.ts"],"names":[],"mappings":"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","sourcesContent":["import Router from 'koa-router'\n\nimport { labelcommand } from '../controllers/label-command'\nimport { printDirect } from '../controllers/print'\n\nexport const boardPrintRouter = new Router()\n\n/**\n * ?printerId=printer_id&data=grf_string\n */\nboardPrintRouter.get('/print', async (context, next) => {\n  let data = Object.keys(context.query).length ? context.query : null\n\n  context.body = await printDirect(data.printerId, data.data)\n})\n\n/**\n * { printerId: 'printer driver ID', data: 'grf string' }\n */\nboardPrintRouter.post('/print', async (context, next) => {\n  let params = context.request.body\n\n  context.type = 'text/plain'\n  context.body = await printDirect(params.printerId, params.data)\n})\n\n// for webpage scrap => zpl image print(grf format) command for released version board\nboardPrintRouter.get('/print-label/:id', async (context, next) => {\n  const { id } = context.params\n  let data = Object.keys(context.query).length ? context.query : null\n\n  let orientation = data && data.orientation\n  let mirror = data && data.mirror\n  let upsideDown = data && data.upsideDown\n  let grf = await labelcommand({ id, data, orientation, mirror, upsideDown, context } as any)\n\n  context.type = 'text/plain'\n  // TODO: 동기화\n  context.body = printDirect(data.printerId, grf)\n})\n\n// for webpage scrap => zpl image print(grf format) command for draft version board\nboardPrintRouter.get('/print-label-draft/:id', async (context, next) => {\n  const { id } = context.params\n  let data = Object.keys(context.query).length ? context.query : null\n\n  let orientation = data && data.orientation\n  let mirror = data && data.mirror\n  let upsideDown = data && data.upsideDown\n  let grf = await labelcommand({ id, data, orientation, mirror, upsideDown, context, draft: true } as any)\n\n  context.type = 'text/plain'\n  // TODO: 동기화\n  context.body = printDirect(data.printerId, grf)\n})\n"]}

package/server/controllers/print.ts

@@ -1,54 +0,0 @@
-import { logger } from '@things-factory/env'
-
-try {
-  var print = require('@thiagoelg/node-printer')
-} catch (e) {
-  logger.error(e)
-}
-
-/**
- * shoot raw data to printer
- *
- * @param printer Printer ID
- * @param command Raw command
- */
-export async function printDirect(printer, command) {
-  print &&
-    (await print.printDirect({
-      data: command,
-      printer,
-      docname: 'RAW print',
-      success: function (jobId) {
-        console.log(`Job ID: ${jobId}`)
-      },
-      error: function (error) {
-        logger.error(error)
-      }
-    }))
-}
-
-/**
- * get all installed printers
- */
-export function getPrinters() {
-  return print?.getPrinters() || []
-}
-
-/**
- * get specific printer by name
- * @param printerName printer name
- */
-export function getPrinter(printerName) {
-  return print?.getPrinter(printerName)
-}
-
-/**
- * get default printer name
- */
-export function getDefaultPrinterName() {
-  return print?.getDefaultPrinterName()
-}
-
-export function getSupportedPrintFormats() {
-  return print?.getSupportedPrintFormats()
-}

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

@@ -1,55 +0,0 @@
-import Router from 'koa-router'
-
-import { labelcommand } from '../controllers/label-command'
-import { printDirect } from '../controllers/print'
-
-export const boardPrintRouter = new Router()
-
-/**
- * ?printerId=printer_id&data=grf_string
- */
-boardPrintRouter.get('/print', async (context, next) => {
-  let data = Object.keys(context.query).length ? context.query : null
-
-  context.body = await printDirect(data.printerId, data.data)
-})
-
-/**
- * { printerId: 'printer driver ID', data: 'grf string' }
- */
-boardPrintRouter.post('/print', async (context, next) => {
-  let params = context.request.body
-
-  context.type = 'text/plain'
-  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
-
-  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 } as any)
-
-  context.type = 'text/plain'
-  // 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)
-})