fix lock

console-api/package-lock.json

@@ -23,6 +23,7 @@
         "@nestjs/swagger": "^5.0.9",
         "@nestjs/typeorm": "^8.0.2",
         "axios": "^0.21.1",
+        "better-lock": "^2.0.3",
         "busboy": "^0.2.14",
         "class-transformer": "^0.4.0",
         "class-validator": "^0.13.1",
@@ -4202,6 +4203,11 @@
         }
       ]
     },
+    "node_modules/better-lock": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/better-lock/-/better-lock-2.0.3.tgz",
+      "integrity": "sha512-3bCaToLrmEXZcIOOVWgi1STvp3/6EpoZAmlWBeuX2MvDB0Ql2ctl/vQ0CbhQIJYQiptdGypllP3ez+TeEmdnKQ=="
+    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -15207,6 +15213,11 @@
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
     },
+    "better-lock": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/better-lock/-/better-lock-2.0.3.tgz",
+      "integrity": "sha512-3bCaToLrmEXZcIOOVWgi1STvp3/6EpoZAmlWBeuX2MvDB0Ql2ctl/vQ0CbhQIJYQiptdGypllP3ez+TeEmdnKQ=="
+    },
     "binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",

console-api/package.json

@@ -35,6 +35,7 @@
     "@nestjs/swagger": "^5.0.9",
     "@nestjs/typeorm": "^8.0.2",
     "axios": "^0.21.1",
+    "better-lock": "^2.0.3",
     "busboy": "^0.2.14",
     "class-transformer": "^0.4.0",
     "class-validator": "^0.13.1",

console-api/src/packager/packager.service.ts

@@ -17,6 +17,7 @@ import { createHash } from 'crypto';
 import PQueue from 'p-queue';
 import { LockService } from 'src/lock/lock.service';
 import { InjectRedis, Redis } from '@nestjs-modules/ioredis';
+import BetterLock from 'better-lock';
 
 interface FileWithHash {
   file: readdirp.EntryInfo;
@@ -208,6 +209,8 @@ export class PackagerService extends ConsoleLogger {
     ]);
   }
 
+  private localLock = new BetterLock();
+
   async archive(root: string, archiveTask: ArchiveTask): Promise<Archive> {
     return this.redlock.getLockInstance().using([`archive:${archiveTask.path}`], 5000, async () => this.archiveProcess(root, archiveTask));
   }