@revopush/react-native-code-push 2.6.0-rc.4 → 2.6.1

package/ios/CodePush/CodePushPackage.m

@@ -90,12 +90,26 @@ static NSString *const UnzippedFolderName = @"unzipped";
     NSString *singleUrl = updatePackage[@"downloadUrl"] ?: updatePackage[@"download_url"];
 
     __block BOOL cameFromDiffHandler = (bundleDiffUrl.length > 0);
-
+    __block BOOL fallbackStarted = NO;
+    // Assigned below. commonDone reaches back into it to retry a diff that verified badly.
+    __block void (^startFullDownload)(void) = nil;
 
     void (^commonDone)(BOOL) = ^(BOOL isZip) {
         NSError *error = nil;
         NSString * unzippedFolderPath = [CodePushPackage getUnzippedFolderPath];
         NSMutableDictionary * mutableUpdatePackage = [updatePackage mutableCopy];
+
+        // A diff patched against the wrong base still produces a well-formed folder, just one
+        // holding the wrong bytes. Retry as a full download rather than failing the update.
+        BOOL (^recoverFromIntegrityFailure)(void) = ^BOOL {
+            if (!cameFromDiffHandler || fallbackStarted || singleUrl.length == 0) {
+                return NO;
+            }
+            CPLog(@"Falling back to a full download.");
+            startFullDownload();
+            return YES;
+        };
+
         if (isZip) {
             if ([[NSFileManager defaultManager] fileExistsAtPath:unzippedFolderPath]) {
                 // This removes any unzipped download data that could have been left
@@ -257,6 +271,9 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                   expectedHash:newUpdateHash
                                                          error:&error]) {
                         CPLog(@"The update contents failed the data integrity check.");
+                        if (recoverFromIntegrityFailure()) {
+                            return;
+                        }
                         if (!error) {
                             error = [CodePushErrorUtils errorWithMessage:@"The update contents failed the data integrity check."];
                         }
@@ -305,6 +322,9 @@ static NSString *const UnzippedFolderName = @"unzipped";
                                                   expectedHash:newUpdateHash
                                                          error:&error]) {
                         CPLog(@"The update contents failed the data integrity check.");
+                        if (recoverFromIntegrityFailure()) {
+                            return;
+                        }
                         if (!error) {
                             error = [CodePushErrorUtils errorWithMessage:@"The update contents failed the data integrity check."];
                         }
@@ -347,15 +367,16 @@ static NSString *const UnzippedFolderName = @"unzipped";
         }
     };
 
-    __block BOOL fallbackStarted = NO;
-
-    void (^startFullDownload)(void) = ^{
+    startFullDownload = ^{
         if (fallbackStarted) return;
         fallbackStarted = YES;
 
         NSError *cleanupErr = nil;
         [[NSFileManager defaultManager] removeItemAtPath:downloadFilePath error:&cleanupErr];
         [[NSFileManager defaultManager] removeItemAtPath:[CodePushPackage getUnzippedFolderPath] error:nil];
+        // A diff that got as far as the integrity check already assembled this folder. Whatever it
+        // left behind is wrong, and copyEntriesInFolder overlays rather than replaces.
+        [[NSFileManager defaultManager] removeItemAtPath:newUpdateFolderPath error:nil];
 
         CodePushDownloadHandler *downloadHandler = [[CodePushDownloadHandler alloc]
             init:downloadFilePath
@@ -378,8 +399,12 @@ static NSString *const UnzippedFolderName = @"unzipped";
 
 
     if (cameFromDiffHandler) {
-        NSString *assetsUrl = updatePackage[@"assetDownloadUrl"] ?: updatePackage[@"asset_download_url"];
-        NSString *assetHash = updatePackage[@"assetHash"] ?: updatePackage[@"asset_hash"];
+        // Retained now: this is the last moment we know the release naming it is still on disk.
+        NSString *baseHash = [self basePackageHash:updatePackage];
+        NSString *baseBundlePath = [self findBaseBundleForPackageHash:baseHash];
+        if (baseBundlePath) {
+            [CodePushBaseBundleStore save:baseBundlePath forPackageHash:baseHash];
+        }
 
         NSError *pkgErr = nil;
         NSDictionary *currentPackage = [CodePushPackage getCurrentPackage:&pkgErr];
@@ -396,10 +421,13 @@ static NSString *const UnzippedFolderName = @"unzipped";
 
         CPLog(@"Diff download handler");
 
-        [diffHandler downloadWithDiffUrl:bundleDiffUrl assetsUrl:assetsUrl assetHash:assetHash nativeAssetHash:nativeAssetHash currentPackage:currentPackage];
+        [diffHandler downloadWithDiffUrl:bundleDiffUrl
+                               assetsUrl:assetsUrl
+                               assetHash:assetHash
+                         nativeAssetHash:nativeAssetHash
+                          currentPackage:currentPackage
+                          baseBundlePath:baseBundlePath];
     } else {
-        NSString *singleUrl = updatePackage[@"downloadUrl"] ?: updatePackage[@"download_url"];
-
         CodePushDownloadHandler *downloadHandler = [[CodePushDownloadHandler alloc]
                 init:downloadFilePath
                 operationQueue:operationQueue
@@ -540,6 +568,51 @@ static NSString *const UnzippedFolderName = @"unzipped";
     return [[self getCodePushPath] stringByAppendingPathComponent:packageHash];
 }
 
+/** The package hash the server named as the diff base, or nil if it named none we can use. */
++ (NSString *)basePackageHash:(NSDictionary *)updatePackage
+{
+    NSDictionary *basePackage = updatePackage[@"basePackage"];
+    if (![basePackage isKindOfClass:NSDictionary.class]) {
+        return nil;
+    }
+
+    NSString *packageHash = basePackage[@"packageHash"];
+    if (packageHash.length == 0) {
+        // Named a base with no hash: server and SDK disagree on the field name.
+        CPLog(@"basePackage has no packageHash. Patching against the binary.");
+        return nil;
+    }
+
+    return packageHash;
+}
+
+/**
+ * The bundle to patch against: the retained copy of that release, else the release's own bundle
+ * while its package folder still exists. nil means patch against the binary's bundle instead.
+ */
++ (NSString *)findBaseBundleForPackageHash:(NSString *)packageHash
+{
+    if (packageHash.length == 0) {
+        return nil;
+    }
+
+    NSString *bundlePath = [CodePushBaseBundleStore lookup:packageHash];
+    if (bundlePath) {
+        return bundlePath;
+    }
+
+    NSString *relativeBundlePath = [self getPackage:packageHash error:nil][RelativeBundlePathKey];
+    bundlePath = relativeBundlePath.length > 0
+            ? [[self getPackageFolderPath:packageHash] stringByAppendingPathComponent:relativeBundlePath]
+            : nil;
+    if (bundlePath && [[NSFileManager defaultManager] fileExistsAtPath:bundlePath]) {
+        return bundlePath;
+    }
+
+    CPLog(@"Base %@ not held. Patching against the binary.", packageHash);
+    return nil;
+}
+
 + (NSDictionary *)getPreviousPackage:(NSError **)error
 {
     NSString *packageHash = [self getPreviousPackageHash:error];

package/ios/CodePush.xcodeproj/project.pbxproj

@@ -81,6 +81,7 @@
 		6463C82E1EBA0CFB0095B8CD /* CodePush.m in Sources */ = {isa = PBXBuildFile; fileRef = 13BE3DED1AC21097009241FE /* CodePush.m */; };
 		6463C82F1EBA0CFB0095B8CD /* CodePushConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 81D51F391B6181C2000DA084 /* CodePushConfig.m */; };
 		6463C8321EBA0CFB0095B8CD /* CodePushPackage.m in Sources */ = {isa = PBXBuildFile; fileRef = 810D4E6C1B96935000B397E9 /* CodePushPackage.m */; };
+		BA5EB00D0000000000000003 /* CodePushBaseBundleStore.m in Sources */ = {isa = PBXBuildFile; fileRef = BA5EB00D0000000000000001 /* CodePushBaseBundleStore.m */; };
 		6463C8331EBA0CFB0095B8CD /* CodePushTelemetryManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5421FE301C58AD5A00986A55 /* CodePushTelemetryManager.m */; };
 		6463C8341EBA0CFB0095B8CD /* CodePushUpdateUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 540D20111C7684FE00D6EF41 /* CodePushUpdateUtils.m */; };
 		6463C8351EBA0CFB0095B8CD /* RCTConvert+CodePushInstallMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B23B9131BF9267B000BB2F0 /* RCTConvert+CodePushInstallMode.m */; };
@@ -88,6 +89,7 @@
 		6463C8451EBA0D1F0095B8CD /* CodePush.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13BE3DEC1AC21097009241FE /* CodePush.h */; };
 		6463C8471EBA0D290095B8CD /* CodePush.h in Headers */ = {isa = PBXBuildFile; fileRef = 13BE3DEC1AC21097009241FE /* CodePush.h */; };
 		810D4E6D1B96935000B397E9 /* CodePushPackage.m in Sources */ = {isa = PBXBuildFile; fileRef = 810D4E6C1B96935000B397E9 /* CodePushPackage.m */; };
+		BA5EB00D0000000000000002 /* CodePushBaseBundleStore.m in Sources */ = {isa = PBXBuildFile; fileRef = BA5EB00D0000000000000001 /* CodePushBaseBundleStore.m */; };
 		81D51F3A1B6181C2000DA084 /* CodePushConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 81D51F391B6181C2000DA084 /* CodePushConfig.m */; };
 		8482F84C1E24C58300F793DB /* CodePush.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 13BE3DEC1AC21097009241FE /* CodePush.h */; };
 		8482F84E1E24C66300F793DB /* CodePush.h in Headers */ = {isa = PBXBuildFile; fileRef = 13BE3DEC1AC21097009241FE /* CodePush.h */; };
@@ -210,6 +212,7 @@
 		540D20111C7684FE00D6EF41 /* CodePushUpdateUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CodePushUpdateUtils.m; path = CodePush/CodePushUpdateUtils.m; sourceTree = "<group>"; };
 		5421FE301C58AD5A00986A55 /* CodePushTelemetryManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CodePushTelemetryManager.m; path = CodePush/CodePushTelemetryManager.m; sourceTree = "<group>"; };
 		810D4E6C1B96935000B397E9 /* CodePushPackage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CodePushPackage.m; path = CodePush/CodePushPackage.m; sourceTree = "<group>"; };
+		BA5EB00D0000000000000001 /* CodePushBaseBundleStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CodePushBaseBundleStore.m; path = CodePush/CodePushBaseBundleStore.m; sourceTree = "<group>"; };
 		81D51F391B6181C2000DA084 /* CodePushConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CodePushConfig.m; path = CodePush/CodePushConfig.m; sourceTree = "<group>"; };
 		F85736731F4F03BF00C9C00A /* MF_Base64Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MF_Base64Additions.h; sourceTree = "<group>"; };
 		F85736741F4F03BF00C9C00A /* MF_Base64Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MF_Base64Additions.m; sourceTree = "<group>"; };
@@ -370,6 +373,7 @@
 				13BE3DED1AC21097009241FE /* CodePush.m */,
 				81D51F391B6181C2000DA084 /* CodePushConfig.m */,
 				810D4E6C1B96935000B397E9 /* CodePushPackage.m */,
+				BA5EB00D0000000000000001 /* CodePushBaseBundleStore.m */,
 				5421FE301C58AD5A00986A55 /* CodePushTelemetryManager.m */,
 				540D20111C7684FE00D6EF41 /* CodePushUpdateUtils.m */,
 				1B23B9131BF9267B000BB2F0 /* RCTConvert+CodePushInstallMode.m */,
@@ -763,6 +767,7 @@
 				F88664511F4AD1EE0036D01B /* JWTAlgorithmNone.m in Sources */,
 				3221E4612C8ABE1300268379 /* mz_zip_rw.c in Sources */,
 				810D4E6D1B96935000B397E9 /* CodePushPackage.m in Sources */,
+				BA5EB00D0000000000000002 /* CodePushBaseBundleStore.m in Sources */,
 				3221E4552C8ABE1300268379 /* mz_strm_pkcrypt.c in Sources */,
 				F88664531F4AD1EE0036D01B /* JWTAlgorithmESBase.m in Sources */,
 				3221E4532C8ABE1300268379 /* mz_strm_os_posix.c in Sources */,
@@ -783,6 +788,7 @@
 				6463C82F1EBA0CFB0095B8CD /* CodePushConfig.m in Sources */,
 				3221E46E2C8ABE1300268379 /* mz_crypt.c in Sources */,
 				6463C8321EBA0CFB0095B8CD /* CodePushPackage.m in Sources */,
+				BA5EB00D0000000000000003 /* CodePushBaseBundleStore.m in Sources */,
 				6463C8331EBA0CFB0095B8CD /* CodePushTelemetryManager.m in Sources */,
 				6463C8341EBA0CFB0095B8CD /* CodePushUpdateUtils.m in Sources */,
 				3221E45C2C8ABE1300268379 /* mz_strm_zlib.c in Sources */,

package/ios/Frameworks/DiffUpdates.xcframework/ios-arm64/DiffUpdates.framework/Headers/DiffUpdates.h

@@ -8,6 +8,12 @@ FOUNDATION_EXPORT const unsigned char DiffUpdatesVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <DiffUpdates/PublicHeader.h>
 
+#if __has_include(<DiffUpdates/hpatch_objc.h>)
+#import <DiffUpdates/hpatch_objc.h>
+#else
+#import "hpatch_objc.h"
+#endif
+
 @interface CodePushDownloadHandler : NSObject <NSURLConnectionDelegate>
 
 @property (strong) NSOutputStream *outputFileStream;
@@ -43,6 +49,18 @@ FOUNDATION_EXPORT const unsigned char DiffUpdatesVersionString[];
        doneCallback:(void (^)(BOOL))doneCallback
        failCallback:(void (^)(NSError *err))failCallback;
 
+/**
+ * Patches against baseBundlePath, or against the binary's own bundle when it is nil.
+ * The patched bundle always keeps the binary bundle's file name, whatever the base was.
+ */
+- (void)downloadWithDiffUrl:(NSString *)diffUrl
+                  assetsUrl:(NSString * _Nullable)assetsUrl
+                  assetHash:(NSString * _Nullable)assetHash
+            nativeAssetHash:(NSString * _Nullable)nativeAssetHash
+             currentPackage:(NSDictionary * _Nullable)currentPackage
+             baseBundlePath:(NSString * _Nullable)baseBundlePath;
+
+/** Patches against the binary's own bundle. Kept so an older SDK links against a newer framework. */
 - (void)downloadWithDiffUrl:(NSString *)diffUrl
                   assetsUrl:(NSString * _Nullable)assetsUrl
                   assetHash:(NSString * _Nullable)assetHash

package/ios/Frameworks/DiffUpdates.xcframework/ios-arm64/DiffUpdates.framework/Headers/hpatch_objc.h

@@ -0,0 +1,23 @@
+#import <Foundation/Foundation.h>
+
+@interface hpatcher : NSObject
+
+//  return THPatchResult, 0 is ok
+//  cacheMemory:
+//    cacheMemory is used for file IO, different cacheMemory only affects patch speed;
+//    recommended 256*1024,1024*1024,... if cacheMemory<0 then default 256*1024;
+//    NOTE: if diffFile created by $xdelta3(-S,-S lzma),$open-vcdiff, alloc memory+=sourceWindowSize+targetWindowSize;
+//        ( sourceWindowSize & targetWindowSize is set when diff, C API getVcDiffInfo() can got values from diffFile. )
+//    if diffFile created by $bsdiff4, and patch very slow,
+//      then cacheMemory recommended oldFileSize+256*1024;
+
++ (int)patchWithOld:(NSString *)oldFileName
+           withDiff:(NSString *)diffFileName
+              toNew:(NSString *)outNewFileName;
+
++ (int)patchWithOld:(NSString *)oldFileName
+           withDiff:(NSString *)diffFileName
+              toNew:(NSString *)outNewFileName
+           byMemory:(int64_t)cacheMemory;
+
+@end

package/ios/Frameworks/DiffUpdates.xcframework/ios-arm64_x86_64-simulator/DiffUpdates.framework/Headers/DiffUpdates.h

@@ -8,6 +8,12 @@ FOUNDATION_EXPORT const unsigned char DiffUpdatesVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <DiffUpdates/PublicHeader.h>
 
+#if __has_include(<DiffUpdates/hpatch_objc.h>)
+#import <DiffUpdates/hpatch_objc.h>
+#else
+#import "hpatch_objc.h"
+#endif
+
 @interface CodePushDownloadHandler : NSObject <NSURLConnectionDelegate>
 
 @property (strong) NSOutputStream *outputFileStream;
@@ -43,6 +49,18 @@ FOUNDATION_EXPORT const unsigned char DiffUpdatesVersionString[];
        doneCallback:(void (^)(BOOL))doneCallback
        failCallback:(void (^)(NSError *err))failCallback;
 
+/**
+ * Patches against baseBundlePath, or against the binary's own bundle when it is nil.
+ * The patched bundle always keeps the binary bundle's file name, whatever the base was.
+ */
+- (void)downloadWithDiffUrl:(NSString *)diffUrl
+                  assetsUrl:(NSString * _Nullable)assetsUrl
+                  assetHash:(NSString * _Nullable)assetHash
+            nativeAssetHash:(NSString * _Nullable)nativeAssetHash
+             currentPackage:(NSDictionary * _Nullable)currentPackage
+             baseBundlePath:(NSString * _Nullable)baseBundlePath;
+
+/** Patches against the binary's own bundle. Kept so an older SDK links against a newer framework. */
 - (void)downloadWithDiffUrl:(NSString *)diffUrl
                   assetsUrl:(NSString * _Nullable)assetsUrl
                   assetHash:(NSString * _Nullable)assetHash

package/ios/Frameworks/DiffUpdates.xcframework/ios-arm64_x86_64-simulator/DiffUpdates.framework/Headers/hpatch_objc.h

@@ -0,0 +1,23 @@
+#import <Foundation/Foundation.h>
+
+@interface hpatcher : NSObject
+
+//  return THPatchResult, 0 is ok
+//  cacheMemory:
+//    cacheMemory is used for file IO, different cacheMemory only affects patch speed;
+//    recommended 256*1024,1024*1024,... if cacheMemory<0 then default 256*1024;
+//    NOTE: if diffFile created by $xdelta3(-S,-S lzma),$open-vcdiff, alloc memory+=sourceWindowSize+targetWindowSize;
+//        ( sourceWindowSize & targetWindowSize is set when diff, C API getVcDiffInfo() can got values from diffFile. )
+//    if diffFile created by $bsdiff4, and patch very slow,
+//      then cacheMemory recommended oldFileSize+256*1024;
+
++ (int)patchWithOld:(NSString *)oldFileName
+           withDiff:(NSString *)diffFileName
+              toNew:(NSString *)outNewFileName;
+
++ (int)patchWithOld:(NSString *)oldFileName
+           withDiff:(NSString *)diffFileName
+              toNew:(NSString *)outNewFileName
+           byMemory:(int64_t)cacheMemory;
+
+@end

package/ios/Frameworks/DiffUpdates.xcframework/ios-arm64_x86_64-simulator/DiffUpdates.framework/_CodeSignature/CodeResources

@@ -6,11 +6,15 @@
 	<dict>
 		<key>Headers/DiffUpdates.h</key>
 		<data>
-		obtyjOKZntpytQhuejpfeMN0BoI=
+		g/pumjyvm0+YW5l1ITg21uE1aks=
+		</data>
+		<key>Headers/hpatch_objc.h</key>
+		<data>
+		SaiQblz/yRr77onv7z8Ugu73qD8=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		1nTR8o5HkR4SUcF0Z6umqipQPHI=
+		2zKOg08DVcAALLhU4O6Sww/NWPU=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -21,21 +25,20 @@
 	<dict>
 		<key>Headers/DiffUpdates.h</key>
 		<dict>
-			<key>hash</key>
+			<key>hash2</key>
 			<data>
-			obtyjOKZntpytQhuejpfeMN0BoI=
+			wph2g8VsI7OQgHbVrjlwf1Th3yy7DNGvT17//mXP4JY=
 			</data>
+		</dict>
+		<key>Headers/hpatch_objc.h</key>
+		<dict>
 			<key>hash2</key>
 			<data>
-			DdvTO8aHHON6ybR/EQTihMgOY9j/pmVw7sekeFl71N4=
+			njsIVvkyjrzbeGuTmt0E8DrCRWuM7HykrRewMTqIatw=
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>
 		<dict>
-			<key>hash</key>
-			<data>
-			MdjndwGRSccoMYmOwMDjozLG1jc=
-			</data>
 			<key>hash2</key>
 			<data>
 			TkYpCqgNFTGwSnC7+iZu51GEITzi1EHKvjZj4HupKms=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revopush/react-native-code-push",
-  "version": "2.6.0-rc.4",
+  "version": "2.6.1",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",
@@ -37,18 +37,14 @@
     "url": "https://github.com/revopush/react-native-code-push"
   },
   "dependencies": {
-    "@revopush/code-push": "4.4.0",
-    "glob": "^7.1.7",
-    "hoist-non-react-statics": "^3.3.2",
-    "inquirer": "^8.1.5",
-    "plist": "^3.0.4",
-    "semver": "^7.3.5",
-    "xcode": "3.0.1"
+    "@revopush/code-push": "4.6.0",
+    "hoist-non-react-statics": "^3.3.2"
   },
   "devDependencies": {
+    "@react-native/gradle-plugin": "0.79.6",
     "@types/assert": "^1.5.2",
     "@types/mkdirp": "^1.0.1",
-    "@types/mocha": "^9.0.0",
+    "@types/mocha": "^10.0.0",
     "@types/node": "^14.0.27",
     "@types/q": "^1.5.4",
     "archiver": "latest",
@@ -57,7 +53,7 @@
     "del": "v6.0.0",
     "express": "latest",
     "mkdirp": "latest",
-    "mocha": "^9.2.0",
+    "mocha": "^11.7.6",
     "q": "^1.5.1",
     "run-sequence": "latest",
     "shx": "^0.3.4",
@@ -65,6 +61,10 @@
     "tslint": "^6.1.3",
     "typescript": "^4.4.3"
   },
+  "overrides": {
+    "serialize-javascript": "^7.0.3",
+    "diff": "^8.0.3"
+  },
   "peerDependencies": {
     "react-native": ">=0.83.0"
   },
@@ -76,10 +76,6 @@
       "sharedLibraries": [
         "libz"
       ]
-    },
-    "commands": {
-      "postlink": "node node_modules/@revopush/react-native-code-push/scripts/postlink/run",
-      "postunlink": "node node_modules/@revopush/react-native-code-push/scripts/postunlink/run"
     }
   }
 }

package/tsconfig.json

@@ -10,8 +10,5 @@
         "rootDir": "test",
         "outDir": "bin",
         "removeComments": true
-    },
-    "exclude": [
-        "Examples"
-    ]
+    }
 }

package/typings/react-native-code-push.d.ts

@@ -89,6 +89,24 @@ export interface Package {
      * The size of the code contained within the update, in bytes.
      */
     packageSize: number;
+
+    /**
+     * The manifest-scheme hash of this update's JS bundle. Present from server versions that
+     * report it; used to match a locally held bundle against a diff's base.
+     */
+    bundleHash?: string;
+
+    /**
+     * URL of this update's bundle-only archive.
+     */
+    bundleBlobUrl?: string;
+
+    /**
+     * The base release this update's bundle diff applies to. Absent when the update has no diff.
+     */
+    basePackage?: {
+        packageHash: string;
+    };
 }
 
 export interface RemotePackage extends Package {

package/scripts/postlink/android/postlink.js

@@ -1,87 +0,0 @@
-var linkTools = require('../../tools/linkToolsAndroid');
-var fs = require("fs");
-var inquirer = require('inquirer');
-
-module.exports = () => {
-
-    console.log("Running android postlink script");
-
-    var buildGradlePath = linkTools.getBuildGradlePath();
-    var mainApplicationPath = linkTools.getMainApplicationLocation();
-
-    // 1. Add the getJSBundleFile override
-    var getJSBundleFileOverride = linkTools.getJSBundleFileOverride;
-
-    if (mainApplicationPath) {
-        var mainApplicationContents = fs.readFileSync(mainApplicationPath, "utf8");
-        if (linkTools.isJsBundleOverridden(mainApplicationContents)) {
-            console.log(`"getJSBundleFile" is already overridden`);
-        } else {
-            var reactNativeHostInstantiation = linkTools.reactNativeHostInstantiation;
-            mainApplicationContents = mainApplicationContents.replace(reactNativeHostInstantiation,
-                `${reactNativeHostInstantiation}${getJSBundleFileOverride}`);
-            fs.writeFileSync(mainApplicationPath, mainApplicationContents);
-        }
-    } else {
-        var mainActivityPath = linkTools.getMainActivityPath();
-        if (mainActivityPath) {
-            var mainActivityContents = fs.readFileSync(mainActivityPath, "utf8");
-            if (linkTools.isJsBundleOverridden(mainActivityContents)) {
-                console.log(`"getJSBundleFile" is already overridden`);
-            } else {
-                var mainActivityClassDeclaration = linkTools.mainActivityClassDeclaration;
-                mainActivityContents = mainActivityContents.replace(mainActivityClassDeclaration,
-                    `${mainActivityClassDeclaration}${getJSBundleFileOverride}`);
-                fs.writeFileSync(mainActivityPath, mainActivityContents);
-            }
-        } else {
-            return Promise.reject(`Couldn't find Android application entry point. You might need to update it manually. \
-    Please refer to plugin configuration section for Android at \
-    https://github.com/microsoft/react-native-code-push/blob/master/docs/setup-android.md#plugin-configuration-for-react-native-lower-than-060-android for more details`);
-        }
-    }
-
-    if (!fs.existsSync(buildGradlePath)) {
-        return Promise.reject(`Couldn't find build.gradle file. You might need to update it manually. \
-    Please refer to plugin installation section for Android at \
-    https://github.com/microsoft/react-native-code-push/blob/master/docs/setup-android.md#plugin-installation-android---manual`);
-    }
-
-    // 2. Add the codepush.gradle build task definitions
-    var buildGradleContents = fs.readFileSync(buildGradlePath, "utf8");
-    var reactGradleLink = buildGradleContents.match(/\napply from: ["'].*?react\.gradle["']/)[0];
-    var codePushGradleLink = linkTools.codePushGradleLink;
-    if (~buildGradleContents.indexOf(codePushGradleLink)) {
-        console.log(`"codepush.gradle" is already linked in the build definition`);
-    } else {
-        buildGradleContents = buildGradleContents.replace(reactGradleLink,
-            `${reactGradleLink}${codePushGradleLink}`);
-        fs.writeFileSync(buildGradlePath, buildGradleContents);
-    }
-
-    //3. Add deployment key
-    var stringsResourcesPath = linkTools.getStringsResourcesPath();
-    if (!stringsResourcesPath) {
-        return Promise.reject(new Error(`Couldn't find strings.xml. You might need to update it manually.`));
-    } else {
-        var stringsResourcesContent = fs.readFileSync(stringsResourcesPath, "utf8");
-        var deploymentKeyName = linkTools.deploymentKeyName;
-        if (~stringsResourcesContent.indexOf(deploymentKeyName)) {
-            console.log(`${deploymentKeyName} already specified in the strings.xml`);
-        } else {
-            return inquirer.prompt({
-                "type": "input",
-                "name": "androidDeploymentKey",
-                "message": "What is your CodePush deployment key for Android (hit <ENTER> to ignore)"
-            }).then(function(answer) {
-                var insertAfterString = "<resources>";
-                var deploymentKeyString = `\t<string moduleConfig="true" name="${deploymentKeyName}">${answer.androidDeploymentKey || "deployment-key-here"}</string>`;
-                stringsResourcesContent = stringsResourcesContent.replace(insertAfterString,`${insertAfterString}\n${deploymentKeyString}`);
-                fs.writeFileSync(stringsResourcesPath, stringsResourcesContent);
-                return Promise.resolve();
-            });
-        }
-    }
-
-    return Promise.resolve();
-}