@things-factory/integration-base 9.0.33 → 9.0.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/engine/connector/headless-connector.d.ts +1 -0
- package/dist-server/engine/connector/headless-connector.js +117 -61
- package/dist-server/engine/connector/headless-connector.js.map +1 -1
- package/dist-server/engine/connector/mssql-connector.js +91 -11
- package/dist-server/engine/connector/mssql-connector.js.map +1 -1
- package/dist-server/engine/resource-pool/headless-pool.d.ts +29 -1
- package/dist-server/engine/resource-pool/headless-pool.js +70 -53
- package/dist-server/engine/resource-pool/headless-pool.js.map +1 -1
- package/dist-server/engine/task/headless-delete.js +9 -61
- package/dist-server/engine/task/headless-delete.js.map +1 -1
- package/dist-server/engine/task/headless-get.js +9 -55
- package/dist-server/engine/task/headless-get.js.map +1 -1
- package/dist-server/engine/task/headless-patch.js +11 -74
- package/dist-server/engine/task/headless-patch.js.map +1 -1
- package/dist-server/engine/task/headless-post.js +11 -74
- package/dist-server/engine/task/headless-post.js.map +1 -1
- package/dist-server/engine/task/headless-put.js +11 -74
- package/dist-server/engine/task/headless-put.js.map +1 -1
- package/dist-server/engine/task/mssql-procedure.js +1 -1
- package/dist-server/engine/task/mssql-procedure.js.map +1 -1
- package/dist-server/engine/task/utils/headless-request-with-recovery.d.ts +18 -0
- package/dist-server/engine/task/utils/headless-request-with-recovery.js +221 -0
- package/dist-server/engine/task/utils/headless-request-with-recovery.js.map +1 -0
- package/dist-server/restful/unstable/headless-pool-status.d.ts +1 -0
- package/dist-server/restful/unstable/headless-pool-status.js +78 -0
- package/dist-server/restful/unstable/headless-pool-status.js.map +1 -0
- package/dist-server/restful/unstable/index.d.ts +1 -0
- package/dist-server/restful/unstable/index.js +1 -0
- package/dist-server/restful/unstable/index.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +8 -9
- package/dist-server/engine/task/utils/headless-pool-for-scenario.d.ts +0 -1
- package/dist-server/engine/task/utils/headless-pool-for-scenario.js +0 -64
- package/dist-server/engine/task/utils/headless-pool-for-scenario.js.map +0 -1
@@ -1,62 +1,79 @@
|
|
1
1
|
"use strict";
|
2
|
+
/**
|
3
|
+
* Integration Base Headless Pool
|
4
|
+
* Using the unified headless pool system from @things-factory/shell
|
5
|
+
*/
|
2
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
7
|
exports.getHeadlessPool = getHeadlessPool;
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
8
|
+
exports.default = getHeadlessPool;
|
9
|
+
exports.getPoolStats = getPoolStats;
|
10
|
+
exports.forceCleanupPool = forceCleanupPool;
|
11
|
+
const shell_1 = require("@things-factory/shell");
|
12
|
+
// Create or get the integration pool instance
|
13
|
+
const integrationPool = (0, shell_1.getOrCreateHeadlessPool)('integration', {
|
14
|
+
min: 2,
|
15
|
+
max: 20,
|
16
|
+
args: [...shell_1.HEADLESS_POOL_ARGUMENT_SETS.basic, ...shell_1.HEADLESS_POOL_ARGUMENT_SETS.keychain_safe],
|
17
|
+
acquireTimeoutMillis: 15000,
|
18
|
+
testOnBorrow: true,
|
19
|
+
enableStats: true,
|
20
|
+
enableRecovery: true,
|
21
|
+
enableCleanup: true
|
22
|
+
});
|
23
|
+
/**
|
24
|
+
* Get the integration headless pool
|
25
|
+
* @returns Pool instance with acquire/release methods
|
26
|
+
*/
|
14
27
|
function getHeadlessPool() {
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
28
|
+
return {
|
29
|
+
acquire: () => integrationPool.acquire(),
|
30
|
+
release: (resource) => integrationPool.release(resource),
|
31
|
+
size: 0, // These will be dynamically calculated if needed
|
32
|
+
available: 0,
|
33
|
+
borrowed: 0,
|
34
|
+
pending: 0,
|
35
|
+
max: 20,
|
36
|
+
min: 2
|
37
|
+
};
|
19
38
|
}
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
async function initializeChromium() {
|
44
|
-
try {
|
45
|
-
if (!puppeteer) {
|
46
|
-
return;
|
47
|
-
}
|
48
|
-
const launchSetting = {
|
49
|
-
args: ['--hide-scrollbars', '--mute-audio', '--no-sandbox', '--use-gl=egl'],
|
50
|
-
headless: 'shell'
|
39
|
+
/**
|
40
|
+
* Get pool statistics
|
41
|
+
* @returns Detailed pool statistics
|
42
|
+
*/
|
43
|
+
function getPoolStats() {
|
44
|
+
const allStats = (0, shell_1.getAllPoolStats)();
|
45
|
+
const integrationStats = allStats.integration;
|
46
|
+
if (!integrationStats) {
|
47
|
+
return {
|
48
|
+
size: 0,
|
49
|
+
available: 0,
|
50
|
+
borrowed: 0,
|
51
|
+
pending: 0,
|
52
|
+
max: 20,
|
53
|
+
min: 2,
|
54
|
+
totalCreated: 0,
|
55
|
+
totalDestroyed: 0,
|
56
|
+
totalAcquired: 0,
|
57
|
+
totalReleased: 0,
|
58
|
+
currentlyAcquired: 0,
|
59
|
+
averageAcquisitionTime: 0,
|
60
|
+
utilizationRate: '0',
|
61
|
+
lastActivity: null
|
51
62
|
};
|
52
|
-
if (CHROMIUM_PATH) {
|
53
|
-
launchSetting['executablePath'] = CHROMIUM_PATH;
|
54
|
-
}
|
55
|
-
const browser = await puppeteer.launch(launchSetting);
|
56
|
-
return browser;
|
57
|
-
}
|
58
|
-
catch (err) {
|
59
|
-
env_1.logger.error(err);
|
60
63
|
}
|
64
|
+
// Convert to format expected by existing code
|
65
|
+
return {
|
66
|
+
...integrationStats.poolStatus,
|
67
|
+
...integrationStats.statistics,
|
68
|
+
averageAcquisitionTime: parseInt(integrationStats.statistics.averageAcquisitionTime.replace('ms', '')) || 0,
|
69
|
+
utilizationRate: integrationStats.poolStatus.utilizationRate.replace('%', '')
|
70
|
+
};
|
71
|
+
}
|
72
|
+
/**
|
73
|
+
* Force cleanup pool - delegates to unified system
|
74
|
+
* @returns Promise<void>
|
75
|
+
*/
|
76
|
+
function forceCleanupPool() {
|
77
|
+
return integrationPool.reset();
|
61
78
|
}
|
62
79
|
//# sourceMappingURL=headless-pool.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"headless-pool.js","sourceRoot":"","sources":["../../../server/engine/resource-pool/headless-pool.ts"],"names":[],"mappings":";;
|
1
|
+
{"version":3,"file":"headless-pool.js","sourceRoot":"","sources":["../../../server/engine/resource-pool/headless-pool.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAoBH,0CAWC;AA+C2B,kCAAO;AAzCnC,oCA8BC;AAMD,4CAEC;AAzED,iDAA6G;AAE7G,8CAA8C;AAC9C,MAAM,eAAe,GAAG,IAAA,+BAAuB,EAAC,aAAa,EAAE;IAC7D,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,EAAE;IACP,IAAI,EAAE,CAAC,GAAG,mCAA2B,CAAC,KAAK,EAAE,GAAG,mCAA2B,CAAC,aAAa,CAAC;IAC1F,oBAAoB,EAAE,KAAK;IAC3B,YAAY,EAAE,IAAI;IAClB,WAAW,EAAE,IAAI;IACjB,cAAc,EAAE,IAAI;IACpB,aAAa,EAAE,IAAI;CACpB,CAAC,CAAA;AAEF;;;GAGG;AACH,SAAgB,eAAe;IAC7B,OAAO;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE;QACxC,OAAO,EAAE,CAAC,QAAa,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC7D,IAAI,EAAE,CAAC,EAAE,iDAAiD;QAC1D,SAAS,EAAE,CAAC;QACZ,QAAQ,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;QACV,GAAG,EAAE,EAAE;QACP,GAAG,EAAE,CAAC;KACP,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,YAAY;IAC1B,MAAM,QAAQ,GAAG,IAAA,uBAAe,GAAE,CAAA;IAClC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,WAAW,CAAA;IAE7C,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,OAAO;YACL,IAAI,EAAE,CAAC;YACP,SAAS,EAAE,CAAC;YACZ,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,CAAC;YACV,GAAG,EAAE,EAAE;YACP,GAAG,EAAE,CAAC;YACN,YAAY,EAAE,CAAC;YACf,cAAc,EAAE,CAAC;YACjB,aAAa,EAAE,CAAC;YAChB,aAAa,EAAE,CAAC;YAChB,iBAAiB,EAAE,CAAC;YACpB,sBAAsB,EAAE,CAAC;YACzB,eAAe,EAAE,GAAG;YACpB,YAAY,EAAE,IAAI;SACnB,CAAA;IACH,CAAC;IAED,8CAA8C;IAC9C,OAAO;QACL,GAAG,gBAAgB,CAAC,UAAU;QAC9B,GAAG,gBAAgB,CAAC,UAAU;QAC9B,sBAAsB,EAAE,QAAQ,CAAC,gBAAgB,CAAC,UAAU,CAAC,sBAAsB,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC;QAC3G,eAAe,EAAE,gBAAgB,CAAC,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;KAC9E,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,gBAAgB;IAC9B,OAAO,eAAe,CAAC,KAAK,EAAE,CAAA;AAChC,CAAC","sourcesContent":["/**\n * Integration Base 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 or get the integration pool instance\nconst integrationPool = getOrCreateHeadlessPool('integration', {\n min: 2,\n max: 20,\n args: [...HEADLESS_POOL_ARGUMENT_SETS.basic, ...HEADLESS_POOL_ARGUMENT_SETS.keychain_safe],\n acquireTimeoutMillis: 15000,\n testOnBorrow: true,\n enableStats: true,\n enableRecovery: true,\n enableCleanup: true\n})\n\n/**\n * Get the integration headless pool\n * @returns Pool instance with acquire/release methods\n */\nexport function getHeadlessPool() {\n return {\n acquire: () => integrationPool.acquire(),\n release: (resource: any) => integrationPool.release(resource),\n size: 0, // These will be dynamically calculated if needed\n available: 0,\n borrowed: 0,\n pending: 0,\n max: 20,\n min: 2\n }\n}\n\n/**\n * Get pool statistics\n * @returns Detailed pool statistics\n */\nexport function getPoolStats() {\n const allStats = getAllPoolStats()\n const integrationStats = allStats.integration\n\n if (!integrationStats) {\n return {\n size: 0,\n available: 0,\n borrowed: 0,\n pending: 0,\n max: 20,\n min: 2,\n totalCreated: 0,\n totalDestroyed: 0,\n totalAcquired: 0,\n totalReleased: 0,\n currentlyAcquired: 0,\n averageAcquisitionTime: 0,\n utilizationRate: '0',\n lastActivity: null\n }\n }\n\n // Convert to format expected by existing code\n return {\n ...integrationStats.poolStatus,\n ...integrationStats.statistics,\n averageAcquisitionTime: parseInt(integrationStats.statistics.averageAcquisitionTime.replace('ms', '')) || 0,\n utilizationRate: integrationStats.poolStatus.utilizationRate.replace('%', '')\n }\n}\n\n/**\n * Force cleanup pool - delegates to unified system\n * @returns Promise<void>\n */\nexport function forceCleanupPool(): Promise<void> {\n return integrationPool.reset()\n}\n\n// Legacy compatibility - re-export the main function\nexport { getHeadlessPool as default }\n"]}
|
@@ -1,78 +1,26 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const tslib_1 = require("tslib");
|
4
|
-
const https_1 = tslib_1.__importDefault(require("https"));
|
5
|
-
const url_1 = require("url");
|
6
3
|
const task_registry_1 = require("../task-registry");
|
7
|
-
const
|
4
|
+
const headless_request_with_recovery_1 = require("./utils/headless-request-with-recovery");
|
8
5
|
async function HeadlessDelete(step, { logger, data, domain }) {
|
9
6
|
const { connection: connectionName, params: stepOptions } = step;
|
10
7
|
const { headers: requestHeaders, path, queryParams } = stepOptions || {};
|
11
|
-
const connection = await connection_manager_1.ConnectionManager.getConnectionInstanceByName(domain, connectionName);
|
12
|
-
if (!connection) {
|
13
|
-
throw new Error(`Connection '${connectionName}' is not established.`);
|
14
|
-
}
|
15
|
-
const { endpoint, params: connectionParams, acquireSessionPage, releasePage } = connection;
|
16
|
-
const headers = {
|
17
|
-
...requestHeaders
|
18
|
-
};
|
19
|
-
const options = {
|
20
|
-
method: 'DELETE',
|
21
|
-
headers
|
22
|
-
};
|
23
|
-
const { rejectUnauthorized } = connectionParams;
|
24
|
-
if (!rejectUnauthorized) {
|
25
|
-
const httpsAgent = new https_1.default.Agent({
|
26
|
-
rejectUnauthorized
|
27
|
-
});
|
28
|
-
options.agent = httpsAgent;
|
29
|
-
}
|
30
|
-
const page = await acquireSessionPage();
|
31
8
|
try {
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
// URL 구성 - queryParams가 있으면 추가
|
40
|
-
let requestUrl = new url_1.URL(path, endpoint);
|
41
|
-
if (queryParams && typeof queryParams === 'object') {
|
42
|
-
Object.keys(queryParams).forEach(key => {
|
43
|
-
if (queryParams[key] !== null && queryParams[key] !== undefined) {
|
44
|
-
requestUrl.searchParams.append(key, String(queryParams[key]));
|
45
|
-
}
|
46
|
-
});
|
47
|
-
}
|
48
|
-
const response = await page.evaluate(async (urlString, options) => {
|
49
|
-
const response = await fetch(urlString, options);
|
50
|
-
if (!response.ok) {
|
51
|
-
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
|
52
|
-
}
|
53
|
-
const contentType = response.headers.get('content-type') || '';
|
54
|
-
if (contentType.includes('application/json')) {
|
55
|
-
return await response.json();
|
56
|
-
}
|
57
|
-
else if (contentType.includes('text/')) {
|
58
|
-
return await response.text();
|
59
|
-
}
|
60
|
-
else {
|
61
|
-
// 응답이 없는 경우 (204 No Content 등)
|
62
|
-
return null;
|
63
|
-
}
|
64
|
-
}, requestUrl.toString(), options);
|
9
|
+
const result = await (0, headless_request_with_recovery_1.executeHeadlessRequestWithRecovery)(connectionName, {
|
10
|
+
method: 'DELETE',
|
11
|
+
path,
|
12
|
+
headers: requestHeaders,
|
13
|
+
queryParams,
|
14
|
+
maxRetries: 2
|
15
|
+
}, { logger, data, domain });
|
65
16
|
return {
|
66
|
-
data:
|
17
|
+
data: result.data
|
67
18
|
};
|
68
19
|
}
|
69
20
|
catch (error) {
|
70
21
|
logger.error('Error in HeadlessDelete:', error);
|
71
22
|
throw error;
|
72
23
|
}
|
73
|
-
finally {
|
74
|
-
await releasePage(page);
|
75
|
-
}
|
76
24
|
}
|
77
25
|
HeadlessDelete.parameterSpec = [
|
78
26
|
{
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"headless-delete.js","sourceRoot":"","sources":["../../../server/engine/task/headless-delete.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"headless-delete.js","sourceRoot":"","sources":["../../../server/engine/task/headless-delete.ts"],"names":[],"mappings":";;AAAA,oDAA+C;AAC/C,2FAA2F;AAE3F,KAAK,UAAU,cAAc,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE;IAC1D,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAA;IAChE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,IAAI,EAAE,CAAA;IAExE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAA,mEAAkC,EACrD,cAAc,EACd;YACE,MAAM,EAAE,QAAQ;YAChB,IAAI;YACJ,OAAO,EAAE,cAAc;YACvB,WAAW;YACX,UAAU,EAAE,CAAC;SACd,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CACzB,CAAA;QAED,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;QAC/C,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC;AAED,cAAc,CAAC,aAAa,GAAG;IAC7B;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,MAAM;KACd;IACD;QACE,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;KACjB;IACD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,kBAAkB;KAC1B;CACF,CAAA;AAED,4BAAY,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAA","sourcesContent":["import { TaskRegistry } from '../task-registry'\nimport { executeHeadlessRequestWithRecovery } from './utils/headless-request-with-recovery'\n\nasync function HeadlessDelete(step, { logger, data, domain }) {\n const { connection: connectionName, params: stepOptions } = step\n const { headers: requestHeaders, path, queryParams } = stepOptions || {}\n\n try {\n const result = await executeHeadlessRequestWithRecovery(\n connectionName,\n {\n method: 'DELETE',\n path,\n headers: requestHeaders,\n queryParams,\n maxRetries: 2\n },\n { logger, data, domain }\n )\n\n return {\n data: result.data\n }\n } catch (error) {\n logger.error('Error in HeadlessDelete:', error)\n throw error\n }\n}\n\nHeadlessDelete.parameterSpec = [\n {\n type: 'string',\n name: 'path',\n label: 'path'\n },\n {\n type: 'http-headers',\n name: 'headers',\n label: 'headers'\n },\n {\n type: 'options',\n name: 'queryParams',\n label: 'query-parameters'\n }\n]\n\nTaskRegistry.registerTaskHandler('headless-delete', HeadlessDelete)"]}
|
@@ -1,72 +1,26 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const url_1 = require("url");
|
4
3
|
const task_registry_1 = require("../task-registry");
|
5
|
-
const
|
4
|
+
const headless_request_with_recovery_1 = require("./utils/headless-request-with-recovery");
|
6
5
|
async function HeadlessGet(step, { logger, data, domain }) {
|
7
6
|
const { connection: connectionName, params: stepOptions } = step;
|
8
7
|
const { headers: requestHeaders, path, queryParams } = stepOptions || {};
|
9
|
-
const connection = await connection_manager_1.ConnectionManager.getConnectionInstanceByName(domain, connectionName);
|
10
|
-
if (!connection) {
|
11
|
-
throw new Error(`Connection '${connectionName}' is not established.`);
|
12
|
-
}
|
13
|
-
const { endpoint, params: connectionParams, acquireSessionPage, releasePage } = connection;
|
14
|
-
const headers = {
|
15
|
-
...requestHeaders
|
16
|
-
};
|
17
|
-
const page = await acquireSessionPage();
|
18
8
|
try {
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
let requestUrl = new url_1.URL(path, endpoint);
|
27
|
-
if (queryParams && typeof queryParams === 'object') {
|
28
|
-
Object.keys(queryParams).forEach(key => {
|
29
|
-
if (queryParams[key] !== null && queryParams[key] !== undefined) {
|
30
|
-
requestUrl.searchParams.append(key, String(queryParams[key]));
|
31
|
-
}
|
32
|
-
});
|
33
|
-
}
|
34
|
-
// headless-scrap과 동일한 방식으로 페이지 이동하여 세션 유지
|
35
|
-
await page.goto(requestUrl, { waitUntil: 'networkidle2' });
|
36
|
-
// 페이지 내에서 GET 요청 실행 (세션 유지)
|
37
|
-
const response = await page.evaluate(async (urlString, headers) => {
|
38
|
-
const response = await fetch(urlString, {
|
39
|
-
method: 'GET',
|
40
|
-
headers,
|
41
|
-
credentials: 'include' // 세션 쿠키/인증 정보 포함
|
42
|
-
});
|
43
|
-
if (!response.ok) {
|
44
|
-
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
|
45
|
-
}
|
46
|
-
const contentType = response.headers.get('content-type') || '';
|
47
|
-
if (contentType.includes('application/json')) {
|
48
|
-
return await response.json();
|
49
|
-
}
|
50
|
-
else if (contentType.includes('text/')) {
|
51
|
-
return await response.text();
|
52
|
-
}
|
53
|
-
else {
|
54
|
-
// Binary data나 기타 타입의 경우
|
55
|
-
const arrayBuffer = await response.arrayBuffer();
|
56
|
-
return Array.from(new Uint8Array(arrayBuffer));
|
57
|
-
}
|
58
|
-
}, requestUrl.toString(), headers);
|
9
|
+
const result = await (0, headless_request_with_recovery_1.executeHeadlessRequestWithRecovery)(connectionName, {
|
10
|
+
method: 'GET',
|
11
|
+
path,
|
12
|
+
headers: requestHeaders,
|
13
|
+
queryParams,
|
14
|
+
maxRetries: 2
|
15
|
+
}, { logger, data, domain });
|
59
16
|
return {
|
60
|
-
data:
|
17
|
+
data: result.data
|
61
18
|
};
|
62
19
|
}
|
63
20
|
catch (error) {
|
64
21
|
logger.error('Error in HeadlessGet:', error);
|
65
22
|
throw error;
|
66
23
|
}
|
67
|
-
finally {
|
68
|
-
await releasePage(page);
|
69
|
-
}
|
70
24
|
}
|
71
25
|
HeadlessGet.parameterSpec = [
|
72
26
|
{
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"headless-get.js","sourceRoot":"","sources":["../../../server/engine/task/headless-get.ts"],"names":[],"mappings":";;AAAA,
|
1
|
+
{"version":3,"file":"headless-get.js","sourceRoot":"","sources":["../../../server/engine/task/headless-get.ts"],"names":[],"mappings":";;AAAA,oDAA+C;AAC/C,2FAA2F;AAE3F,KAAK,UAAU,WAAW,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE;IACvD,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAA;IAChE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,IAAI,EAAE,CAAA;IAExE,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAA,mEAAkC,EACrD,cAAc,EACd;YACE,MAAM,EAAE,KAAK;YACb,IAAI;YACJ,OAAO,EAAE,cAAc;YACvB,WAAW;YACX,UAAU,EAAE,CAAC;SACd,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CACzB,CAAA;QAED,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAA;QAC5C,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC;AAED,WAAW,CAAC,aAAa,GAAG;IAC1B;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,MAAM;KACd;IACD;QACE,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;KACjB;IACD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,kBAAkB;KAC1B;CACF,CAAA;AAED,4BAAY,CAAC,mBAAmB,CAAC,cAAc,EAAE,WAAW,CAAC,CAAA","sourcesContent":["import { TaskRegistry } from '../task-registry'\nimport { executeHeadlessRequestWithRecovery } from './utils/headless-request-with-recovery'\n\nasync function HeadlessGet(step, { logger, data, domain }) {\n const { connection: connectionName, params: stepOptions } = step\n const { headers: requestHeaders, path, queryParams } = stepOptions || {}\n\n try {\n const result = await executeHeadlessRequestWithRecovery(\n connectionName,\n {\n method: 'GET',\n path,\n headers: requestHeaders,\n queryParams,\n maxRetries: 2\n },\n { logger, data, domain }\n )\n\n return {\n data: result.data\n }\n } catch (error) {\n logger.error('Error in HeadlessGet:', error)\n throw error\n }\n}\n\nHeadlessGet.parameterSpec = [\n {\n type: 'string',\n name: 'path',\n label: 'path'\n },\n {\n type: 'http-headers',\n name: 'headers',\n label: 'headers'\n },\n {\n type: 'options',\n name: 'queryParams',\n label: 'query-parameters'\n }\n]\n\nTaskRegistry.registerTaskHandler('headless-get', HeadlessGet)\n"]}
|
@@ -1,91 +1,28 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const url_1 = require("url");
|
4
|
-
const utils_1 = require("@things-factory/utils");
|
5
3
|
const task_registry_1 = require("../task-registry");
|
6
|
-
const
|
4
|
+
const headless_request_with_recovery_1 = require("./utils/headless-request-with-recovery");
|
7
5
|
async function HeadlessPatch(step, { logger, data, domain }) {
|
8
6
|
const { connection: connectionName, params: stepOptions } = step;
|
9
7
|
const { headers: requestHeaders, contentType, path, accessor, queryParams } = stepOptions || {};
|
10
|
-
const connection = await connection_manager_1.ConnectionManager.getConnectionInstanceByName(domain, connectionName);
|
11
|
-
if (!connection) {
|
12
|
-
throw new Error(`Connection '${connectionName}' is not established.`);
|
13
|
-
}
|
14
|
-
const { endpoint, params: connectionParams, acquireSessionPage, releasePage } = connection;
|
15
|
-
const headers = {
|
16
|
-
...requestHeaders
|
17
|
-
};
|
18
|
-
let body = (0, utils_1.access)(accessor, data);
|
19
|
-
if (contentType && body) {
|
20
|
-
headers['content-type'] = contentType;
|
21
|
-
switch (contentType) {
|
22
|
-
case 'text/plain':
|
23
|
-
body = JSON.stringify(body);
|
24
|
-
break;
|
25
|
-
case 'application/json':
|
26
|
-
body = JSON.stringify(body);
|
27
|
-
break;
|
28
|
-
case 'application/x-www-form-urlencoded':
|
29
|
-
const searchParams = new URLSearchParams();
|
30
|
-
for (const prop in body) {
|
31
|
-
searchParams.set(prop, body[prop]);
|
32
|
-
}
|
33
|
-
body = searchParams.toString();
|
34
|
-
break;
|
35
|
-
}
|
36
|
-
}
|
37
|
-
const page = await acquireSessionPage();
|
38
8
|
try {
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
Object.keys(queryParams).forEach(key => {
|
49
|
-
if (queryParams[key] !== null && queryParams[key] !== undefined) {
|
50
|
-
requestUrl.searchParams.append(key, String(queryParams[key]));
|
51
|
-
}
|
52
|
-
});
|
53
|
-
}
|
54
|
-
// headless-scrap과 동일한 방식으로 페이지 이동하여 세션 유지
|
55
|
-
await page.goto(requestUrl, { waitUntil: 'networkidle2' });
|
56
|
-
// 페이지 내에서 PATCH 요청 실행 (세션 유지)
|
57
|
-
const response = await page.evaluate(async (urlString, options) => {
|
58
|
-
const response = await fetch(urlString, {
|
59
|
-
...options,
|
60
|
-
credentials: 'include' // 세션 쿠키/인증 정보 포함
|
61
|
-
});
|
62
|
-
if (!response.ok) {
|
63
|
-
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
|
64
|
-
}
|
65
|
-
const contentType = response.headers.get('content-type') || '';
|
66
|
-
if (contentType.includes('application/json')) {
|
67
|
-
return await response.json();
|
68
|
-
}
|
69
|
-
else if (contentType.includes('text/')) {
|
70
|
-
return await response.text();
|
71
|
-
}
|
72
|
-
else {
|
73
|
-
// Binary data나 기타 타입의 경우
|
74
|
-
const arrayBuffer = await response.arrayBuffer();
|
75
|
-
return Array.from(new Uint8Array(arrayBuffer));
|
76
|
-
}
|
77
|
-
}, requestUrl.toString(), { method: 'PATCH', headers, body });
|
9
|
+
const result = await (0, headless_request_with_recovery_1.executeHeadlessRequestWithRecovery)(connectionName, {
|
10
|
+
method: 'PATCH',
|
11
|
+
path,
|
12
|
+
headers: requestHeaders,
|
13
|
+
queryParams,
|
14
|
+
maxRetries: 2,
|
15
|
+
accessor,
|
16
|
+
contentType
|
17
|
+
}, { logger, data, domain });
|
78
18
|
return {
|
79
|
-
data:
|
19
|
+
data: result.data
|
80
20
|
};
|
81
21
|
}
|
82
22
|
catch (error) {
|
83
23
|
logger.error('Error in HeadlessPatch:', error);
|
84
24
|
throw error;
|
85
25
|
}
|
86
|
-
finally {
|
87
|
-
await releasePage(page);
|
88
|
-
}
|
89
26
|
}
|
90
27
|
HeadlessPatch.parameterSpec = [
|
91
28
|
{
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"headless-patch.js","sourceRoot":"","sources":["../../../server/engine/task/headless-patch.ts"],"names":[],"mappings":";;AAAA,
|
1
|
+
{"version":3,"file":"headless-patch.js","sourceRoot":"","sources":["../../../server/engine/task/headless-patch.ts"],"names":[],"mappings":";;AAAA,oDAA+C;AAC/C,2FAA2F;AAE3F,KAAK,UAAU,aAAa,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE;IACzD,MAAM,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAA;IAChE,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,IAAI,EAAE,CAAA;IAE/F,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAA,mEAAkC,EACrD,cAAc,EACd;YACE,MAAM,EAAE,OAAO;YACf,IAAI;YACJ,OAAO,EAAE,cAAc;YACvB,WAAW;YACX,UAAU,EAAE,CAAC;YACb,QAAQ;YACR,WAAW;SACZ,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,CACzB,CAAA;QAED,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB,CAAA;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAA;QAC9C,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC;AAED,aAAa,CAAC,aAAa,GAAG;IAC5B;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,MAAM;KACd;IACD;QACE,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,SAAS;KACjB;IACD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,kBAAkB;KAC1B;IACD;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,cAAc;QACrB,QAAQ,EAAE;YACR,OAAO,EAAE;gBACP,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC1B,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,kBAAkB,EAAE;gBAC1D,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE;gBAC9C,EAAE,OAAO,EAAE,mCAAmC,EAAE,KAAK,EAAE,mCAAmC,EAAE;aAC7F;SACF;KACF;IACD;QACE,IAAI,EAAE,qBAAqB;QAC3B,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,UAAU;KAClB;CACF,CAAA;AAED,4BAAY,CAAC,mBAAmB,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA","sourcesContent":["import { TaskRegistry } from '../task-registry'\nimport { executeHeadlessRequestWithRecovery } from './utils/headless-request-with-recovery'\n\nasync function HeadlessPatch(step, { logger, data, domain }) {\n const { connection: connectionName, params: stepOptions } = step\n const { headers: requestHeaders, contentType, path, accessor, queryParams } = stepOptions || {}\n\n try {\n const result = await executeHeadlessRequestWithRecovery(\n connectionName,\n {\n method: 'PATCH',\n path,\n headers: requestHeaders,\n queryParams,\n maxRetries: 2,\n accessor,\n contentType\n },\n { logger, data, domain }\n )\n\n return {\n data: result.data\n }\n } catch (error) {\n logger.error('Error in HeadlessPatch:', error)\n throw error\n }\n}\n\nHeadlessPatch.parameterSpec = [\n {\n type: 'string',\n name: 'path',\n label: 'path'\n },\n {\n type: 'http-headers',\n name: 'headers',\n label: 'headers'\n },\n {\n type: 'options',\n name: 'queryParams',\n label: 'query-parameters'\n },\n {\n type: 'select',\n name: 'contentType',\n label: 'content-type',\n property: {\n options: [\n { display: '', value: '' },\n { display: 'application/json', value: 'application/json' },\n { display: 'text/plain', value: 'text/plain' },\n { display: 'application/x-www-form-urlencoded', value: 'application/x-www-form-urlencoded' }\n ]\n }\n },\n {\n type: 'scenario-step-input',\n name: 'accessor',\n label: 'accessor'\n }\n]\n\nTaskRegistry.registerTaskHandler('headless-patch', HeadlessPatch)\n"]}
|
@@ -1,91 +1,28 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
const url_1 = require("url");
|
4
|
-
const utils_1 = require("@things-factory/utils");
|
5
3
|
const task_registry_1 = require("../task-registry");
|
6
|
-
const
|
4
|
+
const headless_request_with_recovery_1 = require("./utils/headless-request-with-recovery");
|
7
5
|
async function HeadlessPost(step, { logger, data, domain }) {
|
8
6
|
const { connection: connectionName, params: stepOptions } = step;
|
9
7
|
const { headers: requestHeaders, contentType, path, accessor, queryParams } = stepOptions || {};
|
10
|
-
const connection = await connection_manager_1.ConnectionManager.getConnectionInstanceByName(domain, connectionName);
|
11
|
-
if (!connection) {
|
12
|
-
throw new Error(`Connection '${connectionName}' is not established.`);
|
13
|
-
}
|
14
|
-
const { endpoint, params: connectionParams, acquireSessionPage, releasePage } = connection;
|
15
|
-
const headers = {
|
16
|
-
...requestHeaders
|
17
|
-
};
|
18
|
-
let body = (0, utils_1.access)(accessor, data);
|
19
|
-
if (contentType && body) {
|
20
|
-
headers['content-type'] = contentType;
|
21
|
-
switch (contentType) {
|
22
|
-
case 'text/plain':
|
23
|
-
body = JSON.stringify(body);
|
24
|
-
break;
|
25
|
-
case 'application/json':
|
26
|
-
body = JSON.stringify(body);
|
27
|
-
break;
|
28
|
-
case 'application/x-www-form-urlencoded':
|
29
|
-
const searchParams = new URLSearchParams();
|
30
|
-
for (const prop in body) {
|
31
|
-
searchParams.set(prop, body[prop]);
|
32
|
-
}
|
33
|
-
body = searchParams.toString();
|
34
|
-
break;
|
35
|
-
}
|
36
|
-
}
|
37
|
-
const page = await acquireSessionPage();
|
38
8
|
try {
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
Object.keys(queryParams).forEach(key => {
|
49
|
-
if (queryParams[key] !== null && queryParams[key] !== undefined) {
|
50
|
-
requestUrl.searchParams.append(key, String(queryParams[key]));
|
51
|
-
}
|
52
|
-
});
|
53
|
-
}
|
54
|
-
// headless-scrap과 동일한 방식으로 페이지 이동하여 세션 유지
|
55
|
-
await page.goto(requestUrl, { waitUntil: 'networkidle2' });
|
56
|
-
// 페이지 내에서 POST 요청 실행 (세션 유지)
|
57
|
-
const response = await page.evaluate(async (urlString, options) => {
|
58
|
-
const response = await fetch(urlString, {
|
59
|
-
...options,
|
60
|
-
credentials: 'include' // 세션 쿠키/인증 정보 포함
|
61
|
-
});
|
62
|
-
if (!response.ok) {
|
63
|
-
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
|
64
|
-
}
|
65
|
-
const contentType = response.headers.get('content-type') || '';
|
66
|
-
if (contentType.includes('application/json')) {
|
67
|
-
return await response.json();
|
68
|
-
}
|
69
|
-
else if (contentType.includes('text/')) {
|
70
|
-
return await response.text();
|
71
|
-
}
|
72
|
-
else {
|
73
|
-
// Binary data나 기타 타입의 경우
|
74
|
-
const arrayBuffer = await response.arrayBuffer();
|
75
|
-
return Array.from(new Uint8Array(arrayBuffer));
|
76
|
-
}
|
77
|
-
}, requestUrl.toString(), { method: 'POST', headers, body });
|
9
|
+
const result = await (0, headless_request_with_recovery_1.executeHeadlessRequestWithRecovery)(connectionName, {
|
10
|
+
method: 'POST',
|
11
|
+
path,
|
12
|
+
headers: requestHeaders,
|
13
|
+
queryParams,
|
14
|
+
maxRetries: 2,
|
15
|
+
accessor,
|
16
|
+
contentType
|
17
|
+
}, { logger, data, domain });
|
78
18
|
return {
|
79
|
-
data:
|
19
|
+
data: result.data
|
80
20
|
};
|
81
21
|
}
|
82
22
|
catch (error) {
|
83
23
|
logger.error('Error in HeadlessPost:', error);
|
84
24
|
throw error;
|
85
25
|
}
|
86
|
-
finally {
|
87
|
-
await releasePage(page);
|
88
|
-
}
|
89
26
|
}
|
90
27
|
HeadlessPost.parameterSpec = [
|
91
28
|
{
|