k99 0.6.0 → 0.7.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "k99",
   "description": "前后端均可用的 web 服务器",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "dependencies": {},
   "keywords": [
     "k99",
@@ -35,7 +35,6 @@
       "module": "./services.mjs",
       "unpkg": "./services.min.js",
       "jsdelivr": "./services.min.js"
-    },
-    "./node": "./node/index.cjs"
+    }
   }
 }

package/services.cjs

@@ -1,10 +1,11 @@
 /*!
- * k99 v0.6.0
- * (c) 2019-2024 猛火Fierflame
+ * k99 v0.7.0
+ * (c) 2019-2025 猛火Fierflame
  * @license MIT
  */
 'use strict';
 
+/** @import { Service } from 'k99' */
 /**
  * 
  * @param {string} s 
@@ -52,7 +53,7 @@ async function parse(request) {
 	} catch { }
 	return null;
 }
-/** @type {import('k99').Service<Promise<any> | null>} */
+/** @type {Service<Promise<any> | null>} */
 const formBodyService = function (ctx) {
 	const [mime, charset] = ctx.requestType.replace(/\s/g, '').split(';');
 	if (mime !== 'application/x-www-form-urlencoded') { return () => null; }
@@ -63,7 +64,8 @@ const formBodyService = function (ctx) {
 	return () => result;
 };
 
-/** @type {import('k99').Service<Promise<any> | null>} */
+/** @import { Service } from 'k99' */
+/** @type {Service<Promise<any> | null>} */
 const jsonBodyService = function (ctx) {
 	const [mime, charset] = ctx.requestType.replace(/\s/g, '').split(';');
 	if (mime !== 'application/json' && mime !== 'text/json') { return () => null; }

package/services.d.ts

@@ -1,14 +1,15 @@
 /*!
- * k99 v0.6.0
- * (c) 2019-2024 猛火Fierflame
+ * k99 v0.7.0
+ * (c) 2019-2025 猛火Fierflame
  * @license MIT
  */
-import * as k99 from 'k99';
+import { Service } from 'k99';
 
-/** @type {import('k99').Service<Promise<any> | null>} */
-declare const formBodyService: k99.Service<Promise<any> | null>;
+/** @type {Service<Promise<any> | null>} */
+declare const formBodyService: Service<Promise<any> | null>;
 
-/** @type {import('k99').Service<Promise<any> | null>} */
-declare const jsonBodyService: k99.Service<Promise<any> | null>;
+/** @import { Service } from 'k99' */
+/** @type {Service<Promise<any> | null>} */
+declare const jsonBodyService: Service<Promise<any> | null>;
 
 export { formBodyService, jsonBodyService };

package/services.js

@@ -1,6 +1,6 @@
 /*!
- * k99 v0.6.0
- * (c) 2019-2024 猛火Fierflame
+ * k99 v0.7.0
+ * (c) 2019-2025 猛火Fierflame
  * @license MIT
  */
 (function (global, factory) {
@@ -9,6 +9,7 @@
 	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.k99Services = {}));
 })(this, (function (exports) { 'use strict';
 
+	/** @import { Service } from 'k99' */
 	/**
 	 * 
 	 * @param {string} s 
@@ -56,7 +57,7 @@
 		} catch { }
 		return null;
 	}
-	/** @type {import('k99').Service<Promise<any> | null>} */
+	/** @type {Service<Promise<any> | null>} */
 	const formBodyService = function (ctx) {
 		const [mime, charset] = ctx.requestType.replace(/\s/g, '').split(';');
 		if (mime !== 'application/x-www-form-urlencoded') { return () => null; }
@@ -67,7 +68,8 @@
 		return () => result;
 	};
 
-	/** @type {import('k99').Service<Promise<any> | null>} */
+	/** @import { Service } from 'k99' */
+	/** @type {Service<Promise<any> | null>} */
 	const jsonBodyService = function (ctx) {
 		const [mime, charset] = ctx.requestType.replace(/\s/g, '').split(';');
 		if (mime !== 'application/json' && mime !== 'text/json') { return () => null; }

package/services.min.js

@@ -1,6 +1,6 @@
 /*!
- * k99 v0.6.0
- * (c) 2019-2024 猛火Fierflame
+ * k99 v0.7.0
+ * (c) 2019-2025 猛火Fierflame
  * @license MIT
  */
 !function(e,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports):"function"==typeof define&&define.amd?define(["exports"],n):n((e="undefined"!=typeof globalThis?globalThis:e||self).k99Services={})}(this,(function(e){"use strict";function n(e){const n=e.indexOf("=");return n<0?[decodeURIComponent(e),""]:[decodeURIComponent(e.substring(0,n)),decodeURIComponent(e.substring(n+1))]}async function t(e){try{const t=await e.text();return t.length?function(e){const t={};for(const o of e.split("&").filter(Boolean)){const[e,r]=n(o);t[e]=e in t?[t[e],r].flat():[r]}return t}(t):null}catch{}return null}e.formBodyService=function(e){const[n,o]=e.requestType.replace(/\s/g,"").split(";");if("application/x-www-form-urlencoded"!==n)return()=>null;if(o&&"charset=UTF-8"!==o)return()=>null;const{request:r}=e;if(r.bodyUsed)return()=>null;const s=t(r);return()=>s},e.jsonBodyService=function(e){const[n,t]=e.requestType.replace(/\s/g,"").split(";");if("application/json"!==n&&"text/json"!==n)return()=>null;if(t&&"charset=UTF-8"!==t)return()=>null;const{request:o}=e;if(o.bodyUsed)return()=>null;const r=o.json();return()=>r}}));

package/services.min.mjs

@@ -1,6 +1,6 @@
 /*!
- * k99 v0.6.0
- * (c) 2019-2024 猛火Fierflame
+ * k99 v0.7.0
+ * (c) 2019-2025 猛火Fierflame
  * @license MIT
  */
 function n(n){const t=n.indexOf("=");return t<0?[decodeURIComponent(n),""]:[decodeURIComponent(n.substring(0,t)),decodeURIComponent(n.substring(t+1))]}async function t(t){try{const e=await t.text();return e.length?function(t){const e={};for(const o of t.split("&").filter(Boolean)){const[t,r]=n(o);e[t]=t in e?[e[t],r].flat():[r]}return e}(e):null}catch{}return null}const e=function(n){const[e,o]=n.requestType.replace(/\s/g,"").split(";");if("application/x-www-form-urlencoded"!==e)return()=>null;if(o&&"charset=UTF-8"!==o)return()=>null;const{request:r}=n;if(r.bodyUsed)return()=>null;const s=t(r);return()=>s},o=function(n){const[t,e]=n.requestType.replace(/\s/g,"").split(";");if("application/json"!==t&&"text/json"!==t)return()=>null;if(e&&"charset=UTF-8"!==e)return()=>null;const{request:o}=n;if(o.bodyUsed)return()=>null;const r=o.json();return()=>r};export{e as formBodyService,o as jsonBodyService};

package/services.mjs

@@ -1,8 +1,9 @@
 /*!
- * k99 v0.6.0
- * (c) 2019-2024 猛火Fierflame
+ * k99 v0.7.0
+ * (c) 2019-2025 猛火Fierflame
  * @license MIT
  */
+/** @import { Service } from 'k99' */
 /**
  * 
  * @param {string} s 
@@ -50,7 +51,7 @@ async function parse(request) {
 	} catch { }
 	return null;
 }
-/** @type {import('k99').Service<Promise<any> | null>} */
+/** @type {Service<Promise<any> | null>} */
 const formBodyService = function (ctx) {
 	const [mime, charset] = ctx.requestType.replace(/\s/g, '').split(';');
 	if (mime !== 'application/x-www-form-urlencoded') { return () => null; }
@@ -61,7 +62,8 @@ const formBodyService = function (ctx) {
 	return () => result;
 };
 
-/** @type {import('k99').Service<Promise<any> | null>} */
+/** @import { Service } from 'k99' */
+/** @type {Service<Promise<any> | null>} */
 const jsonBodyService = function (ctx) {
 	const [mime, charset] = ctx.requestType.replace(/\s/g, '').split(';');
 	if (mime !== 'application/json' && mime !== 'text/json') { return () => null; }

package/node/index.cjs

@@ -1,140 +0,0 @@
-/*!
- * k99 v0.6.0
- * (c) 2019-2024 猛火Fierflame
- * @license MIT
- */
-'use strict';
-
-var node_stream = require('node:stream');
-var node_http2 = require('node:http2');
-
-/**
- * 
- * @param {import('node:http').IncomingMessage | import('node:http2').Http2ServerRequest} req 
- * @returns {AbortSignal}
- */
-function createAbortSignal(req) {
-	const ac = new AbortController();
-	/**
-	 * 
-	 * @param {Error} [err] 
-	 * @returns 
-	 */
-	const end = (err) => {
-		req.off('end', end);
-		req.off('error', end);
-		if (!err) { return; }
-		ac.abort(err);
-	};
-	req.on('end', end);
-	req.on('error', end);
-
-	return ac.signal;
-}
-
-/**
- * 
- * @param {import('node:http').IncomingMessage | import('node:http2').Http2ServerRequest} req 
- * @returns {Request}
- */
-function toWebRequest(req) {
-	const signal = createAbortSignal(req);
-	const host = req.headers['host'] || '127.0.0.1';
-	const url = new URL(req.url || '/', `http://${ host }`);
-	const method = (req.method || 'GET').toUpperCase();
-	const headers = new Headers();
-	for (const [k, v] of Object.entries(req.headers)) {
-		for (const it of [v].flat()) {
-			headers.append(k.toLowerCase(), String(it));
-		}
-	}
-	const body = ['GET', 'OPTIONS'].includes(method) ? null : /** @type {any} */(node_stream.Readable.toWeb(req));
-	// @ts-ignore
-	return new Request(url, { method, headers, signal, body, duplex: 'half'});
-}
-
-/**
- * 
- * @param {import('node:http').ServerResponse | Http2ServerResponse} res 
- * @param {Response} response 
- * @param {(e: any) => void} onError 
- * @returns 
- */
-async function linkResponse(res, response, onError) {
-	res.statusCode = response.status;
-	const {headers} = response;
-	for (const [k, v] of headers) {
-		res.setHeader(k, v);
-	}
-	const cookies = headers.getSetCookie();
-	if (cookies.length) {
-		res.setHeader('set-cookie', cookies);
-	}
-	const {body} = response;
-	if (!body) {
-		res.end();
-		return;
-	}
-	const readable = node_stream.Readable.fromWeb(/** @type {any} */(body));
-	readable.on('error', onError);
-	readable.pipe(res instanceof node_http2.Http2ServerResponse ? res.stream : res);
-}
-
-/**
- * 
- * @param {any} e 
- */
-function echoError(e) {
-	console.error(e);
-}
-/**
- * @template {import('node:http').IncomingMessage | import('node:http2').Http2ServerRequest} TReq
- * @template {import('node:http').ServerResponse | import('node:http2').Http2ServerResponse} TRes
- * @typedef {object} HttpCallbackOptions
- * @property {(req: TReq, res: TRes, next?: () => void) => any} [notFound]
- * @property {(e: any) => void} [onError]
- * @property {boolean} [errorInResponse]
- */
-/**
- * 
- * @template {import('node:http').IncomingMessage | import('node:http2').Http2ServerRequest} TReq
- * @template {import('node:http').ServerResponse | import('node:http2').Http2ServerResponse} TRes
- * @param {(request: Request) => Promise<Response | null>} run 
- * @param {HttpCallbackOptions<TReq, TRes>} [options] 
- * @returns {(req: TReq, res: TRes, next?: () => void) => any}
- */
-function createHttpCallback(run, {
-		notFound,
-		onError = echoError,
-		errorInResponse,
-	} = {}) {
-	return function httpCallback(req, res, next) {
-		return run(toWebRequest(req)).then(r => {
-			if (r) { return linkResponse(res, r, onError); }
-			if (notFound) { return notFound(req, res, next); }
-			if (next) { return next(); }
-			res.statusCode = 404;
-			res.end();
-		}, e => {
-			res.statusCode = 500;
-			onError(e);
-			if (!errorInResponse) {
-				res.end();
-				return;
-			}
-			/** @type {import('node:stream').Writable} */
-			const stream =
-					res instanceof node_http2.Http2ServerResponse ? res.stream : res;
-			if (e instanceof Error) {
-				stream.write(`${ e.stack || '' }`);
-			} else {
-				stream.write(String(e));
-			}
-			res.end();
-		});
-	};
-}
-
-exports.createHttpCallback = createHttpCallback;
-exports.linkResponse = linkResponse;
-exports.toWebRequest = toWebRequest;

package/node/index.d.cts

@@ -1,52 +0,0 @@
-/// <reference types="node" />
-/*!
- * k99 v0.6.0
- * (c) 2019-2024 猛火Fierflame
- * @license MIT
- */
-import * as node_http2 from 'node:http2';
-import { Http2ServerResponse } from 'node:http2';
-import * as node_http from 'node:http';
-import * as http2 from 'http2';
-import * as http from 'http';
-
-/**
- *
- * @param {import('node:http').IncomingMessage | import('node:http2').Http2ServerRequest} req
- * @returns {Request}
- */
-declare function toWebRequest(req: node_http.IncomingMessage | node_http2.Http2ServerRequest): Request;
-
-/**
- *
- * @param {import('node:http').ServerResponse | Http2ServerResponse} res
- * @param {Response} response
- * @param {(e: any) => void} onError
- * @returns
- */
-declare function linkResponse(res: node_http.ServerResponse | Http2ServerResponse, response: Response, onError: (e: any) => void): Promise<void>;
-
-/**
- * @template {import('node:http').IncomingMessage | import('node:http2').Http2ServerRequest} TReq
- * @template {import('node:http').ServerResponse | import('node:http2').Http2ServerResponse} TRes
- * @typedef {object} HttpCallbackOptions
- * @property {(req: TReq, res: TRes, next?: () => void) => any} [notFound]
- * @property {(e: any) => void} [onError]
- * @property {boolean} [errorInResponse]
- */
-/**
- *
- * @template {import('node:http').IncomingMessage | import('node:http2').Http2ServerRequest} TReq
- * @template {import('node:http').ServerResponse | import('node:http2').Http2ServerResponse} TRes
- * @param {(request: Request) => Promise<Response | null>} run
- * @param {HttpCallbackOptions<TReq, TRes>} [options]
- * @returns {(req: TReq, res: TRes, next?: () => void) => any}
- */
-declare function createHttpCallback<TReq extends http.IncomingMessage | http2.Http2ServerRequest, TRes extends http.ServerResponse<http.IncomingMessage> | Http2ServerResponse>(run: (request: Request) => Promise<Response | null>, { notFound, onError, errorInResponse, }?: HttpCallbackOptions<TReq, TRes> | undefined): (req: TReq, res: TRes, next?: () => void) => any;
-type HttpCallbackOptions<TReq extends http.IncomingMessage | http2.Http2ServerRequest, TRes extends http.ServerResponse<http.IncomingMessage> | Http2ServerResponse> = {
-    notFound?: ((req: TReq, res: TRes, next?: () => void) => any) | undefined;
-    onError?: ((e: any) => void) | undefined;
-    errorInResponse?: boolean | undefined;
-};
-
-export { createHttpCallback, linkResponse, toWebRequest };