Skip to content
This repository was archived by the owner on Mar 16, 2019. It is now read-only.

Commit 3788204

Browse files
committed
Fix fs API error message
1 parent 20c0ccb commit 3788204

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

src/fs.js

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ function createFile(path:string, data:string, encoding: 'base64' | 'ascii' | 'ut
6161
return new Promise((resolve, reject) => {
6262
let handler = (err) => {
6363
if(err)
64-
reject(err)
64+
reject(new Error(err))
6565
else
66-
resolve()
66+
resolve()
6767
}
6868
if(encoding.toLowerCase() === 'ascii') {
6969
if(Array.isArray(data))
7070
RNFetchBlob.createFileASCII(path, data, handler)
7171
else
72-
reject('`data` of ASCII file must be an array contains numbers')
72+
reject(new Error('`data` of ASCII file must be an array contains numbers'))
7373
}
7474
else {
7575
RNFetchBlob.createFile(path, data, encoding, handler)
@@ -96,7 +96,7 @@ function writeStream(
9696
return new Promise((resolve, reject) => {
9797
RNFetchBlob.writeStream(path, encoding || 'base64', append || false, (err, streamId:string) => {
9898
if(err)
99-
reject(err)
99+
reject(new Error(err))
100100
else
101101
resolve(new RNFetchBlobWriteStream(streamId, encoding))
102102
})
@@ -129,7 +129,7 @@ function mkdir(path:string):Promise {
129129
return new Promise((resolve, reject) => {
130130
RNFetchBlob.mkdir(path, (err, res) => {
131131
if(err)
132-
reject(err)
132+
reject(new Error(err))
133133
else
134134
resolve()
135135
})
@@ -145,7 +145,7 @@ function mkdir(path:string):Promise {
145145
*/
146146
function readFile(path:string, encoding:string, bufferSize:?number):Promise<any> {
147147
if(typeof path !== 'string')
148-
return Promise.reject('Invalid argument "path" ')
148+
return Promise.reject(new Error('Invalid argument "path" '))
149149
return RNFetchBlob.readFile(path, encoding)
150150
}
151151

@@ -162,12 +162,12 @@ function writeFile(path:string, data:string | Array<number>, encoding:?string):P
162162
return Promise.reject('Invalid argument "path" ')
163163
if(encoding.toLocaleLowerCase() === 'ascii') {
164164
if(!Array.isArray(data))
165-
Promise.reject(`Expected "data" is an Array when encoding is "ascii", however got ${typeof data}`)
165+
Promise.reject(new Error(`Expected "data" is an Array when encoding is "ascii", however got ${typeof data}`))
166166
else
167167
return RNFetchBlob.writeFileArray(path, data, false);
168168
} else {
169169
if(typeof data !== 'string')
170-
Promise.reject(`Expected "data" is a String when encoding is "utf8" or "base64", however got ${typeof data}`)
170+
Promise.reject(new Error(`Expected "data" is a String when encoding is "utf8" or "base64", however got ${typeof data}`))
171171
else
172172
return RNFetchBlob.writeFile(path, encoding, data, false);
173173
}
@@ -179,12 +179,12 @@ function appendFile(path:string, data:string | Array<number>, encoding:?string):
179179
return Promise.reject('Invalid argument "path" ')
180180
if(encoding.toLocaleLowerCase() === 'ascii') {
181181
if(!Array.isArray(data))
182-
Promise.reject(`Expected "data" is an Array when encoding is "ascii", however got ${typeof data}`)
182+
Promise.reject(new Error(`Expected "data" is an Array when encoding is "ascii", however got ${typeof data}`))
183183
else
184184
return RNFetchBlob.writeFileArray(path, data, true);
185185
} else {
186186
if(typeof data !== 'string')
187-
Promise.reject(`Expected "data" is a String when encoding is "utf8" or "base64", however got ${typeof data}`)
187+
Promise.reject(new Error(`Expected "data" is a String when encoding is "utf8" or "base64", however got ${typeof data}`))
188188
else
189189
return RNFetchBlob.writeFile(path, encoding, data, true);
190190
}
@@ -199,7 +199,7 @@ function stat(path:string):Promise<RNFetchBlobFile> {
199199
return new Promise((resolve, reject) => {
200200
RNFetchBlob.stat(path, (err, stat) => {
201201
if(err)
202-
reject(err)
202+
reject(new Error(err))
203203
else
204204
resolve(stat)
205205
})
@@ -215,7 +215,7 @@ function scanFile(pairs:any):Promise {
215215
return new Promise((resolve, reject) => {
216216
RNFetchBlob.scanFile(pairs, (err) => {
217217
if(err)
218-
reject(err)
218+
reject(new Error(err))
219219
else
220220
resolve()
221221
})
@@ -226,7 +226,7 @@ function cp(path:string, dest:string):Promise<boolean> {
226226
return new Promise((resolve, reject) => {
227227
RNFetchBlob.cp(path, dest, (err, res) => {
228228
if(err)
229-
reject(err)
229+
reject(new Error(err))
230230
else
231231
resolve(res)
232232
})
@@ -237,7 +237,7 @@ function mv(path:string, dest:string):Promise<boolean> {
237237
return new Promise((resolve, reject) => {
238238
RNFetchBlob.mv(path, dest, (err, res) => {
239239
if(err)
240-
reject(err)
240+
reject(new Error(err))
241241
else
242242
resolve(res)
243243
})
@@ -248,7 +248,7 @@ function lstat(path:string):Promise<Array<RNFetchBlobFile>> {
248248
return new Promise((resolve, reject) => {
249249
RNFetchBlob.lstat(path, (err, stat) => {
250250
if(err)
251-
reject(err)
251+
reject(new Error(err))
252252
else
253253
resolve(stat)
254254
})
@@ -259,7 +259,7 @@ function ls(path:string):Promise<Array<String>> {
259259
return new Promise((resolve, reject) => {
260260
RNFetchBlob.ls(path, (err, res) => {
261261
if(err)
262-
reject(err)
262+
reject(new Error(err))
263263
else
264264
resolve(res)
265265
})
@@ -274,8 +274,9 @@ function ls(path:string):Promise<Array<String>> {
274274
function unlink(path:string):Promise {
275275
return new Promise((resolve, reject) => {
276276
RNFetchBlob.unlink(path, (err) => {
277-
if(err)
278-
reject(err)
277+
if(err) {
278+
reject(new Error(err))
279+
}
279280
else
280281
resolve()
281282
})
@@ -295,7 +296,7 @@ function exists(path:string):Promise<bool, bool> {
295296
resolve(exist)
296297
})
297298
} catch(err) {
298-
reject(err)
299+
reject(new Error(err))
299300
}
300301
})
301302

@@ -331,7 +332,7 @@ function isDir(path:string):Promise<bool, bool> {
331332
resolve(isDir)
332333
})
333334
} catch(err) {
334-
reject(err)
335+
reject(new Error(err))
335336
}
336337
})
337338

0 commit comments

Comments
 (0)