react-native-3rddigital-appupdate 1.0.18 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-3rddigital-appupdate",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "A React Native library for seamless over-the-air (OTA) updates with version checks, automatic bundle download, and customizable user prompts for iOS and Android.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/scripts/bundle.js

@@ -169,6 +169,54 @@ function findFirstXcodeProj(dir) {
   return null;
 }
 
+function findFirstXcworkspace(dir) {
+  const files = fs.readdirSync(dir);
+
+  for (const file of files) {
+    const fullPath = path.join(dir, file);
+    const stat = fs.statSync(fullPath);
+
+    if (stat.isDirectory()) {
+      if (file.endsWith('.xcworkspace') && file !== 'Pods.xcworkspace') {
+        return fullPath;
+      }
+      const nested = findFirstXcworkspace(fullPath);
+      if (nested) return nested;
+    }
+  }
+
+  return null;
+}
+
+function quoteShellArg(value) {
+  return `'${String(value).replace(/'/g, `'\\''`)}'`;
+}
+
+function runAndCapture(command, cwd = process.cwd()) {
+  try {
+    return execSync(command, {
+      cwd,
+      stdio: ['ignore', 'pipe', 'pipe'],
+    })
+      .toString()
+      .trim();
+  } catch (_error) {
+    return null;
+  }
+}
+
+function extractJsonObject(text) {
+  if (!text) return null;
+
+  const start = text.indexOf('{');
+  const end = text.lastIndexOf('}');
+  if (start === -1 || end === -1 || end <= start) {
+    return null;
+  }
+
+  return text.slice(start, end + 1);
+}
+
 function extractBracedBlock(content, startIndex) {
   const openIndex = content.indexOf('{', startIndex);
   if (openIndex === -1) return null;
@@ -349,6 +397,14 @@ function choosePreferredBuildConfig(buildConfigs, preferredNames = []) {
   return buildConfigs[0] ?? null;
 }
 
+function buildIosEntryLabel({ targetName, buildConfiguration, appId }) {
+  const buildConfigurationLabel = buildConfiguration
+    ? ` [${buildConfiguration}]`
+    : '';
+  const appIdLabel = appId ? ` (${appId})` : '';
+  return `${targetName}${buildConfigurationLabel}${appIdLabel}`;
+}
+
 function getAndroidBuildGradlePath(projectRoot) {
   return findFirstExistingPath([
     path.join(projectRoot, 'android', 'app', 'build.gradle'),
@@ -464,19 +520,134 @@ function getIosProjectFiles() {
     return null;
   }
 
+  const xcworkspacePath = findFirstXcworkspace(iosDir);
+
   const pbxprojPath = path.join(xcodeProjPath, 'project.pbxproj');
   if (!fs.existsSync(pbxprojPath)) {
     console.warn('⚠️ project.pbxproj not found.');
     return null;
   }
 
-  return { iosDir, xcodeProjPath, pbxprojPath };
+  return { iosDir, xcodeProjPath, xcworkspacePath, pbxprojPath };
+}
+
+function getIosBuildContainerArgs(projectFiles) {
+  if (projectFiles.xcworkspacePath) {
+    return `-workspace ${quoteShellArg(projectFiles.xcworkspacePath)}`;
+  }
+
+  return `-project ${quoteShellArg(projectFiles.xcodeProjPath)}`;
+}
+
+function parseXcodebuildSettings(output) {
+  const settings = {};
+
+  for (const line of output.split('\n')) {
+    const match = line.match(/^\s*([A-Za-z0-9_]+)\s*=\s*(.+)$/);
+    if (!match) continue;
+    settings[match[1]] = cleanPbxString(match[2]);
+  }
+
+  return settings;
+}
+
+function isResolvedBuildSetting(value) {
+  if (!value) return false;
+
+  return !/[()$]/.test(value);
+}
+
+function getIosSchemeMetadataFromXcodebuild(projectFiles) {
+  const projectRoot = getProjectRoot();
+  const buildContainerArgs = getIosBuildContainerArgs(projectFiles);
+  const listOutput = runAndCapture(
+    `xcodebuild -list -json ${buildContainerArgs}`,
+    projectRoot
+  );
+
+  if (!listOutput) return null;
+
+  try {
+    const jsonOutput = extractJsonObject(listOutput);
+    if (!jsonOutput) return null;
+
+    const parsed = JSON.parse(jsonOutput);
+    const schemes =
+      parsed.project?.schemes ??
+      parsed.workspace?.schemes ??
+      parsed.project?.targets ??
+      [];
+
+    const uniqueSchemes = [...new Set(schemes)].filter(Boolean);
+    if (!uniqueSchemes.length) return null;
+
+    const entries = uniqueSchemes
+      .map((schemeName) => {
+        const buildConfigurations = ['Release', 'Profile', 'Debug'];
+        const buildSettingsOutput = buildConfigurations
+          .map((configuration) => ({
+            configuration,
+            output: runAndCapture(
+              `xcodebuild -showBuildSettings ${buildContainerArgs} -scheme ${quoteShellArg(
+                schemeName
+              )} -configuration ${quoteShellArg(configuration)}`,
+              projectRoot
+            ),
+          }))
+          .find((item) => item.output)?.output;
+
+        if (!buildSettingsOutput) return null;
+
+        const settings = parseXcodebuildSettings(buildSettingsOutput);
+        const appId = isResolvedBuildSetting(settings.PRODUCT_BUNDLE_IDENTIFIER)
+          ? settings.PRODUCT_BUNDLE_IDENTIFIER
+          : null;
+        const version = isResolvedBuildSetting(settings.MARKETING_VERSION)
+          ? settings.MARKETING_VERSION
+          : null;
+        const targetName =
+          settings.TARGET_NAME || settings.PRODUCT_NAME || schemeName;
+
+        return {
+          name: schemeName,
+          targetName,
+          label: schemeName,
+          appId,
+          version,
+          productName: settings.PRODUCT_NAME || targetName,
+          buildConfiguration: settings.CONFIGURATION || 'Release',
+        };
+      })
+      .filter(Boolean);
+
+    if (!entries.length) return null;
+
+    const dedupedEntries = entries.filter(
+      (entry, index, allEntries) =>
+        allEntries.findIndex(
+          (candidate) =>
+            candidate.name === entry.name && candidate.appId === entry.appId
+        ) === index
+    );
+
+    return {
+      defaultConfig: dedupedEntries[0] ?? null,
+      targets: dedupedEntries,
+    };
+  } catch (_error) {
+    return null;
+  }
 }
 
 function getIosTargetMetadata() {
   const projectFiles = getIosProjectFiles();
   if (!projectFiles) return null;
 
+  const xcodebuildMetadata = getIosSchemeMetadataFromXcodebuild(projectFiles);
+  if (xcodebuildMetadata?.targets?.length) {
+    return xcodebuildMetadata;
+  }
+
   const pbxprojContent = fs.readFileSync(projectFiles.pbxprojPath, 'utf8');
   const configObjects = parsePbxprojObjectsByIsa(
     pbxprojContent,
@@ -516,6 +687,18 @@ function getIosTargetMetadata() {
     ])
   );
 
+  const preferredConfigNames = ['Release', 'Profile', 'Debug'];
+  const fallbackConfigGroups = new Map();
+
+  for (const config of configMap.values()) {
+    const appIdKey = config.appId ?? `no-app-id::${config.id}`;
+    if (!fallbackConfigGroups.has(appIdKey)) {
+      fallbackConfigGroups.set(appIdKey, []);
+    }
+
+    fallbackConfigGroups.get(appIdKey).push(config);
+  }
+
   const targetObjects = parsePbxprojObjectsByIsa(
     pbxprojContent,
     'PBXNativeTarget'
@@ -560,7 +743,7 @@ function getIosTargetMetadata() {
         configsByAppId.get(appIdKey).push(buildConfig);
       }
 
-      const preferredConfigNames = [
+      const targetPreferredConfigNames = [
         configList?.defaultName,
         'Release',
         'Profile',
@@ -574,28 +757,27 @@ function getIosTargetMetadata() {
                 buildConfigsWithAppId.length
                   ? buildConfigsWithAppId
                   : buildConfigs,
-                preferredConfigNames
+                targetPreferredConfigNames
               ),
             ].filter(Boolean)
           : Array.from(configsByAppId.values())
               .map((configGroup) =>
-                choosePreferredBuildConfig(configGroup, preferredConfigNames)
+                choosePreferredBuildConfig(
+                  configGroup,
+                  targetPreferredConfigNames
+                )
               )
               .filter(Boolean);
 
       return distinctConfigs.map((selectedConfig) => {
-        const buildConfigurationLabel = selectedConfig.name
-          ? ` [${selectedConfig.name}]`
-          : '';
-
-        const appIdLabel = selectedConfig.appId
-          ? ` (${selectedConfig.appId})`
-          : '';
-
         return {
           name: `${targetName}::${selectedConfig.appId ?? selectedConfig.id ?? 'no-app-id'}`,
           targetName,
-          label: `${targetName}${buildConfigurationLabel}${appIdLabel}`,
+          label: buildIosEntryLabel({
+            targetName,
+            buildConfiguration: selectedConfig.name ?? null,
+            appId: selectedConfig.appId ?? null,
+          }),
           appId: selectedConfig.appId ?? null,
           version: selectedConfig.version ?? null,
           productName: selectedConfig.productName ?? targetName,
@@ -616,9 +798,62 @@ function getIosTargetMetadata() {
       ) === index
   );
 
+  const existingAppIds = new Set(
+    uniqueTargets.map((target) => target.appId).filter(Boolean)
+  );
+
+  const fallbackEntries = Array.from(fallbackConfigGroups.entries())
+    .filter(([appId]) => !existingAppIds.has(appId))
+    .map(([appId, configs]) => {
+      const selectedConfig = choosePreferredBuildConfig(
+        configs,
+        preferredConfigNames
+      );
+      if (!selectedConfig) return null;
+
+      const targetName =
+        selectedConfig.productName &&
+        selectedConfig.productName !== '$(TARGET_NAME)'
+          ? selectedConfig.productName
+          : 'Default';
+
+      return {
+        name: `${targetName}::${appId}`,
+        targetName,
+        label: buildIosEntryLabel({
+          targetName,
+          buildConfiguration: selectedConfig.name ?? null,
+          appId: selectedConfig.appId ?? null,
+        }),
+        appId: selectedConfig.appId ?? null,
+        version: selectedConfig.version ?? null,
+        productName: selectedConfig.productName ?? targetName,
+        buildConfiguration: selectedConfig.name ?? null,
+      };
+    })
+    .filter(Boolean);
+
+  const mergedTargets = [...uniqueTargets, ...fallbackEntries];
+
+  if (!mergedTargets.length) {
+    const fallbackVersionMatch = pbxprojContent.match(
+      /MARKETING_VERSION\s*=\s*([^;]+);/
+    );
+
+    return {
+      defaultConfig: {
+        name: 'default',
+        label: 'Default',
+        appId: null,
+        version: cleanPbxString(fallbackVersionMatch?.[1]) ?? null,
+      },
+      targets: [],
+    };
+  }
+
   return {
-    defaultConfig: uniqueTargets[0] ?? null,
-    targets: uniqueTargets,
+    defaultConfig: mergedTargets[0] ?? null,
+    targets: mergedTargets,
   };
 }