hof 19.13.4-betav2 → 19.13.4-betav5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/model/index.js +55 -1
- package/package.json +1 -1
package/model/index.js
CHANGED
|
@@ -16,6 +16,58 @@ function timeDiff(from, to, d) {
|
|
|
16
16
|
return +ms.toFixed(digits);
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
+
/*
|
|
20
|
+
async function fetchRequest(settings, callback) {
|
|
21
|
+
//Fetch doesn't like undefined headers
|
|
22
|
+
settings.headers = settings.headers || [];
|
|
23
|
+
var response = await fetch(settings.uri, settings);
|
|
24
|
+
var responseText = await response.text();
|
|
25
|
+
var responseObj = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
|
|
26
|
+
if(response.ok) {
|
|
27
|
+
callback(null,responseObj);
|
|
28
|
+
} else {
|
|
29
|
+
callback({ status: response.status, code: response.status, message: response.statusText },responseObj);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
*/
|
|
33
|
+
|
|
34
|
+
/*
|
|
35
|
+
function fetchRequest(settings, callback) {
|
|
36
|
+
//Fetch doesn't like undefined headers
|
|
37
|
+
settings.headers = settings.headers || [];
|
|
38
|
+
settings.uri = settings.uri || settings.url || url.format(settings);
|
|
39
|
+
fetch(settings.uri, settings).then(async function(response) {
|
|
40
|
+
var responseText = await response.text();
|
|
41
|
+
var responseObj = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
|
|
42
|
+
if(response.ok) {
|
|
43
|
+
callback(null,responseObj);
|
|
44
|
+
} else {
|
|
45
|
+
callback({ status: response.status, code: response.status, message: response.statusText },responseObj);
|
|
46
|
+
//callback({ status: response.status, code: response.status, message: response.statusText },responseObj);
|
|
47
|
+
}
|
|
48
|
+
//return { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
|
|
49
|
+
})
|
|
50
|
+
*/
|
|
51
|
+
|
|
52
|
+
function fetchRequest(settings, callback) {
|
|
53
|
+
//Fetch doesn't like undefined headers
|
|
54
|
+
settings.headers = settings.headers || [];
|
|
55
|
+
settings.uri = settings.uri || settings.url || url.format(settings);
|
|
56
|
+
let response;
|
|
57
|
+
fetch(settings.uri, settings).then((gottenResponse) => {
|
|
58
|
+
response = gottenResponse;
|
|
59
|
+
})
|
|
60
|
+
.then(() => response.text())
|
|
61
|
+
.then((responseText) => {
|
|
62
|
+
var result = { status: response.status, statusCode: response.status, statusText: response.statusText, body: responseText };
|
|
63
|
+
if(response.ok) {
|
|
64
|
+
callback(null,result);
|
|
65
|
+
} else {
|
|
66
|
+
callback({ status: response.status, code: response.status, message: response.statusText }, result);
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
|
|
19
71
|
const urlKeys = Object.keys(url.parse(''));
|
|
20
72
|
|
|
21
73
|
module.exports = class Model extends EventEmitter {
|
|
@@ -26,6 +78,7 @@ module.exports = class Model extends EventEmitter {
|
|
|
26
78
|
this.set(attributes, {
|
|
27
79
|
silent: true
|
|
28
80
|
});
|
|
81
|
+
this._request = fetchRequest;
|
|
29
82
|
}
|
|
30
83
|
|
|
31
84
|
save(options, callback) {
|
|
@@ -85,7 +138,7 @@ module.exports = class Model extends EventEmitter {
|
|
|
85
138
|
}
|
|
86
139
|
|
|
87
140
|
request(originalSettings, body, callback) {
|
|
88
|
-
|
|
141
|
+
/*
|
|
89
142
|
async function fetchRequest(settings, callback) {
|
|
90
143
|
//Fetch doesn't like undefined headers
|
|
91
144
|
settings.headers = settings.headers || [];
|
|
@@ -98,6 +151,7 @@ module.exports = class Model extends EventEmitter {
|
|
|
98
151
|
callback({ status: response.status, code: response.status, message: response.statusText },responseObj);
|
|
99
152
|
}
|
|
100
153
|
}
|
|
154
|
+
*/
|
|
101
155
|
|
|
102
156
|
if (typeof body === 'function' && arguments.length === 2) {
|
|
103
157
|
callback = body;
|