some hardcoded debug lines added

MartinBarker · Jan 25, 2025 · f4d7580 · f4d7580
1 parent 081b39e
commit f4d7580
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 78 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/script/xcrun-wrapper.mts b/script/xcrun-wrapper.mts
@@ -3,114 +3,68 @@
 import { execa } from 'execa';
 import { readFile } from 'node:fs/promises';
 
-// we need a wrapper script because altool tends to error out very often
-// https://developer.apple.com/forums/thread/698477
-// and it errors if binary already exists, we want it to just silently fail in that case
+// Get arguments from the command line
+const [filePath, apiKeyId, apiIssuer, bundleId] = process.argv.slice(2);
 
-const args = process.argv.slice(2);
 
-const filePath = args[0];
-const apiKeyId = args[1];
-const apiIssuer = args[2];
-const appleId = args[3];
-const bundleId = args[4];
+console.log('filePath:', filePath);
+console.log('apiKeyId:', apiKeyId);
+console.log('apiIssuer:', apiIssuer);
+console.log('bundleId:', bundleId);
 
-// seems to be the same
-const ascPublicId = apiIssuer;
+if (!filePath || !apiKeyId || !apiIssuer || !bundleId) {
+  console.error('Usage: npx tsx xcrun-wrapper.mts <filePath> <apiKeyId> <apiIssuer> <bundleId>');
+  process.exit(1);
+}
 
-const packageJson = JSON.parse(await readFile(new URL('../package.json', import.meta.url)) as unknown as string);
+const packageJson = JSON.parse(
+  await readFile(new URL('../package.json', import.meta.url)) as unknown as string
+);
 
 console.log('Using version', packageJson.version);
-
 const packageVersion = packageJson.version;
-// const packageVersion = '3.39.2';
-
-const bundleVersion = packageVersion;
-const bundleShortVersionString = packageVersion;
-
-/*
-Example JSON response:
-{
-    "tool-version": "4.060.1220",
-    "tool-path": "\\/Applications\\/Xcode.app\\/Contents\\/SharedFrameworks\\/ContentDeliveryServices.framework\\/Versions\\/A\\/Frameworks\\/AppStoreService.framework",
-    "os-version": "11.6.0",
-    "product-errors": [
-        {
-            "message": "Unable to upload archive.",
-            "userInfo": {
-                "NSLocalizedDescription": "Unable to upload archive.",
-                "NSLocalizedFailureReason": "The file 'test' cannot be found."
-            },
-            "code": -43
-        },
-        {
-            "message": "Unable to upload archive.",
-            "userInfo": {
-                "NSLocalizedDescription": "Unable to upload archive.",
-                "NSLocalizedFailureReason": "--upload-app is missing one or more required options: --type."
-            },
-            "code": -1027
-        }
-    ]
-}
-*/
 
 async function runAttempt() {
-  // const xcrunArgs = ['altool', '--list-apps', '--output-format', 'json', '--apiKey', apiKeyId, '--apiIssuer', apiIssuer];
-
+  // Command arguments for altool
   const xcrunArgs = [
     'altool',
     '--output-format', 'json',
-    '--upload-package', filePath, '--type', 'macos',
-    '--apiKey', apiKeyId, '--apiIssuer', apiIssuer,
-    '--asc-public-id', ascPublicId,
-    '--apple-id', appleId,
-    '--bundle-id', bundleId,
-    '--bundle-version', bundleVersion,
-    '--bundle-short-version-string', bundleShortVersionString,
+    '--upload-package', filePath,
+    '--type', 'macos',
+    '--apiKey', "K64CXD596U",
+    '--apiIssuer', "4c2a4671-9948-4fd3-be20-5c84c40be346",
   ];
 
+  console.log('Running command: xcrun', xcrunArgs.join(' '));
+
   try {
     const { stdout } = await execa('xcrun', xcrunArgs);
-    console.log('stdout', stdout);
-    return false;
+    console.log('Upload succeeded:', stdout);
+    return false; // No retry needed
   } catch (err) {
-    if (err instanceof Error && 'exitCode' in err && err.exitCode === 1 && 'stdout' in err && err.stdout && typeof err.stdout === 'string') {
-      const errorJson = JSON.parse(err.stdout) as unknown;
-      if (!(errorJson != null && typeof errorJson === 'object' && 'product-errors' in errorJson && Array.isArray(errorJson['product-errors']))) {
-        throw new TypeError('Invalid JSON');
-      }
-      const productErrors = errorJson['product-errors'];
-      // Unable to authenticate
-      if (productErrors.some((error) => error.code === -19209)) {
-        console.log(productErrors);
-        return true; // retry
-      }
-      // "The bundle version, x.y.z, must be a higher than the previously uploaded version."
-      if (productErrors.some((error) => error.code === -19210)) {
-        console.log(productErrors);
-        // ignore
-        return false;
+    if (err instanceof Error) {
+      console.error('Upload failed:', err.message);
+
+      if ('stdout' in err && typeof err.stdout === 'string') {
+        console.error('Error details:', err.stdout);
       }
     }
-    throw err;
+    throw err; // Rethrow other errors
   }
 }
 
 const maxRetries = 3;
 
 async function run() {
   for (let i = 0; i < maxRetries; i += 1) {
-    // eslint-disable-next-line no-await-in-loop
     const wantRetry = await runAttempt();
-    if (!wantRetry) return; // success
-    console.log('Retrying soon');
-    // eslint-disable-next-line no-await-in-loop
+    if (!wantRetry) return; // Success
+    console.log('Retrying in 1 second...');
     await new Promise((resolve) => setTimeout(resolve, 1000));
   }
 
-  console.log('gave up');
+  console.log('Gave up after retries.');
   process.exitCode = 1;
 }
 
-await run();
+await run();