5htp-core 0.6.0-5 → 0.6.0-6

package/package.json

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

package/server/services/email/index.ts

@@ -2,10 +2,6 @@
 - DEPENDANCES
 ----------------------------------*/
 
-/* NOTE: On évite d'utiliser les alias ici,
-        Afin que l'envoi des rapports de bug fonctionne même en cas d'erreur avec les alias
-*/
-
 // Core
 import type { Application } from '@server/app';
 import Service from '@server/app/service';
@@ -13,7 +9,6 @@ import markdown from '@common/data/markdown';
 
 // Speciic
 import { jsonToHtml } from './utils';
-import type { Transporter } from './transporter';
 
 /*----------------------------------
 - SERVICE CONFIG
@@ -25,16 +20,12 @@ export type Config = {
     debug: boolean,
     simulateWhenLocal: boolean,
     default: {
-        transporter: string,
         from: TPerson
     },
     bugReport: {
         from: TPerson,
         to: TPerson
     },
-    transporters: {
-        [transporterId: string]: Transporter
-    }
 }
 
 export type Hooks = {
@@ -49,9 +40,7 @@ export type Services = {
 - TYPES: EMAILS
 ----------------------------------*/
 
-export { Transporter } from './transporter';
-
-export type TEmail = THtmlEmail | TMarkdownEmail// | TTemplateEmail;
+export type TEmail = THtmlEmail | TMarkdownEmail;
 
 type TPerson = {
     name?: string,
@@ -74,11 +63,6 @@ export type TMarkdownEmail = TBaseEmail & {
     markdown: string,
 }
 
-/*export type TTemplateEmail = TBaseEmail & {
-    template: keyof typeof templates,
-    data?: TObjetDonnees
-}*/
-
 export type TCompleteEmail = With<THtmlEmail, {
     to: TPerson[],
     from: TPerson,
@@ -109,14 +93,15 @@ type TOptions = {
 /*----------------------------------
 - FONCTIONS
 ----------------------------------*/
-export default class Email extends Service<Config, Hooks, Application> {
-    
-    private transporters = this.config.transporters;
+export default abstract class Email<TConfig extends Config> 
+    extends Service<TConfig, Hooks, Application> {
 
     /*----------------------------------
     - ACTIONS
     ----------------------------------*/
 
+    protected abstract sendNow( emails: TCompleteEmail[] ): Promise<void>;
+
     public async send( to: string, subject: string, markdown: string, options?: TOptions );
     public async send( emails: TEmail | TEmail[], options?: TOptions ): Promise<void>;
     public async send( ...args: TEmailSendArgs ): Promise<void> {
@@ -162,30 +147,7 @@ export default class Email extends Service<Config, Hooks, Application> {
                 ? email.to
                 : [email.to];
 
-            // Via template
-            // TODO: Restore templates feature
-            /*if ('template' in email) {
-
-                const template = templates[email.template];
-
-                if (template === undefined)
-                    throw new Error(`Impossible de charger la template email ${email.template} depuis le cache (NotFound).`);
-
-                const txt = template(email.data || {})
-
-                const delimTitre = txt.indexOf('\n\n');
-
-                return {
-                    ...email,
-                    // Vire le "> " au début
-                    subject: txt.substring(2, delimTitre),
-                    html: htmlWarning + txt.substring(delimTitre + 2),
-                    from,
-                    to,
-                    cc
-                }
-
-            } else */if ('markdown' in email) {
+            if ('markdown' in email) {
 
                 return {
                     ...email,
@@ -209,11 +171,7 @@ export default class Email extends Service<Config, Hooks, Application> {
             
         });
 
-        const transporterName = options.transporter || this.config.default.transporter;
-        if (transporterName === undefined)
-            throw new Error(`Please define at least one mail transporter.`);
-
-        console.info(LogPrefix, `Sending ${emailsToSend.length} emails via transporter "${transporterName}"`, emailsToSend[0].subject);
+        console.info(LogPrefix, `Sending ${emailsToSend.length} emails via transporter`, emailsToSend[0].subject);
 
         // Pas d'envoi d'email quand local
         if (this.app.env.name === 'local' && this.config.simulateWhenLocal === true) {
@@ -224,8 +182,7 @@ export default class Email extends Service<Config, Hooks, Application> {
             return;
         }
 
-        const transporter = this.transporters[ transporterName ];
-        await transporter.send(emailsToSend);
+        await this.sendNow(emailsToSend);
 
     }
 }

package/types/icons.d.ts

@@ -1 +1 @@
-export type TIcones = "times"|"solid/spinner-third"|"long-arrow-right"|"sack-dollar"|"bell"|"bullseye"|"project-diagram"|"user-friends"|"eye"|"lock"|"comments"|"phone"|"chalkboard-teacher"|"rocket"|"planet-ringed"|"brands/linkedin"|"user-circle"|"crosshairs"|"plus-circle"|"comments-alt"|"arrow-right"|"chart-bar"|"user-shield"|"shield-alt"|"chart-line"|"money-bill-wave"|"star"|"link"|"file-alt"|"long-arrow-left"|"calendar-alt"|"paper-plane"|"at"|"search"|"lightbulb"|"magnet"|"key"|"user"|"binoculars"|"times-circle"|"user-plus"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"angle-up"|"angle-down"|"solid/crown"|"brands/discord"|"pen"|"plus"|"file"|"envelope"|"info-circle"|"check-circle"|"exclamation-circle"|"check"|"arrow-left"|"meh-rolling-eyes"|"bars"|"trash"|"solid/star"|"solid/star-half-alt"|"regular/star"|"chevron-left"|"cog"|"power-off"|"question-circle"|"play"|"minus-circle"|"external-link"|"plane-departure"|"brands/whatsapp"|"wind"|"usd-circle"|"users"|"home"|"home-alt"|"trophy"|"map-marker-alt"|"clock"|"arrow-to-bottom"|"ellipsis-h"|"exclamation-triangle"|"industry"|"map-marker"|"calendar"|"briefcase"|"fire"|"globe"|"solid/magic"|"magic"|"building"|"graduation-cap"|"unlink"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"code"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"image"|"table"|"poll"|"columns"|"sticky-note"|"caret-right"|"align-left"|"align-center"|"align-right"|"align-justify"|"indent"|"outdent"|"list-ul"|"check-square"|"h1"|"h2"|"h3"|"h4"|"list-ol"|"paragraph"|"quote-left"
+export type TIcones = "solid/spinner-third"|"long-arrow-right"|"search"|"paper-plane"|"bookmark"|"solid/download"|"mouse-pointer"|"thumbs-up"|"dollar-sign"|"times"|"angle-down"|"th-large"|"table"|"traffic-light-stop"|"times-circle"|"info-circle"|"check-circle"|"exclamation-circle"|"heart"|"bell"|"chart-bar"|"power-off"|"seedling"|"palette"|"car"|"plane"|"university"|"briefcase"|"hard-hat"|"graduation-cap"|"bolt"|"cogs"|"film"|"leaf"|"tshirt"|"utensils"|"globe"|"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"|"chart-line"|"lock"|"eye"|"credit-card"|"at"|"brands/linkedin"|"image"|"key"|"brands/google"|"check"|"bars"|"books"|"box-full"|"planet-ringed"|"brands/twitter"|"brands/facebook"|"database"|"brain"|"download"|"code"|"money-bill"|"rocket"|"user-circle"|"plus-circle"|"solid/heart"|"regular/heart"|"trash"|"arrow-left"|"arrow-right"|"meh-rolling-eyes"|"unlink"|"pen"|"bold"|"italic"|"underline"|"strikethrough"|"subscript"|"superscript"|"link"|"file"|"plus"|"font"|"empty-set"|"horizontal-rule"|"page-break"|"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"

package/server/services/email/service.json

@@ -1,6 +0,0 @@
-{
-    "id": "Core/Email",
-    "name": "Email",
-    "parent": "app",
-    "dependences": []
-}

package/server/services/email/templates.ts

@@ -1,49 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-import Handlebars, { TemplateDelegate } from 'handlebars';
-
-//import * as templates from '@cache/serveur/emails';
-import templatesDefault from '@root/default/serveur/emails/*.hbs';
-import templatesProjet from '@/*/serveur/emails/*.hbs';
-const templates = { ...templatesDefault, ...templatesProjet }
-import url from '@commun/routeur/url';
-
-/*----------------------------------
-- HELPERS   
-----------------------------------*/
-
-Handlebars.registerHelper('plur', (mot: string, nb: number) =>
-    mot + (nb > 1 ? 's' : '')
-)
-
-Handlebars.registerHelper('url', (route: string, params?: any, absolu?: boolean) =>
-    url(route, params, absolu)
-)
-
-/*----------------------------------
-- FONCTIONS
-----------------------------------*/
-const cache: {[nomTemplate: string]: TemplateDelegate} = {}
-
-export const compiler = async () => {
-
-    console.log(`[boot] Précompilation de ${Object.keys(templates).length} templates email`);
-
-    try {
-        for (const nomTemplate in templates) {
-
-            const template = templates[nomTemplate];
-
-            cache[ nomTemplate ] = Handlebars.compile(template, {
-                strict: true, // Erreur quand variable inexistante
-            });
-    
-        }
-    } catch (error) {
-        console.error(`Erreur lors de la précompilation des templates email:`, error);
-    }
-}
-
-export default cache

package/server/services/email/transporter.ts

@@ -1,31 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// Npm
-
-// Core
-import type Application from "@server/app";
-import Service from '@server/app/service';
-import type EmailService from '@server/services/email';
-
-// Specific
-import type { TCompleteEmail } from ".";
-
-/*----------------------------------
-- TYPES
-----------------------------------*/
-
-export type TBasicConfig = {
-    api: string,
-    debug: boolean
-}
-
-/*----------------------------------
-- CLASS 
-----------------------------------*/
-export abstract class Transporter<TConfig extends TBasicConfig = TBasicConfig>
-    extends Service<TConfig, {}, Application> {
-
-    public abstract send( emails: TCompleteEmail[] ): Promise<void>;
-}