WIP

Author: CMCDragonkai

src/EncryptedFS.ts

@@ -93,10 +93,12 @@ class EncryptedFS {
     logger?: Logger;
     fresh?: boolean;
   }): Promise<EncryptedFS> {
-    let crypto: {
-      key: Buffer,
-      ops: Crypto
-    } | undefined;
+    let crypto:
+      | {
+          key: Buffer;
+          ops: Crypto;
+        }
+      | undefined;
     if (db == null) {
       crypto = {
         key: dbKey!,
@@ -256,7 +258,7 @@ class EncryptedFS {
   } = {}): Promise<void> {
     this.logger.info(`Starting ${this.constructor.name}`);
     if (this.chrootParent == null) {
-      if (this.crypto != null)  {
+      if (this.crypto != null) {
         await this.db.start({ crypto: this.crypto, fresh });
       }
       await this.iNodeMgr.start({ fresh });
@@ -347,7 +349,9 @@ class EncryptedFS {
       });
       // Chrooted EFS shares all of the dependencies
       // This means the dependencies are already in running state
-      const efsChrooted = new EncryptedFS({
+      const efsChrooted = new (this.constructor as new (
+        ...params: ConstructorParameters<typeof EncryptedFS>
+      ) => this)({
         db: this.db,
         iNodeMgr: this.iNodeMgr,
         fdMgr: this.fdMgr,

src/inodes/INodeManager.ts

@@ -207,7 +207,7 @@ class INodeManager {
   ): ResourceAcquire<DBTransaction> {
     return async () => {
       const [transactionRelease, tran] = await this.db.transaction()();
-      await tran!.lock(...inos.map(i => i.toString()));
+      await tran!.lock(...inos.map((i) => i.toString()));
       return [transactionRelease, tran];
     };
   }
@@ -221,7 +221,9 @@ class INodeManager {
   ): Promise<T> {
     const f = params.pop() as (tran: DBTransaction) => Promise<T>;
     return await this.db.withTransactionF(async (tran) => {
-      await tran.lock(...(params as Array<INodeIndex>).map(i => i.toString()));
+      await tran.lock(
+        ...(params as Array<INodeIndex>).map((i) => i.toString()),
+      );
       return f(tran);
     });
   }
@@ -237,7 +239,9 @@ class INodeManager {
       tran: DBTransaction,
     ) => AsyncGenerator<T, TReturn, TNext>;
     return this.db.withTransactionG(async function* (tran) {
-      await tran.lock(...(params as Array<INodeIndex>).map(i => i.toString()));
+      await tran.lock(
+        ...(params as Array<INodeIndex>).map((i) => i.toString()),
+      );
       return yield* g(tran);
     });
   }
@@ -266,7 +270,10 @@ class INodeManager {
     return withF(
       [this.inoAllocation(navigated), this.db.transaction()],
       async ([ino, tran]) => {
-        await tran.lock(ino.toString(), ...(params as Array<INodeIndex>).map(i => i.toString()));
+        await tran.lock(
+          ino.toString(),
+          ...(params as Array<INodeIndex>).map((i) => i.toString()),
+        );
         return f(ino, tran);
       },
     );
@@ -302,7 +309,10 @@ class INodeManager {
     return withG(
       [this.inoAllocation(navigated), this.db.transaction()],
       async function* ([ino, tran]) {
-        await tran.lock(ino.toString(), ...(params as Array<INodeIndex>).map(i => i.toString()));
+        await tran.lock(
+          ino.toString(),
+          ...(params as Array<INodeIndex>).map((i) => i.toString()),
+        );
         return yield* g(ino, tran);
       },
     );

tests/EncryptedFS.concurrent.test.ts

@@ -4037,11 +4037,8 @@ describe(`${EncryptedFS.name} Concurrency`, () => {
         results.every((result) => {
           return (
             result.status === 'fulfilled' &&
-            (
-              (Array.isArray(result.value) && result.value.length === 0)
-              ||
-              result.value === undefined
-            )
+            ((Array.isArray(result.value) && result.value.length === 0) ||
+              result.value === undefined)
           );
         })
       ) {