From 505f64f70bce28b4f52771c8ab4c0042d8377118 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Sat, 22 Feb 2025 14:24:26 -0300 Subject: [PATCH] melhorias em log --- dist/logger.d.ts | 3 +++ dist/logger.js | 27 +++++++++++++++++---------- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 26 +++++++++++++++++--------- 5 files changed, 39 insertions(+), 21 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index 3aa0704..cb9dd10 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -1,3 +1,6 @@ +export declare const postLogger: ({ objeto, }: { + objeto: any; +}) => Promise<[objeto: any, erro?: string]>; type tipoLevel = "info" | "warn" | "error"; type tipoOpSessao = { inquilino: string; diff --git a/dist/logger.js b/dist/logger.js index cc42171..d73cd50 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -3,11 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.logger = void 0; +exports.logger = exports.postLogger = void 0; const cross_fetch_1 = __importDefault(require("cross-fetch")); const variaveisComuns_1 = require("./variaveisComuns"); const LOKI_BASE_URL = "https://log.idz.one"; const LOKI_ENDPOINT = "/loki/api/v1/push"; +const postLogger = async ({ objeto, }) => { + const response = await (0, cross_fetch_1.default)(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(objeto), + }).catch((a) => a); + if (!response.ok) { + return [objeto, `Erro ${response.status}: ${await response?.text?.()}`]; + } + else { + return [objeto]; + } +}; +exports.postLogger = postLogger; const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, mensagem, op_tipoLog) => { let { __filename, detalhes, local } = op_tipoLog || {}; if (!eProducao) { @@ -36,15 +50,8 @@ const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, ], }; const objeto = { streams: [payload] }; - const response = await (0, cross_fetch_1.default)(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify(objeto), - }).catch((a) => a); - if (!response.ok) { - return [objeto, `Erro ${response.status}: ${await response?.text?.()}`]; - } - return [objeto]; + const response = await (0, exports.postLogger)({ objeto }); + return response; }; exports.logger = logger; //# sourceMappingURL=logger.js.map \ No newline at end of file diff --git a/dist/logger.js.map b/dist/logger.js.map index 15ecedb..6aeb4e7 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAelC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE,CACzC,KAAK,EACH,KAAgB,EAChB,QAAgB,EAChB,UAAoB,EACsB,EAAE;IAC5C,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;IAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC;IAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QAC1C,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;IAED,OAAO,CAAC,MAAM,CAAC,CAAA;AACjB,CAAC,CAAA;AArDU,QAAA,MAAM,UAqDhB"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAElC,MAAM,UAAU,GAAG,KAAK,EAAE,EAC/B,MAAM,GACU,EAAyC,EAAE;IAC3D,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;QACpE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;QAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;KAC7B,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,CAAA;IACjB,CAAC;AACH,CAAC,CAAA;AAbY,QAAA,UAAU,cAatB;AAeM,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE,CACzC,KAAK,EACH,KAAgB,EAChB,QAAgB,EAChB,UAAoB,EACsB,EAAE;IAC5C,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;IAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC;IAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;IAChE,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;IAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;QAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACrE,CAAC,CAAC,QAAQ,CAAA;IAEZ,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;QAC1C,MAAM,EAAE;YACN;gBACE,SAAS;gBACT,OAAO,EAAE,sBAAsB;aAChC;SACF;KACF,CAAA;IAED,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAA;IAErC,MAAM,QAAQ,GAAG,MAAM,IAAA,kBAAU,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAE7C,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AA9CU,QAAA,MAAM,UA8ChB"} \ No newline at end of file diff --git a/package.json b/package.json index b7bb25f..6545413 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.82.0", + "version": "0.83.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index a3b58e4..5d6289f 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -4,6 +4,21 @@ import { nomeVariavel } from "./variaveisComuns" const LOKI_BASE_URL = "https://log.idz.one" const LOKI_ENDPOINT = "/loki/api/v1/push" +export const postLogger = async ({ + objeto, +}: { objeto: any }): Promise<[objeto: any, erro?: string]> => { + const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(objeto), + }).catch((a) => a) + if (!response.ok) { + return [objeto, `Erro ${response.status}: ${await response?.text?.()}`] + } else { + return [objeto] + } +} + type tipoLevel = "info" | "warn" | "error" type tipoOpSessao = { @@ -60,14 +75,7 @@ export const logger = const objeto = { streams: [payload] } - const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify(objeto), - }).catch((a) => a) - if (!response.ok) { - return [objeto, `Erro ${response.status}: ${await response?.text?.()}`] - } + const response = await postLogger({ objeto }) - return [objeto] + return response }