mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-13 12:55:00 +00:00
feat(server): separate storage quota limit and blob size limit (#10957)
close CLOUD-171
This commit is contained in:
@@ -258,14 +258,14 @@ export class QuotaService {
|
||||
this.logger.warn(
|
||||
`storage size limit exceeded: ${currentSize} > ${storageQuota}`
|
||||
);
|
||||
return true;
|
||||
return { storageQuotaExceeded: true, blobQuotaExceeded: false };
|
||||
} else if (recvSize > blobLimit) {
|
||||
this.logger.warn(
|
||||
`blob size limit exceeded: ${recvSize} > ${blobLimit}`
|
||||
);
|
||||
return true;
|
||||
return { storageQuotaExceeded: false, blobQuotaExceeded: true };
|
||||
} else {
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
};
|
||||
return checkExceeded;
|
||||
|
||||
@@ -13,7 +13,11 @@ import {
|
||||
import GraphQLUpload from 'graphql-upload/GraphQLUpload.mjs';
|
||||
|
||||
import type { FileUpload } from '../../../base';
|
||||
import { BlobQuotaExceeded, CloudThrottlerGuard } from '../../../base';
|
||||
import {
|
||||
BlobQuotaExceeded,
|
||||
CloudThrottlerGuard,
|
||||
StorageQuotaExceeded,
|
||||
} from '../../../base';
|
||||
import { CurrentUser } from '../../auth';
|
||||
import { AccessController } from '../../permission';
|
||||
import { QuotaService } from '../../quota';
|
||||
@@ -92,9 +96,11 @@ export class WorkspaceBlobResolver {
|
||||
const checkExceeded =
|
||||
await this.quota.getWorkspaceQuotaCalculator(workspaceId);
|
||||
|
||||
// TODO(@darksky): need a proper way to separate `BlobQuotaExceeded` and `BlobSizeTooLarge`
|
||||
if (checkExceeded(0)) {
|
||||
let result = checkExceeded(0);
|
||||
if (result?.blobQuotaExceeded) {
|
||||
throw new BlobQuotaExceeded();
|
||||
} else if (result?.storageQuotaExceeded) {
|
||||
throw new StorageQuotaExceeded();
|
||||
}
|
||||
const buffer = await new Promise<Buffer>((resolve, reject) => {
|
||||
const stream = blob.createReadStream();
|
||||
@@ -104,16 +110,22 @@ export class WorkspaceBlobResolver {
|
||||
|
||||
// check size after receive each chunk to avoid unnecessary memory usage
|
||||
const bufferSize = chunks.reduce((acc, cur) => acc + cur.length, 0);
|
||||
if (checkExceeded(bufferSize)) {
|
||||
result = checkExceeded(bufferSize);
|
||||
if (result?.blobQuotaExceeded) {
|
||||
reject(new BlobQuotaExceeded());
|
||||
} else if (result?.storageQuotaExceeded) {
|
||||
reject(new StorageQuotaExceeded());
|
||||
}
|
||||
});
|
||||
stream.on('error', reject);
|
||||
stream.on('end', () => {
|
||||
const buffer = Buffer.concat(chunks);
|
||||
|
||||
if (checkExceeded(buffer.length)) {
|
||||
result = checkExceeded(buffer.length);
|
||||
if (result?.blobQuotaExceeded) {
|
||||
reject(new BlobQuotaExceeded());
|
||||
} else if (result?.storageQuotaExceeded) {
|
||||
reject(new StorageQuotaExceeded());
|
||||
} else {
|
||||
resolve(buffer);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user