FrontendMasters · abdulashref333 · Jun 10, 2020
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ You'll be creating a CLI program that saves and retrieves contacts from and addr
 * commands
   * start the server - `node exercises/api/server.js`
 
-You'll be refacoring and fixing a simple static asset server. The server uses blocking sync code and crashes whenever a request comes in that is asking for an asset that is not found. Neither of those are desirable. You'll also have to teach the server how to server the assets it has in the `assets` folder.
+You'll be refactoring and fixing a simple static asset server. The server uses blocking sync code and crashes whenever a request comes in that is asking for an asset that is not found. Neither of those are desirable. You'll also have to teach the server how to server the assets it has in the `assets` folder.
 
 - [ ] install all remote modules (hint: use npm)
 - [ ] check the README on how to run your server

diff --git a/exercises/api/assets/error.html b/exercises/api/assets/error.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+    <h1 style="color: green;">404 Error</h1>
+</body>
+</html>
diff --git a/exercises/api/server.js b/exercises/api/server.js
@@ -7,9 +7,16 @@ const path = require('path')
  * this function is blocking, fix that
  * @param {String} name full file name of asset in asset folder
  */
-const findAsset = (name) => {
-  const assetPath = path.join(__dirname, 'assets', name)
-  return fs.readFileSync(assetPath, {encoding: 'utf-8'}).toString()
+const findAsset = async(name) => {
+const assetPath = path.join(__dirname, 'assets', name);
+return new Promise((resolve,reject)=>{
+  fs.readFile(assetPath,{encoding:'utf-8'},(err,res)=>{
+    if(err)
+      reject(err);
+    else
+      resolve(res);
+  });
+});
 }
 
 const hostname = '127.0.0.1'
@@ -18,21 +25,31 @@ const port = 3000
 // log incoming request coming into the server. Helpful for debugging and tracking
 const logRequest = (method, route, status) => console.log(method, route, status)
 
-const server = http.createServer((req, res) => {
-  const method = req.method
-  const route = url.parse(req.url).pathname
-  // this is sloppy, especially with more assets, create a "router"
-  if (route === '/') {
-    res.writeHead(200, {'Content-Type': 'text/html'})
-    res.write(findAsset('index.html'))
-    logRequest(method, route, 200)
-    res.end()
-  } else {
-    // missing asset should not cause server crash
-    throw new Error('route not found')
-    res.end()
+const routs = {
+  '/ GET':{
+    asset:'index.html',
+    mim:'text/html'
+  },
+  '/style.css GET':{
+    asset:'style.css',
+    mim:'text/css'
+  }
+}
+const server = http.createServer(async(req, res) => {
+  const method = req.method;
+  const route = url.parse(req.url).pathname;
+  const findRout = routs[`${route} ${method}`];
+  if (!findRout) {
+    res.writeHead(404);
+    res.write(await findAsset('error.html'))
+    res.end();
+    // console.log('ther is no rout with this url.');
+  } else{
+    res.writeHead(200, {'Content-Type': findRout.mim});
+    res.write(await findAsset(findRout.asset));
+    logRequest(method, route, 200);
+    res.end();
   }
-  // most important part, send down the asset
 })
 
 server.listen(port, hostname, () => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,7 +13,9 @@
   "dependencies": {
     "body-parser": "^1.18.3",
     "express": "^4.16.3",
+    "http": "0.0.1-security",
     "mime": "^2.3.1",
-    "morgan": "^1.9.1"
+    "morgan": "^1.9.1",
+    "url": "^0.11.0"
   }
 }