instaserve 1.1.2 → 1.1.4

package/instaserve

@@ -2,6 +2,8 @@
 
 import chalk from 'chalk'
 import fs from 'node:fs'
+import path from 'node:path'
+import { pathToFileURL } from 'node:url'
 
 console.log(chalk.cyan('\nInstaserve - Instant Web Stack\n'))
 console.log(chalk.yellow('Usage:'))
@@ -25,9 +27,9 @@ const args = process.argv.slice(2)
 
 // Handle generate-routes command
 if (args[0] === 'generate-routes') {
-    const routesFile = './routes.js'
+    const routesFile = path.resolve(process.cwd(), './routes.js')
     if (fs.existsSync(routesFile)) {
-        console.error(chalk.red(`Error: ${routesFile} already exists`))
+        console.error(chalk.red(`Error: routes.js already exists`))
         process.exit(1)
     }
     
@@ -62,7 +64,7 @@ if (args[0] === 'generate-routes') {
 `
     
     fs.writeFileSync(routesFile, sampleRoutes)
-    console.log(chalk.green(`✓ Created ${routesFile}`))
+    console.log(chalk.green(`✓ Created routes.js`))
     process.exit(0)
 }
 
@@ -85,34 +87,42 @@ for (let i = 0; i < args.length; i++) {
 
 // Load routes file
 let routes = {}
-const routesFile = params.api || './routes.js'
+let routesFilePath = null
+const routesFileParam = params.api || './routes.js'
 const routesFileSpecified = !!params.api
 
+// Resolve to absolute path from current working directory
+const routesFile = path.isAbsolute(routesFileParam) 
+    ? routesFileParam 
+    : path.resolve(process.cwd(), routesFileParam)
+
 if (routesFileSpecified && !fs.existsSync(routesFile)) {
-    console.error(chalk.red(`Error: Routes file "${routesFile}" does not exist`))
+    console.error(chalk.red(`Error: Routes file "${routesFileParam}" does not exist`))
     process.exit(1)
 }
 
 if (fs.existsSync(routesFile)) {
     try {
-        const imported = await import(routesFile)
+        const routesFileURL = pathToFileURL(routesFile).href
+        const imported = await import(routesFileURL)
         routes = imported.default || imported
         
         if (!routes || typeof routes !== 'object' || Array.isArray(routes)) {
-            console.error(chalk.red(`Error: Routes file "${routesFile}" must export a default object`))
+            console.error(chalk.red(`Error: Routes file "${routesFileParam}" must export a default object`))
             process.exit(1)
         }
         
         for (const [key, handler] of Object.entries(routes)) {
             if (typeof handler !== 'function') {
-                console.error(chalk.red(`Error: Route "${key}" in "${routesFile}" must be a function`))
+                console.error(chalk.red(`Error: Route "${key}" in "${routesFileParam}" must be a function`))
                 process.exit(1)
             }
         }
+        routesFilePath = routesFile
     } catch (e) {
-        console.error(chalk.red(`Error: Could not load routes file "${routesFile}": ${e.message}`))
+        console.error(chalk.red(`Error: Could not load routes file "${routesFileParam}": ${e.message}`))
         process.exit(1)
     }
 }
 
-server(routes) 
+server(routes, params.port ? parseInt(params.port) : undefined, params.ip, routesFilePath) 

package/module.mjs

@@ -1,6 +1,7 @@
 import http from 'node:http'
 import https from 'node:https'
 import fs from 'node:fs'
+import path from 'node:path'
 
 const args = process.argv.slice(2)
 const params = {}
@@ -18,9 +19,9 @@ for (let i = 0; i < args.length; i++) {
     }
 }
 
-function public_file(r, s) {
+function public_file(r, s, publicDir) {
     if (r.url == '/') r.url = '/index.html'
-    const fn = `${params.public || './public'}${r.url.replace(/\.\./g, '')}`
+    const fn = path.resolve(publicDir, r.url.replace(/\.\./g, '').replace(/^\//, ''))
     if (fs.existsSync(fn)) {
         const content = fs.readFileSync(fn, 'utf-8')
         if (fn.match(/.js$/)) {
@@ -34,8 +35,11 @@ function public_file(r, s) {
     return false // Indicate no file was served
 }
 
-export default async function (routes, port = params.port || 3000, ip = params.ip || '127.0.0.1') {
-    const publicDir = params.public || './public'
+export default async function (routes, port = params.port || 3000, ip = params.ip || '127.0.0.1', routesFilePath = null) {
+    const publicDirParam = params.public || './public'
+    const publicDir = path.isAbsolute(publicDirParam) 
+        ? publicDirParam 
+        : path.resolve(process.cwd(), publicDirParam)
     if (publicDir.includes('..')) {
         throw new Error('Public directory path cannot contain ".."')
     }
@@ -73,12 +77,13 @@ export default async function (routes, port = params.port || 3000, ip = params.i
                 if(responseSent || s.writableEnded) return
 
                 // Try to serve public file
-                if(public_file(r, s)) {
+                if(public_file(r, s, publicDir)) {
                     responseSent = true
                     return
                 }
 
-                const url = rrurl.split('/')[1].split('?')[0]
+                const urlParts = rrurl.split('/')
+                const url = urlParts.length > 1 ? urlParts[1].split('?')[0] : ''
                 if (routes[url]) {
                     const resp = routes[url](r, s, data)
                     if (!responseSent && !s.writableEnded) {
@@ -105,8 +110,8 @@ export default async function (routes, port = params.port || 3000, ip = params.i
 
     let server
     if (params.secure) {
-        const certPath = './cert.pem'
-        const keyPath = './key.pem'
+        const certPath = path.resolve(process.cwd(), './cert.pem')
+        const keyPath = path.resolve(process.cwd(), './key.pem')
         
         if (!fs.existsSync(certPath) || !fs.existsSync(keyPath)) {
             throw new Error('Certificate files not found. Run ./generate-certs.sh first.')
@@ -125,7 +130,10 @@ export default async function (routes, port = params.port || 3000, ip = params.i
     server.listen(port || 3000, ip || '')
 
     const protocol = params.secure ? 'https' : 'http'
-    console.log(`started on: ${protocol}://${(process.env.ip || ip)}:${(process.env.port || port)}, public: ${publicDir}, ${Object.keys(routes).length > 0 ? `using routes: ${Object.keys(routes)}` : 'not using routes'}`)
+    const routesInfo = Object.keys(routes).length > 0 
+        ? (routesFilePath ? `using routes: ${Object.keys(routes)} (${routesFilePath})` : `using routes: ${Object.keys(routes)}`)
+        : 'not using routes'
+    console.log(`started on: ${protocol}://${(process.env.ip || ip)}:${(process.env.port || port)}, public: ${publicDir}, ${routesInfo}`)
     
     return {
         routes: routes,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "instaserve",
-    "version": "1.1.2",
+    "version": "1.1.4",
     "description": "Instant web stack",
     "main": "module.mjs",
     "bin": "./instaserve",