5htp-core 0.6.2-97 → 0.6.2-98

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.6.2-97",
+	"version": "0.6.2-98",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",

package/server/app/index.ts

@@ -150,7 +150,9 @@ export abstract class Application<
         console.log('----------------------------------');
         console.log('- SERVICES');
         console.log('----------------------------------');
-        await this.ready();
+        const startingServices = await this.ready();
+        await Promise.all(startingServices);
+        console.log('All services are ready');
         await this.runHook('ready');
 
         const startedTime = (Date.now() - startTime) / 1000;
@@ -179,12 +181,14 @@ export abstract class Application<
 
     public register( service: AnyService ) {
 
-        service.ready();
+        return service.ready();
 
     }
 
     protected async ready() {
 
+        const startingServices: Promise<any>[] = [];
+
         // Print services
         const processService = async (propKey: string, service: AnyService, level: number = 0) => {
 
@@ -193,7 +197,8 @@ export abstract class Application<
 
             // Services start shouldn't block app boot
             // use await ServiceName.started to make services depends on each other
-            this.starting = service.ready();
+            service.starting = service.ready();
+            startingServices.push(service.starting);
             service.status = 'running';
             console.log('-' + '-'.repeat(level * 1), propKey + ': ' + service.constructor.name);
 
@@ -253,6 +258,8 @@ export abstract class Application<
             // Services start shouldn't block app boot
             processService(serviceId, service);
         }
+
+        return startingServices;
     }
 
 }

package/server/services/disks/index.ts

@@ -50,8 +50,6 @@ export default class DisksManager<
         super(...args);
 
         const drivers = this.config.drivers;
-
-        console.log('drivers', args);
         
         if (Object.keys( drivers ).length === 0)
             throw new Error("At least one disk driver should be mounted.");

package/server/services/router/index.ts

@@ -168,11 +168,6 @@ export default class ServerRouter<
 
     public async ready() {
 
-        // Every hours
-        setInterval(() => {
-            this.refreshStaticPages();
-        }, 1000 * 60 * 60);
-
         // Detect router services
         for (const serviceName in this.config.plugins) {
             const service = this.config.plugins[serviceName];
@@ -216,6 +211,12 @@ export default class ServerRouter<
             );
         };
 
+
+        // When all the services are ready, initialize static routes
+        this.app.on('ready', () => {
+            this.initStaticRoutes();
+        });
+
     }
 
     public async shutdown() {
@@ -238,6 +239,8 @@ export default class ServerRouter<
 
         if (!rendered) {
 
+            console.log('[router] renderStatic: url', url);
+
             const fullUrl = this.url(url, {}, true);
             const response = await got( fullUrl, {
                 method: 'GET',
@@ -266,6 +269,26 @@ export default class ServerRouter<
         
     }
 
+    private initStaticRoutes() {
+
+        for (const route of this.routes) {
+
+            if (!route.options.static)
+                continue;
+
+            // Add to static pages
+            // Should be a GET oage that don't take any parameter
+            for (const url of route.options.static.urls) {
+                this.renderStatic(url, route.options.static);
+            }
+        }
+
+        // Every hours, refresh static pages
+        setInterval(() => {
+            this.refreshStaticPages();
+        }, 1000 * 60 * 60);
+    }
+
     private refreshStaticPages() {
 
         console.log('[router] refreshStaticPages');
@@ -275,15 +298,10 @@ export default class ServerRouter<
             if (page.expire && page.expire < Date.now()) {
 
                 this.renderStatic(pageUrl, page.options);
-
             }
         }
     }
 
-
-
-
-
     private registerRoutes(defModules: GlobImportedWithMetas<TRouteModule>) {
         for (const routeModule of defModules) {
 
@@ -332,14 +350,6 @@ export default class ServerRouter<
 
         this.routes.push(route);
 
-        // Add to static pages
-        // Should be a GET oage that don't take any parameter
-        if (options.static) {
-            for (const url of options.static.urls) {
-                this.renderStatic(url, options.static);
-            }
-        }
-
         return this;
 
     }

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "solid/spinner-third"|"rocket"|"user-circle"|"times"|"at"|"star"|"plus"|"minus"|"trash"|"magnet"|"search"|"paper-plane"|"brands/linkedin"|"play"|"stop"|"check"|"plus-circle"|"clock"|"cog"|"ellipsis-h"|"long-arrow-right"|"lightbulb"|"long-arrow-left"|"phone"|"arrow-right"|"regular/shield-check"|"angle-down"|"plane-departure"|"comments-alt"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"link"|"file-alt"|"envelope"|"solid/crown"|"eye"|"pen"|"file"|"angle-up"|"user-plus"|"sack-dollar"|"info-circle"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"download"|"brands/google"|"brands/whatsapp"|"crown"|"check-circle"|"exclamation-circle"|"times-circle"|"arrow-left"|"broom"|"solid/check-circle"|"solid/exclamation-triangle"|"solid/times-circle"|"hourglass"|"key"|"building"|"briefcase"|"map-marker-alt"|"graduation-cap"|"angle-left"|"angle-right"|"plug"|"coin"|"coins"|"minus-circle"|"external-link"|"question-circle"|"arrow-to-bottom"|"magic"|"user"|"meh-rolling-eyes"|"unlink"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"code"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"
+export type TIcones = "solid/spinner-third"|"long-arrow-right"|"times-circle"|"brands/whatsapp"|"times"|"search"|"user"|"rocket"|"globe"|"bullhorn"|"briefcase"|"chart-line"|"handshake"|"ellipsis-h"|"brands/google"|"brands/reddit-alien"|"brands/linkedin-in"|"brands/github"|"robot"|"comments"|"user-friends"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"angle-down"|"info-circle"|"check-circle"|"exclamation-circle"|"heart"|"lock"|"eye"|"credit-card"|"at"|"brands/linkedin"|"key"|"bars"|"font"|"tag"|"compress"|"bolt"|"puzzle-piece"|"planet-ringed"|"chart-bar"|"power-off"|"exclamation"|"solid/download"|"database"|"solid/fire"|"usd-circle"|"lightbulb"|"download"|"solid/dollar-sign"|"bell"|"code"|"solid/clock"|"seedling"|"palette"|"car"|"plane"|"university"|"hard-hat"|"graduation-cap"|"cogs"|"film"|"leaf"|"tshirt"|"utensils"|"map-marked-alt"|"dumbbell"|"stethoscope"|"concierge-bell"|"book"|"shield-alt"|"gavel"|"industry"|"square-root-alt"|"newspaper"|"pills"|"medal"|"capsules"|"balance-scale"|"home"|"praying-hands"|"shopping-cart"|"flask"|"futbol"|"microchip"|"satellite-dish"|"shipping-fast"|"passport"|"tools"|"plus-circle"|"user-circle"|"brands/twitter"|"brands/facebook"|"comment-alt"|"list"|"file"|"plug"|"paper-plane"|"check"|"long-arrow-left"|"angle-left"|"angle-right"|"meh-rolling-eyes"|"trash"|"arrow-left"|"arrow-right"|"link"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"unlink"|"pen"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"plus"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"