📦 Chore: change version files' upload dest & dist files' upload dest

package.json

@@ -42,6 +42,8 @@
     "write-file-atomic": "^4.0.1"
   },
   "devDependencies": {
+    "@aws-sdk/client-s3": "^3.276.0",
+    "@aws-sdk/lib-storage": "^3.276.0",
     "@babel/plugin-proposal-optional-chaining": "^7.16.7",
     "@picgo/bump-version": "^1.1.2",
     "@types/electron-devtools-installer": "^2.2.0",

scripts/upload-dist.js

@@ -1,4 +1,6 @@
-// upload dist bundled-app to cos
+// upload dist bundled-app to r2
+// upload version file to cos
+
 require('dotenv').config()
 const crypto = require('crypto')
 const fs = require('fs')
@@ -8,13 +10,29 @@ const configList = require('./config')
 const axios = require('axios').default
 const path = require('path')
 const distPath = path.join(__dirname, '../dist_electron')
+const S3Client = require('@aws-sdk/client-s3').S3Client
+const Upload = require('@aws-sdk/lib-storage').Upload
 
 const BUCKET = 'picgo-1251750343'
+const S3_BUCKET = 'picgo'
 // const AREA = 'ap-chengdu'
 const VERSION = pkg.version
 const FILE_PATH = `${VERSION}/`
-const SECRET_ID = process.env.PICGO_ENV_COS_SECRET_ID
-const SECRET_KEY = process.env.PICGO_ENV_COS_SECRET_KEY
+const COS_SECRET_ID = process.env.PICGO_ENV_COS_SECRET_ID
+const COS_SECRET_KEY = process.env.PICGO_ENV_COS_SECRET_KEY
+const S3_SECRET_ID = process.env.PICGO_ENV_S3_SECRET_ID
+const S3_SECRET_KEY = process.env.PICGO_ENV_S3_SECRET_KEY
+const S3_ACCOUNT_ID = process.env.PICGO_ENV_S3_ACCOUNT_ID
+
+const S3Options = {
+  credentials: {
+    accessKeyId: S3_SECRET_ID,
+    secretAccessKey: S3_SECRET_KEY
+  },
+  endpoint: `https://${S3_ACCOUNT_ID}.r2.cloudflarestorage.com`,
+  sslEnabled: true,
+  region: 'auto'
+}
 
 // https://cloud.tencent.com/document/product/436/7778#signature
 /**
@@ -22,7 +40,7 @@ const SECRET_KEY = process.env.PICGO_ENV_COS_SECRET_KEY
  * @returns
  */
 const generateSignature = (fileName, folder = FILE_PATH) => {
-  const secretKey = SECRET_KEY
+  const secretKey = COS_SECRET_ID
   // const area = AREA
   const bucket = BUCKET
   const path = folder
@@ -53,7 +71,7 @@ const getReqOptions = (fileName, fileBuffer, signature, folder = FILE_PATH) => {
     url: `http://${BUCKET}.cos.accelerate.myqcloud.com/${encodeURI(folder)}${encodeURI(fileName)}`,
     headers: {
       Host: `${BUCKET}.cos.accelerate.myqcloud.com`,
-      Authorization: `q-sign-algorithm=sha1&q-ak=${SECRET_ID}&q-sign-time=${signature.signTime}&q-key-time=${signature.signTime}&q-header-list=host&q-url-param-list=&q-signature=${signature.signature}`,
+      Authorization: `q-sign-algorithm=sha1&q-ak=${COS_SECRET_KEY}&q-sign-time=${signature.signTime}&q-key-time=${signature.signTime}&q-header-list=host&q-url-param-list=&q-signature=${signature.signature}`,
       contentType: mime.lookup(fileName),
       useAgent: `PicGo;${pkg.version};null;null`
     },
@@ -64,25 +82,20 @@ const getReqOptions = (fileName, fileBuffer, signature, folder = FILE_PATH) => {
   }
 }
 
-const uploadFile = async () => {
+/**
+ * a backup for version file
+ */
+const uploadVersionFile = 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 filePath = path.join(distPath, fileName)
+      for (const [, config] of configList[platform].entries()) {
         const versionFilePath = path.join(distPath, config['version-file'])
         let versionFileName = config['version-file']
         if (VERSION.toLocaleLowerCase().includes('beta')) {
           versionFileName = versionFileName.replace('.yml', '.beta.yml')
         }
-        // upload dist file
-        const signature = generateSignature(fileName)
-        const reqOptions = getReqOptions(fileName, fs.readFileSync(filePath), signature)
-        console.log('[PicGo Dist] Uploading...', fileName, `${index + 1}/${configList[platform].length}`)
-        await axios.request(reqOptions)
-
         // upload version file
         if (!versionFileHasUploaded) {
           const signature = generateSignature(versionFileName, '')
@@ -100,4 +113,64 @@ const uploadFile = async () => {
   }
 }
 
-uploadFile()
+const uploadDist = 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 filePath = path.join(distPath, fileName)
+        const versionFilePath = path.join(distPath, config['version-file'])
+        let versionFileName = config['version-file']
+        if (VERSION.toLocaleLowerCase().includes('beta')) {
+          versionFileName = versionFileName.replace('.yml', '.beta.yml')
+        }
+
+        const client = new S3Client(S3Options)
+        const uploadDistToS3 = new Upload({
+          client,
+          params: {
+            Bucket: S3_BUCKET,
+            Key: `${FILE_PATH}${fileName}`,
+            Body: fs.createReadStream(filePath),
+            ContentType: 'application/octet-stream'
+          }
+        })
+        // upload dist file
+        console.log('[PicGo Dist] Uploading...', fileName, `${index + 1}/${configList[platform].length}`)
+        uploadDistToS3.on('httpUploadProgress', progress => {
+          console.log(`[PicGo Dist] Uploading... ${progress.loaded}/${progress.total}`)
+        })
+        await uploadDistToS3.done()
+
+        // upload version file
+        if (!versionFileHasUploaded) {
+          const uploadVersionFileToS3 = new Upload({
+            client,
+            params: {
+              Bucket: S3_BUCKET,
+              Key: `${versionFileName}`,
+              Body: fs.createReadStream(versionFilePath),
+              ContentType: 'application/octet-stream'
+            }
+          })
+          console.log('[PicGo Version File] Uploading...', versionFileName)
+          await uploadVersionFileToS3.done()
+          versionFileHasUploaded = true
+        }
+      }
+    } else {
+      console.warn('platform not supported!', platform)
+    }
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+const main = async () => {
+  await uploadVersionFile()
+  await uploadDist()
+}
+
+main()

src/main/events/rpc/index.ts

@@ -7,10 +7,11 @@ import {
   selectUploaderConfig,
   updateUploaderConfig
 } from '~/main/utils/handleUploaderConfig'
+import { getLatestVersion } from '~/main/utils/getLatestVersion'
 
 class RPCServer {
   start () {
-    ipcMain.on(RPC_ACTIONS, (event: IpcMainEvent, action: IRPCActionType, args: any[], callbackId: string) => {
+    ipcMain.on(RPC_ACTIONS, async (event: IpcMainEvent, action: IRPCActionType, args: any[], callbackId: string) => {
       try {
         switch (action) {
           case IRPCActionType.GET_PICBED_CONFIG_LIST: {
@@ -33,6 +34,11 @@ class RPCServer {
             this.sendBack(event, action, true, callbackId)
             break
           }
+          case IRPCActionType.GET_LATEST_VERSION: {
+            const res = await this.getLastestVersion(args as IGetLatestVersionArgs)
+            this.sendBack(event, action, res, callbackId)
+            break
+          }
           default: {
             this.sendBack(event, action, null, callbackId)
             break
@@ -74,6 +80,12 @@ class RPCServer {
     const res = updateUploaderConfig(type, id, config)
     return res
   }
+
+  private async getLastestVersion (args: IGetLatestVersionArgs) {
+    const [isCheckBetaUpdate] = args
+    const version = await getLatestVersion(isCheckBetaUpdate)
+    return version
+  }
 }
 
 const rpcServer = new RPCServer()

src/main/utils/getLatestVersion.ts

@@ -1,11 +1,16 @@
+// for referer policy, we can't use it in renderer
 import axios from 'axios'
-import { RELEASE_URL, RELEASE_URL_BACKUP } from './static'
+import { RELEASE_URL, RELEASE_URL_BACKUP } from '../../universal/utils/static'
 import yaml from 'js-yaml'
 
 export const getLatestVersion = async (isCheckBetaUpdate: boolean = false) => {
   let res: string = ''
   try {
-    res = await axios.get(RELEASE_URL).then(r => {
+    res = await axios.get(RELEASE_URL, {
+      headers: {
+        Referer: 'https://github.com'
+      }
+    }).then(r => {
       const list = r.data as IStringKeyMap[]
       if (isCheckBetaUpdate) {
         const betaList = list.filter(item => item.name.includes('beta'))
@@ -14,7 +19,11 @@ export const getLatestVersion = async (isCheckBetaUpdate: boolean = false) => {
       const normalList = list.filter(item => !item.name.includes('beta'))
       return normalList[0].name
     }).catch(async () => {
-      const result = await axios.get(isCheckBetaUpdate ? `${RELEASE_URL_BACKUP}/latest.beta.yml` : `${RELEASE_URL_BACKUP}/latest.yml`)
+      const result = await axios.get(isCheckBetaUpdate ? `${RELEASE_URL_BACKUP}/latest.beta.yml` : `${RELEASE_URL_BACKUP}/latest.yml`, {
+        headers: {
+          Referer: 'https://github.com'
+        }
+      })
       const r = yaml.load(result.data) as IStringKeyMap
       return r.version
     })

src/main/utils/updateChecker.ts

@@ -3,7 +3,7 @@ import db from '~/main/apis/core/datastore'
 import pkg from 'root/package.json'
 import { lt } from 'semver'
 import { T } from '~/main/i18n'
-import { getLatestVersion } from '#/utils/getLatestVersion'
+import { getLatestVersion } from '~/main/utils/getLatestVersion'
 const version = pkg.version
 // const releaseUrl = 'https://api.github.com/repos/Molunerfinn/PicGo/releases'
 // const releaseUrlBackup = 'https://picgo-1251750343.cos.ap-chengdu.myqcloud.com'

src/renderer/pages/PicGoSetting.vue

@@ -527,13 +527,13 @@ import {
 } from 'electron'
 import { i18nManager, T as $T } from '@/i18n/index'
 import { enforceNumber } from '~/universal/utils/common'
-import { getLatestVersion } from '#/utils/getLatestVersion'
 import { compare } from 'compare-versions'
 import { STABLE_RELEASE_URL, BETA_RELEASE_URL } from '#/utils/static'
 import { computed, onBeforeMount, onBeforeUnmount, reactive, ref } from 'vue'
-import { getConfig, saveConfig, sendToMain } from '@/utils/dataSender'
+import { getConfig, saveConfig, sendToMain, triggerRPC } from '@/utils/dataSender'
 import { useRouter } from 'vue-router'
 import { SHORTKEY_PAGE } from '@/router/config'
+import { IRPCActionType } from '~/universal/types/enum'
 
 const $customLink = ref<InstanceType<typeof ElForm> | null>(null)
 
@@ -774,7 +774,7 @@ function compareVersion2Update (current: string, latest: string): boolean {
 
 async function checkUpdate () {
   checkUpdateVisible.value = true
-  const version = await getLatestVersion(form.checkBetaUpdate)
+  const version = await triggerRPC<string>(IRPCActionType.GET_LATEST_VERSION, form.checkBetaUpdate)
   if (version) {
     latestVersion.value = version
   } else {

src/universal/types/enum.ts

@@ -56,4 +56,5 @@ export enum IRPCActionType {
   CHANGE_CURRENT_UPLOADER = 'CHANGE_CURRENT_UPLOADER',
   SELECT_UPLOADER = 'SELECT_UPLOADER',
   UPDATE_UPLOADER_CONFIG = 'UPDATE_UPLOADER_CONFIG',
+  GET_LATEST_VERSION = 'GET_LATEST_VERSION',
 }

src/universal/types/rpc.d.ts

@@ -2,3 +2,4 @@ type IGetUploaderConfigListArgs = [type: string]
 type IDeleteUploaderConfigArgs = [type: string, id: string]
 type ISelectUploaderConfigArgs = [type: string, id: string]
 type IUpdateUploaderConfigArgs = [type: string, id: string, config: IStringKeyMap]
+type IGetLatestVersionArgs = [isCheckBetaVersion: boolean]