@mojojs/core 0.13.0 → 0.14.0
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/lib/context.d.ts +2 -2
- package/lib/context.js.map +1 -1
- package/lib/session.d.ts +3 -2
- package/lib/session.js +7 -3
- package/lib/session.js.map +1 -1
- package/lib/types.d.ts +12 -1
- package/lib/user-agent/cookie-jar.d.ts +9 -0
- package/lib/user-agent/cookie-jar.js +27 -0
- package/lib/user-agent/cookie-jar.js.map +1 -0
- package/lib/user-agent/mock.js +1 -0
- package/lib/user-agent/mock.js.map +1 -1
- package/lib/user-agent/transport/http.d.ts +12 -0
- package/lib/user-agent/transport/http.js +42 -0
- package/lib/user-agent/transport/http.js.map +1 -0
- package/lib/user-agent/transport/https.d.ts +11 -0
- package/lib/user-agent/transport/https.js +22 -0
- package/lib/user-agent/transport/https.js.map +1 -0
- package/lib/user-agent/transport/ws.d.ts +5 -0
- package/lib/user-agent/transport/ws.js +21 -0
- package/lib/user-agent/transport/ws.js.map +1 -0
- package/lib/user-agent.d.ts +67 -11
- package/lib/user-agent.js +78 -85
- package/lib/user-agent.js.map +1 -1
- package/package.json +1 -1
- package/lib/validator/schema.d.ts +0 -8
- package/lib/validator/schema.js +0 -19
- package/lib/validator/schema.js.map +0 -1
package/lib/context.d.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import type { App } from './app.js';
|
|
3
3
|
import type { ChildLogger } from './logger.js';
|
|
4
4
|
import type { Plan } from './router/plan.js';
|
|
5
|
+
import type { SessionData } from './types.js';
|
|
5
6
|
import type { MojoAction, RenderOptions, ServerRequestOptions, ValidatorFunction } from './types.js';
|
|
6
7
|
import type { UserAgent } from './user-agent.js';
|
|
7
8
|
import type { WebSocket } from './websocket.js';
|
|
@@ -12,7 +13,6 @@ import EventEmitter from 'events';
|
|
|
12
13
|
import { Params } from './body/params.js';
|
|
13
14
|
import { ServerRequest } from './server/request.js';
|
|
14
15
|
import { ServerResponse } from './server/response.js';
|
|
15
|
-
declare type SessionData = Record<string, any>;
|
|
16
16
|
declare type WebSocketHandler = (ws: WebSocket) => void | Promise<void>;
|
|
17
17
|
interface ContextEvents {
|
|
18
18
|
connection: (ws: WebSocket) => void;
|
|
@@ -38,7 +38,7 @@ declare class Context extends EventEmitter {
|
|
|
38
38
|
[EventEmitter.captureRejectionSymbol](error: Error): void;
|
|
39
39
|
accepts(allowed?: string[]): string[] | null;
|
|
40
40
|
get config(): Record<string, any>;
|
|
41
|
-
flash(): Promise<
|
|
41
|
+
flash(): Promise<Record<string, any>>;
|
|
42
42
|
handleUpgrade(ws: WebSocket): void;
|
|
43
43
|
get home(): Path;
|
|
44
44
|
get isAccepted(): boolean;
|
package/lib/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
|
package/lib/session.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { App } from './app.js';
|
|
2
2
|
import type { Context } from './context.js';
|
|
3
|
+
import type { SessionData } from './types.js';
|
|
3
4
|
export declare class Session {
|
|
4
5
|
cookieName: string;
|
|
5
6
|
cookiePath: string;
|
|
@@ -11,6 +12,6 @@ export declare class Session {
|
|
|
11
12
|
constructor(app: App);
|
|
12
13
|
static decrypt(secrets: string[], encrypted: string): Promise<string | null>;
|
|
13
14
|
static encrypt(secret: string, value: string): Promise<string>;
|
|
14
|
-
load(ctx: Context): Promise<
|
|
15
|
-
store(ctx: Context, data:
|
|
15
|
+
load(ctx: Context): Promise<SessionData | null>;
|
|
16
|
+
store(ctx: Context, data: SessionData): Promise<void>;
|
|
16
17
|
}
|
package/lib/session.js
CHANGED
|
@@ -62,15 +62,19 @@ export class Session {
|
|
|
62
62
|
return data;
|
|
63
63
|
}
|
|
64
64
|
async store(ctx, data) {
|
|
65
|
-
if (typeof data.expires !== 'number')
|
|
66
|
-
|
|
65
|
+
if (typeof data.expires !== 'number') {
|
|
66
|
+
const expiration = data.expiration ?? this.expiration;
|
|
67
|
+
if (expiration > 0)
|
|
68
|
+
data.expires = Math.round(Date.now() / 1000) + expiration;
|
|
69
|
+
}
|
|
67
70
|
const app = this._app.deref();
|
|
68
71
|
if (app === undefined)
|
|
69
72
|
return;
|
|
70
73
|
delete data.flash;
|
|
71
74
|
const encrypted = await Session.encrypt(app.secrets[0], JSON.stringify(data));
|
|
75
|
+
const expires = data.expires;
|
|
72
76
|
ctx.res.setCookie(this.cookieName, encrypted, {
|
|
73
|
-
expires: new Date(
|
|
77
|
+
expires: expires === undefined ? undefined : new Date(expires * 1000),
|
|
74
78
|
httpOnly: this.httpOnly,
|
|
75
79
|
path: this.cookiePath,
|
|
76
80
|
sameSite: this.sameSite,
|
package/lib/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
|
@@ -26,6 +26,17 @@ export declare type MojoAction = (ctx: MojoContext, ...args: any[]) => any;
|
|
|
26
26
|
export declare type AnyArguments = Array<string | string[] | MojoAction | Record<string, string[] | RegExp>>;
|
|
27
27
|
export declare type RouteArguments = Array<string | MojoAction | Record<string, string[] | RegExp>>;
|
|
28
28
|
export declare type PlaceholderType = RegExp | string | string[];
|
|
29
|
+
export interface SessionData {
|
|
30
|
+
expiration?: number;
|
|
31
|
+
expires?: number;
|
|
32
|
+
flash?: {
|
|
33
|
+
[key: string]: any;
|
|
34
|
+
};
|
|
35
|
+
nextFlash?: {
|
|
36
|
+
[key: string]: any;
|
|
37
|
+
};
|
|
38
|
+
[key: string]: any;
|
|
39
|
+
}
|
|
29
40
|
export interface AppOptions {
|
|
30
41
|
config?: Record<string, any>;
|
|
31
42
|
exceptionFormat?: string;
|
|
@@ -87,7 +98,7 @@ export interface UserAgentRequestOptions extends SharedUserAgentRequestOptions {
|
|
|
87
98
|
body?: string | Buffer | NodeJS.ReadableStream;
|
|
88
99
|
form?: Record<string, string>;
|
|
89
100
|
formData?: Record<string, string> | FormData;
|
|
90
|
-
|
|
101
|
+
insecure?: boolean;
|
|
91
102
|
json?: JSONValue;
|
|
92
103
|
method?: string;
|
|
93
104
|
servername?: string;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import type { URL } from 'url';
|
|
3
|
+
import tough from 'tough-cookie';
|
|
4
|
+
export declare class CookieJar {
|
|
5
|
+
storage: tough.CookieJar;
|
|
6
|
+
loadCookies(url: URL): Promise<string | null>;
|
|
7
|
+
storeCookies(url: URL, header?: string[]): Promise<void>;
|
|
8
|
+
_cookieURL(currentURL: URL): string;
|
|
9
|
+
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { format } from 'url';
|
|
2
|
+
import tough from 'tough-cookie';
|
|
3
|
+
export class CookieJar {
|
|
4
|
+
constructor() {
|
|
5
|
+
this.storage = new tough.CookieJar();
|
|
6
|
+
}
|
|
7
|
+
async loadCookies(url) {
|
|
8
|
+
const cookies = await this.storage.getCookies(this._cookieURL(url));
|
|
9
|
+
if (cookies.length > 0)
|
|
10
|
+
return cookies.map(cookie => cookie.cookieString()).join('; ');
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
13
|
+
async storeCookies(url, header) {
|
|
14
|
+
if (header === undefined)
|
|
15
|
+
return;
|
|
16
|
+
const cookieURL = this._cookieURL(url);
|
|
17
|
+
for (const cookie of header.map(value => tough.Cookie.parse(value ?? ''))) {
|
|
18
|
+
if (cookie === undefined)
|
|
19
|
+
continue;
|
|
20
|
+
await this.storage.setCookie(cookie, cookieURL);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
_cookieURL(currentURL) {
|
|
24
|
+
return format(currentURL, { auth: false, fragment: false, search: false });
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=cookie-jar.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cookie-jar.js","sourceRoot":"","sources":["../../src/user-agent/cookie-jar.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,MAAM,cAAc,CAAC;AAEjC,MAAM,OAAO,SAAS;IAAtB;QACE,YAAO,GAAG,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;IAqBlC,CAAC;IAnBC,KAAK,CAAC,WAAW,CAAC,GAAQ;QACxB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QACpE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAQ,EAAE,MAAiB;QAC5C,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO;QAEjC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACvC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE;YACzE,IAAI,MAAM,KAAK,SAAS;gBAAE,SAAS;YACnC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;SACjD;IACH,CAAC;IAED,UAAU,CAAC,UAAe;QACxB,OAAO,MAAM,CAAC,UAAU,EAAE,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAC,CAAC,CAAC;IAC3E,CAAC;CACF"}
|
package/lib/user-agent/mock.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../src/user-agent/mock.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AACpC,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAE3C,MAAM,OAAO,aAAc,SAAQ,SAAS;IAG1C,YAAY,OAA0B;QACpC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,GAAQ,EAAE,OAA0B;QAChE,OAAO,MAAM,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAQ;QAClB,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,EAAC,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;QACpF,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;YAAE,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO;QACtC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../src/user-agent/mock.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AACpC,OAAO,EAAC,SAAS,EAAC,MAAM,kBAAkB,CAAC;AAE3C,MAAM,OAAO,aAAc,SAAQ,SAAS;IAG1C,YAAY,OAA0B;QACpC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,GAAQ,EAAE,OAA0B;QAChE,OAAO,MAAM,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAQ;QAClB,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,EAAC,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;QACpF,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;YAAE,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO;QACtC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;CACF"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import type { UserAgentRequestOptions } from '../../types.js';
|
|
3
|
+
import type { URL } from 'url';
|
|
4
|
+
import http from 'http';
|
|
5
|
+
import { UserAgentResponse } from '../response.js';
|
|
6
|
+
export declare class HTTPTransport {
|
|
7
|
+
agent: http.Agent;
|
|
8
|
+
destroy(): void;
|
|
9
|
+
request(config: UserAgentRequestOptions): Promise<UserAgentResponse>;
|
|
10
|
+
_prepareOptions(config: UserAgentRequestOptions): http.RequestOptions;
|
|
11
|
+
_sendRequest(url: URL, options: http.RequestOptions, cb: (res: http.IncomingMessage) => void): http.ClientRequest;
|
|
12
|
+
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import http from 'http';
|
|
2
|
+
import Stream from 'stream';
|
|
3
|
+
import { UserAgentResponse } from '../response.js';
|
|
4
|
+
export class HTTPTransport {
|
|
5
|
+
constructor() {
|
|
6
|
+
this.agent = new http.Agent();
|
|
7
|
+
}
|
|
8
|
+
destroy() {
|
|
9
|
+
this.agent.destroy();
|
|
10
|
+
}
|
|
11
|
+
async request(config) {
|
|
12
|
+
const options = this._prepareOptions(config);
|
|
13
|
+
return await new Promise((resolve, reject) => {
|
|
14
|
+
const req = this._sendRequest(config.url, options, res => resolve(new UserAgentResponse(res)));
|
|
15
|
+
req.once('error', reject);
|
|
16
|
+
req.once('close', reject);
|
|
17
|
+
if (config.body instanceof Buffer) {
|
|
18
|
+
req.end(config.body);
|
|
19
|
+
}
|
|
20
|
+
else if (config.body instanceof Stream) {
|
|
21
|
+
config.body.pipe(req);
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
req.end();
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
_prepareOptions(config) {
|
|
29
|
+
const options = { headers: config.headers, method: (config.method ?? '').toUpperCase() };
|
|
30
|
+
if (config.agent !== undefined)
|
|
31
|
+
options.agent = config.agent;
|
|
32
|
+
if (options.agent === undefined)
|
|
33
|
+
options.agent = this.agent;
|
|
34
|
+
if (config.auth !== undefined)
|
|
35
|
+
options.auth = config.auth;
|
|
36
|
+
return options;
|
|
37
|
+
}
|
|
38
|
+
_sendRequest(url, options, cb) {
|
|
39
|
+
return http.request(url, options, cb);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=http.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/user-agent/transport/http.ts"],"names":[],"mappings":"AAEA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAEjD,MAAM,OAAO,aAAa;IAA1B;QACE,UAAK,GAAG,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;IAmC3B,CAAC;IAjCC,OAAO;QACL,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,MAA+B;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QAE7C,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAU,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACtG,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1B,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAE1B,IAAI,MAAM,CAAC,IAAI,YAAY,MAAM,EAAE;gBACjC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACtB;iBAAM,IAAI,MAAM,CAAC,IAAI,YAAY,MAAM,EAAE;gBACxC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACvB;iBAAM;gBACL,GAAG,CAAC,GAAG,EAAE,CAAC;aACX;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,eAAe,CAAC,MAA+B;QAC7C,MAAM,OAAO,GAAwB,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,EAAC,CAAC;QAC5G,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS;YAAE,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC7D,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS;YAAE,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5D,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QAC1D,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,YAAY,CAAC,GAAQ,EAAE,OAA4B,EAAE,EAAuC;QAC1F,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IACxC,CAAC;CACF"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import type { UserAgentRequestOptions } from '../../types.js';
|
|
3
|
+
import type http from 'http';
|
|
4
|
+
import type { URL } from 'url';
|
|
5
|
+
import https from 'https';
|
|
6
|
+
import { HTTPTransport } from './http.js';
|
|
7
|
+
export declare class HTTPSTransport extends HTTPTransport {
|
|
8
|
+
agent: https.Agent;
|
|
9
|
+
_prepareOptions(config: UserAgentRequestOptions): https.RequestOptions;
|
|
10
|
+
_sendRequest(url: URL, options: https.RequestOptions, cb: (res: http.IncomingMessage) => void): http.ClientRequest;
|
|
11
|
+
}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import https from 'https';
|
|
2
|
+
import { HTTPTransport } from './http.js';
|
|
3
|
+
export class HTTPSTransport extends HTTPTransport {
|
|
4
|
+
constructor() {
|
|
5
|
+
super(...arguments);
|
|
6
|
+
this.agent = new https.Agent();
|
|
7
|
+
}
|
|
8
|
+
_prepareOptions(config) {
|
|
9
|
+
const options = super._prepareOptions(config);
|
|
10
|
+
if (config.ca !== undefined)
|
|
11
|
+
options.ca = config.ca;
|
|
12
|
+
if (config.insecure !== undefined)
|
|
13
|
+
options.rejectUnauthorized = config.insecure !== true;
|
|
14
|
+
if (config.servername !== undefined)
|
|
15
|
+
options.servername = config.servername;
|
|
16
|
+
return options;
|
|
17
|
+
}
|
|
18
|
+
_sendRequest(url, options, cb) {
|
|
19
|
+
return https.request(url, options, cb);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=https.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"https.js","sourceRoot":"","sources":["../../../src/user-agent/transport/https.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,aAAa,EAAC,MAAM,WAAW,CAAC;AAExC,MAAM,OAAO,cAAe,SAAQ,aAAa;IAAjD;;QACE,UAAK,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;IAa5B,CAAC;IAXC,eAAe,CAAC,MAA+B;QAC7C,MAAM,OAAO,GAAyB,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACpE,IAAI,MAAM,CAAC,EAAE,KAAK,SAAS;YAAE,OAAO,CAAC,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACpD,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS;YAAE,OAAO,CAAC,kBAAkB,GAAG,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC;QACzF,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS;YAAE,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;QAC5E,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,YAAY,CAAC,GAAQ,EAAE,OAA6B,EAAE,EAAuC;QAC3F,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IACzC,CAAC;CACF"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { WebSocket } from '../../websocket.js';
|
|
2
|
+
import { UserAgentResponse } from '../response.js';
|
|
3
|
+
import WS from 'ws';
|
|
4
|
+
export class WSTransport {
|
|
5
|
+
async connect(config) {
|
|
6
|
+
const ws = new WS(config.url ?? '', config.protocols, { headers: config.headers });
|
|
7
|
+
return await new Promise((resolve, reject) => {
|
|
8
|
+
let handshake;
|
|
9
|
+
ws.on('upgrade', res => (handshake = new UserAgentResponse(res)));
|
|
10
|
+
ws.on('error', reject);
|
|
11
|
+
ws.on('open', () => {
|
|
12
|
+
// Workaround for a race condition where the first message arrives before the promise resolves
|
|
13
|
+
const socket = handshake.raw.socket;
|
|
14
|
+
socket.pause();
|
|
15
|
+
queueMicrotask(() => socket.resume());
|
|
16
|
+
resolve(new WebSocket(ws, handshake, { jsonMode: config.json ?? false }));
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=ws.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../../src/user-agent/transport/ws.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,OAAO,WAAW;IACtB,KAAK,CAAC,OAAO,CAAC,MAAiC;QAC7C,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,EAAE,MAAM,CAAC,SAAS,EAAE,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAC,CAAC,CAAC;QACjF,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,IAAI,SAA4B,CAAC;YACjC,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,SAAS,GAAG,IAAI,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAClE,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAEvB,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;gBACjB,8FAA8F;gBAC9F,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC;gBACpC,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,cAAc,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBACtC,OAAO,CAAC,IAAI,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,EAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,IAAI,KAAK,EAAC,CAAC,CAAC,CAAC;YAC1E,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
|
package/lib/user-agent.d.ts
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { UserAgentOptions, UserAgentRequestOptions, UserAgentWebSocketOptions } from './types.js';
|
|
3
|
+
import type { UserAgentResponse } from './user-agent/response.js';
|
|
4
|
+
import type { WebSocket } from './websocket.js';
|
|
3
5
|
import EventEmitter from 'events';
|
|
4
|
-
import http from 'http';
|
|
5
6
|
import { URL } from 'url';
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
7
|
+
import { CookieJar } from './user-agent/cookie-jar.js';
|
|
8
|
+
import { HTTPTransport } from './user-agent/transport/http.js';
|
|
9
|
+
import { HTTPSTransport } from './user-agent/transport/https.js';
|
|
10
|
+
import { WSTransport } from './user-agent/transport/ws.js';
|
|
8
11
|
import FormData from 'form-data';
|
|
9
|
-
import tough from 'tough-cookie';
|
|
10
12
|
interface Upload {
|
|
11
13
|
content: string;
|
|
12
14
|
filename: string;
|
|
@@ -20,29 +22,83 @@ declare interface UserAgent {
|
|
|
20
22
|
on: <T extends keyof UserAgentEvents>(event: T, listener: UserAgentEvents[T]) => this;
|
|
21
23
|
emit: <T extends keyof UserAgentEvents>(event: T, ...args: Parameters<UserAgentEvents[T]>) => boolean;
|
|
22
24
|
}
|
|
25
|
+
/**
|
|
26
|
+
* HTTP and WebSocket user agent.
|
|
27
|
+
*/
|
|
23
28
|
declare class UserAgent extends EventEmitter {
|
|
29
|
+
/**
|
|
30
|
+
* Base URL to be used to resolve all relative request URLs with.
|
|
31
|
+
*/
|
|
24
32
|
baseUrl: string | URL | undefined;
|
|
25
|
-
|
|
33
|
+
/**
|
|
34
|
+
* Cookie jar to use.
|
|
35
|
+
*/
|
|
36
|
+
cookieJar: CookieJar | null;
|
|
37
|
+
/**
|
|
38
|
+
* Transport backend to perform HTTP requests with.
|
|
39
|
+
*/
|
|
40
|
+
httpTransport: HTTPTransport;
|
|
41
|
+
/**
|
|
42
|
+
* Transport backend to perform HTTPS requests with.
|
|
43
|
+
*/
|
|
44
|
+
httpsTransport: HTTPSTransport;
|
|
45
|
+
/**
|
|
46
|
+
* Maximum number of redirects to follow, default to `0`.
|
|
47
|
+
*/
|
|
26
48
|
maxRedirects: number;
|
|
49
|
+
/**
|
|
50
|
+
* Name of user agent to send with `User-Agent` header.
|
|
51
|
+
*/
|
|
27
52
|
name: string | undefined;
|
|
53
|
+
/**
|
|
54
|
+
* Transport backend to use for WebSocket connections.
|
|
55
|
+
*/
|
|
56
|
+
wsTransport: WSTransport;
|
|
28
57
|
constructor(options?: UserAgentOptions);
|
|
58
|
+
/**
|
|
59
|
+
* Destroy all active keep-alive connections.
|
|
60
|
+
*/
|
|
61
|
+
destroy(): void;
|
|
62
|
+
/**
|
|
63
|
+
* Perform `DELETE` request.
|
|
64
|
+
*/
|
|
29
65
|
delete(url: string | URL, options: UserAgentRequestOptions): Promise<UserAgentResponse>;
|
|
66
|
+
/**
|
|
67
|
+
* Perform `GET` request.
|
|
68
|
+
*/
|
|
30
69
|
get(url: string | URL, options: UserAgentRequestOptions): Promise<UserAgentResponse>;
|
|
70
|
+
/**
|
|
71
|
+
* Perform `HEAD` request.
|
|
72
|
+
*/
|
|
31
73
|
head(url: string | URL, options: UserAgentRequestOptions): Promise<UserAgentResponse>;
|
|
74
|
+
/**
|
|
75
|
+
* Perform `OPTIONS` request.
|
|
76
|
+
*/
|
|
32
77
|
options(url: string | URL, options: UserAgentRequestOptions): Promise<UserAgentResponse>;
|
|
78
|
+
/**
|
|
79
|
+
* Perform `PATCH` request.
|
|
80
|
+
*/
|
|
33
81
|
patch(url: string | URL, options: UserAgentRequestOptions): Promise<UserAgentResponse>;
|
|
82
|
+
/**
|
|
83
|
+
* Perform `POST` request.
|
|
84
|
+
*/
|
|
34
85
|
post(url: string | URL, options: UserAgentRequestOptions): Promise<UserAgentResponse>;
|
|
86
|
+
/**
|
|
87
|
+
* Perform `PUT` request.
|
|
88
|
+
*/
|
|
35
89
|
put(url: string | URL, options: UserAgentRequestOptions): Promise<UserAgentResponse>;
|
|
90
|
+
/**
|
|
91
|
+
* Perform HTTP request.
|
|
92
|
+
*/
|
|
36
93
|
request(config: UserAgentRequestOptions): Promise<UserAgentResponse>;
|
|
94
|
+
/**
|
|
95
|
+
* Open WebSocket connection.
|
|
96
|
+
*/
|
|
37
97
|
websocket(url: string | URL, options?: UserAgentWebSocketOptions): Promise<WebSocket>;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
_filterSharedConfig(config: Record<string, any>): Record<string, any>;
|
|
98
|
+
_filterConfig(config: UserAgentRequestOptions): Promise<Record<string, any>>;
|
|
99
|
+
_filterSharedConfig(config: UserAgentRequestOptions | UserAgentWebSocketOptions): Promise<Record<string, any>>;
|
|
41
100
|
_formData(values?: Record<string, string | Upload>): FormData;
|
|
42
101
|
_handleRedirect(config: Record<string, any>, res: UserAgentResponse): Promise<UserAgentResponse>;
|
|
43
|
-
_handleResponse(config: Record<string, any>, raw: http.IncomingMessage): Promise<UserAgentResponse>;
|
|
44
|
-
_loadCookies(url: URL, config: Record<string, any>): Promise<void>;
|
|
45
102
|
_requestConfig(method: string, url?: string | URL, options?: UserAgentRequestOptions): Promise<UserAgentResponse>;
|
|
46
|
-
_storeCookies(url: URL, res: UserAgentResponse): Promise<void>;
|
|
47
103
|
}
|
|
48
104
|
export { UserAgent };
|
package/lib/user-agent.js
CHANGED
|
@@ -1,103 +1,116 @@
|
|
|
1
1
|
import EventEmitter from 'events';
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import { WebSocket } from './websocket.js';
|
|
2
|
+
import { URL } from 'url';
|
|
3
|
+
import { CookieJar } from './user-agent/cookie-jar.js';
|
|
4
|
+
import { HTTPTransport } from './user-agent/transport/http.js';
|
|
5
|
+
import { HTTPSTransport } from './user-agent/transport/https.js';
|
|
6
|
+
import { WSTransport } from './user-agent/transport/ws.js';
|
|
8
7
|
import FormData from 'form-data';
|
|
9
8
|
import yaml from 'js-yaml';
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
/**
|
|
10
|
+
* HTTP and WebSocket user agent.
|
|
11
|
+
*/
|
|
12
12
|
class UserAgent extends EventEmitter {
|
|
13
13
|
constructor(options = {}) {
|
|
14
14
|
super();
|
|
15
|
-
|
|
15
|
+
/**
|
|
16
|
+
* Cookie jar to use.
|
|
17
|
+
*/
|
|
18
|
+
this.cookieJar = new CookieJar();
|
|
19
|
+
/**
|
|
20
|
+
* Transport backend to perform HTTP requests with.
|
|
21
|
+
*/
|
|
22
|
+
this.httpTransport = new HTTPTransport();
|
|
23
|
+
/**
|
|
24
|
+
* Transport backend to perform HTTPS requests with.
|
|
25
|
+
*/
|
|
26
|
+
this.httpsTransport = new HTTPSTransport();
|
|
27
|
+
/**
|
|
28
|
+
* Transport backend to use for WebSocket connections.
|
|
29
|
+
*/
|
|
30
|
+
this.wsTransport = new WSTransport();
|
|
16
31
|
this.baseUrl = options.baseUrl;
|
|
17
32
|
this.maxRedirects = options.maxRedirects ?? 0;
|
|
18
33
|
this.name = options.name;
|
|
19
34
|
}
|
|
35
|
+
/**
|
|
36
|
+
* Destroy all active keep-alive connections.
|
|
37
|
+
*/
|
|
38
|
+
destroy() {
|
|
39
|
+
this.httpTransport.destroy();
|
|
40
|
+
this.httpsTransport.destroy();
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Perform `DELETE` request.
|
|
44
|
+
*/
|
|
20
45
|
async delete(url, options) {
|
|
21
46
|
return await this._requestConfig('DELETE', url, options);
|
|
22
47
|
}
|
|
48
|
+
/**
|
|
49
|
+
* Perform `GET` request.
|
|
50
|
+
*/
|
|
23
51
|
async get(url, options) {
|
|
24
52
|
return await this._requestConfig('GET', url, options);
|
|
25
53
|
}
|
|
54
|
+
/**
|
|
55
|
+
* Perform `HEAD` request.
|
|
56
|
+
*/
|
|
26
57
|
async head(url, options) {
|
|
27
58
|
return await this._requestConfig('HEAD', url, options);
|
|
28
59
|
}
|
|
60
|
+
/**
|
|
61
|
+
* Perform `OPTIONS` request.
|
|
62
|
+
*/
|
|
29
63
|
async options(url, options) {
|
|
30
64
|
return await this._requestConfig('OPTIONS', url, options);
|
|
31
65
|
}
|
|
66
|
+
/**
|
|
67
|
+
* Perform `PATCH` request.
|
|
68
|
+
*/
|
|
32
69
|
async patch(url, options) {
|
|
33
70
|
return await this._requestConfig('PATCH', url, options);
|
|
34
71
|
}
|
|
72
|
+
/**
|
|
73
|
+
* Perform `POST` request.
|
|
74
|
+
*/
|
|
35
75
|
async post(url, options) {
|
|
36
76
|
return await this._requestConfig('POST', url, options);
|
|
37
77
|
}
|
|
78
|
+
/**
|
|
79
|
+
* Perform `PUT` request.
|
|
80
|
+
*/
|
|
38
81
|
async put(url, options) {
|
|
39
82
|
return await this._requestConfig('PUT', url, options);
|
|
40
83
|
}
|
|
84
|
+
/**
|
|
85
|
+
* Perform HTTP request.
|
|
86
|
+
*/
|
|
41
87
|
async request(config) {
|
|
42
|
-
const filtered = this._filterConfig(config);
|
|
43
|
-
await this._loadCookies(filtered.url, filtered);
|
|
88
|
+
const filtered = await this._filterConfig(config);
|
|
44
89
|
this.emit('request', filtered);
|
|
45
90
|
if (typeof filtered.body === 'string')
|
|
46
91
|
filtered.body = Buffer.from(filtered.body);
|
|
47
92
|
if (filtered.body instanceof Buffer)
|
|
48
93
|
filtered.headers['Content-Length'] = Buffer.byteLength(filtered.body);
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
if (filtered.insecure !== undefined)
|
|
57
|
-
options.rejectUnauthorized = filtered.insecure !== true;
|
|
58
|
-
if (filtered.servername !== undefined)
|
|
59
|
-
options.servername = filtered.servername;
|
|
60
|
-
const proto = filtered.url.protocol === 'https:' ? https : http;
|
|
61
|
-
return await new Promise((resolve, reject) => {
|
|
62
|
-
const req = proto.request(filtered.url, options, res => resolve(this._handleResponse(filtered, res)));
|
|
63
|
-
req.once('error', reject);
|
|
64
|
-
req.once('abort', reject);
|
|
65
|
-
if (filtered.body instanceof Buffer) {
|
|
66
|
-
req.end(filtered.body);
|
|
67
|
-
}
|
|
68
|
-
else if (filtered.body instanceof Stream) {
|
|
69
|
-
filtered.body.pipe(req);
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
req.end();
|
|
73
|
-
}
|
|
74
|
-
});
|
|
94
|
+
const transport = filtered.url.protocol === 'https:' ? this.httpsTransport : this.httpTransport;
|
|
95
|
+
let res = await transport.request(filtered);
|
|
96
|
+
if (this.cookieJar !== null)
|
|
97
|
+
await this.cookieJar.storeCookies(filtered.url, res.headers['set-cookie']);
|
|
98
|
+
if (this.maxRedirects > 0)
|
|
99
|
+
res = await this._handleRedirect(config, res);
|
|
100
|
+
return res;
|
|
75
101
|
}
|
|
102
|
+
/**
|
|
103
|
+
* Open WebSocket connection.
|
|
104
|
+
*/
|
|
76
105
|
async websocket(url, options = {}) {
|
|
77
106
|
options.url = url;
|
|
78
|
-
const filtered = this._filterSharedConfig(options);
|
|
79
|
-
await this._loadCookies(filtered.url, filtered);
|
|
107
|
+
const filtered = await this._filterSharedConfig(options);
|
|
80
108
|
this.emit('websocket', filtered);
|
|
81
109
|
filtered.url.protocol = filtered.url.protocol === 'https:' ? 'wss:' : 'ws:';
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
ws.on('error', reject);
|
|
87
|
-
ws.on('open', () => {
|
|
88
|
-
// Workaround for a race condition where the first message arrives before the promise resolves
|
|
89
|
-
const socket = handshake.raw.socket;
|
|
90
|
-
socket.pause();
|
|
91
|
-
queueMicrotask(() => socket.resume());
|
|
92
|
-
resolve(new WebSocket(ws, handshake, { jsonMode: filtered.json }));
|
|
93
|
-
});
|
|
94
|
-
});
|
|
95
|
-
}
|
|
96
|
-
_cookieURL(currentURL) {
|
|
97
|
-
return format(currentURL, { auth: false, fragment: false, search: false });
|
|
98
|
-
}
|
|
99
|
-
_filterConfig(config) {
|
|
100
|
-
const filtered = this._filterSharedConfig(config);
|
|
110
|
+
return await this.wsTransport.connect(filtered);
|
|
111
|
+
}
|
|
112
|
+
async _filterConfig(config) {
|
|
113
|
+
const filtered = await this._filterSharedConfig(config);
|
|
101
114
|
if (filtered.method === undefined)
|
|
102
115
|
filtered.method = 'GET';
|
|
103
116
|
// Body
|
|
@@ -124,9 +137,9 @@ class UserAgent extends EventEmitter {
|
|
|
124
137
|
}
|
|
125
138
|
return filtered;
|
|
126
139
|
}
|
|
127
|
-
_filterSharedConfig(config) {
|
|
140
|
+
async _filterSharedConfig(config) {
|
|
128
141
|
if (!(config.url instanceof URL))
|
|
129
|
-
config.url = new URL(config.url, this.baseUrl);
|
|
142
|
+
config.url = new URL(config.url ?? '', this.baseUrl);
|
|
130
143
|
// Auth
|
|
131
144
|
const url = config.url;
|
|
132
145
|
if ((url.username !== '' || url.password !== '') && config.auth === undefined) {
|
|
@@ -146,6 +159,11 @@ class UserAgent extends EventEmitter {
|
|
|
146
159
|
config.headers['User-Agent'] = this.name;
|
|
147
160
|
if (config.headers['Accept-Encoding'] === undefined)
|
|
148
161
|
config.headers['Accept-Encoding'] = 'gzip';
|
|
162
|
+
if (this.cookieJar !== null) {
|
|
163
|
+
const cookies = await this.cookieJar.loadCookies(config.url);
|
|
164
|
+
if (cookies !== null)
|
|
165
|
+
config.headers.Cookie = cookies;
|
|
166
|
+
}
|
|
149
167
|
return config;
|
|
150
168
|
}
|
|
151
169
|
_formData(values = {}) {
|
|
@@ -191,34 +209,9 @@ class UserAgent extends EventEmitter {
|
|
|
191
209
|
}
|
|
192
210
|
return res;
|
|
193
211
|
}
|
|
194
|
-
async _handleResponse(config, raw) {
|
|
195
|
-
const res = new UserAgentResponse(raw);
|
|
196
|
-
await this._storeCookies(config.url, res);
|
|
197
|
-
return this.maxRedirects > 0 ? await this._handleRedirect(config, res) : res;
|
|
198
|
-
}
|
|
199
|
-
async _loadCookies(url, config) {
|
|
200
|
-
if (this.cookieJar === null)
|
|
201
|
-
return;
|
|
202
|
-
const cookies = await this.cookieJar.getCookies(this._cookieURL(url));
|
|
203
|
-
if (cookies.length > 0)
|
|
204
|
-
config.headers.Cookie = cookies.map(cookie => cookie.cookieString()).join('; ');
|
|
205
|
-
}
|
|
206
212
|
async _requestConfig(method, url = '/', options) {
|
|
207
213
|
return await this.request({ url, method, ...options });
|
|
208
214
|
}
|
|
209
|
-
async _storeCookies(url, res) {
|
|
210
|
-
if (this.cookieJar === null)
|
|
211
|
-
return;
|
|
212
|
-
const header = res.headers['set-cookie'];
|
|
213
|
-
if (header === undefined)
|
|
214
|
-
return;
|
|
215
|
-
const cookieURL = this._cookieURL(url);
|
|
216
|
-
for (const cookie of header.map(value => tough.Cookie.parse(value ?? ''))) {
|
|
217
|
-
if (cookie === undefined)
|
|
218
|
-
continue;
|
|
219
|
-
await this.cookieJar.setCookie(cookie, cookieURL);
|
|
220
|
-
}
|
|
221
|
-
}
|
|
222
215
|
}
|
|
223
216
|
export { UserAgent };
|
|
224
217
|
//# sourceMappingURL=user-agent.js.map
|
package/lib/user-agent.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-agent.js","sourceRoot":"","sources":["../src/user-agent.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user-agent.js","sourceRoot":"","sources":["../src/user-agent.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
import type { JSONValue } from '../types.js';
|
|
2
|
-
import type { ValidateFunction } from 'ajv';
|
|
3
|
-
import { ValidatorResult } from './result.js';
|
|
4
|
-
export declare class ValidatorSchema {
|
|
5
|
-
_validate: ValidateFunction;
|
|
6
|
-
constructor(validate: ValidateFunction);
|
|
7
|
-
validate(data: JSONValue): ValidatorResult;
|
|
8
|
-
}
|
package/lib/validator/schema.js
DELETED
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
import { ValidatorResult } from './result.js';
|
|
2
|
-
export class ValidatorSchema {
|
|
3
|
-
constructor(validate) {
|
|
4
|
-
this._validate = validate;
|
|
5
|
-
}
|
|
6
|
-
validate(data) {
|
|
7
|
-
const validate = this._validate;
|
|
8
|
-
const isValid = validate(data);
|
|
9
|
-
const errors = [];
|
|
10
|
-
const results = validate.errors;
|
|
11
|
-
if (results != null) {
|
|
12
|
-
for (const error of results) {
|
|
13
|
-
errors.push({ instancePath: error.instancePath, schemaPath: error.schemaPath, message: error.message });
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
return new ValidatorResult(isValid, errors);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
//# sourceMappingURL=schema.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/validator/schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAE5C,MAAM,OAAO,eAAe;IAG1B,YAAY,QAA0B;QACpC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAED,QAAQ,CAAC,IAAe;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE/B,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC;QAChC,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;gBAC3B,MAAM,CAAC,IAAI,CAAC,EAAC,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAC,CAAC,CAAC;aACvG;SACF;QAED,OAAO,IAAI,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;CACF"}
|