@saltcorn/server 0.8.0-beta.4 → 0.8.0

package/routes/files.js

@@ -18,7 +18,11 @@ const { isAdmin, error_catcher, setTenant } = require("./utils.js");
 const { h1, div, text } = require("@saltcorn/markup/tags");
 const { editRoleForm, fileUploadForm } = require("../markup/forms.js");
 const { strictParseInt } = require("@saltcorn/data/plugin-helper");
-const { send_files_page, config_fields_form, save_config_from_form } = require("../markup/admin");
+const {
+  send_files_page,
+  config_fields_form,
+  save_config_from_form,
+} = require("../markup/admin");
 const fs = require("fs");
 const path = require("path");
 
@@ -58,31 +62,33 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     // todo limit select from file by 10 or 20
-    const { dir } = req.query
-    const safeDir = File.normalise(dir || "/")
+    const { dir } = req.query;
+    const safeDir = File.normalise(dir || "/");
     const rows = await File.find({ folder: dir }, { orderBy: "filename" });
     const roles = await User.get_roles();
     if (safeDir && safeDir !== "/" && safeDir !== ".") {
-      let dirname = path.dirname(safeDir)
-      if (dirname === ".") dirname = "/"
-      rows.unshift(new File({
-        filename: "..",
-        location: dirname,
-        isDirectory: true,
-        mime_super: "",
-        mime_sub: "",
-      }))
+      let dirname = path.dirname(safeDir);
+      if (dirname === ".") dirname = "/";
+      rows.unshift(
+        new File({
+          filename: "..",
+          location: dirname,
+          isDirectory: true,
+          mime_super: "",
+          mime_sub: "",
+        })
+      );
     }
     if (req.xhr) {
       for (const file of rows) {
-        file.location = file.path_to_serve
+        file.location = file.path_to_serve;
       }
-      const directories = await File.allDirectories()
+      const directories = await File.allDirectories();
       for (const file of directories) {
-        file.location = file.path_to_serve
+        file.location = file.path_to_serve;
       }
-      res.json({ files: rows, roles, directories })
-      return
+      res.json({ files: rows, roles, directories });
+      return;
     }
     send_files_page({
       res,
@@ -90,7 +96,7 @@ router.get(
       headers: [
         {
           script: `/static_assets/${db.connectObj.version_tag}/bundle.js`,
-          defer: true
+          defer: true,
         },
         {
           css: `/static_assets/${db.connectObj.version_tag}/bundle.css`,
@@ -122,7 +128,10 @@ router.get(
     const serve_path = req.params[0];
     const file = await File.findOne(serve_path);
 
-    if (file && (role <= file.min_role_read || (user_id && user_id === file.user_id))) {
+    if (
+      file &&
+      (role <= file.min_role_read || (user_id && user_id === file.user_id))
+    ) {
       res.type(file.mimetype);
       if (file.s3_store) s3storage.serveObject(file, res, true);
       else res.download(file.location, file.filename);
@@ -150,7 +159,10 @@ router.get(
     //if (typeof strictParseInt(id) !== "undefined")
     const file = await File.findOne(serve_path);
 
-    if (file && (role <= file.min_role_read || (user_id && user_id === file.user_id))) {
+    if (
+      file &&
+      (role <= file.min_role_read || (user_id && user_id === file.user_id))
+    ) {
       res.type(file.mimetype);
       const cacheability = file.min_role_read === 10 ? "public" : "private";
       res.set("Cache-Control", `${cacheability}, max-age=86400`);
@@ -178,10 +190,12 @@ router.get(
     const { width_str, height_str } = req.params;
     const serve_path = req.params[0];
 
-
     const file = await File.findOne(serve_path);
 
-    if (file && (role <= file.min_role_read || (user_id && user_id === file.user_id))) {
+    if (
+      file &&
+      (role <= file.min_role_read || (user_id && user_id === file.user_id))
+    ) {
       res.type(file.mimetype);
       const cacheability = file.min_role_read === 10 ? "public" : "private";
       res.set("Cache-Control", `${cacheability}, max-age=86400`);
@@ -189,13 +203,16 @@ router.get(
       if (file.s3_store) s3storage.serveObject(file, res, false);
       else {
         const width = strictParseInt(width_str);
-        const height = height_str && height_str !== "0"
-          ? strictParseInt(height_str) : null;
+        const height =
+          height_str && height_str !== "0" ? strictParseInt(height_str) : null;
         if (!width) {
           res.sendFile(file.location);
           return;
         }
-        const basenm = path.join(path.dirname(file.location), '_resized_' + path.basename(file.location))
+        const basenm = path.join(
+          path.dirname(file.location),
+          "_resized_" + path.basename(file.location)
+        );
         const fnm = `${basenm}_w${width}${height ? `_h${height}` : ""}`;
         if (!fs.existsSync(fnm)) {
           await resizer({
@@ -233,15 +250,14 @@ router.post(
 
     if (roleRow && file) {
       await file.set_role(role);
-
     }
 
-
-    res.redirect(file ? `/files?dir=${encodeURIComponent(file.current_folder)}` : "/files");
+    res.redirect(
+      file ? `/files?dir=${encodeURIComponent(file.current_folder)}` : "/files"
+    );
   })
 );
 
-
 router.post(
   "/move/*",
   isAdmin,
@@ -254,10 +270,12 @@ router.post(
       await file.move_to_dir(new_path);
     }
     if (req.xhr) {
-      res.json({ success: "ok" })
-      return
+      res.json({ success: "ok" });
+      return;
     }
-    res.redirect(file ? `/files?dir=${encodeURIComponent(file.current_folder)}` : "/files");
+    res.redirect(
+      file ? `/files?dir=${encodeURIComponent(file.current_folder)}` : "/files"
+    );
   })
 );
 
@@ -278,7 +296,6 @@ router.post(
     await file.rename(filename);
 
     res.redirect(`/files?dir=${encodeURIComponent(file.current_folder)}`);
-
   })
 );
 
@@ -286,7 +303,7 @@ router.post(
   "/new-folder",
   isAdmin,
   error_catcher(async (req, res) => {
-    const { name, folder } = req.body
+    const { name, folder } = req.body;
     await File.new_folder(name, folder);
 
     res.json({ success: "ok" });
@@ -303,11 +320,11 @@ router.post(
   "/upload",
   setTenant,
   error_catcher(async (req, res) => {
-    let { folder } = req.body
+    let { folder } = req.body;
     let jsonResp = {};
     const min_role_upload = getState().getConfig("min_role_upload", 1);
     const role = req.user && req.user.id ? req.user.role_id : 10;
-    let file_for_redirect
+    let file_for_redirect;
     if (role > +min_role_upload) {
       if (!req.xhr) req.flash("warning", req.__("Not authorized"));
       else jsonResp = { error: "Not authorized" };
@@ -323,7 +340,7 @@ router.post(
         folder ? File.normalise(folder) : undefined
       );
       const many = Array.isArray(f);
-      file_for_redirect = many ? f[0] : f
+      file_for_redirect = many ? f[0] : f;
       if (!req.xhr)
         req.flash(
           "success",
@@ -346,10 +363,11 @@ router.post(
         };
     }
     if (!req.xhr)
-      res.redirect(!file_for_redirect
-        ? '/files'
-        : `/files?dir=${encodeURIComponent(file_for_redirect.current_folder)}`);
-
+      res.redirect(
+        !file_for_redirect
+          ? "/files"
+          : `/files?dir=${encodeURIComponent(file_for_redirect.current_folder)}`
+      );
     else res.json(jsonResp);
   })
 );
@@ -438,7 +456,7 @@ router.post(
     const form = await storage_form(req);
     form.validate(req.body);
     if (form.hasErrors) {
-      send_admin_page({
+      send_files_page({
         res,
         req,
         active_sub: "Storage",
@@ -465,17 +483,17 @@ router.post(
  * @returns {Promise<Form>} form
  */
 const files_settings_form = async (req) => {
-    return await config_fields_form({
-        req,
-        field_names: [
-            "min_role_upload",
-            "file_accept_filter_default",
-            "file_upload_debug",
-            "file_upload_limit",
-            "file_upload_timeout",
-        ],
-        action: "/files/settings",
-    });
+  return await config_fields_form({
+    req,
+    field_names: [
+      "min_role_upload",
+      "file_accept_filter_default",
+      "file_upload_debug",
+      "file_upload_limit",
+      "file_upload_timeout",
+    ],
+    action: "/files/settings",
+  });
 };
 
 /**
@@ -484,21 +502,21 @@ const files_settings_form = async (req) => {
  * @memberof module:routes/admin~routes/adminRouter
  */
 router.get(
-    "/settings",
-    isAdmin,
-    error_catcher(async (req, res) => {
-        const form = await files_settings_form(req);
-        send_files_page({
-            res,
-            req,
-            active_sub: "Settings",
-            contents: {
-                type: "card",
-                title: req.__("Files settings"),
-                contents: [renderForm(form, req.csrfToken())],
-            },
-        });
-    })
+  "/settings",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await files_settings_form(req);
+    send_files_page({
+      res,
+      req,
+      active_sub: "Settings",
+      contents: {
+        type: "card",
+        title: req.__("Files settings"),
+        contents: [renderForm(form, req.csrfToken())],
+      },
+    });
+  })
 );
 
 /**
@@ -507,29 +525,29 @@ router.get(
  * @memberof module:routes/admin~routes/adminRouter
  */
 router.post(
-    "/settings",
-    isAdmin,
-    error_catcher(async (req, res) => {
-        const form = await files_settings_form(req);
-        form.validate(req.body);
-        if (form.hasErrors) {
-            send_admin_page({
-                res,
-                req,
-                active_sub: "Settings",
-                contents: {
-                    type: "card",
-                    title: req.__("Files settings"),
-                    contents: [renderForm(form, req.csrfToken())],
-                },
-            });
-        } else {
-            await save_config_from_form(form);
-
-            if (!req.xhr) {
-                req.flash("success", req.__("Files settings updated"));
-                res.redirect("/files/settings");
-            } else res.json({ success: "ok" });
-        }
-    })
-);
+  "/settings",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const form = await files_settings_form(req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      send_files_page({
+        res,
+        req,
+        active_sub: "Settings",
+        contents: {
+          type: "card",
+          title: req.__("Files settings"),
+          contents: [renderForm(form, req.csrfToken())],
+        },
+      });
+    } else {
+      await save_config_from_form(form);
+
+      if (!req.xhr) {
+        req.flash("success", req.__("Files settings updated"));
+        res.redirect("/files/settings");
+      } else res.json({ success: "ok" });
+    }
+  })
+);

package/routes/homepage.js

@@ -481,7 +481,7 @@ const get_config_response = async (role_id, res, req) => {
           title: db_page.title,
           description: db_page.description,
           bodyClass: "page_" + db.sqlsanitize(homeCfg),
-        } || `${pagename} page`,
+        },
         contents
       );
     } else res.redirect(homeCfg);

package/routes/infoarch.js

@@ -113,7 +113,7 @@ router.get(
               {
                 label: req.__("Default"),
                 key: (r) =>
-                  !!r.is_default
+                  r.is_default
                     ? i({
                         class: "fas fa-check-circle text-success",
                       })

package/routes/list.js

@@ -51,7 +51,7 @@ router.get(
   isAdmin,
   error_catcher(async (req, res) => {
     const { tableName, id } = req.params;
-    const table = await Table.findOne({ name : tableName });
+    const table = await Table.findOne({ name: tableName });
 
     const fields = await table.getFields();
     var tfields = fields.map((f) => ({ label: f.label, key: f.listKey }));
@@ -99,7 +99,7 @@ router.post(
   isAdmin,
   error_catcher(async (req, res) => {
     const { tableName, id, _version } = req.params;
-    const table = await Table.findOne({ name : tableName });
+    const table = await Table.findOne({ name: tableName });
 
     const fields = await table.getFields();
     const row = await db.selectOne(`${db.sqlsanitize(table.name)}__history`, {
@@ -216,7 +216,7 @@ const arrangeIdFirst = (flds) => {
   const noId = flds.filter((f) => f.name !== "id");
   const id = flds.find((f) => f.name === "id");
   if (id) return [id, ...noId];
-  else return flds
+  else return flds;
 };
 
 /**
@@ -369,8 +369,9 @@ router.get(
                 })
               })   
               window.tabulator_table = new Tabulator("#jsGrid", {
-                  ajaxURL:"/api/${table.name}${table.versioned ? "?versioncount=on" : ""
-                  }",                   
+                  ajaxURL:"/api/${table.name}${
+                  table.versioned ? "?versioncount=on" : ""
+                }",                   
                   layout:"fitColumns", 
                   columns,
                   height:"100%",

package/routes/packs.js

@@ -335,8 +335,7 @@ router.post(
     const can_install = await can_install_pack(pack.pack);
 
     if (can_install.error) {
-      error = can_install.error;
-      req.flash("error", error);
+      req.flash("error", can_install.error);
       res.redirect(`/plugins`);
       return;
     } else if (can_install.warning) {

package/routes/pageedit.js

@@ -100,7 +100,7 @@ const pageBuilderData = async (req, context) => {
   const views = await View.find();
   const pages = await Page.find();
   const images = await File.find({ mime_super: "image" });
-  images.forEach(im => im.location = im.path_to_serve)
+  images.forEach((im) => (im.location = im.path_to_serve));
   const roles = await User.get_roles();
   const stateActions = getState().actions;
   const actions = [

package/routes/tag_entries.js

@@ -81,7 +81,7 @@ const formOptions = async (type, tag_id) => {
     case "triggers": {
       const ids = await tag.getTriggerIds();
       return {
-        triggers: (Trigger.find()).filter(
+        triggers: Trigger.find().filter(
           (value) => ids.indexOf(value.id) === -1
         ),
       };

package/routes/utils.js

@@ -218,7 +218,9 @@ const scan_for_page_title = (contents, viewname) => {
   try {
     scanstr =
       typeof contents === "string" ? contents : JSON.stringify(contents);
-  } catch {}
+  } catch {
+    //ignore
+  }
   if (scanstr.includes("<!--SCPT:")) {
     const start = scanstr.indexOf("<!--SCPT:");
     const end = scanstr.indexOf("-->", start);

package/s3storage.js

@@ -5,7 +5,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const fileUpload = require("express-fileupload");
 const { v4: uuidv4 } = require("uuid");
 const contentDisposition = require("content-disposition");
-
+const fs = require("fs");
 function createS3Client() {
   return new aws.S3({
     secretAccessKey: getState().getConfig("storage_s3_access_secret"),
@@ -52,19 +52,18 @@ module.exports = {
         createParentPath: true,
         tempFileDir: "/tmp/",
         // set to true - if you want to have debug
-        debug: getState().getConfig("file_upload_debug",false),
+        debug: getState().getConfig("file_upload_debug", false),
         //uriDecodeFileNames: true,
         //safeFileNames: true,
-        defCharset: 'utf8',
-        defParamCharset: 'utf8',
+        defCharset: "utf8",
+        defParamCharset: "utf8",
         // 0 - means no upload limit check
         limits: {
           fileSize: fileSizeLimit,
         },
         abortOnLimit: fileSizeLimit !== 0,
         // 0 - means no upload limit check
-        uploadTimeout: getState().getConfig("file_upload_timeout",0),
-
+        uploadTimeout: getState().getConfig("file_upload_timeout", 0),
       })(req, res, next);
     }
   },
@@ -146,7 +145,7 @@ module.exports = {
       // Forward the object
       s3.getObject(params)
         .on("httpHeaders", function (statusCode, headers) {
-          if (!!download)
+          if (download)
             res.set("Content-Disposition", contentDisposition(file.filename));
           res.set("Content-Length", headers["content-length"]);
           this.response.httpResponse.createUnbufferedStream().pipe(res);

package/serve.js

@@ -30,7 +30,11 @@ const { getConfig } = require("@saltcorn/data/models/config");
 const { migrate } = require("@saltcorn/data/migrate");
 const socketio = require("socket.io");
 const { createAdapter, setupPrimary } = require("@socket.io/cluster-adapter");
-const { setTenant, getSessionStore, get_tenant_from_req } = require("./routes/utils");
+const {
+  setTenant,
+  getSessionStore,
+  get_tenant_from_req,
+} = require("./routes/utils");
 const passport = require("passport");
 const { authenticate } = require("passport");
 const View = require("@saltcorn/data/models/view");
@@ -106,8 +110,8 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
     });
   }
   if (!getState()) {
-    console.error("no State for tenant", tenant)
-    return
+    console.error("no State for tenant", tenant);
+    return;
   }
   if (msg.refresh) getState()[`refresh_${msg.refresh}`](true);
   if (msg.createTenant) {
@@ -142,33 +146,33 @@ const workerDispatchMsg = ({ tenant, ...msg }) => {
  */
 const onMessageFromWorker =
   (masterState, { port, watchReaper, disableScheduler, pid }) =>
-    (msg) => {
-      //console.log("worker msg", typeof msg, msg);
-      if (msg === "Start" && !masterState.started) {
-        masterState.started = true;
-        runScheduler({
-          port,
-          watchReaper,
-          disableScheduler,
-          eachTenant,
-          auto_backup_now,
-          take_snapshot,
-        });
-        require("./systemd")({ port });
-        return true;
-      } else if (msg === "RestartServer") {
-        process.exit(0);
-        return true;
-      } else if (msg.tenant || msg.createTenant) {
-        ///ie from saltcorn
-        //broadcast
-        Object.entries(cluster.workers).forEach(([wpid, w]) => {
-          if (wpid !== pid) w.send(msg);
-        });
-        workerDispatchMsg(msg); //also master
-        return true;
-      }
-    };
+  (msg) => {
+    //console.log("worker msg", typeof msg, msg);
+    if (msg === "Start" && !masterState.started) {
+      masterState.started = true;
+      runScheduler({
+        port,
+        watchReaper,
+        disableScheduler,
+        eachTenant,
+        auto_backup_now,
+        take_snapshot,
+      });
+      require("./systemd")({ port });
+      return true;
+    } else if (msg === "RestartServer") {
+      process.exit(0);
+      return true;
+    } else if (msg.tenant || msg.createTenant) {
+      ///ie from saltcorn
+      //broadcast
+      Object.entries(cluster.workers).forEach(([wpid, w]) => {
+        if (wpid !== pid) w.send(msg);
+      });
+      workerDispatchMsg(msg); //also master
+      return true;
+    }
+  };
 
 module.exports =
   /**
@@ -381,7 +385,7 @@ const setupSocket = (...servers) => {
         } catch (err) {
           getState().log(1, `Socket join_room error: ${err.stack}`);
         }
-      }
+      };
       if (ten && ten !== "public") db.runWithTenant(ten, f);
       else f();
     });

package/systemd.js

@@ -5,9 +5,9 @@
 const fetch = require("node-fetch");
 
 /**
- * @param {number} interval 
- * @param {object} notify 
- * @param {object} opts 
+ * @param {number} interval
+ * @param {object} notify
+ * @param {object} opts
  * @param {string} opts.port
  * @returns {void}
  */
@@ -48,22 +48,24 @@ const watchDog = (interval, notify, { port }) => {
   }
 };
 
-module.exports = 
-/**
- * @function
- * @name "module.exports function"
- * @param {object} opts 
- */
-(opts) => {
-  try {
-    const notify = require("sd-notify");
-    notify.ready();
-    const watchdogInterval = notify.watchdogInterval();
-    if (watchdogInterval && watchdogInterval > 0) {
-      const interval = Math.floor(watchdogInterval / 2);
-      setInterval(() => {
-        watchDog(interval, notify, opts);
-      }, interval);
+module.exports =
+  /**
+   * @function
+   * @name "module.exports function"
+   * @param {object} opts
+   */
+  (opts) => {
+    try {
+      const notify = require("sd-notify");
+      notify.ready();
+      const watchdogInterval = notify.watchdogInterval();
+      if (watchdogInterval && watchdogInterval > 0) {
+        const interval = Math.floor(watchdogInterval / 2);
+        setInterval(() => {
+          watchDog(interval, notify, opts);
+        }, interval);
+      }
+    } catch {
+      //ignore, systemd lib not installed
     }
-  } catch {}
-};
+  };