@ejfdelgado/ejflab-back 1.34.5 → 1.35.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ejfdelgado/ejflab-back",
-  "version": "1.34.5",
+  "version": "1.35.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ejfdelgado/ejflab-back.git"

package/srv/PostgresSrv.mjs

@@ -113,7 +113,14 @@ export class PostgresSrv {
     }
 
     static async executeText(sql, model = {}, client = null) {
-        const sqlRendered = PostgresSrv.renderer.render(sql, model);
+        let sqlRendered = "";
+        if (typeof sql == "string") {
+            sqlRendered = PostgresSrv.renderer.render(sql, model);
+        } else if (sql instanceof Array) {
+            sqlRendered = sql.map((sqlText, index) => {
+                return PostgresSrv.renderer.render(sqlText, model[index]);
+            }).join("\n");
+        }
         consoleSrv.log(sqlRendered);
         let localClient = false;
         if (!client) {
@@ -129,13 +136,27 @@ export class PostgresSrv {
     }
 
     static async executeFile(path, model = {}, client = null) {
-        const sql = fs.readFileSync(path, "utf-8");
-        return await PostgresSrv.executeText(sql, model, client);
+        if (typeof path == "string") {
+            const sql = fs.readFileSync(path, "utf-8");
+            return await PostgresSrv.executeText(sql, model, client);
+        } else if (path instanceof Array) {
+            const plainSqlArray = path.map((singlePath) => {
+                return fs.readFileSync(singlePath, "utf-8");
+            });
+            return await PostgresSrv.executeText(plainSqlArray, model, client);
+        }
     }
 
     static async executeFileInTransaction(path, model = {}) {
-        const sql = fs.readFileSync(path, "utf-8");
-        return await PostgresSrv.executeTextInTransaction(sql, model);
+        if (typeof path == "string") {
+            const sql = fs.readFileSync(path, "utf-8");
+            return await PostgresSrv.executeTextInTransaction(sql, model);
+        } else if (path instanceof Array) {
+            const plainSqlArray = path.map((singlePath) => {
+                return fs.readFileSync(singlePath, "utf-8");
+            });
+            return await PostgresSrv.executeTextInTransaction(plainSqlArray, model);
+        }
     }
 
     static createPool() {

package/srv/SocketIOCall.mjs

@@ -36,6 +36,7 @@ import { CloseVideoChatProcessor } from "./callprocessors/CloseVideoChatProcesso
 import { IncludeOtherPeersProcessor } from "./callprocessors/IncludeOtherPeersProcessor.mjs";
 import { RegisterSessionProcessor } from "./callprocessors/RegisterSessionProcessor.mjs";
 import { UnregisterSessionProcessor } from "./callprocessors/UnregisterSessionProcessor.mjs";
+import { General } from "./common/General.mjs";
 
 import stream from "stream";
 
@@ -53,6 +54,7 @@ export class SocketIOCall {
     static hookProcessors = {};
     static internalBus = new EventEmitter();
     static sessionsByProvider = {};
+    static attachedFiles = {};
 
     static {
         // check dead sockets
@@ -89,6 +91,14 @@ export class SocketIOCall {
         }, 4000);
     }
 
+    static storeAttachedFile(id, byteArray, fileName, mimeType) {
+        SocketIOCall.attachedFiles[id] = {
+            byteArray,
+            fileName,
+            mimeType,
+        };
+    }
+
     static echoLog(message) {
         if (process.env.ENV != "pro") {
             console.log(message);
@@ -641,4 +651,23 @@ export class SocketIOCall {
     static getSocketImage(socketId) {
         return SocketIOCall.socketToImage[socketId];
     }
+
+    static async getAttachedFile(req, res, next) {
+        const attachedId = General.readParam(req, "id", null, true);
+        const attachedData = SocketIOCall.attachedFiles[attachedId];
+        if (!attachedData) {
+            res.status(204).end();
+            return;
+        }
+        const { byteArray, fileName, mimeType } = attachedData;
+        const buffer = Buffer.from(byteArray);
+        const safeName = encodeURIComponent(fileName);
+        res.setHeader("Content-Disposition", `inline; filename=${safeName}`);
+        res.setHeader("Content-Type", mimeType);
+        res.setHeader("X-Frame-Options", "ALLOWALL");
+        res.setHeader("Content-Security-Policy", "frame-ancestors 'self' http://localhost:4200;");
+        res.setHeader("Permissions-Policy", "fullscreen=*");
+
+        res.send(buffer); // send raw bytes
+    }
 }

package/srv/callprocessors/SendChatProcessor.mjs

@@ -1,6 +1,6 @@
 import { SimpleObj } from "@ejfdelgado/ejflab-common/src/SimpleObj.js";
 import { GenericProcessor } from "./GenericProcessor.mjs";
-
+import { v4 as uuidv4 } from 'uuid';
 
 export class SendChatProcessor extends GenericProcessor {
     MAX_COUNT_TIMESTAMS = 6;
@@ -8,8 +8,14 @@ export class SendChatProcessor extends GenericProcessor {
         super(context, io, socket);
     }
     execute(args) {
-        const { text, author, open } = args;
+        const { text, author, open, bytes, fileName, mimeType } = args;
         const room = this.context.getRoomFromSocket(this.socket);
+        let attachedFileId = null;
+        if (bytes) {
+            attachedFileId = room + "_" + uuidv4().replace(/-/g, '_');
+            // Store the bytes using this idKey
+            this.context.storeAttachedFile(attachedFileId, bytes, fileName, mimeType);
+        }
         const roomData = this.context.getRoomLiveTupleModel(room);
         if (!roomData.model.data) {
             roomData.model.data = {};
@@ -18,13 +24,17 @@ export class SendChatProcessor extends GenericProcessor {
             roomData.model.data.chat = [];
         }
         const now = new Date().getTime();
-        roomData.model.data.chat.push({
+        const chatEntry = {
             text,
             date: now,
             author: {
                 uid: author,
             },
-        });
+        };
+        if (attachedFileId) {
+            chatEntry.attachedId = attachedFileId;
+        }
+        roomData.model.data.chat.push(chatEntry);
         let changes = roomData.builder.trackDifferences(roomData.model, [], null, ["data", "data.chat"]);
         roomData.model = roomData.builder.affect(changes);
         // Also notify last message time