Skip to content

Commit 1d956b7

Browse files
yumiurachearon
yumiura
authored andcommitted
use fetch api
1 parent 80e94ea commit 1d956b7

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
88
(Unreleased)
99
==================
1010
### Changed
11+
* Replaced `simple-get ` with ` Node.js builtin` `fetch` (#2309)
1112
### Added
1213
### Fixed
1314

lib/image.js

+12-15
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ const bindings = require('./bindings')
1414
const Image = module.exports = bindings.Image
1515
const util = require('util')
1616

17-
// Lazily loaded simple-get
18-
let get
19-
2017
const { GetSource, SetSource } = bindings
2118

2219
Object.defineProperty(Image.prototype, 'src', {
@@ -47,20 +44,20 @@ Object.defineProperty(Image.prototype, 'src', {
4744
}
4845
}
4946

50-
if (!get) get = require('simple-get')
51-
52-
get.concat({
53-
url: val,
47+
fetch(val, {
48+
method: 'GET',
5449
headers: { 'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36' }
55-
}, (err, res, data) => {
56-
if (err) return onerror(err)
57-
58-
if (res.statusCode < 200 || res.statusCode >= 300) {
59-
return onerror(new Error(`Server responded with ${res.statusCode}`))
60-
}
61-
62-
setSource(this, data)
6350
})
51+
.then(res => {
52+
if (!res.ok) {
53+
throw new Error(`Server responded with ${res.statusCode}`)
54+
}
55+
return res.arrayBuffer()
56+
})
57+
.then(data => {
58+
setSource(this, Buffer.from(data))
59+
})
60+
.catch(onerror)
6461
} else { // local file path assumed
6562
setSource(this, val)
6663
}

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646
],
4747
"dependencies": {
4848
"node-addon-api": "^7.0.0",
49-
"prebuild-install": "^7.1.1",
50-
"simple-get": "^3.0.3"
49+
"prebuild-install": "^7.1.1"
5150
},
5251
"devDependencies": {
5352
"@types/node": "^10.12.18",

0 commit comments

Comments
 (0)