Skip to content

Commit 4ac6d2b

Browse files
committed
fix(argon2,bcrypt,crc32,deno-lint,jieba,xxhash): update js binding
1 parent b172d19 commit 4ac6d2b

File tree

7 files changed

+83
-28
lines changed

7 files changed

+83
-28
lines changed

packages/argon2/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const enum Version {
3232
V0x10 = 0,
3333
/**
3434
* Default value
35-
* Version 19 (0x13 in hex, default)
35+
* Version 19 (0x13 in hex)
3636
*/
3737
V0x13 = 1,
3838
}

packages/argon2/index.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@ const { platform, arch } = process
55

66
let nativeBinding = null
77
let localFileExisted = false
8-
let isMusl = false
98
let loadError = null
109

10+
function isMusl() {
11+
// For Node 10
12+
if (!process.report || typeof process.report.getReport !== 'function') {
13+
try {
14+
return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
15+
} catch (e) {
16+
return false
17+
}
18+
} else {
19+
const { glibcVersionRuntime } = process.report.getReport().header
20+
return !glibcVersionRuntime
21+
}
22+
}
23+
1124
switch (platform) {
1225
case 'android':
1326
if (arch !== 'arm64') {
@@ -114,8 +127,7 @@ switch (platform) {
114127
case 'linux':
115128
switch (arch) {
116129
case 'x64':
117-
isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
118-
if (isMusl) {
130+
if (isMusl()) {
119131
localFileExisted = existsSync(join(__dirname, 'argon2.linux-x64-musl.node'))
120132
try {
121133
if (localFileExisted) {
@@ -140,8 +152,7 @@ switch (platform) {
140152
}
141153
break
142154
case 'arm64':
143-
isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
144-
if (isMusl) {
155+
if (isMusl()) {
145156
localFileExisted = existsSync(join(__dirname, 'argon2.linux-arm64-musl.node'))
146157
try {
147158
if (localFileExisted) {

packages/bcrypt/index.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@ const { platform, arch } = process
55

66
let nativeBinding = null
77
let localFileExisted = false
8-
let isMusl = false
98
let loadError = null
109

10+
function isMusl() {
11+
// For Node 10
12+
if (!process.report || typeof process.report.getReport !== 'function') {
13+
try {
14+
return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
15+
} catch (e) {
16+
return false
17+
}
18+
} else {
19+
const { glibcVersionRuntime } = process.report.getReport().header
20+
return !glibcVersionRuntime
21+
}
22+
}
23+
1124
switch (platform) {
1225
case 'android':
1326
if (arch !== 'arm64') {
@@ -114,8 +127,7 @@ switch (platform) {
114127
case 'linux':
115128
switch (arch) {
116129
case 'x64':
117-
isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
118-
if (isMusl) {
130+
if (isMusl()) {
119131
localFileExisted = existsSync(join(__dirname, 'bcrypt.linux-x64-musl.node'))
120132
try {
121133
if (localFileExisted) {
@@ -140,8 +152,7 @@ switch (platform) {
140152
}
141153
break
142154
case 'arm64':
143-
isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
144-
if (isMusl) {
155+
if (isMusl()) {
145156
localFileExisted = existsSync(join(__dirname, 'bcrypt.linux-arm64-musl.node'))
146157
try {
147158
if (localFileExisted) {

packages/deno-lint/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ crate-type = ["cdylib"]
1010
[dependencies]
1111
annotate-snippets = {version = "0.9", features = ["color"]}
1212
anyhow = "1"
13-
deno_ast = "0.7.0"
14-
deno_lint = "0.20.1"
13+
deno_ast = "=0.8.0"
14+
deno_lint = "=0.21.0"
1515
env_logger = "0.9"
1616
global_alloc = {path = "../../crates/alloc"}
1717
globwalk = "0.8"

packages/deno-lint/index.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@ const { platform, arch } = process
55

66
let nativeBinding = null
77
let localFileExisted = false
8-
let isMusl = false
98
let loadError = null
109

10+
function isMusl() {
11+
// For Node 10
12+
if (!process.report || typeof process.report.getReport !== 'function') {
13+
try {
14+
return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
15+
} catch (e) {
16+
return false
17+
}
18+
} else {
19+
const { glibcVersionRuntime } = process.report.getReport().header
20+
return !glibcVersionRuntime
21+
}
22+
}
23+
1124
switch (platform) {
1225
case 'android':
1326
if (arch !== 'arm64') {
@@ -114,8 +127,7 @@ switch (platform) {
114127
case 'linux':
115128
switch (arch) {
116129
case 'x64':
117-
isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
118-
if (isMusl) {
130+
if (isMusl()) {
119131
localFileExisted = existsSync(join(__dirname, 'deno-lint.linux-x64-musl.node'))
120132
try {
121133
if (localFileExisted) {
@@ -140,8 +152,7 @@ switch (platform) {
140152
}
141153
break
142154
case 'arm64':
143-
isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
144-
if (isMusl) {
155+
if (isMusl()) {
145156
localFileExisted = existsSync(join(__dirname, 'deno-lint.linux-arm64-musl.node'))
146157
try {
147158
if (localFileExisted) {

packages/jieba/index.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@ const { platform, arch } = process
55

66
let nativeBinding = null
77
let localFileExisted = false
8-
let isMusl = false
98
let loadError = null
109

10+
function isMusl() {
11+
// For Node 10
12+
if (!process.report || typeof process.report.getReport !== 'function') {
13+
try {
14+
return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
15+
} catch (e) {
16+
return false
17+
}
18+
} else {
19+
const { glibcVersionRuntime } = process.report.getReport().header
20+
return !glibcVersionRuntime
21+
}
22+
}
23+
1124
switch (platform) {
1225
case 'android':
1326
if (arch !== 'arm64') {
@@ -114,8 +127,7 @@ switch (platform) {
114127
case 'linux':
115128
switch (arch) {
116129
case 'x64':
117-
isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
118-
if (isMusl) {
130+
if (isMusl()) {
119131
localFileExisted = existsSync(join(__dirname, 'jieba.linux-x64-musl.node'))
120132
try {
121133
if (localFileExisted) {
@@ -140,8 +152,7 @@ switch (platform) {
140152
}
141153
break
142154
case 'arm64':
143-
isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
144-
if (isMusl) {
155+
if (isMusl()) {
145156
localFileExisted = existsSync(join(__dirname, 'jieba.linux-arm64-musl.node'))
146157
try {
147158
if (localFileExisted) {

packages/xxhash/index.js

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,22 @@ const { platform, arch } = process
55

66
let nativeBinding = null
77
let localFileExisted = false
8-
let isMusl = false
98
let loadError = null
109

10+
function isMusl() {
11+
// For Node 10
12+
if (!process.report || typeof process.report.getReport !== 'function') {
13+
try {
14+
return readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
15+
} catch (e) {
16+
return false
17+
}
18+
} else {
19+
const { glibcVersionRuntime } = process.report.getReport().header
20+
return !glibcVersionRuntime
21+
}
22+
}
23+
1124
switch (platform) {
1225
case 'android':
1326
if (arch !== 'arm64') {
@@ -114,8 +127,7 @@ switch (platform) {
114127
case 'linux':
115128
switch (arch) {
116129
case 'x64':
117-
isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
118-
if (isMusl) {
130+
if (isMusl()) {
119131
localFileExisted = existsSync(join(__dirname, 'xxhash.linux-x64-musl.node'))
120132
try {
121133
if (localFileExisted) {
@@ -140,8 +152,7 @@ switch (platform) {
140152
}
141153
break
142154
case 'arm64':
143-
isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl')
144-
if (isMusl) {
155+
if (isMusl()) {
145156
localFileExisted = existsSync(join(__dirname, 'xxhash.linux-arm64-musl.node'))
146157
try {
147158
if (localFileExisted) {

0 commit comments

Comments
 (0)