adminforth 1.0.35 → 1.0.37

package/auth.ts

@@ -43,7 +43,11 @@ class AdminForthAuth {
       const decoded = jwt.verify(jwtToken, secret);
       return decoded;
     } catch (err) {
-      console.error('Failed to verify JWT token', err);
+      if (err.name === 'JsonWebTokenError') {
+        console.error('Token expired', err.message);
+      } else {
+        console.error('Failed to verify JWT token', err);
+      }
       return null;
     }
   }

package/dataConnectors/mongo.ts

@@ -41,6 +41,10 @@ class MongoConnector {
 
     async discoverFields(resource) {
         return resource.columns.reduce((acc, col) => {
+            if (!col.type) {
+                throw new Error(`Type is not defined for column ${col.name}`);
+            }
+
             acc[col.name] = {
                 name: col.name,
                 type: col.type,

package/dist/auth.js

@@ -46,7 +46,12 @@ class AdminForthAuth {
             return decoded;
         }
         catch (err) {
-            console.error('Failed to verify JWT token', err);
+            if (err.name === 'JsonWebTokenError') {
+                console.error('Token expired', err.message);
+            }
+            else {
+                console.error('Failed to verify JWT token', err);
+            }
             return null;
         }
     }

package/dist/dataConnectors/mongo.js

@@ -45,6 +45,9 @@ class MongoConnector {
     discoverFields(resource) {
         return __awaiter(this, void 0, void 0, function* () {
             return resource.columns.reduce((acc, col) => {
+                if (!col.type) {
+                    throw new Error(`Type is not defined for column ${col.name}`);
+                }
                 acc[col.name] = {
                     name: col.name,
                     type: col.type,

package/dist/modules/codeInjector.js

@@ -13,11 +13,9 @@ import filewatcher from 'filewatcher';
 import { exec, spawn } from 'child_process';
 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), '..');
+import { ADMIN_FORTH_ABSOLUTE_PATH } from './utils.js';
 let TMP_DIR;
 try {
     TMP_DIR = os.tmpdir();
@@ -74,13 +72,12 @@ class CodeInjector {
     prepareSources(_a) {
         return __awaiter(this, arguments, void 0, function* ({ filesUpdated, verbose = false }) {
             var _b, _c, _d, _e, _f, _g;
-            const spaTmpPath = CodeInjector.SPA_TMP_PATH;
             // check SPA_TMP_PATH exists and create if not
             try {
-                yield fs.promises.access(spaTmpPath, fs.constants.F_OK);
+                yield fs.promises.access(CodeInjector.SPA_TMP_PATH, fs.constants.F_OK);
             }
             catch (e) {
-                yield fs.promises.mkdir(spaTmpPath, { recursive: true });
+                yield fs.promises.mkdir(CodeInjector.SPA_TMP_PATH, { recursive: true });
             }
             const icons = [];
             let routes = '';
@@ -102,18 +99,11 @@ class CodeInjector {
                 });
             };
             collectAssetsFromMenu(this.adminforth.config.menu);
-            // create spa_tmp folder, or ignore if it exists
-            try {
-                yield fs.promises.mkdir(spaTmpPath);
-            }
-            catch (e) {
-                // ignore
-            }
             if (filesUpdated) {
                 // copy only updated files
                 yield Promise.all(filesUpdated.map((file) => __awaiter(this, void 0, void 0, function* () {
-                    const src = path.join(__dirname, 'spa', file);
-                    const dest = path.join(spaTmpPath, file);
+                    const src = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa', file);
+                    const dest = path.join(CodeInjector.SPA_TMP_PATH, file);
                     yield fsExtra.copy(src, dest);
                     if (process.env.HEAVY_DEBUG) {
                         console.log('🪲 await fsExtra.copy filtering', src, dest);
@@ -122,15 +112,16 @@ class CodeInjector {
             }
             else {
                 if (process.env.HEAVY_DEBUG) {
-                    console.log(`🪲 await fsExtra.copy from ${path.join(__dirname, 'spa')}, ${spaTmpPath}`);
+                    console.log(`🪲 await fsExtra.copy from ${path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa')}, ${CodeInjector.SPA_TMP_PATH}`);
                 }
-                yield fsExtra.copy(path.join(__dirname, 'spa'), spaTmpPath, {
+                yield fsExtra.copy(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa'), CodeInjector.SPA_TMP_PATH, {
                     filter: (src) => {
                         if (process.env.HEAVY_DEBUG) {
                             console.log('🪲 await fsExtra.copy filtering', src);
                         }
                         return !src.includes('/adminforth/spa/node_modules') && !src.includes('/adminforth/spa/dist');
                     },
+                    overwrite: true,
                 });
                 // copy whole custom directory
                 if ((_b = this.adminforth.config.customization) === null || _b === void 0 ? void 0 : _b.customComponentsDir) {
@@ -176,7 +167,7 @@ class CodeInjector {
                 imports += `import addCustomUses from '${this.adminforth.config.customization.vueUsesFile}';\n`;
             }
             // inject that code into spa_tmp/src/App.vue
-            const appVuePath = path.join(spaTmpPath, 'src', 'main.ts');
+            const appVuePath = path.join(CodeInjector.SPA_TMP_PATH, 'src', 'main.ts');
             let appVueContent = yield fs.promises.readFile(appVuePath, 'utf-8');
             appVueContent = appVueContent.replace('/* IMPORTANT:ADMINFORTH IMPORTS */', imports);
             appVueContent = appVueContent.replace('/* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */', iconComponents + '\n');
@@ -198,12 +189,12 @@ class CodeInjector {
       //redirect to login 
       redirect: '/${homePagePath}'
     },\n`;
-            const routerVuePath = path.join(spaTmpPath, 'src', 'router', 'index.ts');
+            const routerVuePath = path.join(CodeInjector.SPA_TMP_PATH, 'src', 'router', 'index.ts');
             let routerVueContent = yield fs.promises.readFile(routerVuePath, 'utf-8');
             routerVueContent = routerVueContent.replace('/* IMPORTANT:ADMINFORTH ROUTES */', routes);
             yield fs.promises.writeFile(routerVuePath, routerVueContent);
             /* hash checking */
-            const spaPackageLockPath = path.join(spaTmpPath, 'package-lock.json');
+            const spaPackageLockPath = path.join(CodeInjector.SPA_TMP_PATH, 'package-lock.json');
             const spaPackageLock = JSON.parse(yield fs.promises.readFile(spaPackageLockPath, 'utf-8'));
             const spaLockHash = hashify(spaPackageLock);
             /* customPackageLock */
@@ -214,7 +205,7 @@ class CodeInjector {
             const usersLockHash = hashify(usersLock);
             const packagesNamesHash = hashify(packageNames);
             const fullHash = `${spaLockHash}::${packagesNamesHash}::${usersLockHash}`;
-            const hashPath = path.join(spaTmpPath, 'node_modules', '.adminforth_hash');
+            const hashPath = path.join(CodeInjector.SPA_TMP_PATH, 'node_modules', '.adminforth_hash');
             try {
                 const existingHash = yield fs.promises.readFile(hashPath, 'utf-8');
                 if (existingHash === fullHash) {
@@ -233,7 +224,7 @@ class CodeInjector {
                     console.log('Hash file does not exist, proceeding with npm ci/install');
                 }
             }
-            yield this.runNpmShell({ command: 'ci', verbose, cwd: spaTmpPath });
+            yield this.runNpmShell({ command: 'ci', verbose, cwd: CodeInjector.SPA_TMP_PATH });
             // get packages with version from customPackage
             const IGNORE_PACKAGES = ['tsx', 'typescript', 'express', 'nodemon'];
             const customPackgeNames = [...Object.keys(usersPackage.dependencies), ...Object.keys(usersPackage.devDependencies || [])]
@@ -245,14 +236,14 @@ class CodeInjector {
             }, []);
             if (packageNames.length) {
                 const npmInstallCommand = `install ${[...packageNames, ...customPackgeNames].join(' ')}`;
-                yield this.runNpmShell({ command: npmInstallCommand, cwd: spaTmpPath });
+                yield this.runNpmShell({ command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH });
             }
             yield fs.promises.writeFile(hashPath, fullHash);
         });
     }
     watchForReprepare(_a) {
         return __awaiter(this, arguments, void 0, function* ({ verbose }) {
-            const spaPath = path.join(__dirname, 'spa');
+            const spaPath = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa');
             // get list of all subdirectories in spa recursively
             const directories = [];
             const collectDirectories = (dir) => __awaiter(this, void 0, void 0, function* () {

package/dist/modules/utils.js

@@ -13,12 +13,12 @@ export function guessLabelFromName(name) {
         return name.split(/(?=[A-Z])/).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(' ');
     }
 }
-let package_json;
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.join(path.dirname(__filename), '..');
-console.log('📦 __filename', __dirname);
-console.log('📦 __dirname_orig', path.dirname(__filename));
-console.log('📦 __dirname', __dirname);
+let __dirname = path.join(path.dirname(__filename), '..');
+if (__dirname.endsWith('dist')) {
+    // in prod build we are in dist also
+    __dirname = path.join(__dirname, '..');
+}
 export const ADMIN_FORTH_ABSOLUTE_PATH = __dirname;
-package_json = JSON.parse(fs.readFileSync(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'package.json'), 'utf8'));
+const package_json = JSON.parse(fs.readFileSync(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'package.json'), 'utf8'));
 export const ADMINFORTH_VERSION = package_json.version;

package/dist/spa/spa/src/stores/core.ts

@@ -24,7 +24,7 @@ export const useCoreStore = defineStore('core', () => {
     }, {});
     config.value = resp.config;
     user.value = resp.user;
-    console.log('🌍 AdminForth version', resp.version);
+    console.log('🌍 AdminForth v', resp.version);
 
     // find homepage:true in menu recuresively
     

package/modules/codeInjector.ts

@@ -8,11 +8,9 @@ import { fileURLToPath } from 'url';
 import crypto from 'crypto';
 import os from 'os';
 import AdminForth from '../index.js';
+import { ADMIN_FORTH_ABSOLUTE_PATH } from './utils.js';
 
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.join(path.dirname(__filename), '..');
-
 let TMP_DIR;
 
 try {
@@ -83,12 +81,11 @@ class CodeInjector {
   }
 
   async prepareSources({ filesUpdated, verbose = false }: { filesUpdated?: string[], verbose?: boolean }) {
-    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);
+      await fs.promises.access(CodeInjector.SPA_TMP_PATH, fs.constants.F_OK);
     } catch (e) {
-      await fs.promises.mkdir(spaTmpPath, { recursive: true });
+      await fs.promises.mkdir(CodeInjector.SPA_TMP_PATH, { recursive: true });
     }
 
     const icons = [];
@@ -113,18 +110,11 @@ class CodeInjector {
     };
     collectAssetsFromMenu(this.adminforth.config.menu);
 
-    // create spa_tmp folder, or ignore if it exists
-    try {
-      await fs.promises.mkdir(spaTmpPath);
-    } catch (e) {
-      // ignore
-    }
-
     if (filesUpdated) {
       // copy only updated files
       await Promise.all(filesUpdated.map(async (file) => {
-        const src = path.join(__dirname, 'spa', file);
-        const dest = path.join(spaTmpPath, file);
+        const src = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa', file);
+        const dest = path.join(CodeInjector.SPA_TMP_PATH, file);
         await fsExtra.copy(src, dest);
         if (process.env.HEAVY_DEBUG) {
           console.log('🪲 await fsExtra.copy filtering', src, dest);
@@ -133,10 +123,10 @@ class CodeInjector {
       }));
     } else {
       if (process.env.HEAVY_DEBUG) {
-        console.log(`🪲 await fsExtra.copy from ${path.join(__dirname, 'spa')}, ${spaTmpPath}`);
+        console.log(`🪲 await fsExtra.copy from ${path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa')}, ${CodeInjector.SPA_TMP_PATH}`);
       }
 
-      await fsExtra.copy(path.join(__dirname, 'spa'), spaTmpPath, {
+      await fsExtra.copy(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa'), CodeInjector.SPA_TMP_PATH, {
         filter: (src) => {
           if (process.env.HEAVY_DEBUG) {
             console.log('🪲 await fsExtra.copy filtering', src);
@@ -144,6 +134,7 @@ class CodeInjector {
 
           return !src.includes('/adminforth/spa/node_modules') && !src.includes('/adminforth/spa/dist');
         },
+        overwrite: true,
       });
 
       // copy whole custom directory
@@ -198,7 +189,7 @@ class CodeInjector {
     }
 
     // inject that code into spa_tmp/src/App.vue
-    const appVuePath = path.join(spaTmpPath, 'src', 'main.ts');
+    const appVuePath = path.join(CodeInjector.SPA_TMP_PATH, 'src', 'main.ts');
     let appVueContent = await fs.promises.readFile(appVuePath, 'utf-8');
     appVueContent = appVueContent.replace('/* IMPORTANT:ADMINFORTH IMPORTS */', imports);
     appVueContent = appVueContent.replace('/* IMPORTANT:ADMINFORTH COMPONENT REGISTRATIONS */', iconComponents + '\n' );
@@ -227,14 +218,14 @@ class CodeInjector {
       //redirect to login 
       redirect: '/${homePagePath}'
     },\n`;
-    const routerVuePath = path.join(spaTmpPath, 'src', 'router', 'index.ts');
+    const routerVuePath = path.join(CodeInjector.SPA_TMP_PATH, 'src', 'router', 'index.ts');
     let routerVueContent = await fs.promises.readFile(routerVuePath, 'utf-8');
     routerVueContent = routerVueContent.replace('/* IMPORTANT:ADMINFORTH ROUTES */', routes);
     await fs.promises.writeFile(routerVuePath, routerVueContent);
     
 
     /* hash checking */
-    const spaPackageLockPath = path.join(spaTmpPath, 'package-lock.json');
+    const spaPackageLockPath = path.join(CodeInjector.SPA_TMP_PATH, 'package-lock.json');
     const spaPackageLock = JSON.parse(await fs.promises.readFile(spaPackageLockPath, 'utf-8'));
     const spaLockHash = hashify(spaPackageLock);
 
@@ -249,7 +240,7 @@ class CodeInjector {
     const packagesNamesHash = hashify(packageNames);
 
     const fullHash = `${spaLockHash}::${packagesNamesHash}::${usersLockHash}`;
-    const hashPath = path.join(spaTmpPath, 'node_modules', '.adminforth_hash');
+    const hashPath = path.join(CodeInjector.SPA_TMP_PATH, 'node_modules', '.adminforth_hash');
 
     try {
       const existingHash = await fs.promises.readFile(hashPath, 'utf-8');
@@ -268,7 +259,7 @@ class CodeInjector {
       }
     }
 
-    await this.runNpmShell({command: 'ci', verbose, cwd: spaTmpPath});
+    await this.runNpmShell({command: 'ci', verbose, cwd: CodeInjector.SPA_TMP_PATH});
 
     // get packages with version from customPackage
     const IGNORE_PACKAGES = ['tsx', 'typescript', 'express', 'nodemon'];
@@ -283,7 +274,7 @@ class CodeInjector {
 
     if (packageNames.length) {
       const npmInstallCommand = `install ${[...packageNames, ...customPackgeNames].join(' ')}`;
-      await this.runNpmShell({command: npmInstallCommand, cwd: spaTmpPath});
+      await this.runNpmShell({command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH});
     }
 
     await fs.promises.writeFile(hashPath, fullHash);
@@ -291,7 +282,7 @@ class CodeInjector {
   }
 
 async watchForReprepare({ verbose }) {
-    const spaPath = path.join(__dirname, 'spa');
+    const spaPath = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa');
     // get list of all subdirectories in spa recursively
     const directories = [];
     const collectDirectories = async (dir) => {

package/modules/utils.ts

@@ -15,16 +15,15 @@ export function guessLabelFromName(name) {
 }
 
 
-let package_json;
 const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.join(path.dirname(__filename), '..');
-console.log('📦 __filename', __dirname);
-console.log('📦 __dirname_orig', path.dirname(__filename));
-
-console.log('📦 __dirname', __dirname);
+let __dirname = path.join(path.dirname(__filename), '..');
+if (__dirname.endsWith('dist')) {
+  // in prod build we are in dist also
+  __dirname = path.join(__dirname, '..');
+}
 
 export const ADMIN_FORTH_ABSOLUTE_PATH = __dirname;
 
-package_json = JSON.parse(fs.readFileSync(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'package.json'), 'utf8'));
+const package_json = JSON.parse(fs.readFileSync(path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'package.json'), 'utf8'));
 
 export const ADMINFORTH_VERSION = package_json.version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/spa/src/stores/core.ts

@@ -24,7 +24,7 @@ export const useCoreStore = defineStore('core', () => {
     }, {});
     config.value = resp.config;
     user.value = resp.user;
-    console.log('🌍 AdminForth version', resp.version);
+    console.log('🌍 AdminForth v', resp.version);
 
     // find homepage:true in menu recuresively