From db60190e198fd39298fbc2058b0d2bcc783d9a4e Mon Sep 17 00:00:00 2001 From: Park Dahyeon Date: Thu, 13 Aug 2026 01:34:54 +0900 Subject: [PATCH] . --- electron/main/auto-reservation.ts | 2 + electron/main/captcha-window.ts | 165 ++++++++++++++++++++++ electron/main/keyescape-http.ts | 218 ++++++++++++++++++++++++++++- electron/main/reservation.ts | 14 +- electron/main/server-clock-core.ts | 10 ++ electron/main/server-clock.ts | 34 ++++- package.json | 2 +- src/ReservationApp.tsx | 21 +-- src/components/AutomationPanel.tsx | 23 ++- src/type/reservation.ts | 20 ++- test/e2e/e2e.spec.ts | 16 ++- test/keyescape-http.test.ts | 18 ++- test/screenshots/e2e.png | Bin 80391 -> 120251 bytes 13 files changed, 505 insertions(+), 38 deletions(-) create mode 100644 electron/main/captcha-window.ts diff --git a/electron/main/auto-reservation.ts b/electron/main/auto-reservation.ts index abb58f0..94d73d0 100644 --- a/electron/main/auto-reservation.ts +++ b/electron/main/auto-reservation.ts @@ -224,6 +224,8 @@ export class AutoReservationService { httpStatus: transport?.httpStatus, remoteIp: transport?.remoteIp, reusedSocket: transport?.reusedSocket, + protocol: transport?.protocol, + connectionId: transport?.connectionId, }, } } catch (error) { diff --git a/electron/main/captcha-window.ts b/electron/main/captcha-window.ts new file mode 100644 index 0000000..de948fb --- /dev/null +++ b/electron/main/captcha-window.ts @@ -0,0 +1,165 @@ +import { BrowserWindow, session } from 'electron' +import type { CaptchaResult, ReservationSelection } from '../../src/type/reservation' +import { EDGE_USER_AGENT, encodeMultipart } from './keyescape-http' + +const BASE_URL = 'https://www.keyescape.com' +const CAPTCHA_PARTITION = 'persist:escape-reserve-captcha' +const TOKEN_POLL_INTERVAL_MS = 200 +const MAX_TOKEN_LENGTH = 8_000 + +let captchaWindow: BrowserWindow | null = null + +function captchaForm(selection: ReservationSelection) { + return encodeMultipart({ + zizumNum: String(selection.branchNum), + themeNum: String(selection.themeNum), + themeInfoNum: String(selection.themeInfoNum), + revDays: selection.date, + themeTimeNum: String(selection.timeNum), + revTimes: selection.timeLabel, + themeName: selection.themeName, + }) +} + +function isAllowedTopLevelUrl(rawUrl: string) { + try { + const url = new URL(rawUrl) + return url.protocol === 'https:' && url.hostname === 'www.keyescape.com' + } catch { + return false + } +} + +const AUTH_WINDOW_GUARD = `(() => { + if (window.__escapeReserveCaptchaGuard) return + window.__escapeReserveCaptchaGuard = true + + document.addEventListener('submit', (event) => { + event.preventDefault() + event.stopImmediatePropagation() + }, true) + + const banner = document.createElement('div') + banner.setAttribute('role', 'status') + banner.textContent = 'Escape Reserve 보안 인증 창 · CAPTCHA만 인증할 수 있으며 예약 제출은 차단됩니다.' + Object.assign(banner.style, { + position: 'fixed', + zIndex: '2147483647', + inset: '0 0 auto 0', + padding: '12px 18px', + background: '#111111', + color: '#ffffff', + font: '600 13px/1.4 system-ui, sans-serif', + textAlign: 'center', + boxShadow: '0 2px 12px rgba(0,0,0,.25)' + }) + document.documentElement.appendChild(banner) + document.documentElement.style.scrollPaddingTop = '48px' +})()` + +const READ_CAPTCHA_TOKEN = `(() => { + const field = document.querySelector('textarea[name="g-recaptcha-response"], #g-recaptcha-response') + return field && typeof field.value === 'string' ? field.value : '' +})()` + +export async function openCaptchaWindow(selection: ReservationSelection): Promise { + if (captchaWindow && !captchaWindow.isDestroyed()) { + captchaWindow.focus() + throw new Error('CAPTCHA 인증 창이 이미 열려 있습니다.') + } + + const parent = BrowserWindow.getFocusedWindow() ?? undefined + const captchaSession = session.fromPartition(CAPTCHA_PARTITION, { cache: true }) + captchaSession.setPermissionRequestHandler((_webContents, _permission, callback) => callback(false)) + captchaSession.webRequest.onBeforeRequest({ + urls: [`${BASE_URL}/controller/run_proc.php*`], + }, (_details, callback) => callback({ cancel: true })) + + const window = new BrowserWindow({ + parent, + modal: Boolean(parent), + title: 'CAPTCHA 인증 · Escape Reserve', + width: 1180, + height: 820, + minWidth: 760, + minHeight: 620, + show: false, + autoHideMenuBar: true, + backgroundColor: '#fbf9fb', + webPreferences: { + partition: CAPTCHA_PARTITION, + nodeIntegration: false, + contextIsolation: true, + sandbox: true, + devTools: false, + webSecurity: true, + }, + }) + captchaWindow = window + + window.webContents.setWindowOpenHandler(() => ({ action: 'deny' })) + window.webContents.on('will-navigate', (event, url) => { + if (!isAllowedTopLevelUrl(url)) event.preventDefault() + }) + + return new Promise((resolve, reject) => { + let settled = false + let pollTimer: NodeJS.Timeout | undefined + + const cleanup = () => { + if (pollTimer) clearInterval(pollTimer) + pollTimer = undefined + if (captchaWindow === window) captchaWindow = null + } + + const fail = (message: string) => { + if (settled) return + settled = true + cleanup() + reject(new Error(message)) + if (!window.isDestroyed()) window.destroy() + } + + const pollToken = async () => { + if (settled || window.isDestroyed() || window.webContents.isLoadingMainFrame()) return + try { + const value = await window.webContents.executeJavaScript(READ_CAPTCHA_TOKEN, true) + const token = typeof value === 'string' ? value.trim().slice(0, MAX_TOKEN_LENGTH) : '' + if (token.length < 30 || settled) return + settled = true + cleanup() + resolve({ token, solvedAtMs: Date.now() }) + window.destroy() + } catch { + // Navigations temporarily destroy the execution context; the next poll retries. + } + } + + window.once('closed', () => { + cleanup() + if (!settled) { + settled = true + reject(new Error('CAPTCHA 인증을 취소했습니다.')) + } + }) + window.webContents.on('did-fail-load', (_event, errorCode, errorDescription, _url, isMainFrame) => { + if (isMainFrame && errorCode !== -3) fail(`CAPTCHA 페이지를 불러오지 못했습니다: ${errorDescription}`) + }) + window.webContents.on('dom-ready', () => { + void window.webContents.executeJavaScript(AUTH_WINDOW_GUARD, true).catch(() => undefined) + }) + window.webContents.once('did-finish-load', () => { + window.show() + pollTimer = setInterval(() => void pollToken(), TOKEN_POLL_INTERVAL_MS) + void pollToken() + }) + + const multipart = captchaForm(selection) + void window.loadURL(`${BASE_URL}/reservation2.php`, { + httpReferrer: `${BASE_URL}/reservation1.php?zizum_num=${selection.branchNum}&theme_num=${selection.themeNum}&theme_info_num=${selection.themeInfoNum}`, + userAgent: EDGE_USER_AGENT, + extraHeaders: `Content-Type: multipart/form-data; boundary=${multipart.boundary}\n`, + postData: [{ type: 'rawData', bytes: multipart.body }], + }).catch((error) => fail(error instanceof Error ? error.message : 'CAPTCHA 페이지를 열지 못했습니다.')) + }) +} diff --git a/electron/main/keyescape-http.ts b/electron/main/keyescape-http.ts index 9e02b33..09601bb 100644 --- a/electron/main/keyescape-http.ts +++ b/electron/main/keyescape-http.ts @@ -1,8 +1,27 @@ import https from 'node:https' +import http2, { constants as http2Constants, type ClientHttp2Session } from 'node:http2' import { performance } from 'node:perf_hooks' import { randomBytes } from 'node:crypto' const HOSTNAME = 'www.keyescape.com' +const ORIGIN = `https://${HOSTNAME}` + +export type KeyescapeTransportMode = 'http1' | 'http2' +type ResponseHeaders = Record + +interface H2SessionRecord { + session: ClientHttp2Session + id: string + remoteIp: string + streamCount: number + goaway: boolean +} + +let transportMode: KeyescapeTransportMode = 'http1' +let h2Session: H2SessionRecord | undefined +let h2Connecting: Promise | undefined +let h2ConnectingSession: ClientHttp2Session | undefined +let h2Generation = 0 export const EDGE_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/151.0.0.0 Safari/537.36 Edg/151.0.0.0' @@ -31,7 +50,11 @@ export function edgeBrowserHeaders(options: EdgeHeaderOptions = {}): Record { +export function getKeyescapeTransportMode() { + return transportMode +} + +export function setKeyescapeTransportMode(mode: KeyescapeTransportMode) { + if (mode !== 'http1' && mode !== 'http2') throw new Error('지원하지 않는 HTTP 전송 모드입니다.') + if (transportMode === mode) return false + transportMode = mode + if (mode === 'http1') closeHttp2Session() + return true +} + +export function closeHttp2Session() { + const current = h2Session + const connecting = h2ConnectingSession + h2Session = undefined + h2Connecting = undefined + h2ConnectingSession = undefined + if (current && !current.session.closed && !current.session.destroyed) current.session.close() + if (connecting && !connecting.closed && !connecting.destroyed) connecting.destroy() +} + +export function disposeKeyescapeTransport() { + closeHttp2Session() + keyescapeAgent.destroy() +} + +function requestKeyescapeHttp1(options: KeyescapeRequestOptions): Promise { return new Promise((resolve, reject) => { const sentAtMs = Date.now() const sentMonoMs = performance.now() let remoteIp = '' + let connectionId = '' const request = https.request({ hostname: HOSTNAME, @@ -99,6 +152,8 @@ export function requestKeyescape(options: KeyescapeRequestOptions): Promise { - const captureAddress = () => { remoteIp = socket.remoteAddress ?? remoteIp } + const captureAddress = () => { + remoteIp = socket.remoteAddress ?? remoteIp + connectionId = `h1-${socket.localPort ?? 'x'}-${socket.remotePort ?? 443}` + } socket.once('connect', captureAddress) socket.once('secureConnect', captureAddress) if (socket.remoteAddress) captureAddress() @@ -118,6 +176,158 @@ export function requestKeyescape(options: KeyescapeRequestOptions): Promise { + if (h2Session && !h2Session.goaway && !h2Session.session.closed && !h2Session.session.destroyed) { + return Promise.resolve(h2Session) + } + if (h2Connecting) return h2Connecting + + const pending = new Promise((resolve, reject) => { + const session = http2.connect(ORIGIN, { + settings: { enablePush: false }, + }) + h2ConnectingSession = session + const record: H2SessionRecord = { + session, + id: `h2-${++h2Generation}`, + remoteIp: '', + streamCount: 0, + goaway: false, + } + let connected = false + + const failConnection = (error: Error) => { + if (h2Session === record) h2Session = undefined + if (!connected) reject(error) + } + session.on('error', failConnection) + session.on('goaway', () => { + record.goaway = true + if (h2Session === record) h2Session = undefined + }) + session.on('close', () => { + record.goaway = true + if (h2Session === record) h2Session = undefined + if (!connected) reject(new Error('HTTP/2 세션이 연결 전에 종료되었습니다.')) + }) + session.once('connect', () => { + connected = true + const socket = session.socket + if (socket.alpnProtocol !== 'h2') { + const error = new Error(`서버가 HTTP/2로 연결되지 않았습니다 (ALPN: ${socket.alpnProtocol || 'none'}).`) + session.destroy(error) + reject(error) + return + } + record.remoteIp = socket.remoteAddress ?? '' + h2Session = record + if (h2ConnectingSession === session) h2ConnectingSession = undefined + resolve(record) + }) + }) + h2Connecting = pending + pending.then( + () => { if (h2Connecting === pending) h2Connecting = undefined }, + () => { + if (h2Connecting === pending) h2Connecting = undefined + if (h2ConnectingSession?.destroyed) h2ConnectingSession = undefined + }, + ) + return pending +} + +const HTTP2_FORBIDDEN_HEADERS = new Set([ + 'connection', 'host', 'http2-settings', 'keep-alive', 'proxy-connection', 'transfer-encoding', 'upgrade', +]) + +function toHttp2Headers(options: KeyescapeRequestOptions): http2.OutgoingHttpHeaders { + const headers: http2.OutgoingHttpHeaders = { + ':authority': HOSTNAME, + ':method': options.method, + ':path': options.path, + ':scheme': 'https', + } + const merged = { ...edgeBrowserHeaders(), ...options.headers } + for (const [name, value] of Object.entries(merged)) { + const lowerName = name.toLowerCase() + if (!HTTP2_FORBIDDEN_HEADERS.has(lowerName)) headers[lowerName] = value + } + return headers +} + +async function requestKeyescapeHttp2(options: KeyescapeRequestOptions): Promise { + const record = await createHttp2Session() + if (record.goaway || record.session.closed || record.session.destroyed) { + if (h2Session === record) h2Session = undefined + return requestKeyescapeHttp2(options) + } + + const reusedSocket = record.streamCount > 0 + record.streamCount += 1 + const sentAtMs = Date.now() + const sentMonoMs = performance.now() + + return new Promise((resolve, reject) => { + let stream: http2.ClientHttp2Stream + try { + stream = record.session.request(toHttp2Headers(options), { endStream: !options.body }) + } catch (error) { + reject(error) + return + } + + let responseHeaders: ResponseHeaders = {} + let statusCode = 0 + let receivedAtMs = sentAtMs + let receivedMonoMs = sentMonoMs + let settled = false + const chunks: Buffer[] = [] + const finishWithError = (error: Error) => { + if (settled) return + settled = true + reject(error) + } + + stream.once('response', (headers) => { + receivedAtMs = Date.now() + receivedMonoMs = performance.now() + statusCode = Number(headers[':status'] ?? 0) + responseHeaders = headers as ResponseHeaders + }) + stream.on('data', (chunk: Buffer) => chunks.push(Buffer.from(chunk))) + stream.once('end', () => { + if (settled) return + settled = true + resolve({ + statusCode, + headers: responseHeaders, + body: Buffer.concat(chunks), + sentAtMs, + receivedAtMs, + sentMonoMs, + receivedMonoMs, + rttMs: receivedMonoMs - sentMonoMs, + remoteIp: record.remoteIp, + reusedSocket, + protocol: 'h2', + connectionId: record.id, + }) + }) + stream.once('error', finishWithError) + stream.setTimeout(options.timeoutMs ?? 12_000, () => { + stream.close(http2Constants.NGHTTP2_CANCEL) + finishWithError(new Error('예약 서버 HTTP/2 응답 시간이 초과되었습니다.')) + }) + if (options.body) stream.end(options.body) + }) +} + +export function requestKeyescape(options: KeyescapeRequestOptions): Promise { + return transportMode === 'http2' + ? requestKeyescapeHttp2(options) + : requestKeyescapeHttp1(options) +} + export function encodeMultipart(fields: Record) { const boundary = `----WebKitFormBoundary${randomBytes(12).toString('base64url').slice(0, 16)}` const chunks: Buffer[] = [] diff --git a/electron/main/reservation.ts b/electron/main/reservation.ts index 61d195d..e19ac28 100644 --- a/electron/main/reservation.ts +++ b/electron/main/reservation.ts @@ -1,4 +1,4 @@ -import { ipcMain, shell } from 'electron' +import { ipcMain } from 'electron' import type { Branch, PriceOption, @@ -10,6 +10,7 @@ import type { TimeSlot, } from '../../src/type/reservation' import { edgeBrowserHeaders, encodeMultipart, requestKeyescape } from './keyescape-http' +import { openCaptchaWindow } from './captcha-window' const BASE_URL = 'https://www.keyescape.com' const API_URL = `${BASE_URL}/controller/run_proc.php` @@ -235,13 +236,8 @@ async function prepare(rawSelection: Record): Promise): Promise { - const branchNum = asPositiveInteger(rawSelection.branchNum, '지점') - const themeNum = asPositiveInteger(rawSelection.themeNum, '테마') - const themeInfoNum = asPositiveInteger(rawSelection.themeInfoNum, '테마 정보') - await shell.openExternal( - `${BASE_URL}/reservation1.php?zizum_num=${branchNum}&theme_num=${themeNum}&theme_info_num=${themeInfoNum}`, - ) +async function openCaptcha(rawSelection: Record) { + return openCaptchaWindow(normalizeSelection(rawSelection)) } let reservationSubmissionInFlight = false @@ -321,6 +317,8 @@ async function executeReservationOnce(rawRequest: ReservationRequest): Promise undefined) this.scheduleNext() @@ -121,6 +134,8 @@ export class ServerClockService { serverDateHeader: headerValue(response.headers.date), remoteIp: response.remoteIp, reusedSocket: response.reusedSocket, + protocol: response.protocol, + connectionId: response.connectionId, ageHeader: headerValue(response.headers.age), viaHeader: headerValue(response.headers.via), cacheHeader: headerValue(response.headers['x-cache']), @@ -131,10 +146,17 @@ export class ServerClockService { sample.rejectionReason = `설정된 최대 RTT ${this.settings.maxProbeRttMs}ms 초과` } - const previousIp = this.getEstimate().remoteIp + const previousEstimate = this.getEstimate() + const previousIp = previousEstimate.remoteIp + const previousConnectionId = previousEstimate.connectionId this.samples = appendClockSample(this.samples, sample, this.settings.sampleWindowSize) if (sample.accepted && previousIp && sample.remoteIp !== previousIp) this.precisionBoundaryServerMs = undefined - this.lastError = undefined + else if (sample.accepted && response.protocol === 'h2' && previousConnectionId + && response.connectionId !== previousConnectionId) { + this.precisionBoundaryServerMs = undefined + this.lastError = `HTTP/2 세션이 ${previousConnectionId}에서 ${response.connectionId}로 교체되어 같은 경로에서 재검증 중입니다.` + } + else this.lastError = undefined this.emit() return sample } catch (error) { @@ -172,6 +194,8 @@ export class ServerClockService { uncertaintyMs: estimateAtSend.uncertaintyMs, remoteIp: sample.remoteIp, reusedSocket: sample.reusedSocket, + protocol: sample.protocol, + connectionId: sample.connectionId, } } @@ -182,6 +206,7 @@ export class ServerClockService { this.timer = undefined this.samples = [] this.precisionBoundaryServerMs = undefined + disposeKeyescapeTransport() } private isRunning() { @@ -226,6 +251,7 @@ export class ServerClockService { } private nextInterval() { + if (this.quietUntilMs > Date.now()) return this.quietUntilMs - Date.now() return Math.min(this.regularInterval(), this.precisionInterval()) } diff --git a/package.json b/package.json index 98adba9..f365a44 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "escape-reserve", "productName": "Escape Reserve", - "version": "2.3.0", + "version": "2.4.0", "private": true, "description": "A personal Keyescape reservation desk for Electron.", "license": "MIT", diff --git a/src/ReservationApp.tsx b/src/ReservationApp.tsx index a680e11..921e32e 100644 --- a/src/ReservationApp.tsx +++ b/src/ReservationApp.tsx @@ -13,7 +13,7 @@ import type { } from './type/reservation' import './reservation.css' -type LoadingKey = 'branches' | 'themes' | 'detail' | 'times' | 'prepare' | 'submit' | null +type LoadingKey = 'branches' | 'themes' | 'detail' | 'times' | 'prepare' | 'captcha' | 'submit' | null const inputClass = 'field-input' @@ -257,16 +257,17 @@ function ReservationApp() { } const openCaptcha = async () => { - if (!selectedTheme) return + if (!selection) return setError('') + setLoading('captcha') try { - await window.reservationApi.openCaptcha({ - branchNum, - themeNum: selectedTheme.themeNum, - themeInfoNum: selectedTheme.infoNum, - }) + const authentication = await window.reservationApi.openCaptcha(selection) + setCaptchaToken(authentication.token) + setCaptchaPastedAtMs(authentication.solvedAtMs) } catch (reason) { - setError(reason instanceof Error ? reason.message : '브라우저를 열지 못했습니다.') + setError(reason instanceof Error ? reason.message : 'CAPTCHA 인증 창을 열지 못했습니다.') + } finally { + setLoading(null) } } @@ -441,8 +442,8 @@ function ReservationApp() {
-

캡차 인증

브라우저에서 직접 인증 후 토큰을 붙여넣으세요.

-