@nmtjs/json-format 0.9.0 → 0.10.1
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 +8 -3
- package/dist/client.js.map +1 -1
- package/dist/server.js +2 -2
- package/dist/server.js.map +1 -1
- package/package.json +5 -5
- package/src/client.ts +15 -14
- package/src/server.ts +5 -2
package/dist/client.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { decodeText, encodeText, ProtocolBlob } from "@nmtjs/protocol";
|
|
1
2
|
import { BaseClientFormat } from "@nmtjs/protocol/client";
|
|
2
|
-
import { decodeText, encodeText, ProtocolBlob } from "@nmtjs/protocol/common";
|
|
3
3
|
import { deserializeStreamId, isStreamId, serializeStreamId } from "./common.js";
|
|
4
4
|
/**
|
|
5
5
|
* Custom JSON encoding format with support for Neemata streams.
|
|
@@ -22,8 +22,13 @@ export class JsonFormat extends BaseClientFormat {
|
|
|
22
22
|
}
|
|
23
23
|
return value;
|
|
24
24
|
};
|
|
25
|
-
const payload = JSON.stringify(rpc.payload, replacer);
|
|
26
|
-
const buffer = this.encode([
|
|
25
|
+
const payload = typeof rpc.payload === "undefined" ? undefined : JSON.stringify(rpc.payload, replacer);
|
|
26
|
+
const buffer = typeof payload === "undefined" ? this.encode([
|
|
27
|
+
callId,
|
|
28
|
+
namespace,
|
|
29
|
+
procedure,
|
|
30
|
+
streamsMetadata
|
|
31
|
+
]) : this.encode([
|
|
27
32
|
callId,
|
|
28
33
|
namespace,
|
|
29
34
|
procedure,
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":"AAAA,
|
|
1
|
+
{"mappings":"AAAA,SAEE,YAEA,YACA,oBAGK,iBAAiB;AACxB,SACE,wBAGK,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,iBACG,IAAI,YAAY,cACnB,YACA,KAAK,UAAU,IAAI,SAAS,SAAS;EAE3C,MAAM,gBACG,YAAY,cACf,KAAK,OAAO;GAAC;GAAQ;GAAW;GAAW;EAAgB,EAAC,GAC5D,KAAK,OAAO;GAAC;GAAQ;GAAW;GAAW;GAAiB;EAAQ,EAAC;AAC3E,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 type DecodeRPCContext,\n decodeText,\n type EncodeRPCContext,\n encodeText,\n ProtocolBlob,\n type ProtocolBlobMetadata,\n type ProtocolRPC,\n} from '@nmtjs/protocol'\nimport {\n BaseClientFormat,\n type ProtocolClientBlobStream,\n type ProtocolServerBlobStream,\n} from '@nmtjs/protocol/client'\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 =\n typeof rpc.payload === 'undefined'\n ? undefined\n : JSON.stringify(rpc.payload, replacer)\n\n const buffer =\n typeof payload === 'undefined'\n ? this.encode([callId, namespace, procedure, streamsMetadata])\n : this.encode([callId, namespace, procedure, streamsMetadata, payload])\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/server.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { decodeText, encodeText, ProtocolBlob } from "@nmtjs/protocol
|
|
1
|
+
import { decodeText, encodeText, ProtocolBlob } from "@nmtjs/protocol";
|
|
2
2
|
import { BaseServerFormat } from "@nmtjs/protocol/server";
|
|
3
3
|
import { deserializeStreamId, isStreamId, serializeStreamId } from "./common.js";
|
|
4
4
|
/**
|
|
@@ -50,7 +50,7 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
50
50
|
}
|
|
51
51
|
return value;
|
|
52
52
|
};
|
|
53
|
-
const payload = formatPayload ? JSON.parse(formatPayload, replacer)
|
|
53
|
+
const payload = typeof formatPayload === "undefined" ? undefined : JSON.parse(formatPayload, replacer);
|
|
54
54
|
return {
|
|
55
55
|
callId,
|
|
56
56
|
namespace,
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":"AAAA,SAEE,YAEA,YACA,oBAEK,
|
|
1
|
+
{"mappings":"AAAA,SAEE,YAEA,YACA,oBAEK,iBAAiB;AACxB,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,iBACG,kBAAkB,cACrB,YACA,KAAK,MAAM,eAAe,SAAS;AAEzC,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'\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 =\n typeof formatPayload === 'undefined'\n ? undefined\n : JSON.parse(formatPayload, replacer)\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.10.1",
|
|
16
|
+
"@nmtjs/protocol": "0.10.1"
|
|
17
17
|
},
|
|
18
18
|
"peerDependencies": {
|
|
19
|
-
"@nmtjs/common": "0.
|
|
20
|
-
"@nmtjs/protocol": "0.
|
|
19
|
+
"@nmtjs/common": "0.10.1",
|
|
20
|
+
"@nmtjs/protocol": "0.10.1"
|
|
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.10.1",
|
|
29
29
|
"scripts": {
|
|
30
30
|
"build": "neemata-build --root=./src './**/*.ts'",
|
|
31
31
|
"type-check": "tsc --noEmit"
|
package/src/client.ts
CHANGED
|
@@ -1,8 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
BaseClientFormat,
|
|
3
|
-
type ProtocolClientBlobStream,
|
|
4
|
-
type ProtocolServerBlobStream,
|
|
5
|
-
} from '@nmtjs/protocol/client'
|
|
6
1
|
import {
|
|
7
2
|
type DecodeRPCContext,
|
|
8
3
|
decodeText,
|
|
@@ -11,7 +6,12 @@ import {
|
|
|
11
6
|
ProtocolBlob,
|
|
12
7
|
type ProtocolBlobMetadata,
|
|
13
8
|
type ProtocolRPC,
|
|
14
|
-
} from '@nmtjs/protocol
|
|
9
|
+
} from '@nmtjs/protocol'
|
|
10
|
+
import {
|
|
11
|
+
BaseClientFormat,
|
|
12
|
+
type ProtocolClientBlobStream,
|
|
13
|
+
type ProtocolServerBlobStream,
|
|
14
|
+
} from '@nmtjs/protocol/client'
|
|
15
15
|
import { deserializeStreamId, isStreamId, serializeStreamId } from './common.ts'
|
|
16
16
|
|
|
17
17
|
/**
|
|
@@ -37,14 +37,15 @@ export class JsonFormat extends BaseClientFormat {
|
|
|
37
37
|
}
|
|
38
38
|
return value
|
|
39
39
|
}
|
|
40
|
-
const payload =
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
payload
|
|
47
|
-
|
|
40
|
+
const payload =
|
|
41
|
+
typeof rpc.payload === 'undefined'
|
|
42
|
+
? undefined
|
|
43
|
+
: JSON.stringify(rpc.payload, replacer)
|
|
44
|
+
|
|
45
|
+
const buffer =
|
|
46
|
+
typeof payload === 'undefined'
|
|
47
|
+
? this.encode([callId, namespace, procedure, streamsMetadata])
|
|
48
|
+
: this.encode([callId, namespace, procedure, streamsMetadata, payload])
|
|
48
49
|
return { buffer, streams }
|
|
49
50
|
}
|
|
50
51
|
|
package/src/server.ts
CHANGED
|
@@ -5,7 +5,7 @@ import {
|
|
|
5
5
|
encodeText,
|
|
6
6
|
ProtocolBlob,
|
|
7
7
|
type ProtocolRPCResponse,
|
|
8
|
-
} from '@nmtjs/protocol
|
|
8
|
+
} from '@nmtjs/protocol'
|
|
9
9
|
import { BaseServerFormat } from '@nmtjs/protocol/server'
|
|
10
10
|
import { deserializeStreamId, isStreamId, serializeStreamId } from './common.ts'
|
|
11
11
|
|
|
@@ -60,7 +60,10 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
60
60
|
return value
|
|
61
61
|
}
|
|
62
62
|
|
|
63
|
-
const payload =
|
|
63
|
+
const payload =
|
|
64
|
+
typeof formatPayload === 'undefined'
|
|
65
|
+
? undefined
|
|
66
|
+
: JSON.parse(formatPayload, replacer)
|
|
64
67
|
|
|
65
68
|
return {
|
|
66
69
|
callId,
|