chore: extractor upgrade

elibosley · elibosley · commit 4d239f99ad6d · 2025-07-03T10:42:35.000-04:00
diff --git a/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php b/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/web-components-extractor.php
@@ -5,6 +5,7 @@ class WebComponentsExtractor
 {
     private const PREFIXED_PATH = '/plugins/dynamix.my.servers/unraid-components/';
     private const RICH_COMPONENTS_ENTRY = 'unraid-components.client.mjs';
+    private const RICH_COMPONENTS_ENTRY_JS = 'unraid-components.client.js';
     private const UI_ENTRY = 'src/register.ts';
     private const UI_STYLES_ENTRY = 'style.css';
 
@@ -47,7 +48,16 @@ private function getRichComponentsFile(): string
             $subfolder = $this->getRelativePath($manifestPath);
             
             foreach ($manifest as $key => $value) {
-                if (strpos($key, self::RICH_COMPONENTS_ENTRY) !== false && isset($value["file"])) {
+                // Skip timestamp entries
+                if ($key === 'ts' || !is_array($value)) {
+                    continue;
+                }
+                
+                // Check for both old format (direct key match) and new format (path-based key)
+                $matchesMjs = strpos($key, self::RICH_COMPONENTS_ENTRY) !== false;
+                $matchesJs = strpos($key, self::RICH_COMPONENTS_ENTRY_JS) !== false;
+                
+                if (($matchesMjs || $matchesJs) && isset($value["file"])) {
                     return ($subfolder ? $subfolder . '/' : '') . $value["file"];
                 }
             }
@@ -59,7 +69,7 @@ private function getRichComponentsScript(): string
     {
         $jsFile = $this->getRichComponentsFile();
         if (empty($jsFile)) {
-            return '<script>console.error("%cNo matching key containing \'' . self::RICH_COMPONENTS_ENTRY . '\' found.", "font-weight: bold; color: white; background-color: red");</script>';
+            return '<script>console.error("%cNo matching key containing \'' . self::RICH_COMPONENTS_ENTRY . '\' or \'' . self::RICH_COMPONENTS_ENTRY_JS . '\' found.", "font-weight: bold; color: white; background-color: red");</script>';
         }
         return '<script src="' . $this->getAssetPath($jsFile) . '"></script>';
     }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ class WebComponentsExtractor`
`5`	`5`	`{`
`6`	`6`	`private const PREFIXED_PATH = '/plugins/dynamix.my.servers/unraid-components/';`
`7`	`7`	`private const RICH_COMPONENTS_ENTRY = 'unraid-components.client.mjs';`
	`8`	`+ private const RICH_COMPONENTS_ENTRY_JS = 'unraid-components.client.js';`
`8`	`9`	`private const UI_ENTRY = 'src/register.ts';`
`9`	`10`	`private const UI_STYLES_ENTRY = 'style.css';`
`10`	`11`
`@@ -47,7 +48,16 @@ private function getRichComponentsFile(): string`
`47`	`48`	`$subfolder = $this->getRelativePath($manifestPath);`
`48`	`49`
`49`	`50`	`foreach ($manifest as $key => $value) {`
`50`		`- if (strpos($key, self::RICH_COMPONENTS_ENTRY) !== false && isset($value["file"])) {`
	`51`	`+ // Skip timestamp entries`
	`52`	`+ if ($key === 'ts' \|\| !is_array($value)) {`
	`53`	`+ continue;`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ // Check for both old format (direct key match) and new format (path-based key)`
	`57`	`+ $matchesMjs = strpos($key, self::RICH_COMPONENTS_ENTRY) !== false;`
	`58`	`+ $matchesJs = strpos($key, self::RICH_COMPONENTS_ENTRY_JS) !== false;`
	`59`	`+`
	`60`	`+ if (($matchesMjs \|\| $matchesJs) && isset($value["file"])) {`
`51`	`61`	`return ($subfolder ? $subfolder . '/' : '') . $value["file"];`
`52`	`62`	`}`
`53`	`63`	`}`
`@@ -59,7 +69,7 @@ private function getRichComponentsScript(): string`
`59`	`69`	`{`
`60`	`70`	`$jsFile = $this->getRichComponentsFile();`
`61`	`71`	`if (empty($jsFile)) {`
`62`		`- return '<script>console.error("%cNo matching key containing \'' . self::RICH_COMPONENTS_ENTRY . '\' found.", "font-weight: bold; color: white; background-color: red");</script>';`
	`72`	`+ return '<script>console.error("%cNo matching key containing \'' . self::RICH_COMPONENTS_ENTRY . '\' or \'' . self::RICH_COMPONENTS_ENTRY_JS . '\' found.", "font-weight: bold; color: white; background-color: red");</script>';`
`63`	`73`	`}`
`64`	`74`	`return '<script src="' . $this->getAssetPath($jsFile) . '"></script>';`
`65`	`75`	`}`