Update app.py

app.py

@@ -425,37 +425,9 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0
         
         # 5) Font Awesomeと外部リソースの読み込み完了を確認
         try:
-            # Font Awesomeと外部リソースの読み込み完了を確認するスクリプト
-            resource_check_script = """
-            return new Promise((resolve) => {
-                // Font Awesomeの読み込み確認
-                const checkFontAwesome = () => {
-                    const icons = document.querySelectorAll('.fa, .fas, .far, .fab, [class*="fa-"]');
-                    if (icons.length > 0) {
-                        console.log('Font Awesome icons found:', icons.length);
-                        // すべてのフォントの読み込み完了を待つ
-                        document.fonts.ready.then(() => {
-                            console.log('All fonts loaded');
-                            setTimeout(resolve, 1000); // 安定化のための追加待機
-                        });
-                    } else {
-                        // アイコンがない、またはすでに読み込み完了
-                        document.fonts.ready.then(() => setTimeout(resolve, 500));
-                    }
-                };
-                
-                // DOMContentLoadedまたはloadイベント後にチェック
-                if (document.readyState === 'complete') {
-                    checkFontAwesome();
-                } else {
-                    window.addEventListener('load', checkFontAwesome);
-                }
-            });
-            """
-            
             logger.info("Waiting for Font Awesome and other resources to load...")
             driver.set_script_timeout(15)  # 15秒のタイムアウト
-            driver.execute_async_script(f"const callback = arguments[arguments.length - 1]; {resource_check_script}.then(callback);")
+            driver.execute_async_script(resource_check_script)
             logger.info("Resources loaded successfully")
         except Exception as e:
             logger.warning(f"Resource loading check failed: {e}. Using fallback wait.")
@@ -463,42 +435,14 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0
         
         # 6) スクロールを制御してコンテンツ全体が描画されるようにする
         try:
-            scroll_script = """
-            return new Promise(resolve => {
-                const height = Math.max(
-                    document.documentElement.scrollHeight,
-                    document.body.scrollHeight
-                );
-                const viewportHeight = window.innerHeight;
-                
-                // ページを少しずつスクロールして全体を描画させる
-                const scrollStep = Math.floor(viewportHeight * 0.8);
-                let currentPos = 0;
-                
-                const scrollDown = () => {
-                    if (currentPos < height) {
-                        window.scrollTo(0, currentPos);
-                        currentPos += scrollStep;
-                        setTimeout(scrollDown, 100);
-                    } else {
-                        // 最後にトップに戻す
-                        window.scrollTo(0, 0);
-                        setTimeout(resolve, 300);
-                    }
-                };
-                
-                scrollDown();
-            });
-            """
-            
             logger.info("Ensuring all content is rendered...")
-            driver.execute_async_script(f"const callback = arguments[arguments.length - 1]; {scroll_script}.then(callback);")
+            driver.execute_async_script(scroll_script)
         except Exception as e:
             logger.warning(f"Content rendering check failed: {e}")
             # スクロールを元の位置に戻す
             driver.execute_script("window.scrollTo(0, 0);")
             time.sleep(1)
-
+            
         # 7) Hide scrollbars via CSS
         try:
             driver.execute_script(
@@ -566,42 +510,13 @@ def render_fullpage_screenshot(html_code: str, extension_percentage: float = 6.0
         
         # 9) レイアウト安定化の確認
         try:
-            stability_script = """
-            return new Promise(resolve => {
-                let lastHeight = document.body.offsetHeight;
-                let lastWidth = document.body.offsetWidth;
-                let stableCount = 0;
-                
-                const checkStability = () => {
-                    const currentHeight = document.body.offsetHeight;
-                    const currentWidth = document.body.offsetWidth;
-                    
-                    if (currentHeight === lastHeight && currentWidth === lastWidth) {
-                        stableCount++;
-                        if (stableCount >= 3) {  // 3回連続で同じなら安定と判断
-                            resolve(true);
-                            return;
-                        }
-                    } else {
-                        stableCount = 0;
-                        lastHeight = currentHeight;
-                        lastWidth = currentWidth;
-                    }
-                    
-                    setTimeout(checkStability, 200);  // 200ms間隔でチェック
-                };
-                
-                checkStability();
-            });
-            """
-            
             logger.info("Checking layout stability...")
-            driver.execute_async_script(f"const callback = arguments[arguments.length - 1]; {stability_script}.then(callback);")
+            driver.execute_async_script(stability_script)
             logger.info("Layout is stable")
         except Exception as e:
             logger.warning(f"Layout stability check failed: {e}")
             time.sleep(2)  # 追加待機
-
+    
         # 10) Calculate adjusted height with user-specified margin
         adjusted_height = int(scroll_height * (1 + extension_percentage / 100.0))
         # Ensure adjusted height is not excessively large or small