carta-controller 5.1.1 → 6.0.0-beta.1.0.3

package/dist/config.js

@@ -38,23 +38,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testUser = exports.RuntimeConfig = exports.ServerConfig = void 0;
-const yargs_1 = __importDefault(require("yargs"));
-const url = __importStar(require("url"));
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const JSONC = __importStar(require("jsonc-parser"));
-const lodash_1 = __importDefault(require("lodash"));
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+const url = __importStar(require("node:url"));
 const ajv_1 = __importDefault(require("ajv"));
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
-const util_1 = require("./util");
-const winston_1 = __importDefault(require("winston"));
+const JSONC = __importStar(require("jsonc-parser"));
+const lodash_1 = __importDefault(require("lodash"));
 const moment_timezone_1 = __importDefault(require("moment-timezone"));
+const winston_1 = __importDefault(require("winston"));
+const yargs_1 = __importDefault(require("yargs"));
+const util_1 = require("./util");
 let timeZone;
 const customTimestamp = () => {
     if (timeZone)
-        return (0, moment_timezone_1.default)().tz(timeZone).format('YYYY-MM-DD HH:mm:ss');
+        return (0, moment_timezone_1.default)().tz(timeZone).format("YYYY-MM-DD HH:mm:ss");
     else
-        return (0, moment_timezone_1.default)().format('YYYY-MM-DD HH:mm:ss');
+        return (0, moment_timezone_1.default)().format("YYYY-MM-DD HH:mm:ss");
 };
 // Different log formats
 const logTextFormat = winston_1.default.format.combine(winston_1.default.format.timestamp({ format: customTimestamp }), winston_1.default.format.printf(({ level, message, timestamp }) => {
@@ -68,7 +68,7 @@ const logJsonFormat = winston_1.default.format.combine(winston_1.default.format.
 const defaultConfigPath = "/etc/carta/config.json";
 const argv = yargs_1.default
     .parserConfiguration({
-    'short-option-groups': false,
+    "short-option-groups": false
 })
     .options({
     config: {
@@ -114,7 +114,7 @@ const consoleTransport = new winston_1.default.transports.Console({
 });
 util_1.logger.add(consoleTransport);
 try {
-    let configFiles = [];
+    const configFiles = [];
     if (fs.existsSync(argv.config)) {
         configFiles.push(argv.config);
         const jsonString = fs.readFileSync(argv.config).toString();
@@ -170,10 +170,11 @@ try {
     // Validate timezone setting
     if (serverConfig.timezone) {
         try {
-            new Intl.DateTimeFormat('en-US', { timeZone: serverConfig.timezone });
+            new Intl.DateTimeFormat("en-US", { timeZone: serverConfig.timezone });
             timeZone = serverConfig.timezone;
         }
         catch (err) {
+            util_1.logger.debug(err);
             util_1.logger.error(`Ignoring invalid timezone "${serverConfig.timezone}" in config file`);
         }
     }
@@ -196,7 +197,7 @@ try {
                 util_1.logger.add(new winston_1.default.transports.File({
                     level: serverConfig.logLevelFile,
                     filename: serverConfig.logFile,
-                    format: serverConfig.logTypeFile === "json" ? logJsonFormat : logTextFormat,
+                    format: serverConfig.logTypeFile === "json" ? logJsonFormat : logTextFormat
                 }));
                 util_1.logger.info(`Started logging to ${serverConfig.logFile}`);
             }
@@ -241,8 +242,8 @@ if (serverConfig.authProviders.external) {
     runtimeConfig.logoutAddress = serverConfig.authProviders.external.logoutAddress;
 }
 else {
-    runtimeConfig.tokenRefreshAddress = runtimeConfig.apiAddress + "/auth/refresh";
-    runtimeConfig.logoutAddress = runtimeConfig.apiAddress + "/auth/logout";
+    runtimeConfig.tokenRefreshAddress = `${runtimeConfig.apiAddress}/auth/refresh`;
+    runtimeConfig.logoutAddress = `${runtimeConfig.apiAddress}/auth/logout`;
 }
 if (runtimeConfig.tokenRefreshAddress) {
     const authUrl = url.parse(runtimeConfig.tokenRefreshAddress);

package/dist/controllerTests.js

@@ -46,17 +46,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runTests = runTests;
-const path = __importStar(require("path"));
-const fs = __importStar(require("fs"));
-const mongodb_1 = require("mongodb");
+const node_child_process_1 = require("node:child_process");
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
 const ldapauth_fork_1 = __importDefault(require("ldapauth-fork"));
 const logSymbols = __importStar(require("log-symbols"));
 const moment_1 = __importDefault(require("moment"));
-const config_1 = require("./config");
-const child_process_1 = require("child_process");
-const util_1 = require("./util");
+const mongodb_1 = require("mongodb");
 const websocket_1 = require("websocket");
 const local_1 = require("./auth/local");
+const config_1 = require("./config");
+const util_1 = require("./util");
 const read = require("read");
 function runTests(username) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -194,7 +194,7 @@ function testFrontend() {
     }
     let indexContents;
     try {
-        indexContents = fs.readFileSync(config_1.ServerConfig.frontendPath + "/index.html").toString();
+        indexContents = fs.readFileSync(`${config_1.ServerConfig.frontendPath}/index.html`).toString();
     }
     catch (e) {
         util_1.logger.debug(e);
@@ -238,7 +238,7 @@ function testBackendStartup(username) {
         args.push(config_1.ServerConfig.baseFolderTemplate.replace("{username}", username));
         util_1.logger.debug(`running sudo ${args.join(" ")}`);
         // Use same stdout and stderr stream for the backend process
-        const backendProcess = (0, child_process_1.spawn)("sudo", args, { stdio: "inherit" });
+        const backendProcess = (0, node_child_process_1.spawn)("sudo", args, { stdio: "inherit" });
         yield (0, util_1.delay)(2000);
         if (backendProcess.signalCode) {
             throw new Error(`Backend process terminated with code ${backendProcess.signalCode}. Please check your sudoers config, processCommand option and additionalArgs section`);
@@ -251,7 +251,7 @@ function testBackendStartup(username) {
         wsClient.on("connect", () => {
             wsConnected = true;
         });
-        wsClient.on("connectFailed", (e) => {
+        wsClient.on("connectFailed", e => {
             util_1.logger.debug(e);
         });
         wsClient.connect(`ws://localhost:${port}`);
@@ -272,7 +272,7 @@ function testKillScript(username, existingProcess) {
         }
         const args = ["-u", `${username}`, config_1.ServerConfig.killCommand, `${existingProcess.pid}`];
         util_1.logger.debug(`running sudo ${args.join(" ")}`);
-        const res = (0, child_process_1.spawnSync)("sudo", args, { encoding: 'utf8' });
+        const res = (0, node_child_process_1.spawnSync)("sudo", args, { encoding: "utf8" });
         if (res.error) {
             util_1.logger.debug(res.error);
             util_1.logger.debug(`stdout:\t${res.stdout}`);

package/dist/database.js

@@ -14,13 +14,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.databaseRouter = void 0;
 exports.initDB = initDB;
-const express_1 = __importDefault(require("express"));
 const ajv_1 = __importDefault(require("ajv"));
 const ajv_formats_1 = __importDefault(require("ajv-formats"));
+const express_1 = __importDefault(require("express"));
 const mongodb_1 = require("mongodb");
 const auth_1 = require("./auth");
-const util_1 = require("./util");
 const config_1 = require("./config");
+const util_1 = require("./util");
 const PREFERENCE_SCHEMA_VERSION = 2;
 const LAYOUT_SCHEMA_VERSION = 2;
 const SNIPPET_SCHEMA_VERSION = 1;
@@ -75,13 +75,17 @@ function initDB() {
                 preferenceCollection = yield createOrGetCollection(db, "preferences");
                 workspacesCollection = yield createOrGetCollection(db, "workspaces");
                 // Remove any existing validation in preferences collection
-                yield db.command({ collMod: "preferences", validator: {}, validationLevel: "off" });
+                yield db.command({
+                    collMod: "preferences",
+                    validator: {},
+                    validationLevel: "off"
+                });
                 // Update collection indices if necessary
                 yield updateUsernameIndex(layoutsCollection, false);
                 yield updateUsernameIndex(snippetsCollection, false);
                 yield updateUsernameIndex(workspacesCollection, false);
                 yield updateUsernameIndex(preferenceCollection, true);
-                util_1.logger.info(`Connected to ${client.options.dbName} on ${client.options.hosts} (Authenticated: ${client.options.credentials ? 'Yes' : 'No'})`);
+                util_1.logger.info(`Connected to ${client.options.dbName} on ${client.options.hosts} (Authenticated: ${client.options.credentials ? "Yes" : "No"})`);
             }
             catch (err) {
                 util_1.logger.debug(err);
@@ -108,11 +112,13 @@ function handleGetPreferences(req, res, next) {
             if (doc) {
                 const isValid = validatePreferences(doc);
                 if (!isValid) {
-                    util_1.logger.warning(`Returning invalid preferences:\n${validatePreferences.errors}`);
+                    const errors = JSON.stringify(validatePreferences.errors);
+                    util_1.logger.warning(`Returning invalid preferences:\n${errors}`);
                 }
                 res.json({ success: true, preferences: doc });
             }
             else {
+                util_1.logger.debug(`No preferences found for user ${req.username}`);
                 res.json({ success: true, preferences: {} });
             }
         }
@@ -139,7 +145,8 @@ function handleSetPreferences(req, res, next) {
         update.version = PREFERENCE_SCHEMA_VERSION;
         const validUpdate = validatePreferences(update);
         if (!validUpdate) {
-            util_1.logger.warning(`Rejecting invalid preference update:\n${validatePreferences.errors}`);
+            const errors = JSON.stringify(validatePreferences.errors);
+            util_1.logger.warning(`Rejecting invalid preference update:\n${errors}`);
             return next({ statusCode: 400, message: "Invalid preference update" });
         }
         try {
@@ -211,7 +218,8 @@ function handleGetLayouts(req, res, next) {
                 if (entry.name && entry.layout) {
                     const isValid = validateLayout(entry.layout);
                     if (!isValid) {
-                        util_1.logger.warning(`Returning invalid layout '${entry.name}':\n${validateLayout.errors}`);
+                        const errors = JSON.stringify(validateLayout.errors);
+                        util_1.logger.warning(`Returning invalid layout '${entry.name}':\n${errors}`);
                     }
                     layouts[entry.name] = entry.layout;
                 }
@@ -241,7 +249,8 @@ function handleSetLayout(req, res, next) {
         }
         const validUpdate = validateLayout(layout);
         if (!validUpdate) {
-            util_1.logger.warning(`Rejecting invalid layout update:\n${validateLayout.errors}`);
+            const errors = JSON.stringify(validateLayout.errors);
+            util_1.logger.warning(`Rejecting invalid layout update:\n${errors}`);
             return next({ statusCode: 400, message: "Invalid layout update" });
         }
         try {
@@ -270,7 +279,10 @@ function handleClearLayout(req, res, next) {
         }
         const layoutName = (_a = req.body) === null || _a === void 0 ? void 0 : _a.layoutName;
         try {
-            const deleteResult = yield layoutsCollection.deleteOne({ username: req.username, name: layoutName });
+            const deleteResult = yield layoutsCollection.deleteOne({
+                username: req.username,
+                name: layoutName
+            });
             if (deleteResult.acknowledged) {
                 res.json({ success: true });
             }
@@ -299,7 +311,8 @@ function handleGetSnippets(req, res, next) {
                 if (entry.name && entry.snippet) {
                     const isValid = validateSnippet(entry.snippet);
                     if (!isValid) {
-                        util_1.logger.warning(`Returning invalid snippet '${entry.name}':\n${validateSnippet.errors}`);
+                        const errors = JSON.stringify(validateSnippet.errors);
+                        util_1.logger.warning(`Returning invalid snippet '${entry.name}':\n${errors}`);
                     }
                     snippets[entry.name] = entry.snippet;
                 }
@@ -329,7 +342,8 @@ function handleSetSnippet(req, res, next) {
         }
         const validUpdate = validateSnippet(snippet);
         if (!validUpdate) {
-            util_1.logger.error(`Rejecting invalid snippet update:\n${validateSnippet.errors}`);
+            const errors = JSON.stringify(validateSnippet.errors);
+            util_1.logger.error(`Rejecting invalid snippet update:\n${errors}`);
             return next({ statusCode: 400, message: "Invalid snippet update" });
         }
         try {
@@ -358,7 +372,10 @@ function handleClearSnippet(req, res, next) {
         }
         const snippetName = (_a = req.body) === null || _a === void 0 ? void 0 : _a.snippetName;
         try {
-            const deleteResult = yield snippetsCollection.deleteOne({ username: req.username, name: snippetName });
+            const deleteResult = yield snippetsCollection.deleteOne({
+                username: req.username,
+                name: snippetName
+            });
             if (deleteResult.acknowledged) {
                 res.json({ success: true });
             }
@@ -374,7 +391,7 @@ function handleClearSnippet(req, res, next) {
 }
 function handleClearWorkspace(req, res, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         if (!req.username) {
             return next({ statusCode: 403, message: "Invalid username" });
         }
@@ -383,9 +400,12 @@ function handleClearWorkspace(req, res, next) {
         }
         const workspaceName = (_a = req.body) === null || _a === void 0 ? void 0 : _a.workspaceName;
         // TODO: handle CRUD with workspace ID instead of name
-        const workspaceId = (_b = req.body) === null || _b === void 0 ? void 0 : _b.id;
+        // const workspaceId = req.body?.id;
         try {
-            const deleteResult = yield workspacesCollection.deleteOne({ username: req.username, name: workspaceName });
+            const deleteResult = yield workspacesCollection.deleteOne({
+                username: req.username,
+                name: workspaceName
+            });
             if (deleteResult.acknowledged) {
                 res.json({ success: true });
             }
@@ -410,7 +430,10 @@ function handleGetWorkspaceList(req, res, next) {
         }
         try {
             const workspaceList = yield workspacesCollection.find({ username: req.username }, { projection: { _id: 1, name: 1, "workspace.date": 1 } }).toArray();
-            const workspaces = (_a = workspaceList === null || workspaceList === void 0 ? void 0 : workspaceList.map(w => { var _a; return (Object.assign(Object.assign({}, w), { id: w._id, date: (_a = w.workspace) === null || _a === void 0 ? void 0 : _a.date })); })) !== null && _a !== void 0 ? _a : [];
+            const workspaces = (_a = workspaceList === null || workspaceList === void 0 ? void 0 : workspaceList.map(w => {
+                var _a;
+                return (Object.assign(Object.assign({}, w), { id: w._id.toString(), date: (_a = w.workspace) === null || _a === void 0 ? void 0 : _a.date }));
+            })) !== null && _a !== void 0 ? _a : [];
             res.json({ success: true, workspaces });
         }
         catch (err) {
@@ -437,10 +460,11 @@ function handleGetWorkspaceByName(req, res, next) {
                 return next({ statusCode: 404, message: "Workspace not found" });
             }
             else {
-                const workspace = Object.assign({ id: queryResult._id, name: queryResult.name, editable: true }, queryResult.workspace);
+                const workspace = Object.assign({ id: queryResult._id.toString(), name: queryResult.name, editable: true }, queryResult.workspace);
                 const isValid = validateWorkspace(workspace);
                 if (!isValid) {
-                    util_1.logger.warning(`Returning invalid workspace '${workspace.name}':\n${validateWorkspace.errors}`);
+                    const errors = JSON.stringify(validateWorkspace.errors);
+                    util_1.logger.warning(`Returning invalid workspace '${workspace.name}':\n${errors}`);
                 }
                 res.json({ success: true, workspace: workspace });
             }
@@ -465,7 +489,9 @@ function handleGetWorkspaceByKey(req, res, next) {
         }
         try {
             const objectId = Buffer.from(req.params.key, "base64url").toString("hex");
-            const queryResult = yield workspacesCollection.findOne({ _id: new mongodb_1.ObjectId(objectId) });
+            const queryResult = yield workspacesCollection.findOne({
+                _id: new mongodb_1.ObjectId(objectId)
+            });
             if (!(queryResult === null || queryResult === void 0 ? void 0 : queryResult.workspace)) {
                 return next({ statusCode: 404, message: "Workspace not found" });
             }
@@ -473,10 +499,11 @@ function handleGetWorkspaceByKey(req, res, next) {
                 return next({ statusCode: 403, message: "Workspace not accessible" });
             }
             else {
-                const workspace = Object.assign({ id: queryResult._id, name: queryResult.name, editable: queryResult.username === req.username }, queryResult.workspace);
+                const workspace = Object.assign({ id: queryResult._id.toString(), name: queryResult.name, editable: queryResult.username === req.username }, queryResult.workspace);
                 const isValid = validateWorkspace(workspace);
                 if (!isValid) {
-                    util_1.logger.warning(`Returning invalid workspace '${workspace.name}':\n${validateWorkspace.errors}`);
+                    const errors = JSON.stringify(validateWorkspace.errors);
+                    util_1.logger.warning(`Returning invalid workspace '${workspace.name}':\n${errors}`);
                 }
                 res.json({ success: true, workspace: workspace });
             }
@@ -504,7 +531,8 @@ function handleSetWorkspace(req, res, next) {
         }
         const validUpdate = validateWorkspace(workspace);
         if (!validUpdate) {
-            util_1.logger.error(`Rejecting invalid workspace update:\n${validateWorkspace.errors}`);
+            const errors = JSON.stringify(validateWorkspace.errors);
+            util_1.logger.error(`Rejecting invalid workspace update:\n${errors}`);
             return next({ statusCode: 400, message: "Invalid workspace update" });
         }
         try {

package/dist/index.js

@@ -46,22 +46,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const express_1 = __importDefault(require("express"));
+const fs = __importStar(require("node:fs"));
+const http = __importStar(require("node:http"));
+const path = __importStar(require("node:path"));
+const url = __importStar(require("node:url"));
 const bodyParser = __importStar(require("body-parser"));
-const express_bearer_token_1 = __importDefault(require("express-bearer-token"));
+const compression_1 = __importDefault(require("compression"));
 const cookie_parser_1 = __importDefault(require("cookie-parser"));
-const http_proxy_1 = __importDefault(require("http-proxy"));
-const http = __importStar(require("http"));
-const url = __importStar(require("url"));
 const cors_1 = __importDefault(require("cors"));
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
-const compression_1 = __importDefault(require("compression"));
-const config_1 = require("./config");
-const serverHandlers_1 = require("./serverHandlers");
+const express_1 = __importDefault(require("express"));
+const express_bearer_token_1 = __importDefault(require("express-bearer-token"));
+const http_proxy_1 = __importDefault(require("http-proxy"));
 const auth_1 = require("./auth");
-const database_1 = require("./database");
+const config_1 = require("./config");
 const controllerTests_1 = require("./controllerTests");
+const database_1 = require("./database");
+const serverHandlers_1 = require("./serverHandlers");
 const util_1 = require("./util");
 if (config_1.testUser) {
     (0, controllerTests_1.runTests)(config_1.testUser).then(() => {
@@ -74,7 +74,7 @@ if (config_1.testUser) {
     });
 }
 else {
-    let app = (0, express_1.default)();
+    const app = (0, express_1.default)();
     app.use(bodyParser.urlencoded({ extended: true }));
     app.use((0, cookie_parser_1.default)());
     app.use((0, express_bearer_token_1.default)());
@@ -85,7 +85,7 @@ else {
     app.use("/api/auth", bodyParser.json(), auth_1.authRouter);
     app.use("/api/server", bodyParser.json(), serverHandlers_1.serverRouter);
     app.use("/api/database", bodyParser.json(), database_1.databaseRouter);
-    app.use("/config", (req, res) => {
+    app.use("/config", (_req, res) => {
         return res.json(config_1.RuntimeConfig);
     });
     // Prevent caching of the frontend HTML code
@@ -96,7 +96,9 @@ else {
     };
     if (config_1.ServerConfig.frontendPath) {
         util_1.logger.info(`Serving CARTA frontend from ${config_1.ServerConfig.frontendPath}`);
-        app.use("/", express_1.default.static(config_1.ServerConfig.frontendPath, { setHeaders: staticHeaderHandler }));
+        app.use("/", express_1.default.static(config_1.ServerConfig.frontendPath, {
+            setHeaders: staticHeaderHandler
+        }));
     }
     else {
         const frontendPackage = require("../node_modules/carta-frontend/package.json");
@@ -109,24 +111,24 @@ else {
         const isBannerSvg = config_1.ServerConfig.dashboard.bannerImage.toLowerCase().endsWith(".svg");
         const bannerDataBase64 = fs.readFileSync(config_1.ServerConfig.dashboard.bannerImage, "base64");
         if (isBannerSvg) {
-            bannerDataUri = "data:image/svg+xml;base64," + bannerDataBase64;
+            bannerDataUri = `data:image/svg+xml;base64,${bannerDataBase64}`;
         }
         else {
-            bannerDataUri = "data:image/png;base64," + bannerDataBase64;
+            bannerDataUri = `data:image/png;base64,${bannerDataBase64}`;
         }
     }
     app.get("/frontend", (req, res) => {
         var _a, _b, _c;
         const queryString = (_a = url.parse(req.url, false)) === null || _a === void 0 ? void 0 : _a.query;
         if (queryString) {
-            return res.redirect(((_b = config_1.ServerConfig.serverAddress) !== null && _b !== void 0 ? _b : "") + "/?" + queryString);
+            return res.redirect(`${(_b = config_1.ServerConfig.serverAddress) !== null && _b !== void 0 ? _b : ""}/?${queryString}`);
         }
         else {
             return res.redirect((_c = config_1.ServerConfig.serverAddress) !== null && _c !== void 0 ? _c : "");
         }
     });
     const packageJson = require(path.join(__dirname, "../package.json"));
-    app.get("/dashboard", (req, res) => {
+    app.get("/dashboard", (_req, res) => {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         res.render("templated", {
             googleClientId: (_a = config_1.ServerConfig.authProviders.google) === null || _a === void 0 ? void 0 : _a.clientId,
@@ -147,11 +149,10 @@ else {
     const backendProxy = http_proxy_1.default.createServer({ ws: true });
     app.post("/api/scripting/*", auth_1.authGuard, (0, serverHandlers_1.createScriptingProxyHandler)(backendProxy));
     // Simplified error handling
-    app.use((err, req, res, next) => {
-        err.statusCode = err.statusCode || 500;
-        err.status = err.status || "error";
-        res.status(err.statusCode).json({
-            status: err.status,
+    app.use((err, _req, res, _next) => {
+        var _a, _b;
+        res.status((_a = err.statusCode) !== null && _a !== void 0 ? _a : 500).json({
+            status: (_b = err.status) !== null && _b !== void 0 ? _b : "error",
             message: err.message
         });
     });