pabal-store-api-mcp 1.3.13 → 1.3.14

package/dist/src/index.js

@@ -204,7 +204,7 @@ registerToolWithInfo("aso-push", {
             .int()
             .positive()
             .optional()
-            .describe("Per-image upload timeout in milliseconds"),
+            .describe("Per-image upload timeout in milliseconds (default: 600000 when uploadImages=true)"),
         dryRun: z
             .boolean()
             .optional()

package/dist/src/packages/stores/app-store/client.d.ts

@@ -108,15 +108,34 @@ export declare class AppStoreClient {
      * Delete all screenshots in a screenshot set
      */
     private deleteAllScreenshotsInSet;
+    private deleteScreenshots;
+    private prepareScreenshotSetForUpload;
     private sanitizePathSegment;
     private getScreenshotLockPath;
     private acquireScreenshotUploadLock;
     private preflightScreenshotBatch;
     /**
-     * Upload multiple screenshots for a locale, replacing existing ones
+     * Upload multiple screenshots for a locale, replacing existing ones.
+     *
+     * Failure model:
+     *
+     * existing screenshots ──┐
+     *                        ├─ free only the slots App Store requires
+     * incoming screenshots ──┘
+     *          │
+     *          ├─ upload + commit every incoming screenshot
+     *          │
+     *          └─ only after success, delete the remaining old screenshots
+     *
+     * This avoids the old delete-first behavior where a timeout could leave the
+     * user with an empty screenshot set. If upload fails, most existing
+     * screenshots remain visible and any successfully uploaded new screenshots
+     * are left in App Store Connect for manual or retry cleanup.
+     *
      * 1. Find or create screenshot sets for each display type
-     * 2. Delete existing screenshots in each set
+     * 2. Delete only enough existing screenshots to fit the incoming batch
      * 3. Upload new screenshots in order
+     * 4. Delete remaining old screenshots after the batch succeeds
      */
     uploadScreenshotsForLocale(options: {
         locale: string;

package/dist/src/packages/stores/app-store/client.js

@@ -12,6 +12,9 @@ import { DEFAULT_LOCALE } from "../../../packages/configs/aso-config/constants.j
 import { getAsoDir } from "../../../packages/configs/aso-config/utils.js";
 import { convertToAsoData, convertToMultilingualAsoData, convertToReleaseNote, fetchScreenshotsForLocalization, mapLocalizationsByLocale, selectEnglishAppName, sortReleaseNotes, sortVersions, } from "./api-converters.js";
 import { APP_STORE_API_BASE_URL, APP_STORE_PLATFORM, DEFAULT_APP_LIST_LIMIT, DEFAULT_VERSIONS_FETCH_LIMIT, } from "./constants.js";
+const APP_STORE_SCREENSHOT_SET_MAX_COUNT = 10;
+const DEFAULT_IMAGE_UPLOAD_TIMEOUT_MS = 10 * 60 * 1000;
+const SCREENSHOT_UPLOAD_LOCK_STALE_MS = 30 * 60 * 1000;
 export class AppStoreClient {
     issuerId;
     keyId;
@@ -727,9 +730,10 @@ export class AppStoreClient {
                 }
             });
             req.on("error", reject);
-            if (timeoutMs) {
-                req.setTimeout(timeoutMs, () => {
-                    req.destroy(new Error(`Upload timed out after ${timeoutMs}ms`));
+            const effectiveTimeoutMs = timeoutMs ?? DEFAULT_IMAGE_UPLOAD_TIMEOUT_MS;
+            if (effectiveTimeoutMs > 0) {
+                req.setTimeout(effectiveTimeoutMs, () => {
+                    req.destroy(new Error(`Upload timed out after ${effectiveTimeoutMs}ms`));
                 });
             }
             req.write(fileBuffer);
@@ -779,6 +783,9 @@ export class AppStoreClient {
     async deleteAllScreenshotsInSet(screenshotSetId) {
         const screenshotsResponse = await this.listScreenshots(screenshotSetId);
         const screenshots = screenshotsResponse.data || [];
+        return this.deleteScreenshots(screenshots);
+    }
+    async deleteScreenshots(screenshots) {
         let deletedCount = 0;
         for (const screenshot of screenshots) {
             if (screenshot.type !== "appScreenshots") {
@@ -790,6 +797,33 @@ export class AppStoreClient {
         }
         return deletedCount;
     }
+    async prepareScreenshotSetForUpload(screenshotSetId, incomingCount) {
+        if (incomingCount > APP_STORE_SCREENSHOT_SET_MAX_COUNT) {
+            throw new Error(`Preflight failed: App Store allows up to ${APP_STORE_SCREENSHOT_SET_MAX_COUNT} screenshots per display type, got ${incomingCount}`);
+        }
+        const screenshotsResponse = await this.listScreenshots(screenshotSetId);
+        const existingScreenshots = (screenshotsResponse.data || []).filter((screenshot) => screenshot.type === "appScreenshots");
+        const nonScreenshotCount = (screenshotsResponse.data || []).length - existingScreenshots.length;
+        if (nonScreenshotCount > 0) {
+            console.error(`[AppStore]       Ignoring ${nonScreenshotCount} non-screenshot asset(s) in screenshot set`);
+        }
+        const slotsToFree = Math.max(0, existingScreenshots.length +
+            incomingCount -
+            APP_STORE_SCREENSHOT_SET_MAX_COUNT);
+        // Preserve the first screenshots as long as possible. If the upload fails
+        // after freeing slots, users are more likely to still see the primary
+        // screenshots rather than the tail of the old set.
+        const screenshotsToDeleteBeforeUpload = slotsToFree > 0 ? existingScreenshots.slice(-slotsToFree) : [];
+        const screenshotsToDeleteAfterUpload = existingScreenshots.slice(0, existingScreenshots.length - slotsToFree);
+        const deletedBeforeUpload = await this.deleteScreenshots(screenshotsToDeleteBeforeUpload);
+        if (deletedBeforeUpload > 0) {
+            console.error(`[AppStore]       Deleted ${deletedBeforeUpload} existing screenshots to free upload slots`);
+        }
+        return {
+            deletedBeforeUpload,
+            screenshotsToDeleteAfterUpload,
+        };
+    }
     sanitizePathSegment(value) {
         return value.replace(/[^a-zA-Z0-9._-]/g, "_");
     }
@@ -808,9 +842,19 @@ export class AppStoreClient {
         catch (error) {
             const code = error.code;
             if (code === "EEXIST") {
-                throw new Error(`Screenshot upload lock is already held (${lockPath}). Another upload is running for this locale/display type.`);
+                const lockAgeMs = Date.now() - statSync(lockPath).mtimeMs;
+                if (lockAgeMs > SCREENSHOT_UPLOAD_LOCK_STALE_MS) {
+                    console.error(`[AppStore] Removing stale screenshot upload lock (${lockPath})`);
+                    unlinkSync(lockPath);
+                    descriptor = openSync(lockPath, "wx");
+                }
+                else {
+                    throw new Error(`Screenshot upload lock is already held (${lockPath}). Another upload is running for this locale/display type.`);
+                }
+            }
+            else {
+                throw error;
             }
-            throw error;
         }
         closeSync(descriptor);
         return () => {
@@ -856,10 +900,27 @@ export class AppStoreClient {
         }
     }
     /**
-     * Upload multiple screenshots for a locale, replacing existing ones
+     * Upload multiple screenshots for a locale, replacing existing ones.
+     *
+     * Failure model:
+     *
+     * existing screenshots ──┐
+     *                        ├─ free only the slots App Store requires
+     * incoming screenshots ──┘
+     *          │
+     *          ├─ upload + commit every incoming screenshot
+     *          │
+     *          └─ only after success, delete the remaining old screenshots
+     *
+     * This avoids the old delete-first behavior where a timeout could leave the
+     * user with an empty screenshot set. If upload fails, most existing
+     * screenshots remain visible and any successfully uploaded new screenshots
+     * are left in App Store Connect for manual or retry cleanup.
+     *
      * 1. Find or create screenshot sets for each display type
-     * 2. Delete existing screenshots in each set
+     * 2. Delete only enough existing screenshots to fit the incoming batch
      * 3. Upload new screenshots in order
+     * 4. Delete remaining old screenshots after the batch succeeds
      */
     async uploadScreenshotsForLocale(options) {
         const { locale, screenshots, imageUploadTimeoutMs } = options;
@@ -906,13 +967,10 @@ export class AppStoreClient {
                     console.error(`[AppStore]     Processing ${displayType} (${screenshotList.length} screenshots)...`);
                     // Find or create screenshot set
                     const screenshotSetId = await this.findOrCreateScreenshotSet(localizationId, displayType);
-                    // Delete existing screenshots in this set
-                    const deletedCount = await this.deleteAllScreenshotsInSet(screenshotSetId);
-                    if (deletedCount > 0) {
-                        console.error(`[AppStore]       Deleted ${deletedCount} existing screenshots`);
-                        result.deleted += deletedCount;
-                    }
+                    const { deletedBeforeUpload, screenshotsToDeleteAfterUpload } = await this.prepareScreenshotSetForUpload(screenshotSetId, screenshotList.length);
+                    result.deleted += deletedBeforeUpload;
                     // Upload new screenshots in order
+                    let uploadedForDisplayType = 0;
                     for (const screenshot of screenshotList) {
                         try {
                             const fileBuffer = readFileSync(screenshot.path);
@@ -929,12 +987,20 @@ export class AppStoreClient {
                             await this.commitAppScreenshot(screenshotData.id);
                             console.error(`[AppStore]       ✅ ${screenshot.filename}`);
                             result.uploaded++;
+                            uploadedForDisplayType++;
                         }
                         catch (error) {
                             result.failed++;
                             throw new Error(`[${displayType}] ${screenshot.filename}: ${error instanceof Error ? error.message : String(error)}`);
                         }
                     }
+                    if (uploadedForDisplayType === screenshotList.length) {
+                        const deletedAfterUpload = await this.deleteScreenshots(screenshotsToDeleteAfterUpload);
+                        if (deletedAfterUpload > 0) {
+                            console.error(`[AppStore]       Deleted ${deletedAfterUpload} replaced screenshots after successful upload`);
+                            result.deleted += deletedAfterUpload;
+                        }
+                    }
                 }
                 finally {
                     releaseLock();

package/dist/src/tools/aso/push.js

@@ -5,11 +5,14 @@ import { AppResolutionService } from "../../core/services/app-resolution-service
 import { AppStoreService } from "../../core/services/app-store-service.js";
 import { GooglePlayService } from "../../core/services/google-play-service.js";
 import { formatPushResult } from "../../core/helpers/formatters.js";
+const DEFAULT_IMAGE_UPLOAD_TIMEOUT_MS = 10 * 60 * 1000;
 const appResolutionService = new AppResolutionService();
 const appStoreService = new AppStoreService();
 const googlePlayService = new GooglePlayService();
 export async function handleAsoPush(options) {
-    const { store = "both", uploadImages = false, locales, imageUploadTimeoutMs, dryRun = false, } = options;
+    const { store = "both", uploadImages = false, locales, dryRun = false, } = options;
+    const imageUploadTimeoutMs = options.imageUploadTimeoutMs ??
+        (uploadImages ? DEFAULT_IMAGE_UPLOAD_TIMEOUT_MS : undefined);
     const resolved = appResolutionService.resolve({
         slug: options.app,
         packageName: options.packageName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pabal-store-api-mcp",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "description": "MCP server for App Store / Play Store ASO workflows",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",