@nmtjs/json-format 0.1.0 → 0.1.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/dist/client.js +11 -10
- package/dist/client.js.map +1 -1
- package/dist/common.js +3 -1
- package/dist/common.js.map +1 -1
- package/dist/server.js +11 -10
- package/dist/server.js.map +1 -1
- package/package.json +7 -4
- package/src/client.ts +17 -17
- package/src/common.ts +7 -4
- package/src/server.ts +15 -15
package/dist/client.js
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { BaseClientFormat } from '@nmtjs/protocol/client';
|
|
2
|
+
import { ProtocolBlob, decodeText, encodeText } from '@nmtjs/protocol/common';
|
|
2
3
|
import { deserializeStreamId, isStreamId, serializeStreamId } from "./common.js";
|
|
3
4
|
export class JsonFormat extends BaseClientFormat {
|
|
4
5
|
contentType = 'application/x-neemata-json';
|
|
5
6
|
encode(data) {
|
|
6
7
|
return encodeText(JSON.stringify(data));
|
|
7
8
|
}
|
|
8
|
-
|
|
9
|
-
const { callId,
|
|
9
|
+
encodeRPC(rpc, context) {
|
|
10
|
+
const { callId, namespace, procedure } = rpc;
|
|
10
11
|
const streams = {};
|
|
11
12
|
const replacer = (key, value)=>{
|
|
12
|
-
if (value instanceof
|
|
13
|
+
if (value instanceof ProtocolBlob) {
|
|
13
14
|
const stream = context.addStream(value);
|
|
14
15
|
streams[stream.id] = stream.metadata;
|
|
15
16
|
return serializeStreamId(stream.id);
|
|
@@ -19,7 +20,7 @@ export class JsonFormat extends BaseClientFormat {
|
|
|
19
20
|
const payload = JSON.stringify(rpc.payload, replacer);
|
|
20
21
|
return this.encode([
|
|
21
22
|
callId,
|
|
22
|
-
|
|
23
|
+
namespace,
|
|
23
24
|
procedure,
|
|
24
25
|
streams,
|
|
25
26
|
payload
|
|
@@ -28,7 +29,7 @@ export class JsonFormat extends BaseClientFormat {
|
|
|
28
29
|
decode(data) {
|
|
29
30
|
return JSON.parse(decodeText(data));
|
|
30
31
|
}
|
|
31
|
-
|
|
32
|
+
decodeRPC(buffer, context) {
|
|
32
33
|
const [callId, error, streams, formatPayload] = this.decode(buffer);
|
|
33
34
|
if (error) return {
|
|
34
35
|
callId,
|
|
@@ -58,11 +59,11 @@ export class StandardJsonFormat extends BaseClientFormat {
|
|
|
58
59
|
encode(data) {
|
|
59
60
|
return encodeText(JSON.stringify(data));
|
|
60
61
|
}
|
|
61
|
-
|
|
62
|
-
const { callId,
|
|
62
|
+
encodeRPC(rpc) {
|
|
63
|
+
const { callId, namespace, procedure, payload } = rpc;
|
|
63
64
|
return this.encode([
|
|
64
65
|
callId,
|
|
65
|
-
|
|
66
|
+
namespace,
|
|
66
67
|
procedure,
|
|
67
68
|
payload
|
|
68
69
|
]);
|
|
@@ -70,7 +71,7 @@ export class StandardJsonFormat extends BaseClientFormat {
|
|
|
70
71
|
decode(data) {
|
|
71
72
|
return JSON.parse(decodeText(data));
|
|
72
73
|
}
|
|
73
|
-
|
|
74
|
+
decodeRPC(buffer) {
|
|
74
75
|
const [callId, error, payload] = this.decode(buffer);
|
|
75
76
|
return {
|
|
76
77
|
callId,
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/client.ts"],"sourcesContent":["import {\n
|
|
1
|
+
{"version":3,"sources":["../../src/client.ts"],"sourcesContent":["import { BaseClientFormat } from '@nmtjs/protocol/client'\nimport {\n type DecodeRPCContext,\n type EncodeRPCContext,\n ProtocolBlob,\n type ProtocolBlobMetadata,\n type ProtocolRPC,\n decodeText,\n encodeText,\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): ArrayBuffer {\n const { callId, namespace, procedure } = rpc\n const streams: Record<number, ProtocolBlobMetadata> = {}\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 payload = JSON.stringify(rpc.payload, replacer)\n return this.encode([callId, namespace, procedure, streams, payload])\n }\n\n decode(data: ArrayBuffer): any {\n return JSON.parse(decodeText(data))\n }\n\n decodeRPC(buffer: ArrayBuffer, context: DecodeRPCContext) {\n const [callId, error, streams, formatPayload] = this.decode(buffer)\n if (error) return { callId, error, payload: null }\n else {\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, metadata)\n }\n return value\n }\n const payload = formatPayload ? JSON.parse(formatPayload, replacer) : null\n return { callId, error: null, payload }\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 return this.encode([callId, namespace, procedure, payload])\n }\n\n decode(data: ArrayBuffer) {\n return JSON.parse(decodeText(data))\n }\n\n decodeRPC(buffer: ArrayBuffer) {\n const [callId, error, payload] = this.decode(buffer)\n return { callId, error, payload }\n }\n}\n"],"names":["BaseClientFormat","ProtocolBlob","decodeText","encodeText","deserializeStreamId","isStreamId","serializeStreamId","JsonFormat","contentType","encode","data","JSON","stringify","encodeRPC","rpc","context","callId","namespace","procedure","streams","replacer","key","value","stream","addStream","id","metadata","payload","decode","parse","decodeRPC","buffer","error","formatPayload","StandardJsonFormat"],"mappings":"AAAA,SAASA,gBAAgB,QAAQ,yBAAwB;AACzD,SAGEC,YAAY,EAGZC,UAAU,EACVC,UAAU,QACL,yBAAwB;AAC/B,SAASC,mBAAmB,EAAEC,UAAU,EAAEC,iBAAiB,QAAQ,cAAa;AAKhF,OAAO,MAAMC,mBAAmBP;IAC9BQ,cAAc,6BAA4B;IAE1CC,OAAOC,IAAS,EAAe;QAC7B,OAAOP,WAAWQ,KAAKC,SAAS,CAACF;IACnC;IAEAG,UAAUC,GAAgB,EAAEC,OAAyB,EAAe;QAClE,MAAM,EAAEC,MAAM,EAAEC,SAAS,EAAEC,SAAS,EAAE,GAAGJ;QACzC,MAAMK,UAAgD,CAAC;QACvD,MAAMC,WAAW,CAACC,KAAaC;YAC7B,IAAIA,iBAAiBrB,cAAc;gBACjC,MAAMsB,SAASR,QAAQS,SAAS,CAACF;gBACjCH,OAAO,CAACI,OAAOE,EAAE,CAAC,GAAGF,OAAOG,QAAQ;gBACpC,OAAOpB,kBAAkBiB,OAAOE,EAAE;YACpC;YACA,OAAOH;QACT;QACA,MAAMK,UAAUhB,KAAKC,SAAS,CAACE,IAAIa,OAAO,EAAEP;QAC5C,OAAO,IAAI,CAACX,MAAM,CAAC;YAACO;YAAQC;YAAWC;YAAWC;YAASQ;SAAQ;IACrE;IAEAC,OAAOlB,IAAiB,EAAO;QAC7B,OAAOC,KAAKkB,KAAK,CAAC3B,WAAWQ;IAC/B;IAEAoB,UAAUC,MAAmB,EAAEhB,OAAyB,EAAE;QACxD,MAAM,CAACC,QAAQgB,OAAOb,SAASc,cAAc,GAAG,IAAI,CAACL,MAAM,CAACG;QAC5D,IAAIC,OAAO,OAAO;YAAEhB;YAAQgB;YAAOL,SAAS;QAAK;aAC5C;YACH,MAAMP,WAAW,CAACC,KAAaC;gBAC7B,IAAI,OAAOA,UAAU,YAAYjB,WAAWiB,QAAQ;oBAClD,MAAMG,KAAKrB,oBAAoBkB;oBAC/B,MAAMI,WAAWP,OAAO,CAACM,GAAG;oBAC5B,OAAOV,QAAQS,SAAS,CAACC,IAAIC;gBAC/B;gBACA,OAAOJ;YACT;YACA,MAAMK,UAAUM,gBAAgBtB,KAAKkB,KAAK,CAACI,eAAeb,YAAY;YACtE,OAAO;gBAAEJ;gBAAQgB,OAAO;gBAAML;YAAQ;QACxC;IACF;AACF;AAKA,OAAO,MAAMO,2BAA2BlC;IACtCQ,cAAc,mBAAkB;IAEhCC,OAAOC,IAAS,EAAE;QAChB,OAAOP,WAAWQ,KAAKC,SAAS,CAACF;IACnC;IAEAG,UAAUC,GAAgB,EAAE;QAC1B,MAAM,EAAEE,MAAM,EAAEC,SAAS,EAAEC,SAAS,EAAES,OAAO,EAAE,GAAGb;QAClD,OAAO,IAAI,CAACL,MAAM,CAAC;YAACO;YAAQC;YAAWC;YAAWS;SAAQ;IAC5D;IAEAC,OAAOlB,IAAiB,EAAE;QACxB,OAAOC,KAAKkB,KAAK,CAAC3B,WAAWQ;IAC/B;IAEAoB,UAAUC,MAAmB,EAAE;QAC7B,MAAM,CAACf,QAAQgB,OAAOL,QAAQ,GAAG,IAAI,CAACC,MAAM,CAACG;QAC7C,OAAO;YAAEf;YAAQgB;YAAOL;QAAQ;IAClC;AACF"}
|
package/dist/common.js
CHANGED
|
@@ -6,4 +6,6 @@ export const deserializeStreamId = (value)=>{
|
|
|
6
6
|
const streamId = value.slice(STREAM_SERIALIZE_KEY.length);
|
|
7
7
|
return Number.parseInt(streamId);
|
|
8
8
|
};
|
|
9
|
-
export const isStreamId = (value)=>
|
|
9
|
+
export const isStreamId = (value)=>{
|
|
10
|
+
return typeof value === 'string' && value.length && value.startsWith(STREAM_SERIALIZE_KEY);
|
|
11
|
+
};
|
package/dist/common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"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)
|
|
1
|
+
{"version":3,"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"],"names":["STREAM_SERIALIZE_KEY","serializeStreamId","id","deserializeStreamId","value","streamId","slice","length","Number","parseInt","isStreamId","startsWith"],"mappings":"AACA,MAAMA,uBAAuB;AAE7B,OAAO,MAAMC,oBAAoB,CAACC;IAChC,OAAO,CAAC,EAAEF,qBAAqB,EAAEE,GAAG,CAAC;AACvC,EAAC;AAED,OAAO,MAAMC,sBAAsB,CAACC;IAClC,MAAMC,WAAWD,MAAME,KAAK,CAACN,qBAAqBO,MAAM;IACxD,OAAOC,OAAOC,QAAQ,CAACJ;AACzB,EAAC;AAED,OAAO,MAAMK,aAAa,CAACN;IACzB,OACE,OAAOA,UAAU,YACjBA,MAAMG,MAAM,IACZH,MAAMO,UAAU,CAACX;AAErB,EAAC"}
|
package/dist/server.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ProtocolBlob, decodeText, encodeText } from '@nmtjs/protocol/common';
|
|
2
|
+
import { BaseServerFormat } from '@nmtjs/protocol/server';
|
|
2
3
|
import { deserializeStreamId, isStreamId, serializeStreamId } from "./common.js";
|
|
3
4
|
export class JsonFormat extends BaseServerFormat {
|
|
4
5
|
contentType = 'application/x-neemata-json';
|
|
@@ -8,7 +9,7 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
8
9
|
encode(data) {
|
|
9
10
|
return encodeText(JSON.stringify(data));
|
|
10
11
|
}
|
|
11
|
-
|
|
12
|
+
encodeRPC(rpc, context) {
|
|
12
13
|
const { callId, error } = rpc;
|
|
13
14
|
if (error) return this.encode([
|
|
14
15
|
callId,
|
|
@@ -18,7 +19,7 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
18
19
|
else {
|
|
19
20
|
const streams = {};
|
|
20
21
|
const replacer = (key, value)=>{
|
|
21
|
-
if (value instanceof
|
|
22
|
+
if (value instanceof ProtocolBlob) {
|
|
22
23
|
const stream = context.addStream(value);
|
|
23
24
|
streams[stream.id] = stream.metadata;
|
|
24
25
|
return serializeStreamId(stream.id);
|
|
@@ -37,8 +38,8 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
37
38
|
decode(data) {
|
|
38
39
|
return JSON.parse(decodeText(data));
|
|
39
40
|
}
|
|
40
|
-
|
|
41
|
-
const [callId,
|
|
41
|
+
decodeRPC(buffer, context) {
|
|
42
|
+
const [callId, namespace, procedure, streams, formatPayload] = this.decode(buffer);
|
|
42
43
|
const replacer = (key, value)=>{
|
|
43
44
|
if (typeof value === 'string' && isStreamId(value)) {
|
|
44
45
|
const id = deserializeStreamId(value);
|
|
@@ -50,7 +51,7 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
50
51
|
const payload = formatPayload ? JSON.parse(formatPayload, replacer) : null;
|
|
51
52
|
return {
|
|
52
53
|
callId,
|
|
53
|
-
|
|
54
|
+
namespace,
|
|
54
55
|
procedure,
|
|
55
56
|
payload
|
|
56
57
|
};
|
|
@@ -65,7 +66,7 @@ export class StandardJsonFormat extends BaseServerFormat {
|
|
|
65
66
|
encode(data) {
|
|
66
67
|
return encodeText(JSON.stringify(data));
|
|
67
68
|
}
|
|
68
|
-
|
|
69
|
+
encodeRPC(rpc) {
|
|
69
70
|
const { callId, error } = rpc;
|
|
70
71
|
if (error) return this.encode([
|
|
71
72
|
callId,
|
|
@@ -83,11 +84,11 @@ export class StandardJsonFormat extends BaseServerFormat {
|
|
|
83
84
|
decode(buffer) {
|
|
84
85
|
return JSON.parse(decodeText(buffer));
|
|
85
86
|
}
|
|
86
|
-
|
|
87
|
-
const [callId,
|
|
87
|
+
decodeRPC(buffer) {
|
|
88
|
+
const [callId, namespace, procedure, payload] = this.decode(buffer);
|
|
88
89
|
return {
|
|
89
90
|
callId,
|
|
90
|
-
|
|
91
|
+
namespace,
|
|
91
92
|
procedure,
|
|
92
93
|
payload
|
|
93
94
|
};
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/server.ts"],"sourcesContent":["import {\n
|
|
1
|
+
{"version":3,"sources":["../../src/server.ts"],"sourcesContent":["import {\n type DecodeRPCContext,\n type EncodeRPCContext,\n ProtocolBlob,\n type ProtocolRPCResponse,\n decodeText,\n encodeText,\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, null])\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 payload = JSON.stringify(rpc.payload, replacer)\n return this.encode([callId, null, streams, payload])\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, 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.payload])\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"],"names":["ProtocolBlob","decodeText","encodeText","BaseServerFormat","deserializeStreamId","isStreamId","serializeStreamId","JsonFormat","contentType","accept","encode","data","JSON","stringify","encodeRPC","rpc","context","callId","error","streams","replacer","key","value","stream","addStream","id","metadata","payload","decode","parse","decodeRPC","buffer","namespace","procedure","formatPayload","StandardJsonFormat"],"mappings":"AAAA,SAGEA,YAAY,EAEZC,UAAU,EACVC,UAAU,QACL,yBAAwB;AAC/B,SAASC,gBAAgB,QAAQ,yBAAwB;AACzD,SAASC,mBAAmB,EAAEC,UAAU,EAAEC,iBAAiB,QAAQ,cAAa;AAKhF,OAAO,MAAMC,mBAAmBJ;IAC9BK,cAAc,6BAA4B;IAC1CC,SAAS;QAAC;KAA6B,CAAA;IAEvCC,OAAOC,IAAS,EAAe;QAC7B,OAAOT,WAAWU,KAAKC,SAAS,CAACF;IACnC;IAEAG,UAAUC,GAAwB,EAAEC,OAAyB,EAAe;QAC1E,MAAM,EAAEC,MAAM,EAAEC,KAAK,EAAE,GAAGH;QAC1B,IAAIG,OAAO,OAAO,IAAI,CAACR,MAAM,CAAC;YAACO;YAAQC;YAAO;SAAK;aAC9C;YACH,MAAMC,UAAe,CAAC;YACtB,MAAMC,WAAW,CAACC,KAAaC;gBAC7B,IAAIA,iBAAiBtB,cAAc;oBACjC,MAAMuB,SAASP,QAAQQ,SAAS,CAACF;oBACjCH,OAAO,CAACI,OAAOE,EAAE,CAAC,GAAGF,OAAOG,QAAQ;oBACpC,OAAOpB,kBAAkBiB,OAAOE,EAAE;gBACpC;gBACA,OAAOH;YACT;YACA,MAAMK,UAAUf,KAAKC,SAAS,CAACE,IAAIY,OAAO,EAAEP;YAC5C,OAAO,IAAI,CAACV,MAAM,CAAC;gBAACO;gBAAQ;gBAAME;gBAASQ;aAAQ;QACrD;IACF;IAEAC,OAAOjB,IAAiB,EAAO;QAC7B,OAAOC,KAAKiB,KAAK,CAAC5B,WAAWU;IAC/B;IAEAmB,UAAUC,MAAmB,EAAEf,OAAyB,EAAE;QACxD,MAAM,CAACC,QAAQe,WAAWC,WAAWd,SAASe,cAAc,GAC1D,IAAI,CAACN,MAAM,CAACG;QAEd,MAAMX,WAAW,CAACC,KAAaC;YAC7B,IAAI,OAAOA,UAAU,YAAYjB,WAAWiB,QAAQ;gBAClD,MAAMG,KAAKrB,oBAAoBkB;gBAC/B,MAAMI,WAAWP,OAAO,CAACM,GAAG;gBAC5B,OAAOT,QAAQQ,SAAS,CAACC,IAAIC;YAC/B;YACA,OAAOJ;QACT;QAEA,MAAMK,UAAUO,gBAAgBtB,KAAKiB,KAAK,CAACK,eAAed,YAAY;QAEtE,OAAO;YACLH;YACAe;YACAC;YACAN;QACF;IACF;AACF;AAKA,OAAO,MAAMQ,2BAA2BhC;IACtCK,cAAc,mBAAkB;IAChCC,SAAS;QAAC;QAAoB;KAA2B,CAAA;IAEzDC,OAAOC,IAAS,EAAE;QAChB,OAAOT,WAAWU,KAAKC,SAAS,CAACF;IACnC;IAEAG,UAAUC,GAAwB,EAAE;QAClC,MAAM,EAAEE,MAAM,EAAEC,KAAK,EAAE,GAAGH;QAC1B,IAAIG,OAAO,OAAO,IAAI,CAACR,MAAM,CAAC;YAACO;YAAQC;YAAO;SAAK;aAC9C;YACH,OAAO,IAAI,CAACR,MAAM,CAAC;gBAACO;gBAAQ;gBAAMF,IAAIY,OAAO;aAAC;QAChD;IACF;IAEAC,OAAOG,MAAmB,EAAE;QAC1B,OAAOnB,KAAKiB,KAAK,CAAC5B,WAAW8B;IAC/B;IAEAD,UAAUC,MAAmB,EAAE;QAC7B,MAAM,CAACd,QAAQe,WAAWC,WAAWN,QAAQ,GAAG,IAAI,CAACC,MAAM,CAACG;QAC5D,OAAO;YAAEd;YAAQe;YAAWC;YAAWN;QAAQ;IACjD;AACF"}
|
package/package.json
CHANGED
|
@@ -14,15 +14,18 @@
|
|
|
14
14
|
}
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"@nmtjs/common": "^0.
|
|
17
|
+
"@nmtjs/common": "^0.6.4",
|
|
18
|
+
"@nmtjs/protocol": "^0.6.4"
|
|
18
19
|
},
|
|
19
20
|
"devDependencies": {
|
|
20
21
|
"@biomejs/biome": "^1.8.3",
|
|
21
22
|
"@nmtjs/builder": "github:neematajs/builder#a9139aa321ebf2054ce2f7d26e40a346338be149",
|
|
22
|
-
"@nmtjs/common": "^0.
|
|
23
|
+
"@nmtjs/common": "^0.6.4",
|
|
24
|
+
"@nmtjs/protocol": "^0.6.4",
|
|
23
25
|
"husky": "^9.1.1",
|
|
24
26
|
"typescript": "^5.5.3",
|
|
25
|
-
"vitest": "^2.0.3"
|
|
27
|
+
"vitest": "^2.0.3",
|
|
28
|
+
"@types/node": "^18.0.0"
|
|
26
29
|
},
|
|
27
30
|
"files": [
|
|
28
31
|
"src",
|
|
@@ -31,7 +34,7 @@
|
|
|
31
34
|
"LICENSE.md",
|
|
32
35
|
"README.md"
|
|
33
36
|
],
|
|
34
|
-
"version": "0.1.
|
|
37
|
+
"version": "0.1.2",
|
|
35
38
|
"scripts": {
|
|
36
39
|
"build": "neemata-build --root=./src './**/*.ts'",
|
|
37
40
|
"clean": "rm -rf dist node_modules && pnpm -r exec rm -rf dist node_modules",
|
package/src/client.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
+
import { BaseClientFormat } from '@nmtjs/protocol/client'
|
|
1
2
|
import {
|
|
2
|
-
|
|
3
|
-
type
|
|
4
|
-
|
|
5
|
-
type
|
|
6
|
-
type
|
|
7
|
-
type Rpc,
|
|
3
|
+
type DecodeRPCContext,
|
|
4
|
+
type EncodeRPCContext,
|
|
5
|
+
ProtocolBlob,
|
|
6
|
+
type ProtocolBlobMetadata,
|
|
7
|
+
type ProtocolRPC,
|
|
8
8
|
decodeText,
|
|
9
9
|
encodeText,
|
|
10
|
-
} from '@nmtjs/common'
|
|
10
|
+
} from '@nmtjs/protocol/common'
|
|
11
11
|
import { deserializeStreamId, isStreamId, serializeStreamId } from './common.ts'
|
|
12
12
|
|
|
13
13
|
/**
|
|
@@ -20,11 +20,11 @@ export class JsonFormat extends BaseClientFormat {
|
|
|
20
20
|
return encodeText(JSON.stringify(data))
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
|
|
24
|
-
const { callId,
|
|
25
|
-
const streams: Record<number,
|
|
23
|
+
encodeRPC(rpc: ProtocolRPC, context: EncodeRPCContext): ArrayBuffer {
|
|
24
|
+
const { callId, namespace, procedure } = rpc
|
|
25
|
+
const streams: Record<number, ProtocolBlobMetadata> = {}
|
|
26
26
|
const replacer = (key: string, value: any) => {
|
|
27
|
-
if (value instanceof
|
|
27
|
+
if (value instanceof ProtocolBlob) {
|
|
28
28
|
const stream = context.addStream(value)
|
|
29
29
|
streams[stream.id] = stream.metadata
|
|
30
30
|
return serializeStreamId(stream.id)
|
|
@@ -32,14 +32,14 @@ export class JsonFormat extends BaseClientFormat {
|
|
|
32
32
|
return value
|
|
33
33
|
}
|
|
34
34
|
const payload = JSON.stringify(rpc.payload, replacer)
|
|
35
|
-
return this.encode([callId,
|
|
35
|
+
return this.encode([callId, namespace, procedure, streams, payload])
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
decode(data: ArrayBuffer): any {
|
|
39
39
|
return JSON.parse(decodeText(data))
|
|
40
40
|
}
|
|
41
41
|
|
|
42
|
-
|
|
42
|
+
decodeRPC(buffer: ArrayBuffer, context: DecodeRPCContext) {
|
|
43
43
|
const [callId, error, streams, formatPayload] = this.decode(buffer)
|
|
44
44
|
if (error) return { callId, error, payload: null }
|
|
45
45
|
else {
|
|
@@ -67,16 +67,16 @@ export class StandardJsonFormat extends BaseClientFormat {
|
|
|
67
67
|
return encodeText(JSON.stringify(data))
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
|
|
71
|
-
const { callId,
|
|
72
|
-
return this.encode([callId,
|
|
70
|
+
encodeRPC(rpc: ProtocolRPC) {
|
|
71
|
+
const { callId, namespace, procedure, payload } = rpc
|
|
72
|
+
return this.encode([callId, namespace, procedure, payload])
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
decode(data: ArrayBuffer) {
|
|
76
76
|
return JSON.parse(decodeText(data))
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
-
|
|
79
|
+
decodeRPC(buffer: ArrayBuffer) {
|
|
80
80
|
const [callId, error, payload] = this.decode(buffer)
|
|
81
81
|
return { callId, error, payload }
|
|
82
82
|
}
|
package/src/common.ts
CHANGED
|
@@ -10,7 +10,10 @@ export const deserializeStreamId = (value: string) => {
|
|
|
10
10
|
return Number.parseInt(streamId)
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
-
export const isStreamId = (value: any) =>
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
export const isStreamId = (value: any) => {
|
|
14
|
+
return (
|
|
15
|
+
typeof value === 'string' &&
|
|
16
|
+
value.length &&
|
|
17
|
+
value.startsWith(STREAM_SERIALIZE_KEY)
|
|
18
|
+
)
|
|
19
|
+
}
|
package/src/server.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
type
|
|
6
|
-
type RpcResponse,
|
|
2
|
+
type DecodeRPCContext,
|
|
3
|
+
type EncodeRPCContext,
|
|
4
|
+
ProtocolBlob,
|
|
5
|
+
type ProtocolRPCResponse,
|
|
7
6
|
decodeText,
|
|
8
7
|
encodeText,
|
|
9
|
-
} from '@nmtjs/common'
|
|
8
|
+
} from '@nmtjs/protocol/common'
|
|
9
|
+
import { BaseServerFormat } from '@nmtjs/protocol/server'
|
|
10
10
|
import { deserializeStreamId, isStreamId, serializeStreamId } from './common.ts'
|
|
11
11
|
|
|
12
12
|
/**
|
|
@@ -20,13 +20,13 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
20
20
|
return encodeText(JSON.stringify(data))
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
|
|
23
|
+
encodeRPC(rpc: ProtocolRPCResponse, context: EncodeRPCContext): ArrayBuffer {
|
|
24
24
|
const { callId, error } = rpc
|
|
25
25
|
if (error) return this.encode([callId, error, null])
|
|
26
26
|
else {
|
|
27
27
|
const streams: any = {}
|
|
28
28
|
const replacer = (key: string, value: any) => {
|
|
29
|
-
if (value instanceof
|
|
29
|
+
if (value instanceof ProtocolBlob) {
|
|
30
30
|
const stream = context.addStream(value)
|
|
31
31
|
streams[stream.id] = stream.metadata
|
|
32
32
|
return serializeStreamId(stream.id)
|
|
@@ -42,8 +42,8 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
42
42
|
return JSON.parse(decodeText(data))
|
|
43
43
|
}
|
|
44
44
|
|
|
45
|
-
|
|
46
|
-
const [callId,
|
|
45
|
+
decodeRPC(buffer: ArrayBuffer, context: DecodeRPCContext) {
|
|
46
|
+
const [callId, namespace, procedure, streams, formatPayload] =
|
|
47
47
|
this.decode(buffer)
|
|
48
48
|
|
|
49
49
|
const replacer = (key: string, value: any) => {
|
|
@@ -59,7 +59,7 @@ export class JsonFormat extends BaseServerFormat {
|
|
|
59
59
|
|
|
60
60
|
return {
|
|
61
61
|
callId,
|
|
62
|
-
|
|
62
|
+
namespace,
|
|
63
63
|
procedure,
|
|
64
64
|
payload,
|
|
65
65
|
}
|
|
@@ -77,7 +77,7 @@ export class StandardJsonFormat extends BaseServerFormat {
|
|
|
77
77
|
return encodeText(JSON.stringify(data))
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
|
|
80
|
+
encodeRPC(rpc: ProtocolRPCResponse) {
|
|
81
81
|
const { callId, error } = rpc
|
|
82
82
|
if (error) return this.encode([callId, error, null])
|
|
83
83
|
else {
|
|
@@ -89,8 +89,8 @@ export class StandardJsonFormat extends BaseServerFormat {
|
|
|
89
89
|
return JSON.parse(decodeText(buffer))
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
-
|
|
93
|
-
const [callId,
|
|
94
|
-
return { callId,
|
|
92
|
+
decodeRPC(buffer: ArrayBuffer) {
|
|
93
|
+
const [callId, namespace, procedure, payload] = this.decode(buffer)
|
|
94
|
+
return { callId, namespace, procedure, payload }
|
|
95
95
|
}
|
|
96
96
|
}
|