@xxxaz/json-rpc-schema-typing 0.9.1 → 0.9.2
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/cjs/server/JsonRpcHttpReceiver.js +17 -10
- package/cjs/server/JsonRpcHttpReceiver.js.map +1 -1
- package/cjs/server/JsonRpcServer.js.map +1 -1
- package/esm/server/JsonRpcHttpReceiver.js +18 -11
- package/esm/server/JsonRpcHttpReceiver.js.map +1 -1
- package/esm/server/JsonRpcServer.js.map +1 -1
- package/package.json +1 -1
- package/types/server/JsonRpcServer.d.ts +1 -1
|
@@ -22,8 +22,6 @@ class JsonRpcHttpReceiver extends JsonRpcServer_js_1.JsonRpcServer {
|
|
|
22
22
|
#responseConverter;
|
|
23
23
|
#headers;
|
|
24
24
|
#convertRequesrt(request) {
|
|
25
|
-
if (!this.#requestConverter)
|
|
26
|
-
return request;
|
|
27
25
|
const stream = new ReadableStream({
|
|
28
26
|
start(controller) {
|
|
29
27
|
request.on('error', (error) => controller.error(error));
|
|
@@ -31,7 +29,7 @@ class JsonRpcHttpReceiver extends JsonRpcServer_js_1.JsonRpcServer {
|
|
|
31
29
|
request.on('end', () => controller.close());
|
|
32
30
|
}
|
|
33
31
|
});
|
|
34
|
-
return this.#requestConverter(stream);
|
|
32
|
+
return this.#requestConverter?.(stream) ?? stream;
|
|
35
33
|
}
|
|
36
34
|
#convertResponse(response) {
|
|
37
35
|
if (!this.#responseConverter)
|
|
@@ -40,9 +38,11 @@ class JsonRpcHttpReceiver extends JsonRpcServer_js_1.JsonRpcServer {
|
|
|
40
38
|
}
|
|
41
39
|
async serve(context, request, response) {
|
|
42
40
|
try {
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
41
|
+
const contentLegth = request.headers['content-length'];
|
|
42
|
+
const reqStream = this.#convertRequesrt(request);
|
|
43
|
+
const root = contentLegth
|
|
44
|
+
? JSON.parse(await (await (0, utility_js_1.readStreamAll)(reqStream)).text())
|
|
45
|
+
: await stream_api_json_1.JsonStreamingParser.readFrom(reqStream).root();
|
|
46
46
|
const { status, stream } = await this.#invoke(context, root);
|
|
47
47
|
const nodeStream = toNodeReadable(this.#convertResponse(stream));
|
|
48
48
|
const headers = response instanceof http_1.ServerResponse
|
|
@@ -61,6 +61,15 @@ class JsonRpcHttpReceiver extends JsonRpcServer_js_1.JsonRpcServer {
|
|
|
61
61
|
}
|
|
62
62
|
async #invoke(context, req) {
|
|
63
63
|
try {
|
|
64
|
+
if ((0, utility_js_1.isRpcRequest)(req)) {
|
|
65
|
+
const result = await this.call(context, req);
|
|
66
|
+
return { status: 200, stream: (0, utility_js_1.stringifyStream)(result) };
|
|
67
|
+
}
|
|
68
|
+
if (req instanceof Array) {
|
|
69
|
+
const result = this.batch(context, req);
|
|
70
|
+
const stream = new stream_api_json_1.StringifyingJsonArray(result);
|
|
71
|
+
return { status: 200, stream };
|
|
72
|
+
}
|
|
64
73
|
if (req instanceof stream_api_json_1.ParsingJsonArray) {
|
|
65
74
|
async function* iterateReq() {
|
|
66
75
|
for await (const m of req) {
|
|
@@ -71,10 +80,8 @@ class JsonRpcHttpReceiver extends JsonRpcServer_js_1.JsonRpcServer {
|
|
|
71
80
|
const stream = new stream_api_json_1.StringifyingJsonArray(result);
|
|
72
81
|
return { status: 200, stream };
|
|
73
82
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
return { status: 200, stream: (0, utility_js_1.stringifyStream)(result) };
|
|
77
|
-
}
|
|
83
|
+
const result = await this.call(context, await req.all());
|
|
84
|
+
return { status: 200, stream: (0, utility_js_1.stringifyStream)(result) };
|
|
78
85
|
}
|
|
79
86
|
catch (err) {
|
|
80
87
|
if (err instanceof JsonRpcException_js_1.JsonRpcException) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonRpcHttpReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcHttpReceiver.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"JsonRpcHttpReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcHttpReceiver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonRpcServer.js","sourceRoot":"","sources":["../../src/server/JsonRpcServer.ts"],"names":[],"mappings":";;;AAAA,4DAA+D;AAC/D,gEAAyG;AACzG,0DAA8D;AAG9D,gEAA0D;AAI1D,MAAa,aAAa;IACD;IAArB,YAAqB,MAA8B;QAA9B,WAAM,GAAN,MAAM,CAAwB;IACnD,CAAC;IAEO,eAAe,CAAC,OAAuB;QAC3C,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAC5C,IAAG,OAAiB,KAAK,KAAK;YAAE,MAAM,IAAI,oCAAc,CAAC,uBAAuB,CAAC,CAAC;QAClF,IAAG,CAAC,MAAM;YAAE,MAAM,IAAI,oCAAc,CAAC,qBAAqB,CAAC,CAAC;IAChE,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAA4B,CAAC;QAChF,IAAI,MAAM,EAAE,CAAC,0CAAuB,CAAC,MAAM,CAAC,YAAY,QAAQ,EAAE,CAAC;YAC/D,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,MAAM,IAAI,oCAAc,CAAC,UAAU,UAAU,gBAAgB,CAAC,CAAC;IACnE,CAAC;IAEO,KAAK,CAAC,OAAO,CAAC,GAAY,EAAE,OAAuB;QACvD,IAAI,CAAC;YACD,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAC9B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YAEnC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACnD,MAAM,SAAS,GAAG,IAAI,sCAAgB,CAAC,MAAM,CAAC,CAAC;YAE/C,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC/C,IAAI,CAAC;gBACD,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACrC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,OAAO,CAAC,IAAI,CAAC,mBAAmB,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;YACjD,CAAC;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACpB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,IAAG,GAAG,YAAY,sCAAgB;gBAAE,MAAM,GAAG,CAAC;YAC9C,MAAM,IAAI,mCAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACzC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAY,EAAE,OAAuB;QAC5C,MAAM,OAAO,GAAG,KAAK,CAAC;QACtB,MAAM,EAAE,GAAG,OAAO,CAAC,EAAG,IAAI,IAAI,CAAC;QAC/B,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAChD,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC;QACnC,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACpB,MAAM,KAAK,GAAG,GAAG,YAAY,sCAAgB;gBACzC,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE;gBACjB,CAAC,CAAC,IAAI,mCAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;YACjD,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;QAClC,CAAC;IACL,CAAC;IAAA,CAAC;IAEF,KAAK,CAAC,CAAE,KAAK,CAAC,GAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"JsonRpcServer.js","sourceRoot":"","sources":["../../src/server/JsonRpcServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { Readable } from 'stream';
|
|
|
3
3
|
import { JsonStreamingParser, ParsingJsonArray, StringifyingJsonArray } from '@xxxaz/stream-api-json';
|
|
4
4
|
import { JsonRpcServer } from './JsonRpcServer.js';
|
|
5
5
|
import { InternalError, JsonRpcException } from '../JsonRpcException.js';
|
|
6
|
-
import { stringifyStream } from '../utility.js';
|
|
6
|
+
import { isRpcRequest, stringifyStream, readStreamAll } from '../utility.js';
|
|
7
7
|
export class JsonRpcHttpReceiver extends JsonRpcServer {
|
|
8
8
|
constructor(router, options = {}) {
|
|
9
9
|
super(router);
|
|
@@ -18,8 +18,6 @@ export class JsonRpcHttpReceiver extends JsonRpcServer {
|
|
|
18
18
|
#responseConverter;
|
|
19
19
|
#headers;
|
|
20
20
|
#convertRequesrt(request) {
|
|
21
|
-
if (!this.#requestConverter)
|
|
22
|
-
return request;
|
|
23
21
|
const stream = new ReadableStream({
|
|
24
22
|
start(controller) {
|
|
25
23
|
request.on('error', (error) => controller.error(error));
|
|
@@ -27,7 +25,7 @@ export class JsonRpcHttpReceiver extends JsonRpcServer {
|
|
|
27
25
|
request.on('end', () => controller.close());
|
|
28
26
|
}
|
|
29
27
|
});
|
|
30
|
-
return this.#requestConverter(stream);
|
|
28
|
+
return this.#requestConverter?.(stream) ?? stream;
|
|
31
29
|
}
|
|
32
30
|
#convertResponse(response) {
|
|
33
31
|
if (!this.#responseConverter)
|
|
@@ -36,9 +34,11 @@ export class JsonRpcHttpReceiver extends JsonRpcServer {
|
|
|
36
34
|
}
|
|
37
35
|
async serve(context, request, response) {
|
|
38
36
|
try {
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
|
|
37
|
+
const contentLegth = request.headers['content-length'];
|
|
38
|
+
const reqStream = this.#convertRequesrt(request);
|
|
39
|
+
const root = contentLegth
|
|
40
|
+
? JSON.parse(await (await readStreamAll(reqStream)).text())
|
|
41
|
+
: await JsonStreamingParser.readFrom(reqStream).root();
|
|
42
42
|
const { status, stream } = await this.#invoke(context, root);
|
|
43
43
|
const nodeStream = toNodeReadable(this.#convertResponse(stream));
|
|
44
44
|
const headers = response instanceof Http1ServerResponse
|
|
@@ -57,6 +57,15 @@ export class JsonRpcHttpReceiver extends JsonRpcServer {
|
|
|
57
57
|
}
|
|
58
58
|
async #invoke(context, req) {
|
|
59
59
|
try {
|
|
60
|
+
if (isRpcRequest(req)) {
|
|
61
|
+
const result = await this.call(context, req);
|
|
62
|
+
return { status: 200, stream: stringifyStream(result) };
|
|
63
|
+
}
|
|
64
|
+
if (req instanceof Array) {
|
|
65
|
+
const result = this.batch(context, req);
|
|
66
|
+
const stream = new StringifyingJsonArray(result);
|
|
67
|
+
return { status: 200, stream };
|
|
68
|
+
}
|
|
60
69
|
if (req instanceof ParsingJsonArray) {
|
|
61
70
|
async function* iterateReq() {
|
|
62
71
|
for await (const m of req) {
|
|
@@ -67,10 +76,8 @@ export class JsonRpcHttpReceiver extends JsonRpcServer {
|
|
|
67
76
|
const stream = new StringifyingJsonArray(result);
|
|
68
77
|
return { status: 200, stream };
|
|
69
78
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
return { status: 200, stream: stringifyStream(result) };
|
|
73
|
-
}
|
|
79
|
+
const result = await this.call(context, await req.all());
|
|
80
|
+
return { status: 200, stream: stringifyStream(result) };
|
|
74
81
|
}
|
|
75
82
|
catch (err) {
|
|
76
83
|
if (err instanceof JsonRpcException) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonRpcHttpReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcHttpReceiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgG,cAAc,IAAI,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAM3J,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAoB,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACxH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"JsonRpcHttpReceiver.js","sourceRoot":"","sources":["../../src/server/JsonRpcHttpReceiver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JsonRpcServer.js","sourceRoot":"","sources":["../../src/server/JsonRpcServer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"JsonRpcServer.js","sourceRoot":"","sources":["../../src/server/JsonRpcServer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -7,5 +7,5 @@ export declare class JsonRpcServer<Context> {
|
|
|
7
7
|
private pickMethodDefine;
|
|
8
8
|
private execute;
|
|
9
9
|
call(ctx: Context, request: JsonRpcRequest): Promise<JsonRpcResponse<any>>;
|
|
10
|
-
batch(ctx: Context, requests: AsyncIterable<JsonRpcRequest>): AsyncGenerator<JsonRpcResponse<any>, void, unknown>;
|
|
10
|
+
batch(ctx: Context, requests: AsyncIterable<JsonRpcRequest> | Iterable<JsonRpcRequest>): AsyncGenerator<JsonRpcResponse<any>, void, unknown>;
|
|
11
11
|
}
|