@cristian-israel/giganet_lib_conecta 1.0.148 → 1.0.149

package/dist/index.d.mts

@@ -11307,7 +11307,7 @@ declare class OnuSignalSummaryResource {
     private readonly endpoint;
     constructor(client: APIClient);
     /**
-     * Retorna o resumo de potência (sinal) de uma ONU pelo ID do cliente.
+     * Retorna o resumo de potência (sinal) de uma ONU pelo ID da Fibra.
      * O endpoint retorna HTML, que é tratado e convertido para JSON.
      */
     get(data: GetOnuSignalSummaryInput): Promise<OnuSignalSummary>;

package/dist/index.d.ts

@@ -11307,7 +11307,7 @@ declare class OnuSignalSummaryResource {
     private readonly endpoint;
     constructor(client: APIClient);
     /**
-     * Retorna o resumo de potência (sinal) de uma ONU pelo ID do cliente.
+     * Retorna o resumo de potência (sinal) de uma ONU pelo ID da Fibra.
      * O endpoint retorna HTML, que é tratado e convertido para JSON.
      */
     get(data: GetOnuSignalSummaryInput): Promise<OnuSignalSummary>;

package/dist/index.js

@@ -670,48 +670,66 @@ var LoginDisconnectionsResource = class {
 };
 
 // src/apis/clients/ixc-soft/resources/onu-signal-summary/ixc-soft-onu-signal-summary.types.ts
-function extractValue(text, prefix) {
-  const regex = new RegExp(`${escapeRegex(prefix)}([^<\\n]*)`);
-  const match = text.match(regex);
-  return match ? match[1].trim() : null;
-}
-function escapeRegex(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function toNumberOrNull(value) {
   if (value === null) return null;
   const parsed = parseFloat(value);
   return isNaN(parsed) ? null : parsed;
 }
+function normalizeLabel(label) {
+  return label.replace(/\s+/g, "").toLowerCase();
+}
+function buildLabelMap(html) {
+  const map = /* @__PURE__ */ new Map();
+  const decoded = html.replace(/&ecirc;/gi, "\xEA").replace(/&uacute;/gi, "\xFA").replace(/&Ccedil;/gi, "\xC7").replace(/&Otilde;/gi, "\xD5").replace(/&atilde;/gi, "\xE3").replace(/&ccedil;/gi, "\xE7").replace(/&otilde;/gi, "\xF5").replace(/&amp;/gi, "&").replace(/&lt;/gi, "<").replace(/&gt;/gi, ">").replace(/&quot;/gi, '"').replace(/&aacute;/gi, "\xE1").replace(/&eacute;/gi, "\xE9").replace(/&iacute;/gi, "\xED").replace(/&oacute;/gi, "\xF3").replace(/&ntilde;/gi, "\xF1");
+  const divRegex = /<div[^>]*>([\s\S]*?)<\/div>/gi;
+  let match;
+  while ((match = divRegex.exec(decoded)) !== null) {
+    const text = match[1].replace(/<[^>]+>/g, "").trim();
+    const separatorIndex = text.indexOf(": ");
+    if (separatorIndex === -1) continue;
+    const rawLabel = text.substring(0, separatorIndex);
+    const value = text.substring(separatorIndex + 2).trim();
+    if (!rawLabel || !value) continue;
+    map.set(normalizeLabel(rawLabel), value);
+  }
+  return map;
+}
+function get(map, ...keys) {
+  for (const key of keys) {
+    const value = map.get(normalizeLabel(key));
+    if (value !== void 0) return value;
+  }
+  return null;
+}
 function parseOnuSignalSummaryHtml(html) {
-  const decoded = html.replace(/&ecirc;/gi, "\xEA").replace(/&uacute;/gi, "\xFA").replace(/&Ccedil;/gi, "\xC7").replace(/&Otilde;/gi, "\xD5").replace(/&atilde;/gi, "\xE3").replace(/&amp;/gi, "&").replace(/&lt;/gi, "<").replace(/&gt;/gi, ">").replace(/&quot;/gi, '"');
+  const map = buildLabelMap(html);
   return {
-    lastDropCause: extractValue(decoded, "Causa da \xFAltima queda: "),
-    rxSignal: toNumberOrNull(extractValue(decoded, "Sinal Rx: ")),
-    temperature: toNumberOrNull(extractValue(decoded, "Temperatura: ")),
-    voltage: toNumberOrNull(extractValue(decoded, "Voltagem: ")),
-    txSignal: toNumberOrNull(extractValue(decoded, "Sinal Tx: ")),
-    signalStatus: extractValue(decoded, "Status pot\xEAncia: "),
-    fsp: extractValue(decoded, "F/s/p: "),
-    onuId: extractValue(decoded, "Onu id: "),
-    controlFlag: extractValue(decoded, "Control flag: "),
-    runState: extractValue(decoded, "Run state: "),
-    configState: extractValue(decoded, "Config state: "),
+    lastDropCause: get(map, "Causa da \xFAltima queda", "Causada\xFAltimaqueda"),
+    rxSignal: toNumberOrNull(get(map, "Sinal Rx", "SinalRx")),
+    temperature: toNumberOrNull(get(map, "Temperatura")),
+    voltage: toNumberOrNull(get(map, "Voltagem")),
+    txSignal: toNumberOrNull(get(map, "Sinal Tx", "SinalTx")),
+    signalStatus: get(map, "Status pot\xEAncia", "Statuspot\xEAncia", "Statuspot\xEAncia"),
+    fsp: get(map, "F/s/p"),
+    onuId: get(map, "Onu id", "Onuid"),
+    controlFlag: get(map, "Control flag", "Controlflag"),
+    runState: get(map, "Run state", "Runstate"),
+    configState: get(map, "Config state", "Configstate"),
     ontDistanceMeters: toNumberOrNull(
-      extractValue(decoded, "Ont distance(m): ")
+      get(map, "Ont distance(m)", "Ontdistance(m)")
     ),
-    memoryOccupation: extractValue(decoded, "Memory occupation: "),
-    cpuOccupation: extractValue(decoded, "Cpu occupation: "),
-    mac: extractValue(decoded, "Mac: "),
-    description: extractValue(decoded, "Description: "),
-    lastUpTime: extractValue(decoded, "Last up time: "),
-    lastDownTime: extractValue(decoded, "Last down time: "),
-    lastDyingGaspTime: extractValue(decoded, "Last dying gasp time: "),
-    onlineDuration: extractValue(decoded, "Online duration: "),
-    macRouter: extractValue(decoded, "Mac router: "),
-    vendorSn: extractValue(decoded, "Vendor sn: "),
-    txOlt: toNumberOrNull(extractValue(decoded, "Tx olt: ")),
-    rxOlt: toNumberOrNull(extractValue(decoded, "Rx olt: "))
+    memoryOccupation: get(map, "Memory occupation", "Memoryoccupation"),
+    cpuOccupation: get(map, "Cpu occupation", "Cpuoccupation"),
+    mac: get(map, "Mac"),
+    description: get(map, "Description"),
+    lastUpTime: get(map, "Last up time", "Lastuptime"),
+    lastDownTime: get(map, "Last down time", "Lastdowntime"),
+    lastDyingGaspTime: get(map, "Last dying gasp time", "Lastdyinggasptime"),
+    onlineDuration: get(map, "Online duration", "Onlineduration"),
+    macRouter: get(map, "Mac router", "Macrouter"),
+    vendorSn: get(map, "Vendor sn", "Vendorsn"),
+    txOlt: toNumberOrNull(get(map, "Tx olt", "Txolt")),
+    rxOlt: toNumberOrNull(get(map, "Rx olt", "Rxolt"))
   };
 }
 
@@ -722,7 +740,7 @@ var OnuSignalSummaryResource = class {
     this.endpoint = "/radpop_radio_cliente_fibra_29661";
   }
   /**
-   * Retorna o resumo de potência (sinal) de uma ONU pelo ID do cliente.
+   * Retorna o resumo de potência (sinal) de uma ONU pelo ID da Fibra.
    * O endpoint retorna HTML, que é tratado e convertido para JSON.
    */
   async get(data) {

package/dist/index.mjs

@@ -617,48 +617,66 @@ var LoginDisconnectionsResource = class {
 };
 
 // src/apis/clients/ixc-soft/resources/onu-signal-summary/ixc-soft-onu-signal-summary.types.ts
-function extractValue(text, prefix) {
-  const regex = new RegExp(`${escapeRegex(prefix)}([^<\\n]*)`);
-  const match = text.match(regex);
-  return match ? match[1].trim() : null;
-}
-function escapeRegex(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function toNumberOrNull(value) {
   if (value === null) return null;
   const parsed = parseFloat(value);
   return isNaN(parsed) ? null : parsed;
 }
+function normalizeLabel(label) {
+  return label.replace(/\s+/g, "").toLowerCase();
+}
+function buildLabelMap(html) {
+  const map = /* @__PURE__ */ new Map();
+  const decoded = html.replace(/&ecirc;/gi, "\xEA").replace(/&uacute;/gi, "\xFA").replace(/&Ccedil;/gi, "\xC7").replace(/&Otilde;/gi, "\xD5").replace(/&atilde;/gi, "\xE3").replace(/&ccedil;/gi, "\xE7").replace(/&otilde;/gi, "\xF5").replace(/&amp;/gi, "&").replace(/&lt;/gi, "<").replace(/&gt;/gi, ">").replace(/&quot;/gi, '"').replace(/&aacute;/gi, "\xE1").replace(/&eacute;/gi, "\xE9").replace(/&iacute;/gi, "\xED").replace(/&oacute;/gi, "\xF3").replace(/&ntilde;/gi, "\xF1");
+  const divRegex = /<div[^>]*>([\s\S]*?)<\/div>/gi;
+  let match;
+  while ((match = divRegex.exec(decoded)) !== null) {
+    const text = match[1].replace(/<[^>]+>/g, "").trim();
+    const separatorIndex = text.indexOf(": ");
+    if (separatorIndex === -1) continue;
+    const rawLabel = text.substring(0, separatorIndex);
+    const value = text.substring(separatorIndex + 2).trim();
+    if (!rawLabel || !value) continue;
+    map.set(normalizeLabel(rawLabel), value);
+  }
+  return map;
+}
+function get(map, ...keys) {
+  for (const key of keys) {
+    const value = map.get(normalizeLabel(key));
+    if (value !== void 0) return value;
+  }
+  return null;
+}
 function parseOnuSignalSummaryHtml(html) {
-  const decoded = html.replace(/&ecirc;/gi, "\xEA").replace(/&uacute;/gi, "\xFA").replace(/&Ccedil;/gi, "\xC7").replace(/&Otilde;/gi, "\xD5").replace(/&atilde;/gi, "\xE3").replace(/&amp;/gi, "&").replace(/&lt;/gi, "<").replace(/&gt;/gi, ">").replace(/&quot;/gi, '"');
+  const map = buildLabelMap(html);
   return {
-    lastDropCause: extractValue(decoded, "Causa da \xFAltima queda: "),
-    rxSignal: toNumberOrNull(extractValue(decoded, "Sinal Rx: ")),
-    temperature: toNumberOrNull(extractValue(decoded, "Temperatura: ")),
-    voltage: toNumberOrNull(extractValue(decoded, "Voltagem: ")),
-    txSignal: toNumberOrNull(extractValue(decoded, "Sinal Tx: ")),
-    signalStatus: extractValue(decoded, "Status pot\xEAncia: "),
-    fsp: extractValue(decoded, "F/s/p: "),
-    onuId: extractValue(decoded, "Onu id: "),
-    controlFlag: extractValue(decoded, "Control flag: "),
-    runState: extractValue(decoded, "Run state: "),
-    configState: extractValue(decoded, "Config state: "),
+    lastDropCause: get(map, "Causa da \xFAltima queda", "Causada\xFAltimaqueda"),
+    rxSignal: toNumberOrNull(get(map, "Sinal Rx", "SinalRx")),
+    temperature: toNumberOrNull(get(map, "Temperatura")),
+    voltage: toNumberOrNull(get(map, "Voltagem")),
+    txSignal: toNumberOrNull(get(map, "Sinal Tx", "SinalTx")),
+    signalStatus: get(map, "Status pot\xEAncia", "Statuspot\xEAncia", "Statuspot\xEAncia"),
+    fsp: get(map, "F/s/p"),
+    onuId: get(map, "Onu id", "Onuid"),
+    controlFlag: get(map, "Control flag", "Controlflag"),
+    runState: get(map, "Run state", "Runstate"),
+    configState: get(map, "Config state", "Configstate"),
     ontDistanceMeters: toNumberOrNull(
-      extractValue(decoded, "Ont distance(m): ")
+      get(map, "Ont distance(m)", "Ontdistance(m)")
     ),
-    memoryOccupation: extractValue(decoded, "Memory occupation: "),
-    cpuOccupation: extractValue(decoded, "Cpu occupation: "),
-    mac: extractValue(decoded, "Mac: "),
-    description: extractValue(decoded, "Description: "),
-    lastUpTime: extractValue(decoded, "Last up time: "),
-    lastDownTime: extractValue(decoded, "Last down time: "),
-    lastDyingGaspTime: extractValue(decoded, "Last dying gasp time: "),
-    onlineDuration: extractValue(decoded, "Online duration: "),
-    macRouter: extractValue(decoded, "Mac router: "),
-    vendorSn: extractValue(decoded, "Vendor sn: "),
-    txOlt: toNumberOrNull(extractValue(decoded, "Tx olt: ")),
-    rxOlt: toNumberOrNull(extractValue(decoded, "Rx olt: "))
+    memoryOccupation: get(map, "Memory occupation", "Memoryoccupation"),
+    cpuOccupation: get(map, "Cpu occupation", "Cpuoccupation"),
+    mac: get(map, "Mac"),
+    description: get(map, "Description"),
+    lastUpTime: get(map, "Last up time", "Lastuptime"),
+    lastDownTime: get(map, "Last down time", "Lastdowntime"),
+    lastDyingGaspTime: get(map, "Last dying gasp time", "Lastdyinggasptime"),
+    onlineDuration: get(map, "Online duration", "Onlineduration"),
+    macRouter: get(map, "Mac router", "Macrouter"),
+    vendorSn: get(map, "Vendor sn", "Vendorsn"),
+    txOlt: toNumberOrNull(get(map, "Tx olt", "Txolt")),
+    rxOlt: toNumberOrNull(get(map, "Rx olt", "Rxolt"))
   };
 }
 
@@ -669,7 +687,7 @@ var OnuSignalSummaryResource = class {
     this.endpoint = "/radpop_radio_cliente_fibra_29661";
   }
   /**
-   * Retorna o resumo de potência (sinal) de uma ONU pelo ID do cliente.
+   * Retorna o resumo de potência (sinal) de uma ONU pelo ID da Fibra.
    * O endpoint retorna HTML, que é tratado e convertido para JSON.
    */
   async get(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cristian-israel/giganet_lib_conecta",
-  "version": "1.0.148",
+  "version": "1.0.149",
   "description": "Database Connector Layer",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",