Extract out common code, remove hardcoded arch

Author: MorningLightMountain713

ZelBack/src/services/appLifecycle/appInstaller.js

@@ -28,6 +28,7 @@ const upnpService = require('../upnpService');
 const globalState = require('../utils/globalState');
 const { checkAndDecryptAppSpecs } = require('../utils/enterpriseHelper');
 const { specificationFormatter } = require('../utils/appSpecHelpers');
+const { findCommonArchitectures } = require('../utils/appUtilities');
 const log = require('../../lib/log');
 const { appsFolder, localAppsInformation, scannedHeightCollection } = require('../utils/appConstants');
 const { checkAppTemporaryMessageExistence, checkAppMessageExistence } = require('../appMessaging/messageVerifier');
@@ -1102,15 +1103,6 @@ async function testAppInstall(req, res) {
       }
 
       // Calculate common architectures across all components
-      const findCommonArchitectures = (compArchs) => {
-        if (compArchs.length === 0) return [];
-        if (compArchs.length === 1) return compArchs[0].architectures;
-
-        return compArchs[0].architectures.filter((arch) =>
-          compArchs.every((comp) => comp.architectures.includes(arch)),
-        );
-      };
-
       const commonArchitectures = findCommonArchitectures(componentArchitectures);
 
       // If local architecture is not in common architectures, skip Docker operations

ZelBack/src/services/appRequirements/appValidator.js

@@ -12,7 +12,7 @@ const imageManager = require('../appSecurity/imageManager');
 // const advancedWorkflows = require('../appLifecycle/advancedWorkflows'); // Moved to dynamic require to avoid circular dependency
 // eslint-disable-next-line no-unused-vars
 const { supportedArchitectures, enterpriseRequiredArchitectures } = require('../utils/appConstants');
-const { specificationFormatter } = require('../utils/appUtilities');
+const { specificationFormatter, findCommonArchitectures } = require('../utils/appUtilities');
 const { checkAndDecryptAppSpecs } = require('../utils/enterpriseHelper');
 const portManager = require('../appNetwork/portManager');
 const {
@@ -1285,30 +1285,21 @@ async function verifyAppSpecifications(appSpecifications, height, checkDockerAnd
       const isEnterpriseArcane = appSpecifications.version >= 8 && appSpecifications.enterprise;
 
       if (isEnterpriseArcane) {
-        // Enterprise Arcane apps (v8+) must support amd64 on ALL components (Arcane nodes are amd64-only)
-        const componentsWithoutAmd64 = componentArchitectures.filter(
-          (comp) => !comp.architectures.includes('amd64'),
+        // Enterprise Arcane apps (v8+) must support required architectures on ALL components (Arcane nodes are amd64-only)
+        const componentsWithoutRequiredArchs = componentArchitectures.filter(
+          (comp) => !enterpriseRequiredArchitectures.every((arch) => comp.architectures.includes(arch)),
         );
 
-        if (componentsWithoutAmd64.length > 0) {
-          const componentNames = componentsWithoutAmd64.map((c) => `${c.name} (${c.repotag})`).join(', ');
+        if (componentsWithoutRequiredArchs.length > 0) {
+          const componentNames = componentsWithoutRequiredArchs.map((c) => `${c.name} (${c.repotag})`).join(', ');
           throw new Error(
             `Enterprise application '${appSpecifications.name}' must support ${enterpriseRequiredArchitectures.join(', ')} `
-            + `architecture on ALL components. The following components do not support amd64: ${componentNames}. `
+            + `architecture on ALL components. The following components do not support ${enterpriseRequiredArchitectures.join(', ')}: ${componentNames}. `
             + `Arcane nodes are amd64-only.`,
           );
         }
       } else {
         // Non-enterprise apps: must have at least ONE common architecture across all components
-        const findCommonArchitectures = (compArchs) => {
-          if (compArchs.length === 0) return [];
-          if (compArchs.length === 1) return compArchs[0].architectures;
-
-          return compArchs[0].architectures.filter((arch) =>
-            compArchs.every((comp) => comp.architectures.includes(arch)),
-          );
-        };
-
         const commonArchitectures = findCommonArchitectures(componentArchitectures);
 
         if (commonArchitectures.length === 0) {

ZelBack/src/services/utils/appUtilities.js

@@ -1052,6 +1052,20 @@ function updateToLatestAppSpecifications(appSpec) {
   throw new Error('Original application version not recognized');
 }
 
+/**
+ * Find common architectures across all app components
+ * @param {Array<{name: string, architectures: string[]}>} componentArchitectures - Array of component architecture info
+ * @returns {string[]} Array of architecture strings common to all components
+ */
+function findCommonArchitectures(componentArchitectures) {
+  if (componentArchitectures.length === 0) return [];
+  if (componentArchitectures.length === 1) return componentArchitectures[0].architectures;
+
+  return componentArchitectures[0].architectures.filter((arch) =>
+    componentArchitectures.every((comp) => comp.architectures.includes(arch)),
+  );
+}
+
 module.exports = {
   appPricePerMonth,
   nodeFullGeolocation,
@@ -1060,4 +1074,5 @@ module.exports = {
   getAppPorts,
   specificationFormatter,
   updateToLatestAppSpecifications,
+  findCommonArchitectures,
 };

tests/unit/appValidator.test.js

@@ -103,6 +103,13 @@ describe('appValidator tests', () => {
       },
       '../utils/appUtilities': {
         specificationFormatter: sinon.stub().returnsArg(0),
+        findCommonArchitectures: (componentArchitectures) => {
+          if (componentArchitectures.length === 0) return [];
+          if (componentArchitectures.length === 1) return componentArchitectures[0].architectures;
+          return componentArchitectures[0].architectures.filter((arch) =>
+            componentArchitectures.every((comp) => comp.architectures.includes(arch)),
+          );
+        },
       },
       '../utils/enterpriseHelper': {
         checkAndDecryptAppSpecs: sinon.stub().returnsArg(0),