[nekotools] Allow custom 404 page (#278)

Use 404.html or 404.htm if either exists before defaulting to built-in 404 page
HaxeFoundation · Mar 27, 2023 · 5152b4e · 5152b4e
1 parent b99abf6
commit 5152b4e
Showing 1 changed file with 39 additions and 23 deletions.
diff --git a/src/tools/WebServer.nml b/src/tools/WebServer.nml
@@ -56,7 +56,7 @@ function sys_is_file(file) {
 	neko "$loader.loadprim('std@sys_file_type',1)(file)" == "file"
 }
 
-function page_404(url) {
+function default_page_404(url) {
 "<HTML><HEAD>
 <TITLE>404 Not Found</TITLE>
 </HEAD><BODY>
@@ -551,15 +551,50 @@ function config(c,r) {
 	do_print page_config()
 }
 
+function write_page(c,file,ext,code) {
+	IO.write c.out (sprintf "HTTP/1.1 %d %s\r\n" code);
+	var ctype = try { List.assoc ext mime } catch { Not_found -> "unknown/unknown" };
+	var file_size : int = neko "$loader.loadprim('std@sys_stat',1)(file).size";
+	IO.write c.out ("Content-Type: " + ctype + "\r\n");
+	IO.write c.out ("Content-Length: " + file_size + "\r\n");
+	IO.write c.out "\r\n";
+	var fin = IO.read_file file true;
+	var bufsize = 100000;
+	var n = &(file_size / bufsize);
+	try {
+		while *n > 0 {
+			IO.write c.out IO.read(fin,bufsize);
+			n := *n - 1;
+		}
+		IO.write c.out IO.read(fin,file_size % bufsize);
+	} catch {
+		e -> IO.close_in fin; throw e
+	}
+	IO.close_in fin
+}
+
 function client_msg(c) {
 	var r = parse_http_request c;
 	cur_client := Some c;
 	if r.res == "/server:config" then
 		config(c,r)
 	else match find_url_file r.res true {
 	| None ->
-		c.return_code := (404,"Not Found");
-		do_print page_404(r.res);
+		function rec loop(l) {
+			match l {
+			| [] ->
+				c.return_code := (404, "Not Found");
+				do_print default_page_404(r.res);
+			| f :: l ->
+				match find_url_file f false {
+				| Some page_404 ->
+					var ext = String.lowercase (Sys.extension page_404);
+					write_page c page_404 ext (404, "Not Found")
+				| None -> loop(l)
+				}
+			}
+		}
+		loop ["404.html"; "404.htm"];
 	| Some file ->
 		var ext = String.lowercase (Sys.extension file);
 		if ext == "n" then {
@@ -570,25 +605,7 @@ function client_msg(c) {
 			mod_neko c r file
 		} else {
 			// directly send the file content
-			IO.write c.out "HTTP/1.1 200 OK\r\n";
-			var ctype = try { List.assoc ext mime } catch { Not_found -> "unknown/unknown" };
-			var file_size : int = neko "$loader.loadprim('std@sys_stat',1)(file).size";
-			IO.write c.out ("Content-Type: " + ctype + "\r\n");
-			IO.write c.out ("Content-Length: " + file_size + "\r\n");
-			IO.write c.out "\r\n";
-			var fin = IO.read_file file true;
-			var bufsize = 100000;
-			var n = &(file_size / bufsize);
-			try {
-				while *n > 0 {
-					IO.write c.out IO.read(fin,bufsize);
-					n := *n - 1;
-				}
-				IO.write c.out IO.read(fin,file_size % bufsize);
-			} catch {
-				e -> IO.close_in fin; throw e
-			}
-			IO.close_in fin
+			write_page c file ext (200, "OK");
 		}
 	}
 }
@@ -626,4 +643,3 @@ function init() {
 	log "Starting Neko Server on %s:%d" (*host,*port);
 	Net.start_server Net.host_resolve(*host) (*port) init_client client_msg_safe;
 }
-