diff --git a/dist/logger.d.ts b/dist/logger.d.ts index 76bef18..f6b7539 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -1,14 +1,15 @@ type tipoAmb = { - app: string; inquilino: string; usuario: string; - eProducao: boolean; }; type tipoLog = { detalhes?: unknown[]; __filename?: string; }; -export declare const logger: ({ inquilino, app, eProducao, usuario }: tipoAmb) => { +export declare const logger: ({ app, eProducao }: { + app: string; + eProducao: boolean; +}) => ({ inquilino, usuario }: tipoAmb) => { info: (mensagem: string, op_tipoLog?: tipoLog) => Promise; warn: (mensagem: string, op_tipoLog?: tipoLog) => Promise; error: (mensagem: string, op_tipoLog?: tipoLog) => Promise; diff --git a/dist/logger.js b/dist/logger.js index b0f9321..737c6ae 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -7,7 +7,7 @@ exports.logger = void 0; const cross_fetch_1 = __importDefault(require("cross-fetch")); const LOKI_BASE_URL = "https://log.idz.one"; const LOKI_ENDPOINT = "/loki/api/v1/push"; -const logger = ({ inquilino, app, eProducao, usuario }) => { +const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => { const f = (level) => async (mensagem, op_tipoLog) => { let { __filename, detalhes } = op_tipoLog || {}; if (!eProducao) { diff --git a/dist/logger.js.map b/dist/logger.js.map index 08fe8ef..d26ce2c 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;AAEpC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAgBlC,MAAM,MAAM,GAAG,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAW,EAAE,EAAE;IACxE,MAAM,CAAC,GACL,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;QACrE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;QAE/C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;YAC9B,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;YACrE,CAAC,CAAC,QAAQ,CAAA;QAEZ,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1C,MAAM,EAAE;gBACN;oBACE,SAAS;oBACT,OAAO,EAAE,sBAAsB;iBAChC;aACF;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IAEH,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;KAClB,CAAA;AACH,CAAC,CAAA;AA7CY,QAAA,MAAM,UA6ClB"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AAEpC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAclC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAW,EAAE,EAAE;IAClC,MAAM,CAAC,GACL,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;QACrE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;QAE/C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;YAC9B,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;YACrE,CAAC,CAAC,QAAQ,CAAA;QAEZ,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1C,MAAM,EAAE;gBACN;oBACE,SAAS;oBACT,OAAO,EAAE,sBAAsB;iBAChC;aACF;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IAEH,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;KAClB,CAAA;AACH,CAAC,CAAA;AA/CU,QAAA,MAAM,UA+ChB"} \ No newline at end of file diff --git a/dist/teste.js b/dist/teste.js index 90f9785..14a6a72 100644 --- a/dist/teste.js +++ b/dist/teste.js @@ -1,10 +1,9 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const logger_1 = require("./logger"); -const { error, info } = (0, logger_1.logger)({ +const l = (0, logger_1.logger)({ app: "teste", eProducao: true }); +const { error, info } = l({ inquilino: "conta_1", - app: "teste", - eProducao: true, usuario: "pedrinho", }); error("Deu Ruim"); diff --git a/dist/teste.js.map b/dist/teste.js.map index 49fb983..1b24700 100644 --- a/dist/teste.js.map +++ b/dist/teste.js.map @@ -1 +1 @@ -{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAA,eAAM,EAAC;IAC7B,SAAS,EAAE,SAAS;IACpB,GAAG,EAAE,OAAO;IACZ,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,UAAU;CACpB,CAAC,CAAA;AAEF,KAAK,CAAC,UAAU,CAAC,CAAA;AACjB,IAAI,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA"} \ No newline at end of file +{"version":3,"file":"teste.js","sourceRoot":"","sources":["../src/teste.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAEjC,MAAM,CAAC,GAAG,IAAA,eAAM,EAAC,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;AAEnD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IACxB,SAAS,EAAE,SAAS;IACpB,OAAO,EAAE,UAAU;CACpB,CAAC,CAAA;AAEF,KAAK,CAAC,UAAU,CAAC,CAAA;AACjB,IAAI,CAAC,SAAS,EAAE,EAAE,UAAU,EAAE,CAAC,CAAA"} \ No newline at end of file diff --git a/package.json b/package.json index 1b51b45..aceb1d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.76.0", + "version": "0.78.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index d5f48fa..17c9818 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -6,10 +6,8 @@ const LOKI_ENDPOINT = "/loki/api/v1/push" type tipoLevel = "info" | "warn" | "error" type tipoAmb = { - app: string inquilino: string usuario: string - eProducao: boolean } type tipoLog = { @@ -17,49 +15,51 @@ type tipoLog = { __filename?: string } -export const logger = ({ inquilino, app, eProducao, usuario }: tipoAmb) => { - const f = - (level: tipoLevel) => async (mensagem: string, op_tipoLog?: tipoLog) => { - let { __filename, detalhes } = op_tipoLog || {} +export const logger = + ({ app, eProducao }: { app: string; eProducao: boolean }) => + ({ inquilino, usuario }: tipoAmb) => { + const f = + (level: tipoLevel) => async (mensagem: string, op_tipoLog?: tipoLog) => { + let { __filename, detalhes } = op_tipoLog || {} - if (!eProducao) { - app = `DEV-${app}` - } + if (!eProducao) { + app = `DEV-${app}` + } - if (__filename && typeof process != "undefined" && process.cwd()) { - __filename = __filename.replace(process.cwd(), "") - } + if (__filename && typeof process != "undefined" && process.cwd()) { + __filename = __filename.replace(process.cwd(), "") + } - const timestamp = `${Date.now()}000000` + const timestamp = `${Date.now()}000000` - const mainLog = detalhes?.length - ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` - : mensagem + const mainLog = detalhes?.length + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : mensagem - const payload = { - stream: { app, inquilino, usuario, level }, - values: [ - [ - timestamp, - mainLog, // Linha de log direta + const payload = { + stream: { app, inquilino, usuario, level }, + values: [ + [ + timestamp, + mainLog, // Linha de log direta + ], ], - ], + } + + const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ streams: [payload] }), + }) + + if (!response.ok) { + throw new Error(`Erro ${response.status}: ${await response.text()}`) + } } - const response = await crossFetch(`${LOKI_BASE_URL}${LOKI_ENDPOINT}`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ streams: [payload] }), - }) - - if (!response.ok) { - throw new Error(`Erro ${response.status}: ${await response.text()}`) - } + return { + info: f("info"), + warn: f("warn"), + error: f("error"), } - - return { - info: f("info"), - warn: f("warn"), - error: f("error"), } -} diff --git a/src/teste.ts b/src/teste.ts index 2887ac0..3d62b99 100644 --- a/src/teste.ts +++ b/src/teste.ts @@ -1,9 +1,9 @@ import { logger } from "./logger" -const { error, info } = logger({ +const l = logger({ app: "teste", eProducao: true }) + +const { error, info } = l({ inquilino: "conta_1", - app: "teste", - eProducao: true, usuario: "pedrinho", })