@stacksjs/browser-extension 0.70.247 → 0.70.248

package/dist/firefox-previews.d.ts

@@ -17,7 +17,7 @@ export declare function imageSize(bytes: Uint8Array): { width: number, height: n
  */
 export declare function amoToken(issuer: string, secret: string, now?: number): string;
 /** Read the previews a listing currently shows. */
-export declare function listFirefoxPreviews(addonId: string, token: string): Promise<FirefoxPreview[]>;
+export declare function listFirefoxPreviews(addonId: string, auth: { issuer: string, secret: string }): Promise<FirefoxPreview[]>;
 /**
  * Bring the listing's screenshots in line with the config.
  *

package/dist/firefox-previews.js

@@ -37,19 +37,30 @@ function resolveAuth(options) {
     throw Error(`[browser-extension] missing Firefox Add-ons credentials: ${missing.join(", ")}`);
   return { issuer, secret };
 }
-async function amo(path, token, init = {}) {
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+function retryAfterMs(response, body) {
+  const header = Number(response.headers.get("retry-after"));
+  if (Number.isFinite(header) && header > 0)
+    return header * 1000;
+  const stated = /available in (\d+) seconds?/i.exec(body);
+  return stated ? Number(stated[1]) * 1000 : void 0;
+}
+async function amo(path, auth, init = {}, attempt = 0) {
   const response = await fetch(`${AMO_API}${path}`, {
     ...init,
-    headers: { Authorization: `JWT ${token}`, ...init.headers }
+    headers: { Authorization: `JWT ${amoToken(auth.issuer, auth.secret)}`, ...init.headers }
   });
-  if (!response.ok && response.status !== 404) {
-    const detail = await response.text().catch(() => "");
-    throw Error(`[browser-extension] AMO ${init.method ?? "GET"} ${path} failed (${response.status})${detail ? `: ${detail.slice(0, 300)}` : ""}`);
+  if (response.ok || response.status === 404)
+    return response;
+  const detail = await response.text().catch(() => "");
+  if (response.status === 429 && attempt < 4) {
+    await sleep((retryAfterMs(response, detail) ?? 60000) + 1000);
+    return amo(path, auth, init, attempt + 1);
   }
-  return response;
+  throw Error(`[browser-extension] AMO ${init.method ?? "GET"} ${path} failed (${response.status})${detail ? `: ${detail.slice(0, 300)}` : ""}`);
 }
-export async function listFirefoxPreviews(addonId, token) {
-  const response = await amo(`/addons/addon/${encodeURIComponent(addonId)}/`, token);
+export async function listFirefoxPreviews(addonId, auth) {
+  const response = await amo(`/addons/addon/${encodeURIComponent(addonId)}/`, auth);
   if (response.status === 404)
     return [];
   return ((await response.json()).previews ?? []).map((preview, index) => ({
@@ -69,7 +80,7 @@ export async function syncFirefoxPreviews(config, options = {}) {
       throw Error(`[browser-extension] Firefox screenshot not found: ${path}`);
     })), size = imageSize(bytes);
     return { path: file, bytes, width: size?.width ?? 0, height: size?.height ?? 0 };
-  })), { issuer, secret } = resolveAuth(options), existing = await listFirefoxPreviews(config.geckoId, amoToken(issuer, secret));
+  })), auth = resolveAuth(options), existing = await listFirefoxPreviews(config.geckoId, auth);
   if (files.every((file) => file.width > 0 && file.height > 0) && existing.length === files.length && existing.slice().sort((a, b) => a.position - b.position).every((preview, index) => preview.size[0] === files[index].width && preview.size[1] === files[index].height))
     return { unchanged: !0, uploaded: [], removed: [] };
   if (options.dryRun)
@@ -79,12 +90,12 @@ export async function syncFirefoxPreviews(config, options = {}) {
     const form = new FormData;
     form.append("image", new Blob([file.bytes], { type: "image/png" }), basename(file.path));
     form.append("position", String(index));
-    const created = await (await amo(`/addons/addon/${encodeURIComponent(config.geckoId)}/previews/`, amoToken(issuer, secret), {
+    const created = await (await amo(`/addons/addon/${encodeURIComponent(config.geckoId)}/previews/`, auth, {
       method: "POST",
       body: form
     })).json(), caption = store.screenshotCaptions?.[index];
     if (caption)
-      await amo(`/addons/addon/${encodeURIComponent(config.geckoId)}/previews/${created.id}/`, amoToken(issuer, secret), {
+      await amo(`/addons/addon/${encodeURIComponent(config.geckoId)}/previews/${created.id}/`, auth, {
         method: "PATCH",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ caption: { "en-US": caption } })
@@ -93,7 +104,7 @@ export async function syncFirefoxPreviews(config, options = {}) {
   }
   const removed = [];
   for (const preview of existing) {
-    await amo(`/addons/addon/${encodeURIComponent(config.geckoId)}/previews/${preview.id}/`, amoToken(issuer, secret), { method: "DELETE" });
+    await amo(`/addons/addon/${encodeURIComponent(config.geckoId)}/previews/${preview.id}/`, auth, { method: "DELETE" });
     removed.push(preview.id);
   }
   return { unchanged: !1, uploaded, removed };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/browser-extension",
   "type": "module",
-  "version": "0.70.247",
+  "version": "0.70.248",
   "description": "Build MV3 browser extensions (Chrome, Firefox, Safari) the Stacks way — manifest, content/background scripts, DNR rules, packaging, Safari container app, all config-driven.",
   "author": "Chris Breuer",
   "contributors": [