From fa650a0063dc188934cae76d49f69a2d40326dac Mon Sep 17 00:00:00 2001
From: bokuweb <bokuweb12@gmail.com>
Date: Tue, 30 Apr 2024 18:59:27 +0900
Subject: [PATCH] Revert "fix: use artifact client for download (#135)"

This reverts commit 19d391836e55549dc6517cfd50788f3142b1df66.
---
 src/client.ts    | 25 +++++++---------------
 src/constants.ts |  2 --
 src/service.ts   | 54 +++++++++++++++++++++++++-----------------------
 3 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/src/client.ts b/src/client.ts
index d75b8e279..4c67e7386 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -5,9 +5,6 @@ import { summary } from '@actions/core';
 
 import { Repository } from './repository';
 import { workspace } from './path';
-import { log } from './logger';
-import { join } from 'path';
-import { DOWNLOAD_PATH } from './constants';
 
 export type Octokit = ReturnType<typeof github.getOctokit>;
 
@@ -36,24 +33,16 @@ export const createClient = (repository: Repository, octokit: Octokit) => {
       });
       return res;
     },
-    downloadArtifact: async (token: string, artifactId: number, runId: number) => {
-      const { downloadPath } = await backOff(
+    downloadArtifact: async (artifactId: number) => {
+      return backOff(
         () =>
-          artifactClient.downloadArtifact(artifactId, {
-            path: DOWNLOAD_PATH,
-            findBy: {
-              token,
-              workflowRunId: runId,
-              repositoryName: repository.repo,
-              repositoryOwner: repository.owner,
-            },
+          octokit.rest.actions.downloadArtifact({
+            ...repository,
+            artifact_id: artifactId,
+            archive_format: 'zip',
           }),
-        {
-          numOfAttempts: 5,
-        },
+        { numOfAttempts: 5 },
       );
-      log.info('downloadPath:', downloadPath);
-      return;
     },
     postComment: async (issueNumber: number, comment: string) => {
       const _ = await backOff(
diff --git a/src/constants.ts b/src/constants.ts
index db5a6b126..978a85a94 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -5,5 +5,3 @@ export const JSON_NAME = '0';
 
 export const ARTIFACT_NAME = 'reg';
 export const WORKSPACE_DIR_NAME = '__reg__';
-
-export const DOWNLOAD_PATH = '__reg_download';
diff --git a/src/service.ts b/src/service.ts
index c047c62b4..3263952e9 100644
--- a/src/service.ts
+++ b/src/service.ts
@@ -1,8 +1,9 @@
-import * as fs from 'fs/promises';
+import * as fs from 'fs';
 import * as path from 'path';
 import cpy from 'cpy';
-import { glob } from 'glob';
+import { sync as globSync } from 'glob';
 import makeDir from 'make-dir';
+import Zip from 'adm-zip';
 
 import { log } from './logger';
 import { Config } from './config';
@@ -16,33 +17,34 @@ import { pushImages } from './push';
 import { targetDir } from './helper';
 
 type DownloadClient = {
-  downloadArtifact: (token: string, artifactId: number, runId: number, artifactName: string) => Promise<void>;
+  downloadArtifact: (id: number) => Promise<{ data: unknown }>;
 };
 
 // Download expected images from target artifact.
-const downloadExpectedImages = async (
-  client: DownloadClient,
-  latestArtifactId: number,
-  runId: number,
-  config: Config,
-) => {
+const downloadExpectedImages = async (client: DownloadClient, latestArtifactId: number) => {
   log.info(`Start to download expected images, artifact id = ${latestArtifactId}`);
   try {
-    await client.downloadArtifact(config.githubToken, latestArtifactId, runId, config.artifactName);
-
-    const files = await glob(`${constants.DOWNLOAD_PATH}/**/${constants.ACTUAL_DIR_NAME}/**/*`);
+    const zip = await client.downloadArtifact(latestArtifactId);
     await Promise.all(
-      files.map(async file => {
-        if (!/(png|jpg|jpeg|tiff|bmp|gif)$/.test(file)) return;
-        const f = path.join(
-          workspace(),
-          file.replace(path.join(constants.DOWNLOAD_PATH, constants.ACTUAL_DIR_NAME), constants.EXPECTED_DIR_NAME),
-        );
-        await makeDir(path.dirname(f));
-        log.info('download to', f);
-        await fs.copyFile(file, f);
-      }),
-    );
+      new Zip(Buffer.from(zip.data as any))
+        .getEntries()
+        .filter(f => {
+          log.info('entryName:', f.entryName);
+          return !f.isDirectory && f.entryName.startsWith(constants.ACTUAL_DIR_NAME);
+        })
+        .map(async file => {
+          const f = path.join(
+            workspace(),
+            file.entryName.replace(constants.ACTUAL_DIR_NAME, constants.EXPECTED_DIR_NAME),
+          );
+          await makeDir(path.dirname(f));
+          log.info('download to', f);
+          await fs.promises.writeFile(f, file.getData());
+        }),
+    ).catch(e => {
+      log.error('Failed to extract images.', e);
+      throw e;
+    });
   } catch (e: any) {
     if (e.message === 'Artifact has expired') {
       log.error('Failed to download expected images. Because expected artifact has already expired.');
@@ -74,7 +76,7 @@ const compareAndUpload = async (client: UploadClient, config: Config): Promise<C
   const result = await compare(config);
   log.info('compare result', result);
 
-  const files = await glob.glob(path.join(workspace(), '**/*'));
+  const files = globSync(path.join(workspace(), '**/*'));
 
   log.info('Start upload artifact');
 
@@ -93,7 +95,7 @@ const init = async (config: Config) => {
   log.info(`start initialization with config.`, config);
 
   // Cleanup workspace
-  await fs.rm(workspace(), {
+  await fs.promises.rm(workspace(), {
     recursive: true,
     force: true,
   });
@@ -178,7 +180,7 @@ export const run = async ({
   const { run: targetRun, artifact } = runAndArtifact;
 
   // Download and copy expected images to workspace.
-  await downloadExpectedImages(client, artifact.id, targetRun.id, config);
+  await downloadExpectedImages(client, artifact.id);
 
   const result = await compareAndUpload(client, config);