@things-factory/integration-base 10.0.0-beta.5 → 10.0.0-beta.53

package/dist-server/engine/connector/operato-connector.js

@@ -93,9 +93,9 @@ class OperatoConnector {
             link: splitLink
         });
         const subscriptions = [];
-        Object.keys(subscriptionHandlers).forEach(async (tag) => {
-            if (!tag || !subscriptionHandlers[tag])
-                return;
+        const tags = Object.keys(subscriptionHandlers).filter(tag => tag && subscriptionHandlers[tag]);
+        /* 시나리오 조회 및 subscription 등록을 순차적으로 처리 */
+        for (const tag of tags) {
             const scenarioName = subscriptionHandlers[tag];
             // fetch a scenario
             const selectedScenario = await (0, shell_1.getRepository)(scenario_1.Scenario).findOne({
@@ -104,6 +104,11 @@ class OperatoConnector {
                 },
                 relations: ['steps', 'domain']
             });
+            /* 시나리오가 DB에 없으면 경고 로그를 남기고 건너뜀 */
+            if (!selectedScenario) {
+                connection_manager_1.ConnectionManager.logger.warn(`(${connection.name}) scenario not found for tag "${tag}" (scenarioName: "${scenarioName}") - skipping subscription`);
+                continue;
+            }
             const subscription = client.subscribe({
                 query: (0, graphql_tag_1.default) `
           subscription {
@@ -116,8 +121,14 @@ class OperatoConnector {
             });
             const subscriptionObserver = subscription.subscribe({
                 next: async (data) => {
-                    debug('received pubsub msg.:', data?.data);
-                    await this.runScenario(subscriptions, data?.data?.data);
+                    /* subscription 수신 시 에러가 발생해도 프로세스가 죽지 않도록 catch 처리 */
+                    try {
+                        debug('received pubsub msg.:', data?.data);
+                        await this.runScenario(subscriptions, data?.data?.data);
+                    }
+                    catch (e) {
+                        connection_manager_1.ConnectionManager.logger.error(`(${connection.name}:${tag}) runScenario failed`, e);
+                    }
                 },
                 error: error => {
                     connection_manager_1.ConnectionManager.logger.error(`(${connection.name}:${connection.endpoint}) subscription error`, error);
@@ -133,7 +144,7 @@ class OperatoConnector {
                 subscriptionObserver
             });
             connection_manager_1.ConnectionManager.logger.info(`(${tag}:${scenarioName}) subscription closed flag: ${subscriptionObserver.closed}`);
-        });
+        }
         client['subscriptions'] = subscriptions;
         connection_manager_1.ConnectionManager.addConnectionInstance(connection, client);
         connection_manager_1.ConnectionManager.logger.info(`operato-connector connection(${connection.name}:${connection.endpoint}) is connected`);

package/dist-server/engine/connector/operato-connector.js.map

@@ -1 +1 @@
-{"version":3,"file":"operato-connector.js","sourceRoot":"","sources":["../../../server/engine/connector/operato-connector.ts"],"names":[],"mappings":"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","sourcesContent":["import 'cross-fetch/polyfill'\n\nimport { ApolloClient, InMemoryCache, createHttpLink, split } from '@apollo/client/core'\nimport { setContext } from '@apollo/client/link/context'\n\nimport WebSocket from 'ws'\nimport { createClient } from 'graphql-ws'\nimport { GraphQLWsLink } from '@apollo/client/link/subscriptions'\nimport { getMainDefinition } from '@apollo/client/utilities'\nimport gql from 'graphql-tag'\n\nimport { ConnectionManager } from '../connection-manager'\nimport { Connector } from '../types'\nimport { InputConnection } from '../../service/connection/connection-type'\n\nimport { Scenario } from '../../service/scenario/scenario'\nimport { ScenarioInstance } from '../../service/scenario-instance/scenario-instance-type'\n\nimport { getRepository, GraphqlLocalClient, Domain } from '@things-factory/shell'\nimport { User, checkUserHasRole } from '@things-factory/auth-base'\n\nconst debug = require('debug')('things-factory:integration-base:operato-connector')\n\nconst defaultOptions: any = {\n  watchQuery: {\n    fetchPolicy: 'no-cache',\n    errorPolicy: 'ignore'\n  },\n  query: {\n    fetchPolicy: 'no-cache', //'network-only'\n    errorPolicy: 'all'\n  },\n  mutate: {\n    errorPolicy: 'all'\n  }\n}\n\nexport const GRAPHQL_URI = '/graphql'\nexport const SUBSCRIPTION_URI = GRAPHQL_URI\n\ninterface SubscriberData {\n  tag: string\n  scenario: any\n  subscriptionObserver: any\n}\n\nexport class OperatoConnector implements Connector {\n  private context: any\n\n  async ready(connectionConfigs: InputConnection[]) {\n    await Promise.all(connectionConfigs.map(this.connect.bind(this)))\n\n    ConnectionManager.logger.info('operato-connector connections are ready')\n  }\n\n  async connect(connection: InputConnection) {\n    const {\n      endpoint: uri,\n      params: { authKey, domain, subscriptionHandlers = {} }\n    } = connection\n\n    if (!authKey || !domain) {\n      throw new Error('some connection paramter missing.')\n    }\n\n    const domainOwner = await getRepository(User).findOne({\n      where: {\n        id: connection.domain.owner\n      }\n    })\n\n    this.context = {\n      domain: connection.domain,\n      user: domainOwner\n      /* TODO: domainOwner 대신 특정 유저를 지정할 수 있도록 개선해야함. 모든 커넥션에 유저를 지정하는 기능으로 일반화할 필요가 있는 지 고민해야함 */\n    }\n\n    const httpLink = createHttpLink({\n      uri: uri\n    })\n\n    /* \n    CHECKPOINT: \n      1. GraphqQLWsLink를 사용하면 setContext를 통한 추가 헤더 설정이 무시됩니다.\n      따라서, GraphQLWsLink를 사용하려면, connectionParams를 통해 헤더를 설정해야 합니다.\n    \n      2. 서버에서 실행시, webSocketImpl을 명시적으로 지정해야 합니다.\n    */\n    const wsLink = new GraphQLWsLink(\n      createClient({\n        url: uri.replace(/^http/, 'ws'),\n        keepAlive: 10_000,\n        retryAttempts: 1_000_000,\n        shouldRetry: e => true,\n        webSocketImpl: WebSocket,\n        connectionParams: {\n          headers: {\n            'x-things-factory-domain': domain,\n            authorization: authKey ? `Bearer ${authKey}` : ''\n          }\n        }\n      })\n    )\n\n    const splitLink = split(\n      ({ query }) => {\n        const def = getMainDefinition(query)\n        return def.kind === 'OperationDefinition' && def.operation === 'subscription'\n      },\n      wsLink,\n      setContext((_, { headers }) => {\n        return {\n          headers: {\n            ...headers,\n            'x-things-factory-domain': domain,\n            authorization: authKey ? `Bearer ${authKey}` : ''\n          }\n        }\n      }).concat(httpLink)\n    )\n\n    const cache = new InMemoryCache()\n\n    const client = new ApolloClient({\n      defaultOptions,\n      cache,\n      link: splitLink\n    })\n\n    const subscriptions: SubscriberData[] = []\n    Object.keys(subscriptionHandlers).forEach(async tag => {\n      if (!tag || !subscriptionHandlers[tag]) return\n\n      const scenarioName = subscriptionHandlers[tag]\n\n      // fetch a scenario\n      const selectedScenario = await getRepository(Scenario).findOne({\n        where: {\n          name: scenarioName\n        },\n        relations: ['steps', 'domain']\n      })\n\n      const subscription = client.subscribe({\n        query: gql`\n          subscription {\n            data(tag: \"${tag}\") {\n              tag\n              data\n            }\n          }\n        `\n      })\n\n      const subscriptionObserver = subscription.subscribe({\n        next: async data => {\n          debug('received pubsub msg.:', data?.data)\n          await this.runScenario(subscriptions, data?.data?.data)\n        },\n        error: error => {\n          ConnectionManager.logger.error(`(${connection.name}:${connection.endpoint}) subscription error`, error)\n        },\n        complete: () => {\n          ConnectionManager.logger.info(`(${connection.name}:${connection.endpoint}) subscription complete`)\n        }\n      })\n\n      ConnectionManager.logger.info(\n        `(${connection.name}:${connection.endpoint}) subscription closed flag: ${subscriptionObserver.closed}`\n      )\n\n      subscriptions.push({\n        tag,\n        scenario: selectedScenario,\n        subscriptionObserver\n      })\n      ConnectionManager.logger.info(`(${tag}:${scenarioName}) subscription closed flag: ${subscriptionObserver.closed}`)\n    })\n\n    client['subscriptions'] = subscriptions\n    ConnectionManager.addConnectionInstance(connection, client)\n\n    ConnectionManager.logger.info(\n      `operato-connector connection(${connection.name}:${connection.endpoint}) is connected`\n    )\n  }\n\n  async disconnect(connection: InputConnection) {\n    const client = ConnectionManager.getConnectionInstance(connection)\n    const subscriptions: SubscriberData[] = client['subscriptions']\n    subscriptions.forEach(subscription => subscription.subscriptionObserver.unsubscribe())\n    client.stop()\n    ConnectionManager.removeConnectionInstance(connection)\n\n    ConnectionManager.logger.info(`operato-connector connection(${connection.name}) is disconnected`)\n  }\n\n  async runScenario(subscriptions: SubscriberData[], variables: any): Promise<ScenarioInstance> {\n    const { domain, user } = this.context\n    const { tag } = variables\n\n    if (!tag) {\n      throw new Error(`tag is invalid - ${tag}`)\n    }\n\n    const scenario = subscriptions.find(subscription => subscription.tag === tag)?.scenario\n    if (!scenario) {\n      throw new Error(`scenario is not found - ${tag}`)\n    }\n\n    if (!(await checkUserHasRole(scenario.roleId, domain, user))) {\n      throw new Error(`Unauthorized! ${scenario.name} doesn't have required role.`)\n    }\n\n    /* create a scenario instance */\n    const instanceName = scenario.name + '-' + String(Date.now())\n    const instance = new ScenarioInstance(instanceName, scenario, {\n      user,\n      domain,\n      variables,\n      client: GraphqlLocalClient.client\n    })\n\n    // run scenario\n    await instance.run()\n    return instance\n  }\n\n  get parameterSpec() {\n    return [\n      {\n        type: 'string',\n        name: 'authKey',\n        label: 'auth-key',\n        useDomainAttribute: true\n      },\n      {\n        type: 'string',\n        name: 'domain',\n        label: 'domain'\n      },\n      {\n        type: 'tag-scenarios',\n        name: 'subscriptionHandlers',\n        label: 'subscription-handlers'\n      }\n    ]\n  }\n\n  get taskPrefixes() {\n    return ['graphql']\n  }\n\n  get help() {\n    return 'integration/connector/operato-connector'\n  }\n\n  get description() {\n    return 'Operato Graphql Connector'\n  }\n}\n\nConnectionManager.registerConnector('operato-connector', new OperatoConnector())\n"]}
+{"version":3,"file":"operato-connector.js","sourceRoot":"","sources":["../../../server/engine/connector/operato-connector.ts"],"names":[],"mappings":"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","sourcesContent":["import 'cross-fetch/polyfill'\n\nimport { ApolloClient, InMemoryCache, createHttpLink, split } from '@apollo/client/core'\nimport { setContext } from '@apollo/client/link/context'\n\nimport WebSocket from 'ws'\nimport { createClient } from 'graphql-ws'\nimport { GraphQLWsLink } from '@apollo/client/link/subscriptions'\nimport { getMainDefinition } from '@apollo/client/utilities'\nimport gql from 'graphql-tag'\n\nimport { ConnectionManager } from '../connection-manager'\nimport { Connector } from '../types'\nimport { InputConnection } from '../../service/connection/connection-type'\n\nimport { Scenario } from '../../service/scenario/scenario'\nimport { ScenarioInstance } from '../../service/scenario-instance/scenario-instance-type'\n\nimport { getRepository, GraphqlLocalClient, Domain } from '@things-factory/shell'\nimport { User, checkUserHasRole } from '@things-factory/auth-base'\n\nconst debug = require('debug')('things-factory:integration-base:operato-connector')\n\nconst defaultOptions: any = {\n  watchQuery: {\n    fetchPolicy: 'no-cache',\n    errorPolicy: 'ignore'\n  },\n  query: {\n    fetchPolicy: 'no-cache', //'network-only'\n    errorPolicy: 'all'\n  },\n  mutate: {\n    errorPolicy: 'all'\n  }\n}\n\nexport const GRAPHQL_URI = '/graphql'\nexport const SUBSCRIPTION_URI = GRAPHQL_URI\n\ninterface SubscriberData {\n  tag: string\n  scenario: any\n  subscriptionObserver: any\n}\n\nexport class OperatoConnector implements Connector {\n  private context: any\n\n  async ready(connectionConfigs: InputConnection[]) {\n    await Promise.all(connectionConfigs.map(this.connect.bind(this)))\n\n    ConnectionManager.logger.info('operato-connector connections are ready')\n  }\n\n  async connect(connection: InputConnection) {\n    const {\n      endpoint: uri,\n      params: { authKey, domain, subscriptionHandlers = {} }\n    } = connection\n\n    if (!authKey || !domain) {\n      throw new Error('some connection paramter missing.')\n    }\n\n    const domainOwner = await getRepository(User).findOne({\n      where: {\n        id: connection.domain.owner\n      }\n    })\n\n    this.context = {\n      domain: connection.domain,\n      user: domainOwner\n      /* TODO: domainOwner 대신 특정 유저를 지정할 수 있도록 개선해야함. 모든 커넥션에 유저를 지정하는 기능으로 일반화할 필요가 있는 지 고민해야함 */\n    }\n\n    const httpLink = createHttpLink({\n      uri: uri\n    })\n\n    /* \n    CHECKPOINT: \n      1. GraphqQLWsLink를 사용하면 setContext를 통한 추가 헤더 설정이 무시됩니다.\n      따라서, GraphQLWsLink를 사용하려면, connectionParams를 통해 헤더를 설정해야 합니다.\n    \n      2. 서버에서 실행시, webSocketImpl을 명시적으로 지정해야 합니다.\n    */\n    const wsLink = new GraphQLWsLink(\n      createClient({\n        url: uri.replace(/^http/, 'ws'),\n        keepAlive: 10_000,\n        retryAttempts: 1_000_000,\n        shouldRetry: e => true,\n        webSocketImpl: WebSocket,\n        connectionParams: {\n          headers: {\n            'x-things-factory-domain': domain,\n            authorization: authKey ? `Bearer ${authKey}` : ''\n          }\n        }\n      })\n    )\n\n    const splitLink = split(\n      ({ query }) => {\n        const def = getMainDefinition(query)\n        return def.kind === 'OperationDefinition' && def.operation === 'subscription'\n      },\n      wsLink,\n      setContext((_, { headers }) => {\n        return {\n          headers: {\n            ...headers,\n            'x-things-factory-domain': domain,\n            authorization: authKey ? `Bearer ${authKey}` : ''\n          }\n        }\n      }).concat(httpLink)\n    )\n\n    const cache = new InMemoryCache()\n\n    const client = new ApolloClient({\n      defaultOptions,\n      cache,\n      link: splitLink\n    })\n\n    const subscriptions: SubscriberData[] = []\n    const tags = Object.keys(subscriptionHandlers).filter(tag => tag && subscriptionHandlers[tag])\n\n    /* 시나리오 조회 및 subscription 등록을 순차적으로 처리 */\n    for (const tag of tags) {\n      const scenarioName = subscriptionHandlers[tag]\n\n      // fetch a scenario\n      const selectedScenario = await getRepository(Scenario).findOne({\n        where: {\n          name: scenarioName\n        },\n        relations: ['steps', 'domain']\n      })\n\n      /* 시나리오가 DB에 없으면 경고 로그를 남기고 건너뜀 */\n      if (!selectedScenario) {\n        ConnectionManager.logger.warn(\n          `(${connection.name}) scenario not found for tag \"${tag}\" (scenarioName: \"${scenarioName}\") - skipping subscription`\n        )\n        continue\n      }\n\n      const subscription = client.subscribe({\n        query: gql`\n          subscription {\n            data(tag: \"${tag}\") {\n              tag\n              data\n            }\n          }\n        `\n      })\n\n      const subscriptionObserver = subscription.subscribe({\n        next: async data => {\n          /* subscription 수신 시 에러가 발생해도 프로세스가 죽지 않도록 catch 처리 */\n          try {\n            debug('received pubsub msg.:', data?.data)\n            await this.runScenario(subscriptions, data?.data?.data)\n          } catch (e) {\n            ConnectionManager.logger.error(`(${connection.name}:${tag}) runScenario failed`, e)\n          }\n        },\n        error: error => {\n          ConnectionManager.logger.error(`(${connection.name}:${connection.endpoint}) subscription error`, error)\n        },\n        complete: () => {\n          ConnectionManager.logger.info(`(${connection.name}:${connection.endpoint}) subscription complete`)\n        }\n      })\n\n      ConnectionManager.logger.info(\n        `(${connection.name}:${connection.endpoint}) subscription closed flag: ${subscriptionObserver.closed}`\n      )\n\n      subscriptions.push({\n        tag,\n        scenario: selectedScenario,\n        subscriptionObserver\n      })\n      ConnectionManager.logger.info(`(${tag}:${scenarioName}) subscription closed flag: ${subscriptionObserver.closed}`)\n    }\n\n    client['subscriptions'] = subscriptions\n    ConnectionManager.addConnectionInstance(connection, client)\n\n    ConnectionManager.logger.info(\n      `operato-connector connection(${connection.name}:${connection.endpoint}) is connected`\n    )\n  }\n\n  async disconnect(connection: InputConnection) {\n    const client = ConnectionManager.getConnectionInstance(connection)\n    const subscriptions: SubscriberData[] = client['subscriptions']\n    subscriptions.forEach(subscription => subscription.subscriptionObserver.unsubscribe())\n    client.stop()\n    ConnectionManager.removeConnectionInstance(connection)\n\n    ConnectionManager.logger.info(`operato-connector connection(${connection.name}) is disconnected`)\n  }\n\n  async runScenario(subscriptions: SubscriberData[], variables: any): Promise<ScenarioInstance> {\n    const { domain, user } = this.context\n    const { tag } = variables\n\n    if (!tag) {\n      throw new Error(`tag is invalid - ${tag}`)\n    }\n\n    const scenario = subscriptions.find(subscription => subscription.tag === tag)?.scenario\n    if (!scenario) {\n      throw new Error(`scenario is not found - ${tag}`)\n    }\n\n    if (!(await checkUserHasRole(scenario.roleId, domain, user))) {\n      throw new Error(`Unauthorized! ${scenario.name} doesn't have required role.`)\n    }\n\n    /* create a scenario instance */\n    const instanceName = scenario.name + '-' + String(Date.now())\n    const instance = new ScenarioInstance(instanceName, scenario, {\n      user,\n      domain,\n      variables,\n      client: GraphqlLocalClient.client\n    })\n\n    // run scenario\n    await instance.run()\n    return instance\n  }\n\n  get parameterSpec() {\n    return [\n      {\n        type: 'string',\n        name: 'authKey',\n        label: 'auth-key',\n        useDomainAttribute: true\n      },\n      {\n        type: 'string',\n        name: 'domain',\n        label: 'domain'\n      },\n      {\n        type: 'tag-scenarios',\n        name: 'subscriptionHandlers',\n        label: 'subscription-handlers'\n      }\n    ]\n  }\n\n  get taskPrefixes() {\n    return ['graphql']\n  }\n\n  get help() {\n    return 'integration/connector/operato-connector'\n  }\n\n  get description() {\n    return 'Operato Graphql Connector'\n  }\n}\n\nConnectionManager.registerConnector('operato-connector', new OperatoConnector())\n"]}

package/dist-server/engine/connector/socket-server.js

@@ -14,22 +14,32 @@ class SocketServer {
     async connect(config) {
         var em = new events_1.EventEmitter();
         var [host = '0.0.0.0', port = 8124] = config.endpoint.split(':');
+        var clientIPs = new Set();
         return new Promise((resolve, reject) => {
             var server = net_1.default.createServer(tcp => {
+                const remoteIP = `${tcp.remoteAddress}:${tcp.remotePort}`;
+                clientIPs.add(remoteIP);
                 connection_manager_1.ConnectionManager.logger.info('Client connection: ');
                 connection_manager_1.ConnectionManager.logger.info('   local = %s:%s', tcp.localAddress, tcp.localPort);
                 connection_manager_1.ConnectionManager.logger.info('   remote = %s:%s', tcp.remoteAddress, tcp.remotePort);
+                console.log(`[socket-server] ${config.name} clients: ${clientIPs.size}\n${[...clientIPs].sort().map(ip => `  - ${ip}`).join('\n')}`);
                 tcp.on('data', (data) => {
                     em['__tcp__'] = tcp;
                     var message = data.toString();
                     message = message.replace('SB#', '');
                     message = message.replace(/(\r\n|\n|\r)/gm, '');
-                    em.emit('socket-message-arrive', message);
+                    // IP 정보를 함께 전달한다
+                    em.emit('socket-message-arrive', message, tcp.remoteAddress);
                     connection_manager_1.ConnectionManager.logger.info(`socket ${message}`);
                     tcp.write('ok');
                 });
-                tcp.on('end', () => {
+                tcp.on('close', hadError => {
                     connection_manager_1.ConnectionManager.logger.info('Client disconnected');
+                    if (hadError) {
+                        connection_manager_1.ConnectionManager.logger.info('Client disconnected with error: ' + hadError);
+                    }
+                    clientIPs.delete(remoteIP);
+                    console.log(`[socket-server] ${config.name} clients: ${clientIPs.size}\n${[...clientIPs].sort().map(ip => `  - ${ip}`).join('\n')}`);
                 });
                 tcp.on('error', ex => {
                     connection_manager_1.ConnectionManager.logger.info('Server socket error: ');

package/dist-server/engine/connector/socket-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"socket-server.js","sourceRoot":"","sources":["../../../server/engine/connector/socket-server.ts"],"names":[],"mappings":"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","sourcesContent":["import net from 'net'\nimport { EventEmitter } from 'events'\n\nimport { Connector } from '../types'\nimport { ConnectionManager } from '../connection-manager'\nimport { InputConnection } from '../../service/connection/connection-type'\n\nexport class SocketServer implements Connector {\n  // socket: any\n\n  async ready(connectionConfigs: InputConnection[]) {\n    await Promise.all(connectionConfigs.map(this.connect))\n    ConnectionManager.logger.info('socket servers are ready')\n  }\n\n  async connect(config: InputConnection): Promise<void> {\n    var em = new EventEmitter()\n    var [host = '0.0.0.0', port = 8124] = config.endpoint.split(':')\n    return new Promise((resolve, reject) => {\n      var server = net.createServer(tcp => {\n        ConnectionManager.logger.info('Client connection: ')\n        ConnectionManager.logger.info('   local = %s:%s', tcp.localAddress, tcp.localPort)\n        ConnectionManager.logger.info('   remote = %s:%s', tcp.remoteAddress, tcp.remotePort)\n        tcp.on('data', (data: any) => {\n          em['__tcp__'] = tcp\n          var message = data.toString()\n          message = message.replace('SB#', '')\n          message = message.replace(/(\\r\\n|\\n|\\r)/gm, '')\n          em.emit('socket-message-arrive', message)\n          ConnectionManager.logger.info(`socket ${message}`)\n          tcp.write('ok')\n        })\n\n        tcp.on('end', () => {\n          ConnectionManager.logger.info('Client disconnected')\n        })\n\n        tcp.on('error', ex => {\n          ConnectionManager.logger.info('Server socket error: ')\n          var logger = ConnectionManager.logger\n          let message = ex.stack ? ex.stack : ex\n          let msg = typeof message == 'object' ? JSON.stringify(message, null, 2) : message\n          logger.error(msg, ex)\n          reject(ex)\n        })\n      })\n\n      server.listen(port, async () => {\n        ConnectionManager.logger.info(`tcp echo server listening on ${host}:${port}`)\n\n        /* default client connection */\n        try {\n          em['__server__'] = server\n          ConnectionManager.addConnectionInstance(config, em)\n          ConnectionManager.logger.info(`socket server connection(${config.name}:${config.endpoint}) is connected`)\n\n          resolve()\n        } catch (err) {\n          ConnectionManager.logger.error(err)\n          reject(err)\n        }\n      })\n    })\n  }\n\n  async disconnect(connection: InputConnection) {\n    let em = ConnectionManager.removeConnectionInstance(connection)\n    var tcp = em['__tcp__']\n    var server = em['__server__']\n\n    tcp && (await tcp.destroy())\n    server && (await server.close())\n\n    ConnectionManager.logger.info(`socket server connection(${connection.name}) is disconnected`)\n  }\n\n  get parameterSpec() {\n    return []\n  }\n\n  get taskPrefixes() {\n    return ['socket']\n  }\n}\n\nConnectionManager.registerConnector('socket-server', new SocketServer())\n"]}
+{"version":3,"file":"socket-server.js","sourceRoot":"","sources":["../../../server/engine/connector/socket-server.ts"],"names":[],"mappings":"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","sourcesContent":["import net from 'net'\nimport { EventEmitter } from 'events'\n\nimport { Connector } from '../types'\nimport { ConnectionManager } from '../connection-manager'\nimport { InputConnection } from '../../service/connection/connection-type'\n\nexport class SocketServer implements Connector {\n  // socket: any\n\n  async ready(connectionConfigs: InputConnection[]) {\n    await Promise.all(connectionConfigs.map(this.connect))\n    ConnectionManager.logger.info('socket servers are ready')\n  }\n\n  async connect(config: InputConnection): Promise<void> {\n    var em = new EventEmitter()\n    var [host = '0.0.0.0', port = 8124] = config.endpoint.split(':')\n    var clientIPs = new Set<string>()\n    return new Promise((resolve, reject) => {\n      var server = net.createServer(tcp => {\n        const remoteIP = `${tcp.remoteAddress}:${tcp.remotePort}`\n        clientIPs.add(remoteIP)\n        ConnectionManager.logger.info('Client connection: ')\n        ConnectionManager.logger.info('   local = %s:%s', tcp.localAddress, tcp.localPort)\n        ConnectionManager.logger.info('   remote = %s:%s', tcp.remoteAddress, tcp.remotePort)\n        console.log(\n          `[socket-server] ${config.name} clients: ${clientIPs.size}\\n${[...clientIPs].sort().map(ip => `  - ${ip}`).join('\\n')}`\n        )\n        tcp.on('data', (data: any) => {\n          em['__tcp__'] = tcp\n          var message = data.toString()\n          message = message.replace('SB#', '')\n          message = message.replace(/(\\r\\n|\\n|\\r)/gm, '')\n          // IP 정보를 함께 전달한다\n          em.emit('socket-message-arrive', message, tcp.remoteAddress)\n          ConnectionManager.logger.info(`socket ${message}`)\n          tcp.write('ok')\n        })\n\n        tcp.on('close', hadError => {\n          ConnectionManager.logger.info('Client disconnected')\n          if (hadError) {\n            ConnectionManager.logger.info('Client disconnected with error: ' + hadError)\n          }\n          clientIPs.delete(remoteIP)\n          console.log(\n            `[socket-server] ${config.name} clients: ${clientIPs.size}\\n${[...clientIPs].sort().map(ip => `  - ${ip}`).join('\\n')}`\n          )\n        })\n\n        tcp.on('error', ex => {\n          ConnectionManager.logger.info('Server socket error: ')\n          var logger = ConnectionManager.logger\n          let message = ex.stack ? ex.stack : ex\n          let msg = typeof message == 'object' ? JSON.stringify(message, null, 2) : message\n          logger.error(msg, ex)\n          reject(ex)\n        })\n      })\n\n      server.listen(port, async () => {\n        ConnectionManager.logger.info(`tcp echo server listening on ${host}:${port}`)\n\n        /* default client connection */\n        try {\n          em['__server__'] = server\n          ConnectionManager.addConnectionInstance(config, em)\n          ConnectionManager.logger.info(`socket server connection(${config.name}:${config.endpoint}) is connected`)\n\n          resolve()\n        } catch (err) {\n          ConnectionManager.logger.error(err)\n          reject(err)\n        }\n      })\n    })\n  }\n\n  async disconnect(connection: InputConnection) {\n    let em = ConnectionManager.removeConnectionInstance(connection)\n    var tcp = em['__tcp__']\n    var server = em['__server__']\n\n    tcp && (await tcp.destroy())\n    server && (await server.close())\n\n    ConnectionManager.logger.info(`socket server connection(${connection.name}) is disconnected`)\n  }\n\n  get parameterSpec() {\n    return []\n  }\n\n  get taskPrefixes() {\n    return ['socket']\n  }\n}\n\nConnectionManager.registerConnector('socket-server', new SocketServer())\n"]}

package/dist-server/engine/task/socket-listener.js

@@ -3,19 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@things-factory/utils");
 const task_registry_1 = require("../task-registry");
 const connection_manager_1 = require("../connection-manager");
-function convertDataFormat(data, format) {
+const WITH_IP_FORMATS = ['string-with-ip', 'json-with-ip'];
+function convertDataFormat(data, format, ip) {
+    let converted;
     try {
-        if (format == 'json') {
-            return JSON.parse(data);
+        const baseFormat = format.replace('-with-ip', '');
+        if (baseFormat == 'json') {
+            converted = JSON.parse(data);
         }
-        else if (format == 'csv') {
-            return data.split(',');
+        else if (baseFormat == 'csv') {
+            converted = data.split(',');
+        }
+        else {
+            converted = data;
         }
     }
     catch (e) {
-        return data.toString();
+        converted = data.toString();
+    }
+    // IP 포함 포맷이면 { data, ip } 형태로 반환한다
+    if (WITH_IP_FORMATS.includes(format) && ip) {
+        return { data: converted, ip };
     }
-    return data;
+    return converted;
 }
 async function SocketListener(step, context) {
     //get connection data
@@ -45,9 +55,9 @@ async function SocketListener(step, context) {
                     message
                 };
             };
-            await connection.addListener('socket-message-arrive', async (message) => {
+            await connection.addListener('socket-message-arrive', async (message, ip) => {
                 logger.info(message.toString());
-                MESSAGES.push(convertDataFormat(message.toString(), dataFormat));
+                MESSAGES.push(convertDataFormat(message.toString(), dataFormat, ip));
             });
         }
         catch (e) {
@@ -77,6 +87,14 @@ SocketListener.parameterSpec = [
                 {
                     display: 'String',
                     value: 'string'
+                },
+                {
+                    display: 'String with IP',
+                    value: 'string-with-ip'
+                },
+                {
+                    display: 'JSON with IP',
+                    value: 'json-with-ip'
                 }
             ]
         }

package/dist-server/engine/task/socket-listener.js.map

@@ -1 +1 @@
-{"version":3,"file":"socket-listener.js","sourceRoot":"","sources":["../../../server/engine/task/socket-listener.ts"],"names":[],"mappings":";;AAAA,iDAA6C;AAC7C,oDAA+C;AAC/C,8DAAyD;AAIzD,SAAS,iBAAiB,CAAC,IAAI,EAAE,MAAM;IACrC,IAAI,CAAC;QACH,IAAI,MAAM,IAAI,MAAM,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACzB,CAAC;aAAM,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACxB,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAA;IACxB,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,IAAe,EAAE,OAAgB;IAC7D,qBAAqB;IACrB,MAAM,EACJ,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,EAAE,UAAU,GAAG,MAAM,EAAE,EAC/B,IAAI,EACL,GAAG,IAAI,CAAA;IAER,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAA;IAC/D,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACnB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO,CAAC,iBAAiB,GAAG,EAAE,CAAA;IAChC,CAAC;IAED,yCAAyC;IACzC,IAAI,UAAU,GAAG,MAAM,sCAAiB,CAAC,2BAA2B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IAC5F,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,cAAc,cAAc,uBAAuB,CAAC,CAAA;IACtE,CAAC;IAED;;OAEG;IACH,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;QACrC,IAAI,CAAC;YACH,IAAI,QAAQ,GAAG,EAAE,CAAA;YACjB,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE;gBAC3C,OAAO,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;oBAC5B,MAAM,IAAA,aAAK,EAAC,GAAG,CAAC,CAAA;gBAClB,CAAC;gBACD,IAAI,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAA;gBAC9B,OAAO;oBACL,OAAO;iBACR,CAAA;YACH,CAAC,CAAA;YAED,MAAM,UAAU,CAAC,WAAW,CAAC,uBAAuB,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;gBACpE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;gBAC/B,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,UAAU,CAAC,CAAC,CAAA;YAClE,CAAC,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;IACH,CAAC;IAED,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAA;IAEzD,OAAO;QACL,IAAI,EAAE,OAAO;KACd,CAAA;AACH,CAAC;AAED,cAAc,CAAC,aAAa,GAAG;IAC7B;QACE,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,aAAa;QACpB,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE;YACR,OAAO,EAAE;gBACP;oBACE,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,KAAK;iBACb;gBACD;oBACE,OAAO,EAAE,MAAM;oBACf,KAAK,EAAE,MAAM;iBACd;gBACD;oBACE,OAAO,EAAE,QAAQ;oBACjB,KAAK,EAAE,QAAQ;iBAChB;aACF;SACF;KACF;CACF,CAAA;AACD,4BAAY,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAA","sourcesContent":["import { sleep } from '@things-factory/utils'\nimport { TaskRegistry } from '../task-registry'\nimport { ConnectionManager } from '../connection-manager'\nimport { InputStep } from '../../service/step/step-type'\nimport { Context } from '../types'\n\nfunction convertDataFormat(data, format) {\n  try {\n    if (format == 'json') {\n      return JSON.parse(data)\n    } else if (format == 'csv') {\n      return data.split(',')\n    }\n  } catch (e) {\n    return data.toString()\n  }\n\n  return data\n}\n\nasync function SocketListener(step: InputStep, context: Context) {\n  //get connection data\n  const {\n    connection: connectionName,\n    params: { dataFormat = 'JSON' },\n    name\n  } = step\n\n  const { domain, logger, closures, __socket_listener } = context\n  logger.info('\\r\\n')\n  if (!__socket_listener) {\n    context.__socket_listener = {}\n  }\n\n  // get socket information from connection\n  var connection = await ConnectionManager.getConnectionInstanceByName(domain, connectionName)\n  if (!connection) {\n    throw new Error(`connector '${connectionName}' is not established.`)\n  }\n\n  /*\n   * 1. listner list에서 listner를 찾는다. 없으면, 생성한다.\n   */\n  if (!context.__socket_listener[name]) {\n    try {\n      var MESSAGES = []\n      context.__socket_listener[name] = async () => {\n        while (MESSAGES.length == 0) {\n          await sleep(100)\n        }\n        var message = MESSAGES.shift()\n        return {\n          message\n        }\n      }\n\n      await connection.addListener('socket-message-arrive', async message => {\n        logger.info(message.toString())\n        MESSAGES.push(convertDataFormat(message.toString(), dataFormat))\n      })\n    } catch (e) {\n      logger.error(e)\n    }\n  }\n\n  var { message } = await context.__socket_listener[name]()\n\n  return {\n    data: message\n  }\n}\n\nSocketListener.parameterSpec = [\n  {\n    type: 'select',\n    label: 'data-format',\n    name: 'dataFormat',\n    property: {\n      options: [\n        {\n          display: 'CSV',\n          value: 'csv'\n        },\n        {\n          display: 'JSON',\n          value: 'json'\n        },\n        {\n          display: 'String',\n          value: 'string'\n        }\n      ]\n    }\n  }\n]\nTaskRegistry.registerTaskHandler('socket-listener', SocketListener)\n"]}
+{"version":3,"file":"socket-listener.js","sourceRoot":"","sources":["../../../server/engine/task/socket-listener.ts"],"names":[],"mappings":";;AAAA,iDAA6C;AAC7C,oDAA+C;AAC/C,8DAAyD;AAIzD,MAAM,eAAe,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAA;AAE1D,SAAS,iBAAiB,CAAC,IAAY,EAAE,MAAc,EAAE,EAAW;IAClE,IAAI,SAAc,CAAA;IAClB,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;QACjD,IAAI,UAAU,IAAI,MAAM,EAAE,CAAC;YACzB,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC9B,CAAC;aAAM,IAAI,UAAU,IAAI,KAAK,EAAE,CAAC;YAC/B,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC7B,CAAC;aAAM,CAAC;YACN,SAAS,GAAG,IAAI,CAAA;QAClB,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;IAC7B,CAAC;IAED,mCAAmC;IACnC,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QAC3C,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAA;IAChC,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,KAAK,UAAU,cAAc,CAAC,IAAe,EAAE,OAAgB;IAC7D,qBAAqB;IACrB,MAAM,EACJ,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,EAAE,UAAU,GAAG,MAAM,EAAE,EAC/B,IAAI,EACL,GAAG,IAAI,CAAA;IAER,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAA;IAC/D,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACnB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO,CAAC,iBAAiB,GAAG,EAAE,CAAA;IAChC,CAAC;IAED,yCAAyC;IACzC,IAAI,UAAU,GAAG,MAAM,sCAAiB,CAAC,2BAA2B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IAC5F,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,cAAc,cAAc,uBAAuB,CAAC,CAAA;IACtE,CAAC;IAED;;OAEG;IACH,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;QACrC,IAAI,CAAC;YACH,IAAI,QAAQ,GAAG,EAAE,CAAA;YACjB,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,EAAE;gBAC3C,OAAO,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;oBAC5B,MAAM,IAAA,aAAK,EAAC,GAAG,CAAC,CAAA;gBAClB,CAAC;gBACD,IAAI,OAAO,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAA;gBAC9B,OAAO;oBACL,OAAO;iBACR,CAAA;YACH,CAAC,CAAA;YAED,MAAM,UAAU,CAAC,WAAW,CAAC,uBAAuB,EAAE,KAAK,EAAE,OAAe,EAAE,EAAU,EAAE,EAAE;gBAC1F,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;gBAC/B,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAA;YACtE,CAAC,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC;IACH,CAAC;IAED,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAA;IAEzD,OAAO;QACL,IAAI,EAAE,OAAO;KACd,CAAA;AACH,CAAC;AAED,cAAc,CAAC,aAAa,GAAG;IAC7B;QACE,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,aAAa;QACpB,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE;YACR,OAAO,EAAE;gBACP;oBACE,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,KAAK;iBACb;gBACD;oBACE,OAAO,EAAE,MAAM;oBACf,KAAK,EAAE,MAAM;iBACd;gBACD;oBACE,OAAO,EAAE,QAAQ;oBACjB,KAAK,EAAE,QAAQ;iBAChB;gBACD;oBACE,OAAO,EAAE,gBAAgB;oBACzB,KAAK,EAAE,gBAAgB;iBACxB;gBACD;oBACE,OAAO,EAAE,cAAc;oBACvB,KAAK,EAAE,cAAc;iBACtB;aACF;SACF;KACF;CACF,CAAA;AACD,4BAAY,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAA","sourcesContent":["import { sleep } from '@things-factory/utils'\nimport { TaskRegistry } from '../task-registry'\nimport { ConnectionManager } from '../connection-manager'\nimport { InputStep } from '../../service/step/step-type'\nimport { Context } from '../types'\n\nconst WITH_IP_FORMATS = ['string-with-ip', 'json-with-ip']\n\nfunction convertDataFormat(data: string, format: string, ip?: string) {\n  let converted: any\n  try {\n    const baseFormat = format.replace('-with-ip', '')\n    if (baseFormat == 'json') {\n      converted = JSON.parse(data)\n    } else if (baseFormat == 'csv') {\n      converted = data.split(',')\n    } else {\n      converted = data\n    }\n  } catch (e) {\n    converted = data.toString()\n  }\n\n  // IP 포함 포맷이면 { data, ip } 형태로 반환한다\n  if (WITH_IP_FORMATS.includes(format) && ip) {\n    return { data: converted, ip }\n  }\n\n  return converted\n}\n\nasync function SocketListener(step: InputStep, context: Context) {\n  //get connection data\n  const {\n    connection: connectionName,\n    params: { dataFormat = 'JSON' },\n    name\n  } = step\n\n  const { domain, logger, closures, __socket_listener } = context\n  logger.info('\\r\\n')\n  if (!__socket_listener) {\n    context.__socket_listener = {}\n  }\n\n  // get socket information from connection\n  var connection = await ConnectionManager.getConnectionInstanceByName(domain, connectionName)\n  if (!connection) {\n    throw new Error(`connector '${connectionName}' is not established.`)\n  }\n\n  /*\n   * 1. listner list에서 listner를 찾는다. 없으면, 생성한다.\n   */\n  if (!context.__socket_listener[name]) {\n    try {\n      var MESSAGES = []\n      context.__socket_listener[name] = async () => {\n        while (MESSAGES.length == 0) {\n          await sleep(100)\n        }\n        var message = MESSAGES.shift()\n        return {\n          message\n        }\n      }\n\n      await connection.addListener('socket-message-arrive', async (message: string, ip: string) => {\n        logger.info(message.toString())\n        MESSAGES.push(convertDataFormat(message.toString(), dataFormat, ip))\n      })\n    } catch (e) {\n      logger.error(e)\n    }\n  }\n\n  var { message } = await context.__socket_listener[name]()\n\n  return {\n    data: message\n  }\n}\n\nSocketListener.parameterSpec = [\n  {\n    type: 'select',\n    label: 'data-format',\n    name: 'dataFormat',\n    property: {\n      options: [\n        {\n          display: 'CSV',\n          value: 'csv'\n        },\n        {\n          display: 'JSON',\n          value: 'json'\n        },\n        {\n          display: 'String',\n          value: 'string'\n        },\n        {\n          display: 'String with IP',\n          value: 'string-with-ip'\n        },\n        {\n          display: 'JSON with IP',\n          value: 'json-with-ip'\n        }\n      ]\n    }\n  }\n]\nTaskRegistry.registerTaskHandler('socket-listener', SocketListener)\n"]}

package/dist-server/engine/task/utils/headless-request-with-recovery.js

@@ -72,6 +72,12 @@ async function executeHeadlessRequestWithRecovery(connectionName, options, conte
                             .catch(() => logger.warn('Page readyState timeout'));
                         // JavaScript 초기화를 위한 추가 대기 (핵심 해결책)
                         await new Promise(resolve => setTimeout(resolve, 2000));
+                        // 재연결 후 페이지가 올바른 도메인에 있는지 확인
+                        const resetPageUrl = page.url();
+                        if (!resetPageUrl.startsWith(targetDomain)) {
+                            logger.info(`Navigating reset page to target domain: ${targetDomain} (current: ${resetPageUrl})`);
+                            await page.goto(targetDomain, { waitUntil: 'networkidle2' });
+                        }
                         logger.info(`Full connection reset successful for connection '${connectionName}'`);
                     }
                     catch (resetError) {
@@ -120,6 +126,7 @@ async function executeHeadlessRequestWithRecovery(connectionName, options, conte
                     requestOptions.body = typeof requestBody === 'string' ? requestBody : JSON.stringify(requestBody);
                 }
             }
+            logger.info(`[Fetch] Target: ${url.toString()}, Page: ${page.url()}`);
             const response = await page.evaluate(async (urlString, opts, loginPagePath) => {
                 try {
                     // 페이지 상태 검증 (about:blank 또는 로딩 중인 페이지에서 fetch 방지)
@@ -136,44 +143,30 @@ async function executeHeadlessRequestWithRecovery(connectionName, options, conte
                             networkError: true
                         };
                     }
-                    const response = await fetch(urlString, { ...opts, redirect: 'manual' });
+                    const response = await fetch(urlString, opts);
                     const result = {
                         ok: response.ok,
                         status: response.status,
                         statusText: response.statusText,
                         headers: Object.fromEntries(response.headers.entries())
                     };
-                    // 302 리디렉션 감지 - 로그인 페이지로의 리디렉션 체크
-                    if ([301, 302, 307, 308].includes(response.status)) {
-                        const location = response.headers.get('location') || '';
-                        // connection의 loginPagePath와 일반적인 로그인 경로들을 체크
-                        if (location.includes(loginPagePath) ||
-                            location.includes('/login') ||
-                            location.includes('/signin') ||
-                            location.includes('/auth')) {
+                    // 리디렉션 감지 - 로그인 페이지로의 리디렉션 체크
+                    // 브라우저 Fetch API에서 redirect: 'manual'은 opaque response(status=0)를 반환하므로
+                    // redirect: 'follow'(기본값)를 사용하고 response.redirected로 감지
+                    if (response.redirected) {
+                        const finalUrl = response.url || '';
+                        if (finalUrl.includes(loginPagePath) ||
+                            finalUrl.includes('/login') ||
+                            finalUrl.includes('/signin') ||
+                            finalUrl.includes('/auth')) {
                             return {
                                 ...result,
-                                error: `Redirected to login page: ${location}`,
+                                error: `Redirected to login page: ${finalUrl}`,
                                 redirectedToLogin: true,
-                                location,
+                                location: finalUrl,
                                 data: null
                             };
                         }
-                        // 다른 리디렉션은 follow
-                        const redirectResponse = await fetch(urlString, opts);
-                        return {
-                            ok: redirectResponse.ok,
-                            status: redirectResponse.status,
-                            statusText: redirectResponse.statusText,
-                            headers: Object.fromEntries(redirectResponse.headers.entries()),
-                            data: redirectResponse.ok
-                                ? await redirectResponse
-                                    .json()
-                                    .catch(() => redirectResponse.text())
-                                    .catch(() => null)
-                                : null,
-                            error: redirectResponse.ok ? null : `HTTP ${redirectResponse.status}: ${redirectResponse.statusText}`
-                        };
                     }
                     // status가 0인 경우는 네트워크 레벨 에러 (CORS, 연결 실패 등)
                     if (response.status === 0) {
@@ -257,6 +250,11 @@ async function executeHeadlessRequestWithRecovery(connectionName, options, conte
                         if (resetUrl === 'about:blank') {
                             throw new Error('Page stuck on about:blank after reset');
                         }
+                        // 재연결 후 페이지가 올바른 도메인에 있는지 확인
+                        if (!resetUrl.startsWith(targetDomain)) {
+                            logger.info(`Navigating reset page to target domain: ${targetDomain} (current: ${resetUrl})`);
+                            await page.goto(targetDomain, { waitUntil: 'networkidle2' });
+                        }
                     }
                     catch (resetError) {
                         logger.error(`Connection reset failed after login redirect for connection '${connectionName}':`, resetError);
@@ -295,6 +293,11 @@ async function executeHeadlessRequestWithRecovery(connectionName, options, conte
                         if (resetUrl === 'about:blank') {
                             throw new Error('Page stuck on about:blank after reset');
                         }
+                        // 재연결 후 페이지가 올바른 도메인에 있는지 확인
+                        if (!resetUrl.startsWith(targetDomain)) {
+                            logger.info(`Navigating reset page to target domain: ${targetDomain} (current: ${resetUrl})`);
+                            await page.goto(targetDomain, { waitUntil: 'networkidle2' });
+                        }
                     }
                     catch (resetError) {
                         logger.error(`Connection reset failed after session timeout for connection '${connectionName}':`, resetError);

package/dist-server/engine/task/utils/headless-request-with-recovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"headless-request-with-recovery.js","sourceRoot":"","sources":["../../../../server/engine/task/utils/headless-request-with-recovery.ts"],"names":[],"mappings":"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","sourcesContent":["import { access } from '@things-factory/utils'\nimport { ConnectionManager } from '../../connection-manager'\n\nexport interface HeadlessRequestOptions {\n  method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE'\n  path: string\n  headers?: Record<string, string>\n  body?: any\n  queryParams?: Record<string, any>\n  maxRetries?: number\n  accessor?: string // POST 요청에서 data 접근용\n  contentType?: string // POST 요청에서 content-type 지정용\n}\n\n/**\n * 세션 회복 기능을 포함한 headless HTTP 요청 함수\n */\nexport async function executeHeadlessRequestWithRecovery(\n  connectionName: string,\n  options: HeadlessRequestOptions,\n  context: { logger: any; data: any; domain: any }\n): Promise<any> {\n  const { logger, data, domain } = context\n  const { method, path, headers = {}, body, queryParams, maxRetries = 2, accessor, contentType } = options\n\n  // 요청 컨텍스트 로깅 (발전소 식별을 위한 데이터 포함)\n  const contextInfo = [`Connection: ${connectionName}`, `Path: ${path}`]\n\n  // 발전소 식별자 추출 (디버깅용)\n  if (data) {\n    const identifiers = ['ICUS', 'SEL_METER_ID', 'plantId', 'siteId', 'powerPlantId']\n    identifiers.forEach(key => {\n      if (data[key]) {\n        contextInfo.push(`${key}: ${data[key]}`)\n      }\n    })\n  }\n\n  logger.info(`[Context] ${contextInfo.join(', ')}`)\n\n  // accessor가 있으면 data에서 body 추출\n  let requestBody = body\n  if (accessor && data) {\n    requestBody = access(accessor, data)\n  }\n\n  const connection = await ConnectionManager.getConnectionInstanceByName(domain, connectionName)\n  if (!connection) {\n    throw new Error(`Connection '${connectionName}' is not established.`)\n  }\n\n  const {\n    endpoint,\n    params: connectionParams,\n    acquireSessionPage,\n    releasePage,\n    reAuthenticateSession,\n    validateSession\n  } = connection\n  const loginPagePath = connectionParams?.loginPagePath || '/login'\n\n  let page = null\n  let pageResource = null // 리소스 추적 객체\n  let lastError = null\n\n  // 재시도 로직\n  for (let attempt = 0; attempt <= maxRetries; attempt++) {\n    try {\n      // 페이지 획득\n      const sessionResult = await acquireSessionPage()\n\n      // reAuthenticateSession의 반환 형태 확인\n      if (sessionResult && typeof sessionResult === 'object' && sessionResult.page) {\n        pageResource = sessionResult // {page, browser, requiresManualRelease}\n        page = sessionResult.page\n      } else {\n        page = sessionResult\n        pageResource = { page, requiresManualRelease: false }\n      }\n\n      // 페이지가 올바른 도메인에 있는지 확인\n      const currentUrl = page.url()\n      const targetDomain = new URL(endpoint).origin\n      if (!currentUrl.startsWith(targetDomain)) {\n        logger.info(`Navigating to target domain: ${targetDomain}`)\n        await page.goto(targetDomain, { waitUntil: 'networkidle2' })\n      }\n\n      // 세션 검증은 2번째 시도부터만 수행 (첫 번째는 새 페이지이므로 불필요)\n      if (attempt > 0) {\n        const isSessionValid = await validateSession(page)\n\n        if (!isSessionValid) {\n          logger.warn(\n            `Session invalid for connection '${connectionName}', attempting full connection reset (attempt: ${attempt + 1})`\n          )\n\n          try {\n            const resetResult = await performFullConnectionReset(\n              domain,\n              connectionName,\n              logger,\n              pageResource,\n              releasePage\n            )\n            pageResource = resetResult.pageResource\n            page = resetResult.page\n\n            // 재연결 후 페이지 완전 준비 대기\n            await page\n              .waitForFunction(() => document.readyState === 'complete', { timeout: 10000 })\n              .catch(() => logger.warn('Page readyState timeout'))\n\n            // JavaScript 초기화를 위한 추가 대기 (핵심 해결책)\n            await new Promise(resolve => setTimeout(resolve, 2000))\n\n            logger.info(`Full connection reset successful for connection '${connectionName}'`)\n          } catch (resetError) {\n            logger.error(`Connection reset failed for connection '${connectionName}':`, resetError)\n            // 재설정 실패 시 이번 시도는 실패로 처리하고 다음 시도로 넘어감\n            if (attempt === maxRetries) {\n              throw new Error(`Connection reset failed after ${maxRetries + 1} attempts: ${resetError.message}`)\n            }\n            continue\n          }\n        }\n      }\n\n      // URL 구성\n      const url = new URL(path, endpoint)\n      if (queryParams && typeof queryParams === 'object') {\n        Object.keys(queryParams).forEach(key => {\n          if (queryParams[key] !== null && queryParams[key] !== undefined) {\n            url.searchParams.append(key, String(queryParams[key]))\n          }\n        })\n      }\n\n      // 요청 옵션 구성\n      const requestOptions: any = {\n        method,\n        headers: {\n          ...headers\n        },\n        credentials: 'include'\n      }\n\n      // Content-Type과 body 처리\n      if (requestBody && ['POST', 'PUT', 'PATCH'].includes(method)) {\n        if (contentType) {\n          requestOptions.headers['content-type'] = contentType\n          switch (contentType) {\n            case 'text/plain':\n              requestOptions.body = JSON.stringify(requestBody)\n              break\n            case 'application/json':\n            default:\n              requestOptions.body = typeof requestBody === 'string' ? requestBody : JSON.stringify(requestBody)\n              break\n          }\n        } else {\n          requestOptions.headers['Content-Type'] = 'application/json'\n          requestOptions.body = typeof requestBody === 'string' ? requestBody : JSON.stringify(requestBody)\n        }\n      }\n\n      const response = await page.evaluate(\n        async (urlString, opts, loginPagePath) => {\n          try {\n            // 페이지 상태 검증 (about:blank 또는 로딩 중인 페이지에서 fetch 방지)\n            const pageLocation = window.location.href\n            const pageReadyState = document.readyState\n\n            if (pageLocation === 'about:blank' || pageReadyState !== 'complete') {\n              return {\n                ok: false,\n                status: 0,\n                statusText: 'Page Not Ready',\n                headers: {},\n                error: `Page state invalid - location: ${pageLocation}, readyState: ${pageReadyState}`,\n                data: null,\n                networkError: true\n              }\n            }\n\n            const response = await fetch(urlString, { ...opts, redirect: 'manual' })\n\n            const result = {\n              ok: response.ok,\n              status: response.status,\n              statusText: response.statusText,\n              headers: Object.fromEntries(response.headers.entries())\n            }\n\n            // 302 리디렉션 감지 - 로그인 페이지로의 리디렉션 체크\n            if ([301, 302, 307, 308].includes(response.status)) {\n              const location = response.headers.get('location') || ''\n              // connection의 loginPagePath와 일반적인 로그인 경로들을 체크\n              if (\n                location.includes(loginPagePath) ||\n                location.includes('/login') ||\n                location.includes('/signin') ||\n                location.includes('/auth')\n              ) {\n                return {\n                  ...result,\n                  error: `Redirected to login page: ${location}`,\n                  redirectedToLogin: true,\n                  location,\n                  data: null\n                }\n              }\n              // 다른 리디렉션은 follow\n              const redirectResponse = await fetch(urlString, opts)\n              return {\n                ok: redirectResponse.ok,\n                status: redirectResponse.status,\n                statusText: redirectResponse.statusText,\n                headers: Object.fromEntries(redirectResponse.headers.entries()),\n                data: redirectResponse.ok\n                  ? await redirectResponse\n                      .json()\n                      .catch(() => redirectResponse.text())\n                      .catch(() => null)\n                  : null,\n                error: redirectResponse.ok ? null : `HTTP ${redirectResponse.status}: ${redirectResponse.statusText}`\n              }\n            }\n\n            // status가 0인 경우는 네트워크 레벨 에러 (CORS, 연결 실패 등)\n            if (response.status === 0) {\n              return {\n                ok: false,\n                status: 0,\n                statusText: response.statusText || 'Network Error',\n                headers: {},\n                error: 'HTTP 0 - Network connection failed (possible CORS, SSL, or connectivity issue)',\n                data: null,\n                networkError: true\n              }\n            }\n\n            if (!response.ok) {\n              return {\n                ...result,\n                error: `HTTP ${response.status}: ${response.statusText}`,\n                data: null\n              }\n            }\n\n            const contentType = response.headers.get('content-type') || ''\n\n            if (contentType.includes('application/json')) {\n              result['data'] = await response.json()\n            } else if (contentType.includes('text/')) {\n              result['data'] = await response.text()\n            } else {\n              // 응답이 없는 경우 (204 No Content 등)\n              result['data'] = null\n            }\n\n            return result\n          } catch (fetchError) {\n            // 네트워크 레벨 에러 처리\n            return {\n              ok: false,\n              status: 0,\n              statusText: 'Network Error',\n              headers: {},\n              error: fetchError.message || 'Failed to fetch',\n              data: null,\n              networkError: true\n            }\n          }\n        },\n        url.toString(),\n        requestOptions,\n        loginPagePath\n      )\n\n      // 네트워크 에러 체크 (fetch 자체가 실패한 경우)\n      if (response.networkError) {\n        if (attempt < maxRetries) {\n          logger.warn(`Network error detected: ${response.error}, retrying... (${attempt + 1}/${maxRetries + 1})`)\n          await safeReleasePageResource(pageResource, releasePage, logger)\n          page = null\n          pageResource = null\n          continue\n        } else {\n          await safeReleasePageResource(pageResource, releasePage, logger)\n          throw new Error(`Network error after ${maxRetries + 1} attempts: ${response.error}`)\n        }\n      }\n\n      // 로그인 리디렉션 감지 처리\n      if (response.redirectedToLogin) {\n        if (attempt < maxRetries) {\n          logger.warn(\n            `Login redirect detected: ${response.location}, performing full connection reset... (${attempt + 1}/${maxRetries + 1})`\n          )\n\n          // CRITICAL: 커넥션 재연결 방식으로 완전한 초기화\n          try {\n            const resetResult = await performFullConnectionReset(\n              domain,\n              connectionName,\n              logger,\n              pageResource,\n              releasePage\n            )\n            pageResource = resetResult.pageResource\n            page = resetResult.page\n\n            // 재연결 후 페이지 완전 준비 대기\n            await page\n              .waitForFunction(() => document.readyState === 'complete', { timeout: 10000 })\n              .catch(() => logger.warn('Page readyState timeout'))\n\n            // JavaScript 초기화를 위한 추가 대기\n            await new Promise(resolve => setTimeout(resolve, 2000))\n\n            // 페이지 상태 확인\n            const resetUrl = page.url()\n            const cookies = await page.cookies()\n\n            logger.info(`[Reset Success] URL: ${resetUrl}, Cookies: ${cookies.length}`)\n\n            // about:blank 체크\n            if (resetUrl === 'about:blank') {\n              throw new Error('Page stuck on about:blank after reset')\n            }\n          } catch (resetError) {\n            logger.error(`Connection reset failed after login redirect for connection '${connectionName}':`, resetError)\n            if (attempt === maxRetries) {\n              throw new Error(`Connection reset failed after login redirect: ${resetError.message}`)\n            }\n            continue\n          }\n          continue\n        } else {\n          await safeReleasePageResource(pageResource, releasePage, logger)\n          throw new Error(`Login redirect after ${maxRetries + 1} attempts: ${response.error}`)\n        }\n      }\n\n      // 세션 타임아웃 관련 에러 체크\n      if (!response.ok && isSessionTimeoutError(response.status)) {\n        if (attempt < maxRetries) {\n          logger.warn(\n            `Session timeout detected (${response.status}), performing full connection reset... (${attempt + 1}/${maxRetries + 1})`\n          )\n\n          // CRITICAL: 커넥션 재연결 방식으로 완전한 초기화\n          try {\n            const resetResult = await performFullConnectionReset(\n              domain,\n              connectionName,\n              logger,\n              pageResource,\n              releasePage\n            )\n            pageResource = resetResult.pageResource\n            page = resetResult.page\n\n            // 재연결 후 페이지 완전 준비 대기\n            await page\n              .waitForFunction(() => document.readyState === 'complete', { timeout: 10000 })\n              .catch(() => logger.warn('Page readyState timeout'))\n\n            // JavaScript 초기화를 위한 추가 대기\n            await new Promise(resolve => setTimeout(resolve, 2000))\n\n            // 페이지 상태 확인\n            const resetUrl = page.url()\n            const cookies = await page.cookies()\n\n            logger.info(`[Reset Success] URL: ${resetUrl}, Cookies: ${cookies.length}`)\n\n            // about:blank 체크\n            if (resetUrl === 'about:blank') {\n              throw new Error('Page stuck on about:blank after reset')\n            }\n          } catch (resetError) {\n            logger.error(\n              `Connection reset failed after session timeout for connection '${connectionName}':`,\n              resetError\n            )\n            if (attempt === maxRetries) {\n              throw new Error(`Connection reset failed after session timeout: ${resetError.message}`)\n            }\n            continue\n          }\n          continue\n        } else {\n          await safeReleasePageResource(pageResource, releasePage, logger)\n          throw new Error(`Session timeout after ${maxRetries + 1} attempts: ${response.error}`)\n        }\n      }\n\n      // 기타 HTTP 에러\n      if (!response.ok) {\n        throw new Error(response.error)\n      }\n\n      // 성공 시 페이지 릴리즈 후 결과 반환\n      const result = {\n        data: response.data,\n        status: response.status,\n        headers: response.headers\n      }\n\n      await safeReleasePageResource(pageResource, releasePage, logger)\n\n      return result\n    } catch (error) {\n      lastError = error\n      logger.error(`Headless request attempt ${attempt + 1} failed:`, error)\n\n      await safeReleasePageResource(pageResource, releasePage, logger)\n      page = null\n      pageResource = null\n\n      // 세션 관련 에러가 아니거나 마지막 재시도면 에러 발생\n      if (!isRecoverableError(error) || attempt === maxRetries) {\n        throw error\n      }\n\n      logger.info(`Retrying request... (${attempt + 2}/${maxRetries + 1})`)\n    }\n  }\n\n  // 모든 재시도가 실패한 경우 - 혹시 남은 리소스가 있으면 정리\n  if (pageResource) {\n    await safeReleasePageResource(pageResource, releasePage, logger)\n  }\n  throw lastError || new Error('Request failed after all retry attempts')\n}\n\n/**\n * 세션 타임아웃 관련 HTTP 상태 코드인지 확인\n */\nfunction isSessionTimeoutError(statusCode: number): boolean {\n  return [401, 403].includes(statusCode)\n}\n\n/**\n * 복구 가능한 에러인지 확인\n */\nfunction isRecoverableError(error: any): boolean {\n  const errorMessage = error.message?.toLowerCase() || ''\n\n  // 복구 가능한 에러 키워드 (네트워크, 세션/인증 관련)\n  const recoverableErrorKeywords = [\n    'failed to fetch',\n    'network error',\n    'connection failed',\n    'connection reset',\n    'timeout',\n    'timed out',\n    'unauthorized',\n    'forbidden',\n    'session',\n    'authentication',\n    'login',\n    'expired',\n    'redirected to login' // 로그인 리디렉션 추가\n  ]\n\n  return recoverableErrorKeywords.some(keyword => errorMessage.includes(keyword))\n}\n\n/**\n * Safely release page resource with comprehensive error handling\n */\nexport async function safeReleasePageResource(pageResource: any, releasePage: Function, logger: any): Promise<void> {\n  if (!pageResource) {\n    return\n  }\n\n  try {\n    // Handle different pageResource formats\n    if (pageResource.page) {\n      // This is a complex resource object {page, browser, requiresManualRelease}\n      const { page, browser, requiresManualRelease } = pageResource\n\n      if (requiresManualRelease && browser) {\n        // Manual release required - close page first, then release browser\n        try {\n          if (page && !page.isClosed()) {\n            await page.close()\n            logger.info('Page closed during manual resource release')\n          }\n        } catch (closeError) {\n          logger.error('Failed to close page during manual release:', closeError)\n        }\n\n        // Release browser back to pool\n        try {\n          const { getHeadlessPool } = require('../../resource-pool/headless-pool')\n          const pool = getHeadlessPool()\n          await pool.release(browser)\n          logger.info('Browser manually released to pool')\n        } catch (releaseError) {\n          logger.error('Failed to manually release browser to pool:', releaseError)\n        }\n      } else {\n        // Standard release through releasePage\n        await releasePage(page)\n        logger.info('Page released through standard releasePage method')\n      }\n    } else {\n      // Simple page object - use standard release\n      await releasePage(pageResource)\n      logger.info('Simple page resource released')\n    }\n  } catch (error) {\n    logger.error('Critical error during page resource release:', error)\n\n    // Last resort: try to force close the page if it exists\n    try {\n      const page = pageResource.page || pageResource\n      if (page && !page.isClosed()) {\n        await page.close()\n        logger.warn('Force closed page as last resort')\n      }\n    } catch (forceCloseError) {\n      logger.error('Failed to force close page:', forceCloseError)\n    }\n  }\n}\n\n/**\n * 커넥션을 완전 재초기화하는 함수\n * 세션 만료 시 커넥션 재연결과 동일한 완전한 초기화를 수행\n */\nasync function performFullConnectionReset(\n  domain: any,\n  connectionName: string,\n  logger: any,\n  pageResource: any,\n  releasePage: Function\n): Promise<{ pageResource: any; page: any }> {\n  // 기존 페이지 리소스 해제\n  await safeReleasePageResource(pageResource, releasePage, logger)\n\n  // 커넥션 엔티티 가져오기\n  const connectionEntity = await ConnectionManager.getConnectionEntityByName(domain, connectionName)\n  if (!connectionEntity) {\n    throw new Error('Connection entity not found for reset')\n  }\n\n  // Connector를 직접 사용하여 연결 재설정\n  const { type, edge } = connectionEntity\n  const ProxyConnector = require('../../connector/proxy-connector').ProxyConnector\n  const connector = edge ? ProxyConnector.instance : ConnectionManager.getConnector(type)\n\n  if (!connector) {\n    throw new Error(`Connector not found for type: ${type}`)\n  }\n\n  // 기존 연결 완전 해제\n  await connector.disconnect(connectionEntity)\n  logger.info(`Connection '${connectionName}' disconnected for reset`)\n\n  // 브라우저 완전 종료 및 리소스 정리 대기 (중요!)\n  // 수동 재연결 시에는 자연스럽게 시간이 지나가지만,\n  // 코드에서는 즉시 연결을 시도하므로 명시적 대기 필요\n  await new Promise(resolve => setTimeout(resolve, 3000))\n\n  // 새로운 연결 생성 (완전한 초기화)\n  await connector.connect(connectionEntity)\n  logger.info(`Connection '${connectionName}' reconnected after reset`)\n\n  // 새 브라우저 인스턴스 초기화 대기\n  await new Promise(resolve => setTimeout(resolve, 2000))\n\n  // 새로운 connection 인스턴스 가져오기\n  const newConnection = await ConnectionManager.getConnectionInstanceByName(domain, connectionName)\n  if (!newConnection || !newConnection.acquireSessionPage) {\n    throw new Error('Failed to acquire session page after connection reset')\n  }\n\n  const newSessionResult = await newConnection.acquireSessionPage()\n  let newPageResource: any\n  let newPage: any\n\n  if (newSessionResult && typeof newSessionResult === 'object' && newSessionResult.page) {\n    newPageResource = newSessionResult\n    newPage = newSessionResult.page\n  } else {\n    newPage = newSessionResult\n    newPageResource = { page: newPage, requiresManualRelease: false }\n  }\n\n  // 새 페이지 안정화 대기 (핵심!)\n  await new Promise(resolve => setTimeout(resolve, 1000))\n\n  return { pageResource: newPageResource, page: newPage }\n}\n"]}
+{"version":3,"file":"headless-request-with-recovery.js","sourceRoot":"","sources":["../../../../server/engine/task/utils/headless-request-with-recovery.ts"],"names":[],"mappings":"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","sourcesContent":["import { access } from '@things-factory/utils'\nimport { ConnectionManager } from '../../connection-manager'\n\nexport interface HeadlessRequestOptions {\n  method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE'\n  path: string\n  headers?: Record<string, string>\n  body?: any\n  queryParams?: Record<string, any>\n  maxRetries?: number\n  accessor?: string // POST 요청에서 data 접근용\n  contentType?: string // POST 요청에서 content-type 지정용\n}\n\n/**\n * 세션 회복 기능을 포함한 headless HTTP 요청 함수\n */\nexport async function executeHeadlessRequestWithRecovery(\n  connectionName: string,\n  options: HeadlessRequestOptions,\n  context: { logger: any; data: any; domain: any }\n): Promise<any> {\n  const { logger, data, domain } = context\n  const { method, path, headers = {}, body, queryParams, maxRetries = 2, accessor, contentType } = options\n\n  // 요청 컨텍스트 로깅 (발전소 식별을 위한 데이터 포함)\n  const contextInfo = [`Connection: ${connectionName}`, `Path: ${path}`]\n\n  // 발전소 식별자 추출 (디버깅용)\n  if (data) {\n    const identifiers = ['ICUS', 'SEL_METER_ID', 'plantId', 'siteId', 'powerPlantId']\n    identifiers.forEach(key => {\n      if (data[key]) {\n        contextInfo.push(`${key}: ${data[key]}`)\n      }\n    })\n  }\n\n  logger.info(`[Context] ${contextInfo.join(', ')}`)\n\n  // accessor가 있으면 data에서 body 추출\n  let requestBody = body\n  if (accessor && data) {\n    requestBody = access(accessor, data)\n  }\n\n  const connection = await ConnectionManager.getConnectionInstanceByName(domain, connectionName)\n  if (!connection) {\n    throw new Error(`Connection '${connectionName}' is not established.`)\n  }\n\n  const {\n    endpoint,\n    params: connectionParams,\n    acquireSessionPage,\n    releasePage,\n    reAuthenticateSession,\n    validateSession\n  } = connection\n  const loginPagePath = connectionParams?.loginPagePath || '/login'\n\n  let page = null\n  let pageResource = null // 리소스 추적 객체\n  let lastError = null\n\n  // 재시도 로직\n  for (let attempt = 0; attempt <= maxRetries; attempt++) {\n    try {\n      // 페이지 획득\n      const sessionResult = await acquireSessionPage()\n\n      // reAuthenticateSession의 반환 형태 확인\n      if (sessionResult && typeof sessionResult === 'object' && sessionResult.page) {\n        pageResource = sessionResult // {page, browser, requiresManualRelease}\n        page = sessionResult.page\n      } else {\n        page = sessionResult\n        pageResource = { page, requiresManualRelease: false }\n      }\n\n      // 페이지가 올바른 도메인에 있는지 확인\n      const currentUrl = page.url()\n      const targetDomain = new URL(endpoint).origin\n      if (!currentUrl.startsWith(targetDomain)) {\n        logger.info(`Navigating to target domain: ${targetDomain}`)\n        await page.goto(targetDomain, { waitUntil: 'networkidle2' })\n      }\n\n      // 세션 검증은 2번째 시도부터만 수행 (첫 번째는 새 페이지이므로 불필요)\n      if (attempt > 0) {\n        const isSessionValid = await validateSession(page)\n\n        if (!isSessionValid) {\n          logger.warn(\n            `Session invalid for connection '${connectionName}', attempting full connection reset (attempt: ${attempt + 1})`\n          )\n\n          try {\n            const resetResult = await performFullConnectionReset(\n              domain,\n              connectionName,\n              logger,\n              pageResource,\n              releasePage\n            )\n            pageResource = resetResult.pageResource\n            page = resetResult.page\n\n            // 재연결 후 페이지 완전 준비 대기\n            await page\n              .waitForFunction(() => document.readyState === 'complete', { timeout: 10000 })\n              .catch(() => logger.warn('Page readyState timeout'))\n\n            // JavaScript 초기화를 위한 추가 대기 (핵심 해결책)\n            await new Promise(resolve => setTimeout(resolve, 2000))\n\n            // 재연결 후 페이지가 올바른 도메인에 있는지 확인\n            const resetPageUrl = page.url()\n            if (!resetPageUrl.startsWith(targetDomain)) {\n              logger.info(`Navigating reset page to target domain: ${targetDomain} (current: ${resetPageUrl})`)\n              await page.goto(targetDomain, { waitUntil: 'networkidle2' })\n            }\n\n            logger.info(`Full connection reset successful for connection '${connectionName}'`)\n          } catch (resetError) {\n            logger.error(`Connection reset failed for connection '${connectionName}':`, resetError)\n            // 재설정 실패 시 이번 시도는 실패로 처리하고 다음 시도로 넘어감\n            if (attempt === maxRetries) {\n              throw new Error(`Connection reset failed after ${maxRetries + 1} attempts: ${resetError.message}`)\n            }\n            continue\n          }\n        }\n      }\n\n      // URL 구성\n      const url = new URL(path, endpoint)\n      if (queryParams && typeof queryParams === 'object') {\n        Object.keys(queryParams).forEach(key => {\n          if (queryParams[key] !== null && queryParams[key] !== undefined) {\n            url.searchParams.append(key, String(queryParams[key]))\n          }\n        })\n      }\n\n      // 요청 옵션 구성\n      const requestOptions: any = {\n        method,\n        headers: {\n          ...headers\n        },\n        credentials: 'include'\n      }\n\n      // Content-Type과 body 처리\n      if (requestBody && ['POST', 'PUT', 'PATCH'].includes(method)) {\n        if (contentType) {\n          requestOptions.headers['content-type'] = contentType\n          switch (contentType) {\n            case 'text/plain':\n              requestOptions.body = JSON.stringify(requestBody)\n              break\n            case 'application/json':\n            default:\n              requestOptions.body = typeof requestBody === 'string' ? requestBody : JSON.stringify(requestBody)\n              break\n          }\n        } else {\n          requestOptions.headers['Content-Type'] = 'application/json'\n          requestOptions.body = typeof requestBody === 'string' ? requestBody : JSON.stringify(requestBody)\n        }\n      }\n\n      logger.info(`[Fetch] Target: ${url.toString()}, Page: ${page.url()}`)\n\n      const response = await page.evaluate(\n        async (urlString, opts, loginPagePath) => {\n          try {\n            // 페이지 상태 검증 (about:blank 또는 로딩 중인 페이지에서 fetch 방지)\n            const pageLocation = window.location.href\n            const pageReadyState = document.readyState\n\n            if (pageLocation === 'about:blank' || pageReadyState !== 'complete') {\n              return {\n                ok: false,\n                status: 0,\n                statusText: 'Page Not Ready',\n                headers: {},\n                error: `Page state invalid - location: ${pageLocation}, readyState: ${pageReadyState}`,\n                data: null,\n                networkError: true\n              }\n            }\n\n            const response = await fetch(urlString, opts)\n\n            const result = {\n              ok: response.ok,\n              status: response.status,\n              statusText: response.statusText,\n              headers: Object.fromEntries(response.headers.entries())\n            }\n\n            // 리디렉션 감지 - 로그인 페이지로의 리디렉션 체크\n            // 브라우저 Fetch API에서 redirect: 'manual'은 opaque response(status=0)를 반환하므로\n            // redirect: 'follow'(기본값)를 사용하고 response.redirected로 감지\n            if (response.redirected) {\n              const finalUrl = response.url || ''\n              if (\n                finalUrl.includes(loginPagePath) ||\n                finalUrl.includes('/login') ||\n                finalUrl.includes('/signin') ||\n                finalUrl.includes('/auth')\n              ) {\n                return {\n                  ...result,\n                  error: `Redirected to login page: ${finalUrl}`,\n                  redirectedToLogin: true,\n                  location: finalUrl,\n                  data: null\n                }\n              }\n            }\n\n            // status가 0인 경우는 네트워크 레벨 에러 (CORS, 연결 실패 등)\n            if (response.status === 0) {\n              return {\n                ok: false,\n                status: 0,\n                statusText: response.statusText || 'Network Error',\n                headers: {},\n                error: 'HTTP 0 - Network connection failed (possible CORS, SSL, or connectivity issue)',\n                data: null,\n                networkError: true\n              }\n            }\n\n            if (!response.ok) {\n              return {\n                ...result,\n                error: `HTTP ${response.status}: ${response.statusText}`,\n                data: null\n              }\n            }\n\n            const contentType = response.headers.get('content-type') || ''\n\n            if (contentType.includes('application/json')) {\n              result['data'] = await response.json()\n            } else if (contentType.includes('text/')) {\n              result['data'] = await response.text()\n            } else {\n              // 응답이 없는 경우 (204 No Content 등)\n              result['data'] = null\n            }\n\n            return result\n          } catch (fetchError) {\n            // 네트워크 레벨 에러 처리\n            return {\n              ok: false,\n              status: 0,\n              statusText: 'Network Error',\n              headers: {},\n              error: fetchError.message || 'Failed to fetch',\n              data: null,\n              networkError: true\n            }\n          }\n        },\n        url.toString(),\n        requestOptions,\n        loginPagePath\n      )\n\n      // 네트워크 에러 체크 (fetch 자체가 실패한 경우)\n      if (response.networkError) {\n        if (attempt < maxRetries) {\n          logger.warn(`Network error detected: ${response.error}, retrying... (${attempt + 1}/${maxRetries + 1})`)\n          await safeReleasePageResource(pageResource, releasePage, logger)\n          page = null\n          pageResource = null\n          continue\n        } else {\n          await safeReleasePageResource(pageResource, releasePage, logger)\n          throw new Error(`Network error after ${maxRetries + 1} attempts: ${response.error}`)\n        }\n      }\n\n      // 로그인 리디렉션 감지 처리\n      if (response.redirectedToLogin) {\n        if (attempt < maxRetries) {\n          logger.warn(\n            `Login redirect detected: ${response.location}, performing full connection reset... (${attempt + 1}/${maxRetries + 1})`\n          )\n\n          // CRITICAL: 커넥션 재연결 방식으로 완전한 초기화\n          try {\n            const resetResult = await performFullConnectionReset(\n              domain,\n              connectionName,\n              logger,\n              pageResource,\n              releasePage\n            )\n            pageResource = resetResult.pageResource\n            page = resetResult.page\n\n            // 재연결 후 페이지 완전 준비 대기\n            await page\n              .waitForFunction(() => document.readyState === 'complete', { timeout: 10000 })\n              .catch(() => logger.warn('Page readyState timeout'))\n\n            // JavaScript 초기화를 위한 추가 대기\n            await new Promise(resolve => setTimeout(resolve, 2000))\n\n            // 페이지 상태 확인\n            const resetUrl = page.url()\n            const cookies = await page.cookies()\n\n            logger.info(`[Reset Success] URL: ${resetUrl}, Cookies: ${cookies.length}`)\n\n            // about:blank 체크\n            if (resetUrl === 'about:blank') {\n              throw new Error('Page stuck on about:blank after reset')\n            }\n\n            // 재연결 후 페이지가 올바른 도메인에 있는지 확인\n            if (!resetUrl.startsWith(targetDomain)) {\n              logger.info(`Navigating reset page to target domain: ${targetDomain} (current: ${resetUrl})`)\n              await page.goto(targetDomain, { waitUntil: 'networkidle2' })\n            }\n          } catch (resetError) {\n            logger.error(`Connection reset failed after login redirect for connection '${connectionName}':`, resetError)\n            if (attempt === maxRetries) {\n              throw new Error(`Connection reset failed after login redirect: ${resetError.message}`)\n            }\n            continue\n          }\n          continue\n        } else {\n          await safeReleasePageResource(pageResource, releasePage, logger)\n          throw new Error(`Login redirect after ${maxRetries + 1} attempts: ${response.error}`)\n        }\n      }\n\n      // 세션 타임아웃 관련 에러 체크\n      if (!response.ok && isSessionTimeoutError(response.status)) {\n        if (attempt < maxRetries) {\n          logger.warn(\n            `Session timeout detected (${response.status}), performing full connection reset... (${attempt + 1}/${maxRetries + 1})`\n          )\n\n          // CRITICAL: 커넥션 재연결 방식으로 완전한 초기화\n          try {\n            const resetResult = await performFullConnectionReset(\n              domain,\n              connectionName,\n              logger,\n              pageResource,\n              releasePage\n            )\n            pageResource = resetResult.pageResource\n            page = resetResult.page\n\n            // 재연결 후 페이지 완전 준비 대기\n            await page\n              .waitForFunction(() => document.readyState === 'complete', { timeout: 10000 })\n              .catch(() => logger.warn('Page readyState timeout'))\n\n            // JavaScript 초기화를 위한 추가 대기\n            await new Promise(resolve => setTimeout(resolve, 2000))\n\n            // 페이지 상태 확인\n            const resetUrl = page.url()\n            const cookies = await page.cookies()\n\n            logger.info(`[Reset Success] URL: ${resetUrl}, Cookies: ${cookies.length}`)\n\n            // about:blank 체크\n            if (resetUrl === 'about:blank') {\n              throw new Error('Page stuck on about:blank after reset')\n            }\n\n            // 재연결 후 페이지가 올바른 도메인에 있는지 확인\n            if (!resetUrl.startsWith(targetDomain)) {\n              logger.info(`Navigating reset page to target domain: ${targetDomain} (current: ${resetUrl})`)\n              await page.goto(targetDomain, { waitUntil: 'networkidle2' })\n            }\n          } catch (resetError) {\n            logger.error(\n              `Connection reset failed after session timeout for connection '${connectionName}':`,\n              resetError\n            )\n            if (attempt === maxRetries) {\n              throw new Error(`Connection reset failed after session timeout: ${resetError.message}`)\n            }\n            continue\n          }\n          continue\n        } else {\n          await safeReleasePageResource(pageResource, releasePage, logger)\n          throw new Error(`Session timeout after ${maxRetries + 1} attempts: ${response.error}`)\n        }\n      }\n\n      // 기타 HTTP 에러\n      if (!response.ok) {\n        throw new Error(response.error)\n      }\n\n      // 성공 시 페이지 릴리즈 후 결과 반환\n      const result = {\n        data: response.data,\n        status: response.status,\n        headers: response.headers\n      }\n\n      await safeReleasePageResource(pageResource, releasePage, logger)\n\n      return result\n    } catch (error) {\n      lastError = error\n      logger.error(`Headless request attempt ${attempt + 1} failed:`, error)\n\n      await safeReleasePageResource(pageResource, releasePage, logger)\n      page = null\n      pageResource = null\n\n      // 세션 관련 에러가 아니거나 마지막 재시도면 에러 발생\n      if (!isRecoverableError(error) || attempt === maxRetries) {\n        throw error\n      }\n\n      logger.info(`Retrying request... (${attempt + 2}/${maxRetries + 1})`)\n    }\n  }\n\n  // 모든 재시도가 실패한 경우 - 혹시 남은 리소스가 있으면 정리\n  if (pageResource) {\n    await safeReleasePageResource(pageResource, releasePage, logger)\n  }\n  throw lastError || new Error('Request failed after all retry attempts')\n}\n\n/**\n * 세션 타임아웃 관련 HTTP 상태 코드인지 확인\n */\nfunction isSessionTimeoutError(statusCode: number): boolean {\n  return [401, 403].includes(statusCode)\n}\n\n/**\n * 복구 가능한 에러인지 확인\n */\nfunction isRecoverableError(error: any): boolean {\n  const errorMessage = error.message?.toLowerCase() || ''\n\n  // 복구 가능한 에러 키워드 (네트워크, 세션/인증 관련)\n  const recoverableErrorKeywords = [\n    'failed to fetch',\n    'network error',\n    'connection failed',\n    'connection reset',\n    'timeout',\n    'timed out',\n    'unauthorized',\n    'forbidden',\n    'session',\n    'authentication',\n    'login',\n    'expired',\n    'redirected to login' // 로그인 리디렉션 추가\n  ]\n\n  return recoverableErrorKeywords.some(keyword => errorMessage.includes(keyword))\n}\n\n/**\n * Safely release page resource with comprehensive error handling\n */\nexport async function safeReleasePageResource(pageResource: any, releasePage: Function, logger: any): Promise<void> {\n  if (!pageResource) {\n    return\n  }\n\n  try {\n    // Handle different pageResource formats\n    if (pageResource.page) {\n      // This is a complex resource object {page, browser, requiresManualRelease}\n      const { page, browser, requiresManualRelease } = pageResource\n\n      if (requiresManualRelease && browser) {\n        // Manual release required - close page first, then release browser\n        try {\n          if (page && !page.isClosed()) {\n            await page.close()\n            logger.info('Page closed during manual resource release')\n          }\n        } catch (closeError) {\n          logger.error('Failed to close page during manual release:', closeError)\n        }\n\n        // Release browser back to pool\n        try {\n          const { getHeadlessPool } = require('../../resource-pool/headless-pool')\n          const pool = getHeadlessPool()\n          await pool.release(browser)\n          logger.info('Browser manually released to pool')\n        } catch (releaseError) {\n          logger.error('Failed to manually release browser to pool:', releaseError)\n        }\n      } else {\n        // Standard release through releasePage\n        await releasePage(page)\n        logger.info('Page released through standard releasePage method')\n      }\n    } else {\n      // Simple page object - use standard release\n      await releasePage(pageResource)\n      logger.info('Simple page resource released')\n    }\n  } catch (error) {\n    logger.error('Critical error during page resource release:', error)\n\n    // Last resort: try to force close the page if it exists\n    try {\n      const page = pageResource.page || pageResource\n      if (page && !page.isClosed()) {\n        await page.close()\n        logger.warn('Force closed page as last resort')\n      }\n    } catch (forceCloseError) {\n      logger.error('Failed to force close page:', forceCloseError)\n    }\n  }\n}\n\n/**\n * 커넥션을 완전 재초기화하는 함수\n * 세션 만료 시 커넥션 재연결과 동일한 완전한 초기화를 수행\n */\nasync function performFullConnectionReset(\n  domain: any,\n  connectionName: string,\n  logger: any,\n  pageResource: any,\n  releasePage: Function\n): Promise<{ pageResource: any; page: any }> {\n  // 기존 페이지 리소스 해제\n  await safeReleasePageResource(pageResource, releasePage, logger)\n\n  // 커넥션 엔티티 가져오기\n  const connectionEntity = await ConnectionManager.getConnectionEntityByName(domain, connectionName)\n  if (!connectionEntity) {\n    throw new Error('Connection entity not found for reset')\n  }\n\n  // Connector를 직접 사용하여 연결 재설정\n  const { type, edge } = connectionEntity\n  const ProxyConnector = require('../../connector/proxy-connector').ProxyConnector\n  const connector = edge ? ProxyConnector.instance : ConnectionManager.getConnector(type)\n\n  if (!connector) {\n    throw new Error(`Connector not found for type: ${type}`)\n  }\n\n  // 기존 연결 완전 해제\n  await connector.disconnect(connectionEntity)\n  logger.info(`Connection '${connectionName}' disconnected for reset`)\n\n  // 브라우저 완전 종료 및 리소스 정리 대기 (중요!)\n  // 수동 재연결 시에는 자연스럽게 시간이 지나가지만,\n  // 코드에서는 즉시 연결을 시도하므로 명시적 대기 필요\n  await new Promise(resolve => setTimeout(resolve, 3000))\n\n  // 새로운 연결 생성 (완전한 초기화)\n  await connector.connect(connectionEntity)\n  logger.info(`Connection '${connectionName}' reconnected after reset`)\n\n  // 새 브라우저 인스턴스 초기화 대기\n  await new Promise(resolve => setTimeout(resolve, 2000))\n\n  // 새로운 connection 인스턴스 가져오기\n  const newConnection = await ConnectionManager.getConnectionInstanceByName(domain, connectionName)\n  if (!newConnection || !newConnection.acquireSessionPage) {\n    throw new Error('Failed to acquire session page after connection reset')\n  }\n\n  const newSessionResult = await newConnection.acquireSessionPage()\n  let newPageResource: any\n  let newPage: any\n\n  if (newSessionResult && typeof newSessionResult === 'object' && newSessionResult.page) {\n    newPageResource = newSessionResult\n    newPage = newSessionResult.page\n  } else {\n    newPage = newSessionResult\n    newPageResource = { page: newPage, requiresManualRelease: false }\n  }\n\n  // 새 페이지 안정화 대기 (핵심!)\n  await new Promise(resolve => setTimeout(resolve, 1000))\n\n  return { pageResource: newPageResource, page: newPage }\n}\n"]}

package/dist-server/service/index.d.ts

@@ -12,7 +12,7 @@ export * from './payload-log/payload-log';
 export * from './state-register/state-register';
 export declare const entities: any[];
 export declare const schema: {
-    resolverClasses: (typeof import("./scenario-queue/scenario-queue-subscription").ScenarioQueueSubscription | typeof import("./scenario-instance/scenario-instance-subscription").ScenarioInstanceSubscription | typeof import("./scenario-instance/scenario-instance-query").ScenarioInstanceQuery | typeof import("./scenario/scenario-query").ScenarioQuery | typeof import("./connection/connection-query").ConnectionQuery | typeof import("./connection/connection-mutation").ConnectionMutation | typeof import("./connection/connection-subscription").ConnectionSubscription | typeof import("./connector/connector-query").ConnectorQuery | typeof import("./scenario/scenario-mutation").ScenarioMutation | typeof import("./scenario-instance/scenario-instance-mutation").ScenarioInstanceMutation | typeof import("./task-type/task-type-query").TaskTypeQuery | typeof import("./step/step-query").StepQuery | typeof import("./step/step-mutation").StepMutation | typeof import("./payload-log/payload-log-query").PayloadLogQuery | typeof import("./payload-log/payload-log-mutation").PayloadLogMutation | typeof import("./analysis/analysis-query").IntegrationAnalysisQuery | typeof import("./state-register/state-register-query").StateRegisterQuery | typeof import("./state-register/state-register-mutation").StateRegisterMutation | typeof import("./state-register/data-resolver").DataResolver)[];
+    resolverClasses: (typeof import("./connection/connection-query").ConnectionQuery | typeof import("./connection/connection-mutation").ConnectionMutation | typeof import("./connection/connection-subscription").ConnectionSubscription | typeof import("./connector/connector-query").ConnectorQuery | typeof import("./scenario/scenario-query").ScenarioQuery | typeof import("./scenario/scenario-mutation").ScenarioMutation | typeof import("./scenario-instance/scenario-instance-query").ScenarioInstanceQuery | typeof import("./scenario-instance/scenario-instance-mutation").ScenarioInstanceMutation | typeof import("./scenario-instance/scenario-instance-subscription").ScenarioInstanceSubscription | typeof import("./scenario-queue/scenario-queue-subscription").ScenarioQueueSubscription | typeof import("./step/step-query").StepQuery | typeof import("./step/step-mutation").StepMutation | typeof import("./task-type/task-type-query").TaskTypeQuery | typeof import("./payload-log/payload-log-query").PayloadLogQuery | typeof import("./payload-log/payload-log-mutation").PayloadLogMutation | typeof import("./state-register/state-register-query").StateRegisterQuery | typeof import("./state-register/state-register-mutation").StateRegisterMutation | typeof import("./state-register/data-resolver").DataResolver | typeof import("./analysis/analysis-query").IntegrationAnalysisQuery)[];
 };
 export { PayloadType } from './payload-log/payload-log';
 export { createPayloadLog } from './payload-log/payload-log-mutation';

package/dist-server/service/scenario-instance/index.d.ts

@@ -2,4 +2,4 @@ import { ScenarioInstanceQuery } from './scenario-instance-query';
 import { ScenarioInstanceMutation } from './scenario-instance-mutation';
 import { ScenarioInstanceSubscription } from './scenario-instance-subscription';
 export declare const entities: any[];
-export declare const resolvers: (typeof ScenarioInstanceSubscription | typeof ScenarioInstanceQuery | typeof ScenarioInstanceMutation)[];
+export declare const resolvers: (typeof ScenarioInstanceQuery | typeof ScenarioInstanceMutation | typeof ScenarioInstanceSubscription)[];