feat: add error empty fns (#2)

Author: kurten

.eslintrc.json

@@ -2,6 +2,6 @@
   "extends": "./node_modules/mwts/",
   "ignorePatterns": ["node_modules", "dist", "fixtures"],
   "env": {
-    "mocha": true
+    "jest": true
   }
 }

.github/workflows/nodejs.yml

@@ -0,0 +1,46 @@
+name: Node.js CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 14.x, 16.x]
+
+    steps:
+    - name: Git checkout
+      uses: actions/checkout@v2
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v2
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - run: npm install && npm install codecov
+    - run: npm run build --if-present
+    - run: npm run lint
+    - run: npm run cov
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v2
+
+
+  # build-windows:
+  #   runs-on: windows-latest
+
+  #   strategy:
+  #     matrix:
+  #       node-version: [12.x, 14.x]
+
+  #   steps:
+  #   - uses: actions/checkout@v2
+  #   - name: Use Node.js ${{ matrix.node-version }}
+  #     uses: actions/setup-node@v1
+  #     with:
+  #       node-version: ${{ matrix.node-version }}
+  #   - run: npm install
+  #   - run: npm run build --if-present
+  #   - run: npm run cov

jest.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testPathIgnorePatterns: ['<rootDir>/test/fixtures'],
+  coveragePathIgnorePatterns: ['<rootDir>/test/'],
+  setupFilesAfterEnv: ['./jest.setup.js'],
+};

jest.setup.js

@@ -0,0 +1,2 @@
+process.env.MIDWAY_TS_MODE = 'true';
+jest.setTimeout(120000);

package.json

@@ -4,21 +4,25 @@
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "files": [
-    "dist"
+    "dist/**/*.js",
+    "dist/**/*.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/cli": "^1.0.0",
+    "@types/jest": "^27.4.1",
+    "@types/node": "^16.11.26",
+    "ts-node": "^10.5.0",
     "mwts": "^1.0.5",
-    "typescript": "^3.9.0"
+    "typescript": "^4.0.0",
+    "jest": "^27.5.1",
+    "ts-jest": "^27.1.3"
   },
   "engines": {
     "node": ">= 10"
   },
   "scripts": {
-    "build": "midway-bin build -c && rm -rf ./dist/.mwcc-cache",
-    "test": "midway-bin test --ts --full-trace",
-    "cov": "midway-bin cov --ts",
-    "clean": "midway-bin clean",
+    "build": "rm -rf dist && tsc",
+    "test": "node --require=ts-node/register ./node_modules/.bin/jest",
+    "cov": "node --require=ts-node/register ./node_modules/.bin/jest --coverage --forceExit",
     "lint": "mwts check",
     "lint:fix": "mwts fix"
   },

src/index.ts

@@ -64,6 +64,10 @@ export default class SimpleLock {
             }
           })
           .catch(err => {
+            if (this.q.get(localKey).fns.length > 0) {
+              this.q.get(localKey).fns = [];
+            }
+
             deferredReject(err);
           });
 
@@ -113,6 +117,10 @@ export default class SimpleLock {
           this.q.get(key).resolved = true;
         })
         .catch(err => {
+          if (this.q.get(key).fns.length > 0) {
+            this.q.get(key).fns = [];
+          }
+
           deferredReject(err);
 
           this.q.get(key).resolved = true;

test/index.test.ts

@@ -30,6 +30,29 @@ describe('simple lock', () => {
     assert(i === 1);
   });
 
+  it('sureOnce throw error should be ok', async () => {
+    const lock = new SimpleLock();
+
+    let ee;
+    try {
+      await lock.sureOnce(async () => {
+        (lock as any).q
+          .get('_default_simple_lock_queue')
+          .fns.push(() => console.log('test'));
+
+        throw new Error('11');
+      });
+    } catch (e) {
+      ee = e.message;
+    }
+
+    assert.deepEqual(ee, '11');
+    assert.deepEqual(
+      (lock as any).q.get('_default_simple_lock_queue').fns.length,
+      0
+    );
+  });
+
   it('acquire should be ok', async () => {
     const lock = new SimpleLock();
     let i = 0;
@@ -55,4 +78,22 @@ describe('simple lock', () => {
     assert(3 === i);
     assert.deepEqual([11, 2, 3], data);
   });
+
+  it('acquire throw error should be ok', async () => {
+    const lock = new SimpleLock();
+
+    let ee;
+    try {
+      await lock.acquire('hello', async () => {
+        (lock as any).q.get('hello').fns.push(() => console.log('test'));
+
+        throw new Error('11');
+      });
+    } catch (e) {
+      ee = e.message;
+    }
+
+    assert.deepEqual(ee, '11');
+    assert.deepEqual((lock as any).q.get('hello').fns.length, 0);
+  });
 });

tsconfig.json

@@ -14,6 +14,7 @@
     // TODO: Emit test files to outDir
     "noEmitOnError": false,
     "skipLibCheck": true,
+    "outDir": "dist"
   },
   "exclude": [
     "dist",