Move do-call &co to a transport package

3 files changed, 48 insertions, 39 deletions

diff --git a/src/bot/impl.lisp b/src/bot/impl.lisp
index 93e63f5..ea1aa03 100644
--- a/src/bot/impl.lisp
+++ b/src/bot/impl.lisp
@@ -2,16 +2,8 @@
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/bot/impl
   (:use :c2cl :iterate :ukkoclot/config)
-  (:import-from :anaphora :aand :acond :it)
-  (:import-from :cl+ssl)
-  (:import-from :dex)
-  (:import-from :log)
-  (:import-from :ukkoclot/serializing :fixup-args :parse-value)
-  (:import-from :ukkoclot/strings :lisp->snake-case)
-  (:local-nicknames
-   (:jzon :com.inuoe.jzon))
   (:export
-   :bot :bot-p :make-bot :do-call
+   :bot :bot-p :make-bot
 
    :bot-config :bot-db :bot-base-uri :bot-power-on :bot-username% :bot-id%))
 (in-package :ukkoclot/bot/impl)
@@ -29,32 +21,3 @@
                                "https://api.telegram.org/bot"
                                (config-bot-token config) "/")))
     (make-bot% :config config :db db :base-uri base-uri)))
-
-(defun req (uri method content)
-  (let ((retrier (dex:retry-request 5 :interval 1)))
-    (handler-case (dex:request uri :method method :content content)
-      (dex:http-request-too-many-requests (e) (dex:ignore-and-continue e)) ; We deal with too many reqs manually
-      (dex:http-request-failed (e) (funcall retrier e))
-      (cl+ssl::ssl-error (e) (funcall retrier e)))))
-
-(defun do-call% (bot method uri type args-encoded)
-  (let ((body (req uri method args-encoded)))
-    (let ((hash (jzon:parse body)))
-      (acond
-        ((gethash "ok" hash) (parse-value type (gethash "result" hash)))
-        ((aand (gethash "parameters" hash)
-               (gethash "retry_after" it))
-         (log:info "Should sleep for ~A seconds" it)
-         (sleep it)
-         (log:info "Good morning!")
-         (do-call% bot method uri type args-encoded))
-        (t (error "TG error ~A: ~A ~:A"
-                  (gethash "error_code" hash)
-                  (gethash "description" hash)
-                  (gethash "parameters" hash)))))))
-
-(defun do-call (bot method path type args)
-  (let ((uri (concatenate 'string (bot-base-uri bot) path))
-        (args-encoded (fixup-args args)))
-    (log:debug "~A .../~A ~S" method path args-encoded)
-    (do-call% bot method uri type args-encoded)))
diff --git a/src/bot/method-macros.lisp b/src/bot/method-macros.lisp
index 7b54dc9..b6f237f 100644
--- a/src/bot/method-macros.lisp
+++ b/src/bot/method-macros.lisp
@@ -1,7 +1,9 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/bot/method-macros
-  (:use :c2cl :iterate :ukkoclot/bot/impl)
+  (:use :c2cl :iterate)
+  (:import-from :ukkoclot/bot/impl :bot)
+  (:import-from :ukkoclot/transport :do-call)
   (:export :define-tg-method))
 (in-package :ukkoclot/bot/method-macros)
 
diff --git a/src/transport.lisp b/src/transport.lisp
new file mode 100644
index 0000000..0b5b138
--- /dev/null
+++ b/src/transport.lisp
@@ -0,0 +1,44 @@
+;; SPDX-License-Identifier: EUPL-1.2
+;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
+(defpackage :ukkoclot/transport
+  (:use :c2cl)
+  (:import-from :anaphora :aand :acond :it)
+  (:import-from :cl+ssl)
+  (:import-from :dex)
+  (:import-from :log)
+  (:import-from :ukkoclot/bot/impl :bot-base-uri)
+  (:import-from :ukkoclot/serializing :fixup-args :parse-value)
+  (:local-nicknames
+   (:jzon :com.inuoe.jzon))
+  (:export :do-call))
+(in-package :ukkoclot/transport)
+
+(defun req (uri method content)
+  (let ((retrier (dex:retry-request 5 :interval 1)))
+    (handler-case (dex:request uri :method method :content content)
+      ;; We deal with too many requests manually
+      (dex:http-request-too-many-requests (e) (dex:ignore-and-continue e))
+      (dex:http-request-failed (e) (funcall retrier e))
+      (cl+ssl::ssl-error (e) (funcall retrier e)))))
+
+(defun do-call% (method uri out-type args-encoded)
+  (let ((body (req uri method args-encoded)))
+    (let ((hash (jzon:parse body)))
+      (acond
+        ((gethash "ok" hash) (parse-value out-type (gethash "result" hash)))
+        ((aand (gethash "parameters" hash)
+               (gethash "retry_after" it))
+         (log:info "Should sleep for ~A seconds" it)
+         (sleep it)
+         (log:info "Good morning!")
+         (do-call% method uri out-type args-encoded))
+        (t (error "TG error ~A: ~A ~:A"
+                  (gethash "error_code" hash)
+                  (gethash "description" hash)
+                  (gethash "parameters" hash)))))))
+
+(defun do-call (bot method path out-type args)
+  (let ((uri (concatenate 'string (bot-base-uri bot) path))
+        (args-encoded (fixup-args args)))
+    (log:debug "~A .../~A ~S" method path args-encoded)
+    (do-call% method uri out-type args-encoded)))