From d8bde641e99d36ae5dec917eb003a424f3070598 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Fri, 24 Oct 2025 21:42:10 +0100
Subject: [PATCH] Update appwrite-browser image to version 0.3.1; enhance
 avatar screenshot API by adding 'waitUntil' parameter and refactoring image
 processing logic for improved efficiency.

---
 app/controllers/api/avatars.php | 42 ++++++++++++++++++++-------------
 app/controllers/shared/api.php  |  9 ++++++-
 app/views/install/compose.phtml |  2 +-
 docker-compose.yml              |  2 +-
 4 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php
index e77426ad76..8653a9e437 100644
--- a/app/controllers/api/avatars.php
+++ b/app/controllers/api/avatars.php
@@ -726,6 +726,7 @@ App::get('/v1/avatars/screenshots')
             'theme' => $theme,
             'headers' => $headersObject,
             'sleep' => $sleep * 1000, // Convert seconds to milliseconds
+            'waitUntil' => 'load',
             'viewport' => [
                 'width' => $browserWidth,
                 'height' => $browserHeight
@@ -734,7 +735,7 @@ App::get('/v1/avatars/screenshots')
 
         // Add scale if not default
         if ($scale != 1) {
-            $config['scale'] = $scale;
+            $config['deviceScaleFactor'] = $scale;
         }
 
         // Add fullPage to viewport if enabled
@@ -788,7 +789,7 @@ App::get('/v1/avatars/screenshots')
         
         // Add scale if not default
         if ($scale != 1) {
-            $finalConfig['scale'] = $scale;
+            $finalConfig['deviceScaleFactor'] = $scale;
         }
 
         // Add optional parameters that were set, preserving arrays as arrays
@@ -847,22 +848,29 @@ App::get('/v1/avatars/screenshots')
                 throw new Exception(Exception::AVATAR_IMAGE_NOT_FOUND, 'Screenshot not generated');
             }
 
-            // Determine output format
+            // Determine if image processing is needed
+            $needsProcessing = ($width > 0 && $height > 0) || $quality !== -1 || !empty($output);
+            
+            if ($needsProcessing) {
+                // Process image with cropping, quality adjustment, or format conversion
+                $image = new Image($screenshot);
+                
+                if ($width > 0 && $height > 0) {
+                    $image->crop($width, $height);
+                }
+                
+                $output = $output ?: 'png'; // Default to PNG if not specified
+                $resizedScreenshot = $image->output($output, $quality);
+                unset($image);
+            } else {
+                // Return original screenshot without processing
+                $resizedScreenshot = $screenshot;
+                $output = 'png'; // Screenshots are typically PNG by default
+            }
+
+            // Set content type based on output format
             $outputs = Config::getParam('storage-outputs');
-            if (empty($output)) {
-                $output = 'png'; // Default to PNG for screenshots
-            }
-
-            // Only resize if width and height are explicitly set (not 0)
-            $image = new Image($screenshot);
-            if ($width > 0 && $height > 0) {
-                $image->crop($width, $height);
-            }
-
-            $resizedScreenshot = $image->output($output, $quality);
-            unset($image);
-
-            $contentType = (\array_key_exists($output, $outputs)) ? $outputs[$output] : $outputs['png'];
+            $contentType = $outputs[$output] ?? $outputs['png'];
 
             $response
                 ->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 959ee77b7d..d244ebd7f5 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -54,7 +54,12 @@ $parseLabel = function (string $label, array $responsePayload, array $requestPar
         };
 
         if (array_key_exists($replace, $params)) {
-            $label = \str_replace($find, $params[$replace], $label);
+            $replacement = $params[$replace];
+            // Convert to string if it's not already a string
+            if (!is_string($replacement)) {
+                $replacement = is_array($replacement) ? json_encode($replacement) : (string)$replacement;
+            }
+            $label = \str_replace($find, $replacement, $label);
         }
     }
     return $label;
@@ -831,11 +836,13 @@ App::shutdown()
                 $pattern = $route->getLabel('cache.resource', null);
                 if (!empty($pattern)) {
                     $resource = $parseLabel($pattern, $responsePayload, $requestParams, $user);
+                    var_dump($resource);
                 }
 
                 $pattern = $route->getLabel('cache.resourceType', null);
                 if (!empty($pattern)) {
                     $resourceType = $parseLabel($pattern, $responsePayload, $requestParams, $user);
+                    var_dump($resourceType);
                 }
 
                 $cache = new Cache(
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index ed4de38d2b..22fa371734 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -859,7 +859,7 @@ $image = $this->getParam('image', '');
       - _APP_ASSISTANT_OPENAI_API_KEY
       
   appwrite-browser:
-    image: appwrite/browser:0.2.4
+    image: appwrite/browser:0.3.1
     container_name: appwrite-browser
     <<: *x-logging
     restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index da6362b4c4..2ece9ec20c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -957,7 +957,7 @@ services:
 
   appwrite-browser:
     container_name: appwrite-browser
-    image: appwrite/browser:0.2.4
+    image: appwrite/browser:0.3.1
     networks:
       - appwrite