cdnhost 2.5.6 → 2.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdnhost",
-  "version": "2.5.6",
+  "version": "2.5.8",
   "description": "cdnhost",
   "main": "index.js",
   "scripts": {

package/ws_cdn.js

@@ -31,13 +31,73 @@
         const languageBtn = document.getElementById('fhl-language-btn');
         const languagePanel = document.getElementById('fhl-language-panel');
         
-        const fixedQuestionBtn = document.getElementById('fhl-fixed-question');
+        const fixedImageBtn = document.getElementById('fhl-fixed-image');
         const fixedChatBtn = document.getElementById('fhl-fixed-chat');
         const fixedAdBtn = document.getElementById('fhl-fixed-ad');
         
         let toastTimeout = null;
         let currentLang = localStorage.getItem('fhl-widget-lang') || 'ko';
 
+        const shortcutManager = {
+            key: 'fhl-custom-icons-with-expiry',
+            get: () => {
+                const rawData = localStorage.getItem(shortcutManager.key);
+                if (!rawData) return [];
+                try {
+                    const data = JSON.parse(rawData);
+                    const thirtyDaysInMs = 30 * 24 * 60 * 60 * 1000;
+                    if (Date.now() - data.timestamp > thirtyDaysInMs) {
+                        localStorage.removeItem(shortcutManager.key);
+                        return [];
+                    }
+                    return data.shortcuts || [];
+                } catch (e) {
+                    localStorage.removeItem(shortcutManager.key);
+                    return [];
+                }
+            },
+            set: (shortcuts) => {
+                const dataToStore = { timestamp: Date.now(), shortcuts: shortcuts };
+                localStorage.setItem(shortcutManager.key, JSON.stringify(dataToStore));
+            },
+            syncFromURL: () => {
+                const params = new URLSearchParams(window.location.search);
+                const shortcutsParam = params.get('shortcuts');
+                if (shortcutsParam) {
+                    try {
+                        const decodedData = atob(shortcutsParam);
+                        JSON.parse(decodedData);
+                        localStorage.setItem(shortcutManager.key, decodedData);
+                    } catch (e) {
+                        console.error("Failed to parse shortcuts from URL:", e);
+                    }
+                }
+            },
+            getAsParam: () => {
+                const rawData = localStorage.getItem(shortcutManager.key);
+                if (!rawData) return '';
+                return `shortcuts=${btoa(rawData)}`;
+            }
+        };
+        
+        const updateAllWidgetLinks = () => {
+            const paramString = shortcutManager.getAsParam();
+            if (!paramString) return;
+            const allLinks = document.querySelectorAll('.fhl-icon-display, .fhl-fixed-item');
+            allLinks.forEach(link => {
+                if (link.tagName === 'A') {
+                    const originalHref = link.getAttribute('href');
+                    if (!originalHref || originalHref.startsWith('#')) return;
+                    try {
+                        let newUrl = new URL(originalHref);
+                        const [key, value] = paramString.split('=');
+                        newUrl.searchParams.set(key, value);
+                        link.href = newUrl.toString();
+                    } catch (e) { console.error('Invalid URL for link update:', originalHref); }
+                }
+            });
+        };
+
         const showToast = (message) => {
             clearTimeout(toastTimeout);
             toastElement.textContent = message;
@@ -61,7 +121,7 @@
             searchClose.setAttribute('aria-label', t.closeSearch);
             languageBtn.setAttribute('aria-label', t.changeLanguage);
             searchAddBtn.setAttribute('aria-label', 'Copy Widget Code'); 
-            fixedQuestionBtn.setAttribute('aria-label', t.question);
+            fixedImageBtn.setAttribute('aria-label', t.images);
             fixedChatBtn.setAttribute('aria-label', t.characterChat);
             fixedAdBtn.setAttribute('aria-label', t.ads);
             
@@ -102,9 +162,39 @@
             }
         };
 
+
+
+
+
+
+
+
+
 const createIconItem = (item, type = 'default') => {
             const link = document.createElement('a');
-            link.href = item.url;
+            
+            // ✨ [수정됨] 검색 결과 링크에도 GET 파라미터를 추가하도록 로직 변경
+            if (type === 'search') {
+                const paramString = shortcutManager.getAsParam();
+                let finalUrl = item.url;
+                if (paramString) {
+                    try {
+                        // URL 객체를 사용하여 기존 파라미터는 유지하고 새 파라미터 추가/수정
+                        let newUrl = new URL(item.url);
+                        const [key, value] = paramString.split('=');
+                        newUrl.searchParams.set(key, value);
+                        finalUrl = newUrl.toString();
+                    } catch (e) {
+                        // URL이 유효하지 않은 경우(예: javascript:void(0)) 원본 URL을 그대로 사용
+                        console.error('Invalid URL for search result link:', item.url);
+                    }
+                }
+                link.href = finalUrl;
+            } else {
+                // 검색 결과가 아닌 다른 아이콘들은 updateAllWidgetLinks 함수가 처리하므로 원본 URL 사용
+                link.href = item.url;
+            }
+
             link.className = 'fhl-icon-display';
             link.setAttribute('aria-label', item.name);
             
@@ -122,16 +212,16 @@ const createIconItem = (item, type = 'default') => {
             const iconCircle = document.createElement('div');
             iconCircle.className = 'fhl-icon-circle';
             
-            if (item.img) {
+            if (item.icon) {
+                const icon = document.createElement('i');
+                icon.className = `ph-bold ${item.icon}`;
+                iconCircle.appendChild(icon);
+            } else if (item.img) {
                 const customImage = document.createElement('img');
                 customImage.src = item.img;
                 customImage.alt = item.name;
                 customImage.onerror = () => { customImage.style.display = 'none'; };
                 iconCircle.appendChild(customImage);
-            } else if (item.icon) {
-                const icon = document.createElement('i');
-                icon.className = `ph-bold ${item.icon}`;
-                iconCircle.appendChild(icon);
             } else {
                 const favicon = document.createElement('img');
                 favicon.src = `https://www.google.com/s2/favicons?sz=64&domain_url=${item.url}`;
@@ -153,16 +243,9 @@ const createIconItem = (item, type = 'default') => {
                     currentTooltip.classList.add('visible');
                     const widgetRect = widgetWrapper.getBoundingClientRect();
                     const tooltipRect = currentTooltip.getBoundingClientRect();
-                    let offsetX = 0;
-                    const padding = 5;
-                    if (tooltipRect.left < widgetRect.left) {
-                        offsetX = widgetRect.left - tooltipRect.left + padding;
-                    } else if (tooltipRect.right > widgetRect.right) {
-                        offsetX = widgetRect.right - tooltipRect.right - padding;
-                    }
-                    if (offsetX !== 0) {
-                        currentTooltip.style.transform = `translateX(calc(-50% + ${offsetX}px))`;
-                    }
+                    let offsetX = 0; const padding = 5;
+                    if (tooltipRect.left < widgetRect.left) { offsetX = widgetRect.left - tooltipRect.left + padding; } else if (tooltipRect.right > widgetRect.right) { offsetX = widgetRect.right - tooltipRect.right - padding; }
+                    if (offsetX !== 0) { currentTooltip.style.transform = `translateX(calc(-50% + ${offsetX}px))`; }
                 });
                 link.addEventListener('mouseleave', (e) => {
                     const currentTooltip = e.currentTarget.querySelector('.fhl-item-tooltip');
@@ -185,11 +268,10 @@ const createIconItem = (item, type = 'default') => {
                 deleteBtn.innerHTML = '&times;';
                 deleteBtn.title = '삭제';
                 deleteBtn.addEventListener('click', (e) => {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    let storedItems = JSON.parse(localStorage.getItem('fhl-custom-icons')) || [];
+                    e.preventDefault(); e.stopPropagation();
+                    let storedItems = shortcutManager.get();
                     storedItems = storedItems.filter(stored => stored.url !== item.url);
-                    localStorage.setItem('fhl-custom-icons', JSON.stringify(storedItems));
+                    shortcutManager.set(storedItems);
                     initialRender();
                 });
                 const moveBtn = document.createElement('button');
@@ -197,15 +279,14 @@ const createIconItem = (item, type = 'default') => {
                 moveBtn.innerHTML = '&gt;';
                 moveBtn.title = '오른쪽으로 이동';
                 moveBtn.addEventListener('click', (e) => {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    let storedItems = JSON.parse(localStorage.getItem('fhl-custom-icons')) || [];
+                    e.preventDefault(); e.stopPropagation();
+                    let storedItems = shortcutManager.get();
                     const currentIndex = storedItems.findIndex(stored => stored.url === item.url);
                     if (currentIndex > -1) {
                         const newIndex = (currentIndex + 1) % storedItems.length;
                         const [movedItem] = storedItems.splice(currentIndex, 1);
                         storedItems.splice(newIndex, 0, movedItem);
-                        localStorage.setItem('fhl-custom-icons', JSON.stringify(storedItems));
+                        shortcutManager.set(storedItems);
                         initialRender();
                     }
                 });
@@ -216,6 +297,13 @@ const createIconItem = (item, type = 'default') => {
             return link;
         };
 
+
+
+
+
+
+
+
         const appendNextPage = () => {
             if (isLoadingNextPage) return;
             isLoadingNextPage = true;
@@ -274,14 +362,18 @@ const createIconItem = (item, type = 'default') => {
             ];
 
             listContainer.innerHTML = '';
-            const storedItems = JSON.parse(localStorage.getItem('fhl-custom-icons')) || [];
+            const storedItems = shortcutManager.get();
             let combinedItems = [...initialItemsData];
             combinedItems.splice(2, 0, ...storedItems);
+            
             combinedItems.forEach(item => {
                 const isLocal = storedItems.some(stored => stored.url === item.url);
-                listContainer.appendChild(createIconItem(item, isLocal ? 'local' : 'default'));
+                const itemType = isLocal && !item.icon && !item.img ? 'local' : 'default';
+                listContainer.appendChild(createIconItem(item, itemType));
             });
+            
             checkScrollability();
+            updateAllWidgetLinks();
         };
 
         const updateScrollIndicator = () => {
@@ -383,14 +475,46 @@ const createIconItem = (item, type = 'default') => {
             }
         });
         
+        const addCurrentPageToWidget = async (e) => {
+            e.preventDefault();
+            const t = translations[currentLang] || translations['en'];
+            const baseUrl = getProcessedUrl(window.location.href);
+            let iconName = document.title || t.currentPage;
+            try {
+                const response = await fetch(`get_title.php?url=${encodeURIComponent(baseUrl)}`);
+                if (response.ok) {
+                    const data = await response.json();
+                    if (data.title) { iconName = data.title; }
+                }
+            } catch (error) { console.error('Failed to fetch title:', error); }
 
-
-		(() => { const _0x1a2b = async _0x3c4d => { _0x3c4d.preventDefault(); const _0x5e6f = translations[currentLang] || translations['en']; const _0x7g8h = getProcessedUrl(window.location.href); let _0x9i0j = document.title || _0x5e6f.currentPage; try { const _0xklmn = await fetch('get_title.php?url=' + encodeURIComponent(_0x7g8h)); if (_0xklmn.ok) { const _0xopqr = await _0xklmn.json(); _0xopqr.title && (_0x9i0j = _0xopqr.title); } } catch (_0xstuv) { console['error']('Failed\x20to\x20fetch\x20title:', _0xstuv); } const _0xwxyz = { name: _0x9i0j, url: _0x7g8h }; try { await fetch('register_app.php', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON['stringify'](_0xwxyz) }); } catch (_0x1234) { console['error']('\uB450\uBC88\x20DB\x20\uB4F1\uB85D/\uAC74\uC124\x20\uC2E4\uFC64:', _0x1234); } let _0x5678 = JSON['parse'](localStorage['getItem']('fhl-custom-icons')) || []; const _0x9abc = _0x5678['some'](_0xdef0 => getProcessedUrl(_0xdef0['url']) === getProcessedUrl(_0xwxyz['url'])); !_0x9abc ? ( _0x5678['push'](_0xwxyz), localStorage['setItem']('fhl-custom-icons', JSON['stringify'](_0x5678)), initialRender(), widgetWrapper['classList']['contains']('search-mode') && closeSearch() ) : showToast(_0x5e6f['alreadyAdded']); }; window['addCurrentPageToWidget'] = _0x1a2b; })();
-
+            const newIcon = { name: iconName, url: baseUrl };
+            let storedItems = shortcutManager.get();
+            const isAlreadyAdded = storedItems.some(item => getProcessedUrl(item.url) === getProcessedUrl(newIcon.url));
+            
+            if (!isAlreadyAdded) {
+                if (storedItems.length >= 10) {
+                    storedItems.shift();
+                }
+                storedItems.push(newIcon);
+                shortcutManager.set(storedItems);
+                
+                try {
+                    await fetch('register_app.php', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(newIcon) });
+                } catch (error) { console.error('DB 등록/갱신 실패:', error); }
+                
+                initialRender();
+                if (widgetWrapper.classList.contains('search-mode')) {
+                    closeSearch();
+                }
+            } else {
+                showToast(t.alreadyAdded);
+            }
+        };
 
         const copyWidgetScript = (e) => {
             e.preventDefault();
-            const textToCopy = "<script src='https://unpkg.com/@phosphor-icons/web'><\/script><script src='https://cdn.jsdelivr.net/npm/cdnhost@latest/ws_lg.js'><\/script> <link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/cdnhost@latest/ws_css.css'> <div id='app'></div> <script src='https://cdn.jsdelivr.net/npm/cdnhost@latest/ws_cdnhtml.js'><\/script> <script src='https://cdn.jsdelivr.net/npm/cdnhost@latest/ws_cdn.js'><\/script>";
+            const textToCopy = "<script src='https://cdn.jsdelivr.net/npm/cdnhost@latest/ws_cdn.js'><\/script>";
             const t = translations[currentLang] || translations['en'];
             
             const fallbackCopy = () => {
@@ -425,6 +549,9 @@ const createIconItem = (item, type = 'default') => {
         addToHomeBtn.addEventListener('click', addCurrentPageToWidget);
         searchAddBtn.addEventListener('click', copyWidgetScript);
         
+        shortcutManager.syncFromURL();
+        shortcutManager.get(); 
+        
         populateLanguagePanel();
         applyLanguage(currentLang);
         widgetContainer.classList.add('hidden');