5htp-core 0.1.2 → 0.2.0

package/src/server/services/{router/request/services/tracking.ts → metrics/index.ts}

@@ -8,19 +8,29 @@ 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';
-import requete from '@server/data/ApiClient';
-import app, { $ } from '@server/app';
-
-// Models
-import { IP, User } from '@models';
 
 /*----------------------------------
 - TYPES
 ----------------------------------*/
 
-import type Request from '@server/services/router/request'
+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,
@@ -32,10 +42,10 @@ export type TrackingInfos = {
 type TAssoChaines = { [id: string]: string }
 
 /*----------------------------------
-- TYPES
+- SERVICE
 ----------------------------------*/
 
-export type TrackingServiceConfig = {
+export type Config = {
     ga: {
         pub: string,
         prv: string,
@@ -43,32 +53,32 @@ export type TrackingServiceConfig = {
     }
 }
 
-declare global {
-    namespace Core {
-        namespace Config {
-            interface Services {
-                tracking: TrackingServiceConfig
-            }
-        }
-    }
+export type Hooks = {
+
 }
 
-/*----------------------------------
-- SERVICES
-----------------------------------*/
-export default class TrackerService {
+export default class TrackerService extends Service<Config, Hooks, Application> {
 
-    /*----------------------------------
-    - GLOBAL
-    ----------------------------------*/
-    public static countries: TAssoChaines;
-    public static langues: TAssoChaines;
-    public static locales: locale.Locales;
+    public countries!: TAssoChaines;
+    public langues!: TAssoChaines;
+    public locales!: locale.Locales;
+
+    public async register() {
+
+    }
 
-    public static async LoadCache() {
+    public async start() {
+
+        await this.indexData();
+
+
+
+    }
+
+    private async indexData() {
 
         // On n'oublie pas le tri alphabétique pour les listings
-        const [countries, langues] = await $.sql`
+        /*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]) => [
@@ -76,28 +86,41 @@ export default class TrackerService {
             arrayToObj(listeLangues, { index: 'id', val: 'name' }),
         ]);
 
-        TrackerService.countries = countries as TAssoChaines;
-        TrackerService.langues = langues as TAssoChaines;
-        TrackerService.locales = new locale.Locales(Object.keys(this.langues));
+        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 {
 
-    /*----------------------------------
-    - INSTANCE
-    ----------------------------------*/
+    // Services
+    protected sql: SQL;
 
     // Caches
     private langue?: string;
     private ip?: IP;
 
-    public constructor( private request: Request ) {
+    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 (app.env.profile == 'dev' ||
+        if (this.app.env.profile == 'dev' ||
             (this.request.user && this.request.user.roles.includes('ADMIN'))
         ) 
             return;
@@ -146,9 +169,9 @@ export default class TrackerService {
     private getLangue() {
 
         const locales = new locale.Locales( this.request.headers["accept-language"] )
-        const langue = locales.best( TrackerService.locales ).language.toUpperCase();
+        const langue = locales.best( this.tracker.locales ).language.toUpperCase();
 
-        return (langue in TrackerService.langues) ? langue : 'EN';
+        return (langue in this.tracker.langues) ? langue : 'EN';
 
     }
 
@@ -160,7 +183,7 @@ export default class TrackerService {
         console.log('Checking IP ...', address);
         const now: Date = new Date;
         
-        let ip = await $.sql`SELECT * FROM logs.IP WHERE address = ${address}`.first();
+        let ip = await this.sql`SELECT * FROM logs.IP WHERE address = ${address}`.first();
         if (!ip) {
 
             console.log(`New IP`);
@@ -168,13 +191,13 @@ export default class TrackerService {
             ip = {
                 address,
                 meet: now,
-                activity: now,
+                activity: now,  
                 user_name: this.request.user?.name,
             }
 
             await this.retrieveScore(ip);
 
-            $.sql.insert("logs.IP", ip);
+            this.sql.insert("logs.IP", ip);
 
         // Nouvelle IP
         } else {
@@ -194,7 +217,7 @@ export default class TrackerService {
 
             ip.activity = now;
 
-            $.sql.update("logs.IP", ip, { address });
+            this.sql.update("logs.IP", ip, { address });
 
         }
 
@@ -209,11 +232,11 @@ export default class TrackerService {
         const [iphubOk] = await Promise.all([
 
             // IPhub = le plus fiable en premier
-            requete.get('http://v2.api.iphub.info/ip/' + ip.address, {
+            got.get('http://v2.api.iphub.info/ip/' + ip.address, {
                 headers: {
                     'X-Key': app.config.http.security.iphub
                 }
-            }).then((res) => res.data).then((iphub: any) => {
+            }).json().then((iphub: any) => {
 
                 ip.iphub = iphub.block;
                 ip.country = iphub.countryCode;
@@ -234,7 +257,7 @@ export default class TrackerService {
 
         // Impossible d'avoir le country = douteux
         // NOTE: Pour Iphub, ZZ = inconnu
-        if (!(ip.country in TrackerService.countries)) {
+        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

package/src/server/services/{http → router/http}/index.ts

@@ -11,9 +11,6 @@ import path from 'path';
 import cors from 'cors';
 //var serveStatic = require('serve-static')
 
-// Npm: Autres
-import fs from 'fs-extra';
-
 // Middlewares (npm)
 import morgan from 'morgan';
 import hpp from 'hpp'; // Protection contre la pollution des reuqtees http
@@ -25,10 +22,8 @@ import cookieParser from 'cookie-parser';
 import * as csp from 'express-csp-header';
 
 // Core
-import app from '@server/app';
-// Services
-import '../router';  // force loading the service
-import { Router } from '../router';
+import Application, { Service } from '@server/app';
+import type Router from '..';
 
 // Middlewaees (core)
 import { MiddlewareFormData } from './multipart';
@@ -37,83 +32,58 @@ import { MiddlewareFormData } from './multipart';
 - CONFIG
 ----------------------------------*/
 
-export type HttpServiceConfig = {
-    port: number
+export type Config = {
+
+    // Access
+    domain: string,
+    port: number,
     ssl: boolean,
 
+    // Limitations / Load restriction
     upload: {
         maxSize: string // Expression package bytes
     },
-
-    security: {
-        recaptcha: {
-            prv: string,
-            pub: string
-        },
-        iphub: string
-    }
 }
 
-declare global {
-    namespace Core {
-        namespace Config {
-            interface Services {
-                http: HttpServiceConfig
-            }
-        }
-    }
+export type Hooks = {
+
 }
 
 /*----------------------------------
 - FUNCTION
 ----------------------------------*/
-export default class HttpServer {
+export default class HttpServer extends Service<Config, Hooks, Application> {
 
     public http: http.Server | https.Server;
     public express: express.Express;
 
-    public router: Router;
+    public publicUrl: string;
 
-    public config: HttpServiceConfig;
-    public url: string;
+    public constructor( config: Config, public router: Router ) {
 
-    public constructor() {
+        super( router.app, config );
 
         // Init
-        this.config = app.config.http;
-        this.url = (this.config.ssl ? 'https' : 'http') + '://' + app.env.domain;
-        this.express = express();
+        this.publicUrl = this.app.env.name === 'local'
+            ? 'http://localhost:' + this.config.port
+            : ((this.config.ssl ? 'https' : 'http') + '://' + this.config.domain);
 
         // Configure HTTP server
-        if (!this.config.ssl) {
-
-            this.http = http.createServer(this.express);
-
-        } /*else if ('ssh' in app.env) {
-
-            const ssh = app.env.ssh;
-
-            console.log("Création du serveur https pour le socket:", '/home/' + ssh.login + '/ssl.*');
-            this.http = https.createServer({
-                key: fs.readFileSync('/home/' + ssh.login + '/ssl.key'),
-                cert: fs.readFileSync('/home/' + ssh.login + '/ssl.cert'),
-                ca: fs.readFileSync('/home/' + ssh.login + '/ssl.ca'),
-                requestCert: true,
-                rejectUnauthorized: false
-            }, this.express);
-            
-        }*/ else
-            throw new Error(`SSL was enabled, but no ssh config was specified in app.env (required to load ssl certificate files)`);
+        this.express = express();
+        this.http = http.createServer(this.express);
 
         // Start HTTP Server
-        this.router = app.services.router;
-        app.on('cleanup', () => this.cleanup());
+        this.app.on('cleanup', () => this.cleanup());
     }
 
     /*----------------------------------
     - HOOKS
     ----------------------------------*/
-    public async load() {
+    public async register() {
+
+    }
+
+    public async start() {
 
         const routes = this.express
 
@@ -137,7 +107,7 @@ export default class HttpServer {
         routes.use('/public', cors());
         routes.use(
             '/public',
-            expressStaticGzip( app.path.root + '/bin/public', {
+            expressStaticGzip( this.app.path.root + '/bin/public', {
                 enableBrotli: true,
                 serveStatic: {
                     setHeaders: function setCustomCacheControl(res, path) {
@@ -220,7 +190,7 @@ export default class HttpServer {
         //      https://www.google.com/search?q=http+cors+from+android%7Cwindows%7Cdesktop%7Cmodile+app
         //routes.use('/auth', cors());
 
-        routes.use(csp.expressCspHeader({
+        routes.use( csp.expressCspHeader({
             directives: {
                 'script-src': [csp.INLINE, csp.SELF, 
                     // Whitelist external js scripts
@@ -248,7 +218,7 @@ export default class HttpServer {
         // Impossible donc de créer un serveur http ici, on le fera dans start.js
         console.info("Lancement du serveur web");
         this.http.listen(this.config.port, () => {
-            console.info(`Serveur web démarré sur https://${app.env.domain}:${this.config.port}/`);
+            console.info(`Serveur web démarré sur ${this.publicUrl}`);
         });
 
     }
@@ -256,16 +226,4 @@ export default class HttpServer {
     public async cleanup() {
         this.http.close();
     }
-}
-
-/*----------------------------------
-- REGISTER SERVICE
-----------------------------------*/
-app.register('http', HttpServer);
-declare global {
-    namespace Core {
-        interface Services {
-            http: HttpServer;
-        }
-    }
 }