daiso 1.2.7 → 1.2.8

package/dist/api/handlers.js

@@ -32,8 +32,9 @@ export async function handleOliveyoungSearchProducts(c) {
     const size = parseInt(c.req.query('size') || '20');
     const sort = c.req.query('sort') || '01';
     const includeSoldOut = c.req.query('includeSoldOut') === 'true';
-    const parsedTimeoutMs = parseInt(c.req.query('timeoutMs') || '15000', 10);
-    const timeoutMs = Number.isFinite(parsedTimeoutMs) && parsedTimeoutMs > 0 ? parsedTimeoutMs : 15000;
+    const defaultTimeoutMs = c.env?.OY_RELAY_URL ? 60000 : 15000;
+    const parsedTimeoutMs = parseInt(c.req.query('timeoutMs') || '', 10);
+    const timeoutMs = Number.isFinite(parsedTimeoutMs) && parsedTimeoutMs > 0 ? parsedTimeoutMs : defaultTimeoutMs;
     if (keyword.trim().length === 0) {
         return errorResponse(c, 'MISSING_QUERY', '검색어(keyword)를 입력해주세요.');
     }
@@ -76,8 +77,9 @@ export async function handleOliveyoungFindStores(c) {
     const lng = parseFloat(c.req.query('lng') || '126.978');
     const pageIdx = parseInt(c.req.query('pageIdx') || '1');
     const limit = parseInt(c.req.query('limit') || '20');
-    const parsedTimeoutMs = parseInt(c.req.query('timeoutMs') || '15000', 10);
-    const timeoutMs = Number.isFinite(parsedTimeoutMs) && parsedTimeoutMs > 0 ? parsedTimeoutMs : 15000;
+    const defaultTimeoutMs = c.env?.OY_RELAY_URL ? 60000 : 15000;
+    const parsedTimeoutMs = parseInt(c.req.query('timeoutMs') || '', 10);
+    const timeoutMs = Number.isFinite(parsedTimeoutMs) && parsedTimeoutMs > 0 ? parsedTimeoutMs : defaultTimeoutMs;
     try {
         const result = await fetchOliveyoungStores({
             latitude: lat,
@@ -116,8 +118,9 @@ export async function handleOliveyoungCheckInventory(c) {
     const sort = c.req.query('sort') || '01';
     const includeSoldOut = c.req.query('includeSoldOut') === 'true';
     const storeLimit = parseInt(c.req.query('storeLimit') || '10');
-    const parsedTimeoutMs = parseInt(c.req.query('timeoutMs') || '15000', 10);
-    const timeoutMs = Number.isFinite(parsedTimeoutMs) && parsedTimeoutMs > 0 ? parsedTimeoutMs : 15000;
+    const defaultTimeoutMs = c.env?.OY_RELAY_URL ? 60000 : 15000;
+    const parsedTimeoutMs = parseInt(c.req.query('timeoutMs') || '', 10);
+    const timeoutMs = Number.isFinite(parsedTimeoutMs) && parsedTimeoutMs > 0 ? parsedTimeoutMs : defaultTimeoutMs;
     const parsedStockCheckLimit = parseInt(c.req.query('stockCheckLimit') || '5', 10);
     const stockCheckLimit = Number.isFinite(parsedStockCheckLimit) && parsedStockCheckLimit >= 0 ? parsedStockCheckLimit : 5;
     if (!keyword || keyword.trim().length === 0) {

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

@@ -4,7 +4,7 @@
 import * as z from 'zod';
 import { enrichOliveyoungProductsWithNearbyStoreInventory, fetchOliveyoungProducts, fetchOliveyoungStores, } from '../client.js';
 async function checkInventory(args, transport) {
-    const { keyword, latitude = 37.5665, longitude = 126.978, storeKeyword = '', page = 1, size = 20, sort = '01', includeSoldOut = false, storeLimit = 10, stockCheckLimit = 5, timeoutMs = 15000, zyteApiKey, } = args;
+    const { keyword, latitude = 37.5665, longitude = 126.978, storeKeyword = '', page = 1, size = 20, sort = '01', includeSoldOut = false, storeLimit = 10, stockCheckLimit = 5, timeoutMs = transport.timeout ?? (transport.relayUrl ? 60000 : 15000), zyteApiKey, } = args;
     if (!keyword || keyword.trim().length === 0) {
         throw new Error('상품 검색어(keyword)를 입력해주세요.');
     }
@@ -15,9 +15,9 @@ async function checkInventory(args, transport) {
             pageIdx: 1,
             searchWords: storeKeyword,
         }, {
-            timeout: timeoutMs,
             apiKey: zyteApiKey,
             ...transport,
+            timeout: timeoutMs,
         }),
         fetchOliveyoungProducts({
             keyword,
@@ -26,9 +26,9 @@ async function checkInventory(args, transport) {
             sort,
             includeSoldOut,
         }, {
-            timeout: timeoutMs,
             apiKey: zyteApiKey,
             ...transport,
+            timeout: timeoutMs,
         }),
     ]);
     const enrichedInventory = await enrichOliveyoungProductsWithNearbyStoreInventory(productResult.products, {
@@ -37,9 +37,9 @@ async function checkInventory(args, transport) {
         storeKeyword,
         maxProducts: Math.min(productResult.products.length, Math.max(0, stockCheckLimit)),
     }, {
-        timeout: timeoutMs,
         apiKey: zyteApiKey,
         ...transport,
+        timeout: timeoutMs,
     });
     const inStockProducts = enrichedInventory.products.filter((product) => product.inStock);
     const result = {
@@ -98,7 +98,7 @@ export function createCheckInventoryTool(apiKey, transport = {}) {
                     .optional()
                     .default(5)
                     .describe('주변 매장별 재고를 보강할 상품 수 (기본값: 5, 최대: 5, 낮출수록 빠름)'),
-                timeoutMs: z.number().optional().default(15000).describe('요청 제한 시간(ms, 기본값: 15000)'),
+                timeoutMs: z.number().optional().default(transport.timeout ?? (transport.relayUrl ? 60000 : 15000)).describe('개별 조회 제한 시간(ms, 기본값: 무료 릴레이 60000 / 직접 15000)'),
             },
         },
         handler: ((args) => checkInventory({ ...args, zyteApiKey: apiKey }, transport)),

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

@@ -4,16 +4,16 @@
 import * as z from 'zod';
 import { fetchOliveyoungStores } from '../client.js';
 async function findNearbyStores(args, transport) {
-    const { latitude = 37.5665, longitude = 126.978, keyword = '', pageIdx = 1, limit = 20, timeoutMs = 15000, zyteApiKey, } = args;
+    const { latitude = 37.5665, longitude = 126.978, keyword = '', pageIdx = 1, limit = 20, timeoutMs = transport.timeout ?? (transport.relayUrl ? 60000 : 15000), zyteApiKey, } = args;
     const { totalCount, stores } = await fetchOliveyoungStores({
         latitude,
         longitude,
         pageIdx,
         searchWords: keyword,
     }, {
-        timeout: timeoutMs,
         apiKey: zyteApiKey,
         ...transport,
+        timeout: timeoutMs,
     });
     const limitedStores = stores.slice(0, limit);
     const result = {
@@ -46,7 +46,7 @@ export function createFindNearbyStoresTool(apiKey, transport = {}) {
                     .describe('매장 검색어 (예: 강남, 명동, 신촌). 비우면 주변 매장 전체 조회'),
                 pageIdx: z.number().optional().default(1).describe('매장 결과 페이지 번호 (기본값: 1)'),
                 limit: z.number().optional().default(20).describe('반환할 최대 매장 수 (기본값: 20)'),
-                timeoutMs: z.number().optional().default(15000).describe('요청 제한 시간(ms, 기본값: 15000)'),
+                timeoutMs: z.number().optional().default(transport.timeout ?? (transport.relayUrl ? 60000 : 15000)).describe('개별 조회 제한 시간(ms, 기본값: 무료 릴레이 60000 / 직접 15000)'),
             },
         },
         handler: ((args) => findNearbyStores({ ...args, zyteApiKey: apiKey }, transport)),

package/dist/services/oliveyoung/tools/searchProducts.js

@@ -4,7 +4,7 @@
 import * as z from 'zod';
 import { fetchOliveyoungProducts } from '../client.js';
 async function searchProducts(args, transport) {
-    const { keyword, page = 1, size = 20, sort = '01', includeSoldOut = false, timeoutMs = 15000, zyteApiKey, } = args;
+    const { keyword, page = 1, size = 20, sort = '01', includeSoldOut = false, timeoutMs = transport.timeout ?? (transport.relayUrl ? 60000 : 15000), zyteApiKey, } = args;
     if (!keyword || keyword.trim().length === 0) {
         throw new Error('상품 검색어(keyword)를 입력해주세요.');
     }
@@ -15,9 +15,9 @@ async function searchProducts(args, transport) {
         sort,
         includeSoldOut,
     }, {
-        timeout: timeoutMs,
         apiKey: zyteApiKey,
         ...transport,
+        timeout: timeoutMs,
     });
     return {
         content: [
@@ -50,7 +50,7 @@ export function createSearchProductsTool(apiKey, transport = {}) {
                 size: z.number().optional().default(20).describe('페이지당 상품 수 (기본값: 20)'),
                 sort: z.string().optional().default('01').describe('정렬 코드 (기본값: 01)'),
                 includeSoldOut: z.boolean().optional().default(false).describe('품절 상품 포함 여부 (기본값: false)'),
-                timeoutMs: z.number().optional().default(15000).describe('요청 제한 시간(ms, 기본값: 15000)'),
+                timeoutMs: z.number().optional().default(transport.timeout ?? (transport.relayUrl ? 60000 : 15000)).describe('개별 조회 제한 시간(ms, 기본값: 무료 릴레이 60000 / 직접 15000)'),
             },
         },
         handler: ((args) => searchProducts({ ...args, zyteApiKey: apiKey }, transport)),

package/dist/services/oliveyoung/transport.js

@@ -24,7 +24,8 @@ export function isValidOliveyoungRelayUrl(value) {
             !(relay.protocol === 'http:' && ['127.0.0.1', 'localhost'].includes(relay.hostname))));
 }
 export async function requestOliveyoung(path, body, options = {}) {
-    const { timeout = 15000, relayUrl, relayToken } = options;
+    const { relayUrl, relayToken, timeout = relayUrl ? 60000 : 15000 } = options;
+    const deadline = Date.now() + timeout;
     const headers = {
         'Content-Type': 'application/json',
         Accept: 'application/json',
@@ -64,40 +65,55 @@ export async function requestOliveyoung(path, body, options = {}) {
     }
     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, {
-            method: 'POST',
-            // Workers는 error 모드를 지원하지 않으므로 따라가지 않고 아래 200 검사로 거절합니다.
-            redirect: 'manual',
-            headers,
-            body: JSON.stringify(body),
-            timeout,
-            retries: 0,
-            expectedStatus: 200,
-        });
-    }
-    catch (error) {
-        if (relayUrl) {
-            if (error instanceof HttpError && error.quota)
-                cooldown.set(scope, consumer, error.quota);
-            throw toOliveyoungRelayError(error);
+    let retried = false;
+    while (true) {
+        let result;
+        const cachedQuota = relayUrl ? cooldown.get(scope, consumer) : undefined;
+        try {
+            const remaining = deadline - Date.now();
+            if (remaining <= 0)
+                throw new DOMException('Request deadline exceeded', 'AbortError');
+            if (cachedQuota)
+                throw new HttpError(429, '', '', new Headers({
+                    'x-relay-quota-reason': cachedQuota.quotaReason,
+                    'retry-after': String(cachedQuota.retryAfter),
+                }));
+            result = await fetchJson(url, {
+                method: 'POST',
+                // Workers는 error 모드를 지원하지 않으므로 따라가지 않고 아래 200 검사로 거절합니다.
+                redirect: 'manual',
+                headers,
+                body: JSON.stringify(body),
+                timeout: remaining,
+                retries: 0,
+                expectedStatus: 200,
+            });
+        }
+        catch (error) {
+            if (relayUrl) {
+                if (error instanceof HttpError && error.quota) {
+                    if (!cachedQuota)
+                        cooldown.set(scope, consumer, error.quota);
+                    if (!retried && error.quota.quotaReason === 'consumer-busy' &&
+                        deadline - Date.now() > 1000) {
+                        retried = true;
+                        await new Promise(resolve => setTimeout(resolve, 1000));
+                        continue;
+                    }
+                }
+                throw toOliveyoungRelayError(error);
+            }
+            if (error instanceof Error && error.name === 'AbortError') {
+                throw new Error('올리브영 API 요청 시간 초과');
+            }
+            throw new Error('올리브영 직접 요청 실패. 운영자는 OY_RELAY_URL과 OY_RELAY_TOKEN으로 브라우저 릴레이를 설정해주세요.', { cause: error });
         }
-        if (error instanceof Error && error.name === 'AbortError') {
-            throw new Error('올리브영 API 요청 시간 초과');
+        if (result?.status !== 'SUCCESS') {
+            if (relayUrl)
+                throw toOliveyoungRelayError(new SyntaxError());
+            throw new Error(`올리브영 API 상태 오류: ${result?.status || 'UNKNOWN'}`);
         }
-        throw new Error('올리브영 직접 요청 실패. 운영자는 OY_RELAY_URL과 OY_RELAY_TOKEN으로 브라우저 릴레이를 설정해주세요.', { cause: error });
-    }
-    if (result?.status !== 'SUCCESS') {
-        if (relayUrl)
-            throw toOliveyoungRelayError(new SyntaxError());
-        throw new Error(`올리브영 API 상태 오류: ${result?.status || 'UNKNOWN'}`);
+        return result;
     }
-    return result;
 }

package/dist/utils/relayQuota.js

@@ -3,7 +3,9 @@ export function parseRelayQuota(status, headers) {
         return undefined;
     const reason = headers.get('x-relay-quota-reason');
     const retry = headers.get('retry-after') || '';
-    if (reason !== 'minute' && reason !== 'daily' && reason !== 'consumer')
+    if (reason !== 'minute' && reason !== 'daily' && reason !== 'consumer' && reason !== 'consumer-busy')
+        return undefined;
+    if (reason === 'consumer-busy' && retry !== '1')
         return undefined;
     if (!/^[1-9][0-9]{0,4}$/.test(retry) || Number(retry) > 86400)
         return undefined;
@@ -27,7 +29,7 @@ export function createRelayCooldown(now = () => Date.now(), maxEntries = 1024) {
         },
         set(scope, consumer, quota) {
             prune();
-            const key = quota.quotaReason === 'consumer' ? `${scope}:${consumer}` : scope;
+            const key = (quota.quotaReason === 'consumer' || quota.quotaReason === 'consumer-busy') ? `${scope}:${consumer}` : scope;
             if (!entries.has(key) && entries.size >= maxEntries)
                 return;
             const until = now() + quota.retryAfter * 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "daiso",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "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": {