Merge pull request #39 from masataka/fix-#31

Fix: Lack of URL encoding processing #31

Author: X

.gitignore

@@ -2,3 +2,5 @@
 Thumbs.db
 .aleph/
 dist/
+
+.vscode/launch.json

project.ts

@@ -221,7 +221,7 @@ export class Project {
     }
 
     async callAPI(req: ServerRequest, loc: { pathname: string, search?: string }): Promise<APIHandler | null> {
-        const [url] = this.#apiRouting.createRouter(loc)
+        const [url] = this.#apiRouting.createRouter({ ...loc, pathname: decodeURI(loc.pathname) })
         if (url.pagePath != '') {
             const moduleID = url.pagePath + '.js'
             if (this.#modules.has(moduleID)) {
@@ -1555,7 +1555,8 @@ function fixImportUrl(importUrl: string): string {
     if (isRemote) {
         return '/-/' + url.hostname + (url.port ? '/' + url.port : '') + pathname + ext
     }
-    return pathname + ext
+    const result = pathname + ext
+    return !isRemote && importUrl.startsWith('/api/') ? decodeURI(result) : result;
 }
 
 /** get hash(sha1) of the content, mix current aleph.js version when the second parameter is `true` */

routing.ts

@@ -176,7 +176,8 @@ export class Routing {
 }
 
 export function getPagePath(moduleId: string): string {
-    return util.trimSuffix(moduleId, '.js').replace(reMDExt, '').toLowerCase().replace(/\s+/g, '-').replace(/^\/pages\//, '/').replace(/\/?index$/, '/')
+    const id = util.trimSuffix(moduleId, '.js').replace(reMDExt, '').toLowerCase().replace(/^\/pages\//, '/').replace(/\/?index$/, '/')
+    return id.startsWith('/api/') ? id : id.replace(/\s+/g, '-')
 }
 
 function matchPath(routePath: string, locPath: string): [Record<string, string>, boolean] {

server.ts

@@ -63,6 +63,22 @@ export async function start(appDir: string, port: number, isDev = false, reload
                         continue
                     }
 
+                    // serve public files
+                    const filePath = path.join(project.appRoot, 'public', decodeURI(pathname))
+                    if (existsFileSync(filePath)) {
+                        const info = Deno.lstatSync(filePath)
+                        const lastModified = info.mtime?.toUTCString() ?? new Date().toUTCString()
+                        if (lastModified === req.headers.get('If-Modified-Since')) {
+                            resp.status(304).send('')
+                            continue
+                        }
+
+                        const body = Deno.readFileSync(filePath)
+                        resp.setHeader('Last-Modified', lastModified)
+                        resp.send(body, getContentType(filePath))
+                        continue
+                    }
+
                     // serve APIs
                     if (pathname.startsWith('/api/')) {
                         project.callAPI(req, { pathname, search: url.search })
@@ -113,21 +129,6 @@ export async function start(appDir: string, port: number, isDev = false, reload
                         }
                     }
 
-                    // serve public files
-                    const filePath = path.join(project.appRoot, 'public', pathname)
-                    if (existsFileSync(filePath)) {
-                        const info = await Deno.lstat(filePath)
-                        if (info.mtime?.toUTCString() === req.headers.get('If-Modified-Since')) {
-                            resp.status(304).send('')
-                            continue
-                        }
-
-                        const body = await Deno.readFile(filePath)
-                        resp.setHeader('Last-Modified', info.mtime!.toUTCString())
-                        resp.send(body, getContentType(filePath))
-                        continue
-                    }
-
                     // ssr
                     const [status, html] = await project.getPageHtml({ pathname, search: url.search })
                     resp.status(status).send(html, 'text/html; charset=utf-8')