@nmtjs/json-format 0.8.0 → 0.9.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/dist/client.js +36 -16
- package/dist/client.js.map +1 -1
- package/dist/common.js +2 -0
- package/dist/common.js.map +1 -1
- package/dist/server.js +12 -9
- package/dist/server.js.map +1 -1
- package/package.json +5 -5
- package/src/client.ts +37 -14
- package/src/server.ts +10 -5
package/dist/client.js
CHANGED
|
@@ -11,48 +11,56 @@ export class JsonFormat extends BaseClientFormat {
|
|
|
11
11
|
}
|
|
12
12
|
encodeRPC(rpc, context) {
|
|
13
13
|
const { callId, namespace, procedure } = rpc;
|
|
14
|
+
const streamsMetadata = {};
|
|
14
15
|
const streams = {};
|
|
15
16
|
const replacer = (key, value) => {
|
|
16
17
|
if (value instanceof ProtocolBlob) {
|
|
17
18
|
const stream = context.addStream(value);
|
|
18
|
-
|
|
19
|
+
streamsMetadata[stream.id] = stream.metadata;
|
|
20
|
+
streams[stream.id] = stream;
|
|
19
21
|
return serializeStreamId(stream.id);
|
|
20
22
|
}
|
|
21
23
|
return value;
|
|
22
24
|
};
|
|
23
25
|
const payload = JSON.stringify(rpc.payload, replacer);
|
|
24
|
-
|
|
26
|
+
const buffer = this.encode([
|
|
25
27
|
callId,
|
|
26
28
|
namespace,
|
|
27
29
|
procedure,
|
|
28
|
-
|
|
30
|
+
streamsMetadata,
|
|
29
31
|
payload
|
|
30
32
|
]);
|
|
33
|
+
return {
|
|
34
|
+
buffer,
|
|
35
|
+
streams
|
|
36
|
+
};
|
|
31
37
|
}
|
|
32
38
|
decode(data) {
|
|
33
39
|
return JSON.parse(decodeText(data));
|
|
34
40
|
}
|
|
35
41
|
decodeRPC(buffer, context) {
|
|
36
|
-
const
|
|
42
|
+
const streams = {};
|
|
43
|
+
const [callId, error, streamsMetadata, payload] = this.decode(buffer);
|
|
37
44
|
if (error) return {
|
|
38
45
|
callId,
|
|
39
|
-
error
|
|
40
|
-
payload: null
|
|
46
|
+
error
|
|
41
47
|
};
|
|
42
48
|
else {
|
|
43
49
|
const replacer = (key, value) => {
|
|
44
50
|
if (typeof value === "string" && isStreamId(value)) {
|
|
45
51
|
const id = deserializeStreamId(value);
|
|
46
|
-
const metadata =
|
|
47
|
-
|
|
52
|
+
const metadata = streamsMetadata[id];
|
|
53
|
+
const stream = context.addStream(id, callId, metadata);
|
|
54
|
+
streams[id] = stream;
|
|
55
|
+
return stream;
|
|
48
56
|
}
|
|
49
57
|
return value;
|
|
50
58
|
};
|
|
51
|
-
const
|
|
59
|
+
const result = typeof payload === "undefined" ? undefined : JSON.parse(payload, replacer);
|
|
52
60
|
return {
|
|
53
61
|
callId,
|
|
54
|
-
|
|
55
|
-
|
|
62
|
+
result,
|
|
63
|
+
streams
|
|
56
64
|
};
|
|
57
65
|
}
|
|
58
66
|
}
|
|
@@ -67,22 +75,34 @@ export class StandardJsonFormat extends BaseClientFormat {
|
|
|
67
75
|
}
|
|
68
76
|
encodeRPC(rpc) {
|
|
69
77
|
const { callId, namespace, procedure, payload } = rpc;
|
|
70
|
-
|
|
78
|
+
const streams = {};
|
|
79
|
+
const buffer = this.encode([
|
|
71
80
|
callId,
|
|
72
81
|
namespace,
|
|
73
82
|
procedure,
|
|
74
83
|
payload
|
|
75
84
|
]);
|
|
85
|
+
return {
|
|
86
|
+
buffer,
|
|
87
|
+
streams
|
|
88
|
+
};
|
|
76
89
|
}
|
|
77
90
|
decode(data) {
|
|
78
91
|
return JSON.parse(decodeText(data));
|
|
79
92
|
}
|
|
80
93
|
decodeRPC(buffer) {
|
|
81
|
-
const
|
|
82
|
-
|
|
94
|
+
const streams = {};
|
|
95
|
+
const [callId, error, result] = this.decode(buffer);
|
|
96
|
+
if (error) return {
|
|
83
97
|
callId,
|
|
84
|
-
error
|
|
85
|
-
|
|
98
|
+
error
|
|
99
|
+
};
|
|
100
|
+
else return {
|
|
101
|
+
callId,
|
|
102
|
+
result,
|
|
103
|
+
streams
|
|
86
104
|
};
|
|
87
105
|
}
|
|
88
106
|
}
|
|
107
|
+
|
|
108
|
+
//# sourceMappingURL=client.js.map
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":"AAAA,
|
|
1
|
+
{"mappings":"AAAA,SACE,wBAGK,wBAAwB;AAC/B,SAEE,YAEA,YACA,oBAGK,wBAAwB;AAC/B,SAAS,qBAAqB,YAAY,yBAAyB,aAAa;;;;AAKhF,OAAO,MAAM,mBAAmB,iBAAiB;CAC/C,cAAc;CAEd,OAAOA,MAAwB;AAC7B,SAAO,WAAW,KAAK,UAAU,KAAK,CAAC;CACxC;CAED,UAAUC,KAAkBC,SAA2B;EACrD,MAAM,EAAE,QAAQ,WAAW,WAAW,GAAG;EACzC,MAAMC,kBAAwD,CAAE;EAChE,MAAMC,UAAoD,CAAE;EAC5D,MAAM,WAAW,CAACC,KAAaC,UAAe;AAC5C,OAAI,iBAAiB,cAAc;IACjC,MAAM,SAAS,QAAQ,UAAU,MAAM;AACvC,oBAAgB,OAAO,MAAM,OAAO;AACpC,YAAQ,OAAO,MAAM;AACrB,WAAO,kBAAkB,OAAO,GAAG;GACpC;AACD,UAAO;EACR;EACD,MAAM,UAAU,KAAK,UAAU,IAAI,SAAS,SAAS;EACrD,MAAM,SAAS,KAAK,OAAO;GACzB;GACA;GACA;GACA;GACA;EACD,EAAC;AACF,SAAO;GAAE;GAAQ;EAAS;CAC3B;CAED,OAAOC,MAAwB;AAC7B,SAAO,KAAK,MAAM,WAAW,KAAK,CAAC;CACpC;CAED,UAAUC,QAAqBC,SAA2B;EACxD,MAAMC,UAAoD,CAAE;EAC5D,MAAM,CAAC,QAAQ,OAAO,iBAAiB,QAAQ,GAAG,KAAK,OAAO,OAAO;AACrE,MAAI,MAAO,QAAO;GAAE;GAAQ;EAAO;OAC9B;GACH,MAAM,WAAW,CAACL,KAAaC,UAAe;AAC5C,eAAW,UAAU,YAAY,WAAW,MAAM,EAAE;KAClD,MAAM,KAAK,oBAAoB,MAAM;KACrC,MAAM,WAAW,gBAAgB;KACjC,MAAM,SAAS,QAAQ,UAAU,IAAI,QAAQ,SAAS;AACtD,aAAQ,MAAM;AACd,YAAO;IACR;AACD,WAAO;GACR;GACD,MAAM,gBACG,YAAY,cACf,YACA,KAAK,MAAM,SAAS,SAAS;AACnC,UAAO;IAAE;IAAQ;IAAQ;GAAS;EACnC;CACF;AACF;;;;AAKD,OAAO,MAAM,2BAA2B,iBAAiB;CACvD,cAAc;CAEd,OAAON,MAAW;AAChB,SAAO,WAAW,KAAK,UAAU,KAAK,CAAC;CACxC;CAED,UAAUC,KAAkB;EAC1B,MAAM,EAAE,QAAQ,WAAW,WAAW,SAAS,GAAG;EAClD,MAAMG,UAAoD,CAAE;EAC5D,MAAM,SAAS,KAAK,OAAO;GAAC;GAAQ;GAAW;GAAW;EAAQ,EAAC;AACnE,SAAO;GAAE;GAAQ;EAAS;CAC3B;CAED,OAAOG,MAAmB;AACxB,SAAO,KAAK,MAAM,WAAW,KAAK,CAAC;CACpC;CAED,UAAUC,QAAqB;EAC7B,MAAME,UAAoD,CAAE;EAC5D,MAAM,CAAC,QAAQ,OAAO,OAAO,GAAG,KAAK,OAAO,OAAO;AACnD,MAAI,MAAO,QAAO;GAAE;GAAQ;EAAO;MAC9B,QAAO;GAAE;GAAQ;GAAQ;EAAS;CACxC;AACF","names":["data: any","rpc: ProtocolRPC","context: EncodeRPCContext","streamsMetadata: Record<number, ProtocolBlobMetadata>","streams: Record<number, ProtocolClientBlobStream>","key: string","value: any","data: ArrayBuffer","buffer: ArrayBuffer","context: DecodeRPCContext","streams: Record<number, ProtocolServerBlobStream>"],"sources":["../src/client.ts"],"sourcesContent":["import {\n BaseClientFormat,\n type ProtocolClientBlobStream,\n type ProtocolServerBlobStream,\n} from '@nmtjs/protocol/client'\nimport {\n type DecodeRPCContext,\n decodeText,\n type EncodeRPCContext,\n encodeText,\n ProtocolBlob,\n type ProtocolBlobMetadata,\n type ProtocolRPC,\n} from '@nmtjs/protocol/common'\nimport { deserializeStreamId, isStreamId, serializeStreamId } from './common.ts'\n\n/**\n * Custom JSON encoding format with support for Neemata streams.\n */\nexport class JsonFormat extends BaseClientFormat {\n contentType = 'application/x-neemata-json'\n\n encode(data: any): ArrayBuffer {\n return encodeText(JSON.stringify(data))\n }\n\n encodeRPC(rpc: ProtocolRPC, context: EncodeRPCContext) {\n const { callId, namespace, procedure } = rpc\n const streamsMetadata: Record<number, ProtocolBlobMetadata> = {}\n const streams: Record<number, ProtocolClientBlobStream> = {}\n const replacer = (key: string, value: any) => {\n if (value instanceof ProtocolBlob) {\n const stream = context.addStream(value)\n streamsMetadata[stream.id] = stream.metadata\n streams[stream.id] = stream\n return serializeStreamId(stream.id)\n }\n return value\n }\n const payload = JSON.stringify(rpc.payload, replacer)\n const buffer = this.encode([\n callId,\n namespace,\n procedure,\n streamsMetadata,\n payload,\n ])\n return { buffer, streams }\n }\n\n decode(data: ArrayBuffer): any {\n return JSON.parse(decodeText(data))\n }\n\n decodeRPC(buffer: ArrayBuffer, context: DecodeRPCContext) {\n const streams: Record<number, ProtocolServerBlobStream> = {}\n const [callId, error, streamsMetadata, payload] = this.decode(buffer)\n if (error) return { callId, error }\n else {\n const replacer = (key: string, value: any) => {\n if (typeof value === 'string' && isStreamId(value)) {\n const id = deserializeStreamId(value)\n const metadata = streamsMetadata[id]\n const stream = context.addStream(id, callId, metadata)\n streams[id] = stream\n return stream\n }\n return value\n }\n const result =\n typeof payload === 'undefined'\n ? undefined\n : JSON.parse(payload, replacer)\n return { callId, result, streams }\n }\n }\n}\n\n/**\n * Standard JSON encoding format with no Neemata streams support.\n */\nexport class StandardJsonFormat extends BaseClientFormat {\n contentType = 'application/json'\n\n encode(data: any) {\n return encodeText(JSON.stringify(data))\n }\n\n encodeRPC(rpc: ProtocolRPC) {\n const { callId, namespace, procedure, payload } = rpc\n const streams: Record<number, ProtocolClientBlobStream> = {}\n const buffer = this.encode([callId, namespace, procedure, payload])\n return { buffer, streams }\n }\n\n decode(data: ArrayBuffer) {\n return JSON.parse(decodeText(data))\n }\n\n decodeRPC(buffer: ArrayBuffer) {\n const streams: Record<number, ProtocolServerBlobStream> = {}\n const [callId, error, result] = this.decode(buffer)\n if (error) return { callId, error }\n else return { callId, result, streams }\n }\n}\n"],"version":3,"file":"client.js"}
|
package/dist/common.js
CHANGED
package/dist/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":"AACA,MAAM,uBAAuB;AAE7B,OAAO,MAAM,oBAAoB,CAACA,OAAe;AAC/C,SAAQ,EAAE,qBAAqB,EAAE,GAAG;AACrC;AAED,OAAO,MAAM,sBAAsB,CAACC,UAAkB;CACpD,MAAM,WAAW,MAAM,MAAM,qBAAqB,OAAO;AACzD,QAAO,OAAO,SAAS,SAAS;AACjC;AAED,OAAO,MAAM,aAAa,CAACC,UAAe;AACxC,eACS,UAAU,YACjB,MAAM,UACN,MAAM,WAAW,qBAAqB;AAEzC","names":["id: number","value: string","value: any"],"sources":["src/common.ts"],"sourcesContent":["// TODO: is this a good way to serialize streams within json?\nconst STREAM_SERIALIZE_KEY = '%neemata:stream:%\\f'\n\nexport const serializeStreamId = (id: number) => {\n return `${STREAM_SERIALIZE_KEY}${id}`\n}\n\nexport const deserializeStreamId = (value: string) => {\n const streamId = value.slice(STREAM_SERIALIZE_KEY.length)\n return Number.parseInt(streamId)\n}\n\nexport const isStreamId = (value: any) => {\n return (\n typeof value === 'string' &&\n value.length &&\n value.startsWith(STREAM_SERIALIZE_KEY)\n )\n}\n"],"version":3}
|
|
1
|
+
{"mappings":"AACA,MAAM,uBAAuB;AAE7B,OAAO,MAAM,oBAAoB,CAACA,OAAe;AAC/C,SAAQ,EAAE,qBAAqB,EAAE,GAAG;AACrC;AAED,OAAO,MAAM,sBAAsB,CAACC,UAAkB;CACpD,MAAM,WAAW,MAAM,MAAM,qBAAqB,OAAO;AACzD,QAAO,OAAO,SAAS,SAAS;AACjC;AAED,OAAO,MAAM,aAAa,CAACC,UAAe;AACxC,eACS,UAAU,YACjB,MAAM,UACN,MAAM,WAAW,qBAAqB;AAEzC","names":["id: number","value: string","value: any"],"sources":["../src/common.ts"],"sourcesContent":["// TODO: is this a good way to serialize streams within json?\nconst STREAM_SERIALIZE_KEY = '%neemata:stream:%\\f'\n\nexport const serializeStreamId = (id: number) => {\n return `${STREAM_SERIALIZE_KEY}${id}`\n}\n\nexport const deserializeStreamId = (value: string) => {\n const streamId = value.slice(STREAM_SERIALIZE_KEY.length)\n return Number.parseInt(streamId)\n}\n\nexport const isStreamId = (value: any) => {\n return (\n typeof value === 'string' &&\n value.length &&\n value.startsWith(STREAM_SERIALIZE_KEY)\n )\n}\n"],"version":3,"file":"common.js"}
|
package/dist/server.js
CHANGED
|
@@ -12,11 +12,7 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
12
12
|
}
|
|
13
13
|
encodeRPC(rpc, context) {
|
|
14
14
|
const { callId, error } = rpc;
|
|
15
|
-
if (error) return this.encode([
|
|
16
|
-
callId,
|
|
17
|
-
error,
|
|
18
|
-
null
|
|
19
|
-
]);
|
|
15
|
+
if (error) return this.encode([callId, error]);
|
|
20
16
|
else {
|
|
21
17
|
const streams = {};
|
|
22
18
|
const replacer = (key, value) => {
|
|
@@ -27,8 +23,13 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
27
23
|
}
|
|
28
24
|
return value;
|
|
29
25
|
};
|
|
30
|
-
const
|
|
31
|
-
|
|
26
|
+
const isUndefined = typeof rpc.result === "undefined";
|
|
27
|
+
const payload = JSON.stringify(rpc.result, replacer);
|
|
28
|
+
return this.encode(isUndefined ? [
|
|
29
|
+
callId,
|
|
30
|
+
null,
|
|
31
|
+
streams
|
|
32
|
+
] : [
|
|
32
33
|
callId,
|
|
33
34
|
null,
|
|
34
35
|
streams,
|
|
@@ -45,7 +46,7 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
45
46
|
if (typeof value === "string" && isStreamId(value)) {
|
|
46
47
|
const id = deserializeStreamId(value);
|
|
47
48
|
const metadata = streams[id];
|
|
48
|
-
return context.addStream(id, metadata);
|
|
49
|
+
return context.addStream(id, callId, metadata);
|
|
49
50
|
}
|
|
50
51
|
return value;
|
|
51
52
|
};
|
|
@@ -78,7 +79,7 @@ export class StandardJsonFormat extends BaseServerFormat {
|
|
|
78
79
|
return this.encode([
|
|
79
80
|
callId,
|
|
80
81
|
null,
|
|
81
|
-
rpc.
|
|
82
|
+
rpc.result
|
|
82
83
|
]);
|
|
83
84
|
}
|
|
84
85
|
}
|
|
@@ -95,3 +96,5 @@ export class StandardJsonFormat extends BaseServerFormat {
|
|
|
95
96
|
};
|
|
96
97
|
}
|
|
97
98
|
}
|
|
99
|
+
|
|
100
|
+
//# sourceMappingURL=server.js.map
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":"AAAA,SAEE,YAEA,YACA,oBAEK,wBAAwB;AAC/B,SAAS,wBAAwB,wBAAwB;AACzD,SAAS,qBAAqB,YAAY,yBAAyB,aAAa;;;;AAKhF,OAAO,MAAM,mBAAmB,iBAAiB;CAC/C,cAAc;CACd,SAAS,CAAC,4BAA6B;CAEvC,OAAOA,MAAwB;AAC7B,SAAO,WAAW,KAAK,UAAU,KAAK,CAAC;CACxC;CAED,UAAUC,KAA0BC,SAAwC;EAC1E,MAAM,EAAE,QAAQ,OAAO,GAAG;AAC1B,MAAI,MAAO,QAAO,KAAK,OAAO
|
|
1
|
+
{"mappings":"AAAA,SAEE,YAEA,YACA,oBAEK,wBAAwB;AAC/B,SAAS,wBAAwB,wBAAwB;AACzD,SAAS,qBAAqB,YAAY,yBAAyB,aAAa;;;;AAKhF,OAAO,MAAM,mBAAmB,iBAAiB;CAC/C,cAAc;CACd,SAAS,CAAC,4BAA6B;CAEvC,OAAOA,MAAwB;AAC7B,SAAO,WAAW,KAAK,UAAU,KAAK,CAAC;CACxC;CAED,UAAUC,KAA0BC,SAAwC;EAC1E,MAAM,EAAE,QAAQ,OAAO,GAAG;AAC1B,MAAI,MAAO,QAAO,KAAK,OAAO,CAAC,QAAQ,KAAM,EAAC;OACzC;GACH,MAAMC,UAAe,CAAE;GACvB,MAAM,WAAW,CAACC,KAAaC,UAAe;AAC5C,QAAI,iBAAiB,cAAc;KACjC,MAAM,SAAS,QAAQ,UAAU,MAAM;AACvC,aAAQ,OAAO,MAAM,OAAO;AAC5B,YAAO,kBAAkB,OAAO,GAAG;IACpC;AACD,WAAO;GACR;GACD,MAAM,qBAAqB,IAAI,WAAW;GAC1C,MAAM,UAAU,KAAK,UAAU,IAAI,QAAQ,SAAS;AACpD,UAAO,KAAK,OACV,cACI;IAAC;IAAQ;IAAM;GAAQ,IACvB;IAAC;IAAQ;IAAM;IAAS;GAAQ,EACrC;EACF;CACF;CAED,OAAOC,MAAwB;AAC7B,SAAO,KAAK,MAAM,WAAW,KAAK,CAAC;CACpC;CAED,UAAUC,QAAqBC,SAA2B;EACxD,MAAM,CAAC,QAAQ,WAAW,WAAW,SAAS,cAAc,GAC1D,KAAK,OAAO,OAAO;EAErB,MAAM,WAAW,CAACJ,KAAaC,UAAe;AAC5C,cAAW,UAAU,YAAY,WAAW,MAAM,EAAE;IAClD,MAAM,KAAK,oBAAoB,MAAM;IACrC,MAAM,WAAW,QAAQ;AACzB,WAAO,QAAQ,UAAU,IAAI,QAAQ,SAAS;GAC/C;AACD,UAAO;EACR;EAED,MAAM,UAAU,gBAAgB,KAAK,MAAM,eAAe,SAAS,GAAG;AAEtE,SAAO;GACL;GACA;GACA;GACA;EACD;CACF;AACF;;;;AAKD,OAAO,MAAM,2BAA2B,iBAAiB;CACvD,cAAc;CACd,SAAS,CAAC,oBAAoB,0BAA2B;CAEzD,OAAOL,MAAW;AAChB,SAAO,WAAW,KAAK,UAAU,KAAK,CAAC;CACxC;CAED,UAAUC,KAA0B;EAClC,MAAM,EAAE,QAAQ,OAAO,GAAG;AAC1B,MAAI,MAAO,QAAO,KAAK,OAAO;GAAC;GAAQ;GAAO;EAAK,EAAC;OAC/C;AACH,UAAO,KAAK,OAAO;IAAC;IAAQ;IAAM,IAAI;GAAO,EAAC;EAC/C;CACF;CAED,OAAOM,QAAqB;AAC1B,SAAO,KAAK,MAAM,WAAW,OAAO,CAAC;CACtC;CAED,UAAUA,QAAqB;EAC7B,MAAM,CAAC,QAAQ,WAAW,WAAW,QAAQ,GAAG,KAAK,OAAO,OAAO;AACnE,SAAO;GAAE;GAAQ;GAAW;GAAW;EAAS;CACjD;AACF","names":["data: any","rpc: ProtocolRPCResponse","context: EncodeRPCContext","streams: any","key: string","value: any","data: ArrayBuffer","buffer: ArrayBuffer","context: DecodeRPCContext"],"sources":["../src/server.ts"],"sourcesContent":["import {\n type DecodeRPCContext,\n decodeText,\n type EncodeRPCContext,\n encodeText,\n ProtocolBlob,\n type ProtocolRPCResponse,\n} from '@nmtjs/protocol/common'\nimport { BaseServerFormat } from '@nmtjs/protocol/server'\nimport { deserializeStreamId, isStreamId, serializeStreamId } from './common.ts'\n\n/**\n * Custom JSON encoding format with Neemata streams support.\n */\nexport class JsonFormat extends BaseServerFormat {\n contentType = 'application/x-neemata-json'\n accept = ['application/x-neemata-json']\n\n encode(data: any): ArrayBuffer {\n return encodeText(JSON.stringify(data))\n }\n\n encodeRPC(rpc: ProtocolRPCResponse, context: EncodeRPCContext): ArrayBuffer {\n const { callId, error } = rpc\n if (error) return this.encode([callId, error])\n else {\n const streams: any = {}\n const replacer = (key: string, value: any) => {\n if (value instanceof ProtocolBlob) {\n const stream = context.addStream(value)\n streams[stream.id] = stream.metadata\n return serializeStreamId(stream.id)\n }\n return value\n }\n const isUndefined = typeof rpc.result === 'undefined'\n const payload = JSON.stringify(rpc.result, replacer)\n return this.encode(\n isUndefined\n ? [callId, null, streams]\n : [callId, null, streams, payload],\n )\n }\n }\n\n decode(data: ArrayBuffer): any {\n return JSON.parse(decodeText(data))\n }\n\n decodeRPC(buffer: ArrayBuffer, context: DecodeRPCContext) {\n const [callId, namespace, procedure, streams, formatPayload] =\n this.decode(buffer)\n\n const replacer = (key: string, value: any) => {\n if (typeof value === 'string' && isStreamId(value)) {\n const id = deserializeStreamId(value)\n const metadata = streams[id]\n return context.addStream(id, callId, metadata)\n }\n return value\n }\n\n const payload = formatPayload ? JSON.parse(formatPayload, replacer) : null\n\n return {\n callId,\n namespace,\n procedure,\n payload,\n }\n }\n}\n\n/**\n * Standard JSON encoding format with no Neemata streams support.\n */\nexport class StandardJsonFormat extends BaseServerFormat {\n contentType = 'application/json'\n accept = ['application/json', 'application/vnd.api+json']\n\n encode(data: any) {\n return encodeText(JSON.stringify(data))\n }\n\n encodeRPC(rpc: ProtocolRPCResponse) {\n const { callId, error } = rpc\n if (error) return this.encode([callId, error, null])\n else {\n return this.encode([callId, null, rpc.result])\n }\n }\n\n decode(buffer: ArrayBuffer) {\n return JSON.parse(decodeText(buffer))\n }\n\n decodeRPC(buffer: ArrayBuffer) {\n const [callId, namespace, procedure, payload] = this.decode(buffer)\n return { callId, namespace, procedure, payload }\n }\n}\n"],"version":3,"file":"server.js"}
|
package/package.json
CHANGED
|
@@ -12,12 +12,12 @@
|
|
|
12
12
|
}
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@nmtjs/common": "0.
|
|
16
|
-
"@nmtjs/protocol": "0.
|
|
15
|
+
"@nmtjs/common": "0.9.0",
|
|
16
|
+
"@nmtjs/protocol": "0.9.0"
|
|
17
17
|
},
|
|
18
18
|
"peerDependencies": {
|
|
19
|
-
"@nmtjs/common": "0.
|
|
20
|
-
"@nmtjs/protocol": "0.
|
|
19
|
+
"@nmtjs/common": "0.9.0",
|
|
20
|
+
"@nmtjs/protocol": "0.9.0"
|
|
21
21
|
},
|
|
22
22
|
"files": [
|
|
23
23
|
"src",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"LICENSE.md",
|
|
26
26
|
"README.md"
|
|
27
27
|
],
|
|
28
|
-
"version": "0.
|
|
28
|
+
"version": "0.9.0",
|
|
29
29
|
"scripts": {
|
|
30
30
|
"build": "neemata-build --root=./src './**/*.ts'",
|
|
31
31
|
"type-check": "tsc --noEmit"
|
package/src/client.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
BaseClientFormat,
|
|
3
|
+
type ProtocolClientBlobStream,
|
|
4
|
+
type ProtocolServerBlobStream,
|
|
5
|
+
} from '@nmtjs/protocol/client'
|
|
2
6
|
import {
|
|
3
7
|
type DecodeRPCContext,
|
|
4
8
|
decodeText,
|
|
@@ -20,19 +24,28 @@ export class JsonFormat extends BaseClientFormat {
|
|
|
20
24
|
return encodeText(JSON.stringify(data))
|
|
21
25
|
}
|
|
22
26
|
|
|
23
|
-
encodeRPC(rpc: ProtocolRPC, context: EncodeRPCContext)
|
|
27
|
+
encodeRPC(rpc: ProtocolRPC, context: EncodeRPCContext) {
|
|
24
28
|
const { callId, namespace, procedure } = rpc
|
|
25
|
-
const
|
|
29
|
+
const streamsMetadata: Record<number, ProtocolBlobMetadata> = {}
|
|
30
|
+
const streams: Record<number, ProtocolClientBlobStream> = {}
|
|
26
31
|
const replacer = (key: string, value: any) => {
|
|
27
32
|
if (value instanceof ProtocolBlob) {
|
|
28
33
|
const stream = context.addStream(value)
|
|
29
|
-
|
|
34
|
+
streamsMetadata[stream.id] = stream.metadata
|
|
35
|
+
streams[stream.id] = stream
|
|
30
36
|
return serializeStreamId(stream.id)
|
|
31
37
|
}
|
|
32
38
|
return value
|
|
33
39
|
}
|
|
34
40
|
const payload = JSON.stringify(rpc.payload, replacer)
|
|
35
|
-
|
|
41
|
+
const buffer = this.encode([
|
|
42
|
+
callId,
|
|
43
|
+
namespace,
|
|
44
|
+
procedure,
|
|
45
|
+
streamsMetadata,
|
|
46
|
+
payload,
|
|
47
|
+
])
|
|
48
|
+
return { buffer, streams }
|
|
36
49
|
}
|
|
37
50
|
|
|
38
51
|
decode(data: ArrayBuffer): any {
|
|
@@ -40,19 +53,25 @@ export class JsonFormat extends BaseClientFormat {
|
|
|
40
53
|
}
|
|
41
54
|
|
|
42
55
|
decodeRPC(buffer: ArrayBuffer, context: DecodeRPCContext) {
|
|
43
|
-
const
|
|
44
|
-
|
|
56
|
+
const streams: Record<number, ProtocolServerBlobStream> = {}
|
|
57
|
+
const [callId, error, streamsMetadata, payload] = this.decode(buffer)
|
|
58
|
+
if (error) return { callId, error }
|
|
45
59
|
else {
|
|
46
60
|
const replacer = (key: string, value: any) => {
|
|
47
61
|
if (typeof value === 'string' && isStreamId(value)) {
|
|
48
62
|
const id = deserializeStreamId(value)
|
|
49
|
-
const metadata =
|
|
50
|
-
|
|
63
|
+
const metadata = streamsMetadata[id]
|
|
64
|
+
const stream = context.addStream(id, callId, metadata)
|
|
65
|
+
streams[id] = stream
|
|
66
|
+
return stream
|
|
51
67
|
}
|
|
52
68
|
return value
|
|
53
69
|
}
|
|
54
|
-
const
|
|
55
|
-
|
|
70
|
+
const result =
|
|
71
|
+
typeof payload === 'undefined'
|
|
72
|
+
? undefined
|
|
73
|
+
: JSON.parse(payload, replacer)
|
|
74
|
+
return { callId, result, streams }
|
|
56
75
|
}
|
|
57
76
|
}
|
|
58
77
|
}
|
|
@@ -69,7 +88,9 @@ export class StandardJsonFormat extends BaseClientFormat {
|
|
|
69
88
|
|
|
70
89
|
encodeRPC(rpc: ProtocolRPC) {
|
|
71
90
|
const { callId, namespace, procedure, payload } = rpc
|
|
72
|
-
|
|
91
|
+
const streams: Record<number, ProtocolClientBlobStream> = {}
|
|
92
|
+
const buffer = this.encode([callId, namespace, procedure, payload])
|
|
93
|
+
return { buffer, streams }
|
|
73
94
|
}
|
|
74
95
|
|
|
75
96
|
decode(data: ArrayBuffer) {
|
|
@@ -77,7 +98,9 @@ export class StandardJsonFormat extends BaseClientFormat {
|
|
|
77
98
|
}
|
|
78
99
|
|
|
79
100
|
decodeRPC(buffer: ArrayBuffer) {
|
|
80
|
-
const
|
|
81
|
-
|
|
101
|
+
const streams: Record<number, ProtocolServerBlobStream> = {}
|
|
102
|
+
const [callId, error, result] = this.decode(buffer)
|
|
103
|
+
if (error) return { callId, error }
|
|
104
|
+
else return { callId, result, streams }
|
|
82
105
|
}
|
|
83
106
|
}
|
package/src/server.ts
CHANGED
|
@@ -22,7 +22,7 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
22
22
|
|
|
23
23
|
encodeRPC(rpc: ProtocolRPCResponse, context: EncodeRPCContext): ArrayBuffer {
|
|
24
24
|
const { callId, error } = rpc
|
|
25
|
-
if (error) return this.encode([callId, error
|
|
25
|
+
if (error) return this.encode([callId, error])
|
|
26
26
|
else {
|
|
27
27
|
const streams: any = {}
|
|
28
28
|
const replacer = (key: string, value: any) => {
|
|
@@ -33,8 +33,13 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
33
33
|
}
|
|
34
34
|
return value
|
|
35
35
|
}
|
|
36
|
-
const
|
|
37
|
-
|
|
36
|
+
const isUndefined = typeof rpc.result === 'undefined'
|
|
37
|
+
const payload = JSON.stringify(rpc.result, replacer)
|
|
38
|
+
return this.encode(
|
|
39
|
+
isUndefined
|
|
40
|
+
? [callId, null, streams]
|
|
41
|
+
: [callId, null, streams, payload],
|
|
42
|
+
)
|
|
38
43
|
}
|
|
39
44
|
}
|
|
40
45
|
|
|
@@ -50,7 +55,7 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
50
55
|
if (typeof value === 'string' && isStreamId(value)) {
|
|
51
56
|
const id = deserializeStreamId(value)
|
|
52
57
|
const metadata = streams[id]
|
|
53
|
-
return context.addStream(id, metadata)
|
|
58
|
+
return context.addStream(id, callId, metadata)
|
|
54
59
|
}
|
|
55
60
|
return value
|
|
56
61
|
}
|
|
@@ -81,7 +86,7 @@ export class StandardJsonFormat extends BaseServerFormat {
|
|
|
81
86
|
const { callId, error } = rpc
|
|
82
87
|
if (error) return this.encode([callId, error, null])
|
|
83
88
|
else {
|
|
84
|
-
return this.encode([callId, null, rpc.
|
|
89
|
+
return this.encode([callId, null, rpc.result])
|
|
85
90
|
}
|
|
86
91
|
}
|
|
87
92
|
|