tcjlj/PicList
1
0
Fork 0
mirror of https://github.com/Kuingsmile/PicList.git synced 2025-01-23 14:48:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔨 Refactor: use aws-sdk v3 to upload file, add progress bar

Browse Source
This commit is contained in:
萌萌哒赫萝 2023-02-20 11:07:21 +08:00
parent 3252d70268
commit 729aad882f
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
scripts/upload-dist-to-r2.js
View File

@ -1,6 +1,8 @@
// upload dist bundled-app to r2 // upload dist bundled-app to r2
require('dotenv').config() require('dotenv').config()
const S3 = require('aws-sdk/clients/s3') const S3 = require('aws-sdk/clients/s3')
const S3Client = require('@aws-sdk/client-s3')
const Upload = require('@aws-sdk/lib-storage')
const pkg = require('../package.json') const pkg = require('../package.json')
const configList = require('./config') const configList = require('./config')
const fs = require('fs') const fs = require('fs')
@ -12,7 +14,6 @@ const FILE_PATH = `${VERSION}/`
const ACCOUNT_ID = process.env.R2_ACCOUNT_ID const ACCOUNT_ID = process.env.R2_ACCOUNT_ID
const SECRET_ID = process.env.R2_SECRET_ID const SECRET_ID = process.env.R2_SECRET_ID
const SECRET_KEY = process.env.R2_SECRET_KEY const SECRET_KEY = process.env.R2_SECRET_KEY
console.log(ACCOUNT_ID, SECRET_ID, SECRET_KEY)
const s3 = new S3({ const s3 = new S3({
endpoint: `https://${ACCOUNT_ID}.r2.cloudflarestorage.com`, endpoint: `https://${ACCOUNT_ID}.r2.cloudflarestorage.com`,
@ -31,13 +32,35 @@ const uploadFile = async () => {
const distPath = path.join(__dirname, '../dist_electron') const distPath = path.join(__dirname, '../dist_electron')
let versionFileName = config['version-file'] let versionFileName = config['version-file']
console.log('[PicList Dist] Uploading...', fileName, `${index + 1}/${configList[platform].length}`) console.log('[PicList Dist] Uploading...', fileName, `${index + 1}/${configList[platform].length}`)
const fileBuffer = fs.readFileSync(path.join(distPath, fileName)) const fileStream = fs.createReadStream(path.join(distPath, fileName))
await s3.upload({ const options = {
Bucket: BUCKET, credentials: {
Key: `${FILE_PATH}${fileName}`, accessKeyId: SECRET_ID,
Body: fileBuffer secretAccessKey: SECRET_KEY
}).promise() },
// upload version file 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}`)
})
await parallelUploads3.done()
console.log(`${fileName} uploaded!`)
if (!versionFileHasUploaded) { if (!versionFileHasUploaded) {
console.log('[PicList Version File] Uploading...', versionFileName) console.log('[PicList Version File] Uploading...', versionFileName)
let versionFilePath let versionFilePath