X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=pdns-pipe-nmc.hs;h=1d2563788d0f4fa938ac685322f7d785966ee3f2;hp=a3fc8c7c5b2a5a414388c4f4ede60d1f6c94e1a5;hb=7d674399abdb34b7f27857d8b3dfe7d467fa1434;hpb=b2f5f20509c12bb94783f7035042aed1e0d99c58

diff --git a/pdns-pipe-nmc.hs b/pdns-pipe-nmc.hs
index a3fc8c7..1d25637 100644
--- a/pdns-pipe-nmc.hs
+++ b/pdns-pipe-nmc.hs
@@ -2,10 +2,12 @@
 
 module Main where
 
+import System.IO
 import Control.Monad
-import qualified Data.ByteString.Char8 as C (pack, unpack)
-import qualified Data.ByteString.Lazy.Char8 as L (pack, unpack)
-import Data.ByteString.Lazy as BS hiding (reverse, putStrLn)
+import Data.ByteString.Lazy hiding (reverse, putStr, putStrLn)
+import qualified Data.ByteString.Char8 as C (pack)
+import qualified Data.ByteString.Lazy.Char8 as L (pack)
+import qualified Data.Text as T (pack)
 import Data.List.Split
 import Data.Aeson (encode, decode, Value(..))
 import Network.HTTP.Types
@@ -15,13 +17,14 @@ import Network.HTTP.Conduit
 import JsonRpcClient
 import Config
 import PowerDns
-import NmcJson
+import NmcRpc
+import NmcDom
 
 confFile = "/etc/namecoin.conf"
 
 -- HTTP/JsonRpc interface
 
-qReq :: Config -> ByteString -> ByteString -> Request m
+qReq :: Config -> String -> String -> Request m
 qReq cf q id = applyBasicAuth (C.pack (rpcuser cf)) (C.pack (rpcpassword cf))
              $ def { host           = (C.pack (rpchost cf))
                    , port           = (rpcport cf)
@@ -33,38 +36,33 @@ qReq cf q id = applyBasicAuth (C.pack (rpcuser cf)) (C.pack (rpcpassword cf))
                    , requestBody    = RequestBodyLBS $ encode $
                                       JsonRpcRequest JsonRpcV1
                                                      "name_show"
-                                                     [q]
-                                                     (String "pdns-nmc")
+                                                     [L.pack q]
+                                                     (String (T.pack id))
                    , checkStatus    = \_ _ _ -> Nothing
                    }
 
-qRsp :: Response ByteString -> Either String NmcDom
+qRsp :: Response ByteString -> Either String ByteString
 qRsp rsp =
     case parseJsonRpc (responseBody rsp) :: Either JsonRpcError NmcRes of
       Left  jerr -> 
         case (jrpcErrCode jerr) of
-          -4 -> Right emptyNmcDom
+          -4 -> Right "{}"      -- this is how non-existent entry is returned
           _  -> Left $ "JsonRpc error response: " ++ (show jerr)
-      Right jrsp ->
-        case resValue jrsp of
-          "" -> Right emptyNmcDom
-          vstr ->
-            case decode vstr :: Maybe NmcDom of
-              Nothing  -> Left $ "Unparseable value: " ++ (show vstr)
-              Just dom -> Right dom
+      Right jrsp -> Right $ resValue jrsp
 
 -- NMC interface
 
 queryNmc :: Manager -> Config -> String -> String
          -> IO (Either String NmcDom)
-queryNmc mgr cfg fqdn qid = do
+queryNmc mgr cfg qid fqdn =
   case reverse (splitOn "." fqdn) of
-    "bit":dn:xs -> do
-      rsp <- runResourceT $
-             httpLbs (qReq cfg (L.pack ("d/" ++ dn)) (L.pack qid)) mgr
+    "bit":dn:xs -> descendNmcDom queryOp xs $ seedNmcDom dn
+    _           -> return $ Left "Only \".bit\" domain is supported"
+  where
+    queryOp key = do
+      rsp <- runResourceT $ httpLbs (qReq cfg key qid) mgr
+      -- print $ qRsp rsp
       return $ qRsp rsp
-    _           ->
-      return $ Left "Only \".bit\" domain is supported"
 
 -- Main entry
 
@@ -72,6 +70,8 @@ main = do
 
   cfg <- readConfig confFile
 
+  hSetBuffering stdin  LineBuffering
+  hSetBuffering stdout LineBuffering
   ver <- do
     let
       loopErr e = forever $ do
@@ -92,24 +92,18 @@ main = do
   forever $ do
     l <- getLine
     case pdnsParse ver l of
-      Left e -> putStrLn $ "ERROR\t" ++ e
+      Left e -> putStr $ pdnsReport e
       Right preq -> do
         case preq of
-          PdnsRequestQ qname qtype id _ _ _ -> do
-            ncres <- queryNmc mgr cfg qname id
-            case ncres of
-              Left  e   -> putStrLn $ "ERROR\t" ++ e
-              Right dom -> putStrLn $ pdnsOut qtype dom
+          PdnsRequestQ qname qtype id _ _ _ ->
+            queryNmc mgr cfg id qname >>= putStr . (pdnsOut ver id qname qtype)
           PdnsRequestAXFR xfrreq ->
-            putStrLn ("ERROR\tNo support for AXFR " ++ xfrreq)
-          PdnsRequestPing -> putStrLn "OK"
+            putStr $ pdnsReport ("No support for AXFR " ++ xfrreq)
+          PdnsRequestPing -> putStrLn "END"
 
 -- for testing
 
 ask str = do
   cfg <- readConfig confFile
   mgr <- newManager def
-  ncres <- queryNmc mgr cfg str "test-req-id"
-  case ncres of
-    Left  e   -> putStrLn $ "ERROR\t" ++ e
-    Right dom -> putStrLn $ pdnsOut RRTypeANY dom
+  queryNmc mgr cfg "askid" str >>= putStr . (pdnsOut 1 "askid" str RRTypeANY)