corexxx 1.0.148 → 1.0.151
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/dist/dnetwork.js +58 -9
- package/dist/dnetwork.js.map +1 -1
- package/package.json +1 -1
- package/publish.sh +1 -1
- package/src/dnetwork.ts +64 -9
package/dist/dnetwork.js
CHANGED
|
@@ -27,6 +27,7 @@ exports.dnetwork = exports.NetworkError = void 0;
|
|
|
27
27
|
const axios_1 = __importDefault(require("axios"));
|
|
28
28
|
const dassert_1 = require("./dassert");
|
|
29
29
|
const dlog_1 = require("./dlog");
|
|
30
|
+
let count = 0;
|
|
30
31
|
// Custom error class for network-related errors
|
|
31
32
|
class NetworkError extends dassert_1.DError {
|
|
32
33
|
constructor(message, code = "NETWORK_ERROR", data, statusCode) {
|
|
@@ -91,12 +92,13 @@ var dnetwork;
|
|
|
91
92
|
function get(url, config) {
|
|
92
93
|
return __awaiter(this, void 0, void 0, function* () {
|
|
93
94
|
try {
|
|
94
|
-
dlog_1.dlog.d(`GET ${url}`);
|
|
95
95
|
const result = yield axios_1.default.get(url, config);
|
|
96
|
+
LogNetwork(url, null, result, null);
|
|
96
97
|
dassert_1.dassert.verifyOrThrow(result.status >= 200 && result.status < 300, `GET request to URL ${url} failed with status ${result.status}`, "HTTP_STATUS_ERROR");
|
|
97
98
|
return result.data;
|
|
98
99
|
}
|
|
99
100
|
catch (error) {
|
|
101
|
+
LogNetwork(url, null, null, error);
|
|
100
102
|
if (axios_1.default.isAxiosError(error)) {
|
|
101
103
|
handleAxiosError(error, url);
|
|
102
104
|
}
|
|
@@ -112,6 +114,7 @@ var dnetwork;
|
|
|
112
114
|
return __awaiter(this, void 0, void 0, function* () {
|
|
113
115
|
try {
|
|
114
116
|
const res = yield get(url, config);
|
|
117
|
+
LogNetwork(url, null, res, null);
|
|
115
118
|
if (typeof res === "object" && res !== null) {
|
|
116
119
|
return res;
|
|
117
120
|
}
|
|
@@ -123,6 +126,7 @@ var dnetwork;
|
|
|
123
126
|
}
|
|
124
127
|
}
|
|
125
128
|
catch (error) {
|
|
129
|
+
LogNetwork(url, null, null, error);
|
|
126
130
|
if (axios_1.default.isAxiosError(error)) {
|
|
127
131
|
handleAxiosError(error, url);
|
|
128
132
|
}
|
|
@@ -137,12 +141,13 @@ var dnetwork;
|
|
|
137
141
|
function post(url, data, config) {
|
|
138
142
|
return __awaiter(this, void 0, void 0, function* () {
|
|
139
143
|
try {
|
|
140
|
-
dlog_1.dlog.d(`POST ${url}`, data);
|
|
141
144
|
const result = yield axios_1.default.post(url, data, config);
|
|
145
|
+
LogNetwork(url, data, result, null);
|
|
142
146
|
dassert_1.dassert.verifyOrThrow(result.status >= 200 && result.status < 300, `POST request to URL ${url} failed with status ${result.status}`, "HTTP_STATUS_ERROR");
|
|
143
147
|
return result.data;
|
|
144
148
|
}
|
|
145
149
|
catch (error) {
|
|
150
|
+
LogNetwork(url, data, null, error);
|
|
146
151
|
if (axios_1.default.isAxiosError(error)) {
|
|
147
152
|
handleAxiosError(error, url);
|
|
148
153
|
}
|
|
@@ -159,16 +164,21 @@ var dnetwork;
|
|
|
159
164
|
try {
|
|
160
165
|
const res = yield post(url, data, config);
|
|
161
166
|
if (typeof res === "object" && res !== null) {
|
|
167
|
+
LogNetwork(url, data, res, null);
|
|
162
168
|
return res;
|
|
163
169
|
}
|
|
164
170
|
try {
|
|
165
|
-
|
|
171
|
+
let output = JSON.parse(res);
|
|
172
|
+
LogNetwork(url, data, output, null);
|
|
173
|
+
return output;
|
|
166
174
|
}
|
|
167
175
|
catch (_a) {
|
|
176
|
+
LogNetwork(url, data, res, "Response is not valid JSON");
|
|
168
177
|
throw new NetworkError("Response is not valid JSON", "JSON_PARSE_ERROR", res);
|
|
169
178
|
}
|
|
170
179
|
}
|
|
171
180
|
catch (error) {
|
|
181
|
+
LogNetwork(url, data, null, error);
|
|
172
182
|
if (axios_1.default.isAxiosError(error)) {
|
|
173
183
|
handleAxiosError(error, url);
|
|
174
184
|
}
|
|
@@ -183,19 +193,18 @@ var dnetwork;
|
|
|
183
193
|
function getSimpleStore(url, config) {
|
|
184
194
|
return __awaiter(this, void 0, void 0, function* () {
|
|
185
195
|
try {
|
|
186
|
-
dlog_1.dlog.d(`GET ${url}`);
|
|
187
196
|
const response = yield axios_1.default.get(url, config);
|
|
188
197
|
const jsondata = response.data;
|
|
198
|
+
LogNetwork(url, null, jsondata, null);
|
|
189
199
|
if (jsondata.status === "success") {
|
|
190
|
-
dlog_1.dlog.d("fetch success");
|
|
191
200
|
return jsondata;
|
|
192
201
|
}
|
|
193
202
|
else {
|
|
194
|
-
dlog_1.dlog.e(`GET failed: ${url}`, jsondata);
|
|
195
203
|
throw new NetworkError(jsondata.msg || "SimpleStore request failed", "SIMPLESTORE_ERROR", jsondata);
|
|
196
204
|
}
|
|
197
205
|
}
|
|
198
206
|
catch (error) {
|
|
207
|
+
LogNetwork(url, null, null, error);
|
|
199
208
|
if (axios_1.default.isAxiosError(error)) {
|
|
200
209
|
handleAxiosError(error, url);
|
|
201
210
|
}
|
|
@@ -210,19 +219,18 @@ var dnetwork;
|
|
|
210
219
|
function postSimpleStore(url, data, config) {
|
|
211
220
|
return __awaiter(this, void 0, void 0, function* () {
|
|
212
221
|
try {
|
|
213
|
-
dlog_1.dlog.d(`POST ${url}`, data);
|
|
214
222
|
const response = yield axios_1.default.post(url, data, config);
|
|
215
223
|
const jsondata = response.data;
|
|
224
|
+
LogNetwork(url, data, jsondata, null);
|
|
216
225
|
if (jsondata.status === "success") {
|
|
217
|
-
dlog_1.dlog.d("POST success");
|
|
218
226
|
return jsondata;
|
|
219
227
|
}
|
|
220
228
|
else {
|
|
221
|
-
dlog_1.dlog.e(`POST failed: ${url}`, jsondata);
|
|
222
229
|
throw new NetworkError(jsondata.msg || "SimpleStore request failed", "SIMPLESTORE_ERROR", jsondata);
|
|
223
230
|
}
|
|
224
231
|
}
|
|
225
232
|
catch (error) {
|
|
233
|
+
LogNetwork(url, data, null, error);
|
|
226
234
|
if (axios_1.default.isAxiosError(error)) {
|
|
227
235
|
handleAxiosError(error, url);
|
|
228
236
|
}
|
|
@@ -250,5 +258,46 @@ var dnetwork;
|
|
|
250
258
|
});
|
|
251
259
|
}
|
|
252
260
|
dnetwork.getAsFakeBrowser = getAsFakeBrowser;
|
|
261
|
+
function LogNetwork(url, req, resp, error) {
|
|
262
|
+
count++;
|
|
263
|
+
dlog_1.dlog.d(`=================== NETWORK REQUEST: ${count} ======================
|
|
264
|
+
URL:${url}
|
|
265
|
+
REQUEST: ${convert(req)}
|
|
266
|
+
RESP:${convert(resp)}
|
|
267
|
+
Error:${convert(error)}
|
|
268
|
+
==========================================================
|
|
269
|
+
`);
|
|
270
|
+
}
|
|
253
271
|
})(dnetwork || (exports.dnetwork = dnetwork = {}));
|
|
272
|
+
function convert(a) {
|
|
273
|
+
if (a === null)
|
|
274
|
+
return "null";
|
|
275
|
+
if (a === undefined)
|
|
276
|
+
return "undefined";
|
|
277
|
+
if (typeof a === "string")
|
|
278
|
+
return a;
|
|
279
|
+
if (typeof a === "number" ||
|
|
280
|
+
typeof a === "boolean" ||
|
|
281
|
+
typeof a === "bigint") {
|
|
282
|
+
return a.toString();
|
|
283
|
+
}
|
|
284
|
+
if (typeof a === "function") {
|
|
285
|
+
return a.name ? `[Function: ${a.name}]` : "[Function]";
|
|
286
|
+
}
|
|
287
|
+
if (a instanceof Date) {
|
|
288
|
+
return a.toISOString();
|
|
289
|
+
}
|
|
290
|
+
if (Array.isArray(a)) {
|
|
291
|
+
return `[${a.map(convert).join(", ")}]`;
|
|
292
|
+
}
|
|
293
|
+
if (typeof a === "object") {
|
|
294
|
+
try {
|
|
295
|
+
return JSON.stringify(a);
|
|
296
|
+
}
|
|
297
|
+
catch (_a) {
|
|
298
|
+
return "[Object]";
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
return String(a);
|
|
302
|
+
}
|
|
254
303
|
//# sourceMappingURL=dnetwork.js.map
|
package/dist/dnetwork.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dnetwork.js","sourceRoot":"","sources":["../src/dnetwork.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;AAEH,kDAA8D;AAC9D,uCAA4C;AAC5C,iCAA8B;
|
|
1
|
+
{"version":3,"file":"dnetwork.js","sourceRoot":"","sources":["../src/dnetwork.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/publish.sh
CHANGED
package/src/dnetwork.ts
CHANGED
|
@@ -14,6 +14,7 @@ import axios, { AxiosError, AxiosRequestConfig } from "axios";
|
|
|
14
14
|
import { dassert, DError } from "./dassert";
|
|
15
15
|
import { dlog } from "./dlog";
|
|
16
16
|
import { TObject } from "./dtypes";
|
|
17
|
+
let count = 0;
|
|
17
18
|
|
|
18
19
|
// Custom error class for network-related errors
|
|
19
20
|
export class NetworkError<T = any> extends DError {
|
|
@@ -88,8 +89,8 @@ export namespace dnetwork {
|
|
|
88
89
|
config?: AxiosRequestConfig,
|
|
89
90
|
): Promise<any> {
|
|
90
91
|
try {
|
|
91
|
-
dlog.d(`GET ${url}`);
|
|
92
92
|
const result = await axios.get(url, config);
|
|
93
|
+
LogNetwork(url, null, result, null);
|
|
93
94
|
dassert.verifyOrThrow(
|
|
94
95
|
result.status >= 200 && result.status < 300,
|
|
95
96
|
`GET request to URL ${url} failed with status ${result.status}`,
|
|
@@ -97,6 +98,7 @@ export namespace dnetwork {
|
|
|
97
98
|
);
|
|
98
99
|
return result.data;
|
|
99
100
|
} catch (error) {
|
|
101
|
+
LogNetwork(url, null, null, error);
|
|
100
102
|
if (axios.isAxiosError(error)) {
|
|
101
103
|
handleAxiosError(error, url);
|
|
102
104
|
}
|
|
@@ -113,6 +115,7 @@ export namespace dnetwork {
|
|
|
113
115
|
): Promise<object> {
|
|
114
116
|
try {
|
|
115
117
|
const res = await get(url, config);
|
|
118
|
+
LogNetwork(url, null, res, null);
|
|
116
119
|
if (typeof res === "object" && res !== null) {
|
|
117
120
|
return res;
|
|
118
121
|
}
|
|
@@ -126,6 +129,7 @@ export namespace dnetwork {
|
|
|
126
129
|
);
|
|
127
130
|
}
|
|
128
131
|
} catch (error) {
|
|
132
|
+
LogNetwork(url, null, null, error);
|
|
129
133
|
if (axios.isAxiosError(error)) {
|
|
130
134
|
handleAxiosError(error, url);
|
|
131
135
|
}
|
|
@@ -142,8 +146,8 @@ export namespace dnetwork {
|
|
|
142
146
|
config?: AxiosRequestConfig,
|
|
143
147
|
): Promise<any> {
|
|
144
148
|
try {
|
|
145
|
-
dlog.d(`POST ${url}`, data);
|
|
146
149
|
const result = await axios.post(url, data, config);
|
|
150
|
+
LogNetwork(url, data, result, null);
|
|
147
151
|
dassert.verifyOrThrow(
|
|
148
152
|
result.status >= 200 && result.status < 300,
|
|
149
153
|
`POST request to URL ${url} failed with status ${result.status}`,
|
|
@@ -151,6 +155,7 @@ export namespace dnetwork {
|
|
|
151
155
|
);
|
|
152
156
|
return result.data;
|
|
153
157
|
} catch (error) {
|
|
158
|
+
LogNetwork(url, data, null, error);
|
|
154
159
|
if (axios.isAxiosError(error)) {
|
|
155
160
|
handleAxiosError(error, url);
|
|
156
161
|
}
|
|
@@ -169,11 +174,15 @@ export namespace dnetwork {
|
|
|
169
174
|
try {
|
|
170
175
|
const res = await post(url, data, config);
|
|
171
176
|
if (typeof res === "object" && res !== null) {
|
|
177
|
+
LogNetwork(url, data, res, null);
|
|
172
178
|
return res;
|
|
173
179
|
}
|
|
174
180
|
try {
|
|
175
|
-
|
|
181
|
+
let output = JSON.parse(res);
|
|
182
|
+
LogNetwork(url, data, output, null);
|
|
183
|
+
return output;
|
|
176
184
|
} catch {
|
|
185
|
+
LogNetwork(url, data, res, "Response is not valid JSON");
|
|
177
186
|
throw new NetworkError(
|
|
178
187
|
"Response is not valid JSON",
|
|
179
188
|
"JSON_PARSE_ERROR",
|
|
@@ -181,6 +190,7 @@ export namespace dnetwork {
|
|
|
181
190
|
);
|
|
182
191
|
}
|
|
183
192
|
} catch (error) {
|
|
193
|
+
LogNetwork(url, data, null, error);
|
|
184
194
|
if (axios.isAxiosError(error)) {
|
|
185
195
|
handleAxiosError(error, url);
|
|
186
196
|
}
|
|
@@ -196,14 +206,12 @@ export namespace dnetwork {
|
|
|
196
206
|
config?: AxiosRequestConfig,
|
|
197
207
|
): Promise<any> {
|
|
198
208
|
try {
|
|
199
|
-
dlog.d(`GET ${url}`);
|
|
200
209
|
const response = await axios.get(url, config);
|
|
201
210
|
const jsondata = response.data;
|
|
211
|
+
LogNetwork(url, null, jsondata, null);
|
|
202
212
|
if (jsondata.status === "success") {
|
|
203
|
-
dlog.d("fetch success");
|
|
204
213
|
return jsondata;
|
|
205
214
|
} else {
|
|
206
|
-
dlog.e(`GET failed: ${url}`, jsondata);
|
|
207
215
|
throw new NetworkError(
|
|
208
216
|
jsondata.msg || "SimpleStore request failed",
|
|
209
217
|
"SIMPLESTORE_ERROR",
|
|
@@ -211,6 +219,7 @@ export namespace dnetwork {
|
|
|
211
219
|
);
|
|
212
220
|
}
|
|
213
221
|
} catch (error) {
|
|
222
|
+
LogNetwork(url, null, null, error);
|
|
214
223
|
if (axios.isAxiosError(error)) {
|
|
215
224
|
handleAxiosError(error, url);
|
|
216
225
|
}
|
|
@@ -227,14 +236,12 @@ export namespace dnetwork {
|
|
|
227
236
|
config?: AxiosRequestConfig,
|
|
228
237
|
): Promise<any> {
|
|
229
238
|
try {
|
|
230
|
-
dlog.d(`POST ${url}`, data);
|
|
231
239
|
const response = await axios.post(url, data, config);
|
|
232
240
|
const jsondata = response.data;
|
|
241
|
+
LogNetwork(url, data, jsondata, null);
|
|
233
242
|
if (jsondata.status === "success") {
|
|
234
|
-
dlog.d("POST success");
|
|
235
243
|
return jsondata;
|
|
236
244
|
} else {
|
|
237
|
-
dlog.e(`POST failed: ${url}`, jsondata);
|
|
238
245
|
throw new NetworkError(
|
|
239
246
|
jsondata.msg || "SimpleStore request failed",
|
|
240
247
|
"SIMPLESTORE_ERROR",
|
|
@@ -242,6 +249,7 @@ export namespace dnetwork {
|
|
|
242
249
|
);
|
|
243
250
|
}
|
|
244
251
|
} catch (error) {
|
|
252
|
+
LogNetwork(url, data, null, error);
|
|
245
253
|
if (axios.isAxiosError(error)) {
|
|
246
254
|
handleAxiosError(error, url);
|
|
247
255
|
}
|
|
@@ -271,4 +279,51 @@ export namespace dnetwork {
|
|
|
271
279
|
throw error;
|
|
272
280
|
}
|
|
273
281
|
}
|
|
282
|
+
|
|
283
|
+
function LogNetwork(url: any, req: any, resp: any, error: any) {
|
|
284
|
+
count++;
|
|
285
|
+
dlog.d(`=================== NETWORK REQUEST: ${count} ======================
|
|
286
|
+
URL:${url}
|
|
287
|
+
REQUEST: ${convert(req)}
|
|
288
|
+
RESP:${convert(resp)}
|
|
289
|
+
Error:${convert(error)}
|
|
290
|
+
==========================================================
|
|
291
|
+
`);
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
function convert(a: any): string {
|
|
296
|
+
if (a === null) return "null";
|
|
297
|
+
if (a === undefined) return "undefined";
|
|
298
|
+
|
|
299
|
+
if (typeof a === "string") return a;
|
|
300
|
+
if (
|
|
301
|
+
typeof a === "number" ||
|
|
302
|
+
typeof a === "boolean" ||
|
|
303
|
+
typeof a === "bigint"
|
|
304
|
+
) {
|
|
305
|
+
return a.toString();
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
if (typeof a === "function") {
|
|
309
|
+
return a.name ? `[Function: ${a.name}]` : "[Function]";
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
if (a instanceof Date) {
|
|
313
|
+
return a.toISOString();
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
if (Array.isArray(a)) {
|
|
317
|
+
return `[${a.map(convert).join(", ")}]`;
|
|
318
|
+
}
|
|
319
|
+
|
|
320
|
+
if (typeof a === "object") {
|
|
321
|
+
try {
|
|
322
|
+
return JSON.stringify(a);
|
|
323
|
+
} catch {
|
|
324
|
+
return "[Object]";
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
return String(a);
|
|
274
329
|
}
|