@things-factory/integration-base 9.0.33 → 9.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "9.0.33",
+  "version": "9.0.35",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -32,13 +32,13 @@
   "dependencies": {
     "@apollo/client": "^3.6.9",
     "@operato/moment-timezone-es": "^9.0.0",
-    "@things-factory/api": "^9.0.25",
-    "@things-factory/auth-base": "^9.0.25",
-    "@things-factory/cache-service": "^9.0.25",
+    "@things-factory/api": "^9.0.34",
+    "@things-factory/auth-base": "^9.0.34",
+    "@things-factory/cache-service": "^9.0.34",
     "@things-factory/env": "^9.0.20",
-    "@things-factory/oauth2-client": "^9.0.25",
-    "@things-factory/scheduler-client": "^9.0.25",
-    "@things-factory/shell": "^9.0.25",
+    "@things-factory/oauth2-client": "^9.0.34",
+    "@things-factory/scheduler-client": "^9.0.34",
+    "@things-factory/shell": "^9.0.34",
     "@things-factory/utils": "^9.0.20",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
@@ -46,9 +46,8 @@
     "ieee754": "^1.2.1",
     "node-fetch": "^2.6.0",
     "promise-socket": "^7.0.0",
-    "puppeteer": "^24.5.0",
     "readline": "^1.3.0",
     "ses": "^1.5.0"
   },
-  "gitHead": "42f59ce867281a8f2604647646582c6593e4089c"
+  "gitHead": "7c9c52c3f8fe6e83694893b3a4d7f31ded8ec58e"
 }

package/dist-server/engine/task/utils/headless-pool-for-scenario.d.ts

@@ -1 +0,0 @@
-export declare function getHeadlessPool(): any;

package/dist-server/engine/task/utils/headless-pool-for-scenario.js

@@ -1,64 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHeadlessPool = getHeadlessPool;
-const tslib_1 = require("tslib");
-const genericPool = tslib_1.__importStar(require("generic-pool"));
-const env_1 = require("@things-factory/env");
-try {
-    var puppeteer = require('puppeteer');
-}
-catch (err) {
-    env_1.logger.error(err);
-}
-var headlessPool;
-function getHeadlessPool() {
-    if (!headlessPool) {
-        headlessPool = genericPool.createPool({
-            create() {
-                console.log('headless instance in headless-pool-for-scensrio 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;
-}
-const CHROMIUM_PATH = env_1.config.get('CHROMIUM_PATH');
-async function initializeChromium() {
-    try {
-        if (!puppeteer) {
-            return;
-        }
-        var launchSetting = {
-            args: ['--mute-audio', '--no-sandbox'],
-            headless: 'shell'
-        };
-        if (CHROMIUM_PATH) {
-            launchSetting['executablePath'] = CHROMIUM_PATH;
-        }
-        const browser = await puppeteer.launch(launchSetting);
-        return browser;
-    }
-    catch (err) {
-        env_1.logger.error(err);
-    }
-}
-//# sourceMappingURL=headless-pool-for-scenario.js.map

package/dist-server/engine/task/utils/headless-pool-for-scenario.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"headless-pool-for-scenario.js","sourceRoot":"","sources":["../../../../server/engine/task/utils/headless-pool-for-scenario.ts"],"names":[],"mappings":";;AAYA,0CAiCC;;AA7CD,kEAA2C;AAE3C,6CAAoD;AAEpD,IAAI,CAAC;IACH,IAAI,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AACtC,CAAC;AAAC,OAAO,GAAG,EAAE,CAAC;IACb,YAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;AACnB,CAAC;AAED,IAAI,YAAY,CAAA;AAEhB,SAAgB,eAAe;IAC7B,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,YAAY,GAAG,WAAW,CAAC,UAAU,CACnC;YACE,MAAM;gBACJ,OAAO,CAAC,GAAG,CAAC,iEAAiE,CAAC,CAAA;gBAC9E,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;IACH,CAAC;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAED,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;AAEjD,KAAK,UAAU,kBAAkB;IAC/B,IAAI,CAAC;QACH,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAM;QACR,CAAC;QAED,IAAI,aAAa,GAAG;YAClB,IAAI,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC;YACtC,QAAQ,EAAE,OAAO;SAClB,CAAA;QAED,IAAI,aAAa,EAAE,CAAC;YAClB,aAAa,CAAC,gBAAgB,CAAC,GAAG,aAAa,CAAA;QACjD,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAErD,OAAO,OAAO,CAAA;IAChB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,YAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACnB,CAAC;AACH,CAAC","sourcesContent":["import * as genericPool from 'generic-pool'\n\nimport { config, logger } from '@things-factory/env'\n\ntry {\n  var puppeteer = require('puppeteer')\n} catch (err) {\n  logger.error(err)\n}\n\nvar headlessPool\n\nexport function getHeadlessPool() {\n  if (!headlessPool) {\n    headlessPool = genericPool.createPool(\n      {\n        create() {\n          console.log('headless instance in headless-pool-for-scensrio about to create')\n          return initializeChromium()\n        },\n        validate(browser) {\n          return Promise.race([\n            new Promise(res => setTimeout(() => res(false), 1500)),\n            browser\n              //@ts-ignore\n              .version()\n              .then(_ => true)\n              .catch(_ => false)\n          ])\n        },\n        destroy(browser) {\n          //@ts-ignore\n          return browser.close()\n        }\n      },\n      {\n        min: 2,\n        max: 10,\n        testOnBorrow: true,\n        acquireTimeoutMillis: 15000\n      }\n    )\n  }\n\n  return headlessPool\n}\n\nconst CHROMIUM_PATH = config.get('CHROMIUM_PATH')\n\nasync function initializeChromium() {\n  try {\n    if (!puppeteer) {\n      return\n    }\n\n    var launchSetting = {\n      args: ['--mute-audio', '--no-sandbox'],\n      headless: 'shell'\n    }\n\n    if (CHROMIUM_PATH) {\n      launchSetting['executablePath'] = CHROMIUM_PATH\n    }\n\n    const browser = await puppeteer.launch(launchSetting)\n\n    return browser\n  } catch (err) {\n    logger.error(err)\n  }\n}\n"]}