From 174b1af6589ce61cdad2142cd1fcd1b7caeb23e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Depreeuw?= Date: Tue, 26 Jun 2018 22:15:41 +0200 Subject: [PATCH] Add client chapter 31 --- 31-final-project/client/LICENSE | 30 ++++++ 31-final-project/client/README.md | 1 + 31-final-project/client/Setup.hs | 2 + 31-final-project/client/client.cabal | 25 +++++ 31-final-project/client/src/Main.hs | 102 ++++++++++++++++++ 31-final-project/client/stack.yaml | 65 +++++++++++ .../{fingerd/user.json => client/users.json} | Bin 564 -> 562 bytes 7 files changed, 225 insertions(+) create mode 100644 31-final-project/client/LICENSE create mode 100644 31-final-project/client/README.md create mode 100644 31-final-project/client/Setup.hs create mode 100644 31-final-project/client/client.cabal create mode 100644 31-final-project/client/src/Main.hs create mode 100644 31-final-project/client/stack.yaml rename 31-final-project/{fingerd/user.json => client/users.json} (99%) diff --git a/31-final-project/client/LICENSE b/31-final-project/client/LICENSE new file mode 100644 index 0000000..7b3198d --- /dev/null +++ b/31-final-project/client/LICENSE @@ -0,0 +1,30 @@ +Copyright Gaël Depreeuw (c) 2018 + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Gaël Depreeuw nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/31-final-project/client/README.md b/31-final-project/client/README.md new file mode 100644 index 0000000..249c280 --- /dev/null +++ b/31-final-project/client/README.md @@ -0,0 +1 @@ +# client diff --git a/31-final-project/client/Setup.hs b/31-final-project/client/Setup.hs new file mode 100644 index 0000000..9a994af --- /dev/null +++ b/31-final-project/client/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/31-final-project/client/client.cabal b/31-final-project/client/client.cabal new file mode 100644 index 0000000..d364a55 --- /dev/null +++ b/31-final-project/client/client.cabal @@ -0,0 +1,25 @@ +name: client +version: 0.1.0.0 +-- synopsis: +-- description: +homepage: https://github.com/Mithror/client#readme +license: BSD3 +license-file: LICENSE +author: Gaël Depreeuw +maintainer: gael.depreeuw@gmail.com +copyright: Copyright (c) 2018 Gaël Depreeuw +category: daemon +build-type: Simple +cabal-version: >=1.10 +extra-source-files: README.md + +executable client + hs-source-dirs: src + main-is: Main.hs + default-language: Haskell2010 + build-depends: base >= 4.7 && < 5 + , network + , text + , bytestring + , transformers + , optparse-applicative diff --git a/31-final-project/client/src/Main.hs b/31-final-project/client/src/Main.hs new file mode 100644 index 0000000..561bbc0 --- /dev/null +++ b/31-final-project/client/src/Main.hs @@ -0,0 +1,102 @@ +{-# LANGUAGE OverloadedStrings #-} + +module Main where + +import qualified Control.Exception as E +import qualified Data.ByteString.Char8 as C +import System.IO +import Network.Socket hiding (recv) +import Network.Socket.ByteString (recv, sendAll) +import Data.Text (Text) +import Data.String (fromString) +import Control.Monad.Trans.Reader +import Control.Monad.IO.Class (liftIO) +import Options.Applicative +import Data.Semigroup ((<>)) + +type Host = String +type Port = String + +data Config = Config { configHost :: Host + , configPort :: Port + } deriving (Eq, Show) + +type ConfigT a = ReaderT Config IO a + +sendData :: C.ByteString -> ConfigT () +sendData byteString = do + config <- ask + liftIO $ withSocketsDo $ do + addr <- resolve (configHost config) (configPort config) + E.bracket (open addr) close (talk byteString) + where + resolve h p = do + let hints = defaultHints { addrSocketType = Stream } + addr:_ <- getAddrInfo (Just hints) (Just h) (Just p) + return addr + open addr = do + sock <- socket (addrFamily addr) (addrSocketType addr) defaultProtocol --(addrProtocol addr) + connect sock $ addrAddress addr + return sock + talk bs sock = do + sendAll sock $ bs + msg <- recv sock 1024 + C.putStrLn msg + +sendJSON :: FilePath -> ConfigT () +sendJSON filePath = + (liftIO $ readFile filePath) >>= (sendData . fromString . (++ "\0")) + +sendFinger :: String -> ConfigT () +sendFinger = sendData . fromString . (++ "\r\n") + +data Arguments = Finger String Config + | FileInput FilePath Config + deriving (Show, Eq) + +configInput :: Parser Config +configInput = Config + <$> strOption + ( long "host" + <> short 'h' + <> metavar "HOST" + <> help "host to connect to") + <*> strOption + ( long "port" + <> short 'p' + <> metavar "PORT" + <> help "port of daemon") + +fingerInput :: Parser Arguments +fingerInput = Finger + <$> strOption + ( long "name" + <> short 'n' + <> metavar "NAME" + <> help "name of person to look up") + <*> configInput + +fileInput :: Parser Arguments +fileInput = FileInput + <$> strOption + ( long "file" + <> short 'f' + <> metavar "FILENAME" + <> help "json file with config") + <*> configInput + +input :: Parser Arguments +input = fingerInput <|> fileInput + +handleArguments :: Arguments -> IO () +handleArguments (Finger n c) = runReaderT (sendFinger n) c +handleArguments (FileInput f c) = runReaderT (sendJSON f) c + +main :: IO () +main = handleArguments =<< execParser opts + where + opts = info (input <**> helper) + ( fullDesc + <> progDesc "Finger a person or update the server's database." + <> header "client - a tool to talk to the fingerd" ) + diff --git a/31-final-project/client/stack.yaml b/31-final-project/client/stack.yaml new file mode 100644 index 0000000..2dc31f8 --- /dev/null +++ b/31-final-project/client/stack.yaml @@ -0,0 +1,65 @@ +# This file was automatically generated by 'stack init' +# +# Some commonly used options have been documented as comments in this file. +# For advanced use and comprehensive documentation of the format, please see: +# https://docs.haskellstack.org/en/stable/yaml_configuration/ + +# Resolver to choose a 'specific' stackage snapshot or a compiler version. +# A snapshot resolver dictates the compiler version and the set of packages +# to be used for project dependencies. For example: +# +# resolver: lts-3.5 +# resolver: nightly-2015-09-21 +# resolver: ghc-7.10.2 +# resolver: ghcjs-0.1.0_ghc-7.10.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: lts-11.15 + +# User packages to be built. +# Various formats can be used as shown in the example below. +# +# packages: +# - some-directory +# - https://example.com/foo/bar/baz-0.0.2.tar.gz +# - location: +# git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# subdirs: +# - auto-update +# - wai +packages: +- . +# Dependency packages to be pulled from upstream that are not in the resolver +# using the same syntax as the packages field. +# (e.g., acme-missiles-0.3) +# extra-deps: [] + +# Override default flag values for local packages and extra-deps +# flags: {} + +# Extra package databases containing global packages +# extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true +# +# Require a specific version of stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: ">=1.7" +# +# Override the architecture used by stack, especially useful on Windows +# arch: i386 +# arch: x86_64 +# +# Extra directories used by stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir] +# +# Allow a newer minor version of GHC than the snapshot specifies +# compiler-check: newer-minor \ No newline at end of file diff --git a/31-final-project/fingerd/user.json b/31-final-project/client/users.json similarity index 99% rename from 31-final-project/fingerd/user.json rename to 31-final-project/client/users.json index 684b6bd3d6ddb53b56a0b851b6faa791027ef142..69022aef9d961f8190ef317db9e71ad8c344dede 100644 GIT binary patch delta 7 OcmdnOvWaDb5fcCl3j$LB delta 10 RcmdnQvV~=X5fc*w7XT6v0$%_C