exodus-framework 2.0.9996 → 2.0.9998

package/lib/services/file/contracts/meta.d.ts

@@ -0,0 +1,8 @@
+export interface IMetaFile {
+    originalName: string;
+    extension: string;
+    size: number;
+    md5: string;
+    cachedAt: string;
+}
+//# sourceMappingURL=meta.d.ts.map

package/lib/services/file/contracts/meta.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../../src/services/file/contracts/meta.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;CAClB"}

package/lib/services/file/contracts/meta.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/services/file.js

@@ -35,9 +35,9 @@ class FileService extends _service.default {
     });
   }
   async save(filename, destiny) {
-    const p = _app.Core.settings.getAppication().filePaths.temporary + '/' + filename;
-    const d = _app.Core.settings.getAppication().filePaths[destiny] + '/' + filename;
-    return await fsPromisses.rename(p, d).then(() => d).catch(e => {
+    const tempFilePath = _app.Core.settings.getAppication().filePaths.temporary + '/' + filename;
+    const saveFilePath = _app.Core.settings.getAppication().filePaths[destiny] + '/' + filename;
+    return await fsPromisses.rename(tempFilePath, saveFilePath).then(() => saveFilePath).catch(e => {
       _logger.default.logger().error({
         filename,
         destiny,

package/lib/services/index.d.ts

@@ -10,5 +10,6 @@ export { default as LoggerService } from './logger';
 export { default as EcosystemService } from './ecosystem';
 export { default as TestService } from './test';
 export { default as DatabaseService } from './database';
+export { default as FileLibraryService } from './file/FileLibrary';
 export * from './task';
 //# sourceMappingURL=index.d.ts.map

package/lib/services/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,YAAY,CAAC;AACxD,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/services/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACnE,cAAc,QAAQ,CAAC"}

package/lib/services/index.js

@@ -15,7 +15,8 @@ var _exportNames = {
   LoggerService: true,
   EcosystemService: true,
   TestService: true,
-  DatabaseService: true
+  DatabaseService: true,
+  FileLibraryService: true
 };
 Object.defineProperty(exports, "DatabaseService", {
   enumerable: true,
@@ -35,6 +36,12 @@ Object.defineProperty(exports, "ExpressService", {
     return _express.default;
   }
 });
+Object.defineProperty(exports, "FileLibraryService", {
+  enumerable: true,
+  get: function () {
+    return _FileLibrary.default;
+  }
+});
 Object.defineProperty(exports, "FileService", {
   enumerable: true,
   get: function () {
@@ -101,6 +108,7 @@ var _logger = _interopRequireDefault(require("./logger"));
 var _ecosystem = _interopRequireDefault(require("./ecosystem"));
 var _test = _interopRequireDefault(require("./test"));
 var _database = _interopRequireDefault(require("./database"));
+var _FileLibrary = _interopRequireDefault(require("./file/FileLibrary"));
 var _task = require("./task");
 Object.keys(_task).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/utils/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGzF,eAAO,MAAM,MAAM,WASjB,CAAC;AAgFH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GACnF,YAAY,CAAC,CAAC,CAAC,CAwCjB;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,EAClC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,iBAalD"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAIzF,eAAO,MAAM,MAAM,WASjB,CAAC;AAqGH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GACnF,YAAY,CAAC,CAAC,CAAC,CAwCjB;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC,EAClC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,iBAalD"}

package/lib/utils/database.js

@@ -9,6 +9,7 @@ exports.processFilters = processFilters;
 var _sequelize = require("sequelize");
 var _core = _interopRequireDefault(require("../app/core"));
 var _error = require("../app/error");
+var _dateFns = require("date-fns");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const mainDb = exports.mainDb = new _sequelize.Sequelize({
   database: _core.default.settings.getDatabase().main.database,
@@ -78,9 +79,26 @@ function processDateCondition(key, cond) {
     simpleWhere[1] = [(0, _sequelize.literal)(`DATE(${key}) < '${cond.lt}'`)];
   }
   if (cond.between !== undefined) {
+    const start = cond.between[0];
+    const end = cond.between[1];
+
+    // console.log(start, end);
+
+    let startDate = (0, _dateFns.parseISO)(start);
+    if ((0, _dateFns.isValid)(startDate) && !hasTime(start)) {
+      // console.log('Ajustando início do dia');
+      startDate = (0, _dateFns.startOfDay)(startDate);
+    }
+    let endDate = (0, _dateFns.parseISO)(end);
+    if ((0, _dateFns.isValid)(endDate) && !hasTime(end)) {
+      // console.log('Ajustando fim do dia');
+      endDate = (0, _dateFns.endOfDay)(endDate);
+    }
     simpleWhere[1] = {
-      [_sequelize.Op.between]: cond.between.map(d => new Date(d))
+      [_sequelize.Op.between]: [startDate, endDate]
     };
+
+    // console.log('Condição entre processada:', simpleWhere[1]);
   }
   if (cond.notBetween !== undefined) {
     simpleWhere[1] = {
@@ -154,4 +172,8 @@ async function InsertIndexes(context, tableName, indexes) {
       console.log('tentativa de adicionar index falhou');
     }
   }
+}
+function hasTime(str) {
+  const timeRegex = /\b\d{1,2}:\d{2}(:\d{2})?\b/;
+  return timeRegex.test(str);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exodus-framework",
-  "version": "2.0.9996",
+  "version": "2.0.9998",
   "description": "Exodus Framework",
   "author": "jhownpaixao",
   "license": "ISC",
@@ -38,6 +38,7 @@
     "express-jwt": "^8.4.1",
     "express-requests-logger": "^4.0.1",
     "fs": "^0.0.1-security",
+    "fs-extra": "^11.3.0",
     "install": "^0.13.0",
     "lodash": "^4.17.21",
     "mariadb": "^3.3.1",
@@ -69,6 +70,7 @@
     "@types/cors": "^2.8.17",
     "@types/express": "^4.17.21",
     "@types/express-requests-logger": "^4.0.0",
+    "@types/fs-extra": "^11.0.4",
     "@types/lodash": "^4.17.7",
     "@types/multer": "^1.4.12",
     "@types/node": "^22.5.0",

package/lib/services/file_new.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=file_new.d.ts.map

package/lib/services/file_new.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"file_new.d.ts","sourceRoot":"","sources":["../../src/services/file_new.ts"],"names":[],"mappings":""}

package/lib/services/file_new.js

@@ -1,136 +0,0 @@
-// import { createHash } from 'crypto';
-// import * as fs from 'fs';
-// import * as fsPromisses from 'fs/promises';
-// import NodeCache from 'node-cache';
-// import { Core, ErrorHandler } from '../app';
-// import Service from '../app/classes/service';
-// import { TFilePathSettings } from '../contracts/settings';
-// import LoggerService from './logger';
-
-// class FileService extends Service {
-//   protected cache: NodeCache;
-
-//   async onServiceInit() {
-//     this.cache = new NodeCache();
-//     await Promise.all([this.checkPaths(), this.cleanTemp()]);
-//   }
-
-//   //# Managment
-//   async save(filename: string, destiny: keyof TFilePathSettings) {
-//     const p = Core.settings.getAppication().filePaths.temporary + '/' + filename;
-//     const d = Core.settings.getAppication().filePaths[destiny] + '/' + filename;
-
-//     try {
-//       const md5 = await this.getMD5FromFile(p);
-
-//       if (this.cache.has(md5)) {
-//         return true;
-//       }
-
-//       await this.move(p, d);
-//       this.cache.set(md5, d);
-
-//       return true;
-//     } catch (error) {
-//       new ErrorHandler('Não foi possível salva o arquivo', error);
-//       return false;
-//     }
-//   }
-//   async delete(filename: string, destiny: keyof TFilePathSettings) {
-//     const d = Core.settings.getAppication().filePaths[destiny] + '/' + filename;
-//     return await fsPromisses
-//       .unlink(d)
-//       .then(() => true)
-//       .catch((e) => {
-//         LoggerService.logger().error({ filename, destiny, erro: e }, 'Não foi possível deletar o arquivo');
-//         return false;
-//       });
-//   }
-//   async move(to: string, from: string) {
-//     return await fsPromisses
-//       .rename(to, from)
-//       .then((d) => d)
-//       .catch((e) => {
-//         LoggerService.logger().error({ to, from, erro: e }, 'Não foi possível mover o arquivo');
-//         return false;
-//       });
-//   }
-
-//   //# Getters
-//   public getBuffer(filename: string, destiny: keyof TFilePathSettings) {
-//     const d = Core.settings.getAppication().filePaths[destiny] + '/' + filename;
-
-//     return new Promise((resolve, reject) => {
-//       this.getMD5FromFile(d).then();
-
-//       fsPromisses
-//         .readFile(path)
-//         .then(cb)
-//         .catch((e) => {
-//           logger.error({ path, erro: e }, 'Não foi possível ler o arquivo', path);
-//         });
-//     });
-//   }
-//   /* public getStatByMD5(filename: string, destiny: keyof TFilePathSettings) {
-//     const p = this.getPathByMD5(md5);
-//     if (!p) return;
-//     return fs.statSync(p);
-//   } */
-
-//   //# Utils
-//   private async checkPaths() {
-//     for (const path of Object.values(Core.settings.getAppication().filePaths)) {
-//       !fs.existsSync(path) && fs.mkdirSync(path, { recursive: true });
-//     }
-//   }
-//   private async cleanTemp() {
-//     this.listFiles('temporary', (files) => {
-//       for (const file of files) {
-//         const p = Core.settings.getAppication().filePaths.temporary + '/' + file;
-//         fs.rmSync(p, { recursive: true });
-//       }
-//     });
-//   }
-//   public listFiles(origin: keyof TFilePathSettings, cb: (file: string[]) => void) {
-//     const p = Core.settings.getAppication().filePaths[origin];
-//     fs.readdir(p, (_, file) => cb(file));
-//   }
-
-//   //# MD5
-//   public getMD5FromFile(filePath: string) {
-//     return new Promise<string>((resolve, reject) => {
-//       const hash = createHash('md5');
-//       const stream = fs.createReadStream(filePath);
-
-//       stream.on('data', (dados) => hash.update(dados));
-//       stream.on('error', (error) => reject(error));
-//       stream.on('end', () => resolve(hash.digest('hex')));
-//     });
-//   }
-//   public getMD5FromBuffer(buffer: Buffer) {
-//     const hash = createHash('md5');
-//     hash.update(buffer);
-//     return hash.digest('hex');
-//   }
-
-//   //# Cache
-//   public loadCache() {}
-//   public async hasCached(filePath: string) {
-//     const md5 = await this.getMD5FromFile(filePath);
-
-//     return this.cache.has(md5);
-//   }
-//   //!imcomplete
-//   /* public async loadItem(filename: string, origin: keyof TFilePathSettings) {
-//     try {
-//       const p = Core.settings.getAppication().filePaths[origin] + '/' + filename;
-//       const md5 = await this.getMD5FromFile(p);
-
-//       return md5;
-//     } catch (error) {
-//       return;
-//     }
-//   } */
-// }
-// export default FileService;
-"use strict";