create-mcp-kit 0.0.5 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-mcp-kit",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "create mcp tool kit",
   "type": "module",
   "author": "zhensherlock",
@@ -43,7 +43,7 @@
     "gradient-string": "^3.0.0",
     "handlebars": "^4.7.8",
     "picocolors": "^1.1.1",
-    "@mcp-tool-kit/shared": "^0.0.6"
+    "@mcp-tool-kit/shared": "^0.0.7"
   },
   "devDependencies": {},
   "scripts": {

package/template/server-js/package.json.hbs

@@ -31,7 +31,8 @@
 {{/if}}
 {{#if (includes plugins 'vitest')}}
     "test": "vitest run",
-    "coverage": "rimraf coverage && npm run test && c8 report --reporter=lcov --reporter=html",
+    "report": "c8 report --reporter=lcov --reporter=html",
+    "coverage": "rimraf coverage && npm run test && npm run report",
 {{/if}}
 {{#if (includes plugins 'changelog')}}
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 -n changelog-option.js",
@@ -54,7 +55,7 @@
     "@commitlint/config-conventional": "^19.8.1",
 {{/if}}
 {{#if (includes plugins 'inspector')}}
-    "@modelcontextprotocol/inspector": "^0.16.2",
+    "@modelcontextprotocol/inspector": "^0.16.3",
 {{/if}}
 {{#if (includes plugins 'vitest')}}
     "@vitest/coverage-v8": "^3.2.4",

package/template/server-js/src/services/web.js.hbs

@@ -1,6 +1,6 @@
 {{#if (or (includes transports 'streamable') (includes transports 'sse'))}}
   {{#if (includes transports 'streamable')}}
-  import { nanoid } from 'nanoid'
+import { nanoid } from 'nanoid'
   {{/if}}
 import express from 'express'
   {{#if (includes transports 'streamable')}}

package/template/server-js/tests/utils.js

@@ -0,0 +1,16 @@
+export function waitForValue(getterFn, checkInterval = 100, timeout = 10000) {
+  return new Promise((resolve, reject) => {
+    const start = Date.now()
+
+    const intervalId = setInterval(() => {
+      const value = getterFn()
+      if (value) {
+        clearInterval(intervalId)
+        resolve(value)
+      } else if (Date.now() - start > timeout) {
+        clearInterval(intervalId)
+        reject(new Error('Timeout waiting for value'))
+      }
+    }, checkInterval)
+  })
+}

package/template/server-js/vitest.config.js.hbs

@@ -3,10 +3,22 @@ import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   test: {
+  {{#if (or (includes transports 'streamable') (includes transports 'sse'))}}
+    globalSetup: ['./vitest.global.js'],
+  {{/if}}
     setupFiles: ['./vitest.setup.js'],
     coverage: {
       include: ['src/**/*.js'],
     },
+  {{#if (or (includes transports 'streamable') (includes transports 'sse'))}}
+    pool: 'threads',
+    poolOptions: {
+      threads: {
+        maxThreads: 1,
+        minThreads: 1,
+      },
+    },
+  {{/if}}
   },
 })
 {{/if}}

package/template/server-js/vitest.global.js.hbs

@@ -0,0 +1,25 @@
+{{#if (and (includes plugins 'vitest') (or (includes transports 'streamable') (includes transports 'sse')))}}
+import { spawn } from 'child_process'
+import { waitForValue } from './tests/utils.js'
+
+export default async function setup() {
+  const webProcess = spawn('c8', ['--reporter=lcov', '--reporter=text', 'node', './src/index.js', 'web'], {
+    stdio: 'pipe',
+    env: {
+      ...process.env,
+      NODE_V8_COVERAGE: './coverage/tmp',
+    },
+  })
+  let webStarted = false
+  webProcess.stdout?.on('data', async data => {
+    const output = data.toString()
+    if (output.includes('MCP server started')) {
+      webStarted = true
+    }
+  })
+  await waitForValue(() => webStarted)
+  return () => {
+    webProcess.kill('SIGINT')
+  }
+}
+{{/if}}

package/template/server-js/vitest.setup.js.hbs

@@ -1,21 +1,44 @@
 {{#if (includes plugins 'vitest')}}
 import 'dotenv/config'
 import { Client } from '@modelcontextprotocol/sdk/client/index.js'
+  {{#if (includes transports 'stdio')}}
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
+  {{/if}}
+  {{#if (includes transports 'streamable')}}
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
+  {{/if}}
+  {{#if (includes transports 'sse')}}
+import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'
+  {{/if}}
 
-const serverParams = new StdioClientTransport({
-  command: 'nyc',
-  args: ['--merge-async', '--reporter=lcov', '--reporter=text', 'node', './src/index.js'],
+const client = new Client({
+  name: 'test-mcp-client',
+  version: '1.0.0',
+})
+
+  {{#if (includes transports 'stdio')}}
+const stdioClientTransport = new StdioClientTransport({
+  command: 'c8',
+  args: ['--reporter=lcov', '--reporter=text', 'node', './src/index.js'],
   env: {
     ...process.env,
     NODE_V8_COVERAGE: './coverage/tmp',
   },
 })
-const client = new Client({
-  name: 'test-mcp-client',
-  version: '1.0.0',
-})
-await client.connect(serverParams)
+await client.connect(stdioClientTransport)
+
+  {{/if}}
+  {{#if (includes transports 'streamable')}}
+const streamableBaseUrl = new URL('http://localhost:8401/mcp')
+const streamableClientTransport = new StreamableHTTPClientTransport(new URL(streamableBaseUrl))
+await client.connect(streamableClientTransport)
+
+  {{/if}}
+  {{#if (includes transports 'sse')}}
+const sseBaseUrl = new URL('http://localhost:8401/sse')
+const sseClientTransport = new SSEClientTransport(new URL(sseBaseUrl))
+await client.connect(sseClientTransport)
 
+  {{/if}}
 global.client = client
 {{/if}}

package/template/server-ts/package.json.hbs

@@ -31,7 +31,8 @@
 {{/if}}
 {{#if (includes plugins 'vitest')}}
     "test": "vitest run",
-    "coverage": "rimraf coverage && npm run test && c8 report --reporter=lcov --reporter=html",
+    "report": "c8 report --reporter=lcov --reporter=html",
+    "coverage": "rimraf coverage && npm run test && npm run report",
 {{/if}}
 {{#if (includes plugins 'changelog')}}
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 -n changelog-option.js",
@@ -54,15 +55,15 @@
     "@commitlint/config-conventional": "^19.8.1",
 {{/if}}
 {{#if (includes plugins 'inspector')}}
-    "@modelcontextprotocol/inspector": "^0.16.2",
+    "@modelcontextprotocol/inspector": "^0.16.3",
 {{/if}}
 {{#if (or (includes transports 'streamable') (includes transports 'sse'))}}
     "@types/express": "^5.0.3",
 {{/if}}
     "@types/yargs": "^17.0.33",
 {{#if (includes plugins 'style')}}
-    "@typescript-eslint/eslint-plugin": "^8.38.0",
-    "@typescript-eslint/parser": "^8.38.0",
+    "@typescript-eslint/eslint-plugin": "^8.39.1",
+    "@typescript-eslint/parser": "^8.39.1",
 {{/if}}
 {{#if (includes plugins 'vitest')}}
     "@vitest/coverage-v8": "^3.2.4",

package/template/server-ts/src/services/web.ts.hbs

@@ -1,6 +1,6 @@
 {{#if (or (includes transports 'streamable') (includes transports 'sse'))}}
   {{#if (includes transports 'streamable')}}
-  import { nanoid } from 'nanoid'
+import { nanoid } from 'nanoid'
   {{/if}}
 import express from 'express'
   {{#if (includes transports 'streamable')}}

package/template/server-ts/tests/utils.ts

@@ -0,0 +1,20 @@
+export function waitForValue<T>(
+  getterFn: () => T | undefined | null,
+  checkInterval = 100,
+  timeout = 10000,
+): Promise<T> {
+  return new Promise((resolve, reject) => {
+    const start = Date.now()
+
+    const intervalId = setInterval(() => {
+      const value = getterFn()
+      if (value) {
+        clearInterval(intervalId)
+        resolve(value)
+      } else if (Date.now() - start > timeout) {
+        clearInterval(intervalId)
+        reject(new Error('Timeout waiting for value'))
+      }
+    }, checkInterval)
+  })
+}

package/template/server-ts/vitest.config.ts.hbs

@@ -3,10 +3,22 @@ import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   test: {
+  {{#if (or (includes transports 'streamable') (includes transports 'sse'))}}
+    globalSetup: ['./vitest.global.ts'],
+  {{/if}}
     setupFiles: ['./vitest.setup.ts'],
     coverage: {
       include: ['src/**/*.ts'],
     },
+  {{#if (or (includes transports 'streamable') (includes transports 'sse'))}}
+    pool: 'threads',
+    poolOptions: {
+      threads: {
+        maxThreads: 1,
+        minThreads: 1,
+      },
+    },
+  {{/if}}
   },
 })
 {{/if}}

package/template/server-ts/vitest.global.ts.hbs

@@ -0,0 +1,25 @@
+{{#if (and (includes plugins 'vitest') (or (includes transports 'streamable') (includes transports 'sse')))}}
+import { spawn } from 'child_process'
+import { waitForValue } from './tests/utils'
+
+export default async function setup() {
+  const webProcess = spawn('c8', ['--reporter=lcov', '--reporter=text', 'tsx', './src/index.ts', 'web'], {
+    stdio: 'pipe',
+    env: {
+      ...(process.env as Record<string, string>),
+      NODE_V8_COVERAGE: './coverage/tmp',
+    },
+  })
+  let webStarted = false
+  webProcess.stdout?.on('data', async data => {
+    const output = data.toString()
+    if (output.includes('MCP server started')) {
+      webStarted = true
+    }
+  })
+  await waitForValue(() => webStarted)
+  return () => {
+    webProcess.kill('SIGINT')
+  }
+}
+{{/if}}

package/template/server-ts/vitest.setup.ts.hbs

@@ -1,27 +1,44 @@
 {{#if (includes plugins 'vitest')}}
 import 'dotenv/config'
 import { Client } from '@modelcontextprotocol/sdk/client/index.js'
+  {{#if (includes transports 'stdio')}}
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
+  {{/if}}
+  {{#if (includes transports 'streamable')}}
+import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js'
+  {{/if}}
+  {{#if (includes transports 'sse')}}
+import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'
+  {{/if}}
 
-const serverParams = new StdioClientTransport({
-  command: 'nyc',
-  args: [
-    '--merge-async',
-    '--reporter=lcov',
-    '--reporter=text',
-    'tsx',
-    './src/index.ts',
-  ],
+const client = new Client({
+  name: 'test-mcp-client',
+  version: '1.0.0',
+})
+
+  {{#if (includes transports 'stdio')}}
+const stdioClientTransport = new StdioClientTransport({
+  command: 'c8',
+  args: ['--reporter=lcov', '--reporter=text', 'tsx', './src/index.ts'],
   env: {
     ...process.env as Record<string, string>,
     NODE_V8_COVERAGE: './coverage/tmp',
   },
 })
-const client = new Client({
-  name: 'test-mcp-client',
-  version: '1.0.0',
-})
-await client.connect(serverParams)
+await client.connect(stdioClientTransport)
+
+  {{/if}}
+  {{#if (includes transports 'streamable')}}
+const streamableBaseUrl = new URL('http://localhost:8401/mcp')
+const streamableClientTransport = new StreamableHTTPClientTransport(new URL(streamableBaseUrl))
+await client.connect(streamableClientTransport)
+
+  {{/if}}
+  {{#if (includes transports 'sse')}}
+const sseBaseUrl = new URL('http://localhost:8401/sse')
+const sseClientTransport = new SSEClientTransport(new URL(sseBaseUrl))
+await client.connect(sseClientTransport)
 
+  {{/if}}
 global.client = client
 {{/if}}