Change web server to serve the web client.

havarnov · havarnov · commit be7cf09bf59c · 2018-06-17T22:46:53.000+02:00
diff --git a/server/.gitignore b/server/.gitignore
@@ -1,3 +1,4 @@
 
 /target
 **/*.rs.bk
+/static/client.*
diff --git a/server/build.sh b/server/build.sh
@@ -0,0 +1,14 @@
+current=$(pwd)
+
+# client build
+cd ../client
+
+cargo +nightly web deploy --target=wasm32-unknown-unknown --release
+
+# server build
+cd $current
+
+mkdir -p ./static
+cp ../client/target/deploy/client.* ./static/
+
+cargo build
diff --git a/server/index.html b/server/index.html
@@ -0,0 +1,32 @@
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1" name="viewport" />
+    <script>
+        var Rust = {
+            __dirname: 'static',
+        };
+        var Module = {};
+        var __cargo_web = {};
+        Object.defineProperty( Module, 'canvas', {
+            get: function() {
+                if( __cargo_web.canvas ) {
+                    return __cargo_web.canvas;
+                }
+
+                var canvas = document.createElement( 'canvas' );
+                document.querySelector( 'body' ).appendChild( canvas );
+                __cargo_web.canvas = canvas;
+
+                return canvas;
+            }
+        });
+    </script>
+</head>
+<body>
+    <script src="static/client.js"></script>
+</body>
+</html>
diff --git a/server/src/main.rs b/server/src/main.rs
@@ -3,14 +3,25 @@ extern crate protobuf;
 extern crate protos;
 
 use std::time::{SystemTime, UNIX_EPOCH};
+use std::path::PathBuf;
 
-use actix_web::middleware::cors::Cors;
-use actix_web::{server, App, HttpRequest, HttpResponse};
+use actix_web::{server, App, HttpRequest, HttpResponse, fs, http::Method};
+use actix_web::Result as ActixResult;
 
 use protobuf::Message;
 
 use protos::timestamp::TimestampResponse;
 
+fn index(_req: HttpRequest) -> ActixResult<fs::NamedFile> {
+    let path: PathBuf = "./index.html".into();
+    Ok(fs::NamedFile::open(path)?)
+}
+
+fn wasm(_req: HttpRequest) -> ActixResult<fs::NamedFile> {
+    let path: PathBuf = "./static/client.wasm".into();
+    Ok(fs::NamedFile::open(path)?)
+}
+
 fn fetch_timestamp(_req: HttpRequest) -> HttpResponse {
     let mut response = TimestampResponse::new();
 
@@ -26,13 +37,15 @@ fn fetch_timestamp(_req: HttpRequest) -> HttpResponse {
 
 fn main() {
     server::new(|| {
-        App::new().configure(|app| {
-            Cors::for_app(app)
-                .allowed_origin("http://127.0.0.1:8000")
-                .resource("/api/timestamp", |r| r.f(fetch_timestamp))
-                .register()
-        })
-    }).bind("127.0.0.1:8001")
-        .expect("Can not bind to port 8001")
-        .run();
+        App::new()
+            .handler(
+                "/static",
+                fs::StaticFiles::new("./static"))
+            .resource("/api/timestamp", |r| r.f(fetch_timestamp))
+            .resource("/client.wasm", |r| r.f(wasm))
+            .default_resource(|r| r.method(Method::GET).f(index))
+    })
+    .bind("127.0.0.1:8001")
+    .expect("Can not bind to port 8001")
+    .run();
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`
`2`	`2`	`/target`
`3`	`3`	`*/.rs.bk`
	`4`	`+/static/client.*`