branch: externals/websocket commit 36deb3ff85368d000a88435d5a645ffbab490654 Author: ahyatt <ahyatt@penguin> Commit: ahyatt <ahyatt@penguin>
Remove `websocket-ensure-connected'. Re-opening a websocket can be a problem if the connection failed due to repeatable reasons, such as authentication failures. It also leads to strange situations where the websocket the client has is not a valid websocket anymore. I suspect this isn't actually used. --- websocket.el | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/websocket.el b/websocket.el index 56f768855e..4bfa0baab6 100644 --- a/websocket.el +++ b/websocket.el @@ -557,7 +557,6 @@ the `websocket-error' condition." (websocket-debug websocket "Sending frame, opcode: %s payload: %s" (websocket-frame-opcode frame) (websocket-frame-payload frame)) - (websocket-ensure-connected websocket) (unless (websocket-openp websocket) (signal 'websocket-closed (list frame))) (process-send-string (websocket-conn websocket) @@ -581,21 +580,6 @@ the `websocket-error' condition." (setf (websocket-ready-state websocket) 'closed)) (delete-process (websocket-conn websocket))) -(defun websocket-ensure-connected (websocket) - "If the WEBSOCKET connection is closed, open it." - (unless (and (websocket-conn websocket) - (cl-ecase (process-status (websocket-conn websocket)) - ((run open listen) t) - ((stop exit signal closed connect failed nil) nil))) - (websocket-close websocket) - (websocket-open (websocket-url websocket) - :protocols (websocket-protocols websocket) - :extensions (websocket-extensions websocket) - :on-open (websocket-on-open websocket) - :on-message (websocket-on-message websocket) - :on-close (websocket-on-close websocket) - :on-error (websocket-on-error websocket)))) - ;;;;;;;;;;;;;;;;;;;;;; ;; Websocket client ;; ;;;;;;;;;;;;;;;;;;;;;;