diff --git a/packages/http-transport/package.json b/packages/http-transport/package.json index dc2e2709..bf2b17c0 100644 --- a/packages/http-transport/package.json +++ b/packages/http-transport/package.json @@ -54,7 +54,7 @@ "@nmtjs/common": "workspace:*", "@nmtjs/gateway": "workspace:*", "@nmtjs/protocol": "workspace:*", - "@nmtjs/server": "workspace:*", + "@nmtjs/server-host": "workspace:*", "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.67.0" }, "peerDependencies": { @@ -63,7 +63,7 @@ "@nmtjs/core": "workspace:*", "@nmtjs/gateway": "workspace:*", "@nmtjs/protocol": "workspace:*", - "@nmtjs/server": "workspace:*", + "@nmtjs/server-host": "workspace:*", "@types/bun": "^1.3.0", "@types/deno": "^2.3.0", "@types/node": "^24.13.2", diff --git a/packages/http-transport/src/adapter.ts b/packages/http-transport/src/adapter.ts index 14f1e807..f11d9fbf 100644 --- a/packages/http-transport/src/adapter.ts +++ b/packages/http-transport/src/adapter.ts @@ -2,7 +2,7 @@ import type { ServerHost, ServerHostOptions, ServerRuntimeName, -} from '@nmtjs/server' +} from '@nmtjs/server-host' import type { HttpAdapterParams, HttpAdapterServer } from './types.ts' diff --git a/packages/http-transport/src/constants.ts b/packages/http-transport/src/constants.ts index caef05fc..d74d5f3f 100644 --- a/packages/http-transport/src/constants.ts +++ b/packages/http-transport/src/constants.ts @@ -2,8 +2,8 @@ import type { MetadataKind } from '@nmtjs/application' import { createMeta } from '@nmtjs/application' import { ErrorCode } from '@nmtjs/protocol' -// Single source in @nmtjs/server: the host enforces the same default bound -export { DEFAULT_MAX_REQUEST_BODY_SIZE } from '@nmtjs/server' +// Single source in @nmtjs/server-host: the host enforces the same default bound +export { DEFAULT_MAX_REQUEST_BODY_SIZE } from '@nmtjs/server-host' export enum HttpStatus { Continue = 100, diff --git a/packages/http-transport/src/runtimes/bun.ts b/packages/http-transport/src/runtimes/bun.ts index f0fd38fa..57b5c741 100644 --- a/packages/http-transport/src/runtimes/bun.ts +++ b/packages/http-transport/src/runtimes/bun.ts @@ -1,7 +1,7 @@ import type { ApplicationTransport } from '@nmtjs/application' import type { ConnectionType } from '@nmtjs/protocol' import { ProxyableTransportType } from '@nmtjs/gateway' -import { createServerHost } from '@nmtjs/server/bun' +import { createServerHost } from '@nmtjs/server-host/bun' import type { HttpAdapterParams, HttpTransportOptions } from '../types.ts' import { createHostAdapter } from '../adapter.ts' diff --git a/packages/http-transport/src/runtimes/deno.ts b/packages/http-transport/src/runtimes/deno.ts index 847ae6d4..8877f2f0 100644 --- a/packages/http-transport/src/runtimes/deno.ts +++ b/packages/http-transport/src/runtimes/deno.ts @@ -1,7 +1,7 @@ import type { ApplicationTransport } from '@nmtjs/application' import type { ConnectionType } from '@nmtjs/protocol' import { ProxyableTransportType } from '@nmtjs/gateway' -import { createServerHost } from '@nmtjs/server/deno' +import { createServerHost } from '@nmtjs/server-host/deno' import type { HttpAdapterParams, HttpTransportOptions } from '../types.ts' import { createHostAdapter } from '../adapter.ts' diff --git a/packages/http-transport/src/runtimes/node.ts b/packages/http-transport/src/runtimes/node.ts index 4e616019..f54c0424 100644 --- a/packages/http-transport/src/runtimes/node.ts +++ b/packages/http-transport/src/runtimes/node.ts @@ -1,7 +1,7 @@ import type { ApplicationTransport } from '@nmtjs/application' import type { ConnectionType } from '@nmtjs/protocol' import { ProxyableTransportType } from '@nmtjs/gateway' -import { createServerHost } from '@nmtjs/server/node' +import { createServerHost } from '@nmtjs/server-host/node' import type { HttpAdapterParams, HttpTransportOptions } from '../types.ts' import { createHostAdapter } from '../adapter.ts' diff --git a/packages/http-transport/src/types.ts b/packages/http-transport/src/types.ts index 26ec8802..f2765b89 100644 --- a/packages/http-transport/src/types.ts +++ b/packages/http-transport/src/types.ts @@ -9,7 +9,7 @@ import type { ServerRuntimeName, ServerRuntimeOptions, ServerTlsOptions, -} from '@nmtjs/server' +} from '@nmtjs/server-host' export type { DenoServer } diff --git a/packages/http-transport/src/utils.ts b/packages/http-transport/src/utils.ts index ab2ca874..1f9f04a5 100644 --- a/packages/http-transport/src/utils.ts +++ b/packages/http-transport/src/utils.ts @@ -1,7 +1,7 @@ import { ErrorCode } from '@nmtjs/protocol' import { ProtocolError } from '@nmtjs/protocol/server' -// Response helpers and PayloadTooLargeError live in @nmtjs/server: the +// Response helpers and PayloadTooLargeError live in @nmtjs/server-host: the // runtime hosts throw/build them, and instanceof matching in this package // requires the same class identity export { @@ -9,7 +9,7 @@ export { NotFoundHttpResponse, OkResponse, PayloadTooLargeError, -} from '@nmtjs/server' +} from '@nmtjs/server-host' export const InternalError = (message = 'Internal Server Error') => new ProtocolError(ErrorCode.InternalServerError, message) diff --git a/packages/neem/package.json b/packages/neem/package.json index 9233f189..7272725b 100644 --- a/packages/neem/package.json +++ b/packages/neem/package.json @@ -67,7 +67,7 @@ "@nmtjs/metrics": "workspace:*", "@nmtjs/protocol": "workspace:*", "@nmtjs/proxy": "1.0.0-beta.7", - "@nmtjs/server": "workspace:*", + "@nmtjs/server-host": "workspace:*", "@nmtjs/ws-transport": "workspace:*", "@types/node": "^24.13.2", "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.67.0" diff --git a/packages/neem/tests/e2e/fixtures/cases/shared-server/shared-server.worker.ts b/packages/neem/tests/e2e/fixtures/cases/shared-server/shared-server.worker.ts index 85fbecf2..732139ed 100644 --- a/packages/neem/tests/e2e/fixtures/cases/shared-server/shared-server.worker.ts +++ b/packages/neem/tests/e2e/fixtures/cases/shared-server/shared-server.worker.ts @@ -11,7 +11,7 @@ import { HttpTransport } from '@nmtjs/http-transport/node' import { JsonFormat } from '@nmtjs/json-format/server' import { defineRuntimeWorker } from '@nmtjs/neem' import { ProtocolFormats } from '@nmtjs/protocol/server' -import { createServerHost } from '@nmtjs/server/node' +import { createServerHost } from '@nmtjs/server-host/node' import { WsTransport } from '@nmtjs/ws-transport/node' import { record } from '../../shared/support/_events.ts' diff --git a/packages/server/package.json b/packages/server/package.json index efb8ba02..35831ea7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,5 +1,5 @@ { - "name": "@nmtjs/server", + "name": "@nmtjs/server-host", "description": "Shared HTTP server host for Neemata transports across runtimes.", "type": "module", "exports": { diff --git a/packages/ws-transport/package.json b/packages/ws-transport/package.json index d2bf9ebe..e0b77858 100644 --- a/packages/ws-transport/package.json +++ b/packages/ws-transport/package.json @@ -60,7 +60,7 @@ "@nmtjs/http-transport": "workspace:*", "@nmtjs/json-format": "workspace:*", "@nmtjs/protocol": "workspace:*", - "@nmtjs/server": "workspace:*", + "@nmtjs/server-host": "workspace:*", "@nmtjs/type": "workspace:*", "@nmtjs/ws-client": "workspace:*", "uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.67.0" @@ -71,7 +71,7 @@ "@nmtjs/core": "workspace:*", "@nmtjs/gateway": "workspace:*", "@nmtjs/protocol": "workspace:*", - "@nmtjs/server": "workspace:*", + "@nmtjs/server-host": "workspace:*", "@types/bun": "^1.3.0", "@types/deno": "^2.3.0", "@types/node": "^24.13.2", diff --git a/packages/ws-transport/src/adapter.ts b/packages/ws-transport/src/adapter.ts index 3e20b794..f8382ab9 100644 --- a/packages/ws-transport/src/adapter.ts +++ b/packages/ws-transport/src/adapter.ts @@ -2,7 +2,7 @@ import type { ServerHost, ServerHostOptions, ServerRuntimeName, -} from '@nmtjs/server' +} from '@nmtjs/server-host' import type { WsAdapterParams, WsAdapterServer } from './types.ts' diff --git a/packages/ws-transport/src/runtimes/bun.ts b/packages/ws-transport/src/runtimes/bun.ts index 64df1091..1a2c361f 100644 --- a/packages/ws-transport/src/runtimes/bun.ts +++ b/packages/ws-transport/src/runtimes/bun.ts @@ -1,7 +1,7 @@ import type { ApplicationTransport } from '@nmtjs/application' import type { ConnectionType } from '@nmtjs/protocol' import { ProxyableTransportType } from '@nmtjs/gateway' -import { createServerHost } from '@nmtjs/server/bun' +import { createServerHost } from '@nmtjs/server-host/bun' import type { WsAdapterParams, WsTransportOptions } from '../types.ts' import { createHostAdapter } from '../adapter.ts' diff --git a/packages/ws-transport/src/runtimes/deno.ts b/packages/ws-transport/src/runtimes/deno.ts index 73cc960d..65b78575 100644 --- a/packages/ws-transport/src/runtimes/deno.ts +++ b/packages/ws-transport/src/runtimes/deno.ts @@ -1,7 +1,7 @@ import type { ApplicationTransport } from '@nmtjs/application' import type { ConnectionType } from '@nmtjs/protocol' import { ProxyableTransportType } from '@nmtjs/gateway' -import { createServerHost } from '@nmtjs/server/deno' +import { createServerHost } from '@nmtjs/server-host/deno' import type { WsAdapterParams, WsTransportOptions } from '../types.ts' import { createHostAdapter } from '../adapter.ts' diff --git a/packages/ws-transport/src/runtimes/node.ts b/packages/ws-transport/src/runtimes/node.ts index 2c5cd467..41fe0af0 100644 --- a/packages/ws-transport/src/runtimes/node.ts +++ b/packages/ws-transport/src/runtimes/node.ts @@ -1,7 +1,7 @@ import type { ApplicationTransport } from '@nmtjs/application' import type { ConnectionType } from '@nmtjs/protocol' import { ProxyableTransportType } from '@nmtjs/gateway' -import { createServerHost } from '@nmtjs/server/node' +import { createServerHost } from '@nmtjs/server-host/node' import type { WsAdapterParams, WsTransportOptions } from '../types.ts' import { createHostAdapter } from '../adapter.ts' @@ -14,7 +14,7 @@ export { DEFAULT_WS_MAX_BACKPRESSURE, DEFAULT_WS_MAX_PAYLOAD, resolveUwsWsOptions, -} from '@nmtjs/server/node' +} from '@nmtjs/server-host/node' function adapterFactory(params: WsAdapterParams<'node'>) { return createHostAdapter(createServerHost, params) diff --git a/packages/ws-transport/src/types.ts b/packages/ws-transport/src/types.ts index 69a67146..8320b9c1 100644 --- a/packages/ws-transport/src/types.ts +++ b/packages/ws-transport/src/types.ts @@ -7,7 +7,7 @@ import type { ServerRuntimeOptions, ServerTlsOptions, ServerWebSocketRuntimeOptions, -} from '@nmtjs/server' +} from '@nmtjs/server-host' import type { Hooks } from 'crossws' export type WsTransportServerRequest = ServerRequest diff --git a/packages/ws-transport/src/utils.ts b/packages/ws-transport/src/utils.ts index 4d91acee..bc9226fa 100644 --- a/packages/ws-transport/src/utils.ts +++ b/packages/ws-transport/src/utils.ts @@ -1,12 +1,12 @@ import { ErrorCode } from '@nmtjs/protocol' import { ProtocolError } from '@nmtjs/protocol/server' -// Response helpers live in @nmtjs/server, shared by every runtime host +// Response helpers live in @nmtjs/server-host, shared by every runtime host export { InternalServerErrorHttpResponse, NotFoundHttpResponse, OkResponse as StatusResponse, -} from '@nmtjs/server' +} from '@nmtjs/server-host' export const InternalError = (message = 'Internal Server Error') => new ProtocolError(ErrorCode.InternalServerError, message) diff --git a/packages/ws-transport/tests/shared-server.spec.ts b/packages/ws-transport/tests/shared-server.spec.ts index caabb7cb..a8017296 100644 --- a/packages/ws-transport/tests/shared-server.spec.ts +++ b/packages/ws-transport/tests/shared-server.spec.ts @@ -1,5 +1,5 @@ import { HttpTransport } from '@nmtjs/http-transport/node' -import { createServerHost } from '@nmtjs/server/node' +import { createServerHost } from '@nmtjs/server-host/node' import { describe, expect, it, vi } from 'vitest' import { WsTransport } from '../src/runtimes/node.ts' diff --git a/packages/ws-transport/tests/stream-e2e.spec.ts b/packages/ws-transport/tests/stream-e2e.spec.ts index 68b8f27a..e6d2f43b 100644 --- a/packages/ws-transport/tests/stream-e2e.spec.ts +++ b/packages/ws-transport/tests/stream-e2e.spec.ts @@ -9,7 +9,7 @@ import type { TransportWorker, } from '@nmtjs/gateway' import type { ConnectionType } from '@nmtjs/protocol' -import type { ServerWebSocketRuntimeOptions } from '@nmtjs/server' +import type { ServerWebSocketRuntimeOptions } from '@nmtjs/server-host' import { RuntimeClient } from '@nmtjs/client' import { blobType, c } from '@nmtjs/contract' import { Container, createLogger, Hooks } from '@nmtjs/core' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index baffa1a4..b99cb44f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -223,7 +223,7 @@ importers: '@nmtjs/protocol': specifier: workspace:* version: link:../protocol - '@nmtjs/server': + '@nmtjs/server-host': specifier: workspace:* version: link:../server uWebSockets.js: @@ -317,7 +317,7 @@ importers: '@nmtjs/proxy': specifier: 1.0.0-beta.7 version: 1.0.0-beta.7 - '@nmtjs/server': + '@nmtjs/server-host': specifier: workspace:* version: link:../server '@nmtjs/ws-transport': @@ -584,7 +584,7 @@ importers: '@nmtjs/protocol': specifier: workspace:* version: link:../protocol - '@nmtjs/server': + '@nmtjs/server-host': specifier: workspace:* version: link:../server '@nmtjs/type':