hiro/emacs-jupyter
1
0
Fork 0
mirror of https://github.com/vale981/emacs-jupyter synced 2025-03-06 07:51:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jupyter-websocket-io: Remove the use of websocket-ensure-connected

Browse source 
The function no longer exists in the `websocket` library.
This commit is contained in:
Nathaniel Nicandro 2023-01-28 19:38:58 -06:00
parent 37c3187f8f
commit 9d75eab5df
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
jupyter-server-kernel.el
View file

@ -218,22 +218,7 @@ this case FN will be evaluated on KERNEL."
(jupyter-launch kernel)
(let* ((ws nil)
(shutdown nil)
(kernel-io
(jupyter-publisher
(lambda (event)
(if shutdown (error "Kernel shutdown!")
(pcase event
(`(message . ,rest) (jupyter-content rest))
(`(send ,channel ,msg-type ,content ,msg-id)
(websocket-send-text
ws (let* ((cd (websocket-client-data ws))
(session (plist-get cd :session)))
(jupyter-encode-raw-message session msg-type
:channel channel
:msg-id msg-id
:content content))))
('start (websocket-ensure-connected ws))
('stop (websocket-close ws)))))))
(kernel-io nil)
(status-pub (jupyter-publisher))
(on-message
(lambda (_ws frame)
@ -256,7 +241,24 @@ this case FN will be evaluated on KERNEL."
:custom-header-alist (jupyter-api-auth-headers server)
;; TODO: on-error publishes to status-pub
:on-message on-message))))
(setq ws (funcall make-websocket))
(setq ws (funcall make-websocket)
kernel-io (jupyter-publisher
(lambda (event)
(if shutdown (error "Kernel shutdown!")
(pcase event
(`(message . ,rest) (jupyter-content rest))
(`(send ,channel ,msg-type ,content ,msg-id)
(websocket-send-text
ws (let* ((cd (websocket-client-data ws))
(session (plist-get cd :session)))
(jupyter-encode-raw-message session msg-type
:channel channel
:msg-id msg-id
:content content))))
('start
(unless (websocket-openp ws)
(setq ws (funcall make-websocket))))
('stop (websocket-close ws)))))))
(let ((pub (or (gethash server jupyter--reauth-subscribers)
(setf (gethash server jupyter--reauth-subscribers)
(jupyter-publisher)))))