node-sped-nfe 1.2.41 → 1.2.42

package/dist/utils/make.js

@@ -165,7 +165,12 @@ class Make {
             obj[cont].prod.qTrib = (obj[cont].prod.qTrib * 1).toFixed(4);
             obj[cont].prod.vUnTrib = (obj[cont].prod.vUnTrib * 1).toFixed(10);
             //Calcular ICMSTot
-            __classPrivateFieldGet(this, _Make_instances, "m", _Make_calICMSTot).call(this, obj[cont].prod);
+            __classPrivateFieldGet(this, _Make_instances, "m", _Make_calICMSTot).call(this, {
+                ...obj[cont].prod,
+                ...{
+                    vNF: ((obj[cont].prod.vUnCom - (obj[cont].prod?.vDesc || 0)) * obj[cont].prod.qTrib).toFixed(2)
+                }
+            });
         }
         __classPrivateFieldGet(this, _Make_NFe, "f").infNFe.det = obj;
     }
@@ -345,7 +350,6 @@ class Make {
         __classPrivateFieldGet(this, _Make_instances, "m", _Make_calICMSTot).call(this, obj);
     }
     tagProdICMSUFDest(index, obj) {
-        console.log(__classPrivateFieldGet(this, _Make_NFe, "f").infNFe.total);
         if (__classPrivateFieldGet(this, _Make_NFe, "f").infNFe.det[index].imposto.ICMSUFDest === undefined)
             __classPrivateFieldGet(this, _Make_NFe, "f").infNFe.det[index].imposto.ICMSUFDest = {};
         Object.keys(obj).forEach(key => {
@@ -670,7 +674,7 @@ class Make {
             //Como ja temos cUF, vamos usar o extras.cUF2UF
             let tempUF = urlEventos(cUF2UF[__classPrivateFieldGet(this, _Make_NFe, "f").infNFe.ide.cUF], __classPrivateFieldGet(this, _Make_NFe, "f").infNFe['@versao']);
             __classPrivateFieldGet(this, _Make_NFe, "f").infNFeSupl = {
-                qrCode: tempUF.mod65[__classPrivateFieldGet(this, _Make_NFe, "f").infNFe.ide.tpAmb == 1 ? 'producao' : 'homologacao'].NFeConsultaQR, //Este não e o valor final, vamos utilizar apenas para carregar os dados que vão ser utlizados no make
+                qrCode: tempUF.mod65[__classPrivateFieldGet(this, _Make_NFe, "f").infNFe.ide.tpAmb == 1 ? 'producao' : 'homologacao'].NfeConsultaQR, //Este não e o valor final, vamos utilizar apenas para carregar os dados que vão ser utlizados no make
                 urlChave: tempUF.mod65[__classPrivateFieldGet(this, _Make_NFe, "f").infNFe.ide.tpAmb == 1 ? 'producao' : 'homologacao'].urlChave
             };
         }

package/dist/utils/tools.js

@@ -22,8 +22,6 @@ import { fileURLToPath } from 'url';
 import pem from 'pem';
 import { cUF2UF, json2xml, xml2json, formatData, UF2cUF } from "./extras.js";
 import { SignedXml } from 'xml-crypto';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
 class Tools {
     constructor(config = { mod: "", xmllint: 'xmllint', UF: '', tpAmb: 2, CSC: "", CSCid: "", versao: "4.00", timeout: 30, openssl: null, CPF: "", CNPJ: "" }, certificado = { pfx: "", senha: "" }) {
         _Tools_instances.add(this);
@@ -178,8 +176,10 @@ class Tools {
             let UF = cUF2UF[cUF];
             let mod = `${chNFe}`.substring(20, 22);
             //https://www.nfe.fazenda.gov.br/portal/webservices.aspx?AspxAutoDetectCookieSupport=1
-            if (['AC', 'ES', 'RN', 'PB', 'SC'].includes(UF))
+            if (["AC", "AL", "AP", "CE", "DF", "ES", "PA", "PB", "PI", "RJ", "RN", "RO", "RR", "SC", "SE", "TO"].includes(UF))
                 UF = 'SVRS';
+            if (["MA"].includes(UF))
+                UF = 'SVAN';
             if (typeof __classPrivateFieldGet(this, _Tools_config, "f").tpAmb === "undefined")
                 throw "consultarNFe({...tpAmb}) -> não definido!";
             let consSitNFe = {
@@ -256,22 +256,6 @@ class Tools {
                     throw "sefazEvento({tpEvento}) -> não definido!";
                 if (!__classPrivateFieldGet(this, _Tools_config, "f").CNPJ && !__classPrivateFieldGet(this, _Tools_config, "f").CPF)
                     throw "new Tools({CNPJ|CPF}) -> não definido!";
-                const geradorLote = function () {
-                    const agora = new Date();
-                    const ano = agora.getFullYear().toString().slice(2); // Só os 2 últimos dígitos do ano
-                    const mes = String(agora.getMonth() + 1).padStart(2, '0');
-                    const dia = String(agora.getDate()).padStart(2, '0');
-                    const hora = String(agora.getHours()).padStart(2, '0');
-                    const minuto = String(agora.getMinutes()).padStart(2, '0');
-                    const segundo = String(agora.getSeconds()).padStart(2, '0');
-                    // Junta tudo
-                    let idLote = `${ano}${mes}${dia}${hora}${minuto}${segundo}`;
-                    // Se ainda tiver menos de 15 dígitos, adiciona um número aleatório no final
-                    while (idLote.length < 15) {
-                        idLote += Math.floor(Math.random() * 10); // Adiciona dígitos aleatórios
-                    }
-                    return idLote;
-                };
                 let detEvento = {
                     "@versao": "1.00",
                     "descEvento": __classPrivateFieldGet(this, _Tools_instances, "m", _Tools_descEvento).call(this, `${tpEvento}`)
@@ -389,10 +373,16 @@ class Tools {
             try {
                 if (!chNFe && !ultNSU)
                     throw "sefazDistDFe({chNFe|ultNSU})";
-                if (!__classPrivateFieldGet(this, _Tools_config, "f").CNPJ)
-                    throw "CNPJ não definido!";
-                if (__classPrivateFieldGet(this, _Tools_config, "f").CNPJ.length !== 14)
-                    throw "CNPJ inválido!";
+                if (!__classPrivateFieldGet(this, _Tools_config, "f").CNPJ && !__classPrivateFieldGet(this, _Tools_config, "f").CPF)
+                    throw "Tools({CNPJ|CPF})";
+                if (__classPrivateFieldGet(this, _Tools_config, "f").CPF != undefined) {
+                    if (__classPrivateFieldGet(this, _Tools_config, "f").CPF.length !== 11)
+                        throw "Tools({CPF}) inválido!";
+                }
+                else {
+                    if (__classPrivateFieldGet(this, _Tools_config, "f").CNPJ.length !== 14)
+                        throw "Tools({CNPJ}) inválido!";
+                }
                 // Gera o XML da consulta
                 // Prepara o SOAP
                 var xmlSing = await json2xml({
@@ -428,8 +418,8 @@ class Tools {
                         }
                     }
                 });
-                // HTTPS Request
-                const req = https.request(tempUF[`mod${__classPrivateFieldGet(this, _Tools_config, "f").mod}`][(__classPrivateFieldGet(this, _Tools_config, "f").tpAmb == 1 ? "producao" : "homologacao")].NFeDistribuicaoDFe, {
+                // HTTPS Request, trava modelo 55
+                const req = https.request(tempUF[`mod55`][(__classPrivateFieldGet(this, _Tools_config, "f").tpAmb == 1 ? "producao" : "homologacao")].NFeDistribuicaoDFe, {
                     ...{
                         method: 'POST',
                         headers: {
@@ -480,13 +470,12 @@ class Tools {
                 throw "sefazStatus({...tpAmb}) -> não definido!";
             if (typeof __classPrivateFieldGet(this, _Tools_config, "f").mod == "undefined")
                 throw "sefazStatus({...mod}) -> não definido!";
-            let tempUF = urlEventos(__classPrivateFieldGet(this, _Tools_config, "f").UF, __classPrivateFieldGet(this, _Tools_config, "f").versao);
             //Separado para validar o corpo da consulta
             let consStatServ = {
                 "@versao": "4.00",
                 "@xmlns": "http://www.portalfiscal.inf.br/nfe",
                 "tpAmb": __classPrivateFieldGet(this, _Tools_config, "f").tpAmb,
-                "cUF": tempUF.cUF,
+                "cUF": UF2cUF[__classPrivateFieldGet(this, _Tools_config, "f").UF],
                 "xServ": "STATUS"
             };
             let xmlObj = {
@@ -515,6 +504,7 @@ class Tools {
                         headers: {
                             'Content-Type': 'application/soap+xml; charset=utf-8',
                             'Content-Length': xml.length,
+                            'SOAPAction': 'http://www.portalfiscal.inf.br/nfe/wsdl/NfeStatusServico4/nfeStatusServicoNF'
                         },
                         rejectUnauthorized: false
                     },
@@ -619,7 +609,17 @@ async function _Tools_xmlValido(xml, xsd) {
     return new Promise((resolve, reject) => {
         const xmlFile = tmp.fileSync({ mode: 0o644, prefix: 'xml-', postfix: '.xml' });
         fs.writeFileSync(xmlFile.name, xml, { encoding: 'utf8' });
-        const schemaPath = path.resolve(__dirname, `../../schemas/PL_010_V1/${xsd}.xsd`);
+        //Obter caminho, dos schemas
+        var schemaPath = "";
+        try { //NW.js + ElectronJS
+            schemaPath = path.dirname(require.resolve("node-sped-nfe"));
+            schemaPath = path.resolve(`${path.join(schemaPath, "..", "schemas")}/PL_010_V1/${xsd}.xsd`);
+        }
+        catch (error) { //Caso o require seja desativo
+            const __filename = fileURLToPath(import.meta.url);
+            const __dirname = path.dirname(__filename);
+            schemaPath = path.resolve(__dirname, `../../schemas/PL_010_V1/${xsd}.xsd`);
+        }
         const verif = spawnSync(__classPrivateFieldGet(this, _Tools_config, "f").xmllint, ['--noout', '--schema', schemaPath, xmlFile.name], { encoding: 'utf8' });
         xmlFile.removeCallback();
         // Aqui, usamos o operador de encadeamento opcional (?.)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-sped-nfe",
-  "version": "1.2.41",
+  "version": "1.2.42",
   "author": "Kalmon V. Tavares",
   "type": "module",
   "main": "dist/index.js",
@@ -21,7 +21,8 @@
       "import": "./dist/index.js",
       "require": "./dist/index.js",
       "types": "./dist/index.d.ts"
-    }
+    },
+    "./schemas/*": "./schemas/*"
   },
   "scripts": {
     "build": "tsc > saida.txt",