Skip to content

Introduce shell-maker-request-default-timeout, allow timeout to be nil #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Introduce shell-maker-request-default-timeout, allow timeout to be nil #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions shell-maker.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@ For example:
:type 'boolean
:group 'shell-maker)

(defcustom shell-maker-request-default-timeout 600
"Default curl --max-time argument."
:type 'number
:group 'shell-maker)

(defvar-local shell-maker--input nil)

(defvar-local shell-maker--current-request-id 0)
Expand Down Expand Up @@ -830,8 +835,9 @@ LOG: A function to log to.
(funcall on-output (format "\n\n%s" err))))))))
shell-maker--request-process)))

(cl-defun shell-maker-make-http-request (&key async url data encoding timeout proxy
headers fields filter on-output on-finished shell)
(cl-defun shell-maker-make-http-request (&key async url data encoding
(timeout shell-maker-request-default-timeout)
proxy headers fields filter on-output on-finished shell)
"Make HTTP request at URL.

Optionally set:
Expand All @@ -849,7 +855,7 @@ FIELDS: As a list of strings
(\"field1=value1\")
\"field2=value2\")

TIMEOUT: defaults to 600ms.
TIMEOUT: defaults to `shell-maker-request-default-timeout'.
FILTER: An optional function filter command output. Use it for convertions.

(lambda (raw-text)
Expand Down Expand Up @@ -882,7 +888,9 @@ ON-FINISHED: (lambda (result))."
(cons :success (eq (map-elt result :exit-status) 0))
(cons :output (map-elt result :output))))))

(cl-defun shell-maker-make--curl-command (&key url data encoding timeout headers fields proxy)
(cl-defun shell-maker-make--curl-command (&key url data encoding
(timeout shell-maker-request-default-timeout)
headers fields proxy)
"Build curl command list using URL.

Optionally, add:
Expand All @@ -901,11 +909,9 @@ FIELDS: As a list of strings

PROXY: Set when needing an http proxy.

and TIMEOUT: defaults to 600ms."
and TIMEOUT: defaults to `shell-maker-request-default-timeout'."
(unless encoding
(setq encoding 'utf-8))
(unless timeout
(setq timeout 600))
(let ((data-file (when data
(shell-maker--temp-file "curl-data"))))
(when data
Expand All @@ -914,8 +920,9 @@ and TIMEOUT: defaults to 600ms."
(insert (shell-maker--json-encode data))))
(append (list "curl" url
"--fail-with-body"
"--no-progress-meter"
"-m" (number-to-string timeout))
"--no-progress-meter")
(when timeout
(list "-m" (number-to-string timeout)))
(when proxy
(list "--proxy" proxy))
(apply #'append
Expand Down