test: fix async_progress_worker test (#209)

Author: toyobayashi

.github/actions/debugger/action.yml

@@ -1,9 +1,11 @@
 name: Debug action
 
-description: Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)
+description: Run the build with debugging enabled
 
 runs:
   using: composite
   steps:
-    - name: Debug
-      uses: mxschmitt/action-tmate@c0afd6f790e3a5564914980036ebf83216678101 # v3.23
+  - name: Setup upterm session
+    uses: owenthereal/action-upterm@v1
+    with:
+      limit-access-to-actor: true

.github/workflows/debug.yml

@@ -9,7 +9,7 @@ permissions:
 
 jobs:
   debug:
-    name: Debug with tmate
+    name: Debug with upterm
     runs-on: ubuntu-latest
 
     steps:
@@ -19,8 +19,6 @@ jobs:
         target: 'debug'
         needs-emscripten: 'true'
         needs-wasi-sdk: 'true'
-    - name: NPM Build
-      run: npm run build --workspaces --if-present
-    - name: Setup tmate session
+    - name: Setup debug session
       uses: ./.github/actions/debugger
       if: ${{ github.event_name == 'workflow_dispatch' }}

packages/test/node-addon-api/async_progress_worker.cc

@@ -34,15 +34,20 @@ class TestWorker : public AsyncProgressWorker<ProgressData> {
       SetError("test error");
     }
     ProgressData data{0};
-    std::unique_lock<std::mutex> lock(_cvm);
+
     for (int32_t idx = 0; idx < _times; idx++) {
       data.progress = idx;
       progress.Send(&data, 1);
-      _cv.wait(lock);
+
+      {
+        std::unique_lock<std::mutex> lk(_cvm);
+        _cv.wait(lk, [this] { return dataSent; });
+        dataSent = false;
+      }
     }
   }
 
-  void OnProgress(const ProgressData* data, size_t /* count */) override {
+  void OnProgress(const ProgressData* data, size_t count) override {
     Napi::Env env = Env();
     if (!_progress.IsEmpty()) {
       Number progress = Number::New(env, data->progress);
@@ -52,7 +57,12 @@ class TestWorker : public AsyncProgressWorker<ProgressData> {
       _progress.MakeCallback(Receiver().Value(), {progress});
 #endif
     }
-    _cv.notify_one();
+
+    {
+      std::lock_guard<std::mutex> lk(_cvm);
+      dataSent = true;
+      _cv.notify_one();
+    }
   }
 
  private:
@@ -63,6 +73,8 @@ class TestWorker : public AsyncProgressWorker<ProgressData> {
       : AsyncProgressWorker(cb, resource_name, resource) {
     _progress.Reset(progress, 1);
   }
+
+  bool dataSent = false;
   std::condition_variable _cv;
   std::mutex _cvm;
   int32_t _times;

packages/test/script/test.js

@@ -13,7 +13,6 @@ let ignore = [
   'rust/**/*',
   'tsfn2/tsfn2_st.test.js',
   'async/async_st.test.js',
-  'node-addon-api/async_progress_worker.test.js', // flaky test, needs investigation
 ]
 
 const pthread = [

packages/test/util.js

@@ -42,10 +42,11 @@ function loadPath (request, options) {
     }
 
     if (process.env.EMNAPI_TEST_WASI) {
-      const { WASI } = require('./wasi')
+      const { WASI } = require('node:wasi')
       const { createNapiModule, loadNapiModule } = require('@emnapi/core')
       const v8 = require('@emnapi/core/plugins/v8').default
       const wasi = new WASI({
+        version: 'preview1',
         fs
       })
       const napiModule = createNapiModule({