@nmtjs/json-format 0.12.6 → 0.12.8

package/package.json

@@ -14,20 +14,19 @@
     }
   },
   "dependencies": {
-    "@nmtjs/protocol": "0.12.6",
-    "@nmtjs/common": "0.12.6"
+    "@nmtjs/common": "0.12.8",
+    "@nmtjs/protocol": "0.12.8"
   },
   "peerDependencies": {
-    "@nmtjs/common": "0.12.6",
-    "@nmtjs/protocol": "0.12.6"
+    "@nmtjs/protocol": "0.12.8",
+    "@nmtjs/common": "0.12.8"
   },
   "files": [
-    "src",
     "dist",
     "LICENSE.md",
     "README.md"
   ],
-  "version": "0.12.6",
+  "version": "0.12.8",
   "scripts": {
     "build": "tsc",
     "type-check": "tsc --noEmit"

package/src/client.ts

@@ -1,107 +0,0 @@
-import {
-  type DecodeRPCContext,
-  decodeText,
-  type EncodeRPCContext,
-  encodeText,
-  ProtocolBlob,
-  type ProtocolBlobMetadata,
-  type ProtocolRPC,
-} from '@nmtjs/protocol'
-import {
-  BaseClientFormat,
-  type ProtocolClientBlobStream,
-  type ProtocolServerBlobStream,
-} from '@nmtjs/protocol/client'
-import { deserializeStreamId, isStreamId, serializeStreamId } from './common.ts'
-
-/**
- * Custom JSON encoding format with support for Neemata streams.
- */
-export class JsonFormat extends BaseClientFormat {
-  contentType = 'application/x-neemata-json'
-
-  encode(data: any): ArrayBuffer {
-    return encodeText(JSON.stringify(data))
-  }
-
-  encodeRPC(rpc: ProtocolRPC, context: EncodeRPCContext) {
-    const { callId, namespace, procedure } = rpc
-    const streamsMetadata: Record<number, ProtocolBlobMetadata> = {}
-    const streams: Record<number, ProtocolClientBlobStream> = {}
-    const replacer = (key: string, value: any) => {
-      if (value instanceof ProtocolBlob) {
-        const stream = context.addStream(value)
-        streamsMetadata[stream.id] = stream.metadata
-        streams[stream.id] = stream
-        return serializeStreamId(stream.id)
-      }
-      return value
-    }
-    const payload =
-      typeof rpc.payload === 'undefined'
-        ? undefined
-        : JSON.stringify(rpc.payload, replacer)
-
-    const buffer =
-      typeof payload === 'undefined'
-        ? this.encode([callId, namespace, procedure, streamsMetadata])
-        : this.encode([callId, namespace, procedure, streamsMetadata, payload])
-    return { buffer, streams }
-  }
-
-  decode(data: ArrayBuffer): any {
-    return JSON.parse(decodeText(data))
-  }
-
-  decodeRPC(buffer: ArrayBuffer, context: DecodeRPCContext) {
-    const streams: Record<number, ProtocolServerBlobStream> = {}
-    const [callId, error, streamsMetadata, payload] = this.decode(buffer)
-    if (error) return { callId, error }
-    else {
-      const replacer = (key: string, value: any) => {
-        if (typeof value === 'string' && isStreamId(value)) {
-          const id = deserializeStreamId(value)
-          const metadata = streamsMetadata[id]
-          const stream = context.addStream(id, callId, metadata)
-          streams[id] = stream
-          return stream
-        }
-        return value
-      }
-      const result =
-        typeof payload === 'undefined'
-          ? undefined
-          : JSON.parse(payload, replacer)
-      return { callId, result, streams }
-    }
-  }
-}
-
-/**
- * Standard JSON encoding format with no Neemata streams support.
- */
-export class StandardJsonFormat extends BaseClientFormat {
-  contentType = 'application/json'
-
-  encode(data: any) {
-    return encodeText(JSON.stringify(data))
-  }
-
-  encodeRPC(rpc: ProtocolRPC) {
-    const { callId, namespace, procedure, payload } = rpc
-    const streams: Record<number, ProtocolClientBlobStream> = {}
-    const buffer = this.encode([callId, namespace, procedure, payload])
-    return { buffer, streams }
-  }
-
-  decode(data: ArrayBuffer) {
-    return JSON.parse(decodeText(data))
-  }
-
-  decodeRPC(buffer: ArrayBuffer) {
-    const streams: Record<number, ProtocolServerBlobStream> = {}
-    const [callId, error, result] = this.decode(buffer)
-    if (error) return { callId, error }
-    else return { callId, result, streams }
-  }
-}

package/src/common.ts

@@ -1,19 +0,0 @@
-// TODO: is this a good way to serialize streams within json?
-const STREAM_SERIALIZE_KEY = '%neemata:stream:%\f'
-
-export const serializeStreamId = (id: number) => {
-  return `${STREAM_SERIALIZE_KEY}${id}`
-}
-
-export const deserializeStreamId = (value: string) => {
-  const streamId = value.slice(STREAM_SERIALIZE_KEY.length)
-  return Number.parseInt(streamId)
-}
-
-export const isStreamId = (value: any) => {
-  return (
-    typeof value === 'string' &&
-    value.length &&
-    value.startsWith(STREAM_SERIALIZE_KEY)
-  )
-}

package/src/server.ts

@@ -1,104 +0,0 @@
-import {
-  type DecodeRPCContext,
-  decodeText,
-  type EncodeRPCContext,
-  encodeText,
-  ProtocolBlob,
-  type ProtocolRPCResponse,
-} from '@nmtjs/protocol'
-import { BaseServerFormat } from '@nmtjs/protocol/server'
-import { deserializeStreamId, isStreamId, serializeStreamId } from './common.ts'
-
-/**
- * Custom JSON encoding format with Neemata streams support.
- */
-export class JsonFormat extends BaseServerFormat {
-  contentType = 'application/x-neemata-json'
-  accept = ['application/x-neemata-json']
-
-  encode(data: any): ArrayBuffer {
-    return encodeText(JSON.stringify(data))
-  }
-
-  encodeRPC(rpc: ProtocolRPCResponse, context: EncodeRPCContext): ArrayBuffer {
-    const { callId, error } = rpc
-    if (error) return this.encode([callId, error])
-    else {
-      const streams: any = {}
-      const replacer = (key: string, value: any) => {
-        if (value instanceof ProtocolBlob) {
-          const stream = context.addStream(value)
-          streams[stream.id] = stream.metadata
-          return serializeStreamId(stream.id)
-        }
-        return value
-      }
-      const isUndefined = typeof rpc.result === 'undefined'
-      const payload = JSON.stringify(rpc.result, replacer)
-      return this.encode(
-        isUndefined
-          ? [callId, null, streams]
-          : [callId, null, streams, payload],
-      )
-    }
-  }
-
-  decode(data: ArrayBuffer): any {
-    return JSON.parse(decodeText(data))
-  }
-
-  decodeRPC(buffer: ArrayBuffer, context: DecodeRPCContext) {
-    const [callId, namespace, procedure, streams, formatPayload] =
-      this.decode(buffer)
-
-    const replacer = (key: string, value: any) => {
-      if (typeof value === 'string' && isStreamId(value)) {
-        const id = deserializeStreamId(value)
-        const metadata = streams[id]
-        return context.addStream(id, callId, metadata)
-      }
-      return value
-    }
-
-    const payload =
-      typeof formatPayload === 'undefined'
-        ? undefined
-        : JSON.parse(formatPayload, replacer)
-
-    return {
-      callId,
-      namespace,
-      procedure,
-      payload,
-    }
-  }
-}
-
-/**
- * Standard JSON encoding format with no Neemata streams support.
- */
-export class StandardJsonFormat extends BaseServerFormat {
-  contentType = 'application/json'
-  accept = ['application/json', 'application/vnd.api+json']
-
-  encode(data: any) {
-    return encodeText(JSON.stringify(data))
-  }
-
-  encodeRPC(rpc: ProtocolRPCResponse) {
-    const { callId, error } = rpc
-    if (error) return this.encode([callId, error, null])
-    else {
-      return this.encode([callId, null, rpc.result])
-    }
-  }
-
-  decode(buffer: ArrayBuffer) {
-    return JSON.parse(decodeText(buffer))
-  }
-
-  decodeRPC(buffer: ArrayBuffer) {
-    const [callId, namespace, procedure, payload] = this.decode(buffer)
-    return { callId, namespace, procedure, payload }
-  }
-}