@mojojs/core 0.12.3 → 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/README.md +25 -2
- package/lib/app.js +3 -3
- package/lib/app.js.map +1 -1
- package/lib/body.js +9 -8
- package/lib/body.js.map +1 -1
- package/lib/cli/create-lite-app.js +2 -3
- package/lib/cli/create-lite-app.js.map +1 -1
- package/lib/context.d.ts +4 -1
- package/lib/context.js +19 -0
- package/lib/context.js.map +1 -1
- package/lib/core.js +2 -1
- package/lib/core.js.map +1 -1
- package/lib/plugins/header-conditions.js +1 -1
- package/lib/plugins/header-conditions.js.map +1 -1
- package/lib/plugins/json-config.js +2 -2
- package/lib/plugins/json-config.js.map +1 -1
- package/lib/plugins/view-helpers.js +7 -9
- package/lib/plugins/view-helpers.js.map +1 -1
- package/lib/renderer.js +1 -1
- package/lib/renderer.js.map +1 -1
- package/lib/router/pattern.js +8 -8
- package/lib/router/pattern.js.map +1 -1
- package/lib/router.js +3 -3
- package/lib/router.js.map +1 -1
- package/lib/server/response.js +1 -1
- package/lib/server/response.js.map +1 -1
- package/lib/server.js +12 -6
- package/lib/server.js.map +1 -1
- package/lib/session.d.ts +3 -2
- package/lib/session.js +12 -3
- package/lib/session.js.map +1 -1
- package/lib/static.js +1 -1
- package/lib/static.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/test.d.ts +1 -0
- package/lib/user-agent/test.js +5 -1
- package/lib/user-agent/test.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/lib/util.js +8 -8
- package/lib/util.js.map +1 -1
- package/lib/websocket.js +2 -2
- package/lib/websocket.js.map +1 -1
- package/package.json +4 -4
- 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/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/lib/util.js
CHANGED
|
@@ -11,7 +11,7 @@ export async function captureOutput(fn, options = {}) {
|
|
|
11
11
|
const stderr = process.stderr;
|
|
12
12
|
const stdoutWrite = stdout.write;
|
|
13
13
|
const stderrWrite = stderr.write;
|
|
14
|
-
if (options.stdout) {
|
|
14
|
+
if (options.stdout === true) {
|
|
15
15
|
stdout.write = (chunk) => {
|
|
16
16
|
output.push(chunk);
|
|
17
17
|
return true;
|
|
@@ -35,7 +35,7 @@ export async function captureOutput(fn, options = {}) {
|
|
|
35
35
|
export async function cliCreateDir(path) {
|
|
36
36
|
const dir = new Path(process.cwd(), ...path.split('/'));
|
|
37
37
|
const stdout = process.stdout;
|
|
38
|
-
if (await dir.exists()) {
|
|
38
|
+
if ((await dir.exists()) === true) {
|
|
39
39
|
stdout.write(chalk.green(' [exists]') + ` ${dir.toString()}\n`);
|
|
40
40
|
return;
|
|
41
41
|
}
|
|
@@ -45,7 +45,7 @@ export async function cliCreateDir(path) {
|
|
|
45
45
|
export async function cliCreateFile(path, template, values = {}, options = {}) {
|
|
46
46
|
const file = new Path(process.cwd(), ...path.split('/'));
|
|
47
47
|
const stdout = process.stdout;
|
|
48
|
-
if (await file.exists()) {
|
|
48
|
+
if ((await file.exists()) === true) {
|
|
49
49
|
stdout.write(chalk.red(' [exists]') + ` ${file.toString()}\n`);
|
|
50
50
|
return;
|
|
51
51
|
}
|
|
@@ -59,7 +59,7 @@ export async function cliCreateFile(path, template, values = {}, options = {}) {
|
|
|
59
59
|
export async function cliFixPackage() {
|
|
60
60
|
const file = new Path(process.cwd(), 'package.json');
|
|
61
61
|
const stdout = process.stdout;
|
|
62
|
-
if (
|
|
62
|
+
if ((await file.exists()) === false) {
|
|
63
63
|
stdout.write(chalk.green(' [write]') + ` ${file.toString()}\n`);
|
|
64
64
|
await file.writeFile(JSON.stringify({ type: 'module' }, null, 2));
|
|
65
65
|
return;
|
|
@@ -106,7 +106,7 @@ export async function exceptionContext(error, options = {}) {
|
|
|
106
106
|
return context;
|
|
107
107
|
}
|
|
108
108
|
export function jsonPointer(value, pointer) {
|
|
109
|
-
if (
|
|
109
|
+
if (pointer.startsWith('/') === false)
|
|
110
110
|
return pointer.length > 0 ? null : value;
|
|
111
111
|
let data = value;
|
|
112
112
|
for (const part of pointer.replace(/^\//, '').split('/')) {
|
|
@@ -114,7 +114,7 @@ export function jsonPointer(value, pointer) {
|
|
|
114
114
|
if (typeof data === 'object' && data !== null && data[unescaped] !== undefined) {
|
|
115
115
|
data = data[unescaped];
|
|
116
116
|
}
|
|
117
|
-
else if (Array.isArray(data) && /^\d+$/.test(unescaped)) {
|
|
117
|
+
else if (Array.isArray(data) && /^\d+$/.test(unescaped) === true) {
|
|
118
118
|
data = data[parseInt(unescaped)];
|
|
119
119
|
}
|
|
120
120
|
else {
|
|
@@ -126,10 +126,10 @@ export function jsonPointer(value, pointer) {
|
|
|
126
126
|
export async function loadModules(dirs) {
|
|
127
127
|
const modules = {};
|
|
128
128
|
for (const dir of dirs.map(path => new Path(path))) {
|
|
129
|
-
if (
|
|
129
|
+
if ((await dir.exists()) === false)
|
|
130
130
|
continue;
|
|
131
131
|
for await (const file of dir.list({ recursive: true })) {
|
|
132
|
-
if (
|
|
132
|
+
if (/\.m?js$/.test(file.toString()) === false)
|
|
133
133
|
continue;
|
|
134
134
|
const imports = await import(file.toFileURL().toString());
|
|
135
135
|
const name = dir
|
package/lib/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,EAAc,EACd,UAAgD,EAAE;IAElD,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS;QAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAExD,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC9B,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;IACjC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;IAEjC,IAAI,OAAO,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
|
package/lib/websocket.js
CHANGED
|
@@ -30,7 +30,7 @@ class WebSocket extends EventEmitter {
|
|
|
30
30
|
return await new Promise(resolve => this._raw.ping(data, undefined, () => resolve()));
|
|
31
31
|
}
|
|
32
32
|
async send(message) {
|
|
33
|
-
if (
|
|
33
|
+
if (this.jsonMode === false)
|
|
34
34
|
return await new Promise(resolve => this._raw.send(message, () => resolve()));
|
|
35
35
|
return new Promise(resolve => this._raw.send(JSON.stringify(message), () => resolve()));
|
|
36
36
|
}
|
|
@@ -49,7 +49,7 @@ class WebSocket extends EventEmitter {
|
|
|
49
49
|
}
|
|
50
50
|
_safeMessageHandler(message, isBinary) {
|
|
51
51
|
try {
|
|
52
|
-
if (
|
|
52
|
+
if (this.jsonMode === false) {
|
|
53
53
|
this.emit('message', isBinary ? message : message.toString());
|
|
54
54
|
}
|
|
55
55
|
else {
|
package/lib/websocket.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../src/websocket.ts"],"names":[],"mappings":"AAGA,OAAO,YAAY,EAAE,EAAC,EAAE,EAAC,MAAM,QAAQ,CAAC;AAkBxC,MAAM,SAAU,SAAQ,YAAY;IAKlC,YAAY,EAAM,EAAE,SAAmC,EAAE,OAA4B;QACnF,KAAK,CAAC,EAAC,iBAAiB,EAAE,IAAI,EAAC,CAAC,CAAC;QAEjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,KAAK,CAAC;QAE1C,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QAEf,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QACnD,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEtD,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QAChD,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC9C,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;QAC3B,IAAI;YACF,IAAI,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE;gBACrD,MAAM,OAAO,CAAC;aACf;SACF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY;gBAAE,MAAM,KAAK,CAAC;SAC3E;IACH,CAAC;IAED,KAAK,CAAC,IAAa,EAAE,MAAe;QAClC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAY;QACrB,OAAO,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IACxF,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAA2B;QACpC,IAAI,
|
|
1
|
+
{"version":3,"file":"websocket.js","sourceRoot":"","sources":["../src/websocket.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mojojs/core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.14.0",
|
|
4
4
|
"description": "Real-time web framework",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"web",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"mojo": "./bin/mojo.js"
|
|
50
50
|
},
|
|
51
51
|
"devDependencies": {
|
|
52
|
-
"@istanbuljs/esm-loader-hook": "
|
|
52
|
+
"@istanbuljs/esm-loader-hook": "^0.1.2",
|
|
53
53
|
"@types/busboy": "^0.3.1",
|
|
54
54
|
"@types/ejs": "^3.0.6",
|
|
55
55
|
"@types/js-yaml": "^4.0.3",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"eslint-plugin-prettier": "^4.0.0",
|
|
72
72
|
"prettier": "^2.5.0",
|
|
73
73
|
"tap": "^15.1.5",
|
|
74
|
-
"typescript": "
|
|
74
|
+
"typescript": "^4.3.2"
|
|
75
75
|
},
|
|
76
76
|
"engines": {
|
|
77
77
|
"node": ">= 16"
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
"@mojojs/dom": "^1.0.1",
|
|
81
81
|
"@mojojs/path": "^1.1.2",
|
|
82
82
|
"ajv": "^8.5.0",
|
|
83
|
-
"busboy": "^0.
|
|
83
|
+
"busboy": "^1.0.0",
|
|
84
84
|
"chalk": "^5.0.0",
|
|
85
85
|
"ejs": "^3.1.6",
|
|
86
86
|
"form-data": "^4.0.0",
|
|
@@ -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"}
|