Merge pull request #2 from DavidJinSuh90/main

Final working project
oslabs-beta · May 13, 2021 · a459bdd · a459bdd
2 parents 1459c25 + 80245cf
commit a459bdd
Show file tree

Hide file tree

Showing 92 changed files with 281 additions and 15,184 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-node_modules/
+node_modules/
+.vscode
diff --git a/README.txt → README.md b/README.txt → README.md
@@ -13,14 +13,14 @@ A real-time communication module for Deno.
 
 server.ts:
 ```typescript
-  import { Sono } from 'https://deno.land/x/sono@v0.1.0/mod.ts';
+  import { Sono } from 'https://deno.land/x/sono@v1.0/mod.ts';
 
   const sono = new Sono();
 ```
 
 client.ts:
 ```typescript
-  import { SonoClient } from 'https://deno.land/x/sono@v0.1.0/mod.ts';
+  import { SonoClient } from 'https://deno.land/x/sono@v1.0/mod.ts';
 
   const sono = new SonoClient('ws://localhost:8080/ws');
 
@@ -35,13 +35,13 @@ Import directly from deno.land / github.
 
 deps.ts:
 ```typescript
-  import { Sono } from 'https://deno.land/x/sono@v0.1.0/mod.ts';
+  import { Sono } from 'https://deno.land/x/sono@v1.0/mod.ts';
 ```
 
 ## Documentation
-Find the documentation [here.](https://linktodocumentation)
+Find the documentation [here.](http://sono.land)
 
-  ## Authors
+## Authors
 
 - [Chris Ejercito](https://github.com/chris-paul-ejercito)
 - [David Suh](https://github.com/DavidJinSuh90)

diff --git a/__test__/test.ts b/__test__/test.ts
diff --git a/client_side/index.html b/client_side/index.html
diff --git a/client_side/main.js b/client_side/main.js
diff --git a/client_side/server.ts b/client_side/server.ts
diff --git a/client_side/sono_client.js b/client_side/sono_client.js
diff --git a/deps.ts b/deps.ts
@@ -1,8 +1,8 @@
 /**
  * Import and export necessary methods, types, and functions from the deno standard library.
  */
-export { serve, Server as DenoServer, serveTLS, ServerRequest } from "https://deno.land/std@0.95.0/http/server.ts";
-export { serveFile } from "https://deno.land/std@0.95.0/http/file_server.ts";
-export type { HTTPOptions, HTTPSOptions } from "https://deno.land/std@0.95.0/http/server.ts";
-export { acceptWebSocket, isWebSocketCloseEvent } from "https://deno.land/std@0.95.0/ws/mod.ts";
-export type { WebSocket } from "https://deno.land/std@0.95.0/ws/mod.ts";
+export { serve, Server as DenoServer, serveTLS, ServerRequest } from "https://deno.land/std@0.96.0/http/server.ts";
+export { serveFile } from "https://deno.land/std@0.96.0/http/file_server.ts";
+export type { HTTPOptions, HTTPSOptions } from "https://deno.land/std@0.96.0/http/server.ts";
+export { acceptWebSocket, isWebSocketCloseEvent } from "https://deno.land/std@0.96.0/ws/mod.ts";
+export type { WebSocket } from "https://deno.land/std@0.96.0/ws/mod.ts";
diff --git a/websocket/server.ts → examples/webRTC/server.ts b/websocket/server.ts → examples/webRTC/server.ts
@@ -1,13 +1,14 @@
-import { serve } from "https://deno.land/std@0.95.0/http/server.ts";
-import { serveFile } from "https://deno.land/std@0.95.0/http/file_server.ts";
-import { TestSono } from "../mod.ts"
+import { serve } from "https://deno.land/std@0.96.0/http/server.ts";
+import { serveFile } from "https://deno.land/std@0.96.0/http/file_server.ts";
+import { Sono } from "../../mod.ts"
 
 const server = serve({ port: 8080 });
-const sono = new TestSono();
+const sono = new Sono();
 
 sono.channel('secret', ()=> {console.log('secret opened')})
 
 for await (const req of server) {
+
   if (req.method === "GET" && req.url === "/") {
     const path = `${Deno.cwd()}/static/index.html`
     const content = await serveFile(req, path);
@@ -20,10 +21,17 @@ for await (const req of server) {
   }
   else if (req.method === "GET" && req.url === "/favicon.ico") {
     // Do nothing in case of favicon request
+    continue;
+  }
+  else if (req.url === "/main.js") {
+    const path = `${Deno.cwd()}/static/main.js`
+
+    const content = await serveFile(req, path);
+    req.respond(content)
   }
-  else {
-    const path = `${Deno.cwd()}/static/${req.url}`;
+  else if (req.method === "GET" && req.url === "/mod.ts"){
+    const path = `${Deno.cwd()}/../../mod.ts`;
     const content = await serveFile(req, path);
     req.respond(content)
   }
-}
+}