@t8/serve 0.1.13 → 0.1.15

package/dist/index.js

@@ -49,6 +49,22 @@ async function getFilePath(url = "", { path = "", dirs = [], spa }) {
   }
 }
 
+// src/getTarget.ts
+var defaultHost = "localhost";
+var defaultPort = 3e3;
+function getTarget(config = {}) {
+  let { host, port, url } = config;
+  let [, , urlHost, , urlPort] = url?.match(/^(https?:\/\/)?([^:/]+)(:(\d+))?\/?/) ?? [];
+  if (!urlPort && /^\d+$/.test(urlHost)) {
+    urlPort = urlHost;
+    urlHost = "";
+  }
+  return {
+    port: port || Number(urlPort) || defaultPort,
+    host: host || urlHost || defaultHost
+  };
+}
+
 // src/mimeTypes.ts
 var mimeTypes = {
   html: "text/html; charset=utf-8",
@@ -65,14 +81,7 @@ var mimeTypes = {
 };
 
 // src/serve.ts
-var defaultHost = "localhost";
-var defaultPort = 3e3;
 async function serve(config = {}) {
-  let [, , host, , port] = config.url?.match(/^(https?:\/\/)?([^:/]+)(:(\d+))?\/?/) ?? [];
-  if (!port && /^\d+$/.test(host)) {
-    port = host;
-    host = defaultHost;
-  }
   await bundle(config);
   return new Promise((resolve) => {
     let server = createServer(async (req, res) => {
@@ -87,10 +96,9 @@ async function serve(config = {}) {
       res.writeHead(200, { "content-type": mimeType });
       createReadStream(filePath).pipe(res);
     });
-    let serverPort = Number(port) || defaultPort;
-    let serverHost = host || defaultHost;
-    server.listen(serverPort, serverHost, () => {
-      console.log(`Server running at http://${serverHost}:${serverPort}`);
+    let { host, port } = getTarget(config);
+    server.listen(port, host, () => {
+      if (config.log) console.log(`Server running at http://${host}:${port}`);
       resolve(server);
     });
   });

package/dist/run.cjs

@@ -52,6 +52,22 @@ async function getFilePath(url = "", { path = "", dirs = [], spa }) {
   }
 }
 
+// src/getTarget.ts
+var defaultHost = "localhost";
+var defaultPort = 3e3;
+function getTarget(config = {}) {
+  let { host, port, url } = config;
+  let [, , urlHost, , urlPort] = url?.match(/^(https?:\/\/)?([^:/]+)(:(\d+))?\/?/) ?? [];
+  if (!urlPort && /^\d+$/.test(urlHost)) {
+    urlPort = urlHost;
+    urlHost = "";
+  }
+  return {
+    port: port || Number(urlPort) || defaultPort,
+    host: host || urlHost || defaultHost
+  };
+}
+
 // src/mimeTypes.ts
 var mimeTypes = {
   html: "text/html; charset=utf-8",
@@ -68,14 +84,7 @@ var mimeTypes = {
 };
 
 // src/serve.ts
-var defaultHost = "localhost";
-var defaultPort = 3e3;
 async function serve(config = {}) {
-  let [, , host, , port] = config.url?.match(/^(https?:\/\/)?([^:/]+)(:(\d+))?\/?/) ?? [];
-  if (!port && /^\d+$/.test(host)) {
-    port = host;
-    host = defaultHost;
-  }
   await bundle(config);
   return new Promise((resolve) => {
     let server = (0, import_node_http.createServer)(async (req, res) => {
@@ -90,10 +99,9 @@ async function serve(config = {}) {
       res.writeHead(200, { "content-type": mimeType });
       (0, import_node_fs.createReadStream)(filePath).pipe(res);
     });
-    let serverPort = Number(port) || defaultPort;
-    let serverHost = host || defaultHost;
-    server.listen(serverPort, serverHost, () => {
-      console.log(`Server running at http://${serverHost}:${serverPort}`);
+    let { host, port } = getTarget(config);
+    server.listen(port, host, () => {
+      if (config.log) console.log(`Server running at http://${host}:${port}`);
       resolve(server);
     });
   });
@@ -124,7 +132,8 @@ async function run() {
     path,
     dirs,
     spa,
-    bundle: bundle2
+    bundle: bundle2,
+    log: true
   });
 }
 run();

package/dist/run.mjs

@@ -51,6 +51,22 @@ async function getFilePath(url = "", { path = "", dirs = [], spa }) {
   }
 }
 
+// src/getTarget.ts
+var defaultHost = "localhost";
+var defaultPort = 3e3;
+function getTarget(config = {}) {
+  let { host, port, url } = config;
+  let [, , urlHost, , urlPort] = url?.match(/^(https?:\/\/)?([^:/]+)(:(\d+))?\/?/) ?? [];
+  if (!urlPort && /^\d+$/.test(urlHost)) {
+    urlPort = urlHost;
+    urlHost = "";
+  }
+  return {
+    port: port || Number(urlPort) || defaultPort,
+    host: host || urlHost || defaultHost
+  };
+}
+
 // src/mimeTypes.ts
 var mimeTypes = {
   html: "text/html; charset=utf-8",
@@ -67,14 +83,7 @@ var mimeTypes = {
 };
 
 // src/serve.ts
-var defaultHost = "localhost";
-var defaultPort = 3e3;
 async function serve(config = {}) {
-  let [, , host, , port] = config.url?.match(/^(https?:\/\/)?([^:/]+)(:(\d+))?\/?/) ?? [];
-  if (!port && /^\d+$/.test(host)) {
-    port = host;
-    host = defaultHost;
-  }
   await bundle(config);
   return new Promise((resolve) => {
     let server = createServer(async (req, res) => {
@@ -89,10 +98,9 @@ async function serve(config = {}) {
       res.writeHead(200, { "content-type": mimeType });
       createReadStream(filePath).pipe(res);
     });
-    let serverPort = Number(port) || defaultPort;
-    let serverHost = host || defaultHost;
-    server.listen(serverPort, serverHost, () => {
-      console.log(`Server running at http://${serverHost}:${serverPort}`);
+    let { host, port } = getTarget(config);
+    server.listen(port, host, () => {
+      if (config.log) console.log(`Server running at http://${host}:${port}`);
       resolve(server);
     });
   });
@@ -123,7 +131,8 @@ async function run() {
     path,
     dirs,
     spa,
-    bundle: bundle2
+    bundle: bundle2,
+    log: true
   });
 }
 run();

package/index.ts

@@ -1,2 +1,3 @@
+export * from "./src/BundleConfig";
 export * from "./src/Config";
 export * from "./src/serve";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@t8/serve",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "description": "",
   "keywords": [
     "node",

package/src/BundleConfig.ts

@@ -0,0 +1,4 @@
+export type BundleConfig = {
+  input?: string;
+  output?: string;
+};

package/src/Config.ts

@@ -1,12 +1,12 @@
+import type { BundleConfig } from "./BundleConfig";
+
 export type Config = {
   url?: string;
+  host?: string;
+  port?: number;
   path?: string;
   dirs?: string[];
   spa?: boolean;
-  bundle?:
-    | boolean
-    | {
-        input?: string;
-        output?: string;
-      };
+  log?: boolean;
+  bundle?: boolean | BundleConfig;
 };

package/src/bundle.ts

@@ -2,6 +2,7 @@ import { exec as originalExec } from "node:child_process";
 import { rm } from "node:fs/promises";
 import { join } from "node:path";
 import { promisify } from "node:util";
+import type { BundleConfig } from "./BundleConfig";
 import type { Config } from "./Config";
 
 const exec = promisify(originalExec);
@@ -9,7 +10,7 @@ const exec = promisify(originalExec);
 export async function bundle({ path = "", bundle: options }: Config = {}) {
   if (!options) return;
 
-  let normalizedOptions: Exclude<Config["bundle"], boolean | undefined> =
+  let normalizedOptions: BundleConfig =
     typeof options === "boolean" ? {} : options;
 
   let inputFile = join(path, normalizedOptions.input ?? "index.ts");

package/src/getTarget.ts

@@ -0,0 +1,21 @@
+import type { Config } from "./Config";
+
+const defaultHost = "localhost";
+const defaultPort = 3000;
+
+export function getTarget(config: Config = {}) {
+  let { host, port, url } = config;
+
+  let [, , urlHost, , urlPort] =
+    url?.match(/^(https?:\/\/)?([^:/]+)(:(\d+))?\/?/) ?? [];
+
+  if (!urlPort && /^\d+$/.test(urlHost)) {
+    urlPort = urlHost;
+    urlHost = "";
+  }
+
+  return {
+    port: port || Number(urlPort) || defaultPort,
+    host: host || urlHost || defaultHost,
+  };
+}

package/src/run.ts

@@ -32,6 +32,7 @@ async function run() {
     dirs,
     spa,
     bundle,
+    log: true,
   });
 }
 

package/src/serve.ts

@@ -4,22 +4,12 @@ import { extname } from "node:path";
 import { bundle } from "./bundle";
 import type { Config } from "./Config";
 import { getFilePath } from "./getFilePath";
+import { getTarget } from "./getTarget";
 import { mimeTypes } from "./mimeTypes";
 
-const defaultHost = "localhost";
-const defaultPort = 3000;
-
 export type Server = ReturnType<typeof createServer>;
 
 export async function serve(config: Config = {}): Promise<Server> {
-  let [, , host, , port] =
-    config.url?.match(/^(https?:\/\/)?([^:/]+)(:(\d+))?\/?/) ?? [];
-
-  if (!port && /^\d+$/.test(host)) {
-    port = host;
-    host = defaultHost;
-  }
-
   await bundle(config);
 
   return new Promise((resolve) => {
@@ -39,11 +29,11 @@ export async function serve(config: Config = {}): Promise<Server> {
       createReadStream(filePath).pipe(res);
     });
 
-    let serverPort = Number(port) || defaultPort;
-    let serverHost = host || defaultHost;
+    let { host, port } = getTarget(config);
+
+    server.listen(port, host, () => {
+      if (config.log) console.log(`Server running at http://${host}:${port}`);
 
-    server.listen(serverPort, serverHost, () => {
-      console.log(`Server running at http://${serverHost}:${serverPort}`);
       resolve(server);
     });
   });