From 25f210c2c2c0feb1472f041a2116d25a0af7d53f Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sun, 26 Nov 2023 16:42:53 +0100 Subject: [PATCH] update websocket Signed-off-by: Andreas Gerler --- elpa/websocket-20210110.17/websocket-pkg.el | 2 - .../websocket-autoloads.el | 4 ++ elpa/websocket-20230305.410/websocket-pkg.el | 14 ++++ .../websocket.el | 66 +++++++++---------- 4 files changed, 51 insertions(+), 35 deletions(-) delete mode 100644 elpa/websocket-20210110.17/websocket-pkg.el rename elpa/{websocket-20210110.17 => websocket-20230305.410}/websocket-autoloads.el (89%) create mode 100644 elpa/websocket-20230305.410/websocket-pkg.el rename elpa/{websocket-20210110.17 => websocket-20230305.410}/websocket.el (96%) diff --git a/elpa/websocket-20210110.17/websocket-pkg.el b/elpa/websocket-20210110.17/websocket-pkg.el deleted file mode 100644 index 94e8803c..00000000 --- a/elpa/websocket-20210110.17/websocket-pkg.el +++ /dev/null @@ -1,2 +0,0 @@ -;;; Generated package description from websocket.el -*- no-byte-compile: t -*- -(define-package "websocket" "20210110.17" "Emacs WebSocket client and server" '((cl-lib "0.5")) :commit "34e11124fdd9d73e431499ba8a6b6a8023519664" :authors '(("Andrew Hyatt" . "ahyatt@gmail.com")) :maintainer '("Andrew Hyatt" . "ahyatt@gmail.com") :keywords '("communication" "websocket" "server") :url "https://github.com/ahyatt/emacs-websocket") diff --git a/elpa/websocket-20210110.17/websocket-autoloads.el b/elpa/websocket-20230305.410/websocket-autoloads.el similarity index 89% rename from elpa/websocket-20210110.17/websocket-autoloads.el rename to elpa/websocket-20230305.410/websocket-autoloads.el index c68dedbc..8e93729a 100644 --- a/elpa/websocket-20210110.17/websocket-autoloads.el +++ b/elpa/websocket-20230305.410/websocket-autoloads.el @@ -11,6 +11,10 @@ (register-definition-prefixes "websocket" '("websocket-")) +;;;*** + +;;;### (autoloads nil nil ("websocket-pkg.el") (0 0 0 0)) + ;;;*** ;; Local Variables: diff --git a/elpa/websocket-20230305.410/websocket-pkg.el b/elpa/websocket-20230305.410/websocket-pkg.el new file mode 100644 index 00000000..55e864c2 --- /dev/null +++ b/elpa/websocket-20230305.410/websocket-pkg.el @@ -0,0 +1,14 @@ +(define-package "websocket" "20230305.410" "Emacs WebSocket client and server" + '((cl-lib "0.5")) + :commit "1a08093b122d8cf20366a1cba5faddf7a53d08ed" :authors + '(("Andrew Hyatt" . "ahyatt@gmail.com")) + :maintainers + '(("Andrew Hyatt" . "ahyatt@gmail.com")) + :maintainer + '("Andrew Hyatt" . "ahyatt@gmail.com") + :keywords + '("communication" "websocket" "server") + :url "https://github.com/ahyatt/emacs-websocket") +;; Local Variables: +;; no-byte-compile: t +;; End: diff --git a/elpa/websocket-20210110.17/websocket.el b/elpa/websocket-20230305.410/websocket.el similarity index 96% rename from elpa/websocket-20210110.17/websocket.el rename to elpa/websocket-20230305.410/websocket.el index fa01d5ec..947b68b3 100644 --- a/elpa/websocket-20210110.17/websocket.el +++ b/elpa/websocket-20230305.410/websocket.el @@ -5,9 +5,7 @@ ;; Author: Andrew Hyatt ;; Homepage: https://github.com/ahyatt/emacs-websocket ;; Keywords: Communication, Websocket, Server -;; Package-Version: 20210110.17 -;; Package-Commit: 34e11124fdd9d73e431499ba8a6b6a8023519664 -;; Version: 1.13 +;; Version: 1.14 ;; Package-Requires: ((cl-lib "0.5")) ;; ;; This program is free software; you can redistribute it and/or @@ -722,6 +720,7 @@ to the websocket protocol. (when (and (member status '(closed failed exit signal)) (not (eq 'closed (websocket-ready-state websocket)))) + (setf (websocket-ready-state websocket) 'closed) (websocket-try-callback 'websocket-on-close 'on-close websocket)))))) (defun websocket-ensure-handshake (url conn key protocols extensions custom-header-alist nowait) @@ -915,36 +914,37 @@ All these parameters are defined as in `websocket-open'." (cookie-header (url-cookie-generate-header-lines host-port (car (url-path-and-query parsed-url)) (equal (url-type parsed-url) "wss")))) - (format (concat "Host: %s\r\n" - "Upgrade: websocket\r\n" - "Connection: Upgrade\r\n" - "Sec-WebSocket-Key: %s\r\n" - "Sec-WebSocket-Version: 13\r\n" - (when protocol - (concat - (mapconcat - (lambda (protocol) - (format "Sec-WebSocket-Protocol: %s" protocol)) - protocol "\r\n") - "\r\n")) - (when extensions - (format "Sec-WebSocket-Extensions: %s\r\n" - (mapconcat - (lambda (ext) - (concat - (car ext) - (when (cdr ext) "; ") - (when (cdr ext) - (mapconcat 'identity (cdr ext) "; ")))) - extensions ", "))) - (when cookie-header cookie-header) - (concat (mapconcat (lambda (cons) (format "%s: %s" (car cons) (cdr cons))) - custom-headers-alist "\r\n") - (when custom-headers-alist "\r\n")) - "\r\n") - host-port - key - protocol))) + (concat + (format (concat "Host: %s\r\n" + "Upgrade: websocket\r\n" + "Connection: Upgrade\r\n" + "Sec-WebSocket-Key: %s\r\n" + "Sec-WebSocket-Version: 13\r\n" + (when protocol + (concat + (mapconcat + (lambda (protocol) + (format "Sec-WebSocket-Protocol: %s" protocol)) + protocol "\r\n") + "\r\n")) + (when extensions + (format "Sec-WebSocket-Extensions: %s\r\n" + (mapconcat + (lambda (ext) + (concat + (car ext) + (when (cdr ext) "; ") + (when (cdr ext) + (mapconcat 'identity (cdr ext) "; ")))) + extensions ", ")))) + host-port + key + protocol) + (when cookie-header cookie-header) + (mapconcat (lambda (cons) (format "%s: %s" (car cons) (cdr cons))) + custom-headers-alist "\r\n") + (when custom-headers-alist "\r\n") + "\r\n"))) (defun websocket-get-server-response (websocket client-protocols client-extensions) "Get the websocket response from client WEBSOCKET." -- 2.47.3