From 3133891b19f0813f093ee2b05b38d08f55e0f82e Mon Sep 17 00:00:00 2001
From: checktheroads <mtt.lov@gmail.com>
Date: Mon, 13 May 2019 10:37:33 -0700
Subject: [PATCH] converted /lg POST to jquery ajax

---
 ...8a07b => 1842a0ff0c5b4bdbdca506a3489cceed} | Bin 2844 -> 2848 bytes
 .flask_cache/2029240f6d1128be89ddc32729463129 | Bin 8 -> 8 bytes
 .flask_cache/2a6f99d4936620a3f0bd95fedf526b2f | Bin 0 -> 57 bytes
 .flask_cache/4d39e19ce3b3acf5580716fe63ee17a6 | Bin 0 -> 59 bytes
 .flask_cache/74bc75c0764cbc805c70645cef1f026b | Bin 241 -> 241 bytes
 .flask_cache/7ccf01c622d424f11a8e98761770e19a | Bin 0 -> 241 bytes
 .flask_cache/8e5cc37f0d5eb521574b7675b78fbb7a | Bin 0 -> 53 bytes
 .flask_cache/95b12f8cd6b93bf78161ab0764ef7d66 | Bin 0 -> 54 bytes
 .flask_cache/aabe6e7d021b7037492975340fe21c03 | Bin 0 -> 54 bytes
 .flask_cache/bfec0932dad185d106f4b86af0f7c734 | Bin 0 -> 56 bytes
 .flask_cache/c59a0149864f3a0ccffa8e150c81bc43 | Bin 0 -> 241 bytes
 .flask_cache/d277c4e120e0e4b7fa8f80455a32af2e | Bin 0 -> 52 bytes
 .flask_cache/dd6eca7ee6b5f09a8f1821c6c4a5510b | Bin 0 -> 108 bytes
 .flask_cache/e6ed342200608fc2907bdfc4b3dfe59d | Bin 0 -> 56 bytes
 .flask_cache/f2a7e36076223a740fa17b882df5c74a | Bin 114 -> 0 bytes
 .flask_cache/f9a2505762c137a92600cf2ad6c0527d | Bin 0 -> 241 bytes
 hyperglass/hyperglass.py                      |   5 +-
 hyperglass/static/js/hyperglass.js            |  90 ++++++------------
 18 files changed, 34 insertions(+), 61 deletions(-)
 rename .flask_cache/{77c5444ceabaa72e7f3ca61c79d8a07b => 1842a0ff0c5b4bdbdca506a3489cceed} (96%)
 create mode 100644 .flask_cache/2a6f99d4936620a3f0bd95fedf526b2f
 create mode 100644 .flask_cache/4d39e19ce3b3acf5580716fe63ee17a6
 create mode 100644 .flask_cache/7ccf01c622d424f11a8e98761770e19a
 create mode 100644 .flask_cache/8e5cc37f0d5eb521574b7675b78fbb7a
 create mode 100644 .flask_cache/95b12f8cd6b93bf78161ab0764ef7d66
 create mode 100644 .flask_cache/aabe6e7d021b7037492975340fe21c03
 create mode 100644 .flask_cache/bfec0932dad185d106f4b86af0f7c734
 create mode 100644 .flask_cache/c59a0149864f3a0ccffa8e150c81bc43
 create mode 100644 .flask_cache/d277c4e120e0e4b7fa8f80455a32af2e
 create mode 100644 .flask_cache/dd6eca7ee6b5f09a8f1821c6c4a5510b
 create mode 100644 .flask_cache/e6ed342200608fc2907bdfc4b3dfe59d
 delete mode 100644 .flask_cache/f2a7e36076223a740fa17b882df5c74a
 create mode 100644 .flask_cache/f9a2505762c137a92600cf2ad6c0527d

diff --git a/.flask_cache/77c5444ceabaa72e7f3ca61c79d8a07b b/.flask_cache/1842a0ff0c5b4bdbdca506a3489cceed
similarity index 96%
rename from .flask_cache/77c5444ceabaa72e7f3ca61c79d8a07b
rename to .flask_cache/1842a0ff0c5b4bdbdca506a3489cceed
index 29ac7699a61345c3ff9b4628edbb814102b027ae..e1078ec83956f4dbf7127668ad9aa417a298a093 100644
GIT binary patch
delta 37
pcmbOuwm?kSt8n$r7`+CTsr=jwU=YDEQP_ypK;OtjVWZnME&#y-32y)Z

delta 33
lcmZ1=Hb+d@>)PcTF?tOwQ@Obrz#xKUqOcL8;YP1(TmY`~2|oY;

diff --git a/.flask_cache/2029240f6d1128be89ddc32729463129 b/.flask_cache/2029240f6d1128be89ddc32729463129
index 8bd88e5744fc2a6e447bd2f314a1edd0144f1f3c..61c5ec062ffb260f43887c58eeb884d2edbc5ed6 100644
GIT binary patch
literal 8
PcmeZf&}(4v=F<ZJ2QLAI

literal 8
PcmeZf&}(4vX4L}#2OR-?

diff --git a/.flask_cache/2a6f99d4936620a3f0bd95fedf526b2f b/.flask_cache/2a6f99d4936620a3f0bd95fedf526b2f
new file mode 100644
index 0000000000000000000000000000000000000000..ccb499d88729c6bb75c0b52421bd623a9724b715
GIT binary patch
literal 57
zcmea$S$Z=@uYqN%1_K22sHCT*6c?wYrIssX7AxfCmnbAElqKe5rYLv@C^)916r~my
I>rK%E0PZRg+5i9m

literal 0
HcmV?d00001

diff --git a/.flask_cache/4d39e19ce3b3acf5580716fe63ee17a6 b/.flask_cache/4d39e19ce3b3acf5580716fe63ee17a6
new file mode 100644
index 0000000000000000000000000000000000000000..912d89aec14d9f8e2ac56293059fa5c09a368b90
GIT binary patch
literal 59
zcmeYgUUD-=uYqN%76SzIsO4m56{n;D$+RMc%wmPS{1Sykg|ft)%oGLB00qaCl%mw)
IV!bJP028MYo&W#<

literal 0
HcmV?d00001

diff --git a/.flask_cache/74bc75c0764cbc805c70645cef1f026b b/.flask_cache/74bc75c0764cbc805c70645cef1f026b
index 1c2abdd83761b2825c3bd88668a3ff31641c95b2..e58b6a89f173ec43cfc713bb4f075d71e807c68d 100644
GIT binary patch
delta 12
Tcmey!_>qytD|6M&i7amcBG3h)

delta 12
Ucmey!_>qyt>*(bh6ItE@042c&B>(^b

diff --git a/.flask_cache/7ccf01c622d424f11a8e98761770e19a b/.flask_cache/7ccf01c622d424f11a8e98761770e19a
new file mode 100644
index 0000000000000000000000000000000000000000..b3b7d353b9ef174be1ca1b0c57fdc88f883c10a4
GIT binary patch
literal 241
zcmXAiy-EW?6om~~?Nb~(h0UF8+=bnMRj^P91Y&73nYkuI*qL>H)O2|OORan|!NNyz
z7Eg1zoO{3Te)9GGNT>79-?RU`|2!NA1_vec2>hJbDn@jWTjwJc8@Afm9hwr=Y&P8<
zBjawlTH{vjT^J8rYN@8WL^M6S6k!798Ks=nVNtB5I&jRpjd(S24~gKC&l0J%=MdnY
zP<0($*VN6aLUA#s*d(RK*2`?n$ZW^J`7d)W8_`^q@Ge<Bjou9CjTQ1`CwlpY8?>So
I9s2M=e=M_0HUIzs

literal 0
HcmV?d00001

diff --git a/.flask_cache/8e5cc37f0d5eb521574b7675b78fbb7a b/.flask_cache/8e5cc37f0d5eb521574b7675b78fbb7a
new file mode 100644
index 0000000000000000000000000000000000000000..807e1c1ac14bf6346e0b2f1c8b34a99f0d7596b9
GIT binary patch
literal 53
zcmebJw)kd@UIWWi6$S|CQAkNkN=s45ELO<NFHuNTC`-)AOi}O*P;g91DM~Fa)|;XS
E0K=#d(*OVf

literal 0
HcmV?d00001

diff --git a/.flask_cache/95b12f8cd6b93bf78161ab0764ef7d66 b/.flask_cache/95b12f8cd6b93bf78161ab0764ef7d66
new file mode 100644
index 0000000000000000000000000000000000000000..64f06eddcb61bda02894d5afa5daf467160b1db1
GIT binary patch
literal 54
zcmeZzy5wezUIWWiRR##?QA|%uNlPzM$ShXK%P&z#R47Z#$xKo33{Y@PNhwM#F4mi(
F2LRSG5kCL`

literal 0
HcmV?d00001

diff --git a/.flask_cache/aabe6e7d021b7037492975340fe21c03 b/.flask_cache/aabe6e7d021b7037492975340fe21c03
new file mode 100644
index 0000000000000000000000000000000000000000..8243355d33ca2c753b311ee7ca71df748041f8a5
GIT binary patch
literal 54
zcmeZzzv^a;UIWWiRR##?QA{gNEKW&N$ShXK%P&z#R47Z#$xKo33{Y@PNhwM#F4mi(
F2LRfO5mo>I

literal 0
HcmV?d00001

diff --git a/.flask_cache/bfec0932dad185d106f4b86af0f7c734 b/.flask_cache/bfec0932dad185d106f4b86af0f7c734
new file mode 100644
index 0000000000000000000000000000000000000000..65d071d9301a14d665537b1242bfa2ffd0e06638
GIT binary patch
literal 56
zcmeZTxa4MxUIWWibp{CNQBF%qDNZa-NmIxyR>;dQQAkuMOU%hkQSb~<a7;-lN-Zwd
Ho1zB*@EZ}%

literal 0
HcmV?d00001

diff --git a/.flask_cache/c59a0149864f3a0ccffa8e150c81bc43 b/.flask_cache/c59a0149864f3a0ccffa8e150c81bc43
new file mode 100644
index 0000000000000000000000000000000000000000..8d391880627b39302941aa032be73478098119b3
GIT binary patch
literal 241
zcmXAiu}TCn5QZ(R_9=clg}vnVbYWMp5(@?4;4E!&$#@rJlQo&B*ZBaJ+WBIFh4>`S
z>OaLW%*^*){d|1hs+axu@4f%Le%<Uw0%dEYWqK$SEP*4;Iwn@tih}cDgSJL9pU>7i
zCS0ChFL7bFF;9n``l}l32a1K^GZuofF}QqMEseb=mN_t<Ja1u;V@V=0&Lzqj@eWPj
ztK$>ZFI0o-U`n+r)=t}G#3)FyV<h<#&S9(DqZ%oe;AWish`|SK9yfY0&p1P;JKbZ*
GZ|WBXVN4(Z

literal 0
HcmV?d00001

diff --git a/.flask_cache/d277c4e120e0e4b7fa8f80455a32af2e b/.flask_cache/d277c4e120e0e4b7fa8f80455a32af2e
new file mode 100644
index 0000000000000000000000000000000000000000..30c8d042f669981dfaf8696d2a73e64a713089d2
GIT binary patch
literal 52
zcmea8vFc`wUIWWiWd;c7kxwj6NmIxyR>;dQQAkuMOU%hkQSb~<a7;-lN-Zwdo1zB*
Dp#Tsf

literal 0
HcmV?d00001

diff --git a/.flask_cache/dd6eca7ee6b5f09a8f1821c6c4a5510b b/.flask_cache/dd6eca7ee6b5f09a8f1821c6c4a5510b
new file mode 100644
index 0000000000000000000000000000000000000000..5cb2d5e7dd3d4530c1cdcc879a69d17460569960
GIT binary patch
literal 108
zcmeYYT5&T*uYqN1Gy??mNV^sl<rgU==jY|6CYNO9r7M)=E2N~BWhSTUP4S)2SUW|d
zhpi~Tv?R4?N)KyJVzGhYlpf~f+>|LjECoR2Q+hZu3kr%-(=scj^spQ1f#H<W_9=P*
D)lnu0

literal 0
HcmV?d00001

diff --git a/.flask_cache/e6ed342200608fc2907bdfc4b3dfe59d b/.flask_cache/e6ed342200608fc2907bdfc4b3dfe59d
new file mode 100644
index 0000000000000000000000000000000000000000..56babdf1799510e66c91ff8e175c3b60c1dccdf0
GIT binary patch
literal 56
zcmebJx$0(&UIWWibp{CNQO?QEDo#mDPglq+R>;dQQAkuMOU%hkQSb~<a7;-lN-Zwd
Ho1zB*20#)y

literal 0
HcmV?d00001

diff --git a/.flask_cache/f2a7e36076223a740fa17b882df5c74a b/.flask_cache/f2a7e36076223a740fa17b882df5c74a
deleted file mode 100644
index 82a0b43ff5964c2e0d945e665730aab83cbe8f90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 114
zcmeaev+YKVUIWY2L<R`xk#;RA$}dt#&d<wBO)kmIOIIk#S4c@M%S=wyo8mj4v380^
z4_i@wX-R6)lpfZc#9{-(DLu@|xhYe6xJrr=lT*QRQ+hZu3kr%-(=scj^spQ1f#H<W
H_9=P*6CWu%

diff --git a/.flask_cache/f9a2505762c137a92600cf2ad6c0527d b/.flask_cache/f9a2505762c137a92600cf2ad6c0527d
new file mode 100644
index 0000000000000000000000000000000000000000..9a5ce0a2eaca04cb67d62162f0d8a0a2e0eea1fd
GIT binary patch
literal 241
zcmXAiu}%Xq5JV}c?kk24q>JwyxZ;pfMHC<*MG7U2V=sw?&OW?0kdA_q5;}eiiGojI
zPnjuJquqUT^ZxyFuilQo{*Dg%_`TbY1Y&DsFg+CtmXIUNCZ?>aH3jFx7F`Y9wzJJX
z6RwxHD_q%K<mphWR;+7eKTs?go-r4cjluC{wKDdRvgDBQ;`0s$97~cC<6I(U#0TiU
zSLYY1pDT^(WKy**)=t}Gq*0L4j*;X~IHz6Hoz+OO1UJjcj~IMt%=5Mx%qteqjTi%e
Fs(+ezOO5~l

literal 0
HcmV?d00001

diff --git a/hyperglass/hyperglass.py b/hyperglass/hyperglass.py
index da453ce..56228ae 100644
--- a/hyperglass/hyperglass.py
+++ b/hyperglass/hyperglass.py
@@ -147,8 +147,9 @@ def lg():
         except:
             raise RuntimeError("Unable to add output to cache.", 415, *value_params)
         # If 200, return output
+        response = cache.get(cache_key)
         if value_code == 200:
-            return Response(cache.get(cache_key))
+            return Response(cache.get(cache_key), value_code)
         # If 400 error, return error message and code
         elif value_code in [405, 415]:
             return Response(cache.get(cache_key), value_code)
@@ -156,7 +157,7 @@ def lg():
     else:
         logger.info(f"Cache match for: {cache_key}, returning cached entry...")
         try:
-            return Response(cache.get(cache_key))
+            return Response(cache.get(cache_key), value_code)
         except:
             id = 4152
             raise RuntimeError(
diff --git a/hyperglass/static/js/hyperglass.js b/hyperglass/static/js/hyperglass.js
index 6de396c..d390c8b 100644
--- a/hyperglass/static/js/hyperglass.js
+++ b/hyperglass/static/js/hyperglass.js
@@ -4,13 +4,6 @@ var progress = ($('#progress'));
 var resultsbox = ($('#resultsbox'));
 resultsbox.hide();
 progress.hide();
-clientIP ();
-
-function clientIP () {
-  $.getJSON("https://jsonip.com?callback=?", function(data) {
-    clientip = data.ip
-  });
-};
 
 $( document ).ready(function(){
   var defaultasn = $ ( "#network" ).val();
@@ -189,58 +182,37 @@ var submitForm = function() {
     </div>
 `)
 
-  var xhr = new XMLHttpRequest();
-  xhr.open('POST', '/lg', true);
-  resultsbox.show()
-  progress.show()
-  xhr.setRequestHeader('Content-Type', 'application/json;charset=UTF-8')
-  xhr.send(JSON.stringify({router: router, cmd: cmd, ipprefix: ipprefix}))
-  console.log(JSON.stringify({router: router, cmd: cmd, ipprefix: ipprefix}));
+  /////////////////////////////////////////////////////////////
 
-  xhr_timer = window.setInterval(function() {
-    if (xhr.readyState == XMLHttpRequest.DONE) {
-      progress.hide();
-      window.clearTimeout(xhr_timer);
+  $.ajax({
+    url: `/lg`,
+    type: 'POST',
+    data: JSON.stringify({router: router, cmd: cmd, ipprefix: ipprefix}),
+    contentType: "application/json; charset=utf-8",
+    readyState: resultsbox.show() && progress.show(),
+    statusCode: {
+      200: function(response, code) {
+        console.log(code, response);
+        progress.hide();
+        $('#output').html(`<br><div class="content"><p class="query-output" id="output">${response}</p></div>`);
+      },
+      405: function(response, code) {
+        console.log(code, response);
+        progress.hide();
+        $('#ipprefix').addClass('is-warning');
+        $('#output').html(`<br><div class="notification is-warning" id="output">${response.responseText}</div>`);
+      },
+      415: function(response, code) {
+        console.log(code, response);
+        progress.hide();
+        $('#ipprefix').addClass('is-danger');
+        $('#output').html(`<br><div class="notification is-danger" id="output">${response.responseText}</div>`);
+      },
+      429: function(response, code) {
+        console.log(code, response);
+        progress.hide();
+        $("#ratelimit").addClass("is-active");
+      }
     }
-    var output = document.getElementById('output')
-    if (xhr.status == 415){
-      console.log(XMLHttpRequest.status, 'error')
-      var output = document.getElementById('output')
-      $('#ipprefix').addClass('is-danger')
-      output.innerHTML =
-      '<br>' +
-      '<div class="notification is-danger" id="output">' +
-      xhr.responseText +
-      '</div>'
-    }
-    if (xhr.status == 405){
-      console.log(XMLHttpRequest.status, 'error')
-      var output = document.getElementById('output')
-      $('#ipprefix').addClass('is-warning')
-      output.innerHTML =
-      '<br>' +
-      '<div class="notification is-warning" id="output">' +
-      xhr.responseText +
-      '</div>'
-    }
-    else if (xhr.status == 200){
-      console.log(xhr.status, 'success')
-      var output = document.getElementById('output')
-      output.innerHTML =
-      '<br>' +
-      '<div class="content">' +
-      '<p class="query-output" id="output">' +
-      xhr.responseText +
-      '</p>' +
-      '</div>'
-    }
-    else if (xhr.status == 429){
-      console.log(xhr.status, 'rate limit reached');
-      $("#ratelimit").addClass("is-active");
-    }
-  }, 500);
-
-  xhr.addEventListener("error", function(e) {
-    console.log("error: " + e);
-  });
+  })
 }