fix: update paths for plugin build and manifest validation

- Changed the download path in `build-plugin.yml` to point to the `standalone` directory for better organization.
- Updated the upload path in `main.yml` to use `web/dist` instead of `web/.nuxt/standalone-apps` for consistency.
- Refactored the `findManifestFiles` function in `build-txz.ts` to prioritize checking for `standalone.manifest.json` in the `standalone` subdirectory.
- Enhanced the manifest validation logic to ensure proper error handling and file existence checks.

This commit improves the build process and ensures that the manifest validation is more robust and organized.

Author: elibosley

.github/workflows/build-plugin.yml

@@ -99,7 +99,7 @@ jobs:
         uses: actions/download-artifact@v5
         with:
           pattern: unraid-wc-rich
-          path: ${{ github.workspace }}/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/nuxt
+          path: ${{ github.workspace }}/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/standalone
           merge-multiple: true
       - name: Download Unraid API
         uses: actions/download-artifact@v5

.github/workflows/main.yml

@@ -384,7 +384,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: unraid-wc-rich
-          path: web/.nuxt/standalone-apps
+          path: web/dist
 
   build-plugin-staging-pr:
     name: Build and Deploy Plugin

api/src/unraid-api/cli/generated/graphql.ts

@@ -448,20 +448,6 @@ export enum ConfigErrorState {
   WITHDRAWN = 'WITHDRAWN'
 }
 
-export type ConfigFile = {
-  __typename?: 'ConfigFile';
-  content: Scalars['String']['output'];
-  name: Scalars['String']['output'];
-  path: Scalars['String']['output'];
-  /** Human-readable file size (e.g., "1.5 KB", "2.3 MB") */
-  sizeReadable: Scalars['String']['output'];
-};
-
-export type ConfigFilesResponse = {
-  __typename?: 'ConfigFilesResponse';
-  files: Array<ConfigFile>;
-};
-
 export type Connect = Node & {
   __typename?: 'Connect';
   /** The status of dynamic remote access */
@@ -553,12 +539,16 @@ export type CoreVersions = {
 /** CPU load for a single core */
 export type CpuLoad = {
   __typename?: 'CpuLoad';
+  /** The percentage of time the CPU spent running virtual machines (guest). */
+  percentGuest: Scalars['Float']['output'];
   /** The percentage of time the CPU was idle. */
   percentIdle: Scalars['Float']['output'];
   /** The percentage of time the CPU spent servicing hardware interrupts. */
   percentIrq: Scalars['Float']['output'];
   /** The percentage of time the CPU spent on low-priority (niced) user space processes. */
   percentNice: Scalars['Float']['output'];
+  /** The percentage of CPU time stolen by the hypervisor. */
+  percentSteal: Scalars['Float']['output'];
   /** The percentage of time the CPU spent in kernel space. */
   percentSystem: Scalars['Float']['output'];
   /** The total CPU load on a single core, in percent. */
@@ -1645,7 +1635,6 @@ export type PublicPartnerInfo = {
 
 export type Query = {
   __typename?: 'Query';
-  allConfigFiles: ConfigFilesResponse;
   apiKey?: Maybe<ApiKey>;
   /** All possible permissions for API keys */
   apiKeyPossiblePermissions: Array<Permission>;
@@ -1655,7 +1644,6 @@ export type Query = {
   array: UnraidArray;
   cloud: Cloud;
   config: Config;
-  configFile?: Maybe<ConfigFile>;
   connect: Connect;
   customization?: Maybe<Customization>;
   disk: Disk;
@@ -1719,11 +1707,6 @@ export type QueryApiKeyArgs = {
 };
 
 
-export type QueryConfigFileArgs = {
-  name: Scalars['String']['input'];
-};
-
-
 export type QueryDiskArgs = {
   id: Scalars['PrefixedID']['input'];
 };

plugin/builder/build-txz.ts

@@ -10,39 +10,43 @@ import { cleanupTxzFiles } from "./utils/cleanup";
 import { apiDir } from "./utils/paths";
 import { getVendorBundleName, getVendorFullPath } from "./build-vendor-store";
 import { getAssetUrl } from "./utils/bucket-urls";
+import { validateStandaloneManifest, getStandaloneManifestPath } from "./utils/manifest-validator";
 
 
-// Recursively search for manifest files
+// Check for manifest files in expected locations
 const findManifestFiles = async (dir: string): Promise<string[]> => {
+  const files: string[] = [];
+  
+  // Check standalone subdirectory (preferred)
+  try {
+    const standaloneDir = join(dir, "standalone");
+    const entries = await readdir(standaloneDir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isFile() && entry.name === "standalone.manifest.json") {
+        files.push("standalone/standalone.manifest.json");
+      }
+    }
+  } catch (error) {
+    // Directory doesn't exist, continue checking other locations
+  }
+  
+  // Check root directory for backwards compatibility
   try {
     const entries = await readdir(dir, { withFileTypes: true });
-    const files: string[] = [];
-
     for (const entry of entries) {
-      const fullPath = join(dir, entry.name);
-      if (entry.isDirectory()) {
-        try {
-          files.push(...(await findManifestFiles(fullPath)));
-        } catch (error) {
-          // Log and continue if a subdirectory can't be read
-          console.warn(`Warning: Could not read directory ${fullPath}: ${error.message}`);
-        }
-      } else if (
-        entry.isFile() &&
-        entry.name === "standalone.manifest.json"
-      ) {
-        files.push(entry.name);
+      if (entry.isFile() && entry.name === "standalone.manifest.json") {
+        files.push("standalone.manifest.json");
       }
     }
-
-    return files;
   } catch (error) {
     if (error.code === 'ENOENT') {
       console.warn(`Directory does not exist: ${dir}`);
       return [];
     }
     throw error; // Re-throw other errors
   }
+  
+  return files;
 };
 
 // Function to store vendor archive information in a recoverable location
@@ -123,16 +127,41 @@ const validateSourceDir = async (validatedEnv: TxzEnv) => {
   }
 
   const manifestFiles = await findManifestFiles(webcomponentDir);
-  const hasStandaloneManifest = manifestFiles.includes("standalone.manifest.json");
+  const hasStandaloneManifest = manifestFiles.some(file => 
+    file === "standalone.manifest.json" || file === "standalone/standalone.manifest.json"
+  );
 
   // Only require standalone.manifest.json for new standalone apps
   if (!hasStandaloneManifest) {
     console.log("Existing Manifest Files:", manifestFiles);
     throw new Error(
       `Webcomponents missing required file: standalone.manifest.json - ` +
-      `run 'pnpm build' in web to generate standalone.manifest.json`
+      `run 'pnpm build' in web to generate standalone.manifest.json in the standalone/ subdirectory`
     );
   }
+  
+  // Validate the manifest contents
+  const manifestPath = getStandaloneManifestPath(webcomponentDir);
+  if (manifestPath) {
+    const validation = await validateStandaloneManifest(manifestPath);
+    
+    if (!validation.isValid) {
+      console.error("Standalone manifest validation failed:");
+      validation.errors.forEach(error => console.error(`  ❌ ${error}`));
+      if (validation.warnings.length > 0) {
+        console.warn("Warnings:");
+        validation.warnings.forEach(warning => console.warn(`  ⚠️  ${warning}`));
+      }
+      throw new Error("Standalone manifest validation failed. See errors above.");
+    }
+    
+    if (validation.warnings.length > 0) {
+      console.warn("Standalone manifest validation warnings:");
+      validation.warnings.forEach(warning => console.warn(`  ⚠️  ${warning}`));
+    }
+    
+    console.log("✅ Standalone manifest validation passed");
+  }
 
   if (!existsSync(apiDir)) {
     throw new Error(`API directory ${apiDir} does not exist`);