refactor: lock

kukhariev · Sep 1, 2021 · 22c2955 · 22c2955
1 parent b36495a
commit 22c2955
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/packages/core/src/handlers/base-handler.ts b/packages/core/src/handlers/base-handler.ts
@@ -133,6 +133,11 @@ export abstract class BaseHandler<TFile extends Readonly<File>>
         if ('status' in file && file.status) {
           this.log('[%s]: %s', file.status, file.name);
           this.listenerCount(file.status) && this.emit(file.status, file);
+          if (file.lockedBy instanceof Function) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+            file.lockedBy();
+            return;
+          }
           if (file.status === 'completed') {
             req['_body'] = true;
             req['body'] = file;

diff --git a/packages/core/src/storages/disk-storage.ts b/packages/core/src/storages/disk-storage.ts
@@ -18,7 +18,6 @@ import { LocalMetaStorage, LocalMetaStorageOptions } from './local-meta-storage'
 const INVALID_OFFSET = -1;
 
 export interface DiskFile extends File {
-  lock: (lockFn: () => any) => Promise<any>;
   move: (dest: string) => Promise<any>;
   copy: (dest: string) => Promise<any>;
   delete: () => Promise<any>;
@@ -68,7 +67,10 @@ export class DiskStorage extends BaseStorage<DiskFile> {
 
   buildCompletedFile(file: DiskFile): DiskFile {
     const completed = { ...file };
-    completed.lock = async lockFn => Promise.resolve('TODO:');
+    completed.lock = async lockFn => {
+      completed.lockedBy = lockFn;
+      return Promise.resolve(completed.lockedBy);
+    };
     completed.delete = () => this.delete(file.name);
     completed.hash = (algorithm?: 'sha1' | 'md5', encoding?: 'hex' | 'base64') =>
       fileChecksum(this.getFilePath(file.name), algorithm, encoding);
@@ -91,8 +93,9 @@ export class DiskStorage extends BaseStorage<DiskFile> {
 
   async write(part: FilePart): Promise<DiskFile> {
     const file = await this.getMeta(part.name);
-    await this.checkIfExpired(file);
     if (file.status === 'completed') return file;
+    if (file.lockedBy) return file;
+    await this.checkIfExpired(file);
     if (!isValidPart(part, file)) return fail(ERRORS.FILE_CONFLICT);
     try {
       file.bytesWritten = await this._write({ ...file, ...part });

diff --git a/packages/core/src/storages/file.ts b/packages/core/src/storages/file.ts
@@ -43,6 +43,8 @@ export class File implements FileInit {
   userId?;
   expiredAt?: string | Date | number;
   createdAt?: string | Date | number;
+  lock!: (onLocked: () => any) => Promise<any>;
+  lockedBy?: (() => any) | unknown;
 
   constructor({ metadata = {}, originalName, contentType, size, userId }: FileInit) {
     this.metadata = metadata;