carta-controller 5.1.1 → 6.0.0-beta.1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "carta-controller",
-    "version": "5.1.1",
+    "version": "6.0.0-beta.1.0.3",
     "description": "NodeJS-based controller for CARTA",
     "repository": "https://github.com/CARTAvis/carta-controller",
     "homepage": "https://www.cartavis.org",
@@ -12,20 +12,24 @@
     "scripts": {
         "start": "npx ts-node src/index.ts",
         "test": "npx ts-node src/index.ts --test",
-        "reformat": "npx prettier --write ./src",
-        "checkformat": "npx prettier --check ./src",
+        "reformat": "npx @biomejs/biome format --write",
+        "checkformat": "npx @biomejs/biome format",
+        "lint": "npx @biomejs/biome lint",
+        "fixlint": "npx @biomejs/biome lint --write",
+        "checkformat-and-lint": "npx @biomejs/biome check",
+        "reformat-and-fixlint": "npx @biomejs/biome check --write",
         "prepare": "npx tsc",
         "unit-test": "vitest run"
     },
     "author": "",
-    "license": "ISC",
+    "license": "GPLV3",
     "dependencies": {
         "@pm2/io": "^6.1.0",
         "ajv": "^8.17.1",
         "ajv-formats": "^3.0.1",
         "axios": "^1.8.2",
         "body-parser": "^1.19.0",
-        "carta-frontend": "^5.1.0",
+        "carta-frontend": "^6.0.0-beta.1.0.2",
         "compression": "^1.8.0",
         "cookie-parser": "^1.4.7",
         "cors": "^2.8.5",
@@ -45,16 +49,17 @@
         "moment-timezone": "^0.6.0",
         "mongodb": "^5.8.0",
         "ms": "^2.1.3",
-        "node-linux-pam": "0.1.0",
+        "node-linux-pam": "github:cartavis/node-linux-pam#v0.2.2",
         "pug": "^3.0.0",
         "read": "^2.0.0",
         "tcp-port-used": "^1.0.2",
         "uuid": "^9.0.0",
-        "websocket": "^1.0.34",
+        "websocket": "^1.0.35",
         "winston": "^3.17.0",
         "yargs": "^17.0.1"
     },
     "devDependencies": {
+        "@biomejs/biome": "2.1.4",
         "@types/compression": "^1.7.0",
         "@types/cookie-parser": "^1.4.8",
         "@types/cors": "^2.8.10",
@@ -68,8 +73,6 @@
         "@types/uuid": "^9.0.0",
         "@types/websocket": "^1.0.2",
         "@types/yargs": "^17.0.22",
-        "patch-package": "^7.0.0",
-        "prettier": "2.8.4",
         "ts-node": "^10.9.1",
         "typescript": "^5.5.4",
         "vitest": "^3.1.4"

package/public/dashboard.js

@@ -12,7 +12,6 @@ const isPopup = urlParams.get("popup");
 
 let serverCheckHandle;
 
-let authenticationType = "";
 let authenticatedUser = "";
 let token = "";
 let tokenLifetime = -1;
@@ -22,8 +21,7 @@ let notyf;
 
 let apiBase;
 getApiBase = async () => {
-    if (apiBase)
-        return apiBase;
+    if (apiBase) return apiBase;
     else {
         try {
             const configData = await fetch(`${strippedPath}config`);
@@ -35,7 +33,7 @@ getApiBase = async () => {
             return "/api"; // use default
         }
     }
-}
+};
 
 apiCall = async (callName, jsonBody, method, authRequired) => {
     const options = {
@@ -43,13 +41,13 @@ apiCall = async (callName, jsonBody, method, authRequired) => {
     };
     if (method !== "get" && jsonBody) {
         options.body = JSON.stringify(jsonBody);
-        options.headers = {"Content-Type": "application/json"}
+        options.headers = {"Content-Type": "application/json"};
     } else {
         options.headers = {};
     }
 
     if (token) {
-        options.headers["Authorization"] = `Bearer ${token}`;
+        options.headers.Authorization = `Bearer ${token}`;
     }
 
     const currentTime = Date.now() / 1000;
@@ -62,12 +60,12 @@ apiCall = async (callName, jsonBody, method, authRequired) => {
         }
     }
     return fetch(`${await getApiBase()}/${callName}`, options);
-}
+};
 
 function setToken(tokenString, expiresIn) {
     token = tokenString;
     tokenLifetime = expiresIn;
-    if (isFinite(tokenLifetime) && tokenLifetime > 0) {
+    if (Number.isFinite(tokenLifetime) && tokenLifetime > 0) {
         console.log(`Token updated and valid for ${tokenLifetime.toFixed()} seconds`);
         const currentTimeSeconds = Date.now() / 1000;
         tokenExpiryTime = currentTimeSeconds + tokenLifetime;
@@ -98,7 +96,7 @@ showMessage = (message, error, elementId) => {
         statusElement.className = "success-message";
     }
     statusElement.innerHTML = message;
-}
+};
 
 setButtonDisabled = (elementId, disabled) => {
     const button = document.getElementById(elementId);
@@ -107,10 +105,10 @@ setButtonDisabled = (elementId, disabled) => {
         if (disabled) {
             button.classList.add("button-disabled");
         } else {
-            button.classList.remove("button-disabled")
+            button.classList.remove("button-disabled");
         }
     }
-}
+};
 
 updateServerStatus = async () => {
     let hasServer = false;
@@ -130,15 +128,15 @@ updateServerStatus = async () => {
     }
     updateRedirectURL(hasServer);
     serverRunning = hasServer;
-}
+};
 
-updateRedirectURL = (hasServer) => {
+updateRedirectURL = hasServer => {
     if (hasServer) {
         showMessage("CARTA server running", false, "carta-status");
     } else {
         showMessage(`Logged in as ${authenticatedUser}`, false, "carta-status");
     }
-}
+};
 
 handleLogin = async () => {
     setButtonDisabled("login", true);
@@ -156,20 +154,19 @@ handleLogin = async () => {
         } else {
             onLoginFailed(res.status);
         }
-    } catch (e) {
+    } catch (_e) {
         onLoginFailed(500);
     }
     setButtonDisabled("login", false);
 };
 
-onLoginFailed = (status) => {
+onLoginFailed = status => {
     clearToken();
     notyf.error(status === 403 ? "Invalid username/password combination" : "Could not authenticate correctly");
-}
+};
 
 onLoginSucceeded = async (username, type) => {
     authenticatedUser = username;
-    authenticationType = type;
     localStorage.setItem("authenticationType", type);
     notyf.success(`Logged in as ${authenticatedUser}`);
     if (autoRedirect) {
@@ -181,7 +178,7 @@ onLoginSucceeded = async (username, type) => {
         serverCheckHandle = setInterval(updateServerStatus, 5000);
         await updateServerStatus();
     }
-}
+};
 
 handleServerStop = async () => {
     try {
@@ -202,7 +199,7 @@ handleServerStop = async () => {
         notyf.error("Failed to stop CARTA server");
         console.log(e);
     }
-}
+};
 
 handleLogout = async () => {
     localStorage.removeItem("authenticationType");
@@ -210,11 +207,11 @@ handleLogout = async () => {
         await handleServerStop();
     }
     window.open(`${await getApiBase()}/auth/logout`, "_self");
-}
+};
 
 handleOpenCarta = () => {
     window.open(redirectUrl, "_self");
-}
+};
 
 handleLog = async () => {
     // Disable log buttons for 5 seconds
@@ -230,7 +227,7 @@ handleLog = async () => {
         const res = await apiCall("server/log", undefined, "get", true);
         const body = await res.json();
         if (body.success && body.log) {
-            document.getElementById("log-modal").style.display = "block"
+            document.getElementById("log-modal").style.display = "block";
             document.getElementById("main-div").classList.add("blurred");
             const outputElement = document.getElementById("log-output");
             if (outputElement) {
@@ -244,25 +241,25 @@ handleLog = async () => {
     } catch (e) {
         console.log(e);
     }
-}
+};
 
 handleHideLog = () => {
-    document.getElementById("log-modal").style.display = "none"
+    document.getElementById("log-modal").style.display = "none";
     document.getElementById("main-div").classList.remove("blurred");
-}
+};
 
 handleLocalLogout = async () => {
     await apiCall("auth/logout", undefined, "post", false);
-}
+};
 
-handleKeyup = (e) => {
+handleKeyup = e => {
     if (e.keyCode === 13) {
         const loginButton = document.getElementById("login");
         if (loginButton && !loginButton.disabled) {
             handleLogin();
         }
     }
-}
+};
 
 refreshLocalToken = async () => {
     try {
@@ -277,46 +274,47 @@ refreshLocalToken = async () => {
         notyf.error("Error refreshing authentication");
         console.log(err);
     }
-}
+};
 
-showCartaForm = (show) => {
+showCartaForm = show => {
     const cartaForm = document.getElementsByClassName("carta-form")[0];
     if (show) {
         cartaForm.style.display = "block";
     } else {
         cartaForm.style.display = "none";
-
     }
-}
+};
 
-showLoginForm = (show) => {
+showLoginForm = show => {
     const loginForm = document.getElementsByClassName("login-form")[0];
     if (show) {
         loginForm.style.display = "block";
     } else {
         loginForm.style.display = "none";
-
     }
-}
+};
 
 window.onload = async () => {
     notyf = new Notyf({
         ripple: true,
         position: {x: "center"},
-        types: [{
-            type: "warning",
-            background: "orange"
-        }, {
-            type: "info",
-            background: "#4c84af",
-        }]
+        types: [
+            {
+                type: "warning",
+                background: "orange"
+            },
+            {
+                type: "info",
+                background: "#4c84af"
+            }
+        ]
     });
 
     // Check for completed login
     const usp = new URLSearchParams(window.location.search);
     if (usp.has("oidcuser")) {
         await refreshLocalToken();
-        onLoginSucceeded(usp.get("oidcuser"), "oidc")
+        onLoginSucceeded(usp.get("oidcuser"), "oidc");
     } else if (usp.has("googleuser")) {
         await refreshLocalToken();
         if (localStorage.getItem("redirectParams")) {
@@ -324,7 +322,7 @@ window.onload = async () => {
             localStorage.removeItem("redirectParams");
             autoRedirect = true;
         }
-        onLoginSucceeded(usp.get("googleuser"), "google")
+        onLoginSucceeded(usp.get("googleuser"), "google");
     } else if (usp.has("err")) {
         console.log(usp.get("err"));
         notyf.open({type: "error", message: usp.get("err")});
@@ -375,7 +373,9 @@ window.onload = async () => {
 
     const oidcLoginButton = document.getElementById("oidcLogin");
     if (oidcLoginButton) {
-        oidcLoginButton.onclick = async () => { window.location.href = `${await getApiBase()}/auth/login${window.location.search}` };
+        oidcLoginButton.onclick = async () => {
+            window.location.href = `${await getApiBase()}/auth/login${window.location.search}`;
+        };
     }
 
     document.getElementById("stop").onclick = handleServerStop;
@@ -384,5 +384,4 @@ window.onload = async () => {
     document.getElementById("refresh-logs").onclick = handleLog;
     document.getElementById("hide-logs").onclick = handleHideLog;
     document.getElementById("logout").onclick = handleLogout;
-
-}
+};