@things-factory/weather 9.0.24 → 9.0.34

package/dist-server/services/headless-pool.js

@@ -1,89 +1,35 @@
 "use strict";
+/**
+ * Weather Service Headless Pool
+ * Using the unified headless pool system from @things-factory/shell
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBrowserPool = getBrowserPool;
-const tslib_1 = require("tslib");
-const genericPool = tslib_1.__importStar(require("generic-pool"));
-const env_1 = require("@things-factory/env");
-// puppeteer 모듈 동적 로드 (에러 처리 포함)
-let puppeteer;
-try {
-    puppeteer = require('puppeteer');
-}
-catch (err) {
-    console.error('Puppeteer 로드 실패:', err);
-}
-// 브라우저 풀 인스턴스
-let browserPool;
+const shell_1 = require("@things-factory/shell");
+// Create the weather pool instance
+const weatherPool = (0, shell_1.getOrCreateHeadlessPool)('weather', {
+    min: 1,
+    max: 5,
+    headless: 'new', // Keep 'new' for weather compatibility
+    args: [
+        ...shell_1.HEADLESS_POOL_ARGUMENT_SETS.basic,
+        ...shell_1.HEADLESS_POOL_ARGUMENT_SETS.keychain_safe,
+        ...shell_1.HEADLESS_POOL_ARGUMENT_SETS.security_enhanced
+    ],
+    acquireTimeoutMillis: 10000,
+    idleTimeoutMillis: 30000, // 30초 후 유휴 인스턴스 제거
+    testOnBorrow: true,
+    enableCleanup: true
+});
 /**
  * 헤드리스 브라우저 풀 가져오기 (싱글톤 패턴)
  */
 function getBrowserPool() {
-    if (!browserPool) {
-        browserPool = genericPool.createPool({
-            // 브라우저 인스턴스 생성
-            create() {
-                console.log('날씨 서비스용 headless 브라우저 인스턴스 생성');
-                return initializeChromium();
-            },
-            // 브라우저 인스턴스 유효성 검사
-            validate(browser) {
-                return Promise.race([
-                    new Promise(res => setTimeout(() => res(false), 1500)),
-                    browser
-                        .version()
-                        .then(_ => true)
-                        .catch(_ => false)
-                ]);
-            },
-            // 브라우저 인스턴스 파괴
-            destroy(browser) {
-                return browser.close();
-            }
-        }, {
-            // 풀 설정
-            min: 1, // 최소 인스턴스 수
-            max: 5, // 최대 인스턴스 수
-            testOnBorrow: true,
-            acquireTimeoutMillis: 10000,
-            idleTimeoutMillis: 30000 // 30초 후 유휴 인스턴스 제거
-        });
-        // 애플리케이션 종료 시 정리
-        process.on('exit', async () => {
-            if (browserPool) {
-                await browserPool.drain();
-                await browserPool.clear();
-            }
-        });
-    }
-    return browserPool;
-}
-/**
- * Chromium 초기화
- */
-async function initializeChromium() {
-    // puppeteer가 없으면 오류
-    if (!puppeteer) {
-        throw new Error('Puppeteer is not available');
-    }
-    // 크로미움 경로 (환경설정에서 가져옴)
-    const CHROMIUM_PATH = env_1.config.get('CHROMIUM_PATH');
-    // 실행 설정
-    const launchSettings = {
-        args: ['--hide-scrollbars', '--mute-audio', '--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'],
-        headless: 'new' // 'new' = 최신 헤드리스 모드
+    return {
+        acquire: () => weatherPool.acquire(),
+        release: (resource) => weatherPool.release(resource),
+        drain: () => weatherPool.cleanup(),
+        clear: () => weatherPool.reset()
     };
-    // 크로미움 경로가 설정되어 있으면 사용
-    if (CHROMIUM_PATH) {
-        launchSettings['executablePath'] = CHROMIUM_PATH;
-    }
-    try {
-        // 브라우저 실행
-        const browser = await puppeteer.launch(launchSettings);
-        return browser;
-    }
-    catch (err) {
-        console.error('크로미움 초기화 실패:', err);
-        throw err;
-    }
 }
 //# sourceMappingURL=headless-pool.js.map

package/dist-server/services/headless-pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"headless-pool.js","sourceRoot":"","sources":["../../server/services/headless-pool.ts"],"names":[],"mappings":";;AAiBA,wCA8CC;;AA/DD,kEAA2C;AAC3C,6CAA4C;AAE5C,gCAAgC;AAChC,IAAI,SAAS,CAAA;AACb,IAAI,CAAC;IACH,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA;AAClC,CAAC;AAAC,OAAO,GAAG,EAAE,CAAC;IACb,OAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAA;AACxC,CAAC;AAED,cAAc;AACd,IAAI,WAAW,CAAA;AAEf;;GAEG;AACH,SAAgB,cAAc;IAC5B,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,WAAW,GAAG,WAAW,CAAC,UAAU,CAClC;YACE,eAAe;YACf,MAAM;gBACJ,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;gBAC5C,OAAO,kBAAkB,EAAE,CAAA;YAC7B,CAAC;YAED,mBAAmB;YACnB,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;yBACJ,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;YAED,eAAe;YACf,OAAO,CAAC,OAAO;gBACb,OAAO,OAAO,CAAC,KAAK,EAAE,CAAA;YACxB,CAAC;SACF,EACD;YACE,OAAO;YACP,GAAG,EAAE,CAAC,EAAE,YAAY;YACpB,GAAG,EAAE,CAAC,EAAE,YAAY;YACpB,YAAY,EAAE,IAAI;YAClB,oBAAoB,EAAE,KAAK;YAC3B,iBAAiB,EAAE,KAAK,CAAC,mBAAmB;SAC7C,CACF,CAAA;QAED,iBAAiB;QACjB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE;YAC5B,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA;gBACzB,MAAM,WAAW,CAAC,KAAK,EAAE,CAAA;YAC3B,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,WAAW,CAAA;AACpB,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,kBAAkB;IAC/B,oBAAoB;IACpB,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;IAC/C,CAAC;IAED,uBAAuB;IACvB,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAEjD,QAAQ;IACR,MAAM,cAAc,GAAG;QACrB,IAAI,EAAE,CAAC,mBAAmB,EAAE,cAAc,EAAE,cAAc,EAAE,0BAA0B,EAAE,yBAAyB,CAAC;QAClH,QAAQ,EAAE,KAAK,CAAC,qBAAqB;KACtC,CAAA;IAED,uBAAuB;IACvB,IAAI,aAAa,EAAE,CAAC;QAClB,cAAc,CAAC,gBAAgB,CAAC,GAAG,aAAa,CAAA;IAClD,CAAC;IAED,IAAI,CAAC;QACH,UAAU;QACV,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QACtD,OAAO,OAAO,CAAA;IAChB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAA;QAClC,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC","sourcesContent":["import * as genericPool from 'generic-pool'\nimport { config } from '@things-factory/env'\n\n// puppeteer 모듈 동적 로드 (에러 처리 포함)\nlet puppeteer\ntry {\n  puppeteer = require('puppeteer')\n} catch (err) {\n  console.error('Puppeteer 로드 실패:', err)\n}\n\n// 브라우저 풀 인스턴스\nlet browserPool\n\n/**\n * 헤드리스 브라우저 풀 가져오기 (싱글톤 패턴)\n */\nexport function getBrowserPool() {\n  if (!browserPool) {\n    browserPool = genericPool.createPool(\n      {\n        // 브라우저 인스턴스 생성\n        create() {\n          console.log('날씨 서비스용 headless 브라우저 인스턴스 생성')\n          return initializeChromium()\n        },\n\n        // 브라우저 인스턴스 유효성 검사\n        validate(browser) {\n          return Promise.race([\n            new Promise(res => setTimeout(() => res(false), 1500)),\n            browser\n              .version()\n              .then(_ => true)\n              .catch(_ => false)\n          ])\n        },\n\n        // 브라우저 인스턴스 파괴\n        destroy(browser) {\n          return browser.close()\n        }\n      },\n      {\n        // 풀 설정\n        min: 1, // 최소 인스턴스 수\n        max: 5, // 최대 인스턴스 수\n        testOnBorrow: true,\n        acquireTimeoutMillis: 10000,\n        idleTimeoutMillis: 30000 // 30초 후 유휴 인스턴스 제거\n      }\n    )\n\n    // 애플리케이션 종료 시 정리\n    process.on('exit', async () => {\n      if (browserPool) {\n        await browserPool.drain()\n        await browserPool.clear()\n      }\n    })\n  }\n\n  return browserPool\n}\n\n/**\n * Chromium 초기화\n */\nasync function initializeChromium() {\n  // puppeteer가 없으면 오류\n  if (!puppeteer) {\n    throw new Error('Puppeteer is not available')\n  }\n\n  // 크로미움 경로 (환경설정에서 가져옴)\n  const CHROMIUM_PATH = config.get('CHROMIUM_PATH')\n\n  // 실행 설정\n  const launchSettings = {\n    args: ['--hide-scrollbars', '--mute-audio', '--no-sandbox', '--disable-setuid-sandbox', '--disable-dev-shm-usage'],\n    headless: 'new' // 'new' = 최신 헤드리스 모드\n  }\n\n  // 크로미움 경로가 설정되어 있으면 사용\n  if (CHROMIUM_PATH) {\n    launchSettings['executablePath'] = CHROMIUM_PATH\n  }\n\n  try {\n    // 브라우저 실행\n    const browser = await puppeteer.launch(launchSettings)\n    return browser\n  } catch (err) {\n    console.error('크로미움 초기화 실패:', err)\n    throw err\n  }\n}\n"]}
+{"version":3,"file":"headless-pool.js","sourceRoot":"","sources":["../../server/services/headless-pool.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAuBH,wCAOC;AA5BD,iDAA6G;AAE7G,mCAAmC;AACnC,MAAM,WAAW,GAAG,IAAA,+BAAuB,EAAC,SAAS,EAAE;IACrD,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,CAAC;IACN,QAAQ,EAAE,KAAK,EAAE,uCAAuC;IACxD,IAAI,EAAE;QACJ,GAAG,mCAA2B,CAAC,KAAK;QACpC,GAAG,mCAA2B,CAAC,aAAa;QAC5C,GAAG,mCAA2B,CAAC,iBAAiB;KACjD;IACD,oBAAoB,EAAE,KAAK;IAC3B,iBAAiB,EAAE,KAAK,EAAE,mBAAmB;IAC7C,YAAY,EAAE,IAAI;IAClB,aAAa,EAAE,IAAI;CACpB,CAAC,CAAA;AAEF;;GAEG;AACH,SAAgB,cAAc;IAC5B,OAAO;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE;QACpC,OAAO,EAAE,CAAC,QAAa,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC;QACzD,KAAK,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE;QAClC,KAAK,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE;KACjC,CAAA;AACH,CAAC","sourcesContent":["/**\n * Weather Service Headless Pool\n * Using the unified headless pool system from @things-factory/shell\n */\n\nimport { getOrCreateHeadlessPool, getAllPoolStats, HEADLESS_POOL_ARGUMENT_SETS } from '@things-factory/shell'\n\n// Create the weather pool instance\nconst weatherPool = getOrCreateHeadlessPool('weather', {\n  min: 1,\n  max: 5,\n  headless: 'new', // Keep 'new' for weather compatibility\n  args: [\n    ...HEADLESS_POOL_ARGUMENT_SETS.basic,\n    ...HEADLESS_POOL_ARGUMENT_SETS.keychain_safe,\n    ...HEADLESS_POOL_ARGUMENT_SETS.security_enhanced\n  ],\n  acquireTimeoutMillis: 10000,\n  idleTimeoutMillis: 30000, // 30초 후 유휴 인스턴스 제거\n  testOnBorrow: true,\n  enableCleanup: true\n})\n\n/**\n * 헤드리스 브라우저 풀 가져오기 (싱글톤 패턴)\n */\nexport function getBrowserPool() {\n  return {\n    acquire: () => weatherPool.acquire(),\n    release: (resource: any) => weatherPool.release(resource),\n    drain: () => weatherPool.cleanup(),\n    clear: () => weatherPool.reset()\n  }\n}"]}