daiso 1.0.9 → 1.1.0

package/dist/services/gs25/client.js

@@ -2,10 +2,10 @@
  * GS25 API 클라이언트
  */
 /* c8 ignore start */
-import { fetchJson, fetchWithTimeout, HttpError } from '../../utils/http.js';
-import { decodeZyteHttpBody, requestByZyte } from '../../utils/zyte.js';
+import { fetchJson } from '../../utils/http.js';
 import { GS25_API } from './api.js';
 import { normalizeStore, toNumber } from './storeUtils.js';
+import { fetchGs25StoreStockResponse } from './storeStockTransport.js';
 export { fetchGs25NormalizedKeyword, fetchGs25SearchProducts, } from './productSearch.js';
 export { attachDistanceToGs25Stores, calculateDistanceM, extractGs25ProductCandidates, filterGs25StoresByKeyword, selectGs25StoresForKeyword, sortGs25Stores, } from './storeUtils.js';
 const GS25_DEFAULT_HEADERS = {
@@ -21,31 +21,15 @@ const GS25_DEFAULT_FETCH_OPTIONS = {
 };
 const GS25_STORES_CACHE_TTL_MS = 60 * 5 * 1000;
 const gs25StoresCache = new Map();
-function extractGs25WebCsrfToken(html) {
-    return (html.match(/name="CSRFToken"\s+value="([^"]+)"/)?.[1] ||
-        html.match(/ACC\.config\.CSRFToken\s*=\s*"([^"]+)"/)?.[1] ||
-        null);
-}
-function extractGs25WebCookieHeader(headers) {
-    const setCookie = headers.get('set-cookie') || '';
-    const jsessionId = setCookie.match(/JSESSIONID=[^;,\s]+/)?.[0];
-    return jsessionId;
-}
-function parseGs25WebLocationResponse(body) {
-    if (typeof body === 'string') {
-        return JSON.parse(body);
-    }
-    return body;
-}
 function normalizeGs25WebStore(raw) {
-    const propertyNames = (raw.offeringService || []).filter((item) => item.trim().length > 0);
+    const propertyNames = [];
     return {
         storeCode: raw.shopCode || '',
         storeName: raw.shopName || '',
         address: raw.address || '',
         phone: '',
-        latitude: toNumber(raw.longs),
-        longitude: toNumber(raw.lat),
+        latitude: toNumber(raw.posY),
+        longitude: toNumber(raw.posX),
         serviceCode: '01',
         realStockQuantity: 0,
         pickupStockQuantity: 0,
@@ -63,31 +47,6 @@ function normalizeGs25WebStore(raw) {
         distanceM: null,
     };
 }
-async function fetchGs25StoreStock(url, options) {
-    try {
-        return await fetchJson(url, {
-            ...GS25_DEFAULT_FETCH_OPTIONS,
-            method: 'GET',
-            timeout: options.timeout,
-            headers: GS25_DEFAULT_HEADERS,
-        });
-    }
-    catch (error) {
-        const zyteApiKey = options.zyteApiKey?.trim();
-        if (!(error instanceof HttpError) || error.status !== 403 || !zyteApiKey) {
-            throw error;
-        }
-        const result = await requestByZyte({
-            apiKey: zyteApiKey,
-            url,
-            method: 'GET',
-            timeout: options.timeout,
-            retries: 1,
-            headers: Object.entries(GS25_DEFAULT_HEADERS).map(([name, value]) => ({ name, value })),
-        });
-        return decodeZyteHttpBody(result);
-    }
-}
 function buildCacheKey(params) {
     return [
         params.serviceCode,
@@ -138,85 +97,18 @@ export async function fetchGs25WebStores(keyword, options = {}) {
         return { totalCount: 0, stores: [] };
     }
     const { timeout = 20000 } = options;
-    const locationsUrl = new URL(GS25_API.WEB_LOCATIONS_PATH, GS25_API.WEB_BASE_URL);
-    const locationsResponse = await fetchWithTimeout(locationsUrl.toString(), {
+    const endpoint = new URL(GS25_API.WEB_LOCATION_LIST_PATH, GS25_API.WEB_BASE_URL);
+    endpoint.searchParams.set('shopName', query);
+    const body = await fetchJson(endpoint.toString(), {
         ...GS25_DEFAULT_FETCH_OPTIONS,
-        method: 'GET',
         timeout,
-        headers: {
-            Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-            'Accept-Language': GS25_DEFAULT_HEADERS['Accept-Language'],
-            'User-Agent': GS25_DEFAULT_HEADERS['User-Agent'],
-        },
+        headers: { Accept: 'application/json' },
     });
-    if (!locationsResponse.ok) {
-        throw new HttpError(locationsResponse.status, locationsResponse.statusText, await locationsResponse.text());
-    }
-    const html = await locationsResponse.text();
-    const csrfToken = extractGs25WebCsrfToken(html);
-    if (!csrfToken) {
-        throw new Error('GS25 웹 매장 검색 CSRF 토큰을 찾을 수 없습니다.');
+    if (!Array.isArray(body)) {
+        throw new Error('GS25 매장 응답 형식이 올바르지 않습니다.');
     }
-    const form = new URLSearchParams({
-        pageNum: '1',
-        pageSize: '50',
-        searchShopName: query,
-        searchSido: '',
-        searchGugun: '',
-        searchDong: '',
-        searchType: '',
-        searchTypeService: '0',
-        searchTypeToto: '0',
-        searchTypeCafe25: '0',
-        searchTypeInstant: '0',
-        searchTypeDrug: '0',
-        searchTypeSelf25: '0',
-        searchTypePost: '0',
-        searchTypeATM: '0',
-        searchTypeWithdrawal: '0',
-        searchTypeTaxrefund: '0',
-        searchTypeSmartAtm: '0',
-        searchTypeSelfCookingUtensils: '0',
-        searchTypeDeliveryService: '0',
-        searchTypeParcelService: '0',
-        searchTypePotatoes: '0',
-        searchTypeCardiacDefi: '0',
-        searchTypeFishShapedBun: '0',
-        searchTypeWine25: '0',
-        searchTypeGoPizza: '0',
-        searchTypeSpiritWine: '0',
-        searchTypeFreshGanghw: '0',
-        searchTypeMusinsa: '0',
-        searchTypePosa: '0',
-    });
-    const locationListUrl = new URL(GS25_API.WEB_LOCATION_LIST_PATH, GS25_API.WEB_BASE_URL);
-    locationListUrl.searchParams.set('CSRFToken', csrfToken);
-    const cookieHeader = extractGs25WebCookieHeader(locationsResponse.headers);
-    const body = parseGs25WebLocationResponse(await fetchJson(locationListUrl.toString(), {
-        ...GS25_DEFAULT_FETCH_OPTIONS,
-        method: 'POST',
-        retryUnsafeMethods: true,
-        timeout,
-        headers: {
-            Accept: 'application/json, text/javascript, */*; q=0.01',
-            'Accept-Language': GS25_DEFAULT_HEADERS['Accept-Language'],
-            'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
-            Referer: locationsUrl.toString(),
-            'User-Agent': GS25_DEFAULT_HEADERS['User-Agent'],
-            'X-Requested-With': 'XMLHttpRequest',
-            ...(cookieHeader ? { Cookie: cookieHeader } : {}),
-        },
-        body: form.toString(),
-    }));
-    const stores = (body.results || [])
-        .map(normalizeGs25WebStore)
-        .filter((store) => store.storeCode.length > 0);
-    return {
-        totalCount: typeof body.pagination?.totalNumberOfResults === 'number'
-            ? body.pagination.totalNumberOfResults
-            : stores.length,
-        stores,
-    };
+    const stores = body.map(normalizeGs25WebStore).filter((store) => store.storeCode.length > 0);
+    return { totalCount: stores.length, stores };
 }
 export async function fetchGs25Stores(params = {}, options = {}) {
     const { serviceCode = '01', keyword = '', itemCode = '', storeCode = '', realTimeStockYn = 'Y', latitude, longitude, pageNumber, pageCount, useCache = true, } = params;
@@ -276,10 +168,11 @@ export async function fetchGs25Stores(params = {}, options = {}) {
         endpoint.searchParams.set('isSuperDlvyStoreSelected', 'N');
         endpoint.searchParams.set('isGs25DlvyStoreSelected', 'N');
     }
-    const body = await fetchGs25StoreStock(endpoint.toString(), {
+    const body = await fetchGs25StoreStockResponse(endpoint.toString(), {
         timeout,
         zyteApiKey: options.zyteApiKey,
-    });
+        apiKey: options.apiKey,
+    }, GS25_DEFAULT_HEADERS);
     const stores = (body.stores || [])
         .map(normalizeStore)
         .filter((store) => store.storeCode.length > 0);

package/dist/services/gs25/errors.js

@@ -0,0 +1,12 @@
+/**
+ * GS25 원본 서비스 장애 오류
+ */
+export class Gs25UpstreamUnavailableError extends Error {
+    constructor() {
+        super('GS25 재고 서비스 인증을 사용할 수 없습니다. 운영자는 GS25_API_KEY 설정을 확인하세요.');
+        this.name = 'Gs25UpstreamUnavailableError';
+    }
+}
+export function isGs25UpstreamUnavailableError(error) {
+    return error instanceof Gs25UpstreamUnavailableError;
+}

package/dist/services/gs25/index.js

@@ -18,9 +18,9 @@ class Gs25Service {
     }
     getTools() {
         return [
-            createFindNearbyStoresTool(this.options.googleMapsApiKey, this.options.zyteApiKey),
+            createFindNearbyStoresTool(this.options.googleMapsApiKey, this.options.zyteApiKey, this.options.apiKey),
             createSearchProductsTool(this.options.zyteApiKey),
-            createCheckInventoryTool(this.options.googleMapsApiKey, this.options.zyteApiKey),
+            createCheckInventoryTool(this.options.googleMapsApiKey, this.options.zyteApiKey, this.options.apiKey),
         ];
     }
 }

package/dist/services/gs25/productSearch.js

@@ -48,6 +48,7 @@ async function fetchGs25TotalSearchResponse(query, options) {
                 value,
             })),
             bodyText,
+            tags: { service: 'gs25' },
         });
         return decodeZyteHttpBody(result);
     }

package/dist/services/gs25/storeStockTransport.js

@@ -0,0 +1,55 @@
+/**
+ * GS25 재고 원본 요청과 Zyte 대체 경로
+ */
+import { fetchJson, HttpError } from '../../utils/http.js';
+import { decodeZyteHttpBody, requestByZyte } from '../../utils/zyte.js';
+import { Gs25UpstreamUnavailableError } from './errors.js';
+function withApiKey(headers, apiKey) {
+    const normalizedApiKey = apiKey?.trim();
+    return normalizedApiKey ? { ...headers, 'Api-Key': normalizedApiKey } : headers;
+}
+function isAuthenticationStatus(status) {
+    return status === 401 || status === 403;
+}
+export async function fetchGs25StoreStockResponse(url, options, headers) {
+    const requestHeaders = withApiKey(headers, options.apiKey);
+    try {
+        return await fetchJson(url, {
+            method: 'GET',
+            timeout: options.timeout,
+            retries: 1,
+            retryDelayMs: 250,
+            headers: requestHeaders,
+        });
+    }
+    catch (error) {
+        if (!(error instanceof HttpError) || !isAuthenticationStatus(error.status)) {
+            throw error;
+        }
+        const zyteApiKey = options.zyteApiKey?.trim();
+        if (error.status === 401 || !zyteApiKey) {
+            throw new Gs25UpstreamUnavailableError();
+        }
+        try {
+            const result = await requestByZyte({
+                apiKey: zyteApiKey,
+                url,
+                method: 'GET',
+                timeout: options.timeout,
+                retries: 1,
+                headers: Object.entries(requestHeaders).map(([name, value]) => ({ name, value })),
+                tags: { service: 'gs25' },
+            });
+            if (isAuthenticationStatus(result.statusCode)) {
+                throw new Gs25UpstreamUnavailableError();
+            }
+            return decodeZyteHttpBody(result);
+        }
+        catch (fallbackError) {
+            if (fallbackError instanceof Gs25UpstreamUnavailableError) {
+                throw fallbackError;
+            }
+            throw new Gs25UpstreamUnavailableError();
+        }
+    }
+}

package/dist/services/gs25/tools/checkInventory.js

@@ -8,7 +8,7 @@ function getProcessEnvValue(name) {
     return typeof process !== 'undefined' ? process.env[name] : undefined;
 }
 async function checkInventory(args) {
-    const { keyword, itemCode: providedItemCode, latitude, longitude, storeKeyword = '', serviceCode = '01', storeLimit = 20, timeoutMs = 20000, googleMapsApiKey = getProcessEnvValue('GOOGLE_MAPS_API_KEY'), zyteApiKey = getProcessEnvValue('ZYTE_API_KEY'), } = args;
+    const { keyword, itemCode: providedItemCode, latitude, longitude, storeKeyword = '', serviceCode = '01', storeLimit = 20, timeoutMs = 20000, googleMapsApiKey = getProcessEnvValue('GOOGLE_MAPS_API_KEY'), zyteApiKey = getProcessEnvValue('ZYTE_API_KEY'), apiKey = getProcessEnvValue('GS25_API_KEY'), } = args;
     if (!keyword || keyword.trim().length === 0) {
         throw new Error('상품 검색어(keyword)를 입력해주세요.');
     }
@@ -25,6 +25,7 @@ async function checkInventory(args) {
         }, {
             timeout: timeoutMs,
             zyteApiKey,
+            apiKey,
         });
         const firstAddress = filterGs25StoresByKeyword(baseStores.stores, storeKeyword).find((store) => store.address.trim().length > 0)?.address || '';
         if (firstAddress.length > 0) {
@@ -61,6 +62,7 @@ async function checkInventory(args) {
         }, {
             timeout: timeoutMs,
             zyteApiKey,
+            apiKey,
         });
     }
     else {
@@ -83,6 +85,7 @@ async function checkInventory(args) {
             }, {
                 timeout: timeoutMs,
                 zyteApiKey,
+                apiKey,
             });
         }
         else {
@@ -97,6 +100,7 @@ async function checkInventory(args) {
             }, {
                 timeout: timeoutMs,
                 zyteApiKey,
+                apiKey,
             });
         }
     }
@@ -147,7 +151,7 @@ async function checkInventory(args) {
         ],
     };
 }
-export function createCheckInventoryTool(googleMapsApiKey, zyteApiKey) {
+export function createCheckInventoryTool(googleMapsApiKey, zyteApiKey, apiKey) {
     return {
         name: 'gs25_check_inventory',
         metadata: {
@@ -184,6 +188,7 @@ export function createCheckInventoryTool(googleMapsApiKey, zyteApiKey) {
             ...args,
             googleMapsApiKey: args.googleMapsApiKey || googleMapsApiKey,
             zyteApiKey: args.zyteApiKey || zyteApiKey,
+            apiKey: args.apiKey || apiKey,
         })),
     };
 }

package/dist/services/gs25/tools/findNearbyStores.js

@@ -2,14 +2,15 @@
  * GS25 주변 매장 탐색 도구
  */
 import * as z from 'zod';
-import { attachDistanceToGs25Stores, fetchGs25Stores, geocodeGs25Address, selectGs25StoresForKeyword, sortGs25Stores, } from '../client.js';
+import { isGs25UpstreamUnavailableError } from '../errors.js';
+import { attachDistanceToGs25Stores, fetchGs25Stores, fetchGs25WebStores, geocodeGs25Address, selectGs25StoresForKeyword, sortGs25Stores, } from '../client.js';
 const FALLBACK_STORE_LOOKUP_ITEM_CODE = '8801117752804';
 function getProcessEnvValue(name) {
     /* c8 ignore next -- Node 테스트와 CLI 런타임은 process를 제공하며, Worker에는 API에서 키를 주입합니다. */
     return typeof process !== 'undefined' ? process.env[name] : undefined;
 }
 async function findNearbyStores(args) {
-    const { latitude, longitude, keyword = '', serviceCode = '01', limit = 20, timeoutMs = 20000, googleMapsApiKey = getProcessEnvValue('GOOGLE_MAPS_API_KEY'), zyteApiKey = getProcessEnvValue('ZYTE_API_KEY'), } = args;
+    const { latitude, longitude, keyword = '', serviceCode = '01', limit = 20, timeoutMs = 20000, googleMapsApiKey = getProcessEnvValue('GOOGLE_MAPS_API_KEY'), zyteApiKey = getProcessEnvValue('ZYTE_API_KEY'), apiKey = getProcessEnvValue('GS25_API_KEY'), } = args;
     let resolvedLatitude = latitude;
     let resolvedLongitude = longitude;
     let geocodeUsed = false;
@@ -25,6 +26,7 @@ async function findNearbyStores(args) {
             geocodeUsed = true;
         }
     }
+    let fallbackUsed = false;
     let result = await fetchGs25Stores({
         serviceCode,
         latitude: resolvedLatitude,
@@ -32,9 +34,15 @@ async function findNearbyStores(args) {
     }, {
         timeout: timeoutMs,
         zyteApiKey,
+        apiKey,
+    }).catch(async (error) => {
+        if (!isGs25UpstreamUnavailableError(error) || keyword.trim().length === 0)
+            throw error;
+        const webResult = await fetchGs25WebStores(keyword, { timeout: timeoutMs });
+        fallbackUsed = true;
+        return { ...webResult, cacheHit: false };
     });
-    let fallbackUsed = false;
-    if (result.stores.length === 0 &&
+    if (!fallbackUsed && result.stores.length === 0 &&
         typeof resolvedLatitude === 'number' &&
         typeof resolvedLongitude === 'number') {
         try {
@@ -48,6 +56,7 @@ async function findNearbyStores(args) {
             }, {
                 timeout: timeoutMs,
                 zyteApiKey,
+                apiKey,
             });
             if (fallbackResult.stores.length > 0) {
                 result = fallbackResult;
@@ -58,6 +67,11 @@ async function findNearbyStores(args) {
             fallbackUsed = false;
         }
     }
+    if (!fallbackUsed && result.stores.length === 0 && keyword.trim().length > 0) {
+        const webResult = await fetchGs25WebStores(keyword, { timeout: timeoutMs });
+        result = { ...webResult, cacheHit: false };
+        fallbackUsed = true;
+    }
     const selected = selectGs25StoresForKeyword(result.stores, keyword, {
         relaxWhenEmpty: typeof resolvedLatitude === 'number' && typeof resolvedLongitude === 'number',
     });
@@ -89,7 +103,7 @@ async function findNearbyStores(args) {
         ],
     };
 }
-export function createFindNearbyStoresTool(googleMapsApiKey, zyteApiKey) {
+export function createFindNearbyStoresTool(googleMapsApiKey, zyteApiKey, apiKey) {
     return {
         name: 'gs25_find_nearby_stores',
         metadata: {
@@ -112,6 +126,7 @@ export function createFindNearbyStoresTool(googleMapsApiKey, zyteApiKey) {
             ...args,
             googleMapsApiKey: args.googleMapsApiKey || googleMapsApiKey,
             zyteApiKey: args.zyteApiKey || zyteApiKey,
+            apiKey: args.apiKey || apiKey,
         })),
     };
 }

package/dist/services/lottecinema/client.js

@@ -105,7 +105,9 @@ async function fetchPlaySequenceByPair(playDate, theater, movie, timeout = 15000
         .filter((item) => item.CinemaID && item.RepresentationMovieCode && item.ScreenID && item.PlaySequence)
         .map((item) => {
         const totalSeats = toNumber(item.TotalSeatCount);
-        const bookedSeats = toNumber(item.BookingSeatCount);
+        // 공식 BookingSeatCount는 예매된 수가 아니라 예매 가능(잔여) 좌석 수다.
+        const remainingSeats = toNumber(item.BookingSeatCount);
+        const bookedSeats = Math.max(totalSeats - remainingSeats, 0);
         const normalizedPlayDate = normalizeDateForOutput(item.PlayDt || playDate);
         const theaterId = String(item.CinemaID);
         const screenId = String(item.ScreenID);
@@ -123,7 +125,7 @@ async function fetchPlaySequenceByPair(playDate, theater, movie, timeout = 15000
             endTime: formatTime(item.EndTime),
             totalSeats,
             bookedSeats,
-            remainingSeats: Math.max(totalSeats - bookedSeats, 0),
+            remainingSeats,
         };
     });
 }

package/dist/services/lottemart/config.js

@@ -1,4 +1,4 @@
 /**
  * 롯데마트 서비스 공통 설정
  */
-export const DEFAULT_LOTTEMART_TIMEOUT_MS = 45000;
+export const DEFAULT_LOTTEMART_TIMEOUT_MS = 15000;