Merge pull request #24 from oslabs-beta/staging

webpack updates

Author: StephWood

grpc_mockData/client.js

@@ -1,6 +1,6 @@
 const path = require("path");
 const protoLoader = require("@grpc/proto-loader");
-const grpc = require("grpc");
+const grpc = require("@grpc/grpc-js");
 
 // store proto path
 const PROTO_PATH = path.resolve(__dirname, "./protos/hw2.proto");
@@ -28,19 +28,18 @@ function main() {
   } else {
     user = "world";
   }
-  
+
   // create metadata
   const meta = new grpc.Metadata();
   meta.add("testing", "metadata is working");
-  
+
   // unary
-  client.sayHello({ name: user }, meta, function(err, response) {
+  client.sayHello({ name: user }, meta, function (err, response) {
     console.log("Greeting:", response.message);
-
   });
   // server side streaming
   const call = client.sayHellos({ name: user }, meta);
-  call.on("data", data => {
+  call.on("data", (data) => {
     console.log("server streaming messages:", data);
   });
 
@@ -52,21 +51,21 @@ function main() {
       console.log(response);
     }
     client.close();
-  })
-  stream.write({ name: 'hello 1st client side stream'});
-  stream.write({name: 'hello 2nd client side stream' })
+  });
+  stream.write({ name: "hello 1st client side stream" });
+  stream.write({ name: "hello 2nd client side stream" });
   // ends client streaming
-  stream.end({ name: 'hello end client side stream'})
- 
+  stream.end({ name: "hello end client side stream" });
+
   // bidi streaming
   const streamBidi = client.sayHelloBidi(meta);
   // reads streaming data
   streamBidi.on("error", console.error);
   streamBidi.on("data", console.log);
   streamBidi.on("end", () => client.close());
   // write data
-  streamBidi.write ({ name: 'hello 1st bi-di stream'});
+  streamBidi.write({ name: "hello 1st bi-di stream" });
   // ends data
-  streamBidi.end({ name: 'hello 2nd bi-di stream'})
+  streamBidi.end({ name: "hello 2nd bi-di stream" });
 }
 main();

grpc_mockData/server.js

@@ -2,24 +2,24 @@ const path = require("path");
 const Mali = require("mali");
 // consider replacing highland with normal node code for converting array to streams
 const hl = require("highland");
-const grpc = require('grpc');
+const grpc = require("@grpc/grpc-js");
 
 const PROTO_PATH = path.join(__dirname, "./protos/hw2.proto");
 const HOSTPORT = "0.0.0.0:50051";
 
 const dataStream = [
   {
-    message: "You"
+    message: "You",
   },
   {
-    message: "Are"
+    message: "Are",
   },
   {
-    message: "doing IT"
+    message: "doing IT",
   },
   {
-    message: "Champ"
-  }
+    message: "Champ",
+  },
 ];
 
 /**
@@ -31,8 +31,8 @@ const dataStream = [
 function sayHello(ctx) {
   // create new metadata
   let metadata = new grpc.Metadata();
-  metadata.set('it', 'works?')
-  metadata.set('indeed', 'it do')
+  metadata.set("it", "works?");
+  metadata.set("indeed", "it do");
   // Watcher creates a watch execution context for the watch
   // The execution context provides scripts and templates with access to the watch metadata
   // console.log("received metadata from client request", ctx.metadata)
@@ -44,8 +44,8 @@ function sayHello(ctx) {
   ctx.res = { message: "Hello " + ctx.req.name };
 
   // send response header metadata object directly as an argument and that is set and sent
-  metadata.set('UNARY', 'yes')
-  ctx.sendMetadata(metadata)
+  metadata.set("UNARY", "yes");
+  ctx.sendMetadata(metadata);
 
   // console.log(`set sayHello response: ${ctx.res.message}`);
 }
@@ -54,8 +54,8 @@ function sayHello(ctx) {
 function sayHelloNested(ctx) {
   // create new metadata
   let metadata = new grpc.Metadata();
-  metadata.set('it', 'works?')
-  metadata.set('indeed', 'it do')
+  metadata.set("it", "works?");
+  metadata.set("indeed", "it do");
   // Watcher creates a watch execution context for the watch
   // The execution context provides scripts and templates with access to the watch metadata
   // console.log("received metadata from client request", ctx.metadata)
@@ -66,94 +66,96 @@ function sayHelloNested(ctx) {
   let firstPerson = ctx.req.firstPerson.name;
   let secondPerson = ctx.req.secondPerson.name;
   // console.log("firstPerson line 68 from server.js:", firstPerson)
-  ctx.res = {"serverMessage": [{message: "Hello! " + firstPerson}, {message: 'Hello! ' + secondPerson}]}
+  ctx.res = {
+    serverMessage: [
+      { message: "Hello! " + firstPerson },
+      { message: "Hello! " + secondPerson },
+    ],
+  };
 
   // send response header metadata object directly as an argument and that is set and sent
-  ctx.sendMetadata(metadata)
+  ctx.sendMetadata(metadata);
 }
 // Server-Side Stream
 // used highland library to manage asynchronous data
 async function sayHellos(ctx) {
   // create new metadata
   let metadata = new grpc.Metadata();
-  metadata.set('it', 'works?')
-  metadata.set('indeed', 'it do')
+  metadata.set("it", "works?");
+  metadata.set("indeed", "it do");
   // The execution context provides scripts and templates with access to the watch metadata
   // console.dir(ctx.metadata, { depth: 3, colors: true });
   // converts a request into strings
   // console.log(`got sayHellos request name:`, JSON.stringify(ctx.req, null, 4));
 
   // alias for ctx.request.req
   // In case of UNARY and RESPONSE_STREAM calls it is simply the gRPC call's request
-  
-  let reqMessages = {"message": 'hello!!! ' + ctx.req.name}
 
-  dataStream.push(reqMessages)
-  reqMessages = dataStream
-  let streamData = await hl(reqMessages)
+  let reqMessages = { message: "hello!!! " + ctx.req.name };
+
+  dataStream.push(reqMessages);
+  reqMessages = dataStream;
+  let streamData = await hl(reqMessages);
   ctx.res = streamData;
-  metadata.set('serverStream', 'indeed')
-  dataStream.pop()
+  metadata.set("serverStream", "indeed");
+  dataStream.pop();
 
   // send response header metadata object directly as an argument and that is set and sent
-  ctx.sendMetadata(metadata)
+  ctx.sendMetadata(metadata);
 
   // ends server stream
-  ctx.res.end()
+  ctx.res.end();
 }
 
-
 // Client-Side stream
-function sayHelloCs (ctx) {
+function sayHelloCs(ctx) {
   // create new metadata
   let metadata = new grpc.Metadata();
-  metadata.set('it', 'works?')
-  metadata.set('indeed', 'it do')
-  metadata.set('clientStream', 'indubitably')
+  metadata.set("it", "works?");
+  metadata.set("indeed", "it do");
+  metadata.set("clientStream", "indubitably");
   // The execution context provides scripts and templates with access to the watch metadata
-  console.dir(ctx.metadata, { depth: 3, colors: true })
+  console.dir(ctx.metadata, { depth: 3, colors: true });
   // console.log('got sayHelloClients')
   let counter = 0;
   let messages = [];
   // client streaming calls to write messages and end writing before you can get the response
   return new Promise((resolve, reject) => {
     hl(ctx.req)
-      .map(message => {
-        counter++
+      .map((message) => {
+        counter++;
         // console.log('message content',message.name)
-        ctx.response.res = { message: 'Client stream: ' + message.name }
-        messages.push(message.name)
-        ctx.sendMetadata(metadata)
+        ctx.response.res = { message: "Client stream: " + message.name };
+        messages.push(message.name);
+        ctx.sendMetadata(metadata);
       })
       // returns all the elements as an array
       .collect()
       .toCallback((err, result) => {
-        if (err) return reject(err)
+        if (err) return reject(err);
         // console.log(`done sayHelloClients counter ${counter}`)
-        ctx.response.res = { message: 'SAYHELLOCs Client stream: ' + messages }
+        ctx.response.res = { message: "SAYHELLOCs Client stream: " + messages };
         // console.log(ctx.response.res)
-        resolve()
-      })
-  })
+        resolve();
+      });
+  });
 }
 
 // Bi-Di stream
 function sayHelloBidi(ctx) {
   // create new metadata
   let metadata = new grpc.Metadata();
-  metadata.set('it', 'works?')
-  metadata.set('indeed', 'it do')
+  metadata.set("it", "works?");
+  metadata.set("indeed", "it do");
   // console.log("got sayHelloBidi");
   // The execution context provides scripts and templates with access to the watch metadata
   console.dir(ctx.metadata, { depth: 3, colors: true });
   let counter = 0;
-  ctx.req.on("data", d => {
+  ctx.req.on("data", (d) => {
     counter++;
     ctx.res.write({ message: "bidi stream: " + d.name });
-
-
   });
-  metadata.set('bidiStream', 'ohyes')
+  metadata.set("bidiStream", "ohyes");
   ctx.sendMetadata(metadata);
   // calls end to client before closing server
   ctx.req.on("end", () => {

index-csp.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <!-- <link rel="stylesheet" href="./node_modules/chart.js/dist/Chart.min.css" /> -->
+    <title>Document</title>
+  </head>
+  <body></body>
+</html>

index.html

@@ -1,9 +1,9 @@
-<!DOCTYPE html>
+<!-- <!DOCTYPE html>
 <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
 <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
 <!--[if IE 8]>         <html class="no-js lt-ie9"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]-->
-  <head>
+<!--[if gt IE 8]>> <html class="no-js"> <!--<![endif]-->
+  <!-- <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>This is a test</title>
@@ -16,4 +16,4 @@
     
     <script src="" async defer></script>
   </body>
-</html>
+</html> -->