README.md

@@ -12,7 +12,7 @@ yarn start
 
 or
 
-pm2 --name=tellme-bot start npm -- start
+pm2 start yarn start --name=tellme-bot
 ```
 
 ## Konfiguration

packages/server/_bootstrap.js

@@ -1,88 +0,0 @@
-import fastify from 'fastify'
-import dotenv from 'dotenv'
-import path from 'path'
-import { EventEmitter } from 'events'
-import formBody from '@fastify/formbody'
-
-// getting .env
-dotenv.config({ path: path.join(path.resolve(), '/../../.env') })
-
-// create server
-const server = fastify()
-
-// adding eventEmitter
-server.decorate('eventEmitter', new EventEmitter())
-
-// adding formBody
-server.register(formBody)
-
-/**
- *  add xmpp
- *
- */
-
-import xmpp from './plugins/xmpp.js'
-
-server.register(xmpp, {
-    service: process.env.XMPP_SERVICE,
-    domain: process.env.XMPP_DOMAIN,
-    username: process.env.XMPP_USERNAME,
-    password: process.env.XMPP_PASSWORD,
-    to: process.env.XMPP_TO
-})
-
-/**
- *  add helmet
- *
- */
-
-import helmet from '@fastify/helmet'
- 
-/***
- server.register(
-    helmet, { 
-        referrerPolicy: {
-            policy: ['origin']
-        }
-    }
-)*/
-
-/**
- *  add rateLimit
- *
- */
-
-import rateLimit from '@fastify/rate-limit'
-
-const rateLimitSettings = {
-    max: 100,
-    timeWindow: 60000
-}
-
-if (process.env.APP_RATE_LIMIT_MAX) {
-    rateLimitSettings.max = process.env.APP_RATE_LIMIT_MAX
-}
-
-if (process.env.APP_RATE_LIMIT_TIMEWINDOW) {
-    rateLimitSettings.timeWindow = process.env.APP_RATE_LIMIT_TIMEWINDOW
-}
-
-server.register(rateLimit, rateLimitSettings)
-
-/**
- *  add routes
- *
- *
- */
-import webhookHttp from './http/api/webhook.js'
-import healthHttp from './http/api/health.js'
-
-server
-    .register(webhookHttp, {
-        'prefix': '/api/webhook'
-    })
-    .register(healthHttp, {
-        'prefix': '/api/health'
-    })
-
-export default server

packages/server/bootstrap.js

@@ -0,0 +1,41 @@
+import fastify from 'fastify'
+import dotenv from 'dotenv'
+import path from 'path'
+import { EventEmitter } from 'events'
+
+// getting .env
+dotenv.config({ path: path.join(path.resolve(), '/../../.env') })
+
+// create server
+const server = fastify()
+
+// adding eventEmitter
+server.decorate('eventEmitter', new EventEmitter())
+
+// adding xmpp
+import xmpp from './plugins/xmpp.js'
+
+server.register(xmpp, {
+    service: process.env.XMPP_SERVICE,
+    domain: process.env.XMPP_DOMAIN,
+    username: process.env.XMPP_USERNAME,
+    password: process.env.XMPP_PASSWORD
+})
+
+/**
+ *  add routes
+ *
+ *
+ */
+import webhookHttp from './http/api/webhook.js'
+import healthHttp from './http/api/health.js'
+
+server
+    .register(webhookHttp, {
+        'prefix': '/api/webhook'
+    })
+    .register(healthHttp, {
+        'prefix': '/api/health'
+    })
+
+export default server

packages/server/handlers/parser.js

@@ -1,40 +0,0 @@
-import DOMPurify from 'isomorphic-dompurify'
-
-/**
- *
- *  handle parser
- *
- *
- *  @author Björn Hase <me@herr-hase.wtf>
- *  @license http://opensource.org/licenses/MIT The MIT License
- *  @link https://gitea.node001.net/HerrHase/super-fastify-directus.git
- *
- */
-
-async function parserHandler(request, response) {
-
-    // getting allowed parsers from .env as array
-    const allowedParsers = process.env.APP_API_ALLOWED_PARSERS.split(',')
-
-    // getting name from request 
-    const parserName = DOMPurify.sanitize(request.params.parser)
-
-    // if parser not found send 404
-    if (allowedParsers.indexOf(parserName) === -1) {
-
-        console.log('Parsers: "' + parserName + '" not found!')
-
-        return response
-            .code(404)
-            .send()
-    }
-
-    // getting parser and set body to parser
-    const Parser = await import('./../parsers/' + parserName + '.js')
-
-    response.locals = {
-        parser: new Parser.default(request.body)
-    }
-}
-  
-export default parserHandler

packages/server/handlers/token.js

@@ -1,23 +0,0 @@
-import DOMPurify from 'isomorphic-dompurify'
-
-/**
- *  handle token
- *
- *  @author Björn Hase <me@herr-hase.wtf>
- *  @license http://opensource.org/licenses/MIT The MIT License
- *  @link https://gitea.node001.net/HerrHase/super-fastify-directus.git
- *
- */
-
-async function tokenHandler(request, response) {
-
-    const token = DOMPurify.sanitize(request.params.token)
-
-    if (token !== process.env.APP_API_TOKEN) {
-        return response
-            .code(401)
-            .send()
-    }
-}
- 
-export default tokenHandler

packages/server/http/api/health.js

@@ -7,8 +7,8 @@
  *
  */
 
-export default async function(fastify, opts) {
+export default async function(fastify, opts)
-
+{
     /**
      *  getting post getting allowed parser class and send over xmpp
      *
@@ -16,9 +16,10 @@ export default async function(fastify, opts) {
      *  @param  {object} response
      *
      */
-    fastify.get('/v1', async function (request, response) {
+    fastify.get('/v1', async function (request, reply)
-        response
+    {
+        reply
             .code(200)
             .send()
     })
-}
+}

packages/server/http/api/webhook.js

@@ -1,6 +1,3 @@
-import tokenHandler from './../../handlers/token.js'
-import parserHandler from './../../handlers/parser.js'
-
 /**
  *  handle webhook
  *
@@ -10,11 +7,8 @@ import parserHandler from './../../handlers/parser.js'
  *
  */
 
-export default async function(fastify, options) {
+export default async function(fastify, opts)
-
+{
-    fastify.addHook('preHandler', tokenHandler)
-    fastify.addHook('preHandler', parserHandler)
-
     /**
      *  getting post getting allowed parser class and send over xmpp
      *
@@ -22,19 +16,36 @@ export default async function(fastify, options) {
      *  @param  {object} response
      *
      */
-    fastify.post('/v1/:parser/:token', async function (request, response) {
+    fastify.post('/v1/:parser([a-zA-Z0-9]{0,255})/:token([a-zA-Z0-9])', async function (request, reply)
+    {
+        if (request.params.token !== process.env.APP_API_TOKEN) {
+            return reply
+                .code(401)
+                .send()
+        }
+
+        // getting allowed parsers from .env as array
+        const allowedParsers = process.env.APP_API_ALLOWED_PARSERS.split(',')
 
-        // getting parser from preHandler: parserHandler
+        if (allowedParsers.indexOf(request.params.parser) === -1) {
-        const result = response.locals.parser.run()
+            return reply
+                .code(404)
+                .send()
+        }
+
+        // getting parser and set body to parser
+        const Parser = await import('./../../parsers/' + request.params.parser + '.js')
+        const parser = new Parser.default(request.body)
+
+        const result = parser.run()
 
         // send event for send xmpp
         fastify.eventEmitter.emit('send-message', {
             'message': result
         })
 
-        response
+        reply
             .code(200)
             .send()
     })
-
+}
-}

packages/server/index.js

@@ -1,18 +1,14 @@
-import server from './_bootstrap.js'
+import server from './bootstrap.js'
 
 // let it rain
 const start = async () => {
     try {
-        await server.listen({
+        await server.listen(process.env.APP_PORT)
-            port: process.env.APP_PORT
+        console.log('Server is running on port ' + process.env.APP_PORT)
-        })
-
-        console.log('Server: start')
-        console.log('Server: running on port ' + process.env.APP_PORT)
     } catch (error) {
         console.log(error)
         process.exit(1)
     }
 }
 
-start()
+start()

packages/server/package.json

@@ -1,19 +1,16 @@
 {
     "private": true,
     "name": "server",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "scripts": {
         "start": "node index.js"
     },
     "type": "module",
     "dependencies": {
-        "@fastify/formbody": "^7.4.0",
+        "@xmpp/client": "^0.13.0",
-        "@fastify/helmet": "^11.0.0",
-        "@fastify/rate-limit": "^8.0.1",
-        "@xmpp/client": "^0.13.1",
         "dotenv": "^10.0.0",
-        "fastify": "^4.19.2",
+        "fastify": "^3.24.0",
-        "fastify-plugin": "^4.5.0",
+        "fastify-formbody": "^5.2.0",
-        "isomorphic-dompurify": "^1.7.0"
+        "isomorphic-dompurify": "^0.16.0"
     }
 }

packages/server/parsers/kuma.js

@@ -1,4 +1,4 @@
-import Parser from './_parser.js'
+import Parser from './parser.js'
 import DOMPurify from 'isomorphic-dompurify'
 
 /**
@@ -9,14 +9,10 @@ import DOMPurify from 'isomorphic-dompurify'
  *  @link https://gitea.node001.net/HerrHase/tellme-bot.git
  *
  */
-class Kuma extends Parser {
+class Kuma extends Parser
-
+{
-    /**
+    parse()
-     *
+    {
-     *  
-     */
-    parse() {
-
         // check for msg and clean it
         if (this.body.msg) {
             this.message = DOMPurify.sanitize(this.body.msg)
@@ -24,4 +20,4 @@ class Kuma extends Parser {
     }
 }
 
-export default Kuma
+export default Kuma

packages/server/parsers/parser.js

@@ -7,14 +7,14 @@
  *  @link https://gitea.node001.net/HerrHase/tellme-bot.git
  *
  */
-class Parser {
+class Parser
-
+{
     /**
      *
      *
      */
-    constructor(body) {
+    constructor(body)
-
+    {
         // body from webhook
         this.body = body
 
@@ -28,10 +28,11 @@ class Parser {
      *  @return string
      *
      */
-    run() {
+    run()
+    {
         this.parse()
         return this.message
     }
 }
 
-export default Parser
+export default Parser

packages/server/parsers/text.js

@@ -1,4 +1,4 @@
-import Parser from './_parser.js'
+import Parser from './parser.js'
 import DOMPurify from 'isomorphic-dompurify'
 
 /**
@@ -9,14 +9,10 @@ import DOMPurify from 'isomorphic-dompurify'
  *  @link https://gitea.node001.net/HerrHase/tellme-bot.git
  *
  */
-class Text extends Parser {
+class Text extends Parser
-
+{
-    /**
+    parse()
-     *
+    {
-     *
-     */
-    parse() {
-        
         // check for msg and clean it
         if (this.body.text) {
             this.message = DOMPurify.sanitize(this.body.text)
@@ -24,4 +20,4 @@ class Text extends Parser {
     }
 }
 
-export default Text
+export default Text

packages/server/plugins/xmpp.js

@@ -21,22 +21,17 @@ export default function (fastify, options, done) {
      */
     async function handleSendMessage(data) {
 
-        let send = false
-
         // Sends a chat message to itself
         const message = xml(
-            'message', {
+            'message',
+            {
                 type: 'chat',
                 to: options.to
             },
             xml('body', {}, data.message)
         )
 
-        try {
+        await xmpp.send(message)
-            await xmpp.send(message)
-        } catch (error) {
-            console.log(error)
-        }
     }
 
     const xmpp = client({
@@ -52,8 +47,9 @@ export default function (fastify, options, done) {
     })
 
     // handle if client goes online
-    xmpp.on('online', (address) => {
+    xmpp.on('online', (address) =>
-        console.log('Xmpp: connected to ' + address)
+    {
+        console.log('connected to ' + address)
 
         // check for event and remove it
         if (fastify.eventEmitter.listeners('send-message').length > 0) {
@@ -70,4 +66,4 @@ export default function (fastify, options, done) {
         .catch(console.log)
 
     done()
-}
+}