mppx 0.5.10 → 0.5.11
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/CHANGELOG.md
CHANGED
package/dist/server/Request.js
CHANGED
|
@@ -16,9 +16,9 @@ export function toNodeListener(handler, options) {
|
|
|
16
16
|
});
|
|
17
17
|
});
|
|
18
18
|
return (async (req, res) => {
|
|
19
|
-
const request = fromNodeListener(req, res, options);
|
|
20
19
|
let response;
|
|
21
20
|
try {
|
|
21
|
+
const request = fromNodeListener(req, res, options);
|
|
22
22
|
response = await handler(request);
|
|
23
23
|
}
|
|
24
24
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../src/server/Request.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AAUjD;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,OAAqB,EACrB,OAA4C;IAE5C,MAAM,OAAO,GACX,OAAO,EAAE,OAAO;QAChB,CAAC,CAAC,KAAc,EAAE,EAAE;YAClB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACpB,OAAO,IAAI,QAAQ,CAAC,uBAAuB,EAAE;gBAC3C,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,EAAE,cAAc,EAAE,YAAY,EAAE;aAC1C,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IAEJ,OAAO,CAAC,KAAK,EAAE,GAAoB,EAAE,GAAmB,EAAE,EAAE;QAC1D,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"Request.js","sourceRoot":"","sources":["../../src/server/Request.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AAUjD;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,OAAqB,EACrB,OAA4C;IAE5C,MAAM,OAAO,GACX,OAAO,EAAE,OAAO;QAChB,CAAC,CAAC,KAAc,EAAE,EAAE;YAClB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACpB,OAAO,IAAI,QAAQ,CAAC,uBAAuB,EAAE;gBAC3C,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,EAAE,cAAc,EAAE,YAAY,EAAE;aAC1C,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IAEJ,OAAO,CAAC,KAAK,EAAE,GAAoB,EAAE,GAAmB,EAAE,EAAE;QAC1D,IAAI,QAAkB,CAAA;QACtB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;YACnD,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAA;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC;gBACH,QAAQ;oBACN,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,CAAC;wBACtB,IAAI,QAAQ,CAAC,uBAAuB,EAAE;4BACpC,MAAM,EAAE,GAAG;4BACX,OAAO,EAAE,EAAE,cAAc,EAAE,YAAY,EAAE;yBAC1C,CAAC,CAAA;YACN,CAAC;YAAC,OAAO,UAAU,EAAE,CAAC;gBACpB,OAAO,CAAC,KAAK,CAAC,4CAA4C,UAAU,EAAE,CAAC,CAAA;gBACvE,QAAQ,GAAG,IAAI,QAAQ,CAAC,uBAAuB,EAAE;oBAC/C,MAAM,EAAE,GAAG;oBACX,OAAO,EAAE,EAAE,cAAc,EAAE,YAAY,EAAE;iBAC1C,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;QACD,MAAM,YAAY,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC,CAAoB,CAAA;AACvB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,GAAoB,EACpB,GAAmB,EACnB,OAA4C;IAE5C,IAAI,UAAU,GAA2B,IAAI,eAAe,EAAE,CAAA;IAC9D,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC,CAAA;IAC5C,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,UAAU,GAAG,IAAI,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,KAAK,CAAA;IAClC,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;IAClC,MAAM,QAAQ,GACZ,OAAO,EAAE,QAAQ;QACjB,CAAC,WAAW,IAAI,GAAG,CAAC,MAAM,IAAK,GAAG,CAAC,MAAkC,CAAC,SAAS;YAC7E,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,OAAO,CAAC,CAAA;IACd,MAAM,IAAI,GACR,OAAO,EAAE,IAAI;QACb,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC;QAClB,GAAG,CAAC,OAAkC,CAAC,YAAY,CAAC;QACrD,WAAW,CAAA;IACb,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,QAAQ,KAAK,IAAI,EAAE,CAAC,CAAA;IAE5E,MAAM,IAAI,GAAsC;QAC9C,MAAM;QACN,OAAO;QACP,MAAM,EAAE,UAAU,CAAC,MAAM;KAC1B,CAAA;IAED,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QAC1C,IAAI,CAAC,IAAI,GAAG,IAAI,cAAc,CAAC;YAC7B,KAAK,CAAC,CAAC;gBACL,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;oBAC/B,CAAC,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;gBAC7E,CAAC,CAAC,CAAA;gBACF,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;oBACjB,CAAC,CAAC,KAAK,EAAE,CAAA;gBACX,CAAC,CAAC,CAAA;YACJ,CAAC;SACF,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;AAC/B,CAAC;AAED,SAAS,sBAAsB,CAAC,GAAuB;IACrD,IAAI,CAAC,GAAG;QAAE,OAAO,GAAG,CAAA;IAEpB,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QAChC,mFAAmF;QACnF,0EAA0E;QAC1E,IAAI,WAAW,CAAC,QAAQ,KAAK,OAAO,IAAI,WAAW,CAAC,QAAQ,KAAK,QAAQ;YACvE,OAAO,GAAG,WAAW,CAAC,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE,CAAA;IACzD,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,SAAS,aAAa,CAAC,GAAoB;IACzC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAA;IAC7B,MAAM,GAAG,GAAG,GAAG,CAAC,UAAU,CAAA;IAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,IAAI,GAAG,CAAC,CAAC,CAAE,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAQ;QACrC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAE,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mppx",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.5.
|
|
4
|
+
"version": "0.5.11",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"files": [
|
|
@@ -105,7 +105,7 @@
|
|
|
105
105
|
"@modelcontextprotocol/sdk": ">=1.25.0",
|
|
106
106
|
"elysia": ">=1",
|
|
107
107
|
"express": ">=5",
|
|
108
|
-
"hono": ">=4",
|
|
108
|
+
"hono": ">=4.12.12",
|
|
109
109
|
"viem": ">=2.47.5"
|
|
110
110
|
},
|
|
111
111
|
"peerDependenciesMeta": {
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { EventEmitter } from 'node:events'
|
|
2
|
+
import type { IncomingMessage, ServerResponse } from 'node:http'
|
|
3
|
+
|
|
1
4
|
import { NodeListener, Request } from 'mppx/server'
|
|
2
5
|
import { afterEach, describe, expect, test } from 'vp/test'
|
|
3
6
|
import * as Http from '~test/Http.js'
|
|
@@ -6,6 +9,63 @@ let server: Awaited<ReturnType<typeof Http.createServer>> | undefined
|
|
|
6
9
|
|
|
7
10
|
afterEach(() => server?.close())
|
|
8
11
|
|
|
12
|
+
function createMockRequest(options: {
|
|
13
|
+
method?: string
|
|
14
|
+
url?: string
|
|
15
|
+
rawHeaders?: string[]
|
|
16
|
+
}): [
|
|
17
|
+
IncomingMessage,
|
|
18
|
+
ServerResponse & { body: Buffer[]; headers?: Record<string, string | string[]> },
|
|
19
|
+
] {
|
|
20
|
+
type MockResponse = ServerResponse & {
|
|
21
|
+
body: Buffer[]
|
|
22
|
+
headers?: Record<string, string | string[]>
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
const rawHeaders = options.rawHeaders ?? []
|
|
26
|
+
const headers = Object.fromEntries(
|
|
27
|
+
rawHeaders.reduce<[string, string][]>((acc, value, index, values) => {
|
|
28
|
+
if (index % 2 === 0 && values[index + 1]) acc.push([value.toLowerCase(), values[index + 1]!])
|
|
29
|
+
return acc
|
|
30
|
+
}, []),
|
|
31
|
+
)
|
|
32
|
+
const req = Object.assign(new EventEmitter(), {
|
|
33
|
+
method: options.method ?? 'GET',
|
|
34
|
+
url: options.url ?? '/',
|
|
35
|
+
headers,
|
|
36
|
+
rawHeaders,
|
|
37
|
+
socket: {},
|
|
38
|
+
}) as unknown as IncomingMessage
|
|
39
|
+
|
|
40
|
+
const res = Object.assign(new EventEmitter(), {
|
|
41
|
+
req,
|
|
42
|
+
body: [] as Buffer[],
|
|
43
|
+
writeHead(
|
|
44
|
+
this: MockResponse,
|
|
45
|
+
_statusCode: number,
|
|
46
|
+
statusMessageOrHeaders?: string | Record<string, string | string[]>,
|
|
47
|
+
headersMaybe?: Record<string, string | string[]>,
|
|
48
|
+
) {
|
|
49
|
+
this.headers =
|
|
50
|
+
typeof statusMessageOrHeaders === 'string'
|
|
51
|
+
? (headersMaybe ?? {})
|
|
52
|
+
: (statusMessageOrHeaders ?? {})
|
|
53
|
+
return this
|
|
54
|
+
},
|
|
55
|
+
write(this: MockResponse, chunk: Uint8Array | string) {
|
|
56
|
+
this.body.push(Buffer.from(chunk))
|
|
57
|
+
return true
|
|
58
|
+
},
|
|
59
|
+
end(this: MockResponse, chunk?: Uint8Array | string) {
|
|
60
|
+
if (chunk) this.body.push(Buffer.from(chunk))
|
|
61
|
+
this.emit('finish')
|
|
62
|
+
return this
|
|
63
|
+
},
|
|
64
|
+
}) as unknown as MockResponse
|
|
65
|
+
|
|
66
|
+
return [req, res]
|
|
67
|
+
}
|
|
68
|
+
|
|
9
69
|
describe('sendResponse', () => {
|
|
10
70
|
test('writes status and headers', async () => {
|
|
11
71
|
server = await Http.createServer(async (_, res) => {
|
|
@@ -185,4 +245,22 @@ describe('toNodeListener', () => {
|
|
|
185
245
|
const response = await fetch(server.url)
|
|
186
246
|
expect(await response.text()).toBe('abc')
|
|
187
247
|
})
|
|
248
|
+
|
|
249
|
+
test('routes malformed host header URL parsing errors through onError', async () => {
|
|
250
|
+
const [req, res] = createMockRequest({
|
|
251
|
+
rawHeaders: ['Host', 'a, b'],
|
|
252
|
+
})
|
|
253
|
+
const onError = vi.fn((error: unknown) => {
|
|
254
|
+
return new Response(error instanceof TypeError ? 'bad host' : 'unexpected', {
|
|
255
|
+
status: 500,
|
|
256
|
+
headers: { 'Content-Type': 'text/plain' },
|
|
257
|
+
})
|
|
258
|
+
})
|
|
259
|
+
const handler = Request.toNodeListener(async () => new Response('ok'), { onError })
|
|
260
|
+
|
|
261
|
+
await expect(Promise.resolve(handler(req, res))).resolves.toBeUndefined()
|
|
262
|
+
expect(onError).toHaveBeenCalledTimes(1)
|
|
263
|
+
expect(onError.mock.calls[0]![0]).toBeInstanceOf(TypeError)
|
|
264
|
+
expect(Buffer.concat(res.body).toString()).toBe('bad host')
|
|
265
|
+
})
|
|
188
266
|
})
|
package/src/server/Request.ts
CHANGED
|
@@ -32,9 +32,9 @@ export function toNodeListener(
|
|
|
32
32
|
})
|
|
33
33
|
|
|
34
34
|
return (async (req: IncomingMessage, res: ServerResponse) => {
|
|
35
|
-
const request = fromNodeListener(req, res, options)
|
|
36
35
|
let response: Response
|
|
37
36
|
try {
|
|
37
|
+
const request = fromNodeListener(req, res, options)
|
|
38
38
|
response = await handler(request)
|
|
39
39
|
} catch (error) {
|
|
40
40
|
try {
|