jeffemmett
/
postiz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: region

This commit is contained in:
Nevo David 2024-03-14 15:37:40 +07:00
parent bbf3677bcd
commit b6fc26f0bd
2 changed files with 6 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
libraries/nestjs-libraries/src/upload/cloudflare.storage.ts
View File

@ -5,24 +5,6 @@ import type { Request } from 'express';
import {makeId} from "@gitroom/nestjs-libraries/services/make.is"; import {makeId} from "@gitroom/nestjs-libraries/services/make.is";
import mime from 'mime-types'; import mime from 'mime-types';
export interface CloudflareCDNUploadResponse<T = string[]> {
success: boolean;
errors: {
code: number;
message: string;
}[];
result: {
id: string;
filename: string;
metadata: {
meta: string;
};
requireSignedURLs: boolean;
variants: T;
uploaded: string;
};
}
type CallbackFunction = ( type CallbackFunction = (
error: Error | null, error: Error | null,
info?: Partial<Express.Multer.File> info?: Partial<Express.Multer.File>
@ -35,11 +17,13 @@ class CloudflareStorage implements StorageEngine {
accountID: string, accountID: string,
accessKey: string, accessKey: string,
secretKey: string, secretKey: string,
private region: string,
private _bucketName: string, private _bucketName: string,
private _uploadUrl: string private _uploadUrl: string,
) { ) {
this._client = new S3Client({ this._client = new S3Client({
endpoint: `https://${accountID}.r2.cloudflarestorage.com`, endpoint: `https://${accountID}.r2.cloudflarestorage.com`,
region,
credentials: { credentials: {
accessKeyId: accessKey, accessKeyId: accessKey,
secretAccessKey: secretKey, secretAccessKey: secretKey,
@ -77,7 +61,7 @@ class CloudflareStorage implements StorageEngine {
Body: data, Body: data,
}); });
const upload = await this._client.send(command); await this._client.send(command);
return { return {
filename: `${id}.${extension}`, filename: `${id}.${extension}`,
@ -91,51 +75,12 @@ class CloudflareStorage implements StorageEngine {
encoding: '7bit', encoding: '7bit',
stream: data as any, stream: data as any,
} }
// const request = await fetch(this.destURL, {
// method: 'POST',
// headers: {
// Authorization: `Bearer ${this.accountToken}`,
// ...body.getHeaders(),
// },
// body,
// });
//
// const response: CloudflareCDNUploadResponse = await request.json();
// if (request.ok) {
// return callback(null, {
// path: response.result.variants[0],
// filename: response.result.filename,
// destination: response.result.id,
// });
// }
//
// console.log(response);
// return callback(
// new Error(
// 'There was an error in uploading an asset to Cloudflare Images.'
// )
// );
} }
private async _deleteFile( private async _deleteFile(
filedestination: string, filedestination: string,
callback: CallbackFunction callback: CallbackFunction
) { ) {
// const request = await fetch(`${this.destURL}/${filedestination}`, {
// method: 'DELETE',
// headers: {
// Authorization: `Bearer ${this.accountToken}`,
// },
// });
//
// if (request.ok) return callback(null);
// return callback(
// new Error(
// 'There was an error in deleting the asset from Cloudflare Images.'
// )
// );
} }
} }

2
libraries/nestjs-libraries/src/upload/upload.module.ts
View File

@ -10,11 +10,13 @@ const storage =
process.env.CLOUDFLARE_ACCESS_KEY && process.env.CLOUDFLARE_ACCESS_KEY &&
process.env.CLOUDFLARE_SECRET_ACCESS_KEY && process.env.CLOUDFLARE_SECRET_ACCESS_KEY &&
process.env.CLOUDFLARE_BUCKETNAME && process.env.CLOUDFLARE_BUCKETNAME &&
process.env.CLOUDFLARE_REGION &&
process.env.CLOUDFLARE_BUCKET_URL process.env.CLOUDFLARE_BUCKET_URL
? new CloudflareStorage( ? new CloudflareStorage(
process.env.CLOUDFLARE_ACCOUNT_ID, process.env.CLOUDFLARE_ACCOUNT_ID,
process.env.CLOUDFLARE_ACCESS_KEY, process.env.CLOUDFLARE_ACCESS_KEY,
process.env.CLOUDFLARE_SECRET_ACCESS_KEY, process.env.CLOUDFLARE_SECRET_ACCESS_KEY,
process.env.CLOUDFLARE_REGION,
process.env.CLOUDFLARE_BUCKETNAME, process.env.CLOUDFLARE_BUCKETNAME,
process.env.CLOUDFLARE_BUCKET_URL process.env.CLOUDFLARE_BUCKET_URL
) )