From e7b7348102f7a0a182a58ec8e389387cdb6e9f81 Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Thu, 23 May 2024 19:52:19 +0800
Subject: [PATCH] fix detecting node-addon packages (#908)

---
 .github/scripts/node-addon/run.sh   |  2 +-
 .github/workflows/npm-addon.yaml    |  2 +-
 nodejs-addon-examples/package.json  |  2 +-
 scripts/node-addon-api/lib/addon.js | 14 ++++++++------
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/scripts/node-addon/run.sh b/.github/scripts/node-addon/run.sh
index 1bed3699..5fd9a9b9 100755
--- a/.github/scripts/node-addon/run.sh
+++ b/.github/scripts/node-addon/run.sh
@@ -18,7 +18,7 @@ fi
 SHERPA_ONNX_VERSION=$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt  | cut -d " " -f 2  | cut -d '"' -f 2)
 echo "SHERPA_ONNX_VERSION $SHERPA_ONNX_VERSION"
 
-# SHERPA_ONNX_VERSION=1.0.24
+# SHERPA_ONNX_VERSION=1.0.25
 
 if [ -z $owner ]; then
   owner=k2-fsa
diff --git a/.github/workflows/npm-addon.yaml b/.github/workflows/npm-addon.yaml
index 34d30278..2b4af162 100644
--- a/.github/workflows/npm-addon.yaml
+++ b/.github/workflows/npm-addon.yaml
@@ -55,7 +55,7 @@ jobs:
 
           SHERPA_ONNX_VERSION=$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt  | cut -d " " -f 2  | cut -d '"' -f 2)
           echo "SHERPA_ONNX_VERSION $SHERPA_ONNX_VERSION"
-          # SHERPA_ONNX_VERSION=1.0.24
+          # SHERPA_ONNX_VERSION=1.0.25
 
           src_dir=.github/scripts/node-addon
           sed -i.bak s/SHERPA_ONNX_VERSION/$SHERPA_ONNX_VERSION/g $src_dir/package.json
diff --git a/nodejs-addon-examples/package.json b/nodejs-addon-examples/package.json
index 6fd702a7..005514c0 100644
--- a/nodejs-addon-examples/package.json
+++ b/nodejs-addon-examples/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "sherpa-onnx-node": "^1.0.24"
+    "sherpa-onnx-node": "^1.0.25"
   }
 }
diff --git a/scripts/node-addon-api/lib/addon.js b/scripts/node-addon-api/lib/addon.js
index c55e3e25..9ba19351 100644
--- a/scripts/node-addon-api/lib/addon.js
+++ b/scripts/node-addon-api/lib/addon.js
@@ -27,9 +27,10 @@ for (const p of possible_paths) {
 if (!found) {
   let msg = `Could not find sherpa-onnx-node. Tried\n\n  ${
       possible_paths.join('\n  ')}\n`
-  if (os.platform() == 'darwin' && process.env.DYLD_LIBRARY_PATH &&
-      !process.env.DYLD_LIBRARY_PATH.includes(
-          `node_modules/sherpa-onnx-${platform_arch}`)) {
+  if (os.platform() == 'darwin' &&
+      (!process.env.DYLD_LIBRARY_PATH ||
+       !process.env.DYLD_LIBRARY_PATH.includes(
+           `node_modules/sherpa-onnx-${platform_arch}`))) {
     msg +=
         'Please remeber to set the following environment variable and try again:\n';
 
@@ -39,9 +40,10 @@ if (!found) {
     msg += ':$DYLD_LIBRARY_PATH\n';
   }
 
-  if (os.platform() == 'linux' && process.env.LD_LIBRARY_PATH &&
-      !process.env.LD_LIBRARY_PATH.includes(
-          `node_modules/sherpa-onnx-${platform_arch}`)) {
+  if (os.platform() == 'linux' &&
+      (!process.env.LD_LIBRARY_PATH ||
+       !process.env.LD_LIBRARY_PATH.includes(
+           `node_modules/sherpa-onnx-${platform_arch}`))) {
     msg +=
         'Please remeber to set the following environment variable and try again:\n';