5htp-core 0.2.6-4 → 0.2.6-5

package/package.json

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

package/src/server/services/router/response/index.ts

@@ -133,7 +133,9 @@ export default class ServerResponse<
         for (const serviceName in this.router.services) {
 
             const routerService = this.router.services[serviceName];
-            contextServices[ serviceName ] = routerService.requestService( this.request );
+            const requestService = routerService.requestService( this.request );
+            if (requestService !== null)
+                contextServices[ serviceName ] = requestService;
 
         }
 

package/src/server/services/router/response/page/document.tsx

@@ -19,10 +19,10 @@ import type Page from '.';
 /*----------------------------------
 - SERVICE
 ----------------------------------*/
-export default class DocumentRenderer {
+export default class DocumentRenderer<TRouter extends Router> {
 
     public constructor(
-        public router: Router,
+        public router: TRouter,
         public app = router.app
     ) {
 
@@ -55,7 +55,7 @@ export default class DocumentRenderer {
         );
     }
 
-    public async page( html: string, page: Page, response: ServerResponse<Router> ) {
+    public async page( html: string, page: Page, response: ServerResponse<TRouter> ) {
 
         const fullUrl = this.router.http.publicUrl + response.request.path;
 
@@ -133,7 +133,7 @@ export default class DocumentRenderer {
         </>
     }
 
-    private styles( page ) {
+    private styles( page: Page ) {
         return <>
             <link rel="stylesheet" type="text/css" href="/public/icons.css" />
             <link rel="preload" href="/public/client.css" as="style" />
@@ -151,7 +151,7 @@ export default class DocumentRenderer {
         </>
     }
 
-    private async scripts( response, page ) {
+    private async scripts( response: ServerResponse<TRouter>, page: Page ) {
 
         const context = safeStringify( response.forSsr(page) );
 
@@ -174,21 +174,9 @@ export default class DocumentRenderer {
                 <link rel="preload" href={script.url} as="script" />
                 <script type="text/javascript" src={script.url} {...script.attrs || {}} />
             </> : <>
-                <script type="text/javascript" {...script.attrs || {}} id={script.id} dangerouslySetInnerHTML={{ __html: script.inline }} />
+                <script type="text/javascript" {...script.attrs || {}} id={script.id} 
+                    dangerouslySetInnerHTML={{ __html: script.inline }} />
             </>)}
-
-            {/* Initialize GTM & GA for pagechange events */}
-            {/* TODO: append via the metrics module */}
-            {/*<script async src={"https://www.googletagmanager.com/gtag/js?id=" + this.app.config.tracking.ga.pub}></script>
-            <script dangerouslySetInnerHTML={{ __html: `
-                window.dataLayer = window.dataLayer || [];
-                function gtag(){dataLayer.push(arguments);}
-                gtag('js', new Date());
-
-                gtag('config', '${this.app.config.tracking.ga.pub}', {
-                    send_page_view: false
-                });
-            `}} />*/}
         </>
     }
 }

package/src/server/services/router/service.ts

@@ -43,6 +43,6 @@ export default abstract class RouterService<TRouter extends Router = Router> {
     
     public abstract register(): Promise<void>;
 
-    public abstract requestService( request: ServerRequest<TRouter> ): RequestService;
+    public abstract requestService( request: ServerRequest<TRouter> ): RequestService | null;
 
 }

package/src/client/services/metrics/index.ts

@@ -1,37 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// Npm
-
-// Core
-import type ClientApplication from '@client/app';
-
-/*----------------------------------
-- TYPES
-----------------------------------*/
-
-
-
-/*----------------------------------
-- SERVICE
-----------------------------------*/
-export default class ClientMetrics {
-
-    public constructor( public app: ClientApplication ) {
-
-    }
-
-    public start() {
-        
-    }
-
-    // Tracking
-    public event( name: string, params?: object ) {
-        if (!window.gtag) return;
-        if (name === 'pageview')
-            window.gtag('send', name);
-        else
-            window.gtag('event', name, params);
-    }
-}

package/src/server/services/metrics/detect.ts

@@ -1,109 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// Npm
-import got from 'got';
-
-// Core
-import { Forbidden } from '@common/errors';
-import ServerRequest from '../router/request';
-
-// App
-import app from '@server/app';
-
-/*----------------------------------
-- TYPES
-----------------------------------*/
-
-/*----------------------------------
-- MODULE
-----------------------------------*/
-export default class ProtectService {
-
-    private tracking: TrackerService;
-
-    public constructor( private request: ServerRequest ) {
-
-        this.tracking = request.tracking;
-        
-    }
-
-    public async bots(): Promise<IP> {
-
-        // Récupération et varifications informations ip
-        const ip = await this.tracking.checkIP();
-
-        // Captcha
-        /*if (this.request.method === 'POST')
-            await this.captcha(this.request.data.captcha);*/
-
-        return ip;
-    }
-
-    public async multiaccount(ip: IP, whitelist?: string) {
-
-        // DON'T USE IT
-        // People can't try the app when another user recommands it IRL
-        // TODO: find another way to detect / avoid multi account
-        //  Ex: Force login with Google only
-        
-        // If IP Address already used by another account
-        /*const username = whitelist || this.request.user?.name;
-        if (ip.user_name !== undefined && ip.user_name !== null && (username === undefined || username !== ip.user_name))
-            throw new Forbidden(`
-                I noticed you're trying to use multiple accounts.
-                Only one account is allowed per IP address.
-                If you think I'm wrong, please contact me at contact@gaetan-legac.fr and I will solve the problem.
-            `);*/
-    }
-
-    public async botsAndMultiaccount( usernameWhitelist?: string ) {
-        const ip = await this.bots();
-        await this.multiaccount(ip, usernameWhitelist);
-        return ip;
-    }
-
-    public async conflictOfInterest( username: string, request: ServerRequest ) {
-
-        // NOTE: Don't base conflict of interest detection on IP
-
-        // If the current ip have never been used by username
-
-        /*const conflict = await sql`
-            FROM UserLogin
-            WHERE ip = ${request.ip} AND user = ${username}
-        `.exists();
-
-        return conflict;*/
-
-        return false;
-
-    }
-
-    public async captcha(token?: string) {
-
-        console.info(`Validation du captcha`, {
-            secret: app.config.http.security.recaptcha.prv,
-            response: token
-        });
-
-        if (!token)
-            throw new Forbidden("Le captcha n'a pas été complété.");
-
-        const res = await got.post('https://www.google.com/recaptcha/api/siteverify', {
-            body: JSON.stringify({
-                secret: app.config.http.security.recaptcha.prv,
-                response: token, 
-                remoteip: null
-            })
-        }).json()
-
-        console.info(`Réponse captcha`, res);
-
-        const ok = res.success || false;
-
-        if (!ok) throw new Forbidden("Le captcha est incorrect");
-    }
-
-}

package/src/server/services/metrics/index.ts

@@ -1,272 +0,0 @@
-/*----------------------------------
-- DEPENDANCES
-----------------------------------*/
-
-// Npm
-import locale from 'locale'
-import dayjs from 'dayjs';
-import got from 'got';
-
-// Core
-import Application, { Service } from '@server/app';
-import type Router from '@server/services/router'
-import type ServerRequest from '@server/services/router/request'
-import type SQL from '@server/services/database';
-import { arrayToObj } from '@common/data/tableaux';
-import { Forbidden } from '@common/errors';
-
-/*----------------------------------
-- TYPES
-----------------------------------*/
-
-type IP = {
-    // Identity
-    ip: string,
-    address: string,
-    isp: string,
-    country: string,
-    iphub: number,
-    // Status
-    banned: Date,
-    banReason?: string,
-    updated?: Date
-}
-
-export type TrackingInfos = {
-    user: User | null,
-    ip: IP,
-    country: string,
-    langue: string
-}
-
-type TAssoChaines = { [id: string]: string }
-
-/*----------------------------------
-- SERVICE
-----------------------------------*/
-
-export type Config = {
-    ga: {
-        pub: string,
-        prv: string,
-        secret: string,
-    }
-}
-
-export type Hooks = {
-
-}
-
-export default class TrackerService extends Service<Config, Hooks, Application> {
-
-    public countries!: TAssoChaines;
-    public langues!: TAssoChaines;
-    public locales!: locale.Locales;
-
-    public async register() {
-
-    }
-
-    public async start() {
-
-        await this.indexData();
-
-
-
-    }
-
-    private async indexData() {
-
-        // On n'oublie pas le tri alphabétique pour les listings
-        /*const [countries, langues] = await this.app.sql`
-            SELECT id, name FROM Countries ORDER BY name ASC;
-            SELECT id, name FROM Locales ORDER BY name ASC;
-        `().then(([listePays, listeLangues]) => [
-            arrayToObj(listePays, { index: 'id', val: 'name' }),
-            arrayToObj(listeLangues, { index: 'id', val: 'name' }),
-        ]);
-
-        this.countries = countries as TAssoChaines;
-        this.langues = langues as TAssoChaines;
-        this.locales = new locale.Locales(Object.keys(this.langues));*/
-    }
-
-    public async request( request: ServerRequest ) {
-        return new TrackingRequestService(request, this);
-    }
-}
-
-/*----------------------------------
-- REQUEST SERVICE
-----------------------------------*/
-export class TrackingRequestService {
-
-    // Services
-    protected sql: SQL;
-
-    // Caches
-    private langue?: string;
-    private ip?: IP;
-
-    public constructor( 
-        private request: ServerRequest,
-        private tracker: TrackerService,
-    ) {
-
-        this.sql = tracker.sql;
-      
-    }
-
-    public event( event: 'pageview' ) {
-
-        // Ne compte pas les events lorsque mode dev ou admin
-        if (this.app.env.profile == 'dev' ||
-            (this.request.user && this.request.user.roles.includes('ADMIN'))
-        ) 
-            return;
-
-        console.log(`[router][request] Send GA event ${event}`);
-        /*got.post(`https://www.google-analytics.com/mp/collect`
-            + `?measurement_id=${app.config.tracking.ga.pub}`
-            + `&api_secret=${app.config.tracking.ga.secret}`, {
-
-            body: JSON.stringify({
-                client_id: app.config.tracking.ga.prv,
-                events: [{
-                    name: 'pageview',
-                    params: {},
-                }]
-            })
-        })*/
-            
-    }
-
-    public async infos(): Promise<TrackingInfos> {
-
-        if (this.langue === undefined)
-            this.langue = this.getLangue();
-
-        if (this.ip === undefined)
-            this.ip = await this.checkIP();
-
-        return {
-            user: this.request.user || null,
-            langue: this.langue,
-            country: this.ip.country,
-            ip: this.ip
-        }
-    }
-
-    public static values({ user, ip, langue, country }: TrackingInfos) {
-        return {
-            user: user ? user.email : null,
-            ip: ip.address,
-            country,
-            langue
-        }
-    }
-
-    private getLangue() {
-
-        const locales = new locale.Locales( this.request.headers["accept-language"] )
-        const langue = locales.best( this.tracker.locales ).language.toUpperCase();
-
-        return (langue in this.tracker.langues) ? langue : 'EN';
-
-    }
-
-    public async checkIP(): Promise<IP> {
-
-        let address: string = this.request.ip;
-
-        // Détection multicompte: 1 Compte max / IP
-        console.log('Checking IP ...', address);
-        const now: Date = new Date;
-        
-        let ip = await this.sql`SELECT * FROM logs.IP WHERE address = ${address}`.first();
-        if (!ip) {
-
-            console.log(`New IP`);
-
-            ip = {
-                address,
-                meet: now,
-                activity: now,  
-                user_name: this.request.user?.name,
-            }
-
-            await this.retrieveScore(ip);
-
-            this.sql.insert("logs.IP", ip);
-
-        // Nouvelle IP
-        } else {
-
-            console.log(`Existing IP`, address, ip.banned);
-
-            // Déjà banni
-            if (ip.banned)
-                throw new Forbidden(`Banned for the following reason: ` + ip.banReason);
-
-            // Données expirées
-            const tempsDepuisDerniereMaj = dayjs().diff(ip.dateMaj, 'day');
-            if (tempsDepuisDerniereMaj >= 7) {
-                console.log(`Dernière màj il y a ` + tempsDepuisDerniereMaj + ' jours');
-                await this.retrieveScore(ip);
-            }
-
-            ip.activity = now;
-
-            this.sql.update("logs.IP", ip, { address });
-
-        }
-
-        return ip;
-    }
-
-    private async retrieveScore(ip: IP) {
-
-        console.log(ip.address, `Computing score ...`);
-
-        // Retourner true pour autoriser
-        const [iphubOk] = await Promise.all([
-
-            // IPhub = le plus fiable en premier
-            got.get('http://v2.api.iphub.info/ip/' + ip.address, {
-                headers: {
-                    'X-Key': app.config.http.security.iphub
-                }
-            }).json().then((iphub: any) => {
-
-                ip.iphub = iphub.block;
-                ip.country = iphub.countryCode;
-                ip.isp = iphub.isp;
-
-                console.log(ip.address, "IpHub:", iphub);
-
-                /*
-                    block: 0 - Residential or business IP (i.e. safe IP)
-                    block: 1 - Non-residential IP (hosting provider, proxy, etc.)
-                    block: 2 - Non-residential & residential IP (warning, may flag innocent people)
-                */
-                return ip.iphub !== 1;
-
-            })
-
-        ]);
-
-        // Impossible d'avoir le country = douteux
-        // NOTE: Pour Iphub, ZZ = inconnu
-        if (!(ip.country in this.tracker.countries)) {
-            ip.banned = new Date;
-            ip.banReason = "Invalid location: " + ip.country;
-        // Considéré comme suspect par iphub etou getipintel
-        } else if (!(iphubOk)) {
-            ip.banned = new Date;
-            ip.banReason = "Suspicious activity on your network";
-        }
-
-        ip.updated = new Date;
-    }
-
-}