@gpc-cli/core 0.9.58 → 0.9.59

package/dist/index.js

@@ -4,6 +4,7 @@ import {
   GpcError,
   NetworkError,
   applyReleaseNotes,
+  commitWithRescue,
   createTrack,
   diffReleases,
   fetchReleaseNotes,
@@ -14,9 +15,10 @@ import {
   updateTrackConfig,
   uploadExternallyHosted,
   uploadRelease,
+  validateAndCommit,
   validateUploadFile,
   waitForBundleProcessing
-} from "./chunk-QIYAOW6R.js";
+} from "./chunk-IZKB6GBS.js";
 
 // src/output.ts
 import process2 from "process";
@@ -915,10 +917,7 @@ async function updateListing(client, packageName, language, data, commitOptions)
   const edit = await client.edits.insert(packageName);
   try {
     const listing = await client.listings.patch(packageName, edit.id, language, data);
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
     return listing;
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
@@ -931,10 +930,7 @@ async function deleteListing(client, packageName, language, commitOptions) {
   const edit = await client.edits.insert(packageName);
   try {
     await client.listings.delete(packageName, edit.id, language);
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
     });
@@ -1057,10 +1053,7 @@ ${details}`,
       const { language, ...data } = listing;
       await client.listings.update(packageName, edit.id, language, data);
     }
-    if (!options?.commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, options?.commitOptions);
+    await validateAndCommit(client, packageName, edit.id, options?.commitOptions);
     return {
       updated: localListings.length,
       languages: localListings.map((l) => l.language)
@@ -1101,10 +1094,7 @@ async function uploadImage(client, packageName, language, imageType, filePath, c
   const edit = await client.edits.insert(packageName);
   try {
     const image = await client.images.upload(packageName, edit.id, language, imageType, filePath);
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
     return image;
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
@@ -1117,10 +1107,7 @@ async function deleteImage(client, packageName, language, imageType, imageId, co
   const edit = await client.edits.insert(packageName);
   try {
     await client.images.delete(packageName, edit.id, language, imageType, imageId);
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
     });
@@ -1164,7 +1151,7 @@ var ALL_IMAGE_TYPES = [
 ];
 async function exportImages(client, packageName, dir, options) {
   const { mkdir: mkdir8, writeFile: writeFile9 } = await import("fs/promises");
-  const { join: join12 } = await import("path");
+  const { join: join13 } = await import("path");
   const edit = await client.edits.insert(packageName);
   try {
     let languages;
@@ -1195,7 +1182,7 @@ async function exportImages(client, packageName, dir, options) {
       const batch = tasks.slice(i, i + concurrency);
       const results = await Promise.all(
         batch.map(async (task) => {
-          const dirPath = join12(dir, task.language, task.imageType);
+          const dirPath = join13(dir, task.language, task.imageType);
           await mkdir8(dirPath, { recursive: true });
           const response = await fetch(task.url);
           if (!response.ok) {
@@ -1207,7 +1194,7 @@ async function exportImages(client, packageName, dir, options) {
             );
           }
           const buffer = Buffer.from(await response.arrayBuffer());
-          const filePath = join12(dirPath, `${task.index}.png`);
+          const filePath = join13(dirPath, `${task.index}.png`);
           await writeFile9(filePath, buffer);
           return buffer.length;
         })
@@ -1233,10 +1220,7 @@ async function updateAppDetails(client, packageName, details, commitOptions) {
   const edit = await client.edits.insert(packageName);
   try {
     const result = await client.details.patch(packageName, edit.id, details);
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
     return result;
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
@@ -3238,7 +3222,7 @@ async function handleBreach(event, config, client) {
       }
       case "halt": {
         try {
-          const { updateRollout: updateRollout2 } = await import("./releases-I5MYFNCV.js");
+          const { updateRollout: updateRollout2 } = await import("./releases-VFDJ6IX2.js");
           await updateRollout2(client, config.packageName, config.track, "halt");
           halted = true;
         } catch {
@@ -3822,10 +3806,7 @@ async function addTesters(client, packageName, track, groupEmails, commitOptions
     const updated = await client.testers.update(packageName, edit.id, track, {
       googleGroups: [...existing]
     });
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
     return updated;
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
@@ -3842,10 +3823,7 @@ async function removeTesters(client, packageName, track, groupEmails, commitOpti
     const updated = await client.testers.update(packageName, edit.id, track, {
       googleGroups: filtered
     });
-    if (!commitOptions?.changesNotSentForReview) {
-      await client.edits.validate(packageName, edit.id);
-    }
-    await client.edits.commit(packageName, edit.id, commitOptions);
+    await validateAndCommit(client, packageName, edit.id, commitOptions);
     return updated;
   } catch (error) {
     await client.edits.delete(packageName, edit.id).catch(() => {
@@ -8371,6 +8349,202 @@ function compareFingerprints(a, b) {
   return normalizeFingerprint(a) === normalizeFingerprint(b);
 }
 
+// src/utils/hash.ts
+import { createHash } from "crypto";
+import { stat as stat9 } from "fs/promises";
+async function sha256File(filePath) {
+  const hash = createHash("sha256");
+  const { size } = await stat9(filePath);
+  if (size === 0) return hash.digest("hex");
+  const { createReadStream } = await import("fs");
+  const stream = createReadStream(filePath);
+  await new Promise((resolve2, reject) => {
+    stream.on("data", (chunk) => hash.update(chunk));
+    stream.on("end", resolve2);
+    stream.on("error", reject);
+  });
+  return hash.digest("hex");
+}
+
+// src/commands/image-sync.ts
+import { readdir as readdir7 } from "fs/promises";
+import { join as join12, extname as extname5 } from "path";
+import { PlayApiError } from "@gpc-cli/api";
+var IMAGE_EXTENSIONS = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg"]);
+var ALL_IMAGE_TYPES2 = [
+  "icon",
+  "featureGraphic",
+  "tvBanner",
+  "phoneScreenshots",
+  "sevenInchScreenshots",
+  "tenInchScreenshots",
+  "tvScreenshots",
+  "wearScreenshots"
+];
+async function scanLocalImages(dir) {
+  try {
+    const entries = await readdir7(dir, { withFileTypes: true });
+    return entries.filter((e) => e.isFile() && IMAGE_EXTENSIONS.has(extname5(e.name).toLowerCase())).map((e) => e.name).sort();
+  } catch {
+    return [];
+  }
+}
+async function scanLanguages(dir) {
+  try {
+    const entries = await readdir7(dir, { withFileTypes: true });
+    return entries.filter((e) => e.isDirectory()).map((e) => e.name).sort();
+  } catch {
+    return [];
+  }
+}
+async function syncImages(client, packageName, dir, options) {
+  const details = [];
+  let uploaded = 0;
+  let skipped = 0;
+  let deleted = 0;
+  const languages = options?.lang ? [options.lang] : await scanLanguages(dir);
+  if (languages.length === 0) {
+    throw new GpcError(
+      `No language directories found in "${dir}"`,
+      "IMAGE_SYNC_EMPTY",
+      1,
+      "The directory should contain subdirectories named by language code (e.g., en-US/) with image type subdirectories inside."
+    );
+  }
+  const imageTypes = options?.type ? [options.type] : ALL_IMAGE_TYPES2;
+  const edit = await client.edits.insert(packageName);
+  try {
+    for (const language of languages) {
+      for (const imageType of imageTypes) {
+        const localDir = join12(dir, language, imageType);
+        const localFiles = await scanLocalImages(localDir);
+        let remoteImages;
+        try {
+          remoteImages = await client.images.list(packageName, edit.id, language, imageType);
+        } catch (error) {
+          if (error instanceof PlayApiError && error.statusCode === 404) {
+            remoteImages = [];
+          } else {
+            throw error;
+          }
+        }
+        const remoteSha256Set = new Set(remoteImages.map((img) => img.sha256.toLowerCase()));
+        const localHashes = /* @__PURE__ */ new Map();
+        for (const file of localFiles) {
+          const hash = await sha256File(join12(localDir, file));
+          localHashes.set(file, hash);
+        }
+        const localSha256Set = new Set(localHashes.values());
+        if (options?.delete) {
+          for (const img of remoteImages) {
+            if (!localSha256Set.has(img.sha256.toLowerCase())) {
+              if (!options?.dryRun) {
+                await client.images.delete(packageName, edit.id, language, imageType, img.id);
+              }
+              deleted++;
+              details.push({
+                language,
+                imageType,
+                file: img.id,
+                action: "delete",
+                reason: "not in local"
+              });
+            }
+          }
+        }
+        for (const file of localFiles) {
+          const hash = localHashes.get(file);
+          if (remoteSha256Set.has(hash)) {
+            skipped++;
+            details.push({ language, imageType, file, action: "skip", reason: "sha256 match" });
+          } else {
+            if (!options?.dryRun) {
+              const filePath = join12(localDir, file);
+              const check = await validateImage(filePath, imageType);
+              if (!check.valid) {
+                throw new GpcError(
+                  `Image validation failed for ${language}/${imageType}/${file}: ${check.errors.join("; ")}`,
+                  "IMAGE_INVALID",
+                  2,
+                  "Check image dimensions, file size, and format."
+                );
+              }
+              await client.images.upload(packageName, edit.id, language, imageType, filePath);
+            }
+            uploaded++;
+            details.push({ language, imageType, file, action: "upload", reason: "new or changed" });
+          }
+        }
+      }
+    }
+    if (options?.dryRun || uploaded === 0 && deleted === 0) {
+      await client.edits.delete(packageName, edit.id).catch(() => {
+      });
+    } else {
+      await validateAndCommit(client, packageName, edit.id, options?.commitOptions);
+    }
+    return {
+      uploaded,
+      skipped,
+      deleted,
+      total: uploaded + skipped + deleted,
+      details
+    };
+  } catch (error) {
+    await client.edits.delete(packageName, edit.id).catch(() => {
+    });
+    throw error;
+  }
+}
+
+// src/commands/bundles.ts
+import { PlayApiError as PlayApiError2 } from "@gpc-cli/api";
+async function listBundles(client, packageName) {
+  const edit = await client.edits.insert(packageName);
+  try {
+    const bundles = await client.bundles.list(packageName, edit.id);
+    await client.edits.delete(packageName, edit.id).catch(() => {
+    });
+    return bundles;
+  } catch (error) {
+    await client.edits.delete(packageName, edit.id).catch(() => {
+    });
+    throw error;
+  }
+}
+async function findBundle(client, packageName, versionCode) {
+  const bundles = await listBundles(client, packageName);
+  return bundles.find((b) => b.versionCode === versionCode) ?? null;
+}
+function isRetryableError(error) {
+  if (!(error instanceof PlayApiError2)) return false;
+  const status = error.statusCode;
+  return status === 429 || status === 500 || status === 503 || status === 409;
+}
+async function waitForBundle(client, packageName, versionCode, options) {
+  const timeout = options?.timeout ?? 6e5;
+  const interval = options?.interval ?? 15e3;
+  const deadline = Date.now() + timeout;
+  while (Date.now() < deadline) {
+    try {
+      const bundles = await listBundles(client, packageName);
+      const match = bundles.find((b) => b.versionCode === versionCode);
+      if (match) return match;
+    } catch (error) {
+      if (!isRetryableError(error)) throw error;
+    }
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) break;
+    await new Promise((r) => setTimeout(r, Math.min(interval, remaining)));
+  }
+  throw new GpcError(
+    `Bundle version code ${versionCode} not found after ${Math.round(timeout / 1e3)}s`,
+    "BUNDLE_WAIT_TIMEOUT",
+    4,
+    "The bundle may still be processing. Try again with a longer --timeout, or check the Play Console."
+  );
+}
+
 // src/signing-consistency.ts
 async function checkSigningConsistency(accessToken, packageName, apiHost = "androidpublisher.googleapis.com") {
   const baseUrl = `https://${apiHost}/androidpublisher/v3/applications/${encodeURIComponent(packageName)}`;
@@ -8613,6 +8787,7 @@ export {
   checkThreshold,
   classifyError,
   clearAuditLog,
+  commitWithRescue,
   compareBundles,
   compareFingerprints,
   compareVersionVitals,
@@ -8667,6 +8842,7 @@ export {
   fetchAggregateCost,
   fetchChangelog,
   fetchReleaseNotes,
+  findBundle,
   formatChangelogEntry,
   formatCustomPayload,
   formatDiscordPayload,
@@ -8733,6 +8909,7 @@ export {
   lintLocalListings,
   listAchievements,
   listAuditEvents,
+  listBundles,
   listDeviceTiers,
   listEvents,
   listGeneratedApks,
@@ -8801,9 +8978,11 @@ export {
   searchVitalsErrors,
   sendNotification,
   sendWebhook,
+  sha256File,
   sortResults,
   startTrain,
   statusHasBreach,
+  syncImages,
   syncInAppProducts,
   topFiles,
   trackBreachState,
@@ -8824,6 +9003,7 @@ export {
   uploadImage,
   uploadInternalSharing,
   uploadRelease,
+  validateAndCommit,
   validateBundleForApply,
   validateImage,
   validateLanguageCode,
@@ -8834,6 +9014,7 @@ export {
   validateTrackName,
   validateUploadFile,
   validateVersionCode,
+  waitForBundle,
   waitForBundleProcessing,
   watchVitalsWithAutoHalt,
   wordDiff,