Merge branch 'main' into pr/Mastercuber/80

.gitignore

@@ -7,3 +7,4 @@ dist
 types
 .conf*
 .idea/
+test/cert

README.md

@@ -10,7 +10,7 @@ An elegant HTTP listener.
 
 ## Features
 
-- Built-in CLI To run your applications with watch mode and typescript support (with [unjs/jiti](https://github.com/unjs/jiti))
+- Built-in CLI To run your applications with watch mode and typescript support (with [unjs/jiti](https://github.com/unjs/jiti)) and serve static files
 - Promisified interface for listening and closing server
 - Work with express/connect or plain http handle function
 - Support HTTP and HTTPS
@@ -27,18 +27,28 @@ An elegant HTTP listener.
 
 You can run your applications in localhost with typescript support and watch mode using `listhen` CLI:
 
-Create `app.ts`:
+Create `index.ts`:
 
 ```ts
 export default (req, res) => {
   res.end("Hello World!");
 };
 ```
 
+Using [unjs/h3](https://github.com/unjs/h3):
+
+```ts
+import { createApp, eventHandler } from "h3";
+
+export const app = createApp();
+
+app.use("/", () => "Hello world!");
+```
+
 Use npx to invoke `listhen` command:
 
 ```sh
-npx listhen -w ./app.ts
+npx listhen -w ./index.ts
 ```
 
 ## Usage (API)

package.json

@@ -44,6 +44,7 @@
     "consola": "^3.2.3",
     "defu": "^6.1.2",
     "get-port-please": "^3.0.1",
+    "h3": "^1.8.0-rc.2",
     "http-shutdown": "^1.2.2",
     "jiti": "^1.19.1",
     "mlly": "^1.4.0",
@@ -58,7 +59,6 @@
     "changelogen": "^0.5.4",
     "eslint": "^8.46.0",
     "eslint-config-unjs": "^0.2.1",
-    "h3": "^1.8.0-rc.2",
     "ip-regex": "^5.0.0",
     "prettier": "^3.0.0",
     "typescript": "^5.1.6",

playground/index.ts

@@ -1,4 +1,8 @@
-import { toNodeListener } from "h3";
-import { app } from "./app";
+import { createApp, eventHandler } from "h3";
 
-export default toNodeListener(app);
+export const app = createApp();
+
+app.use(
+  "/",
+  eventHandler(() => ({ hello: "world!" })),
+);

playground/public/test.txt

@@ -0,0 +1 @@
+Static asset works!

src/_utils.ts

@@ -1,8 +1,5 @@
 import { networkInterfaces } from "node:os";
-import { relative, resolve } from "node:path";
 import { colors } from "consola/utils";
-import { fileURLToPath } from "mlly";
-import { isAbsolute } from "pathe";
 
 export function getNetworkInterfaces(v4Only = true): string[] {
   const addrs = new Set<string>();
@@ -39,33 +36,3 @@ export function formatURL(url: string) {
     ),
   );
 }
-
-export async function createImporter(input: string, _cwd?: string) {
-  const cwd = resolve(_cwd ? fileURLToPath(_cwd) : ".");
-
-  const jiti = await import("jiti").then((r) => r.default || r);
-  const _jitiRequire = jiti(cwd, {
-    esmResolve: true,
-    requireCache: false,
-    interopDefault: true,
-  });
-
-  if (!isAbsolute(input) && !input.startsWith(".")) {
-    input = `./${input}`;
-  }
-
-  const entry = _jitiRequire.resolve(input);
-
-  const _import = () => {
-    const r = _jitiRequire(input);
-    return Promise.resolve(r.default || r);
-  };
-
-  return {
-    cwd,
-    relative: (path: string) => relative(cwd, path),
-    formateRelative: (path: string) => `\`./${relative(cwd, path)}\``,
-    entry,
-    import: _import,
-  };
-}

src/cli.ts

@@ -1,10 +1,11 @@
-import { resolve } from "node:path";
+import { WatchOptions } from "node:fs";
 import { defineCommand, runMain as _runMain } from "citty";
+import { isAbsolute } from "pathe";
 import { name, description, version } from "../package.json";
 import { listen } from "./listen";
-import { listenAndWatch } from "./watch";
-import type { ListenOptions, WatchOptions } from "./types";
-import { createImporter } from "./_utils";
+import { listenAndWatch } from "./server";
+import type { ListenOptions } from "./types";
+import { DevServerOptions, createDevServer } from "./server/dev";
 
 export const main = defineCommand({
   meta: {
@@ -63,12 +64,8 @@ export const main = defineCommand({
     },
   },
   async run({ args }) {
-    const cwd = resolve(args.cwd || ".");
-    process.chdir(cwd);
-
-    const opts: Partial<ListenOptions & WatchOptions> = {
+    const opts: Partial<ListenOptions & WatchOptions & DevServerOptions> = {
       ...args,
-      cwd,
       port: args.port,
       hostname: args.host,
       clipboard: args.clipboard,
@@ -78,12 +75,17 @@ export const main = defineCommand({
       https: args.https, // TODO: Support custom cert
     };
 
+    const entry =
+      isAbsolute(args.entry) || args.entry.startsWith(".")
+        ? args.entry
+        : `./${args.entry}`;
+
     if (args.watch) {
-      await listenAndWatch(args.entry, opts);
+      await listenAndWatch(entry, opts);
     } else {
-      const importer = await createImporter(args.entry);
-      const handler = await importer.import();
-      await listen(handler, opts);
+      const devServer = await createDevServer(entry, opts);
+      await listen(devServer.nodeListener, opts);
+      await devServer.reload(true);
     }
   },
 });

src/index.ts

@@ -1,3 +1,3 @@
 export * from "./listen";
 export * from "./types";
-export * from "./watch";
+export * from "./server";

src/server/_resolver.ts

@@ -0,0 +1,33 @@
+import { relative } from "node:path";
+
+export async function createResolver() {
+  const jiti = await import("jiti").then((r) => r.default || r);
+
+  const _jitiRequire = jiti(process.cwd(), {
+    cache: true,
+    esmResolve: true,
+    requireCache: false,
+    interopDefault: true,
+  });
+
+  const _import = (id: string) => {
+    const r = _jitiRequire(id);
+    return Promise.resolve(r.default || r);
+  };
+
+  const resolve = (id: string) => _jitiRequire.resolve(id);
+
+  const tryResolve = (id: string) => {
+    try {
+      return resolve(id);
+    } catch {}
+  };
+
+  return {
+    relative: (path: string) => relative(process.cwd(), path),
+    formateRelative: (path: string) => `\`./${relative(process.cwd(), path)}\``,
+    import: _import,
+    resolve,
+    tryResolve,
+  };
+}