daiso 1.2.6 → 1.2.7

package/dist/api/cgvHandlers.js

@@ -5,7 +5,7 @@ import { fetchCgvMovies, fetchCgvTheaters, fetchCgvTimetable, toYyyymmdd, } from
 import { isCgvUpstreamUnavailableError } from '../services/cgv/errors.js';
 import { fetchCgvNearbyTheaters, resolveCgvNearestTheater } from '../services/cgv/location.js';
 import { filterAndSortTimetable } from '../services/cgv/timetable.js';
-import { errorResponse, successResponse } from './response.js';
+import { errorResponse, serviceErrorResponse, successResponse } from './response.js';
 function parseOptionalNumber(value) {
     if (!value) {
         return undefined;
@@ -62,7 +62,7 @@ export async function handleCgvFindTheaters(c) {
     }
     catch (error) {
         if (isCgvUpstreamUnavailableError(error)) {
-            return errorResponse(c, 'CGV_UPSTREAM_UNAVAILABLE', error.message, 503);
+            return serviceErrorResponse(c, error, 'theaters');
         }
         const message = error instanceof Error ? error.message : '알 수 없는 오류가 발생했습니다.';
         return errorResponse(c, 'CGV_THEATER_SEARCH_FAILED', message, 500);
@@ -120,7 +120,7 @@ export async function handleCgvSearchMovies(c) {
     }
     catch (error) {
         if (isCgvUpstreamUnavailableError(error)) {
-            return errorResponse(c, 'CGV_UPSTREAM_UNAVAILABLE', error.message, 503);
+            return serviceErrorResponse(c, error, 'movies');
         }
         const message = error instanceof Error ? error.message : '알 수 없는 오류가 발생했습니다.';
         return errorResponse(c, 'CGV_MOVIE_SEARCH_FAILED', message, 500);
@@ -188,7 +188,7 @@ export async function handleCgvGetTimetable(c) {
     }
     catch (error) {
         if (isCgvUpstreamUnavailableError(error)) {
-            return errorResponse(c, 'CGV_UPSTREAM_UNAVAILABLE', error.message, 503);
+            return serviceErrorResponse(c, error, 'timetable');
         }
         const message = error instanceof Error ? error.message : '알 수 없는 오류가 발생했습니다.';
         return errorResponse(c, 'CGV_TIMETABLE_FETCH_FAILED', message, 500);

package/dist/api/healthChecks.js

@@ -1,3 +1,4 @@
+import { isKnownCgvBlock } from './healthFailurePolicy.js';
 /**
  * 개별 서비스 헬스 체크 실행기
  */
@@ -70,10 +71,14 @@ function aggregateStatus(checks) {
     }
     return 'ok';
 }
-function shouldDegradeFailedResponse(check, message) {
+function shouldDegradeFailedResponse(check, message, status, body) {
+    if (isKnownCgvBlock(check.path, status, body))
+        return true;
     return check.degradedFailurePatterns?.some((pattern) => message.includes(pattern)) ?? false;
 }
-function shouldDegradeCliContractPath(path, message) {
+function shouldDegradeCliContractPath(path, message, status, body) {
+    if (isKnownCgvBlock(path, status, body))
+        return true;
     if (path.startsWith('/api/gs25/')) {
         return GS25_CLOUDFRONT_403_PATTERNS.some((pattern) => message.includes(pattern));
     }
@@ -131,7 +136,7 @@ async function runCliContractCheck(check, params) {
             const body = (await response.json().catch(() => ({})));
             if (!response.ok || !isCliCompatibleEnvelope(path, body)) {
                 const message = body.error?.message || `${path} CLI 계약 응답이 올바르지 않습니다.`;
-                if (shouldDegradeCliContractPath(path, message)) {
+                if (shouldDegradeCliContractPath(path, message, response.status, body)) {
                     degradedMessages.push(`${path}: ${message}`);
                     continue;
                 }
@@ -179,7 +184,11 @@ async function runSingleCheck(check, params) {
         const response = await params.fetchImpl(buildCheckUrl(params.baseUrl, check, timeoutMs, cacheBustValue), {
             signal: AbortSignal.timeout(timeoutMs),
         });
-        const body = (await response.json().catch(() => ({})));
+        const body = (await response.json().catch(() => {
+            if (response.ok)
+                throw new Error('invalid JSON response');
+            return {};
+        }));
         const durationMs = params.now() - startedAt;
         if (!response.ok || body.success === false) {
             const message = body.error?.message || `HTTP ${response.status}`;
@@ -187,7 +196,7 @@ async function runSingleCheck(check, params) {
                 id: check.id,
                 service: check.service,
                 target: check.target,
-                status: shouldDegradeFailedResponse(check, message) ? 'degraded' : 'fail',
+                status: shouldDegradeFailedResponse(check, message, response.status, body) ? 'degraded' : 'fail',
                 durationMs,
                 httpStatus: response.status,
                 message,

package/dist/api/healthFailurePolicy.js

@@ -0,0 +1,6 @@
+export function isKnownCgvBlock(path, status, body) {
+    return (path.startsWith('/api/cgv/') &&
+        status === 503 &&
+        body.error?.code === 'CGV_UPSTREAM_UNAVAILABLE' &&
+        body.diagnostics?.upstreamStatus === 403);
+}

package/dist/api/response.js

@@ -24,6 +24,8 @@ export function errorResponse(c, code, message, status = 400) {
 }
 /** 원문이 제거된 외부 서비스 오류를 실제 상태와 함께 반환합니다. */
 export function serviceErrorResponse(c, error, operation) {
+    if (error.retryAfter !== undefined)
+        c.header('Retry-After', String(error.retryAfter));
     return c.json({
         success: false,
         error: { code: error.code, message: error.message },

package/dist/core/errors.js

@@ -8,13 +8,17 @@ export class ServiceError extends Error {
     status;
     retryable;
     upstreamStatus;
-    constructor(code, message, status, retryable, upstreamStatus) {
+    quotaReason;
+    retryAfter;
+    constructor(code, message, status, retryable, upstreamStatus, quota) {
         super(message);
         this.code = code;
         this.status = status;
         this.retryable = retryable;
         this.upstreamStatus = upstreamStatus;
         this.name = 'ServiceError';
+        this.quotaReason = quota?.quotaReason;
+        this.retryAfter = quota?.retryAfter;
     }
 }
 const SERVICE_PREFIXES = [
@@ -116,6 +120,8 @@ export function toServiceErrorDiagnostics(error, operation) {
             operation,
         }),
         retryable: error.retryable,
+        quotaReason: error.quotaReason,
+        retryAfter: error.retryAfter,
         hint: buildHint(error.retryable),
     };
 }

package/dist/middleware/dailyRateLimit.js

@@ -35,7 +35,7 @@ export async function hashRateLimitIdentity(ip) {
     const digest = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(ip));
     return Array.from(new Uint8Array(digest), (byte) => byte.toString(16).padStart(2, '0')).join('');
 }
-function resolveRateLimitIdentity(request) {
+export function resolveRateLimitIdentity(request) {
     const ip = request.headers.get('CF-Connecting-IP')?.trim();
     if (!ip || ip !== CROSS_ZONE_WORKER_CLIENT_IP) {
         return ip || null;

package/dist/middleware/diagnostics.js

@@ -1,3 +1,4 @@
+import { resolveRateLimitIdentity } from './dailyRateLimit.js';
 import { withDiagnostics, diagnosticEvent, diagnosticHeaders, diagnosticOperation, } from '../utils/diagnostics.js';
 export const diagnosticsMiddleware = async (c, next) => withDiagnostics(async () => {
     const start = performance.now();
@@ -14,4 +15,4 @@ export const diagnosticsMiddleware = async (c, next) => withDiagnostics(async ()
             durationMs: performance.now() - start,
         });
     }
-});
+}, resolveRateLimitIdentity(c.req.raw) || undefined);

package/dist/services/cgv/errors.js

@@ -1,13 +1,11 @@
 /**
  * CGV 원본 및 대체 전송 경로를 사용할 수 없는 상태
  */
-import { ZYTE_COST_POLICY_MESSAGE } from '../../core/errors.js';
-export class CgvUpstreamUnavailableError extends Error {
-    upstreamStatus;
+import { ServiceError, ZYTE_COST_POLICY_MESSAGE } from '../../core/errors.js';
+export class CgvUpstreamUnavailableError extends ServiceError {
     constructor(upstreamStatus) {
         const statusSuffix = upstreamStatus === undefined ? '' : ` (HTTP ${upstreamStatus})`;
-        super(`CGV 원본 서비스에 연결할 수 없습니다. ${ZYTE_COST_POLICY_MESSAGE}${statusSuffix}`);
-        this.upstreamStatus = upstreamStatus;
+        super('CGV_UPSTREAM_UNAVAILABLE', `CGV 원본 서비스에 연결할 수 없습니다. ${ZYTE_COST_POLICY_MESSAGE}${statusSuffix}`, 503, false, upstreamStatus);
         this.name = 'CgvUpstreamUnavailableError';
     }
 }

package/dist/services/oliveyoung/errors.js

@@ -3,7 +3,7 @@ import { ServiceError } from '../../core/errors.js';
 import { HttpError, UnexpectedHtmlResponseError } from '../../utils/http.js';
 export function toOliveyoungRelayError(error) {
     if (error instanceof HttpError) {
-        return new ServiceError('OLIVEYOUNG_RELAY_HTTP_ERROR', `올리브영 브라우저 릴레이 요청 실패 (HTTP ${error.status})`, [429, 502, 503].includes(error.status) ? error.status : 502, error.status >= 500 || error.status === 408 || error.status === 429, error.status);
+        return new ServiceError('OLIVEYOUNG_RELAY_HTTP_ERROR', `올리브영 브라우저 릴레이 요청 실패 (HTTP ${error.status})`, [429, 502, 503].includes(error.status) ? error.status : 502, error.status >= 500 || error.status === 408 || error.status === 429, error.status, error.quota);
     }
     if (error instanceof Error && ['AbortError', 'TimeoutError'].includes(error.name)) {
         return new ServiceError('OLIVEYOUNG_RELAY_TIMEOUT', '올리브영 브라우저 릴레이 요청 시간 초과', 504, true);

package/dist/services/oliveyoung/transport.js

@@ -1,8 +1,10 @@
-import { diagnosticHeaders } from '../../utils/diagnostics.js';
+import { diagnosticHeaders, relayConsumer } from '../../utils/diagnostics.js';
 /** 올리브영 무료 직접 요청 및 운영자가 설정한 브라우저 릴레이 전송. */
-import { fetchJson } from '../../utils/http.js';
+import { createRelayCooldown, relayCredentialScope } from '../../utils/relayQuota.js';
+import { HttpError, fetchJson } from '../../utils/http.js';
 import { toOliveyoungRelayError } from './errors.js';
 import { OLIVEYOUNG_API } from './api.js';
+const cooldown = createRelayCooldown();
 /** 설정 진단과 실제 요청에 같은 릴레이 URL 규칙을 적용합니다. */
 export function isValidOliveyoungRelayUrl(value) {
     if (!value?.trim())
@@ -28,6 +30,8 @@ export async function requestOliveyoung(path, body, options = {}) {
         Accept: 'application/json',
         'X-Requested-With': 'XMLHttpRequest',
     };
+    let scope = '';
+    let consumer = 'legacy';
     let url = `${OLIVEYOUNG_API.BASE_URL}${path}`;
     if (relayUrl) {
         if (!isValidOliveyoungRelayUrl(relayUrl)) {
@@ -38,6 +42,9 @@ export async function requestOliveyoung(path, body, options = {}) {
         url = `${relayUrl.replace(/\/$/, '')}/v1/oliveyoung/${path.split('/').pop()}`;
         Object.assign(headers, diagnosticHeaders());
         headers.Authorization = `Bearer ${relayToken}`;
+        consumer = (await relayConsumer(relayToken)) || 'legacy';
+        if (consumer !== 'legacy')
+            headers['x-relay-consumer'] = consumer;
         const { accessClientId, accessClientSecret } = options;
         if (accessClientId !== undefined || accessClientSecret !== undefined) {
             if (!accessClientId?.trim() || !accessClientSecret?.trim()) {
@@ -55,6 +62,14 @@ export async function requestOliveyoung(path, body, options = {}) {
         headers.Referer = `${OLIVEYOUNG_API.BASE_URL}/`;
         headers['Accept-Language'] = 'ko-KR,ko;q=0.9';
     }
+    if (relayUrl) {
+        scope = await relayCredentialScope([relayUrl.replace(/\/$/, ''), relayToken, options.accessClientId, options.accessClientSecret]);
+        const quota = cooldown.get(scope, consumer);
+        if (quota)
+            throw toOliveyoungRelayError(new HttpError(429, '', '', new Headers({
+                'x-relay-quota-reason': quota.quotaReason, 'retry-after': String(quota.retryAfter),
+            })));
+    }
     let result;
     try {
         result = await fetchJson(url, {
@@ -69,8 +84,11 @@ export async function requestOliveyoung(path, body, options = {}) {
         });
     }
     catch (error) {
-        if (relayUrl)
+        if (relayUrl) {
+            if (error instanceof HttpError && error.quota)
+                cooldown.set(scope, consumer, error.quota);
             throw toOliveyoungRelayError(error);
+        }
         if (error instanceof Error && error.name === 'AbortError') {
             throw new Error('올리브영 API 요청 시간 초과');
         }

package/dist/utils/diagnostics.js

@@ -1,10 +1,10 @@
 /** 비밀값과 원문 없이 요청 경계를 연결하는 진단 컨텍스트입니다. */
 import { AsyncLocalStorage } from 'node:async_hooks';
 const context = new AsyncLocalStorage();
-export function withDiagnostics(work) {
+export function withDiagnostics(work, consumerIdentity) {
     if (context.getStore())
         return work();
-    return context.run({ requestId: crypto.randomUUID(), sampled: Math.random() < 0.01, events: 0 }, work);
+    return context.run({ requestId: crypto.randomUUID(), sampled: Math.random() < 0.01, events: 0, consumerIdentity }, work);
 }
 export function diagnosticHeaders() {
     const current = context.getStore();
@@ -74,3 +74,13 @@ export function diagnosticOperation(url) {
         return `${parts[2]}.${parts[3]}`;
     return 'other';
 }
+/** 릴레이 전용 일별 익명 식별자이며 로그나 공개 응답에는 포함하지 않습니다. */
+export async function relayConsumer(token) {
+    const identity = context.getStore()?.consumerIdentity;
+    if (!identity)
+        return undefined;
+    const encoder = new TextEncoder();
+    const key = await crypto.subtle.importKey('raw', encoder.encode(token), { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']);
+    const signature = await crypto.subtle.sign('HMAC', key, encoder.encode(`${Math.floor(Date.now() / 86400000)}:${identity}`));
+    return Array.from(new Uint8Array(signature), byte => byte.toString(16).padStart(2, '0')).join('');
+}

package/dist/utils/http.js

@@ -1,9 +1,11 @@
+import { parseRelayQuota } from './relayQuota.js';
 import { diagnosticEvent } from './diagnostics.js';
 export class HttpError extends Error {
+    quota;
     status;
     statusText;
     bodyText;
-    constructor(status, statusText, bodyText) {
+    constructor(status, statusText, bodyText, headers) {
         const normalizedBody = bodyText.trim().replace(/\s+/g, ' ').slice(0, 300);
         const detail = normalizedBody.length > 0 ? ` - ${normalizedBody}` : '';
         super(`API 요청 실패: ${status} ${statusText}${detail}`);
@@ -11,6 +13,7 @@ export class HttpError extends Error {
         this.status = status;
         this.statusText = statusText;
         this.bodyText = bodyText;
+        this.quota = parseRelayQuota(status, headers);
     }
 }
 /** HTML 원문을 노출하지 않고 예상하지 못한 응답 형식을 구분합니다. */
@@ -136,7 +139,7 @@ async function readTextResponse(url, options) {
 export async function fetchJson(url, options = {}) {
     const { response, body } = await readTextResponse(url, options);
     if (!response.ok || (options.expectedStatus !== undefined && response.status !== options.expectedStatus)) {
-        throw new HttpError(response.status, response.statusText, body);
+        throw new HttpError(response.status, response.statusText, body, response.headers);
     }
     if (/^\s*(?:<!doctype\s+html\b|<html\b)/i.test(body)) {
         throw new UnexpectedHtmlResponseError(response.status, response.headers.get('content-type') || '');
@@ -146,7 +149,7 @@ export async function fetchJson(url, options = {}) {
 export async function fetchText(url, options = {}) {
     const { response, body } = await readTextResponse(url, options);
     if (!response.ok) {
-        throw new HttpError(response.status, response.statusText, body);
+        throw new HttpError(response.status, response.statusText, body, response.headers);
     }
     return body;
 }

package/dist/utils/relayQuota.js

@@ -0,0 +1,44 @@
+export function parseRelayQuota(status, headers) {
+    if (status !== 429 || !headers)
+        return undefined;
+    const reason = headers.get('x-relay-quota-reason');
+    const retry = headers.get('retry-after') || '';
+    if (reason !== 'minute' && reason !== 'daily' && reason !== 'consumer')
+        return undefined;
+    if (!/^[1-9][0-9]{0,4}$/.test(retry) || Number(retry) > 86400)
+        return undefined;
+    return { quotaReason: reason, retryAfter: Number(retry) };
+}
+/** 만료 후 정리하고 고정 크기에서 새 휴지 기록을 생략합니다. */
+export function createRelayCooldown(now = () => Date.now(), maxEntries = 1024) {
+    const entries = new Map();
+    const prune = () => {
+        for (const [key, entry] of entries)
+            if (entry.until <= now())
+                entries.delete(key);
+    };
+    return {
+        get(scope, consumer) {
+            prune();
+            const entry = entries.get(scope) || entries.get(`${scope}:${consumer}`);
+            if (!entry)
+                return undefined;
+            return { quotaReason: entry.quotaReason, retryAfter: Math.ceil((entry.until - now()) / 1000) };
+        },
+        set(scope, consumer, quota) {
+            prune();
+            const key = quota.quotaReason === 'consumer' ? `${scope}:${consumer}` : scope;
+            if (!entries.has(key) && entries.size >= maxEntries)
+                return;
+            const until = now() + quota.retryAfter * 1000;
+            if ((entries.get(key)?.until || 0) > until)
+                return;
+            entries.set(key, { quotaReason: quota.quotaReason, until });
+        },
+    };
+}
+/** 자격증명 원문을 저장하지 않는 릴레이/Access 구성별 키. */
+export async function relayCredentialScope(values) {
+    const digest = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(JSON.stringify(values)));
+    return Array.from(new Uint8Array(digest), byte => byte.toString(16).padStart(2, '0')).join('');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "daiso",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "Korean retail and cinema MCP server, CLI, and Codex Skill for Daiso, convenience stores, marts, Olive Young, and theaters",
   "main": "dist/index.js",
   "bin": {