refactor(server): clean up

Author: ije

server/app.ts

@@ -128,9 +128,7 @@ export class Application implements ServerApplication {
     const { init } = await import(`../framework/${framework}/init.ts`)
     await init(this)
 
-    if (!this.isDev) {
-      log.info('Building...')
-    }
+    log.info('Building...')
 
     // pre-compile framework modules
     await this.compile(`${alephPkgUri}/framework/${framework}/bootstrap.ts`)
@@ -150,8 +148,8 @@ export class Application implements ServerApplication {
     // compile custom components
     for (const name of ['app', '404', 'loading']) {
       for (const ext of moduleExts) {
-        if (existsFileSync(path.join(this.srcDir, name + '.' + ext))) {
-          await this.compile('/' + name + '.' + ext)
+        if (existsFileSync(path.join(this.srcDir, `${name}.${ext}`))) {
+          await this.compile(`/${name}.${ext}`)
           break
         }
       }
@@ -338,14 +336,18 @@ export class Application implements ServerApplication {
       if (options.pathname) {
         Object.assign(routeMod, { url: util.cleanPath('/api/' + options.pathname) + '.tsx' })
       } else if (!routeMod.url.startsWith('/api/')) {
-        throw new Error(`the api module url should start with '/api/': ${routeMod.url}`)
+        log.warn(`the api module url should start with '/api/': ${routeMod.url}`)
+        this.#modules.delete(mod.url)
+        return
       }
       this.#apiRouting.update(routeMod)
     } else if (options.asPage) {
       if (options.pathname) {
         Object.assign(routeMod, { url: util.cleanPath('/pages/' + options.pathname) + '.tsx' })
       } else if (!routeMod.url.startsWith('/pages/')) {
-        throw new Error(`the page module url should start with '/pages/': ${routeMod.url}`)
+        log.warn(`the page module url should start with '/pages/': ${routeMod.url}`)
+        this.#modules.delete(mod.url)
+        return
       }
       this.#pageRouting.update(routeMod)
     }
@@ -466,9 +468,11 @@ export class Application implements ServerApplication {
     }
     for (const ext of moduleExts) {
       if (url.endsWith('.' + ext)) {
-        return url.startsWith('/pages/') ||
+        return (
+          url.startsWith('/pages/') ||
           url.startsWith('/components/') ||
-          ['/app', '/404'].includes(trimModuleExt(url))
+          ['/app', '/404'].includes(util.trimSuffix(url, '.' + ext))
+        )
       }
     }
     return this.config.plugins.some(p => p.type === 'loader' && p.test.test(url) && (p.allowPage || p.acceptHMR))

server/server.ts

@@ -89,38 +89,39 @@ export class Server {
             req.status(status).send('')
           }
           return
-        } else if (reHashJs.test(pathname) && ['main', 'main.bundle'].includes(util.trimPrefix(pathname, '/_aleph/').replace(reHashJs, ''))) {
-          req.send(app.getMainJS(pathname.startsWith('/_aleph/main.bundle')), 'application/javascript; charset=utf-8')
+        }
+
+        if (pathname.startsWith('/_aleph/main') && ['main', 'main.bundle'].includes(util.trimPrefix(pathname, '/_aleph/').replace(reHashJs, ''))) {
+          req.send(app.getMainJS(pathname.includes('.bundle.')), 'application/javascript; charset=utf-8')
           return
-        } else {
-          const filePath = path.join(app.buildDir, util.trimPrefix(pathname, '/_aleph/'))
-          if (existsFileSync(filePath)) {
-            const info = Deno.lstatSync(filePath)
-            const lastModified = info.mtime?.toUTCString() ?? new Date().toUTCString()
-            if (lastModified === r.headers.get('If-Modified-Since')) {
-              req.status(304).send('')
-              return
-            }
+        }
 
-            let content = await Deno.readTextFile(filePath)
+        const filePath = path.join(app.buildDir, util.trimPrefix(pathname, '/_aleph/'))
+        if (existsFileSync(filePath)) {
+          const info = Deno.lstatSync(filePath)
+          const lastModified = info.mtime?.toUTCString() ?? new Date().toUTCString()
+          if (lastModified === r.headers.get('If-Modified-Since')) {
+            req.status(304).send('')
+            return
+          }
 
-            if (reHashJs.test(filePath)) {
-              const metaFile = filePath.replace(reHashJs, '') + '.meta.json'
-              if (existsFileSync(metaFile)) {
-                try {
-                  const { url } = JSON.parse(await Deno.readTextFile(metaFile))
-                  const mod = app.getModule(url)
-                  if (mod && app.isHMRable(mod.url)) {
-                    content = app.injectHMRCode(mod, content)
-                  }
-                } catch (e) { }
-              }
+          let content = await Deno.readTextFile(filePath)
+          if (reHashJs.test(filePath)) {
+            const metaFile = filePath.replace(reHashJs, '') + '.meta.json'
+            if (existsFileSync(metaFile)) {
+              try {
+                const { url } = JSON.parse(await Deno.readTextFile(metaFile))
+                const mod = app.getModule(url)
+                if (mod && app.isHMRable(mod.url)) {
+                  content = app.injectHMRCode(mod, content)
+                }
+              } catch (e) { }
             }
-
-            req.setHeader('Last-Modified', lastModified)
-            req.send(content, getContentType(filePath))
-            return
           }
+
+          req.setHeader('Last-Modified', lastModified)
+          req.send(content, getContentType(filePath))
+          return
         }
 
         req.status(404).send('file not found')
@@ -206,7 +207,7 @@ export async function serve({ app, port, hostname, certFile, keyFile }: ServeOpt
       } else {
         s = stdServe({ port, hostname })
       }
-      log.info(`Aleph server ready on http://${hostname || 'localhost'}:${port}${app.config.baseUrl}`)
+      log.info(`Server ready on http://${hostname || 'localhost'}:${port}${app.config.baseUrl}`)
       for await (const r of s) {
         server.handle(r)
       }