Minor token handling fix

src/apiutils.nim

@@ -44,7 +44,7 @@ proc genHeaders*(token: Token = nil): HttpHeaders =
  })
 
 template updateToken() =
- if api != Api.search and resp.headers.hasKey(rlRemaining):
+ if resp.headers.hasKey(rlRemaining):
  let
  remaining = parseInt(resp.headers[rlRemaining])
  reset = parseInt(resp.headers[rlReset])
@@ -72,9 +72,9 @@ template fetchImpl(result, fetchBody) {.dirty.} =
  if resp.status == "401 Unauthorized" and result.len == 0:
  getContent()
 
- if resp.status == $Http503:
- badClient = true
- raise newException(InternalError, result)
+  if resp.status == $Http503:
+  badClient = true
+  raise newException(BadClientError, "Bad client")
 
  if result.len > 0:
  if resp.headers.getOrDefault("content-encoding") == "gzip":
@@ -90,6 +90,9 @@ template fetchImpl(result, fetchBody) {.dirty.} =
  raise newException(InternalError, $url)
  except InternalError as e:
  raise e
+ except BadClientError as e:
+ release(token, used=true)
+ raise e
  except Exception as e:
  echo "error: ", e.name, ", msg: ", e.msg, ", token: ", token[], ", url: ", url
  if "length" notin e.msg and "descriptor" notin e.msg:

src/http_pool.nim

@@ -42,5 +42,11 @@ template use*(pool: HttpPool; heads: HttpHeaders; body: untyped): untyped =
  except ProtocolError:
  # Twitter closed the connection, retry
  body
+ except BadClientError:
+ # Twitter returned 503, we need a new client
+ pool.release(c, true)
+ badClient = false
+ c = pool.acquire(heads)
+ body
  finally:
  pool.release(c, badClient)

src/nitter.nim

@@ -85,6 +85,10 @@ routes:
  resp Http500, showError(
  &"An error occurred, please {link} with the URL you tried to visit.", cfg)
 
+ error BadClientError:
+ echo error.exc.name, ": ", error.exc.msg
+ resp Http500, showError("Network error occured, please try again.", cfg)
+
  error RateLimitError:
  const link = a("another instance", href = instancesUrl)
  resp Http429, showError(

src/types.nim

@@ -7,6 +7,7 @@ genPrefsType()
 type
  RateLimitError* = object of CatchableError
  InternalError* = object of CatchableError
+ BadClientError* = object of CatchableError
 
  TimelineKind* {.pure.} = enum
  tweets