From 015798533a6d68a8590b9d20edd4fa87ac883613 Mon Sep 17 00:00:00 2001
From: luhc228 <luhengchang228@gmail.com>
Date: Mon, 31 May 2021 12:41:00 +0800
Subject: [PATCH] chore: upload latest app

---
 scripts/uploadApp.ts   | 18 +++++++++++++-----
 scripts/uploadToOSS.ts | 10 +++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/scripts/uploadApp.ts b/scripts/uploadApp.ts
index 6b7a42e..83efdc7 100644
--- a/scripts/uploadApp.ts
+++ b/scripts/uploadApp.ts
@@ -26,14 +26,22 @@ const { build: { productName }, version } = packageJSON;
   }
   const buildResourcesDir = path.join(__dirname, '..', 'release');
   // upload app resource
-  // 软件内获取的版本最新版本信息，用于升级软件 e.g: latest-mac.yml
+  // record latest version for the auto-updater to work. e.g: latest-mac.yml
   const channelFile = `${channel}${channelExt}`;
-  // 软件安装包 e.g: AppWorks Toolkit-0.1.0.dmg
-  const packageFile = `${distFileName}${distFileExt}`;
-  // 软件压缩包 e.g: AppWorks Toolkit-0.1.0-mac.zip
+  // package installer file with version. e.g: AppWorks Toolkit.dmg
+  const packageWithoutVersionFile = `${productName}${distFileExt}`;
+  // package installer file with version. e.g: AppWorks Toolkit-0.1.0.dmg
+  const packageWithVersionFile = `${distFileName}${distFileExt}`;
+  // package zip file. e.g: AppWorks Toolkit-0.1.0-mac.zip
   const packageZipFile = `${distFileName}-${platform}.zip`;
 
+  const fileLists = [
+    { ossObjectFile: channelFile, localFile: channelFile },
+    { ossObjectFile: packageWithoutVersionFile, localFile: packageWithVersionFile },
+    { ossObjectFile: packageWithVersionFile, localFile: packageWithVersionFile },
+    { ossObjectFile: packageZipFile, localFile: packageZipFile },
+  ];
   Promise.all([
-    [channelFile, packageFile, packageZipFile].map((file: string) => uploadToOSS(`${OSSObjectDir}/${file}`, path.join(buildResourcesDir, file))),
+    fileLists.map(({ ossObjectFile, localFile }) => uploadToOSS(`${OSSObjectDir}/${ossObjectFile}`, path.join(buildResourcesDir, localFile))),
   ]);
 })();
diff --git a/scripts/uploadToOSS.ts b/scripts/uploadToOSS.ts
index f5e3fb4..0b30e7f 100644
--- a/scripts/uploadToOSS.ts
+++ b/scripts/uploadToOSS.ts
@@ -8,17 +8,17 @@ const ossClient = oss({
   timeout: '300s',
 });
 
-function uploadToOSS(target: string, filePath: string) {
+function uploadToOSS(ossObjectName: string, localPath: string) {
   return new Promise((resolve, reject) => {
-    console.log(`[UPLOAD] start to upload ${filePath}.`);
+    console.log(`[UPLOAD] start to upload ${localPath}.`);
     ossClient
-      .put(target, filePath)
+      .put(ossObjectName, localPath)
       .then(() => {
-        console.log(`[UPLOAD] ${filePath} upload success.`);
+        console.log(`[UPLOAD] ${localPath} upload success.`);
         resolve(0);
       })
       .catch((e: Error) => {
-        console.log(`[ERROR] ${filePath} upload failed.`);
+        console.log(`[ERROR] ${localPath} upload failed.`);
         reject(e.message);
       });
   });