adminforth 1.1.81 → 1.1.83

package/dist/modules/codeInjector.js

@@ -28,6 +28,11 @@ const execAsync = promisify(exec);
 function hashify(obj) {
     return crypto.createHash('sha256').update(JSON.stringify(obj)).digest('hex');
 }
+function notifyWatcherIssue(limit) {
+    console.log('Ran out of file handles after watching %s files.', limit);
+    console.log('Falling back to polling which uses more CPU.');
+    console.log('Run ulimit -n 10000 to increase the limit for open files.');
+}
 class CodeInjector {
     cleanup() {
         console.log('Cleaning up...');
@@ -425,6 +430,7 @@ class CodeInjector {
                 console.log(`File ${file} changed ${x}, preparing sources...`);
                 yield this.prepareSources({ filesUpdated: [file.replace(spaPath + '/', '')] });
             }));
+            watcher.on('fallback', notifyWatcherIssue);
             this.allWatchers.push(watcher);
         });
     }
@@ -488,6 +494,7 @@ class CodeInjector {
                     // for now do nothing
                 }
             }));
+            watcher.on('fallback', notifyWatcherIssue);
             this.allWatchers.push(watcher);
         });
     }

package/dist/spa/spa/src/utils.ts

@@ -14,7 +14,7 @@ export async function callApi({path, method, body=undefined} ) {
     },
     body: JSON.stringify(body),
   };
-  const fullPath = `${import.meta.env.VITE_ADMINFORTH_PUBLIC_PATH || ''}${path}`;
+  const fullPath = `${import.meta.env.VUE_APP_ADMINFORTH_PUBLIC_PATH || ''}${path}`;
   const r = await fetch(fullPath, options);
   if (r.status == 401 ) {
     useUserStore().unauthorize();

package/dist/spa/spa/vite.config.ts

@@ -2,6 +2,7 @@ import { fileURLToPath, URL } from 'node:url'
 
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
+import { clear, error } from 'node:console';
 
 
 const customLogger = {
@@ -26,12 +27,18 @@ const customLogger = {
   clear() {
     console.clear();
   },
+  clearScreen() {
+    console.clear();
+  },
   hasWarned: false,
+  hasErrorLogged: (error: any): boolean => {
+    return false;
+  }
 };
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: process.env.VITE_ADMINFORTH_PUBLIC_PATH || '/',
+  base: process.env.VUE_APP_ADMINFORTH_PUBLIC_PATH || '/',
   server: {
     port: 5173,
     strictPort: true, // better predictability

package/index.ts

@@ -706,7 +706,7 @@ class AdminForth implements AdminForthClass {
               pk: userRecord[userResource.columns.find((col) => col.primaryKey).name], 
               username
             };
-            const beforeLoginConfirmation = this.config.auth.beforeLoginConfirmation as BeforeLoginConfirmationFunction[];
+            const beforeLoginConfirmation = this.config.auth.beforeLoginConfirmation as (BeforeLoginConfirmationFunction[] | undefined);
             if (beforeLoginConfirmation?.length){
               for (const hook of beforeLoginConfirmation) {
                 const resp = await hook({ userRecord:adminUser});

package/modules/codeInjector.ts

@@ -30,6 +30,12 @@ function hashify(obj) {
     ('sha256').update(JSON.stringify(obj)).digest('hex');
 }
 
+function notifyWatcherIssue(limit) {
+  console.log('Ran out of file handles after watching %s files.', limit);
+  console.log('Falling back to polling which uses more CPU.');
+  console.log('Run ulimit -n 10000 to increase the limit for open files.');
+}
+
 class CodeInjector implements CodeInjectorType {
 
   allWatchers = [];
@@ -490,6 +496,7 @@ async watchForReprepare({ verbose }) {
         await this.prepareSources({ filesUpdated: [file.replace(spaPath + '/', '')] });
       }
     )
+    watcher.on('fallback', notifyWatcherIssue);
     this.allWatchers.push(watcher);
   }
 
@@ -561,7 +568,10 @@ async watchForReprepare({ verbose }) {
           // for now do nothing
         }
       }
-    )
+    );
+
+    watcher.on('fallback', notifyWatcherIssue);
+
     this.allWatchers.push(watcher);
   }
 

package/package.json

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

package/spa/src/utils.ts

@@ -14,7 +14,7 @@ export async function callApi({path, method, body=undefined} ) {
     },
     body: JSON.stringify(body),
   };
-  const fullPath = `${import.meta.env.VITE_ADMINFORTH_PUBLIC_PATH || ''}${path}`;
+  const fullPath = `${import.meta.env.VUE_APP_ADMINFORTH_PUBLIC_PATH || ''}${path}`;
   const r = await fetch(fullPath, options);
   if (r.status == 401 ) {
     useUserStore().unauthorize();

package/spa/vite.config.ts

@@ -2,6 +2,7 @@ import { fileURLToPath, URL } from 'node:url'
 
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
+import { clear, error } from 'node:console';
 
 
 const customLogger = {
@@ -26,12 +27,18 @@ const customLogger = {
   clear() {
     console.clear();
   },
+  clearScreen() {
+    console.clear();
+  },
   hasWarned: false,
+  hasErrorLogged: (error: any): boolean => {
+    return false;
+  }
 };
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: process.env.VITE_ADMINFORTH_PUBLIC_PATH || '/',
+  base: process.env.VUE_APP_ADMINFORTH_PUBLIC_PATH || '/',
   server: {
     port: 5173,
     strictPort: true, // better predictability