fix: chat example's content-security-policy (denoland/deno#4091)

caspervonb · Jan 31, 2021 · 20d7cc6 · 20d7cc6
1 parent 21b7780
commit 20d7cc6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/examples/chat/index.html b/examples/chat/index.html
@@ -1,5 +1,6 @@
-<html>
+<html lang="en">
   <head>
+    <meta charset="UTF-8" />
     <title>ws chat example</title>
   </head>
   <body>
@@ -10,7 +11,7 @@
       <button id="closeButton" disabled>close</button>
     </div>
     <div id="status"></div>
-    <ul id="timeline"></div>
+    <ul id="timeline"></ul>
     <script>
       let ws;
       function messageDom(msg) {
@@ -35,7 +36,7 @@
       }
       function connect() {
         if (ws) ws.close();
-        ws = new WebSocket("ws://0.0.0.0:8080/ws");
+        ws = new WebSocket(`ws://${location.host}/ws`);
         ws.addEventListener("open", () => {
           console.log("open", ws);
           applyState({connected: true});

diff --git a/examples/chat/server.ts b/examples/chat/server.ts
@@ -36,12 +36,17 @@ listenAndServe({ port: 8080 }, async req => {
     if (u.protocol.startsWith("http")) {
       // server launched by deno run http(s)://.../server.ts,
       fetch(u.href).then(resp => {
-        resp.headers.set("content-type", "text/html");
-        return req.respond(resp);
+        return req.respond({
+          status: resp.status,
+          headers: new Headers({
+            "content-type": "text/html"
+          }),
+          body: resp.body
+        });
       });
     } else {
       // server launched by deno run ./server.ts
-      const file = await Deno.open("./index.html");
+      const file = await Deno.open(u.pathname);
       req.respond({
         status: 200,
         headers: new Headers({
@@ -51,6 +56,14 @@ listenAndServe({ port: 8080 }, async req => {
       });
     }
   }
+  if (req.method === "GET" && req.url === "/favicon.ico") {
+    req.respond({
+      status: 302,
+      headers: new Headers({
+        location: "https://deno.land/favicon.ico"
+      })
+    });
+  }
   if (req.method === "GET" && req.url === "/ws") {
     if (acceptable(req)) {
       acceptWebSocket({