fix(argon2,bcrypt,crc32,deno-lint,jieba,xxhash): update js binding

napi-rs · Jan 10, 2022 · 4ac6d2b · 4ac6d2b
1 parent b172d19
commit 4ac6d2b
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 28 deletions.
diff --git a/packages/argon2/index.d.ts b/packages/argon2/index.d.ts
@@ -32,7 +32,7 @@ export const enum Version {
   V0x10 = 0,
   /**
    * Default value
-   * Version 19 (0x13 in hex, default)
+   * Version 19 (0x13 in hex)
    */
   V0x13 = 1,
 }

diff --git a/packages/argon2/index.js b/packages/argon2/index.js
@@ -5,9 +5,22 @@ const { platform, arch } = process
 
 let nativeBinding = null
 let localFileExisted = false
-let isMusl = false
 let loadError = null
 
+function isMusl() {
+  // For Node 10
+  if (!process.report || typeof process.report.getReport !== 'function') {
+    try {
+      return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
+    } catch (e) {
+      return false
+    }
+  } else {
+    const { glibcVersionRuntime } = process.report.getReport().header
+    return !glibcVersionRuntime
+  }
+}
+
 switch (platform) {
   case 'android':
     if (arch !== 'arm64') {
@@ -114,8 +127,7 @@ switch (platform) {
   case 'linux':
     switch (arch) {
       case 'x64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(join(__dirname, 'argon2.linux-x64-musl.node'))
           try {
             if (localFileExisted) {
@@ -140,8 +152,7 @@ switch (platform) {
         }
         break
       case 'arm64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(join(__dirname, 'argon2.linux-arm64-musl.node'))
           try {
             if (localFileExisted) {

diff --git a/packages/bcrypt/index.js b/packages/bcrypt/index.js
@@ -5,9 +5,22 @@ const { platform, arch } = process
 
 let nativeBinding = null
 let localFileExisted = false
-let isMusl = false
 let loadError = null
 
+function isMusl() {
+  // For Node 10
+  if (!process.report || typeof process.report.getReport !== 'function') {
+    try {
+      return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
+    } catch (e) {
+      return false
+    }
+  } else {
+    const { glibcVersionRuntime } = process.report.getReport().header
+    return !glibcVersionRuntime
+  }
+}
+
 switch (platform) {
   case 'android':
     if (arch !== 'arm64') {
@@ -114,8 +127,7 @@ switch (platform) {
   case 'linux':
     switch (arch) {
       case 'x64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(join(__dirname, 'bcrypt.linux-x64-musl.node'))
           try {
             if (localFileExisted) {
@@ -140,8 +152,7 @@ switch (platform) {
         }
         break
       case 'arm64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(join(__dirname, 'bcrypt.linux-arm64-musl.node'))
           try {
             if (localFileExisted) {

diff --git a/packages/deno-lint/Cargo.toml b/packages/deno-lint/Cargo.toml
@@ -10,8 +10,8 @@ crate-type = ["cdylib"]
 [dependencies]
 annotate-snippets = {version = "0.9", features = ["color"]}
 anyhow = "1"
-deno_ast = "0.7.0"
-deno_lint = "0.20.1"
+deno_ast = "=0.8.0"
+deno_lint = "=0.21.0"
 env_logger = "0.9"
 global_alloc = {path = "../../crates/alloc"}
 globwalk = "0.8"

diff --git a/packages/deno-lint/index.js b/packages/deno-lint/index.js
@@ -5,9 +5,22 @@ const { platform, arch } = process
 
 let nativeBinding = null
 let localFileExisted = false
-let isMusl = false
 let loadError = null
 
+function isMusl() {
+  // For Node 10
+  if (!process.report || typeof process.report.getReport !== 'function') {
+    try {
+      return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
+    } catch (e) {
+      return false
+    }
+  } else {
+    const { glibcVersionRuntime } = process.report.getReport().header
+    return !glibcVersionRuntime
+  }
+}
+
 switch (platform) {
   case 'android':
     if (arch !== 'arm64') {
@@ -114,8 +127,7 @@ switch (platform) {
   case 'linux':
     switch (arch) {
       case 'x64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(join(__dirname, 'deno-lint.linux-x64-musl.node'))
           try {
             if (localFileExisted) {
@@ -140,8 +152,7 @@ switch (platform) {
         }
         break
       case 'arm64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(join(__dirname, 'deno-lint.linux-arm64-musl.node'))
           try {
             if (localFileExisted) {

diff --git a/packages/jieba/index.js b/packages/jieba/index.js
@@ -5,9 +5,22 @@ const { platform, arch } = process
 
 let nativeBinding = null
 let localFileExisted = false
-let isMusl = false
 let loadError = null
 
+function isMusl() {
+  // For Node 10
+  if (!process.report || typeof process.report.getReport !== 'function') {
+    try {
+      return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
+    } catch (e) {
+      return false
+    }
+  } else {
+    const { glibcVersionRuntime } = process.report.getReport().header
+    return !glibcVersionRuntime
+  }
+}
+
 switch (platform) {
   case 'android':
     if (arch !== 'arm64') {
@@ -114,8 +127,7 @@ switch (platform) {
   case 'linux':
     switch (arch) {
       case 'x64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(join(__dirname, 'jieba.linux-x64-musl.node'))
           try {
             if (localFileExisted) {
@@ -140,8 +152,7 @@ switch (platform) {
         }
         break
       case 'arm64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(join(__dirname, 'jieba.linux-arm64-musl.node'))
           try {
             if (localFileExisted) {

diff --git a/packages/xxhash/index.js b/packages/xxhash/index.js
@@ -5,9 +5,22 @@ const { platform, arch } = process
 
 let nativeBinding = null
 let localFileExisted = false
-let isMusl = false
 let loadError = null
 
+function isMusl() {
+  // For Node 10
+  if (!process.report || typeof process.report.getReport !== 'function') {
+    try {
+      return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
+    } catch (e) {
+      return false
+    }
+  } else {
+    const { glibcVersionRuntime } = process.report.getReport().header
+    return !glibcVersionRuntime
+  }
+}
+
 switch (platform) {
   case 'android':
     if (arch !== 'arm64') {
@@ -114,8 +127,7 @@ switch (platform) {
   case 'linux':
     switch (arch) {
       case 'x64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(join(__dirname, 'xxhash.linux-x64-musl.node'))
           try {
             if (localFileExisted) {
@@ -140,8 +152,7 @@ switch (platform) {
         }
         break
       case 'arm64':
-        isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
-        if (isMusl) {
+        if (isMusl()) {
           localFileExisted = existsSync(join(__dirname, 'xxhash.linux-arm64-musl.node'))
           try {
             if (localFileExisted) {