@miqro/core 1.2.4 → 1.3.3
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/README.md +43 -27
- package/dist/handler/api-handler.d.ts +5 -0
- package/dist/handler/api-handler.js +12 -4
- package/dist/handler/api-handler.js.map +1 -0
- package/dist/handler/api-router-utils.js +10 -2
- package/dist/handler/api-router-utils.js.map +1 -0
- package/dist/handler/api-router.d.ts +1 -2
- package/dist/handler/api-router.js +1 -0
- package/dist/handler/api-router.js.map +1 -0
- package/dist/handler/app.d.ts +1 -2
- package/dist/handler/app.js +96 -13
- package/dist/handler/app.js.map +1 -0
- 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/helpers.js +1 -0
- package/dist/handler/common/helpers.js.map +1 -0
- package/dist/handler/common/index.d.ts +2 -45
- package/dist/handler/common/index.js +13 -110
- package/dist/handler/common/index.js.map +1 -0
- package/dist/handler/common/router-utils.d.ts +26 -0
- package/dist/handler/common/router-utils.js +59 -0
- package/dist/handler/common/router-utils.js.map +1 -0
- package/dist/handler/{router.d.ts → common/router.d.ts} +7 -16
- package/dist/handler/common/router.js +76 -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 +36 -28
- package/dist/handler/common/tokenize-match.js.map +1 -0
- package/dist/handler/feature-router.d.ts +1 -2
- package/dist/handler/feature-router.js +3 -2
- package/dist/handler/feature-router.js.map +1 -0
- package/dist/handler/index.d.ts +1 -5
- package/dist/handler/index.js +2 -6
- package/dist/handler/index.js.map +1 -0
- package/dist/{middleware → handler/middleware}/buffer.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/buffer.js +3 -2
- package/dist/handler/middleware/buffer.js.map +1 -0
- package/dist/handler/middleware/cookie.d.ts +4 -0
- package/dist/handler/middleware/cookie.js +18 -0
- 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 +3 -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 +8 -5
- package/dist/handler/middleware/form.js.map +1 -0
- package/dist/handler/middleware/group.d.ts +3 -0
- package/dist/handler/{group.js → middleware/group.js} +3 -2
- package/dist/handler/middleware/group.js.map +1 -0
- package/dist/handler/middleware/index.d.ts +13 -0
- package/dist/handler/middleware/index.js +64 -0
- 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 +3 -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 +1 -0
- package/dist/handler/middleware/logger.js.map +1 -0
- package/dist/handler/{parse.d.ts → middleware/parse.d.ts} +4 -3
- package/dist/handler/{parse.js → middleware/parse.js} +17 -7
- package/dist/handler/middleware/parse.js.map +1 -0
- package/dist/handler/middleware/session.d.ts +21 -0
- package/dist/handler/middleware/session.js +140 -0
- package/dist/handler/middleware/session.js.map +1 -0
- package/dist/handler/middleware/tag.d.ts +4 -0
- package/dist/handler/middleware/tag.js +14 -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 +3 -2
- package/dist/handler/middleware/text.js.map +1 -0
- package/dist/handler/proxy.js +5 -11
- package/dist/handler/proxy.js.map +1 -0
- package/dist/handler/{html.d.ts → response/html.d.ts} +1 -1
- package/dist/handler/{html.js → response/html.js} +1 -0
- package/dist/handler/response/html.js.map +1 -0
- package/dist/handler/response/index.d.ts +3 -0
- package/dist/{middleware → handler/response}/index.js +3 -7
- 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} +3 -3
- 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} +8 -8
- package/dist/handler/response/result.js.map +1 -0
- package/dist/index.d.ts +0 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -0
- package/dist/util/cli/index.js +1 -0
- package/dist/util/cli/index.js.map +1 -0
- package/dist/util/config/browser.js +1 -0
- package/dist/util/config/browser.js.map +1 -0
- package/dist/util/config/config.js +1 -0
- package/dist/util/config/config.js.map +1 -0
- package/dist/util/config/featuretoggle.js +1 -0
- package/dist/util/config/featuretoggle.js.map +1 -0
- package/dist/util/config/index.js +1 -0
- package/dist/util/config/index.js.map +1 -0
- package/dist/util/cookie/cookie.d.ts +51 -0
- package/dist/util/cookie/cookie.js +168 -0
- package/dist/util/cookie/cookie.js.map +1 -0
- package/dist/util/cookie/index.d.ts +16 -0
- package/dist/util/cookie/index.js +9 -0
- package/dist/util/cookie/index.js.map +1 -0
- package/dist/util/error/configfilenotfound.js +1 -0
- package/dist/util/error/configfilenotfound.js.map +1 -0
- package/dist/util/error/forbiddenerror.js +1 -0
- package/dist/util/error/forbiddenerror.js.map +1 -0
- package/dist/util/error/index.js +1 -0
- package/dist/util/error/index.js.map +1 -0
- package/dist/util/error/named.js +1 -0
- package/dist/util/error/named.js.map +1 -0
- package/dist/util/error/notfound.js +1 -0
- package/dist/util/error/notfound.js.map +1 -0
- package/dist/util/error/notimplemented.js +1 -0
- package/dist/util/error/notimplemented.js.map +1 -0
- package/dist/util/error/parsererror.js +1 -0
- package/dist/util/error/parsererror.js.map +1 -0
- package/dist/util/error/unauthorizederror.js +1 -0
- package/dist/util/error/unauthorizederror.js.map +1 -0
- package/dist/util/index.js +3 -0
- package/dist/util/index.js.map +1 -0
- package/dist/util/loader/index.js +1 -0
- package/dist/util/loader/index.js.map +1 -0
- package/dist/util/logger/common.js +1 -0
- package/dist/util/logger/common.js.map +1 -0
- package/dist/util/logger/factory.js +1 -0
- package/dist/util/logger/factory.js.map +1 -0
- package/dist/util/logger/formatter.js +1 -0
- package/dist/util/logger/formatter.js.map +1 -0
- package/dist/util/logger/index.js +1 -0
- package/dist/util/logger/index.js.map +1 -0
- package/dist/util/logger/logger.js +6 -2
- package/dist/util/logger/logger.js.map +1 -0
- package/dist/util/logger/transport.js +1 -0
- package/dist/util/logger/transport.js.map +1 -0
- package/dist/util/parser/common.d.ts +5 -5
- package/dist/util/parser/common.js +1 -0
- package/dist/util/parser/common.js.map +1 -0
- package/dist/util/parser/get.js +7 -1
- package/dist/util/parser/get.js.map +1 -0
- package/dist/util/parser/index.js +1 -0
- package/dist/util/parser/index.js.map +1 -0
- package/dist/util/parser/parser.d.ts +3 -3
- package/dist/util/parser/parser.js +20 -11
- package/dist/util/parser/parser.js.map +1 -0
- package/dist/util/parser/types/any.js +1 -0
- package/dist/util/parser/types/any.js.map +1 -0
- package/dist/util/parser/types/array.js +1 -0
- package/dist/util/parser/types/array.js.map +1 -0
- package/dist/util/parser/types/boolean.js +1 -0
- package/dist/util/parser/types/boolean.js.map +1 -0
- package/dist/util/parser/types/email.js +1 -0
- package/dist/util/parser/types/email.js.map +1 -0
- package/dist/util/parser/types/enum.js +1 -0
- package/dist/util/parser/types/enum.js.map +1 -0
- package/dist/util/parser/types/index.js +1 -0
- package/dist/util/parser/types/index.js.map +1 -0
- package/dist/util/parser/types/multiple.js +6 -2
- package/dist/util/parser/types/multiple.js.map +1 -0
- package/dist/util/parser/types/nested.js +1 -0
- package/dist/util/parser/types/nested.js.map +1 -0
- package/dist/util/parser/types/number.js +1 -0
- package/dist/util/parser/types/number.js.map +1 -0
- package/dist/util/parser/types/object.js +1 -0
- package/dist/util/parser/types/object.js.map +1 -0
- package/dist/util/parser/types/regex.js +1 -0
- package/dist/util/parser/types/regex.js.map +1 -0
- package/dist/util/parser/types/string.js +1 -0
- package/dist/util/parser/types/string.js.map +1 -0
- package/dist/util/parser/types/url.js +1 -0
- package/dist/util/parser/types/url.js.map +1 -0
- package/dist/util/request/common.d.ts +10 -0
- package/dist/util/request/common.js +100 -1
- package/dist/util/request/common.js.map +1 -0
- package/dist/util/request/index.js +143 -199
- package/dist/util/request/index.js.map +1 -0
- 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 +13 -46
- package/dist/util/session/index.js.map +1 -0
- package/dist/util/session/service.d.ts +26 -0
- package/dist/util/session/service.js +143 -0
- package/dist/util/session/service.js.map +1 -0
- package/dist/util/test/app.js +5 -1
- package/dist/util/test/app.js.map +1 -0
- package/dist/util/test/common.js +1 -0
- package/dist/util/test/common.js.map +1 -0
- package/dist/util/test/index.js +1 -0
- package/dist/util/test/index.js.map +1 -0
- package/dist/util/uuid/index.d.ts +7 -0
- package/dist/util/uuid/index.js +8 -0
- package/dist/util/uuid/index.js.map +1 -0
- package/dist/util/uuid/regex.d.ts +2 -0
- package/dist/util/uuid/regex.js +5 -0
- package/dist/util/uuid/regex.js.map +1 -0
- package/dist/util/uuid/rng.d.ts +1 -0
- package/dist/util/uuid/rng.js +18 -0
- package/dist/util/uuid/rng.js.map +1 -0
- package/dist/util/uuid/stringify.d.ts +2 -0
- package/dist/util/uuid/stringify.js +50 -0
- package/dist/util/uuid/stringify.js.map +1 -0
- package/dist/util/uuid/v4.d.ts +5 -0
- package/dist/util/uuid/v4.js +27 -0
- package/dist/util/uuid/v4.js.map +1 -0
- package/dist/util/uuid/validate.d.ts +2 -0
- package/dist/util/uuid/validate.js +12 -0
- package/dist/util/uuid/validate.js.map +1 -0
- package/package.json +12 -21
- package/src/handler/api-handler.ts +56 -0
- package/src/handler/api-router-utils.ts +101 -0
- package/src/handler/api-router.ts +60 -0
- package/src/handler/app.ts +138 -0
- package/src/handler/common/context.ts +161 -0
- package/src/handler/common/helpers.ts +11 -0
- package/src/handler/common/index.ts +3 -0
- package/src/handler/common/router-utils.ts +67 -0
- package/src/handler/common/router.ts +70 -0
- package/src/handler/common/tokenize-match.ts +152 -0
- package/src/handler/feature-router.ts +90 -0
- package/src/handler/index.ts +8 -0
- package/src/handler/middleware/buffer.ts +79 -0
- package/src/handler/middleware/cookie.ts +19 -0
- package/src/handler/middleware/cors.ts +98 -0
- package/src/handler/middleware/form.ts +53 -0
- package/src/handler/middleware/group.ts +28 -0
- package/src/handler/middleware/index.ts +52 -0
- package/src/handler/middleware/json.ts +50 -0
- package/src/handler/middleware/logger.ts +18 -0
- package/src/handler/middleware/parse.ts +93 -0
- package/src/handler/middleware/session.ts +155 -0
- package/src/handler/middleware/tag.ts +15 -0
- package/src/handler/middleware/text.ts +40 -0
- package/src/handler/proxy.ts +44 -0
- package/src/handler/response/html.ts +36 -0
- package/src/handler/response/index.ts +3 -0
- package/src/handler/response/json.ts +19 -0
- package/src/handler/response/result.ts +40 -0
- package/src/index.ts +2 -0
- package/src/util/cli/index.ts +57 -0
- package/src/util/config/browser.ts +5 -0
- package/src/util/config/config.ts +93 -0
- package/src/util/config/featuretoggle.ts +6 -0
- package/src/util/config/index.ts +3 -0
- package/src/util/cookie/cookie.ts +207 -0
- package/src/util/cookie/index.ts +6 -0
- package/src/util/error/configfilenotfound.ts +8 -0
- package/src/util/error/forbiddenerror.ts +8 -0
- package/src/util/error/index.ts +6 -0
- package/src/util/error/named.ts +3 -0
- package/src/util/error/notfound.ts +8 -0
- package/src/util/error/notimplemented.ts +8 -0
- package/src/util/error/parsererror.ts +10 -0
- package/src/util/error/unauthorizederror.ts +8 -0
- package/src/util/index.ts +11 -0
- package/src/util/loader/index.ts +67 -0
- package/src/util/logger/common.ts +6 -0
- package/src/util/logger/factory.ts +45 -0
- package/src/util/logger/formatter.ts +9 -0
- package/src/util/logger/index.ts +6 -0
- package/src/util/logger/logger.ts +114 -0
- package/src/util/logger/transport.ts +69 -0
- package/src/util/parser/common.ts +81 -0
- package/src/util/parser/get.ts +42 -0
- package/src/util/parser/index.ts +6 -0
- package/src/util/parser/parser.ts +235 -0
- package/src/util/parser/types/any.ts +8 -0
- package/src/util/parser/types/array.ts +73 -0
- package/src/util/parser/types/boolean.ts +13 -0
- package/src/util/parser/types/email.ts +26 -0
- package/src/util/parser/types/enum.ts +29 -0
- package/src/util/parser/types/index.ts +12 -0
- package/src/util/parser/types/multiple.ts +36 -0
- package/src/util/parser/types/nested.ts +19 -0
- package/src/util/parser/types/number.ts +34 -0
- package/src/util/parser/types/object.ts +10 -0
- package/src/util/parser/types/regex.ts +17 -0
- package/src/util/parser/types/string.ts +23 -0
- package/src/util/parser/types/url.ts +35 -0
- package/src/util/request/common.ts +193 -0
- package/src/util/request/index.ts +230 -0
- package/src/util/session/common.ts +63 -0
- package/src/util/session/index.ts +2 -0
- package/src/util/session/service.ts +154 -0
- package/src/util/test/app.ts +44 -0
- package/src/util/test/common.ts +17 -0
- package/src/util/test/index.ts +2 -0
- package/src/util/uuid/index.ts +5 -0
- package/src/util/uuid/regex.ts +2 -0
- package/src/util/uuid/rng.ts +14 -0
- package/src/util/uuid/stringify.ts +53 -0
- package/src/util/uuid/v4.ts +30 -0
- package/src/util/uuid/validate.ts +8 -0
- package/tsconfig.json +32 -0
- package/dist/handler/common/response.d.ts +0 -13
- package/dist/handler/common/response.js +0 -54
- package/dist/handler/error.d.ts +0 -2
- package/dist/handler/error.js +0 -46
- package/dist/handler/group.d.ts +0 -3
- package/dist/handler/result.d.ts +0 -4
- package/dist/handler/router.js +0 -119
- package/dist/middleware/index.d.ts +0 -6
|
@@ -28,221 +28,181 @@ const request = (options, logger) => {
|
|
|
28
28
|
if (typeof options.maxRedirects === "undefined") {
|
|
29
29
|
options.maxRedirects = 10;
|
|
30
30
|
}
|
|
31
|
-
const
|
|
32
|
-
const
|
|
33
|
-
|
|
31
|
+
const contentType = options.headers[CONTENT_TYPE_HEADER] || options.headers[CONTENT_TYPE_HEADER.toLowerCase()] || undefined || options.headers[CONTENT_TYPE_HEADER.toUpperCase()];
|
|
32
|
+
const isJSONType = contentType ? contentType.toString().toLocaleLowerCase().indexOf("application/json") === 0 : undefined;
|
|
33
|
+
const noType = !contentType;
|
|
34
|
+
const isText = typeof options.data === "string";
|
|
35
|
+
const JsonStringify = (!isText && (noType || isJSONType));
|
|
36
|
+
if (JsonStringify && noType) {
|
|
34
37
|
options.headers["Content-Type"] = JSON_TYPE;
|
|
35
38
|
}
|
|
36
|
-
else if (
|
|
39
|
+
else if (isText && noType) {
|
|
37
40
|
options.headers["Content-Type"] = TEXT_TYPE;
|
|
38
41
|
}
|
|
39
|
-
const data = options.data ?
|
|
42
|
+
const data = options.data ? JsonStringify ? JSON.stringify(options.data) : options.data : undefined;
|
|
40
43
|
const contentLength = data ? Buffer.from(data).length : 0;
|
|
41
|
-
|
|
42
|
-
|
|
44
|
+
// { socketPath, protocol, queryStr, hash, pathname, hostname, port }
|
|
45
|
+
const parsed = (0, common_1.parseRedirectLocation)(options.url, options.query, options.socketPath);
|
|
46
|
+
if (!parsed.socketPath && !parsed.hostname) {
|
|
43
47
|
throw new Error(`Bad url ${options.url}`);
|
|
44
48
|
}
|
|
45
|
-
|
|
46
|
-
switch (protocol) {
|
|
49
|
+
switch (parsed.protocol) {
|
|
47
50
|
case "https:":
|
|
48
51
|
case "http:":
|
|
49
|
-
const
|
|
50
|
-
agent: false,
|
|
51
|
-
path: `${pathname}${queryStr ? `?${queryStr}` : ""}${hash ? hash : ""}`,
|
|
52
|
-
method: options.method,
|
|
53
|
-
socketPath: options.socketPath,
|
|
54
|
-
headers: options.disableUserAgent ? Object.assign({ ["Content-Length"]: contentLength }, options.headers) : Object.assign({ ["User-Agent"]: DEFAULT_USER_AGENT, ["Content-Length"]: contentLength }, options.headers),
|
|
55
|
-
timeout: options.timeout,
|
|
56
|
-
hostname,
|
|
57
|
-
port
|
|
58
|
-
}, (res) => {
|
|
52
|
+
const readTimeout = options.timeout ? setTimeout(() => {
|
|
59
53
|
try {
|
|
60
|
-
|
|
61
|
-
if (readTimeout) {
|
|
62
|
-
clearTimeout(readTimeout);
|
|
63
|
-
}
|
|
64
|
-
readTimeout = options.timeout ? setTimeout(() => {
|
|
65
|
-
res.removeListener("data", chunkListener);
|
|
66
|
-
res.removeListener("error", errorListener);
|
|
67
|
-
res.removeListener("end", endListener);
|
|
68
|
-
req.end(() => {
|
|
69
|
-
try {
|
|
70
|
-
req.destroy();
|
|
71
|
-
res.destroy();
|
|
72
|
-
}
|
|
73
|
-
catch (e) {
|
|
74
|
-
if (logger) {
|
|
75
|
-
logger.error(e);
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
reject(new Error(`response timeout ${options.timeout}`));
|
|
79
|
-
return;
|
|
80
|
-
});
|
|
81
|
-
}, options.timeout) : null;
|
|
82
|
-
let responseLength = 0;
|
|
83
|
-
const chunkListener = (chunk) => {
|
|
84
|
-
responseLength += chunk.length;
|
|
85
|
-
if (options.maxResponse && options.maxResponse < responseLength) {
|
|
86
|
-
res.removeListener("data", chunkListener);
|
|
87
|
-
res.removeListener("error", errorListener);
|
|
88
|
-
res.removeListener("end", endListener);
|
|
89
|
-
req.end(() => {
|
|
90
|
-
try {
|
|
91
|
-
req.destroy();
|
|
92
|
-
res.destroy();
|
|
93
|
-
}
|
|
94
|
-
catch (e) {
|
|
95
|
-
if (logger) {
|
|
96
|
-
logger.error(e);
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
reject(new Error(`response too big maxResponse ${options.maxResponse} < ${responseLength}`));
|
|
100
|
-
return;
|
|
101
|
-
});
|
|
102
|
-
}
|
|
103
|
-
else {
|
|
104
|
-
buffers.push(chunk);
|
|
105
|
-
}
|
|
106
|
-
};
|
|
107
|
-
const errorListener = (e2) => {
|
|
108
|
-
res.removeListener("data", chunkListener);
|
|
109
|
-
res.removeListener("end", endListener);
|
|
110
|
-
res.removeListener("error", errorListener);
|
|
54
|
+
req.end(() => {
|
|
111
55
|
try {
|
|
112
56
|
req.destroy();
|
|
113
|
-
res.destroy();
|
|
114
57
|
}
|
|
115
58
|
catch (e) {
|
|
116
59
|
if (logger) {
|
|
117
60
|
logger.error(e);
|
|
118
61
|
}
|
|
119
62
|
}
|
|
120
|
-
reject(
|
|
121
|
-
|
|
122
|
-
|
|
63
|
+
reject(new Error(`response timeout ${options.timeout}`));
|
|
64
|
+
return;
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
catch (e) {
|
|
68
|
+
reject(e);
|
|
69
|
+
}
|
|
70
|
+
}, options.timeout) : null;
|
|
71
|
+
const req = (parsed.protocol === "https:" ? https_1.default.request : http_1.default.request)({
|
|
72
|
+
agent: false,
|
|
73
|
+
path: `${parsed.pathname}${parsed.queryStr ? `?${parsed.queryStr}` : ""}${parsed.hash ? parsed.hash : ""}`,
|
|
74
|
+
method: options.method,
|
|
75
|
+
socketPath: options.socketPath,
|
|
76
|
+
headers: options.disableUserAgent ? {
|
|
77
|
+
["Content-Length"]: contentLength,
|
|
78
|
+
...options.headers
|
|
79
|
+
} : {
|
|
80
|
+
["User-Agent"]: DEFAULT_USER_AGENT,
|
|
81
|
+
["Content-Length"]: contentLength,
|
|
82
|
+
...options.headers
|
|
83
|
+
},
|
|
84
|
+
timeout: options.timeout,
|
|
85
|
+
hostname: parsed.hostname,
|
|
86
|
+
port: parsed.port
|
|
87
|
+
}, (res) => (0, common_1.readResponseBuffer)({
|
|
88
|
+
options,
|
|
89
|
+
req,
|
|
90
|
+
readTimeout,
|
|
91
|
+
logger,
|
|
92
|
+
reject,
|
|
93
|
+
res
|
|
94
|
+
}, (buffers) => {
|
|
95
|
+
try {
|
|
96
|
+
const responseBuffer = res.headers["content-encoding"] === "gzip" && !(0, browser_1.isBrowser)() ?
|
|
97
|
+
(0, zlib_1.gunzipSync)(Buffer.concat(buffers)) : Buffer.concat(buffers);
|
|
98
|
+
let data = responseBuffer.toString();
|
|
99
|
+
const contentType = res.headers["content-type"];
|
|
100
|
+
if (contentType && data && (contentType.indexOf("json") !== -1)) {
|
|
101
|
+
data = JSON.parse(responseBuffer.toString());
|
|
102
|
+
}
|
|
103
|
+
const status = res.statusCode;
|
|
104
|
+
if (!status) {
|
|
105
|
+
const err = new common_1.ResponseError(status, res.headers, options.url, null, data, responseBuffer, options.locations ? options.locations : []);
|
|
106
|
+
reject(err);
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
109
|
+
else if (status >= 300 && status < 400 && options.followRedirect) {
|
|
110
|
+
// follow redirect
|
|
111
|
+
const location = res.headers["location"];
|
|
123
112
|
try {
|
|
124
|
-
if (
|
|
125
|
-
|
|
113
|
+
if (!location) {
|
|
114
|
+
reject(new Error(`[${location}] not valid from ${options.url}`));
|
|
115
|
+
return;
|
|
116
|
+
}
|
|
117
|
+
// parse location and add query data from current location
|
|
118
|
+
const locationData = (0, common_1.parseRedirectLocation)(location, options.query, options.socketPath);
|
|
119
|
+
// if no host is set in location header set the current header and protocol
|
|
120
|
+
// protocol is infered from current location
|
|
121
|
+
if (!locationData.hostname && parsed.hostname && !locationData.socketPath) {
|
|
122
|
+
locationData.url = `${parsed.protocol}//${parsed.hostname}${parsed.port ? `:${parsed.port}` : ""}${locationData.url}`;
|
|
126
123
|
}
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
const responseBuffer = res.headers["content-encoding"] === "gzip" && !(0, browser_1.isBrowser)() ?
|
|
130
|
-
(0, zlib_1.gunzipSync)(Buffer.concat(buffers)) : Buffer.concat(buffers);
|
|
131
|
-
let data = responseBuffer.toString();
|
|
132
|
-
const contentType = res.headers["content-type"];
|
|
133
|
-
if (contentType && data && (contentType.indexOf("json") !== -1)) {
|
|
134
|
-
data = JSON.parse(responseBuffer.toString());
|
|
124
|
+
if (logger) {
|
|
125
|
+
logger.debug(`redirecting to [${locationData.url}] from [${options.url}][${status}]`);
|
|
135
126
|
}
|
|
136
|
-
|
|
137
|
-
if (
|
|
138
|
-
|
|
139
|
-
reject(err);
|
|
127
|
+
// avoid loop redirect
|
|
128
|
+
if (options.url === locationData.url || (options.locations && options.locations.indexOf(locationData.url) !== -1)) {
|
|
129
|
+
reject(new Error(`loop redirect to [${location}] from [${options.url}][${status}] locations ${options.locations ? options.locations.join(",") : "[]"}`));
|
|
140
130
|
return;
|
|
141
131
|
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
// if no host is set in location header set the current header and protocol
|
|
149
|
-
// protocol is infered from current location
|
|
150
|
-
if (!locationData.hostname && hostname && !locationData.socketPath) {
|
|
151
|
-
locationData.url = `${protocol}//${hostname}${port ? `:${port}` : ""}${locationData.url}`;
|
|
152
|
-
}
|
|
153
|
-
if (logger) {
|
|
154
|
-
logger.debug(`redirecting to [${locationData.url}] from [${options.url}][${status}]`);
|
|
155
|
-
}
|
|
156
|
-
// avoid loop redirect
|
|
157
|
-
if (options.url === locationData.url || (options.locations && options.locations.indexOf(locationData.url) !== -1)) {
|
|
158
|
-
reject(new Error(`loop redirect to [${location}] from [${options.url}][${status}] locations ${options.locations ? options.locations.join(",") : "[]"}`));
|
|
159
|
-
return;
|
|
160
|
-
}
|
|
161
|
-
// append new location
|
|
162
|
-
options.locations = options.locations ? options.locations.concat([locationData.url]) : [options.url, locationData.url];
|
|
163
|
-
// check options.maxRedirects
|
|
164
|
-
if (options.maxRedirects !== undefined && (options.locations.length - 1) > options.maxRedirects) {
|
|
165
|
-
reject(new Error(`too many redirects to [${location}] from [${options.url}][${status}]`));
|
|
166
|
-
return;
|
|
167
|
-
}
|
|
168
|
-
// request new location pass current options
|
|
169
|
-
(0, exports.request)(Object.assign(Object.assign({}, options), { socketPath: locationData.socketPath, url: locationData.url, locations: options.locations }), logger).then((ret) => {
|
|
170
|
-
resolve(Object.assign(Object.assign({}, ret), { url: options.url, redirectedUrl: ret.locations && ret.locations.length > 0 ? ret.locations[ret.locations.length - 1] : ret.url }));
|
|
171
|
-
return;
|
|
172
|
-
}).catch((e4) => {
|
|
173
|
-
// bad redirect
|
|
174
|
-
if (e4.url && e4.status && e4.headers && e4.data) {
|
|
175
|
-
const err = new common_1.ResponseError(e4.status, e4.headers, e4.url, e4.redirectedUrl, e4.data, e4.buffer, e4.locations ? e4.locations : (options.locations ? options.locations : []));
|
|
176
|
-
err.stack = e4.stack;
|
|
177
|
-
reject(err);
|
|
178
|
-
return;
|
|
179
|
-
}
|
|
180
|
-
else {
|
|
181
|
-
e4.redirectedUrl = locationData.url;
|
|
182
|
-
e4.locations = options.locations;
|
|
183
|
-
e4.url = options.url;
|
|
184
|
-
reject(e4);
|
|
185
|
-
return;
|
|
186
|
-
}
|
|
187
|
-
});
|
|
188
|
-
return;
|
|
189
|
-
}
|
|
190
|
-
catch (e5) {
|
|
191
|
-
reject(new common_1.ResponseError(status, res.headers, options.url, location, data, responseBuffer, options.locations ? options.locations : []));
|
|
192
|
-
return;
|
|
193
|
-
}
|
|
132
|
+
// append new location
|
|
133
|
+
options.locations = options.locations ? options.locations.concat([locationData.url]) : [options.url, locationData.url];
|
|
134
|
+
// check options.maxRedirects
|
|
135
|
+
if (options.maxRedirects !== undefined && (options.locations.length - 1) > options.maxRedirects) {
|
|
136
|
+
reject(new Error(`too many redirects to [${location}] from [${options.url}][${status}]`));
|
|
137
|
+
return;
|
|
194
138
|
}
|
|
195
|
-
|
|
196
|
-
|
|
139
|
+
// request new location pass current options
|
|
140
|
+
(0, exports.request)({
|
|
141
|
+
...options,
|
|
142
|
+
socketPath: locationData.socketPath,
|
|
143
|
+
url: locationData.url,
|
|
144
|
+
locations: options.locations
|
|
145
|
+
}, logger).then((ret) => {
|
|
197
146
|
resolve({
|
|
147
|
+
...ret,
|
|
198
148
|
url: options.url,
|
|
199
|
-
|
|
200
|
-
locations: options.locations ? options.locations : [],
|
|
201
|
-
redirectedUrl: null,
|
|
202
|
-
headers: res.headers,
|
|
203
|
-
data,
|
|
204
|
-
buffer: responseBuffer
|
|
149
|
+
redirectedUrl: ret.locations && ret.locations.length > 0 ? ret.locations[ret.locations.length - 1] : ret.url
|
|
205
150
|
});
|
|
206
151
|
return;
|
|
207
|
-
}
|
|
208
|
-
|
|
209
|
-
if (
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
locations: options.locations ? options.locations : [],
|
|
215
|
-
redirectedUrl: null,
|
|
216
|
-
headers: res.headers,
|
|
217
|
-
data,
|
|
218
|
-
buffer: responseBuffer
|
|
219
|
-
});
|
|
152
|
+
}).catch((e4) => {
|
|
153
|
+
// bad redirect
|
|
154
|
+
if (e4.url && e4.status && e4.headers && e4.data) {
|
|
155
|
+
const err = new common_1.ResponseError(e4.status, e4.headers, e4.url, e4.redirectedUrl, e4.data, e4.buffer, e4.locations ? e4.locations : (options.locations ? options.locations : []));
|
|
156
|
+
err.stack = e4.stack;
|
|
157
|
+
reject(err);
|
|
158
|
+
return;
|
|
220
159
|
}
|
|
221
160
|
else {
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
161
|
+
e4.redirectedUrl = locationData.url;
|
|
162
|
+
e4.locations = options.locations;
|
|
163
|
+
e4.url = options.url;
|
|
164
|
+
reject(e4);
|
|
165
|
+
return;
|
|
225
166
|
}
|
|
226
|
-
|
|
227
|
-
|
|
167
|
+
});
|
|
168
|
+
return;
|
|
228
169
|
}
|
|
229
|
-
catch (
|
|
230
|
-
reject(
|
|
170
|
+
catch (e5) {
|
|
171
|
+
reject(new common_1.ResponseError(status, res.headers, options.url, location ? location : null, data, responseBuffer, options.locations ? options.locations : []));
|
|
231
172
|
return;
|
|
232
173
|
}
|
|
233
|
-
};
|
|
234
|
-
try {
|
|
235
|
-
// setup listeners
|
|
236
|
-
res.on("data", chunkListener);
|
|
237
|
-
res.once("error", errorListener);
|
|
238
|
-
res.once("end", endListener);
|
|
239
174
|
}
|
|
240
|
-
|
|
241
|
-
//
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
175
|
+
else if (status >= 200 && status < 300) {
|
|
176
|
+
// always resolve with 2xx
|
|
177
|
+
resolve({
|
|
178
|
+
url: options.url,
|
|
179
|
+
status,
|
|
180
|
+
locations: options.locations ? options.locations : [],
|
|
181
|
+
redirectedUrl: null,
|
|
182
|
+
headers: res.headers,
|
|
183
|
+
data,
|
|
184
|
+
buffer: responseBuffer
|
|
185
|
+
});
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
else {
|
|
189
|
+
if (options.disableThrow && status !== undefined) {
|
|
190
|
+
// disable throw and resolve with 4xx 5xx etc
|
|
191
|
+
resolve({
|
|
192
|
+
url: options.url,
|
|
193
|
+
status,
|
|
194
|
+
locations: options.locations ? options.locations : [],
|
|
195
|
+
redirectedUrl: null,
|
|
196
|
+
headers: res.headers,
|
|
197
|
+
data,
|
|
198
|
+
buffer: responseBuffer
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
else {
|
|
202
|
+
// throw with 4xx 5xx etc
|
|
203
|
+
const err = new common_1.ResponseError(status, res.headers, options.url, null, data, responseBuffer, options.locations ? options.locations : []);
|
|
204
|
+
reject(err);
|
|
205
|
+
}
|
|
246
206
|
return;
|
|
247
207
|
}
|
|
248
208
|
}
|
|
@@ -250,34 +210,17 @@ const request = (options, logger) => {
|
|
|
250
210
|
reject(e);
|
|
251
211
|
return;
|
|
252
212
|
}
|
|
253
|
-
});
|
|
213
|
+
}));
|
|
254
214
|
req.once("error", (e) => {
|
|
255
215
|
if (e.code === "ECONNREFUSED") {
|
|
256
216
|
e.name = "ResponseConnectionRefusedError";
|
|
257
217
|
}
|
|
258
218
|
reject(e);
|
|
259
219
|
});
|
|
260
|
-
if (readTimeout) {
|
|
261
|
-
clearTimeout(readTimeout);
|
|
262
|
-
}
|
|
263
|
-
readTimeout = options.timeout ? setTimeout(() => {
|
|
264
|
-
req.end(() => {
|
|
265
|
-
try {
|
|
266
|
-
req.destroy();
|
|
267
|
-
}
|
|
268
|
-
catch (e) {
|
|
269
|
-
if (logger) {
|
|
270
|
-
logger.error(e);
|
|
271
|
-
}
|
|
272
|
-
}
|
|
273
|
-
reject(new Error(`response timeout ${options.timeout}`));
|
|
274
|
-
return;
|
|
275
|
-
});
|
|
276
|
-
}, options.timeout) : null;
|
|
277
220
|
req.end(data);
|
|
278
221
|
break;
|
|
279
222
|
default:
|
|
280
|
-
reject(new Error(`unknown protocol [${protocol}]`));
|
|
223
|
+
reject(new Error(`unknown protocol [${parsed.protocol}]`));
|
|
281
224
|
}
|
|
282
225
|
}
|
|
283
226
|
catch (e) {
|
|
@@ -287,3 +230,4 @@ const request = (options, logger) => {
|
|
|
287
230
|
}
|
|
288
231
|
};
|
|
289
232
|
exports.request = request;
|
|
233
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/request/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { SimpleMap, SimpleTypes } from "../parser/common";
|
|
2
|
+
export interface NoTokenSession extends SimpleMap<SimpleTypes> {
|
|
3
|
+
account: string;
|
|
4
|
+
username: string;
|
|
5
|
+
groups: string[];
|
|
6
|
+
}
|
|
7
|
+
export interface Session extends NoTokenSession {
|
|
8
|
+
token: string;
|
|
9
|
+
}
|
|
10
|
+
export declare type GroupPolicyType = "at_least_one" | "all";
|
|
11
|
+
export declare type GroupPolicyGroups = string | string[];
|
|
12
|
+
export interface GroupPolicy {
|
|
13
|
+
groups: GroupPolicyGroups[];
|
|
14
|
+
groupPolicy: GroupPolicyType;
|
|
15
|
+
}
|
|
16
|
+
export declare const policyCheck: (session: Session, options: GroupPolicy) => boolean;
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.policyCheck = void 0;
|
|
4
|
+
const error_1 = require("../error");
|
|
5
|
+
const policyCheck = (session, options) => {
|
|
6
|
+
switch (options.groupPolicy) {
|
|
7
|
+
case "at_least_one":
|
|
8
|
+
for (const group of options.groups) {
|
|
9
|
+
if (group instanceof Array) {
|
|
10
|
+
let ret = true;
|
|
11
|
+
for (const g of group) {
|
|
12
|
+
if (session.groups.indexOf(g) === -1) {
|
|
13
|
+
ret = false;
|
|
14
|
+
break;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
if (ret) {
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
if (session.groups.indexOf(group) !== -1) {
|
|
23
|
+
return true;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return false;
|
|
28
|
+
case "all":
|
|
29
|
+
for (const group of options.groups) {
|
|
30
|
+
if (group instanceof Array) {
|
|
31
|
+
for (const g of group) {
|
|
32
|
+
if (session.groups.indexOf(g) === -1) {
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
if (session.groups.indexOf(group) === -1) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return true;
|
|
44
|
+
default:
|
|
45
|
+
throw new error_1.ParseOptionsError(`policy [${options.groupPolicy}] not implemented!!`);
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
exports.policyCheck = policyCheck;
|
|
49
|
+
//# sourceMappingURL=common.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/util/session/common.ts"],"names":[],"mappings":";;;AAAA,oCAA6C;AAsBtC,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAE,OAAoB,EAAW,EAAE;IAC7E,QAAQ,OAAO,CAAC,WAAW,EAAE;QAC3B,KAAK,cAAc;YACjB,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,IAAI,GAAG,GAAG,IAAI,CAAC;oBACf,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,GAAG,GAAG,KAAK,CAAC;4BACZ,MAAM;yBACP;qBACF;oBACD,IAAI,GAAG,EAAE;wBACP,OAAO,IAAI,CAAC;qBACb;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,IAAI,CAAC;qBACb;iBACF;aACF;YACD,OAAO,KAAK,CAAC;QACf,KAAK,KAAK;YACR,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,OAAO,KAAK,CAAC;yBACd;qBACF;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,KAAK,CAAC;qBACd;iBACF;aACF;YACD,OAAO,IAAI,CAAC;QACd;YACE,MAAM,IAAI,yBAAiB,CAAC,WAAW,OAAO,CAAC,WAAW,qBAAqB,CAAC,CAAC;KACpF;AACH,CAAC,CAAC;AAxCW,QAAA,WAAW,eAwCtB"}
|
|
@@ -1,16 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export
|
|
3
|
-
account: string;
|
|
4
|
-
username: string;
|
|
5
|
-
groups: string[];
|
|
6
|
-
}
|
|
7
|
-
export interface Session extends NoTokenSession {
|
|
8
|
-
token: string;
|
|
9
|
-
}
|
|
10
|
-
export declare type GroupPolicyType = "at_least_one" | "all";
|
|
11
|
-
export declare type GroupPolicyGroups = string | string[];
|
|
12
|
-
export interface GroupPolicy {
|
|
13
|
-
groups: GroupPolicyGroups[];
|
|
14
|
-
groupPolicy: GroupPolicyType;
|
|
15
|
-
}
|
|
16
|
-
export declare const policyCheck: (session: Session, options: GroupPolicy) => boolean;
|
|
1
|
+
export * from "./common";
|
|
2
|
+
export * from "./service";
|
|
@@ -1,48 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
for (const g of group) {
|
|
12
|
-
if (session.groups.indexOf(g) === -1) {
|
|
13
|
-
ret = false;
|
|
14
|
-
break;
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
if (ret) {
|
|
18
|
-
return true;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
else {
|
|
22
|
-
if (session.groups.indexOf(group) !== -1) {
|
|
23
|
-
return true;
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
return false;
|
|
28
|
-
case "all":
|
|
29
|
-
for (const group of options.groups) {
|
|
30
|
-
if (group instanceof Array) {
|
|
31
|
-
for (const g of group) {
|
|
32
|
-
if (session.groups.indexOf(g) === -1) {
|
|
33
|
-
return false;
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
else {
|
|
38
|
-
if (session.groups.indexOf(group) === -1) {
|
|
39
|
-
return false;
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
return true;
|
|
44
|
-
default:
|
|
45
|
-
throw new error_1.ParseOptionsError(`policy [${options.groupPolicy}] not implemented!!`);
|
|
46
|
-
}
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
47
11
|
};
|
|
48
|
-
exports
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
__exportStar(require("./common"), exports);
|
|
14
|
+
__exportStar(require("./service"), exports);
|
|
15
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/session/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyB;AACzB,4CAA0B"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { Session, NoTokenSession } from "./common";
|
|
2
|
+
import { Context } from "../../handler/common";
|
|
3
|
+
import { RequestOptions, RequestResponse } from "../request";
|
|
4
|
+
export interface VerifyTokenService {
|
|
5
|
+
verify(args: {
|
|
6
|
+
token: string;
|
|
7
|
+
ctx: Context;
|
|
8
|
+
}): Promise<Session | null>;
|
|
9
|
+
}
|
|
10
|
+
export interface VerifyEndpointServiceOptions {
|
|
11
|
+
url: string;
|
|
12
|
+
method: string;
|
|
13
|
+
tokenLocation: "header" | "query" | "cookie";
|
|
14
|
+
tokenLocationName: string | ((ctx: Context) => Promise<string>);
|
|
15
|
+
}
|
|
16
|
+
export declare class VerifyEndpointService implements VerifyTokenService {
|
|
17
|
+
protected options: VerifyEndpointServiceOptions;
|
|
18
|
+
constructor(options?: VerifyEndpointServiceOptions);
|
|
19
|
+
verify({ token, ctx }: {
|
|
20
|
+
token: string;
|
|
21
|
+
ctx: Context;
|
|
22
|
+
}): Promise<Session | null>;
|
|
23
|
+
protected getResponse(config: RequestOptions, ctx?: Context): Promise<RequestResponse>;
|
|
24
|
+
protected checkSession(session: NoTokenSession, ctx?: Context): boolean;
|
|
25
|
+
protected decodeSession(response: RequestResponse, token: string, ctx?: Context): Promise<NoTokenSession>;
|
|
26
|
+
}
|