@nmtjs/ws-transport 0.1.7 → 0.2.0

package/lib/types.ts

@@ -1,55 +1,20 @@
-import type {
-  Callback,
-  Connection,
-  Container,
-  ServerDownStream,
-  ServerUpStream,
-  Subscription,
-} from '@nmtjs/application'
-import type {
-  BaseServerDecoder,
-  BaseServerEncoder,
-  BaseServerFormat,
-  DecodeRpcContext,
-  EncodeRpcContext,
-} from '@nmtjs/common'
+import type { InteractivePromise } from '@nmtjs/common'
+import type { Connection, ConnectionContext } from '@nmtjs/protocol/server'
 import type { AppOptions, WebSocket } from 'uWebSockets.js'
 
 export type WsUserData = {
   id: Connection['id']
-  services: string[]
-  backpressure: null | {
-    promise: Promise<void>
-    resolve: Callback
-  }
-  abortControllers: Map<number, AbortController>
-  streams: {
-    /**
-     * Client to server streams
-     */
-    up: Map<number, ServerUpStream>
-    /**
-     * Server to client streams
-     */
-    down: Map<number, ServerDownStream>
-    streamId: number
-  }
-  subscriptions: Map<string, Subscription>
-  container: Container
-  data: WsConnectionData
-  format: {
-    encoder: BaseServerEncoder
-    decoder: BaseServerDecoder
-  }
-  context: {
-    decode: Omit<DecodeRpcContext, 'addStream'> & {
-      addStream: (
-        signal: AbortSignal,
-        ...args: Parameters<DecodeRpcContext['addStream']>
-      ) => any
-    }
-    encode: EncodeRpcContext
+  opening: InteractivePromise<void>
+  backpressure: InteractivePromise<void> | null
+  request: {
+    headers: Map<string, string>
+    query: URLSearchParams
+    remoteAddress: string
+    proxiedRemoteAddress: string
+    acceptType: string | null
+    contentType: string | null
   }
+  context: ConnectionContext
 }
 
 export type WsTransportSocket = WebSocket<WsUserData>
@@ -61,12 +26,4 @@ export type WsTransportOptions = {
   tls?: AppOptions
   maxPayloadLength?: number
   maxStreamChunkLength?: number
-  // cors?: ServerOptions['cors']
-}
-
-export type WsConnectionData = {
-  headers: Map<string, string>
-  query: URLSearchParams
-  remoteAddress: string
-  proxiedRemoteAddress: string
 }

package/lib/utils.ts

@@ -1,30 +1,9 @@
-import { ApiError, type Format } from '@nmtjs/application'
-import {
-  ErrorCode,
-  type RpcResponse,
-  concat,
-  encodeNumber,
-} from '@nmtjs/common'
+import { createPromise } from '@nmtjs/common'
+import { ErrorCode, concat, encodeNumber } from '@nmtjs/protocol/common'
+import { ProtocolError } from '@nmtjs/protocol/server'
 import type { HttpRequest } from 'uWebSockets.js'
 import type { WsTransportSocket } from './types.ts'
 
-export const sendMessage = (
-  ws: WsTransportSocket,
-  type: number,
-  payload: any,
-) => {
-  return send(ws, type, ws.getUserData().format.encoder.encode(payload))
-}
-
-export const sendRpcMessage = (
-  ws: WsTransportSocket,
-  type: number,
-  rpc: RpcResponse,
-) => {
-  const data = ws.getUserData()
-  return send(ws, type, data.format.encoder.encodeRpc(rpc, data.context.encode))
-}
-
 export const send = (
   ws: WsTransportSocket,
   type: number,
@@ -32,12 +11,10 @@ export const send = (
 ): boolean | null => {
   const data = ws.getUserData()
   try {
-    const result = ws.send(
-      concat(encodeNumber(type, 'Uint8'), ...buffers),
-      true,
-    )
+    const buffer = concat(encodeNumber(type, 'Uint8'), ...buffers)
+    const result = ws.send(buffer, true)
     if (result === 0) {
-      data.backpressure = Promise.withResolvers()
+      data.backpressure = createPromise()
       return false
     }
     if (result === 2) {
@@ -49,22 +26,6 @@ export const send = (
   }
 }
 
-export const getFormat = ({ headers, query }: RequestData, format: Format) => {
-  const contentType = headers.get('content-type') || query.get('content-type')
-  const acceptType = headers.get('accept') || query.get('accept')
-
-  const encoder = contentType ? format.supportsEncoder(contentType) : undefined
-  if (!encoder) throw new Error('Unsupported content-type')
-
-  const decoder = acceptType ? format.supportsDecoder(acceptType) : undefined
-  if (!decoder) throw new Error('Unsupported accept')
-
-  return {
-    encoder,
-    decoder,
-  }
-}
-
 export const toRecord = (input: {
   forEach: (cb: (value, key) => void) => void
 }) => {
@@ -103,13 +64,13 @@ export const getRequestData = (req: HttpRequest): RequestData => {
 }
 
 export const InternalError = (message = 'Internal Server Error') =>
-  new ApiError(ErrorCode.InternalServerError, message)
+  new ProtocolError(ErrorCode.InternalServerError, message)
 
 export const NotFoundError = (message = 'Not Found') =>
-  new ApiError(ErrorCode.NotFound, message)
+  new ProtocolError(ErrorCode.NotFound, message)
 
 export const ForbiddenError = (message = 'Forbidden') =>
-  new ApiError(ErrorCode.Forbidden, message)
+  new ProtocolError(ErrorCode.Forbidden, message)
 
 export const RequestTimeoutError = (message = 'Request Timeout') =>
-  new ApiError(ErrorCode.RequestTimeout, message)
+  new ProtocolError(ErrorCode.RequestTimeout, message)

package/package.json

@@ -8,15 +8,12 @@
     }
   },
   "dependencies": {
-    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.48.0"
-  },
-  "peerDependencies": {
-    "@nmtjs/application": "^0.3.9",
-    "@nmtjs/common": "^0.3.9"
+    "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.51.0",
+    "@nmtjs/core": "^0.6.1",
+    "@nmtjs/protocol": "^0.6.1",
+    "@nmtjs/common": "^0.6.1"
   },
   "devDependencies": {
-    "@nmtjs/application": "^0.3.9",
-    "@nmtjs/common": "^0.3.9",
     "@types/node": "^18.0.0"
   },
   "engines": {
@@ -30,7 +27,7 @@
     "LICENSE.md",
     "README.md"
   ],
-  "version": "0.1.7",
+  "version": "0.2.0",
   "scripts": {
     "build": "neemata-build ./index.ts './lib/**/*.ts'",
     "type-check": "tsc --noEmit"