@govtechsg/oobee 0.10.98 → 0.11.0

package/src/utils.ts

@@ -390,14 +390,31 @@ export const cleanUp = async (randomToken?: string, isError: boolean = false): P
       consoleLogger.warn(`Unable to force remove userDataDirectory: ${error.message}`);
     }
 
-    // Also remove _pool* sibling directories created by browser pool re-launches
-    try {
-      const poolDirs = globSync(`${constants.userDataDirectory}_pool*`);
+    // Also remove _pool* sibling directories created by browser pool re-launches.
+    // On Windows, Chrome writes files (optimization_guide_model_store,
+    // segmentation_platform, first_party_sets.db, etc.) during its shutdown
+    // sequence and may still hold file locks. Retry up to 10 times at 5s intervals.
+    const removePoolDirs = (): number => {
+      // On Windows, glob interprets backslashes as escape characters, not path
+      // separators. Normalize to forward slashes so the pattern actually matches.
+      const globPattern = `${constants.userDataDirectory}_pool*`.replace(/\\/g, '/');
+      const poolDirs = globSync(globPattern);
       for (const dir of poolDirs) {
         fs.rmSync(dir, { recursive: true, force: true });
       }
-    } catch (error) {
-      consoleLogger.warn(`Unable to remove pool directories: ${error.message}`);
+      return poolDirs.length;
+    };
+    for (let attempt = 0; attempt < 10; attempt++) {
+      try {
+        if (removePoolDirs() === 0) break; // nothing left to clean
+        break; // rmSync succeeded for all dirs
+      } catch {
+        if (attempt < 9) {
+          await new Promise(r => setTimeout(r, 5000));
+        } else {
+          consoleLogger.warn('Unable to remove pool directories after 10 attempts');
+        }
+      }
     }
   }
 
@@ -418,7 +435,7 @@ export const cleanUp = async (randomToken?: string, isError: boolean = false): P
       const crawleeDir = path.join(storagePath, 'crawlee');
       const dataset = await Dataset.open(crawleeDir);
       await dataset.drop();
-      const requestQueue = await RequestQueue.open(crawleeDir);
+      const requestQueue = await RequestQueue.open(`${crawleeDir}_rq`);
       await requestQueue.drop();
     } catch (error) {
       consoleLogger.info(`Crawlee storage drop in cleanUp: ${error.message}`);
@@ -428,6 +445,11 @@ export const cleanUp = async (randomToken?: string, isError: boolean = false): P
     } catch (error) {
       consoleLogger.warn(`Unable to force remove crawlee folder: ${error.message}`);
     }
+    try {
+      fs.rmSync(path.join(storagePath, 'crawlee_rq'), { recursive: true, force: true });
+    } catch (error) {
+      consoleLogger.warn(`Unable to force remove crawlee_rq folder: ${error.message}`);
+    }
 
     try {
       fs.rmSync(path.join(storagePath, 'pdfs'), { recursive: true, force: true });
@@ -1022,9 +1044,10 @@ export const zipResults = async (zipName: string, resultsPath: string): Promise<
   if (!stats.isDirectory()) {
     throw new Error(`resultsPath is not a directory: ${resultsPath}`);
   }
-  async function addFolderToZip(folderPath: string, zipFolder: JSZip): Promise<void> {
+  async function addFolderToZip(folderPath: string, zipFolder: JSZip, isRoot = false): Promise<void> {
     const items = await fs.readdir(folderPath);
     for (const item of items) {
+      if (isRoot && item.startsWith('crawlee')) continue;
       const fullPath = path.join(folderPath, item);
       const stats = await fs.stat(fullPath);
       if (stats.isDirectory()) {
@@ -1038,7 +1061,7 @@ export const zipResults = async (zipName: string, resultsPath: string): Promise<
   }
 
   const zip = new JSZip();
-  await addFolderToZip(resultsPath, zip);
+  await addFolderToZip(resultsPath, zip, true);
 
   const zipStream = zip.generateNodeStream({
     type: 'nodebuffer',