mirror of
https://github.com/CommunitySolidServer/CommunitySolidServer.git
synced 2024-10-03 14:55:10 +00:00

* feat: implemented SizeReporter and FileSizeReporter * test: FileSizeReporter tests * feat: added QuotedDataAccessor * test: added extra test to check recursiveness of filesizereporter * feat: added QuotaStrategy interface * feat: further progress in different files * feat: wrote doc, tests and improved code * feat: fixed bugs and code is now runnable and buildable * feat: finished implementation * fix: revert accidental chanegs * fix: fileSizeReported did not count container size * fix: bug calculating container sizes fixed * test: FileSizeReporter tests * test: QuotaDataValidator tests * test: QuotaError tests * fix: removed console.log * doc: added doc to several files * doc: changed doc for QuotaStrategy to new implementation * fix: improved content length regex * feat: improved GlobalQuotaStrategy code * fix: made FileSizeReported readonly * feat: added comments to quota-file.json * fix: changed default tempFilePath variable * test: included new tempFilePath variable in testing * chore: created seperate command for start:file:quota to pass tests * feat: removed all sync fs calls from FileSizeReporter * feat: minor changes in multple files * fix: changed function signatures to be in line with others * feat: optimized quota data validation * feat: improved FileSizeReporter code * fix: corrected calculation of containersizes and fixed erroring edgecase * feat: save content-length as number in metadata * feat: added comments and changed GlobalQuotaStrategy constructor * feat: changed file names and added small comment * test: AtomicFileDataAccessor tests * test: completed FileSizeReporter tests * fix: content-length is now saved correctly in RepresentationMetadata * feat: adapted content length metadata + tests * fix: removed tempFilePath variable * fix: reverted .gitignore * fix: forgot to remove tempFilePath variable from componentsjs config * test: GlobalQuotaStrategy tests * feat: replaced DataValidator with Validator * feat: reworked DataValidator * feat: added calcultateChunkSize() to SizeReporter * test: updated FileSizeReporter tests * fix: tempFile location now relative to rootFilePath * test: QuotaDataValidator tests * fix: corrected FileSizeReporter tests * fix: adapted FileSizeReporter tests * fix: FileSizeReporter bug on Windows * fix: regex linting error * feat: changed Validator class * feat: added PodQuotaStrategy to enable suota on a per pod basis * chore: bump context versions * fix: Capitalized comments in json file * chore: renamed ValidatorArgs to ValidatorInput * chore: order all exports * fix: made TODO comment clearer * chore: added seperated config files for global and pod based quota + fixed comments * chore: made minor changes to comments * feat: added PassthroughDataAccessor * feat: added PasstroughtDataAccessor + tests * fix: added invalid header check to ContentLengthParser * chore: improved mocks * chore: move quota limit higher up in config * fix: atomicity issue in AtomicFileDataAccessor * chore: moved .internal folder to config from FileSizeReporter * fix: improved algorithm to ignore folders while calculating file size in FileSizeReporter * fix: changes to support containers in the future * fix: added error handling to prevent reading of unexistent files * feat: added generic type to SizeReporter to calculate chunk sizes * test: use mocked DataAccessor * chore: added some comments to test and made minor improvement * fix: fs mock rename * chore: QuotaStrategy.estimateSize refactor * chore: move trackAvailableSpace to abstract class QuotaStrategy * fix: improved test case * test: quota integration tests * chore: edited some comments * chore: change lstat to stat * feat: moved estimateSize to SizeReporter to be consistent with calcultateChunkSize * test: finish up tests to reach coverage * fix: basic config * fix: minor changes to test CI run * fix: small fix for windows * fix: improved writing to file * chore: linting errors * chore: rename trackAvailableSpace * test: improved integration tests * test: logging info for test debugging * test: extra logging for debugging * test: logging for debugging * test: logging for debugging * test: logging for debugging * test: improved Quota integration test setup * test: improve quota tests for CI run * test: debugging Quota test * test: uncommented global quota test * test: changed global quota parameters * test: logging for debugging * test: logging cleanup * chore: minor changes, mostly typo fixes * chore: remove console.log * fix: getting inconsistent results * chore: try fix index.ts CI error * chore: try fix CI error * chore: try fix CI error * chore: revert last commits * chore: fix inconsistent files with origin * test: minor test improvements * chore: minor refactors and improvements * fix: added extra try catch for breaking bug * chore: improve config * chore: minor code improvements * test: use mockFs * feat: add extra check in podQuotaStrategy * chore: replace handle by handleSafe in ValidatingDataAccessor * chore: typo * test: improved Quota integration tests * test: made comment in test more correct * fix: rm -> rmdir for backwards compatibility * fix: fsPromises issue * chore: leave out irrelevant config * chore: removed start script from package.json * fix: Small fixes Co-authored-by: Joachim Van Herwegen <joachimvh@gmail.com>
67 lines
2.4 KiB
TypeScript
67 lines
2.4 KiB
TypeScript
import type { RepresentationMetadata } from '../../http/representation/RepresentationMetadata';
|
|
import type { ResourceIdentifier } from '../../http/representation/ResourceIdentifier';
|
|
import { NotFoundHttpError } from '../../util/errors/NotFoundHttpError';
|
|
import type { IdentifierStrategy } from '../../util/identifiers/IdentifierStrategy';
|
|
import { RDF, PIM } from '../../util/Vocabularies';
|
|
import type { DataAccessor } from '../accessors/DataAccessor';
|
|
import type { Size } from '../size-reporter/Size';
|
|
import type { SizeReporter } from '../size-reporter/SizeReporter';
|
|
import { QuotaStrategy } from './QuotaStrategy';
|
|
|
|
/**
|
|
* The PodQuotaStrategy sets a limit on the amount of data stored on a per pod basis
|
|
*/
|
|
export class PodQuotaStrategy extends QuotaStrategy {
|
|
private readonly identifierStrategy: IdentifierStrategy;
|
|
private readonly accessor: DataAccessor;
|
|
|
|
public constructor(
|
|
limit: Size,
|
|
reporter: SizeReporter<any>,
|
|
identifierStrategy: IdentifierStrategy,
|
|
accessor: DataAccessor,
|
|
) {
|
|
super(reporter, limit);
|
|
this.identifierStrategy = identifierStrategy;
|
|
this.accessor = accessor;
|
|
}
|
|
|
|
protected async getTotalSpaceUsed(identifier: ResourceIdentifier): Promise<Size> {
|
|
const pimStorage = await this.searchPimStorage(identifier);
|
|
|
|
// No storage was found containing this identifier, so we assume this identifier points to an internal location.
|
|
// Quota does not apply here so there is always available space.
|
|
if (!pimStorage) {
|
|
return { amount: Number.MAX_SAFE_INTEGER, unit: this.limit.unit };
|
|
}
|
|
|
|
return this.reporter.getSize(pimStorage);
|
|
}
|
|
|
|
/** Finds the closest parent container that has pim:storage as metadata */
|
|
private async searchPimStorage(identifier: ResourceIdentifier): Promise<ResourceIdentifier | undefined> {
|
|
if (this.identifierStrategy.isRootContainer(identifier)) {
|
|
return;
|
|
}
|
|
|
|
let metadata: RepresentationMetadata;
|
|
const parent = this.identifierStrategy.getParentContainer(identifier);
|
|
|
|
try {
|
|
metadata = await this.accessor.getMetadata(identifier);
|
|
} catch (error: unknown) {
|
|
if (error instanceof NotFoundHttpError) {
|
|
// Resource and/or its metadata do not exist
|
|
return this.searchPimStorage(parent);
|
|
}
|
|
throw error;
|
|
}
|
|
|
|
const hasPimStorageMetadata = metadata!.getAll(RDF.type)
|
|
.some((term): boolean => term.value === PIM.Storage);
|
|
|
|
return hasPimStorageMetadata ? identifier : this.searchPimStorage(parent);
|
|
}
|
|
}
|
|
|