@things-factory/board-service 4.0.0-y.0 → 4.0.5

package/dist-server/controllers/fonts.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fonts = void 0;
 const typeorm_1 = require("typeorm");
 const font_base_1 = require("@things-factory/font-base");
-const fonts = () => (0, typeorm_1.getRepository)(font_base_1.Font).find({ select: ['name'] });
+const fonts = async () => {
+    const qb = await (0, typeorm_1.getRepository)(font_base_1.Font).createQueryBuilder('FONT');
+    return (await qb.select('name').distinct(true).where({ active: true }).getRawMany()).map((f) => f.name);
+};
 exports.fonts = fonts;
 //# sourceMappingURL=fonts.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"fonts.js","sourceRoot":"","sources":["../../server/controllers/fonts.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AACvC,yDAAgD;AAEzC,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AAA5D,QAAA,KAAK,SAAuD"}
+{"version":3,"file":"fonts.js","sourceRoot":"","sources":["../../server/controllers/fonts.ts"],"names":[],"mappings":";;;AAAA,qCAA+E;AAE/E,yDAAgD;AAEzC,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;IAC9B,MAAM,EAAE,GAA6B,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;IACzF,OAAO,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CACtF,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAChC,CAAA;AACH,CAAC,CAAA;AALY,QAAA,KAAK,SAKjB"}

package/dist-server/controllers/headless-pool-for-board.js

@@ -0,0 +1,82 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getHeadlessPool = void 0;
+const genericPool = __importStar(require("generic-pool"));
+const env_1 = require("@things-factory/env");
+try {
+    var puppeteer = require('puppeteer');
+}
+catch (err) {
+    console.error(err);
+}
+var headlessPool;
+function getHeadlessPool() {
+    if (!headlessPool) {
+        headlessPool = genericPool.createPool({
+            create() {
+                console.log('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;
+}
+exports.getHeadlessPool = getHeadlessPool;
+const CHROMIUM_PATH = env_1.config.get('CHROMIUM_PATH');
+async function initializeChromium() {
+    try {
+        if (!puppeteer) {
+            return;
+        }
+        var launchSetting = {
+            args: ['--hide-scrollbars', '--mute-audio', '--no-sandbox']
+        };
+        if (CHROMIUM_PATH) {
+            launchSetting['executablePath'] = CHROMIUM_PATH;
+        }
+        const browser = await puppeteer.launch(launchSetting);
+        return browser;
+    }
+    catch (err) {
+        console.error(err);
+    }
+}
+//# sourceMappingURL=headless-pool-for-board.js.map

package/dist-server/controllers/headless-pool-for-board.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"headless-pool-for-board.js","sourceRoot":"","sources":["../../server/controllers/headless-pool-for-board.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA2C;AAE3C,6CAA4C;AAE5C,IAAI;IACF,IAAI,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;CACrC;AAAC,OAAO,GAAG,EAAE;IACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;CACnB;AAED,IAAI,YAAY,CAAA;AAEhB,SAAgB,eAAe;IAC7B,IAAI,CAAC,YAAY,EAAE;QACjB,YAAY,GAAG,WAAW,CAAC,UAAU,CACnC;YACE,MAAM;gBACJ,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAA;gBACtD,OAAO,kBAAkB,EAAE,CAAA;YAC7B,CAAC;YACD,QAAQ,CAAC,OAAO;gBACd,OAAO,OAAO,CAAC,IAAI,CAAC;oBAClB,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;oBACtD,OAAO;wBACL,YAAY;yBACX,OAAO,EAAE;yBACT,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC;yBACf,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC;iBACrB,CAAC,CAAA;YACJ,CAAC;YACD,OAAO,CAAC,OAAO;gBACb,YAAY;gBACZ,OAAO,OAAO,CAAC,KAAK,EAAE,CAAA;YACxB,CAAC;SACF,EACD;YACE,GAAG,EAAE,CAAC;YACN,GAAG,EAAE,EAAE;YACP,YAAY,EAAE,IAAI;YAClB,oBAAoB,EAAE,KAAK;SAC5B,CACF,CAAA;KACF;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAjCD,0CAiCC;AAED,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;AAEjD,KAAK,UAAU,kBAAkB;IAC/B,IAAI;QACF,IAAI,CAAC,SAAS,EAAE;YACd,OAAM;SACP;QAED,IAAI,aAAa,GAAG;YAClB,IAAI,EAAE,CAAC,mBAAmB,EAAE,cAAc,EAAE,cAAc,CAAC;SAC5D,CAAA;QAED,IAAI,aAAa,EAAE;YACjB,aAAa,CAAC,gBAAgB,CAAC,GAAG,aAAa,CAAA;SAChD;QAED,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAErD,OAAO,OAAO,CAAA;KACf;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KACnB;AACH,CAAC"}

package/dist-server/controllers/headless-pool-for-label.js

@@ -0,0 +1,146 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getHeadlessPool = void 0;
+const genericPool = __importStar(require("generic-pool"));
+const env_1 = require("@things-factory/env");
+const shell_1 = require("@things-factory/shell");
+const fonts_1 = require("./fonts");
+try {
+    var puppeteer = require('puppeteer');
+}
+catch (err) {
+    console.error(err);
+}
+var headlessPool;
+function getHeadlessPool() {
+    if (!headlessPool) {
+        headlessPool = genericPool.createPool({
+            create() {
+                console.log('headless-pool-for-label about to create');
+                return initializeScenePage();
+            },
+            validate({ browser, page }) {
+                return Promise.race([
+                    new Promise(res => setTimeout(() => res(false), 1500)),
+                    browser
+                        //@ts-ignore
+                        .version()
+                        .then(_ => true)
+                        .catch(_ => false)
+                ]);
+            },
+            destroy({ browser, page }) {
+                //@ts-ignore
+                return browser.close();
+            }
+        }, {
+            min: 2,
+            max: 10,
+            testOnBorrow: true,
+            acquireTimeoutMillis: 15000
+        });
+        setTimeout(async () => {
+            var e_1, _a;
+            const it = shell_1.pubsub.asyncIterator('notify-font-changed');
+            try {
+                for (var it_1 = __asyncValues(it), it_1_1; it_1_1 = await it_1.next(), !it_1_1.done;) {
+                    const data = it_1_1.value;
+                    headlessPool.clear();
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (it_1_1 && !it_1_1.done && (_a = it_1.return)) await _a.call(it_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        });
+    }
+    return headlessPool;
+}
+exports.getHeadlessPool = getHeadlessPool;
+const CHROMIUM_PATH = env_1.config.get('CHROMIUM_PATH');
+async function initializeChromium() {
+    try {
+        if (!puppeteer) {
+            return;
+        }
+        var launchSetting = {
+            args: ['--hide-scrollbars', '--mute-audio', '--no-sandbox']
+        };
+        if (CHROMIUM_PATH) {
+            launchSetting['executablePath'] = CHROMIUM_PATH;
+        }
+        const browser = await puppeteer.launch(launchSetting);
+        return browser;
+    }
+    catch (err) {
+        console.error(err);
+    }
+}
+async function initializeScenePage() {
+    /* get brand new browser for every request */
+    const browser = await initializeChromium();
+    if (!browser) {
+        return;
+    }
+    const protocol = 'http';
+    const host = 'localhost';
+    const path = '/internal-label-command-view';
+    const port = process.env.PORT;
+    const url = `${protocol}://${host}:${port}${path}`;
+    const page = await browser.newPage();
+    const fontsToUse = await (0, fonts_1.fonts)();
+    await page.setRequestInterception(true);
+    page.on('console', msg => {
+        console.log(`[browser ${msg._type}] ${msg._text}`);
+        for (let i = 0; i < msg.args().length; ++i)
+            console.log(`${i}: ${msg.args()[i]}`);
+    });
+    page.on('request', request => {
+        if (request.url() === url) {
+            request.continue({
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                postData: JSON.stringify({
+                    fonts: fontsToUse
+                })
+            });
+        }
+        else {
+            request.continue();
+        }
+    });
+    await page.goto(url, { timeout: 0 });
+    return { browser, page };
+}
+//# sourceMappingURL=headless-pool-for-label.js.map

package/dist-server/controllers/headless-pool-for-label.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"headless-pool-for-label.js","sourceRoot":"","sources":["../../server/controllers/headless-pool-for-label.ts"],"names":[],"mappings":"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"}

package/dist-server/controllers/label-command.js

@@ -2,54 +2,10 @@
 /*
  * Copyright © HatioLab Inc. All rights reserved.
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.labelcommand = exports.initializeLabelPage = void 0;
-const headless_chromium_1 = require("../headless-chromium");
-const fonts_1 = require("./fonts");
-const v4_1 = __importDefault(require("uuid/v4"));
+exports.labelcommand = void 0;
+const headless_pool_for_label_1 = require("./headless-pool-for-label");
 const headless_model_1 = require("./headless-model");
-var fontsInUse = [], fontsToUse = [], labelPage, browser;
-async function initializeLabelPage() {
-    browser = await (0, headless_chromium_1.initializeChromium)();
-    if (!browser) {
-        return;
-    }
-    const protocol = 'http';
-    const host = 'localhost';
-    const path = '/internal-label-command-view';
-    const port = process.env.PORT;
-    const url = `${protocol}://${host}:${port}${path}`;
-    labelPage = await browser.newPage();
-    fontsToUse = (await (0, fonts_1.fonts)()).map((f) => f.name);
-    await labelPage.setRequestInterception(true);
-    labelPage.on('console', msg => {
-        console.log(`[browser ${msg._type}] ${msg._text}`);
-        for (let i = 0; i < msg.args().length; ++i)
-            console.log(`${i}: ${msg.args()[i]}`);
-    });
-    labelPage.on('request', request => {
-        if (request.url() === url) {
-            request.continue({
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                postData: JSON.stringify({
-                    fonts: fontsToUse
-                })
-            });
-        }
-        else {
-            request.continue();
-        }
-    });
-    await labelPage.goto(url, { timeout: 0 });
-    return labelPage;
-}
-exports.initializeLabelPage = initializeLabelPage;
 /**
  * 라벨 출력
  *
@@ -61,27 +17,15 @@ exports.initializeLabelPage = initializeLabelPage;
  */
 const labelcommand = async ({ id, model, data, orientation, mirror = false, upsideDown = false, context }) => {
     const { domain } = context.state;
-    if (!browser || (browser && !browser.isConnected())) {
-        await initializeLabelPage();
+    const resource = (await (0, headless_pool_for_label_1.getHeadlessPool)().acquire());
+    if (!resource) {
+        return;
     }
+    const { page } = resource;
     var { model } = await (0, headless_model_1.headlessModel)({ domain, model, id });
-    var fontListChanged = false;
-    fontsToUse = (await (0, fonts_1.fonts)()).map((f) => {
-        if (!fontListChanged && !fontsInUse.find(inUse => inUse == f.name)) {
-            fontListChanged = true;
-        }
-        return f.name;
-    });
-    var page = labelPage;
-    if (fontListChanged) {
-        fontsInUse = fontsToUse;
-        console.log('[label-command] Refreshing page to load fonts.');
-        await page.reload();
-    }
-    var guid = (0, v4_1.default)();
-    const grf = await page.evaluate(async (guid, model, data, orientation, mirror, upsideDown) => {
+    const grf = await page.evaluate(async (model, data, orientation, mirror, upsideDown) => {
         //@ts-ignore
-        let s = createScene(guid, model);
+        let s = createScene(model);
         if (data) {
             s.data = data;
         }
@@ -96,7 +40,8 @@ const labelcommand = async ({ id, model, data, orientation, mirror = false, upsi
                 s.dispose();
             });
         });
-    }, guid, model, data, orientation, mirror, upsideDown);
+    }, model, data, orientation, mirror, upsideDown);
+    (0, headless_pool_for_label_1.getHeadlessPool)().release(resource);
     return `
 ^XA
 ^GFA,${grf}

package/dist-server/controllers/label-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"label-command.js","sourceRoot":"","sources":["../../server/controllers/label-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"label-command.js","sourceRoot":"","sources":["../../server/controllers/label-command.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,uEAA2D;AAC3D,qDAAgD;AAEhD;;;;;;;;GAQG;AACI,MAAM,YAAY,GAAG,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,KAAK,EAAE,UAAU,GAAG,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;IAClH,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAEhC,MAAM,QAAQ,GAAG,CAAC,MAAM,IAAA,yCAAe,GAAE,CAAC,OAAO,EAAE,CAAQ,CAAA;IAC3D,IAAI,CAAC,QAAQ,EAAE;QACb,OAAM;KACP;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAA;IAEzB,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,8BAAa,EAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA;IAE1D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAC7B,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE;QACrD,YAAY;QACZ,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;QAC1B,IAAI,IAAI,EAAE;YACR,CAAC,CAAC,IAAI,GAAG,IAAI,CAAA;SACd;QACD,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,aAAa;YACb,qBAAqB,CAAC,GAAG,EAAE;gBACzB,aAAa;gBACb,IAAI,GAAG,GAAG,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;gBACnE,OAAO,CAAC,GAAG,CAAC,CAAA;gBACZ,aAAa;gBACb,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;gBACpC,CAAC,CAAC,OAAO,EAAE,CAAA;YACb,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,EACD,KAAK,EACL,IAAI,EACJ,WAAW,EACX,MAAM,EACN,UAAU,CACX,CAAA;IAED,IAAA,yCAAe,GAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAEnC,OAAO;;OAEF,GAAG;;IAEN,CAAA;AACJ,CAAC,CAAA;AA7CY,QAAA,YAAY,gBA6CxB"}

package/dist-server/controllers/pdf.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pdf = void 0;
-const headless_model_1 = require("./headless-model");
 const fonts_1 = require("./fonts");
-const headless_chromium_1 = require("../headless-chromium");
+const headless_pool_for_board_1 = require("./headless-pool-for-board");
+const headless_model_1 = require("./headless-model");
 const protocol = 'http';
 const host = 'localhost';
 const path = '/internal-board-service-view';
 const pdf = async ({ id = '', model = null, data = null, width: w = 0, height: h = 0, options = {}, context = {} } = {}) => {
-    var browser = await (0, headless_chromium_1.initializeChromium)();
+    const browser = (await (0, headless_pool_for_board_1.getHeadlessPool)().acquire());
     if (!browser) {
         return;
     }
     const { domain, user } = context.state;
     var { model, base } = await (0, headless_model_1.headlessModel)({ domain, id, model });
-    model.fonts = (await (0, fonts_1.fonts)()).map((font) => font.name);
+    model.fonts = await (0, fonts_1.fonts)();
     let { width, height } = model;
     width = Number(width);
     height = Number(height);
@@ -30,54 +30,62 @@ const pdf = async ({ id = '', model = null, data = null, width: w = 0, height: h
     const port = process.env.PORT ? `:${process.env.PORT}` : '';
     const url = `${protocol}://${host}${port}${path}`;
     const page = await browser.newPage();
-    /* @remember-me width, height should be a integer */
-    await page.setViewport({ width, height });
-    await page.setRequestInterception(true);
-    page.on('console', msg => {
-        console.log(`[browser ${msg._type}] ${msg._text}`);
-        for (let i = 0; i < msg.args().length; ++i)
-            console.log(`${i}: ${msg.args()[i]}`);
-    });
-    const token = await (user === null || user === void 0 ? void 0 : user.sign()); // TODO improve performance
-    page.on('request', request => {
-        if (request.url() === url) {
-            request.continue({
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'x-things-factory-domain': domain === null || domain === void 0 ? void 0 : domain.subdomain,
-                    Authorization: 'Bearer ' + token
-                },
-                postData: JSON.stringify({
-                    model,
-                    base
-                })
-            });
-        }
-        else if (request.url().startsWith(`${protocol}://${host}${port}`)) {
-            request.continue({
-                headers: Object.assign(Object.assign({}, request.headers()), { 'x-things-factory-domain': domain === null || domain === void 0 ? void 0 : domain.subdomain, Authorization: 'Bearer ' + token })
-            });
-        }
-        else {
-            request.continue();
-        }
-    });
-    await page.goto(url);
-    await page.evaluate(async (data) => {
-        if (data) {
-            // @ts-ignore
-            s.data = data;
-        }
-        // data 주입 후 강제 지연시킴.
-        return new Promise(resolve => {
-            // @ts-ignore
-            requestAnimationFrame(() => resolve());
+    try {
+        /* @remember-me width, height should be a integer */
+        await page.setViewport({ width, height });
+        await page.setRequestInterception(true);
+        page.on('console', msg => {
+            console.log(`[browser ${msg._type}] ${msg._text}`);
+            for (let i = 0; i < msg.args().length; ++i)
+                console.log(`${i}: ${msg.args()[i]}`);
+        });
+        const token = await (user === null || user === void 0 ? void 0 : user.sign()); // TODO improve performance
+        page.on('request', request => {
+            if (request.url() === url) {
+                request.continue({
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'x-things-factory-domain': domain === null || domain === void 0 ? void 0 : domain.subdomain,
+                        Authorization: 'Bearer ' + token
+                    },
+                    postData: JSON.stringify({
+                        model,
+                        base
+                    })
+                });
+            }
+            else if (request.url().startsWith(`${protocol}://${host}${port}`)) {
+                request.continue({
+                    headers: Object.assign(Object.assign({}, request.headers()), { 'x-things-factory-domain': domain === null || domain === void 0 ? void 0 : domain.subdomain, Authorization: 'Bearer ' + token })
+                });
+            }
+            else {
+                request.continue();
+            }
         });
-    }, data);
-    const pdf = await page.pdf(Object.assign({ format: 'A4' }, options));
-    page.close();
-    return pdf;
+        await page.goto(url);
+        await page.evaluate(async (data) => {
+            if (data) {
+                // @ts-ignore
+                s.data = data;
+            }
+            // data 주입 후 강제 지연시킴.
+            return new Promise(resolve => {
+                // @ts-ignore
+                requestAnimationFrame(() => resolve());
+            });
+        }, data);
+        const pdf = await page.pdf(Object.assign({ format: 'A4' }, options));
+    }
+    catch (error) {
+        console.log(error);
+    }
+    finally {
+        page.close();
+        (0, headless_pool_for_board_1.getHeadlessPool)().release(browser);
+    }
+    return exports.pdf;
 };
 exports.pdf = pdf;
 //# sourceMappingURL=pdf.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"pdf.js","sourceRoot":"","sources":["../../server/controllers/pdf.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pdf.js","sourceRoot":"","sources":["../../server/controllers/pdf.ts"],"names":[],"mappings":"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"}

package/dist-server/controllers/screenshot.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.screenshot = void 0;
-const headless_model_1 = require("./headless-model");
 const fonts_1 = require("./fonts");
-const headless_chromium_1 = require("../headless-chromium");
+const headless_pool_for_board_1 = require("./headless-pool-for-board");
+const headless_model_1 = require("./headless-model");
 const protocol = 'http';
 const host = 'localhost';
 const path = '/internal-board-service-view';
 const screenshot = async ({ id = '', model = null, data = null, width: w = 0, height: h = 0, options = { encoding: 'base64' }, isThumbnail = false, context = {} } = {}) => {
-    var browser = await (0, headless_chromium_1.initializeChromium)();
+    const browser = (await (0, headless_pool_for_board_1.getHeadlessPool)().acquire());
     var screenshot = null;
     if (!browser) {
         return;
     }
     const { domain, user } = context.state;
     var { model, base } = await (0, headless_model_1.headlessModel)({ domain, id, model });
-    model.fonts = (await (0, fonts_1.fonts)()).map((font) => font.name);
+    model.fonts = await (0, fonts_1.fonts)();
     var { width, height } = model;
     if (isThumbnail) {
         var widthRatio = 400 / width, heightRatio = 300 / height;
@@ -32,7 +32,7 @@ const screenshot = async ({ id = '', model = null, data = null, width: w = 0, he
         /* @remember-me width, height should be a integer */
         await page.setViewport({ width, height });
         await page.setRequestInterception(true);
-        await page.setDefaultTimeout(3000);
+        await page.setDefaultTimeout(5000);
         page.on('console', msg => {
             console.log(`[browser ${msg._type}] ${msg._text}`);
             for (let i = 0; i < msg.args().length; ++i)
@@ -82,6 +82,7 @@ const screenshot = async ({ id = '', model = null, data = null, width: w = 0, he
     }
     finally {
         page.close();
+        (0, headless_pool_for_board_1.getHeadlessPool)().release(browser);
     }
     return screenshot;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"screenshot.js","sourceRoot":"","sources":["../../server/controllers/screenshot.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"screenshot.js","sourceRoot":"","sources":["../../server/controllers/screenshot.ts"],"names":[],"mappings":"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"}

package/dist-server/routers/standalone-board-service-router.js

@@ -4,23 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.standaloneBoardServiceRouter = void 0;
+const board_1 = require("../service/board/board");
 const koa_router_1 = __importDefault(require("koa-router"));
-const typeorm_1 = require("typeorm");
 const content_disposition_1 = __importDefault(require("content-disposition"));
-const auth_base_1 = require("@things-factory/auth-base");
-const screenshot_1 = require("../controllers/screenshot");
-const pdf_1 = require("../controllers/pdf");
+const fonts_1 = require("../controllers/fonts");
+const typeorm_1 = require("typeorm");
 const headless_model_1 = require("../controllers/headless-model");
 const label_command_1 = require("../controllers/label-command");
-const fonts_1 = require("../controllers/fonts");
-const board_1 = require("../service/board/board");
+const pdf_1 = require("../controllers/pdf");
+const screenshot_1 = require("../controllers/screenshot");
+const auth_base_1 = require("@things-factory/auth-base");
 exports.standaloneBoardServiceRouter = new koa_router_1.default();
 // for board headless
 exports.standaloneBoardServiceRouter.get('/headless/:id', async (context, next) => {
     const { domain, user } = context.state;
     const { id } = context.params;
     const { model, base } = await (0, headless_model_1.headlessModel)({ domain, id });
-    model.fonts = (await (0, fonts_1.fonts)()).map((font) => font.name);
+    model.fonts = await (0, fonts_1.fonts)();
     (0, auth_base_1.setAccessTokenCookie)(context, await user.sign({ domain }));
     await context.render('internal-board-service-view', { model, base });
 });
@@ -48,7 +48,7 @@ exports.standaloneBoardServiceRouter.get('/screenshot/:id', async (context, next
     const { model, board } = await (0, headless_model_1.headlessModel)({ domain, id });
     const data = Object.keys(context.query).length ? context.query : null;
     context.type = 'image/png';
-    context.set('Content-Disposition', `filename="${board.name}.png"`);
+    context.set('Content-Disposition', (0, content_disposition_1.default)(`${board.name}.png`));
     context.body = await (0, screenshot_1.screenshot)({ id, model, data, options: { encoding: 'binary', type: 'png' }, context });
 });
 // for webpage scrap
@@ -67,7 +67,7 @@ exports.standaloneBoardServiceRouter.get('/board/pdf/:id', async (context, next)
         context
     });
     context.type = 'application/pdf';
-    context.set('Content-Disposition', `filename="${board.name}.pdf"`);
+    context.set('Content-Disposition', (0, content_disposition_1.default)(`${board.name}.pdf`));
     context.body = result;
 });
 // for webpage scrap => zpl image print(grf format) command