adminforth 1.0.8 → 1.0.10

package/dataConnectors/postgres.js

@@ -11,6 +11,11 @@ class PostgresConnector {
         });
         (async () => {
             await this.db.connect();
+            this.db.on('error', (err) => {
+                console.log('Postgres error: ', err.message, err.stack)
+                this.db.end();
+                this.db = new PostgresConnector({ url }).db;
+             });
         })();
     }
 

package/modules/codeInjector.js

@@ -6,17 +6,19 @@ import { promisify } from 'util';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import crypto from 'crypto';
+import os from 'os';
 
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.join(path.dirname(__filename), '..');
 
-// const SPA_TMP_PATH = path.join(__dirname, 'spa_tmp');
+let TMP_DIR;
 
-// folder in /tmp directory to store SPA sources
-const SPA_TMP_PATH = path.join('/tmp', 'adminforth', 'spa_tmp');
-// make sure the folder exists
-fsExtra.ensureDirSync(SPA_TMP_PATH);
+try {
+  TMP_DIR = os.tmpdir();
+} catch (e) {
+  TMP_DIR = '/tmp';
+}
 
 
 const execAsync = promisify(exec);
@@ -27,6 +29,9 @@ function hashify(obj) {
 }
 
 class CodeInjector {
+
+  static SPA_TMP_PATH = path.join(TMP_DIR, 'adminforth', 'spa_tmp');
+
   constructor(adminforth) {
     this.adminforth = adminforth;
   }
@@ -65,7 +70,7 @@ class CodeInjector {
 
   async rmTmpDir() {
     // remove spa_tmp folder if it is exists
-    const spaTmpPath = SPA_TMP_PATH;
+    const spaTmpPath = CodeInjector.SPA_TMP_PATH;
     try {
       await fs.promises.rm(spaTmpPath, { recursive: true });
     } catch (e) {
@@ -74,7 +79,13 @@ class CodeInjector {
   }
 
   async prepareSources({ filesUpdated, verbose = false }) {
-    const spaTmpPath = SPA_TMP_PATH;
+    const spaTmpPath = CodeInjector.SPA_TMP_PATH;
+    // check SPA_TMP_PATH exists and create if not
+    try {
+      await fs.promises.access(spaTmpPath, fs.constants.F_OK);
+    } catch (e) {
+      await fs.promises.mkdir(spaTmpPath, { recursive: true });
+    }
 
     const customFiles = [];
     const icons = [];
@@ -282,10 +293,11 @@ class CodeInjector {
     await this.watchForReprepare();
     console.log('AdminForth bundling');
     
-    const cwd = SPA_TMP_PATH;
+    const cwd = CodeInjector.SPA_TMP_PATH;
 
     if (!hotReload) {
-      await this.runNpmShell({command: 'run build', verbose, cwd});
+      // probably add option to build with tsh check (plain 'build')
+      await this.runNpmShell({command: 'run build-only', verbose, cwd});
     } else {
       const command = 'run dev';
       console.time(`Running npm ${command}...`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "index.js",
   "scripts": {

package/servers/express.js

@@ -2,6 +2,7 @@
 import path from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
+import CodeInjector from '../modules/codeInjector.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -104,11 +105,11 @@ class ExpressServer {
 
     } else {
       this.expressApp.get(`${slashedPrefix}assets/*`, (req, res) => {
-        res.sendFile(path.join(__dirname, '..', 'spa', 'dist', replaceAtStart(req.url, prefix)))
+        res.sendFile(path.join(CodeInjector.SPA_TMP_PATH, 'dist', replaceAtStart(req.url, prefix)))
       })
 
       this.expressApp.get(`${prefix}*`, async (req, res) => {
-        const fullPath = path.join(__dirname, '..', 'spa', 'dist', 'index.html');
+        const fullPath = path.join(CodeInjector.SPA_TMP_PATH, 'dist', 'index.html');
         
         let fileExists = true;
         try { 
@@ -116,7 +117,6 @@ class ExpressServer {
         } catch (e) {
           fileExists = false;
         }
-        console.log('fileExists', fileExists);
         if (!fileExists) {
           res.status(500).send(respondNoServer(`${this.adminforth.config.brandName} is still warming up`, 'Please wait a moment...'));
           return;