@algocare/react-native-code-push 12.6.4 → 13.0.0-rc.0

package/cli/utils/unzip.ts

@@ -0,0 +1,46 @@
+import fs from "fs";
+import path from "path";
+import yauzl from "yauzl";
+
+export function unzip(zipPath: string, outputDir: string): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+        yauzl.open(zipPath, { lazyEntries: true }, (err, zipFile) => {
+            if (err) return reject(err);
+
+            zipFile.readEntry();
+
+            zipFile.on("entry", (entry) => {
+                const fullPath = path.join(outputDir, entry.fileName);
+
+                // Handle directory entry
+                if (/\/$/.test(entry.fileName)) {
+                    fs.mkdir(fullPath, { recursive: true }, (err) => {
+                        if (err) return reject(err);
+                        zipFile.readEntry();
+                    });
+                    return;
+                }
+
+                // Handle file entry
+                zipFile.openReadStream(entry, (err, readStream) => {
+                    if (err) return reject(err);
+
+                    fs.mkdir(path.dirname(fullPath), { recursive: true }, (err) => {
+                        if (err) return reject(err);
+
+                        const writeStream = fs.createWriteStream(fullPath);
+                        readStream.pipe(writeStream);
+
+                        // Continue to the next entry after writing
+                        writeStream.on("close", () => {
+                            zipFile.readEntry();
+                        });
+                    });
+                });
+            });
+
+          zipFile.on("end", resolve);
+          zipFile.on("error", reject);
+        });
+    });
+}

package/cli/utils/zip.ts

@@ -0,0 +1,65 @@
+/**
+ * code based on appcenter-cli
+ */
+
+import fs from "fs";
+import path from "path";
+import yazl from "yazl";
+import { generateRandomFilename, normalizePath, isDirectory } from "./file-utils.js";
+import { walk } from "./promisfied-fs.js";
+
+type ReleaseFile = { sourceLocation: string, targetLocation: string };
+
+export function zip(updateContentsPath: string): Promise<string> {
+
+    // eslint-disable-next-line no-async-promise-executor
+    return new Promise(async (resolve, reject) => {
+        const releaseFiles: ReleaseFile[] = [];
+
+        try {
+            if (!isDirectory(updateContentsPath)) {
+                releaseFiles.push({
+                    sourceLocation: updateContentsPath,
+                    targetLocation: normalizePath(path.basename(updateContentsPath)), // Put the file in the root
+                });
+            }
+        } catch (error: unknown) {
+            if (error instanceof Error) {
+                error.message = error.message + " Make sure you have added the platform you are making a release to.`.";
+            }
+            reject(error);
+        }
+
+        const directoryPath = updateContentsPath;
+        const baseDirectoryPath = path.join(directoryPath, '..'); // For legacy reasons, put the root directory in the zip
+
+        const files: string[] = await walk(updateContentsPath);
+
+        files.forEach((filePath) => {
+            const relativePath = path.relative(baseDirectoryPath, filePath);
+            releaseFiles.push({
+                sourceLocation: filePath,
+                targetLocation: normalizePath(relativePath),
+            });
+        });
+
+        const packagePath = path.join(process.cwd(), generateRandomFilename(15) + '.zip');
+        const zipFile = new yazl.ZipFile();
+        const writeStream = fs.createWriteStream(packagePath);
+
+        zipFile.outputStream
+            .pipe(writeStream)
+            .on('error', (error: unknown) => {
+                reject(error);
+            })
+            .on('close', () => {
+                resolve(packagePath);
+            });
+
+        releaseFiles.forEach((releaseFile) => {
+            zipFile.addFile(releaseFile.sourceLocation, releaseFile.targetLocation);
+        });
+
+        zipFile.end();
+    });
+}

package/expo/plugin/withCodePush.js

@@ -0,0 +1,14 @@
+const { createRunOncePlugin } = require('expo/config-plugins');
+const { withAndroidMainApplicationDependency } = require('./withCodePushAndroid');
+const { withIosBridgingHeader, withIosAppDelegateDependency } = require('./withCodePushIos');
+const pkg = require('../../package.json');
+
+const withCodePush = (config) => {
+  config = withAndroidMainApplicationDependency(config);
+  config = withIosBridgingHeader(config);
+  config = withIosAppDelegateDependency(config);
+
+  return config;
+};
+
+module.exports = createRunOncePlugin(withCodePush, pkg.name, pkg.version);

package/expo/plugin/withCodePushAndroid.js

@@ -0,0 +1,92 @@
+const { withMainApplication, WarningAggregator } = require('expo/config-plugins');
+
+const IMPORT_CODE_PUSH = 'import com.microsoft.codepush.react.CodePush';
+const RN_082_MARKER = 'ExpoReactHostFactory.getDefaultReactHost(';
+const JS_BUNDLE_FILE_PATH_ARGUMENT = 'jsBundleFilePath = CodePush.getJSBundleFile()';
+
+function androidMainApplicationApplyImplementation(mainApplication, find, add, reverse = false) {
+  if (mainApplication.includes(add)) {
+    return mainApplication;
+  }
+
+  if (mainApplication.includes(find)) {
+    return mainApplication.replace(find, reverse ? `${add}\n${find}` : `${find}\n${add}`);
+  }
+
+  WarningAggregator.addWarningAndroid(
+    'withCodePushAndroid',
+    `
+    Failed to detect "${find.replace(/\n/g, '').trim()}" in the MainApplication.kt.
+    Please add "${add.replace(/\n/g, '').trim()}" to the MainApplication.kt.
+    Supported format: Expo SDK default template.
+
+    Android manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-1-manual-setup
+    `,
+  );
+
+  return mainApplication;
+}
+
+function addJsBundleFilePathArgument(mainApplication) {
+  // Capture packageList block plus optional existing jsBundleFilePath line.
+  // This allows us to normalize comma placement before injecting the new argument.
+  const packageListArgumentPattern = /(packageList\s*=\s*\n\s*PackageList\(this\)[\s\S]+?\},?\s*\n)(\s*jsBundleFilePath\s*=\s*CodePush\.getJSBundleFile\(\),\s*\n)?/;
+
+  if (!packageListArgumentPattern.test(mainApplication)) {
+    WarningAggregator.addWarningAndroid(
+      'withCodePushAndroid',
+      `
+      Failed to detect "packageList = PackageList(this)" block in MainApplication.kt.
+      Please add "jsBundleFilePath = CodePush.getJSBundleFile()" inside getDefaultReactHost arguments.
+
+      Android manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-1-manual-setup
+      `,
+    );
+    return mainApplication;
+  }
+
+  return mainApplication.replace(packageListArgumentPattern, (match, packageListArgument, existingJsBundleArgument) => {
+    const trimmedMatch = packageListArgument.replace(/\s+$/, '');
+    // Kotlin call args need a trailing comma before the next named argument.
+    const hasTrailingComma = /,\s*$/.test(trimmedMatch);
+    const packageListArgumentWithComma = hasTrailingComma ? trimmedMatch : `${trimmedMatch},`;
+    const jsBundleArgument = existingJsBundleArgument
+      ? existingJsBundleArgument.replace(/\s+$/, '')
+      : `      ${JS_BUNDLE_FILE_PATH_ARGUMENT},`;
+    return `${packageListArgumentWithComma}\n${jsBundleArgument}\n`;
+  });
+}
+
+const withAndroidMainApplicationDependency = (config) => {
+  return withMainApplication(config, (action) => {
+    action.modResults.contents = androidMainApplicationApplyImplementation(
+      action.modResults.contents,
+      'import com.facebook.react.ReactApplication',
+      IMPORT_CODE_PUSH,
+    );
+
+    if (action.modResults.contents.includes(RN_082_MARKER)) {
+      action.modResults.contents = addJsBundleFilePathArgument(action.modResults.contents);
+    } else if (!action.modResults.contents.includes('CodePush.getJSBundleFile()')) {
+        // https://github.com/Soomgo-Mobile/react-native-code-push/issues/97
+        const isExpoSDK54 = config.sdkVersion?.startsWith('54.') ?? false;
+        const addingCode = isExpoSDK54
+          ? '        override fun getJSBundleFile(): String {\n' +
+            '          CodePush.getInstance(applicationContext, BuildConfig.DEBUG)\n' +
+            '          return CodePush.getJSBundleFile()\n' +
+            '        }\n'
+          : '        override fun getJSBundleFile(): String = CodePush.getJSBundleFile()\n';
+        action.modResults.contents = androidMainApplicationApplyImplementation(
+          action.modResults.contents,
+          'object : DefaultReactNativeHost(this) {',
+          addingCode,
+        );
+    }
+
+    return action;
+  });
+};
+
+module.exports = {
+  withAndroidMainApplicationDependency,
+};

package/expo/plugin/withCodePushIos.js

@@ -0,0 +1,143 @@
+const { withAppDelegate, withXcodeProject, WarningAggregator } = require('expo/config-plugins');
+const { getAppDelegate } = require('@expo/config-plugins/build/ios/Paths');
+const path = require('path');
+const fs = require('fs');
+
+function iosApplyImplementation(
+  appDelegate,
+  find,
+  add,
+  replace,
+) {
+  if (appDelegate.includes(add)) {
+    return appDelegate;
+  }
+
+  if (appDelegate.includes(find)) {
+    return appDelegate.replace(find, replace ? add : `${find}\n${add}`);
+  }
+
+  WarningAggregator.addWarningIOS(
+    'withCodePushIos',
+    `
+    Failed to detect "${find.replace(/\n/g, '').trim()}" in the AppDelegate.(m|swift).
+    Please ${replace ? 'replace' : 'add'} "${add.replace(/\n/g, '').trim()}" to the AppDelegate.(m|swift).
+    Supported format: Expo SDK default template.
+
+    iOS manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-1-manual-setup
+    `,
+  );
+
+  return appDelegate;
+}
+
+function getBridgingHeaderFileFromXcode(project) {
+  const buildConfigs = project.pbxXCBuildConfigurationSection();
+
+  for (const key in buildConfigs) {
+    const config = buildConfigs[key];
+    if (
+      typeof config === 'object' &&
+      config.buildSettings &&
+      config.buildSettings['SWIFT_OBJC_BRIDGING_HEADER']
+    ) {
+      const bridgingHeaderFile = config.buildSettings[
+        'SWIFT_OBJC_BRIDGING_HEADER'
+      ].replace(/"/g, '');
+
+      return bridgingHeaderFile;
+    }
+  }
+  return null;
+}
+
+const withIosAppDelegateDependency = (config) => {
+  return withAppDelegate(config, (action) => {
+    const language = action.modResults.language;
+
+    if (['objc', 'objcpp'].includes(language)) {
+      action.modResults.contents = iosApplyImplementation(
+        action.modResults.contents,
+        `#import "AppDelegate.h"`,
+        `#import <CodePush/CodePush.h>`,
+      );
+      action.modResults.contents = iosApplyImplementation(
+        action.modResults.contents,
+        `return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];`,
+        `return [CodePush bundleURL];`,
+        true,
+      );
+
+      return action;
+    }
+
+    if (language === 'swift') {
+      action.modResults.contents = iosApplyImplementation(
+        action.modResults.contents,
+        `return Bundle.main.url(forResource: "main", withExtension: "jsbundle")`,
+        `return CodePush.bundleURL()`,
+        true,
+      );
+
+      return action;
+    }
+
+    WarningAggregator.addWarningIOS(
+      'withIosAppDelegate',
+      `${language} AppDelegate file is not supported yet.`,
+    );
+
+    return action;
+  });
+};
+
+const withIosBridgingHeader = (config) => {
+  return withXcodeProject(config, (action) => {
+    const projectRoot = action.modRequest.projectRoot;
+    const appDelegate = getAppDelegate(projectRoot);
+
+    if (appDelegate.language === 'swift') {
+      const bridgingHeaderFile = getBridgingHeaderFileFromXcode(
+        action.modResults,
+      );
+
+      const bridgingHeaderPath = path.join(
+        action.modRequest.platformProjectRoot,
+        bridgingHeaderFile,
+      );
+
+      if (fs.existsSync(bridgingHeaderPath)) {
+        let content = fs.readFileSync(bridgingHeaderPath, 'utf8');
+        const codePushImport = '#import <CodePush/CodePush.h>';
+
+        if (!content.includes(codePushImport)) {
+          content += `${codePushImport}\n`;
+          fs.writeFileSync(bridgingHeaderPath, content);
+        }
+
+        return action;
+      }
+
+      WarningAggregator.addWarningIOS(
+        'withIosBridgingHeader',
+        `
+        Failed to detect ${bridgingHeaderPath} file.
+        Please add CodePush integration manually:
+        #import <CodePush/CodePush.h>
+
+        Supported format: Expo SDK default template.
+        iOS manual setup: https://github.com/Soomgo-Mobile/react-native-code-push#2-1-manual-setup
+        `
+      );
+
+      return action;
+    }
+
+    return action;
+  });
+};
+
+module.exports = {
+  withIosAppDelegateDependency,
+  withIosBridgingHeader,
+};

package/ios/CodePush/CodePush.h

@@ -102,7 +102,6 @@
 @property (readonly) NSDictionary *configuration;
 @property (copy) NSString *deploymentKey;
 @property (copy) NSString *serverURL;
-@property (copy) NSString *publicKey;
 
 + (instancetype)current;
 
@@ -140,7 +139,6 @@ failCallback:(void (^)(NSError *err))failCallback;
 
 + (void)downloadPackage:(NSDictionary *)updatePackage
  expectedBundleFileName:(NSString *)expectedBundleFileName
-              publicKey:(NSString *)publicKey
          operationQueue:(dispatch_queue_t)operationQueue
        progressCallback:(void (^)(long long, long long))progressCallback
            doneCallback:(void (^)())doneCallback
@@ -205,20 +203,6 @@ downloadCompleteCallback:(void (^)())downloadCompleteCallback;
                    expectedHash:(NSString *)expectedHash
                           error:(NSError **)error;
 
-// remove BEGIN / END tags and line breaks from public key string
-+ (NSString *)getKeyValueFromPublicKeyString:(NSString *)publicKeyString;
-
-+ (NSString *)getSignatureFilePath:(NSString *)updateFolderPath;
-
-+ (NSDictionary *) verifyAndDecodeJWT:(NSString *) jwt
-               withPublicKey:(NSString *)publicKey
-                       error:(NSError **)error;
-
-+ (BOOL)verifyUpdateSignatureFor:(NSString *)updateFolderPath
-                    expectedHash:(NSString *)newUpdateHash
-                   withPublicKey:(NSString *)publicKeyString
-                           error:(NSError **)error;
-
 @end
 
 void CPLog(NSString *formatString, ...);

package/ios/CodePush/CodePush.m

@@ -1,18 +1,10 @@
-#if __has_include(<React/RCTAssert.h>)
 #import <React/RCTAssert.h>
 #import <React/RCTBridgeModule.h>
 #import <React/RCTConvert.h>
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTRootView.h>
 #import <React/RCTUtils.h>
-#else // back compatibility for RN version < 0.40
-#import "RCTAssert.h"
-#import "RCTBridgeModule.h"
-#import "RCTConvert.h"
-#import "RCTEventDispatcher.h"
-#import "RCTRootView.h"
-#import "RCTUtils.h"
-#endif
+#import <React/RCTReloadCommand.h>
 
 #import "CodePush.h"
 
@@ -31,7 +23,8 @@
     long long _latestExpectedContentLength;
     long long _latestReceivedConentLength;
     BOOL _didUpdateProgress;
-    
+    NSTimeInterval _lastProgressEventTime;
+
     BOOL _allowed;
     BOOL _restartInProgress;
     NSMutableArray *_restartQueue;
@@ -218,7 +211,7 @@ static NSString *const LatestRollbackCountKey = @"count";
 
 + (void)setDeploymentKey:(NSString *)deploymentKey
 {
-    [CodePushConfig current].deploymentKey = deploymentKey;
+    [CodePushConfig current].deploymentKey = @"deprecated_deployment_key";
 }
 
 /*
@@ -337,6 +330,18 @@ static NSString *const LatestRollbackCountKey = @"count";
                      }];
 }
 
+- (void)dispatchThrottledDownloadProgressEventWithForce:(BOOL)force
+{
+    static const NSTimeInterval interval = 0.05; // 50 ms throttle
+    NSTimeInterval now = CFAbsoluteTimeGetCurrent();
+    if (!force && _lastProgressEventTime > 0 && (now - _lastProgressEventTime) < interval) {
+        return;
+    }
+
+    _lastProgressEventTime = now;
+    [self dispatchDownloadProgressEvent];
+}
+
 /*
  * This method ensures that the app was packaged with a JS bundle
  * file, and if not, it throws the appropriate exception.
@@ -378,7 +383,8 @@ static NSString *const LatestRollbackCountKey = @"count";
     _allowed = YES;
     _restartInProgress = NO;
     _restartQueue = [NSMutableArray arrayWithCapacity:1];
-    
+    _lastProgressEventTime = 0;
+
     self = [super init];
     if (self) {
         [self initializeUpdateAfterRestart];
@@ -542,7 +548,7 @@ static NSString *const LatestRollbackCountKey = @"count";
             [super.bridge setValue:[CodePush bundleURL] forKey:@"bundleURL"];
         }
 
-        [super.bridge reload];
+        RCTTriggerReloadCommandListeners(@"CodePush reload");
     });
 }
 
@@ -584,7 +590,7 @@ static NSString *const LatestRollbackCountKey = @"count";
     if ([[self class] isFailedHash:[failedPackage objectForKey:PackageHashKey]]) {
         return;
     }
-    
+
     NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
     NSMutableArray *failedUpdates = [preferences objectForKey:FailedUpdatesKey];
     if (failedUpdates == nil) {
@@ -724,10 +730,9 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
         // progress events every frame if the progress is updated.
         _didUpdateProgress = NO;
         self.paused = NO;
+        _lastProgressEventTime = 0;
     }
 
-    NSString * publicKey = [[CodePushConfig current] publicKey];
-
     // Install progress callback for reporting unzip/file-copy progress to JS
     void (^installProgressCallback)(NSString *, NSNumber *, NSNumber *) =
         ^(NSString *phase, NSNumber *current, NSNumber *total) {
@@ -742,7 +747,6 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
     [CodePushPackage
         downloadPackage:mutableUpdatePackage
         expectedBundleFileName:[bundleResourceName stringByAppendingPathExtension:bundleResourceExtension]
-        publicKey:publicKey
         operationQueue:_methodQueue
         // The download is progressing forward
         progressCallback:^(long long expectedContentLength, long long receivedContentLength) {
@@ -750,13 +754,19 @@ RCT_EXPORT_METHOD(downloadUpdate:(NSDictionary*)updatePackage
             _latestExpectedContentLength = expectedContentLength;
             _latestReceivedConentLength = receivedContentLength;
             _didUpdateProgress = YES;
+            // Fabric/TurboModules don't hook RCTFrameUpdateObserver, so _pauseCallback
+            // stays nil there and we must emit progress events directly.
+            // On the legacy bridge _pauseCallback is set, and didUpdateFrame handles dispatch.
+            if (!_pauseCallback) {
+                [self dispatchThrottledDownloadProgressEventWithForce:NO];
+            }
 
             // If the download is completed, stop observing frame
             // updates and synchronously send the last event.
             if (expectedContentLength == receivedContentLength) {
                 _didUpdateProgress = NO;
                 self.paused = YES;
-                [self dispatchDownloadProgressEvent];
+                [self dispatchThrottledDownloadProgressEventWithForce:YES];
             }
         }
         // The download and post-processing completed
@@ -934,7 +944,7 @@ RCT_EXPORT_METHOD(installUpdate:(NSDictionary*)updatePackage
                                                          selector:@selector(applicationDidBecomeActive)
                                                              name:UIApplicationDidBecomeActiveNotification
                                                            object:RCTSharedApplication()];
-                                                           
+
                 [[NSNotificationCenter defaultCenter] addObserver:self
                                                          selector:@selector(applicationWillEnterForeground)
                                                              name:UIApplicationWillEnterForegroundNotification
@@ -1135,7 +1145,7 @@ RCT_EXPORT_METHOD(saveStatusReportForRetry:(NSDictionary *)statusReport)
         return;
     }
 
-    [self dispatchDownloadProgressEvent];
+    [self dispatchThrottledDownloadProgressEventWithForce:YES];
     _didUpdateProgress = NO;
 }
 

package/ios/CodePush/CodePushConfig.m

@@ -12,7 +12,6 @@ static NSString * const BuildVersionConfigKey = @"buildVersion";
 static NSString * const ClientUniqueIDConfigKey = @"clientUniqueId";
 static NSString * const DeploymentKeyConfigKey = @"deploymentKey";
 static NSString * const ServerURLConfigKey = @"serverUrl";
-static NSString * const PublicKeyKey = @"publicKey";
 
 + (instancetype)current
 {
@@ -35,8 +34,7 @@ static NSString * const PublicKeyKey = @"publicKey";
     NSString *buildVersion = [infoDictionary objectForKey:(NSString *)kCFBundleVersionKey];
     NSString *deploymentKey = [infoDictionary objectForKey:@"CodePushDeploymentKey"];
     NSString *serverURL = [infoDictionary objectForKey:@"CodePushServerURL"];
-    NSString *publicKey = [infoDictionary objectForKey:@"CodePushPublicKey"];
-    
+
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
     NSString *clientUniqueId = [userDefaults stringForKey:ClientUniqueIDConfigKey];
     if (clientUniqueId == nil) {
@@ -56,7 +54,6 @@ static NSString * const PublicKeyKey = @"publicKey";
     if (serverURL) [_configDictionary setObject:serverURL forKey:ServerURLConfigKey];
     if (clientUniqueId) [_configDictionary setObject:clientUniqueId forKey:ClientUniqueIDConfigKey];
     if (deploymentKey) [_configDictionary setObject:deploymentKey forKey:DeploymentKeyConfigKey];
-    if (publicKey) [_configDictionary setObject:publicKey forKey:PublicKeyKey];
 
     return self;
 }
@@ -91,11 +88,6 @@ static NSString * const PublicKeyKey = @"publicKey";
     return [_configDictionary objectForKey:ClientUniqueIDConfigKey];
 }
 
-- (NSString *)publicKey
-{
-    return [_configDictionary objectForKey:PublicKeyKey];
-}
-
 - (void)setAppVersion:(NSString *)appVersion
 {
     [_configDictionary setValue:appVersion forKey:AppVersionConfigKey];
@@ -111,6 +103,4 @@ static NSString * const PublicKeyKey = @"publicKey";
     [_configDictionary setValue:serverURL forKey:ServerURLConfigKey];
 }
 
-//no setter for PublicKey, because it's need to be hard coded within Info.plist for safety
-
 @end