Skip to content

refactor: centralize Polli image refresh helper #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hackall360 merged 1 commit into from
Sep 13, 2025
Merged

refactor: centralize Polli image refresh helper #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 29 additions & 65 deletions chat-storage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,73 +334,37 @@ document.addEventListener("DOMContentLoaded", () => {
showToast("Failed to download image: " + err.message);
});
}
function refreshImage(img, imageId) {
console.log(`Refreshing image with ID: ${imageId}`);
if (!img.src) {
showToast("No image source to refresh.");
return;
}
const urlObj = new URL(img.src);
if (!window.polliClient || !window.polliClient.imageBase) {
showToast("Image client not ready.");
function refreshImage(img, imageId) {
console.log(`Refreshing image with ID: ${imageId}`);
const { url: finalUrl, error } = window.refreshPolliImage(img?.src, {
width: img.naturalWidth,
height: img.naturalHeight,
});
if (!finalUrl) {
showToast(error || "Failed to refresh image");
return;
}
const baseOrigin = new URL(window.polliClient.imageBase).origin;
if (urlObj.origin !== baseOrigin) {
showToast("Can't refresh: not a polliLib image URL.");
return;
}
const newSeed = Math.floor(Math.random() * 1000000);
let prompt = '';
try {
const parts = urlObj.pathname.split('/');
const i = parts.indexOf('prompt');
if (i >= 0 && parts[i+1]) prompt = decodeURIComponent(parts[i+1]);
} catch {}
const width = Number(urlObj.searchParams.get('width')) || img.naturalWidth || 512;
const height = Number(urlObj.searchParams.get('height')) || img.naturalHeight || 512;
const model = urlObj.searchParams.get('model') || (document.getElementById('model-select')?.value || undefined);
let newUrl = img.src;
try {
if (window.polliLib && window.polliClient && prompt) {
newUrl = window.polliLib.mcp.generateImageUrl(window.polliClient, {
prompt, width, height, seed: newSeed, nologo: true, model
});
} else {
urlObj.searchParams.set('seed', String(newSeed));
newUrl = urlObj.toString();
}
} catch (e) {
console.warn('polliLib generateImageUrl failed; falling back to seed swap', e);
urlObj.searchParams.set('seed', String(newSeed));
newUrl = urlObj.toString();
}
const newUrlObj = new URL(newUrl);
if (!newUrlObj.searchParams.has('referrer') && window.polliClient?.referrer) {
newUrlObj.searchParams.set('referrer', window.polliClient.referrer); // retain referrer for API tiering
}
const finalUrl = newUrlObj.toString();
const loadingDiv = document.createElement("div");
loadingDiv.className = "ai-image-loading";
const spinner = document.createElement("div");
spinner.className = "loading-spinner";
loadingDiv.appendChild(spinner);
loadingDiv.style.width = img.width + "px";
loadingDiv.style.height = img.height + "px";
img.parentNode.insertBefore(loadingDiv, img);
img.style.display = "none";
img.onload = () => {
loadingDiv.remove();
img.style.display = "block";
showToast("Image refreshed with new seed");
};
img.onerror = () => {
loadingDiv.innerHTML = "⚠️ Failed to refresh image";
loadingDiv.style.display = "flex";
loadingDiv.style.justifyContent = "center";
loadingDiv.style.alignItems = "center";
showToast("Failed to refresh image");
};
const loadingDiv = document.createElement("div");
loadingDiv.className = "ai-image-loading";
const spinner = document.createElement("div");
spinner.className = "loading-spinner";
loadingDiv.appendChild(spinner);
loadingDiv.style.width = img.width + "px";
loadingDiv.style.height = img.height + "px";
img.parentNode.insertBefore(loadingDiv, img);
img.style.display = "none";
img.onload = () => {
loadingDiv.remove();
img.style.display = "block";
showToast("Image refreshed with new seed");
};
img.onerror = () => {
loadingDiv.innerHTML = "⚠️ Failed to refresh image";
loadingDiv.style.display = "flex";
loadingDiv.style.justifyContent = "center";
loadingDiv.style.alignItems = "center";
showToast("Failed to refresh image");
};
img.src = finalUrl;
}
function openImageInNewTab(img, imageId) {
Expand Down
11 changes: 6 additions & 5 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,11 @@ <h3 class="modal-title">Voice Chat</h3>

<!-- UI now safely uses PolliLib's default client -->
<script defer src="ui.js"></script>

<script defer src="chat-storage.js"></script>
<script defer src="chat-init.js"></script>
<script defer src="simple.js"></script>
</body>

<script defer src="polli-utils.js"></script>
<script defer src="chat-storage.js"></script>
<script defer src="chat-init.js"></script>
<script defer src="simple.js"></script>
</body>

</html>
51 changes: 51 additions & 0 deletions polli-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
(function(global){
function refreshPolliImage(url, options = {}) {
if (!url) {
return { error: 'No image source to refresh.' };
}
let urlObj;
try {
urlObj = new URL(url);
} catch {
return { error: 'Invalid image URL.' };
}
if (!global.polliClient || !global.polliClient.imageBase) {
return { error: 'Image client not ready.' };
}
const baseOrigin = new URL(global.polliClient.imageBase).origin;
if (urlObj.origin !== baseOrigin) {
return { error: "Can't refresh: not a polliLib image URL." };
}
const newSeed = Math.floor(Math.random() * 1000000);
let prompt = '';
try {
const parts = urlObj.pathname.split('/');
const i = parts.indexOf('prompt');
if (i >= 0 && parts[i + 1]) prompt = decodeURIComponent(parts[i + 1]);
} catch {}
const width = options.width || Number(urlObj.searchParams.get('width')) || 512;
const height = options.height || Number(urlObj.searchParams.get('height')) || 512;
const model = options.model || urlObj.searchParams.get('model') || (document.getElementById('model-select')?.value || undefined);
let newUrl = url;
try {
if (global.polliLib && global.polliClient && prompt) {
newUrl = global.polliLib.mcp.generateImageUrl(global.polliClient, {
prompt, width, height, seed: newSeed, nologo: true, model
});
} else {
urlObj.searchParams.set('seed', String(newSeed));
newUrl = urlObj.toString();
}
} catch (e) {
console.warn('polliLib generateImageUrl failed; falling back to seed swap', e);
urlObj.searchParams.set('seed', String(newSeed));
newUrl = urlObj.toString();
}
const newUrlObj = new URL(newUrl);
if (!newUrlObj.searchParams.has('referrer') && global.polliClient?.referrer) {
newUrlObj.searchParams.set('referrer', global.polliClient.referrer);
}
return { url: newUrlObj.toString() };
}
global.refreshPolliImage = refreshPolliImage;
})(window);
98 changes: 31 additions & 67 deletions simple.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,75 +562,39 @@ document.addEventListener("DOMContentLoaded", () => {
});
}

function refreshImage(img, imageId) {
console.log(`Refreshing image with ID: ${imageId} in simple mode`);
if (!img.src) {
window.showToast("No image source to refresh.");
return;
}
const urlObj = new URL(img.src);
if (!window.polliClient || !window.polliClient.imageBase) {
window.showToast("Image client not ready.");
function refreshImage(img, imageId) {
console.log(`Refreshing image with ID: ${imageId} in simple mode`);
const { url: finalUrl, error } = window.refreshPolliImage(img?.src, {
width: img.naturalWidth,
height: img.naturalHeight,
});
if (!finalUrl) {
window.showToast(error || "Failed to refresh image");
return;
}
const baseOrigin = new URL(window.polliClient.imageBase).origin;
if (urlObj.origin !== baseOrigin) {
window.showToast("Can't refresh: not a polliLib image URL.");
return;
}
const newSeed = Math.floor(Math.random() * 1000000);
let prompt = '';
try {
const parts = urlObj.pathname.split('/');
const i = parts.indexOf('prompt');
if (i >= 0 && parts[i+1]) prompt = decodeURIComponent(parts[i+1]);
} catch {}
const width = Number(urlObj.searchParams.get('width')) || img.naturalWidth || 512;
const height = Number(urlObj.searchParams.get('height')) || img.naturalHeight || 512;
const model = urlObj.searchParams.get('model') || (document.getElementById('model-select')?.value || undefined);
let newUrl = img.src;
try {
if (window.polliLib && window.polliClient && prompt) {
newUrl = window.polliLib.mcp.generateImageUrl(window.polliClient, {
prompt, width, height, seed: newSeed, nologo: true, model
});
} else {
urlObj.searchParams.set('seed', String(newSeed));
newUrl = urlObj.toString();
}
} catch (e) {
console.warn('polliLib generateImageUrl failed; falling back to seed swap', e);
urlObj.searchParams.set('seed', String(newSeed));
newUrl = urlObj.toString();
}
const newUrlObj = new URL(newUrl);
if (!newUrlObj.searchParams.has('referrer') && window.polliClient?.referrer) {
newUrlObj.searchParams.set('referrer', window.polliClient.referrer); // retain referrer for API tiering
}
const finalUrl = newUrlObj.toString();

const loadingDiv = document.createElement("div");
loadingDiv.className = "simple-ai-image-loading";
const spinner = document.createElement("div");
spinner.className = "simple-loading-spinner";
loadingDiv.appendChild(spinner);
loadingDiv.style.width = img.width + "px";
loadingDiv.style.height = img.height + "px";
img.parentNode.insertBefore(loadingDiv, img);
img.style.display = "none";

img.onload = () => {
loadingDiv.remove();
img.style.display = "block";
window.showToast("Image refreshed with new seed");
};
img.onerror = () => {
loadingDiv.innerHTML = "⚠️ Failed to refresh image";
loadingDiv.style.display = "flex";
loadingDiv.style.justifyContent = "center";
loadingDiv.style.alignItems = "center";
window.showToast("Failed to refresh image");
};

const loadingDiv = document.createElement("div");
loadingDiv.className = "simple-ai-image-loading";
const spinner = document.createElement("div");
spinner.className = "simple-loading-spinner";
loadingDiv.appendChild(spinner);
loadingDiv.style.width = img.width + "px";
loadingDiv.style.height = img.height + "px";
img.parentNode.insertBefore(loadingDiv, img);
img.style.display = "none";

img.onload = () => {
loadingDiv.remove();
img.style.display = "block";
window.showToast("Image refreshed with new seed");
};
img.onerror = () => {
loadingDiv.innerHTML = "⚠️ Failed to refresh image";
loadingDiv.style.display = "flex";
loadingDiv.style.justifyContent = "center";
loadingDiv.style.alignItems = "center";
window.showToast("Failed to refresh image");
};
img.src = finalUrl;
}

Expand Down
Loading