From 211f85130da390ed466d0e052554e7de2afa758f Mon Sep 17 00:00:00 2001
From: nguyentrungthat <80239428+nguentrungthat@users.noreply.github.com>
Date: Thu, 19 Mar 2026 08:26:33 +0700
Subject: [PATCH] Update regex show inventory, version

---
 BACKEND/app/ultils/templates/show_inventory.ts | 10 +++++++++-
 BACKEND/app/ultils/templates/show_version.ts   |  5 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/BACKEND/app/ultils/templates/show_inventory.ts b/BACKEND/app/ultils/templates/show_inventory.ts
index b412a5e..8b39708 100644
--- a/BACKEND/app/ultils/templates/show_inventory.ts
+++ b/BACKEND/app/ultils/templates/show_inventory.ts
@@ -124,7 +124,15 @@ const parseLog = (data: string) => {
       records = [firstRecord]
     }
   }
-  return records
+  return records.sort((a: any, b: any) => {
+    const getScore = (item: any) => {
+      if (item?.name?.toLowerCase().includes('stack')) return 100
+      if (!item.pid) return 100
+      return 0
+    }
+
+    return getScore(a) - getScore(b)
+  })
 }
 
 export default parseLog
diff --git a/BACKEND/app/ultils/templates/show_version.ts b/BACKEND/app/ultils/templates/show_version.ts
index ea723ab..d1dedae 100644
--- a/BACKEND/app/ultils/templates/show_version.ts
+++ b/BACKEND/app/ultils/templates/show_version.ts
@@ -3,10 +3,11 @@ import XRegExp from 'xregexp'
 // Parser function
 const parseLog = (data: string) => {
   const patterns = [
-    // 1. Software Image & Version
+    XRegExp('^.*Software.*\\((?<SOFTWARE_IMAGE>\\S+)\\),\\s+Version\\s+(?<VERSION>[\\w\\.-]+)'),
     XRegExp(
-      '^.*Software.*\\((?<SOFTWARE_IMAGE>\\S+)\\),\\s+Version\\s+(?<VERSION>.+?),\\s+RELEASE.*\\((?<RELEASE>\\S+)\\)'
+      '^\\*?\\s*\\d+\\s+\\d+\\s+[\\w-]+\\s+(?<VERSION>\\d[\\w\\.-]+)\\s+(?<SOFTWARE_IMAGE>[\\w-]+)\\s+(?:BUNDLE|INSTALL)'
     ),
+    XRegExp('System\\s+image\\s+file\\s+is\\s+"(?:[^:]*:)?(?<SOFTWARE_IMAGE>[^"]+)"'),
     XRegExp('Active-image:\\s+(?<SOFTWARE_IMAGE>\\S+)'),
     XRegExp('Version:\\s+(?<VERSION>\\S+)'),
     XRegExp('^ROM:\\s+(?<ROMMON>\\S+)'),