koa-classic-server 2.0.0 → 2.1.0

package/index.cjs

@@ -65,10 +65,10 @@ module.exports = function koaClassicServer(
     options.template = opts.template || {};
 
     options.method = Array.isArray(options.method) ? options.method : ['GET'];
-    options.showDirContents = typeof options.showDirContents == 'boolean' ? options.showDirContents : true;
+    options.showDirContents = typeof options.showDirContents === 'boolean' ? options.showDirContents : true;
 
     // Normalize index option to array format
-    if (typeof options.index == 'string') {
+    if (typeof options.index === 'string') {
         // DEPRECATION WARNING: String format is deprecated
         if (options.index) {
             console.warn(
@@ -91,14 +91,14 @@ module.exports = function koaClassicServer(
         options.index = [];
     }
 
-    options.urlPrefix = typeof options.urlPrefix == 'string' ? options.urlPrefix : "";
+    options.urlPrefix = typeof options.urlPrefix === 'string' ? options.urlPrefix : "";
     options.urlsReserved = Array.isArray(options.urlsReserved) ? options.urlsReserved : [];
-    options.template.render = (options.template.render == undefined || typeof options.template.render == 'function') ? options.template.render : undefined;
+    options.template.render = (options.template.render === undefined || typeof options.template.render === 'function') ? options.template.render : undefined;
     options.template.ext = Array.isArray(options.template.ext) ? options.template.ext : [];
 
     // OPTIMIZATION: HTTP Caching options
-    options.cacheMaxAge = typeof options.cacheMaxAge == 'number' && options.cacheMaxAge >= 0 ? options.cacheMaxAge : 3600;
-    options.enableCaching = typeof options.enableCaching == 'boolean' ? options.enableCaching : true;
+    options.cacheMaxAge = typeof options.cacheMaxAge === 'number' && options.cacheMaxAge >= 0 ? options.cacheMaxAge : 3600;
+    options.enableCaching = typeof options.enableCaching === 'boolean' ? options.enableCaching : true;
 
     return async (ctx, next) => {
         // Check if method is allowed
@@ -109,7 +109,7 @@ module.exports = function koaClassicServer(
 
         // Normalize URL (remove trailing slash)
         let pageHref = '';
-        if (ctx.href.charAt(ctx.href.length - 1) == '/') {
+        if (ctx.href.charAt(ctx.href.length - 1) === '/') {
             pageHref = new URL(ctx.href.slice(0, -1));
         } else {
             pageHref = new URL(ctx.href);
@@ -120,7 +120,7 @@ module.exports = function koaClassicServer(
         const a_urlPrefix = options.urlPrefix.split("/");
 
         for (const key in a_urlPrefix) {
-            if (a_urlPrefix[key] != a_pathname[key]) {
+            if (a_urlPrefix[key] !== a_pathname[key]) {
                 await next();
                 return;
             }
@@ -128,7 +128,7 @@ module.exports = function koaClassicServer(
 
         // Create pageHrefOutPrefix without URL prefix
         let pageHrefOutPrefix = pageHref;
-        if (options.urlPrefix != "") {
+        if (options.urlPrefix !== "") {
             let a_pathnameOutPrefix = a_pathname.slice(a_urlPrefix.length);
             let s_pathnameOutPrefix = a_pathnameOutPrefix.join("/");
             let hrefOutPrefix = pageHref.origin + '/' + s_pathnameOutPrefix;
@@ -139,7 +139,7 @@ module.exports = function koaClassicServer(
         if (Array.isArray(options.urlsReserved) && options.urlsReserved.length > 0) {
             const a_pathnameOutPrefix = pageHrefOutPrefix.pathname.split("/");
             for (const value of options.urlsReserved) {
-                if (a_pathnameOutPrefix[1] == value.substring(1)) {
+                if (a_pathnameOutPrefix[1] === value.substring(1)) {
                     await next();
                     return;
                 }
@@ -149,7 +149,7 @@ module.exports = function koaClassicServer(
         // Path Traversal Protection
         // Construct safe file path
         let requestedPath = "";
-        if (pageHrefOutPrefix.pathname == "/") {
+        if (pageHrefOutPrefix.pathname === "/") {
             requestedPath = "";
         } else {
             requestedPath = decodeURIComponent(pageHrefOutPrefix.pathname);
@@ -193,7 +193,7 @@ module.exports = function koaClassicServer(
                 }
 
                 // No index file found, show directory listing
-                ctx.body = await show_dir(toOpen);
+                ctx.body = await show_dir(toOpen, ctx);
             } else {
                 // Directory listing disabled
                 ctx.status = 404;
@@ -386,8 +386,20 @@ module.exports = function koaClassicServer(
             ctx.body = src;
         }
 
+        // Helper function to format file size in human-readable format
+        function formatSize(bytes) {
+            if (bytes === 0) return '0 B';
+            if (bytes === undefined || bytes === null) return '-';
+
+            const k = 1024;
+            const sizes = ['B', 'KB', 'MB', 'GB', 'TB'];
+            const i = Math.floor(Math.log(bytes) / Math.log(k));
+
+            return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
+        }
+
         // OPTIMIZATION: show_dir is now async and uses array join instead of string concatenation
-        async function show_dir(toOpen) {
+        async function show_dir(toOpen, ctx) {
             let dir;
             try {
                 // OPTIMIZATION: Use async readdir (non-blocking)
@@ -409,61 +421,158 @@ module.exports = function koaClassicServer(
                 `;
             }
 
+            // Get sorting parameters from query string
+            const sortBy = ctx.query.sort || 'name';
+            const sortOrder = ctx.query.order || 'asc';
+
+            // Build base URL for sorting links (without query params)
+            const baseUrl = pageHrefOutPrefix.pathname;
+
+            // Helper to create sorting URL
+            function getSortUrl(column) {
+                let newOrder = 'asc';
+                if (sortBy === column && sortOrder === 'asc') {
+                    newOrder = 'desc';
+                }
+                return `${baseUrl}?sort=${column}&order=${newOrder}`;
+            }
+
+            // Helper to get sort indicator
+            function getSortIndicator(column) {
+                if (sortBy === column) {
+                    return sortOrder === 'asc' ? ' ↑' : ' ↓';
+                }
+                return '';
+            }
+
             // OPTIMIZATION: Use array + join instead of string concatenation
             // This reduces memory allocation from O(n²) to O(n)
             const parts = [];
             parts.push("<table>");
+            parts.push("<thead>");
+            parts.push("<tr>");
+            parts.push(`<th><a href="${escapeHtml(getSortUrl('name'))}">Name${getSortIndicator('name')}</a></th>`);
+            parts.push(`<th><a href="${escapeHtml(getSortUrl('type'))}">Type${getSortIndicator('type')}</a></th>`);
+            parts.push(`<th><a href="${escapeHtml(getSortUrl('size'))}">Size${getSortIndicator('size')}</a></th>`);
+            parts.push("</tr>");
+            parts.push("</thead>");
+            parts.push("<tbody>");
 
             // Parent directory link
-            if (pageHrefOutPrefix.origin + "/" != pageHrefOutPrefix.href) {
-                const a_pD = pageHref.href.split("/");
+            const currentPath = pageHref.origin + pageHref.pathname;
+            if (currentPath !== pageHrefOutPrefix.origin + "/") {
+                // Build parent directory URL without query parameters
+                const a_pD = currentPath.split("/");
                 a_pD.pop();
                 const parentDirectory = a_pD.join("/");
                 // Escape HTML to prevent XSS
-                parts.push(`<tr><td><a href="${escapeHtml(parentDirectory)}"><b>.. Parent Directory</b></a></td><td>DIR</td></tr>`);
+                parts.push(`<tr><td><a href="${escapeHtml(parentDirectory)}"><b>.. Parent Directory</b></a></td><td>DIR</td><td>-</td></tr>`);
             }
 
-            if (dir.length == 0) {
-                parts.push(`<tr><td>empty folder</td><td></td></tr>`);
+            if (dir.length === 0) {
+                parts.push(`<tr><td>empty folder</td><td></td><td></td></tr>`);
             } else {
                 let a_sy = Object.getOwnPropertySymbols(dir[0]);
                 const sy_type = a_sy[0];
 
+                // Collect all items data first (for sorting)
+                const items = [];
                 for (const item of dir) {
                     const s_name = item.name.toString();
                     const type = item[sy_type];
 
-                    let rowStart = '';
-                    if (type == 1) {
-                        // File
-                        rowStart = `<tr><td> FILE `;
-                    } else if (type == 2 || type == 3) {
-                        // Directory or symbolic link
-                        rowStart = `<tr><td>`;
-                    } else {
+                    if (type !== 1 && type !== 2 && type !== 3) {
                         console.error("Unknown file type:", type);
-                        continue; // Skip unknown types instead of throwing
+                        continue;
                     }
 
                     const itemPath = path.join(toOpen, s_name);
                     let itemUri = "";
-                    if (pageHref.href == pageHref.origin + options.urlPrefix + "/") {
+                    // Build item URI without query parameters
+                    const baseUrl = pageHref.origin + pageHref.pathname;
+                    if (baseUrl === pageHref.origin + options.urlPrefix + "/" || baseUrl === pageHref.origin + options.urlPrefix) {
                         itemUri = `${pageHref.origin + options.urlPrefix}/${encodeURIComponent(s_name)}`;
                     } else {
-                        itemUri = `${pageHref.href}/${encodeURIComponent(s_name)}`;
+                        itemUri = `${baseUrl}/${encodeURIComponent(s_name)}`;
                     }
 
-                    // Check if this is a reserved directory
-                    if (pageHrefOutPrefix.pathname == '/' && options.urlsReserved.includes('/' + s_name) && (type == 2 || type == 3)) {
-                        parts.push(`${rowStart} ${escapeHtml(s_name)}</td> <td> DIR BUT RESERVED</td></tr>`);
+                    // Get file size
+                    let sizeStr = '-';
+                    let sizeBytes = 0;
+                    try {
+                        const itemStat = await fs.promises.stat(itemPath);
+                        if (type === 1) {
+                            sizeBytes = itemStat.size;
+                            sizeStr = formatSize(sizeBytes);
+                        } else {
+                            sizeStr = '-';
+                        }
+                    } catch (error) {
+                        sizeStr = '-';
+                    }
+
+                    const mimeType = type === 2 ? "DIR" : (mime.lookup(itemPath) || 'unknown');
+                    const isReserved = pageHrefOutPrefix.pathname === '/' && options.urlsReserved.includes('/' + s_name) && (type === 2 || type === 3);
+
+                    items.push({
+                        name: s_name,
+                        type: type,
+                        mimeType: mimeType,
+                        sizeStr: sizeStr,
+                        sizeBytes: sizeBytes,
+                        itemUri: itemUri,
+                        isReserved: isReserved
+                    });
+                }
+
+                // Sort items based on query parameters
+                items.sort((a, b) => {
+                    let comparison = 0;
+
+                    if (sortBy === 'name') {
+                        comparison = a.name.localeCompare(b.name);
+                    } else if (sortBy === 'type') {
+                        // Sort directories first, then by mime type
+                        if (a.type === 2 && b.type !== 2) {
+                            comparison = -1;
+                        } else if (a.type !== 2 && b.type === 2) {
+                            comparison = 1;
+                        } else {
+                            comparison = a.mimeType.localeCompare(b.mimeType);
+                        }
+                    } else if (sortBy === 'size') {
+                        // Directories always at top when sorting by size
+                        if (a.type === 2 && b.type !== 2) {
+                            comparison = -1;
+                        } else if (a.type !== 2 && b.type === 2) {
+                            comparison = 1;
+                        } else {
+                            comparison = a.sizeBytes - b.sizeBytes;
+                        }
+                    }
+
+                    // Apply sort order (asc/desc)
+                    return sortOrder === 'desc' ? -comparison : comparison;
+                });
+
+                // Generate HTML for sorted items
+                for (const item of items) {
+                    let rowStart = '';
+                    if (item.type === 1) {
+                        rowStart = `<tr><td> FILE `;
                     } else {
-                        // Escape HTML to prevent XSS in filenames
-                        const mimeType = type == 2 ? "DIR" : (mime.lookup(itemPath) || 'unknown');
-                        parts.push(`${rowStart} <a href="${escapeHtml(itemUri)}">${escapeHtml(s_name)}</a> </td> <td> ${escapeHtml(mimeType)} </td></tr>`);
+                        rowStart = `<tr><td>`;
+                    }
+
+                    if (item.isReserved) {
+                        parts.push(`${rowStart} ${escapeHtml(item.name)}</td> <td> DIR BUT RESERVED</td><td>${item.sizeStr}</td></tr>`);
+                    } else {
+                        parts.push(`${rowStart} <a href="${escapeHtml(item.itemUri)}">${escapeHtml(item.name)}</a> </td> <td> ${escapeHtml(item.mimeType)} </td><td>${item.sizeStr}</td></tr>`);
                     }
                 }
             }
 
+            parts.push("</tbody>");
             parts.push("</table>");
 
             // OPTIMIZATION: Single join operation instead of multiple concatenations
@@ -477,6 +586,48 @@ module.exports = function koaClassicServer(
                         <meta http-equiv="X-UA-Compatible" content="IE=edge">
                         <meta name="viewport" content="width=device-width, initial-scale=1.0">
                         <title>Index of ${escapeHtml(pageHrefOutPrefix.pathname)}</title>
+                        <style>
+                            body {
+                                font-family: Arial, sans-serif;
+                                margin: 20px;
+                            }
+                            h1 {
+                                border-bottom: 1px solid #ddd;
+                                padding-bottom: 10px;
+                            }
+                            table {
+                                border-collapse: collapse;
+                                width: 100%;
+                                max-width: 800px;
+                            }
+                            thead {
+                                background-color: #f5f5f5;
+                                border-bottom: 2px solid #ddd;
+                            }
+                            th {
+                                text-align: left;
+                                padding: 10px;
+                                font-weight: bold;
+                                border-bottom: 2px solid #ddd;
+                            }
+                            td {
+                                padding: 8px 10px;
+                                border-bottom: 1px solid #eee;
+                            }
+                            tr:hover {
+                                background-color: #f9f9f9;
+                            }
+                            a {
+                                color: #0066cc;
+                                text-decoration: none;
+                            }
+                            a:hover {
+                                text-decoration: underline;
+                            }
+                            th:nth-child(1), td:nth-child(1) { width: 50%; }
+                            th:nth-child(2), td:nth-child(2) { width: 30%; }
+                            th:nth-child(3), td:nth-child(3) { width: 20%; text-align: right; }
+                        </style>
                     </head>
                     <body>
                     <h1>Index of ${escapeHtml(pageHrefOutPrefix.pathname)}</h1>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koa-classic-server",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "High-performance Koa middleware for serving static files with Apache-like directory listing, HTTP caching, template engine support, and comprehensive security fixes",
   "main": "index.cjs",
   "exports": {
@@ -12,10 +12,10 @@
     "test": "jest",
     "test:security": "jest __tests__/security.test.js",
     "test:performance": "jest __tests__/performance.test.js --runInBand",
-    "benchmark": "node benchmark.js",
-    "benchmark:save": "node benchmark.js --save",
-    "benchmark:setup": "node scripts/setup-benchmark.js",
-    "loadConfig": "node ./customTest/loadConfig.util.js"
+    "benchmark": "node __tests__/benchmark.js",
+    "benchmark:save": "node __tests__/benchmark.js --save",
+    "benchmark:setup": "node __tests__/setup-benchmark.js",
+    "loadConfig": "node __tests__/customTest/loadConfig.util.js"
   },
   "keywords": [
     "koa",
@@ -30,11 +30,14 @@
   "author": "Italo Paesano",
   "license": "MIT",
   "dependencies": {
-    "koa": "^3.1.1",
     "mime-types": "^2.1.35"
   },
+  "peerDependencies": {
+    "koa": "^2.0.0 || ^3.0.0"
+  },
   "devDependencies": {
     "autocannon": "^7.15.0",
+    "ejs": "^3.1.10",
     "inquirer": "^12.4.1",
     "jest": "^29.7.0",
     "supertest": "^7.0.0"

package/CREATE_RELEASE.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-# Script per creare la release v1.2.0
-
-echo "🏷️  Creazione Release v1.2.0..."
-
-# Assicurati di essere sul branch principale
-echo "📥 Fetch delle ultime modifiche..."
-git fetch origin
-
-# Checkout al branch principale (prova main, poi master)
-if git show-ref --verify --quiet refs/remotes/origin/main; then
-    echo "✅ Checkout a main..."
-    git checkout main
-    git pull origin main
-elif git show-ref --verify --quiet refs/remotes/origin/master; then
-    echo "✅ Checkout a master..."
-    git checkout master
-    git pull origin master
-else
-    echo "❌ Branch principale non trovato. Usa l'interfaccia GitHub."
-    exit 1
-fi
-
-# Crea il tag
-echo "🏷️  Creazione tag v1.2.0..."
-git tag -a v1.2.0 -m "Release v1.2.0 - Critical Security Update
-
-⚠️ CRITICAL SECURITY FIXES
-
-Security Fixes:
-- Fixed Path Traversal Vulnerability (CRITICAL)
-- Fixed Template Rendering Crash (CRITICAL)
-
-Bug Fixes:
-- HTTP Status Code 404 (HIGH)
-- Race Condition File Access (HIGH)
-- File Extension Extraction (HIGH)
-- Directory Read Errors (MEDIUM)
-- Content-Disposition Header (MEDIUM)
-- Code Quality & XSS Protection
-
-Statistics:
-- Security vulnerabilities: 2 critical fixed
-- Bugs fixed: 6
-- Tests: 71 passing
-- Documentation: 2000+ lines added"
-
-# Push del tag
-echo "📤 Push del tag a GitHub..."
-git push origin v1.2.0
-
-echo "✅ Tag creato! Ora vai su GitHub per creare la release:"
-echo "   https://github.com/italopaesano/koa-classic-server/releases/new?tag=v1.2.0"

package/publish-to-npm.sh

@@ -1,65 +0,0 @@
-#!/bin/bash
-# Script per pubblicare koa-classic-server v1.2.0 su npm
-
-set -e  # Exit on error
-
-echo "📦 Publishing koa-classic-server v1.2.0 to npm"
-echo ""
-
-# Verifica login
-echo "🔐 Verifying npm login..."
-if ! npm whoami > /dev/null 2>&1; then
-    echo "❌ Not logged in to npm. Please run: npm login"
-    exit 1
-fi
-
-echo "✅ Logged in as: $(npm whoami)"
-echo ""
-
-# Verifica versione
-echo "📋 Package info:"
-echo "   Name: $(node -p "require('./package.json').name")"
-echo "   Version: $(node -p "require('./package.json').version")"
-echo ""
-
-# Verifica che non ci siano modifiche non committate
-if [ -n "$(git status --porcelain)" ]; then
-    echo "⚠️  Warning: You have uncommitted changes"
-    git status --short
-    read -p "Continue anyway? (y/N) " -n 1 -r
-    echo
-    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-        exit 1
-    fi
-fi
-
-# Dry run per vedere cosa verrà pubblicato
-echo "🔍 Files that will be published:"
-npm pack --dry-run | tail -20
-echo ""
-
-# Chiedi conferma
-read -p "🚀 Publish to npm? (y/N) " -n 1 -r
-echo
-if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    echo "❌ Publish cancelled"
-    exit 0
-fi
-
-# Pubblica
-echo "📤 Publishing to npm..."
-npm publish
-
-if [ $? -eq 0 ]; then
-    echo ""
-    echo "✅ Successfully published koa-classic-server@1.2.0!"
-    echo ""
-    echo "🔗 View on npm: https://www.npmjs.com/package/koa-classic-server"
-    echo ""
-    echo "📝 Users can now install with:"
-    echo "   npm install koa-classic-server@1.2.0"
-    echo "   npm install koa-classic-server@latest"
-else
-    echo "❌ Publish failed"
-    exit 1
-fi