TRAP Caching: Re-introduce workaround for download timeout

lib/init-action.js

@@ -177,6 +177,7 @@ async function runWrapper() {
         core.setFailed(`init action failed: ${error}`);
         console.log(error);
     }
+    await (0, util_1.checkForTimeout)();
 }
 void runWrapper();
 //# sourceMappingURL=init-action.js.map

lib/trap-caching.js

@@ -100,11 +100,11 @@ async function downloadTrapCaches(codeql, languages, logger) {
         // The SHA from the base of the PR is the most similar commit we might have a cache for
         const preferredKey = await cacheKey(codeql, language, baseSha);
         logger.info(`Looking in Actions cache for TRAP cache with key ${preferredKey}`);
-        const found = await cache.restoreCache([cacheDir], preferredKey, [
+        const found = await (0, util_1.withTimeout)(MAX_CACHE_OPERATION_MS, cache.restoreCache([cacheDir], preferredKey, [
             // Fall back to any cache with the right key prefix
             await cachePrefix(codeql, language),
-        ], {
-            segmentTimeoutInMs: MAX_CACHE_OPERATION_MS,
+        ]), () => {
+            logger.info(`Timed out downloading cache for ${language}, will continue without it`);
         });
         if (found === undefined) {
             // We didn't find a TRAP cache in the Actions cache, so the directory on disk is

src/init-action.ts

@@ -29,6 +29,7 @@ import { parseRepositoryNwo } from "./repository";
 import { getTotalCacheSize } from "./trap-caching";
 import {
   checkActionVersion,
+  checkForTimeout,
   checkGitHubVersionInRange,
   codeQlVersionAbove,
   DEFAULT_DEBUG_ARTIFACT_NAME,
@@ -332,6 +333,7 @@ async function runWrapper() {
     core.setFailed(`init action failed: ${error}`);
     console.log(error);
   }
+  await checkForTimeout();
 }
 
 void runWrapper();

src/trap-caching.ts

@@ -113,15 +113,16 @@ export async function downloadTrapCaches(
     logger.info(
       `Looking in Actions cache for TRAP cache with key ${preferredKey}`
     );
-    const found = await cache.restoreCache(
-      [cacheDir],
-      preferredKey,
-      [
+    const found = await withTimeout(
+      MAX_CACHE_OPERATION_MS,
+      cache.restoreCache([cacheDir], preferredKey, [
         // Fall back to any cache with the right key prefix
         await cachePrefix(codeql, language),
-      ],
-      {
-        segmentTimeoutInMs: MAX_CACHE_OPERATION_MS,
+      ]),
+      () => {
+        logger.info(
+          `Timed out downloading cache for ${language}, will continue without it`
+        );
       }
     );
     if (found === undefined) {