zyket 1.0.12 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zyket",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -14,7 +14,9 @@
   "description": "",
   "dependencies": {
     "colors": "^1.4.0",
+    "cors": "^2.8.5",
     "dotenv": "^16.4.7",
+    "express": "^5.1.0",
     "fast-glob": "^3.3.3",
     "mariadb": "^3.4.0",
     "minio": "^8.0.5",

package/src/kernel/HTTPServer.js

@@ -0,0 +1,32 @@
+const http = require('http')
+
+module.exports = class HTTPServer {
+  #server
+  #port
+
+  constructor ({ port }) {
+    if (!port || typeof port !== 'number' || port < 1) {
+      throw new Error('port must be a positive number')
+    }
+
+    this.#port = port
+    this.#server = http.createServer()
+  }
+
+  start () {
+    if (this.isStarted) {
+      throw new Error('Server is already started. Review your code')
+    }
+    console.log(`HTTP Server listening on port ${this.#port}`)
+
+    this.#server.listen(this.#port, () => {})
+  }
+
+  get server () {
+    return this.#server
+  }
+
+  get isStarted () {
+    return this.#server?.listening === true
+  }
+}

package/src/kernel/index.js

@@ -2,15 +2,16 @@ const {ContainerBuilder} = require("node-dependency-injection");
 const EnvManager = require("../utils/EnvManager");
 const fs = require("fs");
 const path = require("path");
+const HTTPServer = require("./HTTPServer");
 
 module.exports = class Kernel {
   container;
   #services;
   #onSocketConnection;
+  #httpServer;
 
   constructor({ 
-    services = [],
-    onConnection = () => { },
+    services = []
   } = { }) {
     this.container = new ContainerBuilder();
     this.#services = services;
@@ -24,14 +25,20 @@ module.exports = class Kernel {
   async boot(clearConsole = true, secretsPath = `${process.cwd()}/.env`) {
     EnvManager.load(secretsPath, false);
     if(clearConsole) process.stdout.write("\u001b[2J\u001b[0;0H");
+    this.#httpServer = new HTTPServer({ port: Number(process.env.PORT) || 3000 });
+    await this.#httpServer.start();
+
     const services = require("../services");
 
     await this.#registerServices(services);
     await this.#registerServices(this.#services);
 
+
     for (const [name] of [...services, ...this.#services]) {
       this.container.get('logger').debug(`Booting service ${name}`);
-      await this.container.get(name).boot();
+      await this.container.get(name).boot({
+        httpServer: this.#httpServer.server,
+      });
     }
   }
 

package/src/services/express/Express.js

@@ -0,0 +1,33 @@
+const Service = require("../Service");
+const express = require("express");
+const cors = require("cors");
+
+
+module.exports = class Express extends Service {
+  #container;
+  #app;
+  #httpServer;
+
+  constructor(container) {
+    super("express");
+    this.#container = container;
+  }
+
+  async boot({ httpServer } = {}) {
+    if (!httpServer) {
+      throw new Error("HTTP server is not available");
+    }
+
+    this.#httpServer = httpServer;
+    this.#app = express();
+
+    this.#app.use(express.json({ limit: `100mb` }))
+    this.#app.use(cors({
+      origin: '*'
+    }))
+
+    this.#httpServer.on("request", this.#app);
+
+    this.#container.get('logger').info(`Express is running on http://localhost:${httpServer.address().port}`);
+  }
+}

package/src/services/express/Middleware.js

@@ -0,0 +1,2 @@
+export default class Middleware {
+}

package/src/services/express/Route.js

@@ -0,0 +1,2 @@
+export default class Route {
+}

package/src/services/express/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  Express: require("./Express"),
+}

package/src/services/index.js

@@ -2,6 +2,7 @@ const Database = require("./database");
 const Cache = require("./cache");
 const S3 = require("./s3");
 const { SocketIO } = require("./socketio");
+const { Express } = require("./express");
 
 module.exports = [
   ["logger", require("./logger"), ["@service_container", process.env.LOG_DIRECTORY || `${process.cwd()}/logs`, process.env.DEBUG === "true"]],
@@ -9,5 +10,6 @@ module.exports = [
   process.env.DATABASE_URL ? ["database", Database, ["@service_container", process.env.DATABASE_URL]] : null,
   process.env.CACHE_URL ? ["cache", Cache, ["@service_container", process.env.CACHE_URL]] : null,
   (process.env.S3_ENDPOINT && process.env.S3_ACCESS_KEY && process.env.S3_SECRET_KEY) ? ["s3", S3, ["@service_container", process.env.S3_ENDPOINT, process.env.S3_PORT, process.env.S3_USE_SSL === "true", process.env.S3_ACCESS_KEY, process.env.S3_SECRET_KEY]] : null,
-  ["socketio", SocketIO, ["@service_container", process.env.PORT || 3000]],
+  ["socketio", SocketIO, ["@service_container"]],
+  ["express", Express, ["@service_container"]]
 ].filter(Boolean);

package/src/services/socketio/SocketIO.js

@@ -8,18 +8,16 @@ const Middleware = require("./Middleware");
 
 
 module.exports = class SocketIO extends Service {
-  port;
   #container;
   io;
   middlewares = {};
   
-  constructor(container, port, onConnection = () => { }) {
+  constructor(container) {
     super("socketio");
-    this.port = port || 3000;
     this.#container = container;
   }
 
-  async boot() {
+  async boot({ httpServer } = {}) {
     const middlewares = await this.#loadMiddlewaresFromFolder(path.join(process.cwd(), "src", "middlewares"));
     for (const middleware of middlewares) {
       this.middlewares[middleware.name] = middleware;
@@ -59,8 +57,8 @@ module.exports = class SocketIO extends Service {
       });
     });
 
-    this.io.listen(this.port);
-    this.#container.get('logger').info(`Socket.IO is running on port ws://localhost:${this.port}`);
+    this.io.listen(httpServer);
+    this.#container.get('logger').info(`Socket.IO is running on ws://localhost:${httpServer.address().port}`);
   }
 
   async #loadConnectionHandler() {