zyket 1.0.2 → 1.0.4

package/README.md

@@ -30,7 +30,7 @@ const { Handler } = require("zyket");
 module.exports = class MessageHandler extends Handler {
     middlewares = ["default"];
 
-    async handle({ container, socket, data }) {
+    async handle({ container, socket, data, io }) {
         container.get("logger").info("Message handler");
     }
 };
@@ -48,7 +48,7 @@ Middlewares allow you to process data before it reaches the handler. They can be
 const { Middleware } = require("zyket");
 
 module.exports = class DefaultMiddleware extends Middleware {
-    async handle({ container, socket }) {
+    async handle({ container, socket, io }) {
         container.get("logger").info("Default middleware");
     }
 };

package/bin/cli.js

@@ -0,0 +1,32 @@
+const prompts = require('prompts');
+
+(async () => {
+	process.stdout.write("\u001b[2J\u001b[0;0H");
+  const response = await prompts({
+		type: 'select',
+		name: 'value',
+		message: '[ZYKET] What do you want to do?',
+		choices: [
+			{ title: 'Install Template', value: 'install-template', description: 'Install a new template', disabled: false },
+			{ title: 'Remove Template', value: 'remove-template', description: 'Remove an existing template', disabled: false }
+		],
+		initial: 0
+	});
+
+  const actions = {
+		'install-template': async () => {
+			console.log('Installing template');
+		},
+		'remove-template': async () => {
+			console.log('Removing template');
+		}
+	};
+
+	await actions[response.value]();
+
+	await new Promise((resolve) => {
+		setTimeout(() => {
+			resolve();
+		}, 2000);
+	});
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zyket",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -16,6 +16,7 @@
     "mariadb": "^3.4.0",
     "minio": "^8.0.5",
     "node-dependency-injection": "^3.2.2",
+    "prompts": "^2.4.2",
     "redis": "^4.7.0",
     "sequelize": "^6.37.6",
     "socket.io": "^4.8.1"

package/src/services/database/index.js

@@ -18,7 +18,7 @@ module.exports = class Database extends Service {
   
   async boot() {
     this.#createModelsFolder();
-    this.sequelize = new Sequelize(process.env.DATABASE_URL, {
+    this.sequelize = new Sequelize(this.#databaseUrl, {
       dialect: process.env.DATABASE_DIALECT || 'mariadb',
       logging: (msg) => this.#container.get('logger').debug(msg),
       operatorsAliases: 0,

package/src/services/index.js

@@ -1,10 +1,11 @@
-const Database = require("./Database");
-const Cache = require("./Cache");
-const S3 = require("./S3");
+const Database = require("./database");
+const Cache = require("./cache");
+const S3 = require("./s3");
 const { SocketIO } = require("./socketio");
 
 module.exports = [
   ["logger", require("./Logger"), ["@service_container", process.env.LOG_DIRECTORY || `${process.cwd()}/logs`, process.env.DEBUG === "true"]],
+  ["template-manager", require("./template-manager"), ["@service_container"]],
   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,

package/src/services/socketio/SocketIO.js

@@ -40,9 +40,9 @@ module.exports = class SocketIO extends Service {
           this.#container.get('logger').warn(`You are using a middleware that does not exist`);
           continue;
         }
-        middleware.handle({ container: this.#container, socket });
+        middleware.handle({ container: this.#container, socket, io: this.io });
       }
-      connectionHandler.handle({ container: this.#container, socket });
+      connectionHandler.handle({ container: this.#container, socket, io: this.io });
       handlers.forEach((handler) => {
         const handlerMiddlewares = (handler?.middlewares || []).map(mdl => this.middlewares[mdl])
         socket.on(handler.event, async (data) => {
@@ -52,9 +52,9 @@ module.exports = class SocketIO extends Service {
               this.#container.get('logger').warn(`You are using a middleware that does not exist`);
               continue;
             }
-            await middleware.handle({ container: this.#container, socket });
+            await middleware.handle({ container: this.#container, socket, io: this.io });
           }
-          return await handler.handle({ container: this.#container, socket, data });
+          return await handler.handle({ container: this.#container, socket, data, io: this.io });
         });
       });
     });
@@ -65,15 +65,8 @@ module.exports = class SocketIO extends Service {
 
   async #loadConnectionHandler() {
     const connectionHandlerExists  = fs.existsSync(path.join(process.cwd(), "src", "handlers", "connection.js"));
-    /* if exists require, otherwise create a default one */
     if(!connectionHandlerExists) {
-      fs.writeFileSync(path.join(process.cwd(), "src", "handlers", "connection.js"), `const { Handler } = require("zyket");
-
-module.exports = class ConnectionHandler extends Handler {
-  async handle({ container, socket }) {
-    container.get("logger").info("New connection");
-  }
-};`);
+      this.#container.get('template-manager').installFile('default/src/handlers/connection', path.join(process.cwd(), "src", "handlers", "connection.js"));
     }
     return require(path.join(process.cwd(), "src", "handlers", "connection.js"));
   }
@@ -94,16 +87,7 @@ module.exports = class ConnectionHandler extends Handler {
     if (fs.existsSync(handlersFolder) && !overwrite) return;
     this.#container.get('logger').info(`Creating handlers folder at ${handlersFolder}`);
     fs.mkdirSync(handlersFolder);
-    // create a default handler
-    fs.writeFileSync(path.join(handlersFolder, "message.js"), `const { Handler } = require("zyket");
-module.exports = class MessageHandler extends Handler {
-  event = "message";
-  middlewares = ["default"];
-
-  async handle({ container, socket, data }) {
-    container.get("logger").info("Message handler");
-  }
-};`);
+    this.#container.get('template-manager').installFile('default/src/handlers/message', path.join(handlersFolder, "message.js"));
   }
 
   async #loadMiddlewaresFromFolder(middlewaresFolder) {
@@ -123,13 +107,7 @@ module.exports = class MessageHandler extends Handler {
     if (fs.existsSync(middlewaresFolder) && !overwrite) return;
     this.#container.get('logger').info(`Creating middlewares folder at ${middlewaresFolder}`);
     fs.mkdirSync(middlewaresFolder);
-    // create a default middleware
-    fs.writeFileSync(path.join(middlewaresFolder, "default.js"), `const { Middleware } = require("zyket");
-module.exports = class DefaultMiddleware extends Middleware {
-  async handle({ container, socket }) {
-    container.get("logger").info("Default middleware");
-  }
-};`);
+    this.#container.get('template-manager').installFile('default/src/middlewares/default', path.join(middlewaresFolder, "default.js"));
   }
 
   stop() {

package/src/services/template-manager/index.js

@@ -0,0 +1,67 @@
+const fg = require('fast-glob');
+const Service = require('../Service');
+const path = require('path');
+const fs = require('fs');
+
+module.exports = class TemplateManager extends Service {
+  #container;
+  templates = {}
+
+  constructor(container) {
+    super('template-manager');
+    this.#container = container;
+  }
+
+  async boot() {
+    const zyketTemplates = await fg(['**/*.js'], {
+      cwd: path.join(__dirname, '../../templates'),
+    });
+    for (const template of zyketTemplates) {
+      // need to copy full file  and relation with the name on templates variable
+      const templatePath = path.join(__dirname, '../../templates', template);
+      const templateContent = fs.readFileSync(templatePath, 'utf-8');
+      this.templates[template.replace('.js', '')] = templateContent;   
+    }
+
+    this.#container.get('logger').info(`Loaded ${this.templates.length} templates`);
+  }
+
+  installFile(fileName, location) {
+    const template = this.templates[fileName];
+    if (!template) throw new Error(`Template ${fileName} not found`);
+    return fs.writeFileSync(location, template);
+  }
+
+  installTemplate(templateName) {
+    const template = this.getTemplates().find((t) => t === templateName);
+    if (!template) throw new Error(`Template ${templateName} not found`);
+    const files = this.getTemplate(templateName);
+    
+    for (const file of files) {
+      const fileName = file.split('/').slice(1).join('/');
+      const fileLocation = path.join(process.cwd(), fileName);
+      if (fs.existsSync(fileLocation)) throw new Error(`File ${file} already exists`);
+    }
+
+    for (const file of files) {
+      const fileName = file.split('/').slice(1).join('/');
+      const template = this.templates[file];
+      const fileLocation = path.join(process.cwd(), fileName);
+      fs.writeFileSync(fileLocation, template);
+    }
+  }
+
+  getTemplates() {
+    const uniqueTemplates = new Set();
+    for (const template of Object.keys(this.templates)) {
+      uniqueTemplates.add(template.split('/')[0]);
+    }
+    return Array.from(uniqueTemplates);
+  }
+
+  getTemplate(templateName) {
+    const files = Object.keys(this.templates).filter((t) => t.startsWith(templateName));
+    if (files.length === 0) throw new Error(`Template ${templateName} not found`);
+    return files
+  }
+}

package/src/templates/default/src/handlers/connection.js

@@ -0,0 +1,7 @@
+const { Handler } = require("zyket");
+
+module.exports = class ConnectionHandler extends Handler {
+  async handle({ container, socket, io }) {
+    container.get("logger").info("New connection");
+  }
+};

package/src/templates/default/src/handlers/message.js

@@ -0,0 +1,9 @@
+const { Handler } = require("zyket");
+
+module.exports = class MessageHandler extends Handler {
+  middlewares = ["default"];
+
+  async handle({ container, socket, data, io }) {
+    container.get("logger").info("Message handler");
+  }
+};

package/src/templates/default/src/middlewares/default.js

@@ -0,0 +1,6 @@
+const { Middleware } = require("zyket");
+module.exports = class DefaultMiddleware extends Middleware {
+  async handle({ container, socket, io }) {
+    container.get("logger").info("Default middleware");
+  }
+};