@miqro/core 1.3.1 → 1.3.5
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/handler/api-handler.d.ts +2 -2
- package/dist/handler/api-handler.js +7 -6
- package/dist/handler/api-handler.js.map +1 -1
- package/dist/handler/api-router-utils.d.ts +1 -8
- package/dist/handler/api-router-utils.js +16 -14
- package/dist/handler/api-router-utils.js.map +1 -1
- package/dist/handler/api-router.d.ts +1 -2
- package/dist/handler/api-router.js.map +1 -1
- package/dist/handler/app.d.ts +1 -2
- package/dist/handler/app.js +95 -13
- package/dist/handler/app.js.map +1 -1
- package/dist/handler/common/context.d.ts +57 -0
- package/dist/handler/common/context.js +123 -0
- package/dist/handler/common/context.js.map +1 -0
- package/dist/handler/common/index.d.ts +2 -55
- package/dist/handler/common/index.js +12 -127
- package/dist/handler/common/index.js.map +1 -1
- package/dist/handler/common/router-utils.d.ts +51 -0
- package/dist/handler/common/router-utils.js +107 -0
- package/dist/handler/common/router-utils.js.map +1 -0
- package/dist/handler/common/router.d.ts +20 -0
- package/dist/handler/common/router.js +82 -0
- package/dist/handler/common/router.js.map +1 -0
- package/dist/handler/common/tokenize-match.d.ts +18 -9
- package/dist/handler/common/tokenize-match.js +35 -28
- package/dist/handler/common/tokenize-match.js.map +1 -1
- package/dist/handler/feature-router.d.ts +3 -2
- package/dist/handler/feature-router.js +3 -3
- package/dist/handler/feature-router.js.map +1 -1
- package/dist/handler/index.d.ts +1 -4
- package/dist/handler/index.js +1 -5
- package/dist/handler/index.js.map +1 -1
- package/dist/{middleware → handler/middleware}/buffer.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/buffer.js +2 -2
- package/dist/handler/middleware/buffer.js.map +1 -0
- package/dist/{middleware → handler/middleware}/cookie.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/cookie.js +1 -1
- package/dist/handler/middleware/cookie.js.map +1 -0
- package/dist/{middleware → handler/middleware}/cors.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/cors.js +2 -2
- package/dist/handler/middleware/cors.js.map +1 -0
- package/dist/{middleware → handler/middleware}/form.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/form.js +2 -2
- package/dist/handler/middleware/form.js.map +1 -0
- package/dist/handler/middleware/group.d.ts +3 -0
- package/dist/{middleware → handler/middleware}/group.js +2 -2
- package/dist/handler/middleware/group.js.map +1 -0
- package/dist/{middleware → handler/middleware}/index.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/index.js +1 -1
- package/dist/handler/middleware/index.js.map +1 -0
- package/dist/{middleware → handler/middleware}/json.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/json.js +2 -2
- package/dist/handler/middleware/json.js.map +1 -0
- package/dist/{middleware → handler/middleware}/logger.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/logger.js +0 -0
- package/dist/handler/middleware/logger.js.map +1 -0
- package/dist/{middleware → handler/middleware}/parse.d.ts +4 -3
- package/dist/{middleware → handler/middleware}/parse.js +11 -1
- package/dist/handler/middleware/parse.js.map +1 -0
- package/dist/{middleware → handler/middleware}/session.d.ts +2 -2
- package/dist/{middleware → handler/middleware}/session.js +3 -3
- package/dist/handler/middleware/session.js.map +1 -0
- package/dist/{middleware → handler/middleware}/tag.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/tag.js +0 -0
- package/dist/handler/middleware/tag.js.map +1 -0
- package/dist/{middleware → handler/middleware}/text.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/text.js +2 -2
- package/dist/handler/middleware/text.js.map +1 -0
- package/dist/handler/{html.d.ts → response/html.d.ts} +1 -1
- package/dist/handler/{html.js → response/html.js} +0 -0
- package/dist/handler/response/html.js.map +1 -0
- package/dist/handler/response/index.d.ts +3 -0
- package/dist/handler/response/index.js +16 -0
- package/dist/handler/response/index.js.map +1 -0
- package/dist/handler/{response.d.ts → response/json.d.ts} +1 -1
- package/dist/handler/{response.js → response/json.js} +1 -1
- package/dist/handler/response/json.js.map +1 -0
- package/dist/handler/response/result.d.ts +4 -0
- package/dist/handler/{result.js → response/result.js} +1 -1
- package/dist/handler/response/result.js.map +1 -0
- package/dist/index.d.ts +0 -2
- package/dist/index.js +0 -2
- package/dist/index.js.map +1 -1
- package/dist/util/cookie/cookie.d.ts +0 -1
- package/dist/util/request/common.d.ts +9 -0
- package/dist/util/request/common.js +99 -1
- package/dist/util/request/common.js.map +1 -1
- package/dist/util/request/index.js +136 -209
- package/dist/util/request/index.js.map +1 -1
- package/dist/util/session/common.d.ts +16 -0
- package/dist/util/session/common.js +49 -0
- package/dist/util/session/common.js.map +1 -0
- package/dist/util/session/index.d.ts +2 -16
- package/dist/util/session/index.js +12 -46
- package/dist/util/session/index.js.map +1 -1
- package/dist/{service/index.d.ts → util/session/service.d.ts} +3 -3
- package/dist/{service/index.js → util/session/service.js} +6 -6
- package/dist/util/session/service.js.map +1 -0
- package/package.json +1 -2
- package/src/handler/api-handler.ts +8 -7
- package/src/handler/api-router-utils.ts +17 -20
- package/src/handler/api-router.ts +1 -2
- package/src/handler/app.ts +95 -10
- package/src/handler/common/context.ts +161 -0
- package/src/handler/common/index.ts +2 -157
- package/src/handler/common/router-utils.ts +140 -0
- package/src/handler/common/router.ts +76 -0
- package/src/handler/common/tokenize-match.ts +42 -40
- package/src/handler/feature-router.ts +4 -3
- package/src/handler/index.ts +1 -5
- package/src/{middleware → handler/middleware}/buffer.ts +3 -3
- package/src/{middleware → handler/middleware}/cookie.ts +2 -2
- package/src/{middleware → handler/middleware}/cors.ts +3 -3
- package/src/{middleware → handler/middleware}/form.ts +3 -3
- package/src/{middleware → handler/middleware}/group.ts +3 -3
- package/src/{middleware → handler/middleware}/index.ts +2 -2
- package/src/{middleware → handler/middleware}/json.ts +3 -3
- package/src/{middleware → handler/middleware}/logger.ts +1 -1
- package/src/{middleware → handler/middleware}/parse.ts +14 -4
- package/src/{middleware → handler/middleware}/session.ts +5 -5
- package/src/{middleware → handler/middleware}/tag.ts +1 -1
- package/src/{middleware → handler/middleware}/text.ts +3 -3
- package/src/handler/{html.ts → response/html.ts} +1 -1
- package/src/handler/response/index.ts +3 -0
- package/src/handler/{response.ts → response/json.ts} +1 -1
- package/src/handler/{result.ts → response/result.ts} +3 -3
- package/src/index.ts +0 -2
- package/src/util/request/common.ts +110 -0
- package/src/util/request/index.ts +141 -211
- package/src/util/session/common.ts +63 -0
- package/src/util/session/index.ts +2 -63
- package/src/{service/index.ts → util/session/service.ts} +7 -7
- package/tsconfig.json +2 -2
- package/dist/handler/common/response.d.ts +0 -13
- package/dist/handler/common/response.js +0 -55
- package/dist/handler/common/response.js.map +0 -1
- package/dist/handler/error.d.ts +0 -2
- package/dist/handler/error.js +0 -47
- package/dist/handler/error.js.map +0 -1
- package/dist/handler/html.js.map +0 -1
- package/dist/handler/response.js.map +0 -1
- package/dist/handler/result.d.ts +0 -4
- package/dist/handler/result.js.map +0 -1
- package/dist/handler/router.d.ts +0 -28
- package/dist/handler/router.js +0 -119
- package/dist/handler/router.js.map +0 -1
- package/dist/middleware/buffer.js.map +0 -1
- package/dist/middleware/cookie.js.map +0 -1
- package/dist/middleware/cors.js.map +0 -1
- package/dist/middleware/form.js.map +0 -1
- package/dist/middleware/group.d.ts +0 -3
- package/dist/middleware/group.js.map +0 -1
- package/dist/middleware/index.js.map +0 -1
- package/dist/middleware/json.js.map +0 -1
- package/dist/middleware/logger.js.map +0 -1
- package/dist/middleware/parse.js.map +0 -1
- package/dist/middleware/session.js.map +0 -1
- package/dist/middleware/tag.js.map +0 -1
- package/dist/middleware/text.js.map +0 -1
- package/dist/service/index.js.map +0 -1
- package/src/handler/common/response.ts +0 -59
- package/src/handler/error.ts +0 -42
- package/src/handler/router.ts +0 -127
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { parse } from "
|
|
2
|
-
import { checkEnvVariables } from "
|
|
3
|
-
import { Session } from "
|
|
4
|
-
import { Context, Handler } from "../
|
|
5
|
-
import { ForbiddenError, UnAuthorizedError } from "
|
|
1
|
+
import { parse } from "../../util/parser";
|
|
2
|
+
import { checkEnvVariables } from "../../util/config";
|
|
3
|
+
import { Session } from "../../util/session";
|
|
4
|
+
import { Context, Handler } from "../common";
|
|
5
|
+
import { ForbiddenError, UnAuthorizedError } from "../../util/error";
|
|
6
6
|
|
|
7
7
|
const DEFAULT_TOKEN_LOCATION = "header";
|
|
8
8
|
const DEFAULT_TOKEN_HEADER = "Authorization";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Context, Handler } from "../
|
|
2
|
-
import { BadRequestError } from "
|
|
3
|
-
import { checkEnvVariables } from "
|
|
1
|
+
import { Context, Handler } from "../common";
|
|
2
|
+
import { BadRequestError } from "../../util/error";
|
|
3
|
+
import { checkEnvVariables } from "../../util/config";
|
|
4
4
|
import { DEFAULT_READ_BUFFER_LIMIT } from "./buffer";
|
|
5
5
|
|
|
6
6
|
export const TextParser = (options?: {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OutgoingHttpHeaders } from "http";
|
|
2
|
-
import { Context, Handler } from "
|
|
2
|
+
import { Context, Handler } from "../common";
|
|
3
3
|
|
|
4
4
|
export type HTMLResponseResult = string | { status?: number; headers?: OutgoingHttpHeaders, body?: string; template: (ctx: Context) => Promise<string>; }
|
|
5
5
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { parse, Parser } from "
|
|
2
|
-
import { ParseOptions } from "
|
|
3
|
-
import { Context, Handler } from "
|
|
1
|
+
import { parse, Parser } from "../../util";
|
|
2
|
+
import { ParseOptions } from "../../util/parser/common";
|
|
3
|
+
import { Context, Handler } from "../common";
|
|
4
4
|
|
|
5
5
|
export const ResultParser = (options: ParseOptions | ParseOptions[], parser?: Parser): Handler<any> =>
|
|
6
6
|
async (ctx: Context): Promise<any> => {
|
package/src/index.ts
CHANGED
|
@@ -4,6 +4,116 @@ import { mergeSearchParams } from "../../handler/common/tokenize-match";
|
|
|
4
4
|
import { SimpleMap } from "../parser/common";
|
|
5
5
|
import { URL } from "url";
|
|
6
6
|
import { newURL } from "../../handler/common/helpers";
|
|
7
|
+
import { Logger } from "../logger/logger";
|
|
8
|
+
|
|
9
|
+
export const readResponseBuffer = ({
|
|
10
|
+
res,
|
|
11
|
+
readTimeout,
|
|
12
|
+
options,
|
|
13
|
+
req,
|
|
14
|
+
reject,
|
|
15
|
+
logger
|
|
16
|
+
}: {
|
|
17
|
+
res: http.IncomingMessage;
|
|
18
|
+
readTimeout: NodeJS.Timeout | null,
|
|
19
|
+
options: RequestOptions,
|
|
20
|
+
req: http.ClientRequest,
|
|
21
|
+
reject: (error: Error) => void;
|
|
22
|
+
logger?: Logger;
|
|
23
|
+
}, cb: (buffers: Buffer[]) => void): void => {
|
|
24
|
+
try {
|
|
25
|
+
const buffers: Buffer[] = [];
|
|
26
|
+
|
|
27
|
+
if (readTimeout) {
|
|
28
|
+
clearTimeout(readTimeout);
|
|
29
|
+
}
|
|
30
|
+
const responseTimeout = options.timeout ? setTimeout(() => {
|
|
31
|
+
res.removeListener("data", chunkListener);
|
|
32
|
+
res.removeListener("error", errorListener)
|
|
33
|
+
res.removeListener("end", endListener);
|
|
34
|
+
req.end(() => {
|
|
35
|
+
try {
|
|
36
|
+
req.destroy();
|
|
37
|
+
res.destroy();
|
|
38
|
+
} catch (e) {
|
|
39
|
+
if (logger) {
|
|
40
|
+
logger.error(e);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
reject(new Error(`response timeout ${options.timeout}`));
|
|
44
|
+
return;
|
|
45
|
+
});
|
|
46
|
+
}, options.timeout) : null;
|
|
47
|
+
|
|
48
|
+
let responseLength = 0;
|
|
49
|
+
const chunkListener = (chunk: Buffer) => {
|
|
50
|
+
responseLength += chunk.length;
|
|
51
|
+
if (options.maxResponse && options.maxResponse < responseLength) {
|
|
52
|
+
res.removeListener("data", chunkListener);
|
|
53
|
+
res.removeListener("error", errorListener)
|
|
54
|
+
res.removeListener("end", endListener);
|
|
55
|
+
req.end(() => {
|
|
56
|
+
try {
|
|
57
|
+
req.destroy();
|
|
58
|
+
res.destroy();
|
|
59
|
+
} catch (e) {
|
|
60
|
+
if (logger) {
|
|
61
|
+
logger.error(e);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
reject(new Error(`response too big maxResponse ${options.maxResponse} < ${responseLength}`));
|
|
65
|
+
return;
|
|
66
|
+
});
|
|
67
|
+
} else {
|
|
68
|
+
buffers.push(chunk);
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
const errorListener = (e2: Error) => {
|
|
72
|
+
res.removeListener("data", chunkListener);
|
|
73
|
+
res.removeListener("end", endListener);
|
|
74
|
+
res.removeListener("error", errorListener);
|
|
75
|
+
try {
|
|
76
|
+
req.destroy();
|
|
77
|
+
res.destroy();
|
|
78
|
+
} catch (e) {
|
|
79
|
+
if (logger) {
|
|
80
|
+
logger.error(e);
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
reject(e2);
|
|
84
|
+
};
|
|
85
|
+
|
|
86
|
+
const endListener = () => {
|
|
87
|
+
try {
|
|
88
|
+
if (responseTimeout) {
|
|
89
|
+
clearTimeout(responseTimeout);
|
|
90
|
+
}
|
|
91
|
+
res.removeListener("data", chunkListener);
|
|
92
|
+
res.removeListener("error", errorListener);
|
|
93
|
+
cb(buffers);
|
|
94
|
+
} catch (e: any) {
|
|
95
|
+
reject(e);
|
|
96
|
+
}
|
|
97
|
+
};
|
|
98
|
+
|
|
99
|
+
try {
|
|
100
|
+
// setup listeners
|
|
101
|
+
res.on("data", chunkListener);
|
|
102
|
+
res.once("error", errorListener)
|
|
103
|
+
res.once("end", endListener);
|
|
104
|
+
} catch (e3: any) {
|
|
105
|
+
// remove listeners
|
|
106
|
+
res.removeListener("data", chunkListener);
|
|
107
|
+
res.removeListener("end", endListener);
|
|
108
|
+
res.removeListener("error", errorListener);
|
|
109
|
+
reject(e3);
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
112
|
+
} catch (e: any) {
|
|
113
|
+
reject(e);
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
7
117
|
|
|
8
118
|
export const parseRedirectLocation = (url: string, extraQuery?: SimpleMap<string | string[] | number | boolean | number[] | boolean[]>, socketPath?: string): {
|
|
9
119
|
protocol?: string;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Logger } from "../logger";
|
|
2
2
|
import http from "http";
|
|
3
3
|
import https from "https";
|
|
4
|
-
import { parseRedirectLocation, RequestOptions, RequestResponse, ResponseError } from "./common";
|
|
4
|
+
import { parseRedirectLocation, RequestOptions, RequestResponse, ResponseError, readResponseBuffer } from "./common";
|
|
5
5
|
import { gunzipSync } from "zlib";
|
|
6
6
|
import { isBrowser } from "../config/browser";
|
|
7
7
|
|
|
@@ -24,29 +24,52 @@ export const request = (options: RequestOptions, logger?: Logger): Promise<Reque
|
|
|
24
24
|
if (typeof options.maxRedirects === "undefined") {
|
|
25
25
|
options.maxRedirects = 10;
|
|
26
26
|
}
|
|
27
|
-
const isJSON: boolean = typeof options.data !== "string";
|
|
28
27
|
|
|
29
|
-
const
|
|
30
|
-
|
|
28
|
+
const contentType = options.headers[CONTENT_TYPE_HEADER] || options.headers[CONTENT_TYPE_HEADER.toLowerCase()] || undefined || options.headers[CONTENT_TYPE_HEADER.toUpperCase()];
|
|
29
|
+
const isJSONType = contentType ? contentType.toString().toLocaleLowerCase().indexOf("application/json") === 0 : undefined;
|
|
30
|
+
|
|
31
|
+
const noType = !contentType;
|
|
32
|
+
|
|
33
|
+
const isText: boolean = typeof options.data === "string";
|
|
34
|
+
const JsonStringify: boolean = (!isText && (noType || isJSONType as boolean));
|
|
35
|
+
|
|
36
|
+
if (JsonStringify && noType) {
|
|
31
37
|
options.headers["Content-Type"] = JSON_TYPE;
|
|
32
|
-
} else if (
|
|
38
|
+
} else if (isText && noType) {
|
|
33
39
|
options.headers["Content-Type"] = TEXT_TYPE;
|
|
34
40
|
}
|
|
35
|
-
const data = options.data ?
|
|
41
|
+
const data = options.data ? JsonStringify ? JSON.stringify(options.data) : options.data : undefined;
|
|
36
42
|
const contentLength = data ? Buffer.from(data).length : 0;
|
|
37
43
|
|
|
38
|
-
|
|
44
|
+
// { socketPath, protocol, queryStr, hash, pathname, hostname, port }
|
|
45
|
+
const parsed = parseRedirectLocation(options.url, options.query, options.socketPath);
|
|
39
46
|
|
|
40
|
-
if (!socketPath && !hostname) {
|
|
47
|
+
if (!parsed.socketPath && !parsed.hostname) {
|
|
41
48
|
throw new Error(`Bad url ${options.url}`);
|
|
42
49
|
}
|
|
43
|
-
|
|
44
|
-
switch (protocol) {
|
|
50
|
+
switch (parsed.protocol) {
|
|
45
51
|
case "https:":
|
|
46
52
|
case "http:":
|
|
47
|
-
const
|
|
53
|
+
const readTimeout = options.timeout ? setTimeout(() => {
|
|
54
|
+
try {
|
|
55
|
+
req.end(() => {
|
|
56
|
+
try {
|
|
57
|
+
req.destroy();
|
|
58
|
+
} catch (e) {
|
|
59
|
+
if (logger) {
|
|
60
|
+
logger.error(e);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
reject(new Error(`response timeout ${options.timeout}`));
|
|
64
|
+
return;
|
|
65
|
+
});
|
|
66
|
+
} catch (e) {
|
|
67
|
+
reject(e);
|
|
68
|
+
}
|
|
69
|
+
}, options.timeout) : null;
|
|
70
|
+
const req: http.ClientRequest = (parsed.protocol === "https:" ? https.request : http.request)({
|
|
48
71
|
agent: false,
|
|
49
|
-
path: `${pathname}${queryStr ? `?${queryStr}` : ""}${hash ? hash : ""}`,
|
|
72
|
+
path: `${parsed.pathname}${parsed.queryStr ? `?${parsed.queryStr}` : ""}${parsed.hash ? parsed.hash : ""}`,
|
|
50
73
|
method: options.method,
|
|
51
74
|
socketPath: options.socketPath,
|
|
52
75
|
headers: options.disableUserAgent ? {
|
|
@@ -57,244 +80,151 @@ export const request = (options: RequestOptions, logger?: Logger): Promise<Reque
|
|
|
57
80
|
["Content-Length"]: contentLength,
|
|
58
81
|
...options.headers
|
|
59
82
|
},
|
|
60
|
-
|
|
61
83
|
timeout: options.timeout,
|
|
62
|
-
hostname,
|
|
63
|
-
port
|
|
64
|
-
}, (res: http.IncomingMessage) => {
|
|
84
|
+
hostname: parsed.hostname,
|
|
85
|
+
port: parsed.port
|
|
86
|
+
}, (res: http.IncomingMessage) => readResponseBuffer({
|
|
87
|
+
options,
|
|
88
|
+
req,
|
|
89
|
+
readTimeout,
|
|
90
|
+
logger,
|
|
91
|
+
reject,
|
|
92
|
+
res
|
|
93
|
+
}, (buffers) => {
|
|
65
94
|
try {
|
|
66
|
-
const
|
|
67
|
-
|
|
68
|
-
|
|
95
|
+
const responseBuffer: Buffer = res.headers["content-encoding"] === "gzip" && !isBrowser() ?
|
|
96
|
+
gunzipSync(Buffer.concat(buffers)) : Buffer.concat(buffers);
|
|
97
|
+
let data: any = responseBuffer.toString();
|
|
98
|
+
|
|
99
|
+
const contentType = res.headers["content-type"];
|
|
100
|
+
if (contentType && data && (contentType.indexOf("json") !== -1)) {
|
|
101
|
+
data = JSON.parse(responseBuffer.toString());
|
|
69
102
|
}
|
|
70
|
-
readTimeout = options.timeout ? setTimeout(() => {
|
|
71
|
-
res.removeListener("data", chunkListener);
|
|
72
|
-
res.removeListener("error", errorListener)
|
|
73
|
-
res.removeListener("end", endListener);
|
|
74
|
-
req.end(() => {
|
|
75
|
-
try {
|
|
76
|
-
req.destroy();
|
|
77
|
-
res.destroy();
|
|
78
|
-
} catch (e) {
|
|
79
|
-
if (logger) {
|
|
80
|
-
logger.error(e);
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
reject(new Error(`response timeout ${options.timeout}`));
|
|
84
|
-
return;
|
|
85
|
-
});
|
|
86
|
-
}, options.timeout) : null;
|
|
87
103
|
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
try {
|
|
97
|
-
req.destroy();
|
|
98
|
-
res.destroy();
|
|
99
|
-
} catch (e) {
|
|
100
|
-
if (logger) {
|
|
101
|
-
logger.error(e);
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
reject(new Error(`response too big maxResponse ${options.maxResponse} < ${responseLength}`));
|
|
105
|
-
return;
|
|
106
|
-
});
|
|
107
|
-
} else {
|
|
108
|
-
buffers.push(chunk);
|
|
109
|
-
}
|
|
110
|
-
};
|
|
111
|
-
const errorListener = (e2: Error) => {
|
|
112
|
-
res.removeListener("data", chunkListener);
|
|
113
|
-
res.removeListener("end", endListener);
|
|
114
|
-
res.removeListener("error", errorListener);
|
|
115
|
-
try {
|
|
116
|
-
req.destroy();
|
|
117
|
-
res.destroy();
|
|
118
|
-
} catch (e) {
|
|
119
|
-
if (logger) {
|
|
120
|
-
logger.error(e);
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
reject(e2);
|
|
124
|
-
};
|
|
125
|
-
const endListener = () => {
|
|
104
|
+
const status = res.statusCode;
|
|
105
|
+
if (!status) {
|
|
106
|
+
const err = new ResponseError(status as any, res.headers, options.url, null, data, responseBuffer, options.locations ? options.locations : []);
|
|
107
|
+
reject(err);
|
|
108
|
+
return;
|
|
109
|
+
} else if (status >= 300 && status < 400 && options.followRedirect) {
|
|
110
|
+
// follow redirect
|
|
111
|
+
const location = res.headers["location"];
|
|
126
112
|
try {
|
|
127
|
-
if (
|
|
128
|
-
|
|
113
|
+
if (!location) {
|
|
114
|
+
reject(new Error(`[${location}] not valid from ${options.url}`));
|
|
115
|
+
return;
|
|
129
116
|
}
|
|
130
|
-
|
|
131
|
-
|
|
117
|
+
// parse location and add query data from current location
|
|
118
|
+
const locationData = parseRedirectLocation(location, options.query, options.socketPath);
|
|
132
119
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
120
|
+
// if no host is set in location header set the current header and protocol
|
|
121
|
+
// protocol is infered from current location
|
|
122
|
+
if (!locationData.hostname && parsed.hostname && !locationData.socketPath) {
|
|
123
|
+
locationData.url = `${parsed.protocol}//${parsed.hostname}${parsed.port ? `:${parsed.port}` : ""}${locationData.url}`;
|
|
124
|
+
}
|
|
136
125
|
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
data = JSON.parse(responseBuffer.toString());
|
|
126
|
+
if (logger) {
|
|
127
|
+
logger.debug(`redirecting to [${locationData.url}] from [${options.url}][${status}]`);
|
|
140
128
|
}
|
|
141
129
|
|
|
142
|
-
|
|
143
|
-
if (
|
|
144
|
-
|
|
145
|
-
reject(err);
|
|
130
|
+
// avoid loop redirect
|
|
131
|
+
if (options.url === locationData.url || (options.locations && options.locations.indexOf(locationData.url) !== -1)) {
|
|
132
|
+
reject(new Error(`loop redirect to [${location}] from [${options.url}][${status}] locations ${options.locations ? options.locations.join(",") : "[]"}`));
|
|
146
133
|
return;
|
|
147
|
-
}
|
|
148
|
-
// follow redirect
|
|
149
|
-
const location = res.headers["location"];
|
|
150
|
-
try {
|
|
151
|
-
// parse location and add query data from current location
|
|
152
|
-
const locationData = parseRedirectLocation(location, options.query, options.socketPath);
|
|
153
|
-
|
|
154
|
-
// if no host is set in location header set the current header and protocol
|
|
155
|
-
// protocol is infered from current location
|
|
156
|
-
if (!locationData.hostname && hostname && !locationData.socketPath) {
|
|
157
|
-
locationData.url = `${protocol}//${hostname}${port ? `:${port}` : ""}${locationData.url}`;
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
if (logger) {
|
|
161
|
-
logger.debug(`redirecting to [${locationData.url}] from [${options.url}][${status}]`);
|
|
162
|
-
}
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
// avoid loop redirect
|
|
166
|
-
if (options.url === locationData.url || (options.locations && options.locations.indexOf(locationData.url) !== -1)) {
|
|
167
|
-
reject(new Error(`loop redirect to [${location}] from [${options.url}][${status}] locations ${options.locations ? options.locations.join(",") : "[]"}`));
|
|
168
|
-
return;
|
|
169
|
-
}
|
|
134
|
+
}
|
|
170
135
|
|
|
171
|
-
|
|
172
|
-
|
|
136
|
+
// append new location
|
|
137
|
+
options.locations = options.locations ? options.locations.concat([locationData.url]) : [options.url, locationData.url];
|
|
173
138
|
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
139
|
+
// check options.maxRedirects
|
|
140
|
+
if (options.maxRedirects !== undefined && (options.locations.length - 1) > options.maxRedirects) {
|
|
141
|
+
reject(new Error(`too many redirects to [${location}] from [${options.url}][${status}]`));
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
179
144
|
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
resolve({
|
|
188
|
-
...ret,
|
|
189
|
-
url: options.url,
|
|
190
|
-
redirectedUrl: ret.locations && ret.locations.length > 0 ? ret.locations[ret.locations.length - 1] : ret.url
|
|
191
|
-
});
|
|
192
|
-
return;
|
|
193
|
-
}).catch((e4: any) => {
|
|
194
|
-
// bad redirect
|
|
195
|
-
if (e4.url && e4.status && e4.headers && e4.data) {
|
|
196
|
-
const err = new ResponseError(e4.status, e4.headers, e4.url, e4.redirectedUrl, e4.data, e4.buffer, e4.locations ? e4.locations : (options.locations ? options.locations : []));
|
|
197
|
-
err.stack = e4.stack;
|
|
198
|
-
reject(err);
|
|
199
|
-
return;
|
|
200
|
-
} else {
|
|
201
|
-
(e4 as any).redirectedUrl = locationData.url;
|
|
202
|
-
(e4 as any).locations = options.locations;
|
|
203
|
-
(e4 as any).url = options.url;
|
|
204
|
-
reject(e4);
|
|
205
|
-
return;
|
|
206
|
-
}
|
|
207
|
-
});
|
|
208
|
-
return;
|
|
209
|
-
} catch (e5) {
|
|
210
|
-
reject(new ResponseError(status, res.headers, options.url, location, data, responseBuffer, options.locations ? options.locations : []));
|
|
211
|
-
return;
|
|
212
|
-
}
|
|
213
|
-
} else if (status >= 200 && status < 300) {
|
|
214
|
-
// always resolve with 2xx
|
|
145
|
+
// request new location pass current options
|
|
146
|
+
request({
|
|
147
|
+
...options,
|
|
148
|
+
socketPath: locationData.socketPath,
|
|
149
|
+
url: locationData.url,
|
|
150
|
+
locations: options.locations
|
|
151
|
+
}, logger).then((ret) => {
|
|
215
152
|
resolve({
|
|
153
|
+
...ret,
|
|
216
154
|
url: options.url,
|
|
217
|
-
|
|
218
|
-
locations: options.locations ? options.locations : [],
|
|
219
|
-
redirectedUrl: null,
|
|
220
|
-
headers: res.headers,
|
|
221
|
-
data,
|
|
222
|
-
buffer: responseBuffer
|
|
155
|
+
redirectedUrl: ret.locations && ret.locations.length > 0 ? ret.locations[ret.locations.length - 1] : ret.url
|
|
223
156
|
});
|
|
224
157
|
return;
|
|
225
|
-
}
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
status,
|
|
231
|
-
locations: options.locations ? options.locations : [],
|
|
232
|
-
redirectedUrl: null,
|
|
233
|
-
headers: res.headers,
|
|
234
|
-
data,
|
|
235
|
-
buffer: responseBuffer
|
|
236
|
-
});
|
|
237
|
-
} else {
|
|
238
|
-
// throw with 4xx 5xx etc
|
|
239
|
-
const err = new ResponseError(status, res.headers, options.url, null, data, responseBuffer, options.locations ? options.locations : []);
|
|
158
|
+
}).catch((e4: any) => {
|
|
159
|
+
// bad redirect
|
|
160
|
+
if (e4.url && e4.status && e4.headers && e4.data) {
|
|
161
|
+
const err = new ResponseError(e4.status, e4.headers, e4.url, e4.redirectedUrl, e4.data, e4.buffer, e4.locations ? e4.locations : (options.locations ? options.locations : []));
|
|
162
|
+
err.stack = e4.stack;
|
|
240
163
|
reject(err);
|
|
164
|
+
return;
|
|
165
|
+
} else {
|
|
166
|
+
(e4 as any).redirectedUrl = locationData.url;
|
|
167
|
+
(e4 as any).locations = options.locations;
|
|
168
|
+
(e4 as any).url = options.url;
|
|
169
|
+
reject(e4);
|
|
170
|
+
return;
|
|
241
171
|
}
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
reject(e);
|
|
172
|
+
});
|
|
173
|
+
return;
|
|
174
|
+
} catch (e5) {
|
|
175
|
+
reject(new ResponseError(status, res.headers, options.url, location ? location : null, data, responseBuffer, options.locations ? options.locations : []));
|
|
247
176
|
return;
|
|
248
177
|
}
|
|
249
|
-
}
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
178
|
+
} else if (status >= 200 && status < 300) {
|
|
179
|
+
// always resolve with 2xx
|
|
180
|
+
resolve({
|
|
181
|
+
url: options.url,
|
|
182
|
+
status,
|
|
183
|
+
locations: options.locations ? options.locations : [],
|
|
184
|
+
redirectedUrl: null,
|
|
185
|
+
headers: res.headers,
|
|
186
|
+
data,
|
|
187
|
+
buffer: responseBuffer
|
|
188
|
+
});
|
|
189
|
+
return;
|
|
190
|
+
} else {
|
|
191
|
+
if (options.disableThrow && status !== undefined) {
|
|
192
|
+
// disable throw and resolve with 4xx 5xx etc
|
|
193
|
+
resolve({
|
|
194
|
+
url: options.url,
|
|
195
|
+
status,
|
|
196
|
+
locations: options.locations ? options.locations : [],
|
|
197
|
+
redirectedUrl: null,
|
|
198
|
+
headers: res.headers,
|
|
199
|
+
data,
|
|
200
|
+
buffer: responseBuffer
|
|
201
|
+
});
|
|
202
|
+
} else {
|
|
203
|
+
// throw with 4xx 5xx etc
|
|
204
|
+
const err = new ResponseError(status, res.headers, options.url, null, data, responseBuffer, options.locations ? options.locations : []);
|
|
205
|
+
reject(err);
|
|
206
|
+
}
|
|
261
207
|
return;
|
|
262
208
|
}
|
|
263
|
-
} catch (e) {
|
|
209
|
+
} catch (e: any) {
|
|
264
210
|
reject(e);
|
|
265
211
|
return;
|
|
266
212
|
}
|
|
267
|
-
})
|
|
213
|
+
}))
|
|
268
214
|
req.once("error", (e: Error) => {
|
|
269
215
|
if ((e as any).code === "ECONNREFUSED") {
|
|
270
216
|
e.name = "ResponseConnectionRefusedError";
|
|
271
217
|
}
|
|
272
218
|
reject(e);
|
|
273
219
|
});
|
|
274
|
-
if (readTimeout) {
|
|
275
|
-
clearTimeout(readTimeout);
|
|
276
|
-
}
|
|
277
|
-
readTimeout = options.timeout ? setTimeout(() => {
|
|
278
|
-
req.end(() => {
|
|
279
|
-
try {
|
|
280
|
-
req.destroy();
|
|
281
|
-
} catch (e) {
|
|
282
|
-
if (logger) {
|
|
283
|
-
logger.error(e);
|
|
284
|
-
}
|
|
285
|
-
}
|
|
286
|
-
reject(new Error(`response timeout ${options.timeout}`));
|
|
287
|
-
return;
|
|
288
|
-
});
|
|
289
|
-
}, options.timeout) : null;
|
|
290
220
|
req.end(data);
|
|
291
221
|
break;
|
|
292
222
|
default:
|
|
293
|
-
reject(new Error(`unknown protocol [${protocol}]`))
|
|
223
|
+
reject(new Error(`unknown protocol [${parsed.protocol}]`))
|
|
294
224
|
}
|
|
295
225
|
} catch (e) {
|
|
296
226
|
reject(e);
|
|
297
227
|
}
|
|
298
228
|
});
|
|
299
229
|
}
|
|
300
|
-
}
|
|
230
|
+
}
|