Clean up

Author: Milan Pavlik

app/src/App.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import './App.css';
 import { grpc } from 'grpc-web-client';
 import { HackerNewsService } from './proto/hackernews_pb_service';
-import { GetStoryRequest, ListStoriesRequest, ListStoriesResponse } from './proto/hackernews_pb';
+import { ListStoriesRequest, ListStoriesResponse } from './proto/hackernews_pb';
 import { Button, Container, Divider, Grid, Header, Image, Menu, Segment } from 'semantic-ui-react';
 import StoryList from './StoryList';
 import StoryView from './StoryView';
@@ -17,7 +17,7 @@ const ThemingLayout = () => (
         <StoryList />
       </Grid.Column>
 
-      <Grid.Column width={9}>
+      <Grid.Column width={13} stretched={true}>
 
         <Header as="h2">Example body text</Header>
         <StoryView />
@@ -244,27 +244,29 @@ const ThemingLayout = () => (
 class App extends React.Component {
 
   componentDidMount() {
+    let count = 0;
     const request = new ListStoriesRequest();
     grpc.invoke(HackerNewsService.ListStories, {
       request: request,
       debug: true,
       host: 'http://localhost:8900',
       onMessage: (res: ListStoriesResponse) => {
+        count += 1;
         // const obj: ListStoriesResponse = res.toObject();
-        const id = res.getStory()!.getId();
+        const url = res.getStory()!.getUrl();
+        console.log('url', url);
         // console.log(id);
-
-        const req = new GetStoryRequest();
-        req.setId(id);
-
-        grpc.unary(HackerNewsService.GetStory, {
-          host: 'http://localhost:8900',
-          debug: true,
-          request: req,
-          onEnd: (result) => {
-            console.log(result.message ? atob((result.message.toObject() as {html: string}).html) : 'nil');
-          }
-        });
+        if (count === 1) {
+          fetch('http://localhost:8900/article-proxy?q=' + encodeURIComponent(url));
+        }
+        // grpc.unary(HackerNewsService.GetStory, {
+        //   host: 'http://localhost:8900',
+        //   debug: true,
+        //   request: req,
+        //   onEnd: (result) => {
+        //     console.log(result.message ? atob((result.message.toObject() as {html: string}).html) : 'nil');
+        //   }
+        // });
       },
       onEnd: (res) => {
         console.log('end', res);

app/src/StoryView.tsx

@@ -1,12 +1,16 @@
 import * as React from 'react';
 
 const StoryView: React.SFC<{}> = (props) => {
+  const url = 'http://localhost:8900/article-proxy?q=' +
+    'https%3A%2F%2Fstackshare.io%2Fstream%2Fstream-and-go-news-feeds-for-over-300-million-end-users';
   return (
     <iframe
       frameBorder="0"
-      width="100%"
-      height="100%"
-      src="https://0day.work/using-a-yubikey-for-gpg-and-ssh/"
+      style={{
+        height: '100vh',
+        width: '100%',
+      }}
+      src={url}
     />
   );
 };

server/hackernews/scraper.go

@@ -2,29 +2,43 @@ package main
 
 import (
 	"github.com/go-chi/chi"
+	chiMiddleware "github.com/go-chi/chi/middleware"
 	"google.golang.org/grpc"
 	"net/http"
 	"github.com/easyCZ/grpc-web-hacker-news/server/hackernews"
 	hackernews_pb "github.com/easyCZ/grpc-web-hacker-news/server/proto"
 	"google.golang.org/grpc/grpclog"
 	"github.com/improbable-eng/grpc-web/go/grpcweb"
+	"github.com/go-chi/cors"
+	"github.com/easyCZ/grpc-web-hacker-news/server/proxy"
+	"github.com/easyCZ/grpc-web-hacker-news/server/ping"
+	"github.com/easyCZ/grpc-web-hacker-news/server/middleware"
 )
 
 func main() {
-	router := chi.NewRouter()
-
 	grpcServer := grpc.NewServer()
 	hackernewsService := hackernews.NewHackerNewsService(nil)
 	hackernews_pb.RegisterHackerNewsServiceServer(grpcServer, hackernewsService)
 
 	wrappedGrpc := grpcweb.WrapServer(grpcServer)
-	router.Use(func(handler http.Handler) http.Handler {
-		return wrappedGrpc
-	})
 
-	router.Get("/ping", func(writer http.ResponseWriter, request *http.Request) {
-		writer.Write([]byte("pong"))
-	})
+	router := chi.NewRouter()
+	router.Use(
+		chiMiddleware.Logger,
+		chiMiddleware.Recoverer,
+		middleware.NewGrpcWebMiddleware(wrappedGrpc).Handler,	// Must come before general CORS handling
+		cors.New(cors.Options{
+			AllowedOrigins: []string{"*"},
+			AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+			AllowedHeaders:   []string{"Accept", "Authorization", "Content-Type", "X-CSRF-Token", },
+			ExposedHeaders:   []string{"Link"},
+			AllowCredentials: true,
+			MaxAge:           300, // Maximum value not ignored by any of major browsers
+		}).Handler,
+	)
+
+	router.Get("/article-proxy", proxy.Article)
+	router.Get("/ping", ping.Handler)
 
 	if err := http.ListenAndServe(":8900", router); err != nil {
 		grpclog.Fatalf("failed starting http2 server: %v", err)

server/main.go

@@ -0,0 +1,24 @@
+package middleware
+
+import (
+	"github.com/improbable-eng/grpc-web/go/grpcweb"
+	"net/http"
+)
+
+type GrpcWebMiddleware struct {
+	*grpcweb.WrappedGrpcServer
+}
+
+func (m *GrpcWebMiddleware) Handler(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if m.IsAcceptableGrpcCorsRequest(r) || m.IsGrpcWebRequest(r) {
+			m.ServeHTTP(w, r)
+			return
+		}
+		next.ServeHTTP(w, r)
+	})
+}
+
+func NewGrpcWebMiddleware(grpcWeb *grpcweb.WrappedGrpcServer) *GrpcWebMiddleware {
+	return &GrpcWebMiddleware{grpcWeb}
+}

server/middleware/grpcWeb.go

@@ -0,0 +1,7 @@
+package ping
+
+import "net/http"
+
+func Handler(w http.ResponseWriter, r *http.Request) {
+	w.Write([]byte("pong"))
+}

server/ping/ping.go

@@ -0,0 +1,27 @@
+package proxy
+
+import (
+	"fmt"
+	"net/http"
+	"bufio"
+)
+
+func Article(w http.ResponseWriter, r *http.Request) {
+	//url := chi.URLParam(request, "q") // URL encoded url we want to proxy serve
+	url := "http://www.bbc.com/news/health-42736764"
+	fmt.Println("url", url)
+	if url == "" {
+		http.Error(w, "Must specify the url to request", 400)
+	}
+	response, err := http.Get(url)
+	if err != nil {
+		http.Error(w, "Failed to retrieve article", 500)
+	}
+	if response.StatusCode >= 400 {
+		if err != nil {
+			http.Error(w, response.Status, response.StatusCode)
+		}
+	}
+	reader := bufio.NewReader(response.Body)
+	reader.WriteTo(w)
+}