🔨 Refactor: optimize auto update

scripts/notarize.js

@@ -1,37 +1,36 @@
-"use strict";
+'use strict'
 
 require('dotenv').config()
 
-const { notarize } = require("@electron/notarize")
+const { notarize } = require('@electron/notarize')
 const {
   ELECTRON_SKIP_NOTARIZATION,
   XCODE_APP_LOADER_EMAIL,
-  XCODE_APP_LOADER_PASSWORD,
+  XCODE_APP_LOADER_PASSWORD
 } = process.env
 
-async function main(context) {
+async function main (context) {
   const { electronPlatformName, appOutDir } = context
 
   if (
-    electronPlatformName !== "darwin" ||
-    ELECTRON_SKIP_NOTARIZATION === "true" ||
+    electronPlatformName !== 'darwin' ||
+    ELECTRON_SKIP_NOTARIZATION === 'true' ||
     !XCODE_APP_LOADER_EMAIL ||
     !XCODE_APP_LOADER_PASSWORD
   ) {
-    console.log("Skipping Apple notarization.")
-    return;
+    console.log('Skipping Apple notarization.')
+    return
   }
 
-  console.log("Starting Apple notarization.")
-  const appName = context.packager.appInfo.productFilename;
+  console.log('Starting Apple notarization.')
+  const appName = context.packager.appInfo.productFilename
   await notarize({
-    appBundleId: "com.kuingsmile.piclist",
+    appBundleId: 'com.kuingsmile.piclist',
     appPath: `${appOutDir}/${appName}.app`,
     appleId: XCODE_APP_LOADER_EMAIL,
-    appleIdPassword: XCODE_APP_LOADER_PASSWORD,
+    appleIdPassword: XCODE_APP_LOADER_PASSWORD
   })
-  console.log("Finished Apple notarization.")
-
+  console.log('Finished Apple notarization.')
 }
 
-exports.default = main;
+exports.default = main

scripts/upload-beta.js

@@ -14,51 +14,50 @@ const ACCOUNT_ID = process.env.R2_ACCOUNT_ID
 const SECRET_ID = process.env.R2_SECRET_ID
 const SECRET_KEY = process.env.R2_SECRET_KEY
 
-
 const uploadFile = async () => {
-    try {
-        const platform = process.platform
-        if (configList[platform]) {
-            for (const [index, config] of configList[platform].entries()) {
-                const fileName = `${config.appNameWithPrefix}${VERSION}${config.arch}${config.ext}`
-                const distPath = path.join(__dirname, '../dist_electron')
-                console.log('[PicList Dist] Uploading...', fileName, `${index + 1}/${configList[platform].length}`)
-                const fileStream = fs.createReadStream(path.join(distPath, fileName))
-                const options = {
-                    credentials: {
-                        accessKeyId: SECRET_ID,
-                        secretAccessKey: SECRET_KEY
-                    },
-                    endpoint: `https://${ACCOUNT_ID}.r2.cloudflarestorage.com`,
-                    sslEnabled: true,
-                    region: 'us-east-1'
-                }
-                const client = new S3Client.S3Client(options)
-                const parallelUploads3 = new Upload.Upload({
-                    client,
-                    params: {
-                        Bucket: BUCKET,
-                        Key: `${FILE_PATH}${fileName}`,
-                        Body: fileStream,
-                        ContentType: 'application/octet-stream',
-                        Metadata: {
-                            description: 'uploaded by PicList'
-                        }
-                    }
-                })
-                parallelUploads3.on('httpUploadProgress', (progress) => {
-                    const progressBar = Math.round((progress.loaded / progress.total) * 100)
-                    process.stdout.write(`\r${progressBar}% ${fileName}`)
-                })
-                console.log('\n')
-                await parallelUploads3.done()
-                console.log(`${fileName} uploaded!`)
-            }
-        } else {
-            console.warn('platform not supported!', platform)
+  try {
+    const platform = process.platform
+    if (configList[platform]) {
+      for (const [index, config] of configList[platform].entries()) {
+        const fileName = `${config.appNameWithPrefix}${VERSION}${config.arch}${config.ext}`
+        const distPath = path.join(__dirname, '../dist_electron')
+        console.log('[PicList Dist] Uploading...', fileName, `${index + 1}/${configList[platform].length}`)
+        const fileStream = fs.createReadStream(path.join(distPath, fileName))
+        const options = {
+          credentials: {
+            accessKeyId: SECRET_ID,
+            secretAccessKey: SECRET_KEY
+          },
+          endpoint: `https://${ACCOUNT_ID}.r2.cloudflarestorage.com`,
+          sslEnabled: true,
+          region: 'us-east-1'
         }
-    } catch (err) {
-        console.error(err)
+        const client = new S3Client.S3Client(options)
+        const parallelUploads3 = new Upload.Upload({
+          client,
+          params: {
+            Bucket: BUCKET,
+            Key: `${FILE_PATH}${fileName}`,
+            Body: fileStream,
+            ContentType: 'application/octet-stream',
+            Metadata: {
+              description: 'uploaded by PicList'
+            }
+          }
+        })
+        parallelUploads3.on('httpUploadProgress', (progress) => {
+          const progressBar = Math.round((progress.loaded / progress.total) * 100)
+          process.stdout.write(`\r${progressBar}% ${fileName}`)
+        })
+        console.log('\n')
+        await parallelUploads3.done()
+        console.log(`${fileName} uploaded!`)
+      }
+    } else {
+      console.warn('platform not supported!', platform)
     }
+  } catch (err) {
+    console.error(err)
+  }
 }
-uploadFile()
+uploadFile()

scripts/upload-dist-to-r2.js

@@ -7,90 +7,109 @@ const pkg = require('../package.json')
 const configList = require('./config')
 const fs = require('fs')
 const path = require('path')
+const yaml = require('js-yaml')
 
 const BUCKET = 'piclist-dl'
 const VERSION = pkg.version
-const FILE_PATH = `latest/`
+const FILE_PATH = 'latest/'
 const ACCOUNT_ID = process.env.R2_ACCOUNT_ID
 const SECRET_ID = process.env.R2_SECRET_ID
 const SECRET_KEY = process.env.R2_SECRET_KEY
 
 const s3 = new S3({
-    endpoint: `https://${ACCOUNT_ID}.r2.cloudflarestorage.com`,
-    accessKeyId: SECRET_ID,
-    secretAccessKey: SECRET_KEY,
-    signatureVersion: 'v4',
+  endpoint: `https://${ACCOUNT_ID}.r2.cloudflarestorage.com`,
+  accessKeyId: SECRET_ID,
+  secretAccessKey: SECRET_KEY,
+  signatureVersion: 'v4'
 })
 
-const uploadFile = async () => {
-    try {
-        const platform = process.platform
-        if (configList[platform]) {
-            let versionFileHasUploaded = false
-            for (const [index, config] of configList[platform].entries()) {
-                const fileName = `${config.appNameWithPrefix}${VERSION}${config.arch}${config.ext}`
-                const distPath = path.join(__dirname, '../dist_electron')
-                let versionFileName = config['version-file']
-                console.log('[PicList Dist] Uploading...', fileName, `${index + 1}/${configList[platform].length}`)
-                const fileStream = fs.createReadStream(path.join(distPath, fileName))
-                const options = {
-                    credentials: {
-                        accessKeyId: SECRET_ID,
-                        secretAccessKey: SECRET_KEY
-                    },
-                    endpoint: `https://${ACCOUNT_ID}.r2.cloudflarestorage.com`,
-                    sslEnabled: true,
-                    region: 'us-east-1'
-                }
-                const client = new S3Client.S3Client(options)
-                const parallelUploads3 = new Upload.Upload({
-                    client,
-                    params: {
-                        Bucket: BUCKET,
-                        Key: `${FILE_PATH}${fileName}`,
-                        Body: fileStream,
-                        ContentType: 'application/octet-stream',
-                        Metadata: {
-                            description: 'uploaded by PicList'
-                        }
-                    }
-                })
-                parallelUploads3.on('httpUploadProgress', (progress) => {
-                    const progressBar = Math.round((progress.loaded / progress.total) * 100)
-                    process.stdout.write(`\r${progressBar}% ${fileName}`)
-                })
-                console.log('\n')
-                await parallelUploads3.done()
-                console.log(`${fileName} uploaded!`)
-                if (!versionFileHasUploaded) {
-                    console.log('[PicList Version File] Uploading...', versionFileName)
-                    let versionFilePath
-                    if (platform === 'win32') {
-                        versionFilePath = path.join(distPath, 'latest.yml')
-                    } else if (platform === 'darwin') {
-                        versionFilePath = path.join(distPath, 'latest-mac.yml')
-                    } else {
-                        versionFilePath = path.join(distPath, 'latest-linux.yml')
-                    }
-                    const versionFileBuffer = fs.readFileSync(versionFilePath)
-                    await s3.upload({
-                        Bucket: BUCKET,
-                        Key: `${versionFileName}`,
-                        Body: versionFileBuffer
-                    }).promise()
-                    await s3.upload({
-                        Bucket: BUCKET,
-                        Key: `${FILE_PATH}${versionFileName}`,
-                        Body: versionFileBuffer
-                    }).promise()
-                    versionFileHasUploaded = true
-                }
-            }
-        } else {
-            console.warn('platform not supported!', platform)
-        }
-    } catch (err) {
-        console.error(err)
-    }
+const removeDupField = path => {
+  const file = fs.readFileSync(path, 'utf8')
+  const data = yaml.load(file)
+  const filesMap = {}
+  data.files.forEach(file => {
+    const key = file.url + file.sha512 + file.size
+    filesMap[key] = file
+  })
+  data.files = Object.values(filesMap)
+  const newYml = yaml.dump(data, { lineWidth: -1 })
+  fs.writeFileSync(path, newYml, 'utf8')
 }
-uploadFile()
+
+const uploadFile = async () => {
+  try {
+    const platform = process.platform
+    if (configList[platform]) {
+      let versionFileHasUploaded = false
+      for (const [index, config] of configList[platform].entries()) {
+        const fileName = `${config.appNameWithPrefix}${VERSION}${config.arch}${config.ext}`
+        const distPath = path.join(__dirname, '../dist_electron')
+        const versionFileName = config['version-file']
+        console.log('[PicList Dist] Uploading...', fileName, `${index + 1}/${configList[platform].length}`)
+        const fileStream = fs.createReadStream(path.join(distPath, fileName))
+        const options = {
+          credentials: {
+            accessKeyId: SECRET_ID,
+            secretAccessKey: SECRET_KEY
+          },
+          endpoint: `https://${ACCOUNT_ID}.r2.cloudflarestorage.com`,
+          sslEnabled: true,
+          region: 'us-east-1'
+        }
+        const client = new S3Client.S3Client(options)
+        const parallelUploads3 = new Upload.Upload({
+          client,
+          params: {
+            Bucket: BUCKET,
+            Key: `${FILE_PATH}${fileName}`,
+            Body: fileStream,
+            ContentType: 'application/octet-stream',
+            Metadata: {
+              description: 'uploaded by PicList'
+            }
+          }
+        })
+        parallelUploads3.on('httpUploadProgress', progress => {
+          const progressBar = Math.round((progress.loaded / progress.total) * 100)
+          process.stdout.write(`\r${progressBar}% ${fileName}`)
+        })
+        console.log('\n')
+        await parallelUploads3.done()
+        console.log(`${fileName} uploaded!`)
+        if (!versionFileHasUploaded) {
+          console.log('[PicList Version File] Uploading...', versionFileName)
+          let versionFilePath
+          if (platform === 'win32') {
+            versionFilePath = path.join(distPath, 'latest.yml')
+          } else if (platform === 'darwin') {
+            versionFilePath = path.join(distPath, 'latest-mac.yml')
+          } else {
+            versionFilePath = path.join(distPath, 'latest-linux.yml')
+          }
+          removeDupField(versionFilePath)
+          const versionFileBuffer = fs.readFileSync(versionFilePath)
+          await s3
+            .upload({
+              Bucket: BUCKET,
+              Key: `${versionFileName}`,
+              Body: versionFileBuffer
+            })
+            .promise()
+          await s3
+            .upload({
+              Bucket: BUCKET,
+              Key: `${FILE_PATH}${versionFileName}`,
+              Body: versionFileBuffer
+            })
+            .promise()
+          versionFileHasUploaded = true
+        }
+      }
+    } else {
+      console.warn('platform not supported!', platform)
+    }
+  } catch (err) {
+    console.error(err)
+  }
+}
+uploadFile()