From c51cfef7c0751804a736aa0e0a80b3ad2905c9bb Mon Sep 17 00:00:00 2001
From: Noah Zalev <github@nzalev.ca>
Date: Sat, 8 Jan 2022 14:27:17 -0500
Subject: [PATCH] Factorize close command + bugfix

---
 meshuser.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/meshuser.js b/meshuser.js
index 4ea9cad6..98e6ac44 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -3188,13 +3188,6 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                     }
                     break;
                 }
-            case 'close':
-                {
-                    // Close the web socket session
-                    if (obj.req.session && obj.req.session.ws && obj.req.session.ws == ws) { delete obj.req.session.ws; }
-                    try { ws.close(); } catch (e) { }
-                    break;
-                }
             case 'getcookie':
                 {
                     // Check if this user has rights on this nodeid
@@ -5190,6 +5183,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
         'authcookie': serverCommandAuthCookie,
         'changeemail': serverCommandChangeEmail,
         'changelang': serverCommandChangeLang,
+        'close': serverCommandClose,
         'files': serverCommandFiles,
         'getnetworkinfo': serverCommandGetNetworkInfo,
         'getsysinfo': serverCommandGetSysInfo,
@@ -5793,6 +5787,12 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
         parent.parent.DispatchEvent(targets, obj, message);
     }
 
+    function serverCommandClose(command) {
+        // Close the web socket session
+        try { delete obj.req.session.ws; } catch (e) { }
+        try { ws.close(); } catch (e) { }
+    }
+
     function serverCommandFiles(command) {
         // Send the full list of server files to the browser app
         updateUserFiles(user, ws, domain);