release: 0.1.2-1

demo/index.ts

@@ -6,7 +6,7 @@ const App = new rootRouter<any, any>();
 App.binding(
     '/(.*)',
     new handler('ANY', [
-        async (request, response) => {
+        async (request, _response) => {
             console.log(request);
             return undefined;
         },

eslint.config.js

@@ -0,0 +1,30 @@
+import globals from 'globals';
+import pluginJs from '@eslint/js';
+import tseslint from 'typescript-eslint';
+
+export default [
+    { files: ['src/**/*.{js,mjs,cjs,ts}', 'test/**/*.{js,mjs,cjs,ts}'] },
+    { languageOptions: { globals: globals.browser } },
+    pluginJs.configs.recommended,
+    ...tseslint.configs.recommended,
+    {
+        rules: {
+            '@typescript-eslint/interface-name-prefix': 'off',
+            '@typescript-eslint/explicit-function-return-type': 'off',
+            '@typescript-eslint/explicit-module-boundary-types': 'off',
+            '@typescript-eslint/no-explicit-any': 'off',
+            '@typescript-eslint/no-unused-vars': [
+                'error',
+                {
+                    args: 'all',
+                    argsIgnorePattern: '^_',
+                    caughtErrors: 'all',
+                    caughtErrorsIgnorePattern: '^_',
+                    destructuredArrayIgnorePattern: '^_',
+                    varsIgnorePattern: '^_',
+                    ignoreRestSiblings: true,
+                },
+            ],
+        },
+    },
+];

index.ts

@@ -7,6 +7,7 @@ export { methodENUM as method } from './src/interface/method';
 export { response } from './src/interface/response';
 export { request } from './src/interface/request';
 export * as platformAdapater from './src/platform/export';
+export * as interfaces from './src/interface/index';
 
 export { rootRouter };
 export default rootRouter;

jest.config.js

@@ -1,6 +0,0 @@
-/** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
-export default {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  forceExit: true
-};

jest.config.ts

@@ -0,0 +1,22 @@
+// jest.config.ts
+import type { JestConfigWithTsJest } from 'ts-jest';
+
+const jestConfig: JestConfigWithTsJest = {
+    // [...]
+    preset: 'ts-jest/presets/default-esm', // or other ESM presets
+    moduleNameMapper: {
+        '^(\\.{1,2}/.*)\\.js$': '$1',
+    },
+    transform: {
+        // '^.+\\.[tj]sx?$' to process ts,js,tsx,jsx with `ts-jest`
+        // '^.+\\.m?[tj]sx?$' to process ts,js,tsx,jsx,mts,mjs,mtsx,mjsx with `ts-jest`
+        '^.+\\.tsx?$': [
+            'ts-jest',
+            {
+                useESM: true,
+            },
+        ],
+    },
+};
+
+export default jestConfig;

package.json

@@ -1,12 +1,17 @@
 {
     "name": "handlers.js",
     "description": "Handlers.js is a unified and lightweight web application framework for multiple platforms.",
-    "version": "0.1.2",
+    "version": "0.1.2-1",
     "main": "./dist/index.js",
-    "webpack": "./dist/index.js",
-    "browser": "./dist/main.serviceworker.js",
-    "module": "./dist/index.js",
-    "types": "dist/index.d.ts",
+    "types": "./dist/index.d.ts",
+    "exports": {
+        ".": {
+            "import": "./dist/index.js",
+            "require": "./dist/index.node.js",
+            "types": "./dist/index.d.ts",
+            "default": "./dist/index.js"
+        }
+    },
     "files": [
         "dist",
         "LICENSE"
@@ -24,23 +29,27 @@
         "unified"
     ],
     "dependencies": {
-        "path-to-regexp": "^6.2.1"
+        "path-to-regexp": "6"
     },
     "devDependencies": {
         "@cloudflare/workers-types": "^3.13.0",
+        "@eslint/js": "^9.8.0",
         "@types/jest": "^28.1.4",
         "@types/node": "^18.0.0",
         "@webpack-cli/generators": "^2.5.0",
         "axios": "^0.27.2",
         "bluebird": "^3.7.2",
         "bun-types": "^0.1.4",
-        "jest": "^28.1.2",
+        "eslint": "9.x",
+        "globals": "^15.8.0",
+        "jest": "^29.7.0",
         "prettier": "^2.7.1",
-        "ts-jest": "^28.0.5",
+        "ts-jest": "^29.2.4",
         "ts-loader": "^9.3.1",
         "ts-node": "^10.8.1",
         "tsc-alias": "^1.8.10",
         "typescript": "^4.7.4",
+        "typescript-eslint": "^8.0.0",
         "webpack": "^5.73.0",
         "webpack-cli": "^4.10.0"
     },
@@ -57,9 +66,10 @@
         "clean": "rm -rf ./dist",
         "demo": "env NODE_ENV=development yarn build:node && node ./dist/main.node.js",
         "tsc": "tsc && tsc-alias",
-        "test:node": "jest ./test/node.test.ts",
+        "lint": "eslint --fix **/*.ts",
+        "test:node": "NODE_OPTIONS=--experimental-vm-modules jest ./test/node.test.ts",
         "test:deno": "BUILD_TARGET=deno:test webpack && jest ./test/deno.test.ts",
-        "coverage": "jest --collectCoverage --",
+        "coverage": "ODE_OPTIONS=--experimental-vm-modules jest --collectCoverage --",
         "prepublish": "env NODE_ENV=production yarn build && yarn tsc",
         "format": "prettier --write \"**/*.{ts,json,md}\" "
     },

src/handler.ts

@@ -29,8 +29,8 @@ export class handler<RequestCustomType, ResponseCustomType> {
             case 1:
                 return this.responders[0](request, responseMessage);
             default:
-                for (let responder of this.responders) {
-                    let thisResponse = await responder(
+                for (const responder of this.responders) {
+                    const thisResponse = await responder(
                         request,
                         responseMessage,
                     );

src/interface/response.ts

@@ -1,5 +1,5 @@
 import headers from './headers';
-import packageJSON from '../../package.json';
+import packageJSON from '../../package.json' assert { type: 'json' };
 import { platform, version } from '../lib';
 
 export class defaultHeaders extends headers {

src/lib.ts

@@ -20,7 +20,9 @@ export const platform = (() => {
 })();
 export const version = (() => {
     switch (platform) {
-        case 'Node.js' || 'Bun':
+        case 'Node.js':
+            return process.version;
+        case 'Bun':
             return process.version;
         case 'Deno':
             return Deno.version.deno;

src/platform/deno.ts

@@ -20,8 +20,8 @@ const DefaultConn: Deno.Conn = {
     closeWrite: async () => undefined,
     readable: '',
     writable: '',
-    read: async (p: Uint8Array) => null,
-    write: async (p: Uint8Array) => 0,
+    read: async (_p: Uint8Array) => null,
+    write: async (_p: Uint8Array) => 0,
     close: () => undefined,
 };
 
@@ -29,10 +29,12 @@ export class DenoPlatformAdapter<T = any, K = any>
     extends SWPlatformAdapter<T, K>
     implements platformAdapater<T, K>
 {
-    async listen(port: number): Promise<void> {
-        const Server: Deno.Listener = Deno.listen({ port });
+    public server: Deno.Listener;
 
-        for await (const connection of Server) {
+    async listen(port: number): Promise<void> {
+        this.server = Deno.listen({ port });
+
+        for await (const connection of this.server) {
             const httpConnection = Deno.serveHttp(connection);
 
             for await (const requestEvent of httpConnection) {
@@ -43,6 +45,10 @@ export class DenoPlatformAdapter<T = any, K = any>
         }
     }
 
+    close() {
+        this.server.close();
+    }
+
     async handleRequest(
         nativeRequest: Request,
         connection: Deno.Conn = DefaultConn,
@@ -56,8 +62,9 @@ export class DenoPlatformAdapter<T = any, K = any>
             requestHeaders,
             await nativeRequest.text(),
             {},
-            `${connection.remoteAddr.hostname}:${connection.remoteAddr.port}` ||
-                '',
+            `${connection.remoteAddr.hostname ?? '0.0.0.0'}:${
+                connection.remoteAddr.port ?? '0'
+            }`,
         );
         return requestMessage;
     }

src/platform/index.ts

@@ -4,6 +4,7 @@ import { router } from '../router';
 export interface platformAdapater<T = any, K = any> {
     router: router<T, K>;
     listen(port: number): void;
+    close(): void;
     handleRequest(nativeRequest: any): Promise<request<T>>;
     handleResponse(
         response: response<K> | Promise<response<K>>,

src/platform/node.ts

@@ -8,14 +8,16 @@ import { methodENUM } from 'src/interface/method';
 
 export class NodePlatformAdapter<T = any, K = any> implements platformAdapater {
     public router: router<T, K>;
+    public server: http.Server;
 
-    constructor(router: router<T, K>) {
+    constructor(router: router<T, K>, server?: http.Server) {
         this.router = router;
+        if (server) this.server = server;
+        else this.server = http.createServer();
     }
 
     async listen(port: number): Promise<void> {
-        const server = http.createServer();
-        server.on(
+        this.server.on(
             'request',
             async (req: http.IncomingMessage, res: http.ServerResponse) => {
                 const request = await this.handleRequest(req);
@@ -23,8 +25,11 @@ export class NodePlatformAdapter<T = any, K = any> implements platformAdapater {
                 this.handleResponse(response, res);
             },
         );
-        server.listen(port);
-        return;
+        this.server.listen(port);
+    }
+
+    close() {
+        this.server.close();
     }
 
     async handleRequest(

src/platform/serviceworker.ts

@@ -8,15 +8,20 @@ import { methodENUM } from 'src/interface/method';
 
 export class SWPlatformAdapter<T = any, K = any> implements platformAdapater {
     public router: router<T, K>;
+    private eventHandler = (event: FetchEvent) => {
+        event.respondWith(this.handler(event));
+    };
 
     constructor(router: router<T, K>) {
         this.router = router;
     }
 
     async listen(_port?: number): Promise<void> {
-        self.addEventListener('fetch', (event: FetchEvent) => {
-            event.respondWith(this.handler(event));
-        });
+        self.addEventListener('fetch', this.eventHandler);
+    }
+
+    close() {
+        self.removeEventListener('fetch', this.eventHandler);
     }
 
     async handleRequest(nativeRequest: Request): Promise<request<T>> {

src/platform/txiki-js/serveHttp.ts

@@ -3,7 +3,7 @@ import { response } from '../../interface';
 import { headers } from '../../interface/headers';
 import { methodENUM } from '../../interface/method';
 
-import statusCode from './statusCode.json';
+import statusCode from './statusCode.json' assert { type: 'json' };
 
 export class HttpConn {
     private closed: boolean = false;
@@ -35,8 +35,10 @@ export class HttpConn {
 
         const url = new URL(
             path,
-            `http://${requestHeaders.get('Host')}/` ??
-                `http://${this.conn.localAddress.ip}:${this.conn.localAddress.port}/`,
+            `http://${
+                requestHeaders.get('Host') ??
+                `${this.conn.localAddress.ip}:${this.conn.localAddress.port}`
+            }/`,
         );
 
         const body = lines.slice(dividingIndex + 1).join('\n');
@@ -56,9 +58,9 @@ export class HttpConn {
         let responseMessage: string = '';
         responseMessage +=
             'HTTP/1.1 ' +
-                response.status +
-                ' ' +
-                statusCode[<'100'>response.status.toString()] ?? '';
+            response.status +
+            ' ' +
+            (statusCode[<'100'>response.status.toString()] ?? '');
 
         response.headers.forEach((key, value) => {
             responseMessage += '\n' + key + ': ' + value;
@@ -95,6 +97,7 @@ export class HttpConn {
     }
 
     [Symbol.asyncIterator]() {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
         const httpConn = this;
 
         return {

src/platform/txiki.ts

@@ -8,15 +8,16 @@ export class TxikiPlatformAdapter<T = any, K = any>
     implements platformAdapater
 {
     public router: router<T, K>;
+    public server: tjs.Listener;
 
     constructor(router: router<T, K>) {
         this.router = router;
     }
 
     async listen(port?: number): Promise<void> {
-        const Server = await tjs.listen('tcp', '0.0.0.0', port);
+        this.server = await tjs.listen('tcp', '0.0.0.0', port);
 
-        for await (const conn of Server) {
+        for await (const conn of this.server) {
             const httpConn = serveHttp(conn);
 
             for await (const conn of httpConn) {
@@ -31,6 +32,10 @@ export class TxikiPlatformAdapter<T = any, K = any>
         }
     }
 
+    close() {
+        this.server.close();
+    }
+
     async handleRequest(nativeRequest: request<any>): Promise<request<T>> {
         return nativeRequest;
     }

src/route.ts

@@ -42,7 +42,7 @@ export class route {
                         attributes: [],
                     };
 
-                let attributes: matchedStatus['attributes'] = [];
+                const attributes: matchedStatus['attributes'] = [];
 
                 it.keys.forEach((key, index) => {
                     attributes.push({

src/router.ts

@@ -98,7 +98,7 @@ export class router<K = any, V = any> {
 
         let mismatchCount = 0;
 
-        for (let route of this.routes) {
+        for (const route of this.routes) {
             const isMatched = await route.exec(request.url.pathname);
 
             if (!isMatched.matched) {
@@ -112,7 +112,7 @@ export class router<K = any, V = any> {
 
             try {
                 let thisResponse: response<V> | void = responseMessage;
-                for (let handler of route.handlers) {
+                for (const handler of route.handlers) {
                     if (
                         handler.method != request.method &&
                         handler.method != methodENUM.ANY
@@ -215,10 +215,12 @@ export class rootRouter<K = any, V = any> extends router<K, V> {
 
         return responseMessage;
     };
+
     useAdapater(adapater: platformAdapaterConstructor): this {
         this.adapater = createPlatformAdapater(adapater, this);
         return this;
     }
+
     useMappingAdapter(
         mapping: {
             [platform: string]: platformAdapaterConstructor;
@@ -231,8 +233,14 @@ export class rootRouter<K = any, V = any> extends router<K, V> {
         else this.useAdapater(mapping[platform]);
         return this;
     }
+
     listen(port: number): void {
         if (this.adapater == null) throw new Error('No platform adapter set');
         this.adapater.listen(port);
     }
+
+    close(): void {
+        if (this.adapater == null) throw new Error('No platform adapter set');
+        this.adapater.close();
+    }
 }

test/node.test.ts

@@ -81,3 +81,8 @@ describe('Test server', () => {
         expect(secondData).toEqual('hit');
     });
 });
+
+afterAll((done) => {
+    _.close();
+    done();
+});

test/test-server.ts

@@ -45,7 +45,7 @@ App.route('/info/(.*)')
         App.create(
             'GET',
             (): Promise<handlersJS.response<any>> =>
-                new Promise((resolve) => {
+                new Promise(() => {
                     throw new handlersJS.response('hit');
                 }),
         ),

tsconfig.json

@@ -1,10 +1,8 @@
 {
     "compilerOptions": {
-        "target": "esnext",
-        "module": "esnext",
-        "lib": [
-            "ESNext"
-        ],
+        "target": "ESNext",
+        "module": "ESNext",
+        "lib": ["ESNext"],
         "types": [
             "@cloudflare/workers-types",
             "@types/node",
@@ -37,18 +35,11 @@
         ],
         "declaration": true
     },
-    "exclude": [
-        "node_modules"
-    ],
-    "include": [
-        "index.ts",
-        "src/**/*.ts",
-        "demo/**/*.ts",
-        "types/*.d.ts"
-    ],
+    "exclude": ["node_modules"],
+    "include": ["index.ts", "src/**/*.ts", "demo/**/*.ts", "types/*.d.ts"],
     "tsc-alias": {
         "resolveFullPaths": true,
         "verbose": true
     }
     // "esm": true
-}
+}