@revopush/react-native-code-push 1.5.0 → 2.5.0-rc.1

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

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Headers/DiffUpdates.h</key>
+		<data>
+		obtyjOKZntpytQhuejpfeMN0BoI=
+		</data>
+		<key>Info.plist</key>
+		<data>
+		1nTR8o5HkR4SUcF0Z6umqipQPHI=
+		</data>
+		<key>Modules/module.modulemap</key>
+		<data>
+		MdjndwGRSccoMYmOwMDjozLG1jc=
+		</data>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Headers/DiffUpdates.h</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			obtyjOKZntpytQhuejpfeMN0BoI=
+			</data>
+			<key>hash2</key>
+			<data>
+			DdvTO8aHHON6ybR/EQTihMgOY9j/pmVw7sekeFl71N4=
+			</data>
+		</dict>
+		<key>Modules/module.modulemap</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			MdjndwGRSccoMYmOwMDjozLG1jc=
+			</data>
+			<key>hash2</key>
+			<data>
+			TkYpCqgNFTGwSnC7+iZu51GEITzi1EHKvjZj4HupKms=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revopush/react-native-code-push",
-  "version": "1.5.0",
+  "version": "2.5.0-rc.1",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",
@@ -37,7 +37,7 @@
     "url": "https://github.com/revopush/react-native-code-push"
   },
   "dependencies": {
-    "code-push": "4.2.3",
+    "@revopush/code-push": "4.3.0",
     "glob": "^7.1.7",
     "hoist-non-react-statics": "^3.3.2",
     "inquirer": "^8.1.5",

package/request-fetch-adapter.js

@@ -12,7 +12,7 @@ module.exports = {
       "Content-Type": "application/json",
       "X-CodePush-Plugin-Name": packageJson.name,
       "X-CodePush-Plugin-Version": packageJson.version,
-      "X-CodePush-SDK-Version": packageJson.dependencies["code-push"]
+      "X-CodePush-SDK-Version": packageJson.dependencies["@revopush/code-push"]
     };
 
     if (requestBody && typeof requestBody === "object") {
@@ -49,4 +49,4 @@ function getHttpMethodName(verb) {
     "CONNECT",
     "PATCH"
   ][verb];
-}
+}

package/scripts/generateBundledResourcesHash.js

@@ -17,10 +17,14 @@ var path = require("path");
 
 var getFilesInFolder = require("./getFilesInFolder");
 
-var CODE_PUSH_FOLDER_PREFIX = "CodePush";
-var CODE_PUSH_HASH_FILE_NAME = "CodePushHash";
-var CODE_PUSH_HASH_OLD_FILE_NAME = "CodePushHash.json";
-var HASH_ALGORITHM = "sha256";
+const CODE_PUSH_FOLDER_PREFIX = "CodePush";
+const CODE_PUSH_HASH_FILE_NAME = "CodePushHash";
+const CODE_PUSH_METADATA_FILE_NAME = "CodePushMetadata";
+const CODE_PUSH_PACKAGE_HASH = "packageHash"
+const CODE_PUSH_BUNDLE_HASH = "bundleHash"
+const CODE_PUSH_ASSET_HASH = "assetHash"
+const CODE_PUSH_HASH_OLD_FILE_NAME = "CodePushHash.json";
+const HASH_ALGORITHM = "sha256";
 
 var resourcesDir = process.argv[2];
 var jsBundleFilePath = process.argv[3];
@@ -30,96 +34,129 @@ var tempFileName = process.argv[5];
 var oldFileToModifiedTimeMap = {};
 var tempFileLocalPath = null;
 if (tempFileName) {
-    tempFileLocalPath = path.join(require("os").tmpdir(), tempFileName);
-    oldFileToModifiedTimeMap = require(tempFileLocalPath);
+  tempFileLocalPath = path.join(require("os").tmpdir(), tempFileName);
+  oldFileToModifiedTimeMap = require(tempFileLocalPath);
 }
 var resourceFiles = [];
 
 getFilesInFolder(resourcesDir, resourceFiles);
 
+function getBundleResourceEntries(resourcesDir, assetsDir) {
+  const resourceFiles = [];
+  const assetFiles = [];
+  getFilesInFolder(resourcesDir, resourceFiles);
+  getFilesInFolder(assetsDir, assetFiles);
+  let resourceFilesRelative = resourceFiles.map((it) => path.relative(resourcesDir, it.path));
+  let assetsFilesRelative = assetFiles.map((it) => path.relative(assetsDir, it.path));
+
+  const normalizePath = (it) => path.join(CODE_PUSH_FOLDER_PREFIX, it).replace(/\\/g, "/")
+  return {
+    resources: Object.fromEntries(resourceFilesRelative.map((it) => [path.parse(it).name, normalizePath(it)])),
+    assets: Object.fromEntries(assetsFilesRelative.map((it) => [it.replace(/\\/g, "/"), normalizePath(it)]))
+  }
+}
+
 var newFileToModifiedTimeMap = {};
 
-resourceFiles.forEach(function(resourceFile) {
-    newFileToModifiedTimeMap[resourceFile.path.substring(resourcesDir.length)] = resourceFile.mtime;
+resourceFiles.forEach(function (resourceFile) {
+  newFileToModifiedTimeMap[resourceFile.path.substring(resourcesDir.length)] = resourceFile.mtime;
 });
 
 var bundleGeneratedAssetFiles = [];
 
 for (var newFilePath in newFileToModifiedTimeMap) {
-    if (!oldFileToModifiedTimeMap[newFilePath] || oldFileToModifiedTimeMap[newFilePath] < newFileToModifiedTimeMap[newFilePath].getTime()) {
-        bundleGeneratedAssetFiles.push(newFilePath);
-    }
+  if (!oldFileToModifiedTimeMap[newFilePath] || oldFileToModifiedTimeMap[newFilePath] < newFileToModifiedTimeMap[newFilePath].getTime()) {
+    bundleGeneratedAssetFiles.push(newFilePath);
+  }
 }
 
 var manifest = [];
 
 if (bundleGeneratedAssetFiles.length) {
-    bundleGeneratedAssetFiles.forEach(function(assetFile) {
-        // Generate hash for each asset file
-        addFileToManifest(resourcesDir, assetFile, manifest, function() {
-            if (manifest.length === bundleGeneratedAssetFiles.length) {
-                addJsBundleAndMetaToManifest();
-            }
-        });
+  bundleGeneratedAssetFiles.forEach(function (assetFile) {
+    // Generate hash for each asset file
+    addFileToManifest(resourcesDir, assetFile, manifest, function () {
+      if (manifest.length === bundleGeneratedAssetFiles.length) {
+        addJsBundleAndMetaToManifest();
+      }
     });
+  });
 } else {
-    addJsBundleAndMetaToManifest();
+  addJsBundleAndMetaToManifest();
 }
 
 function addJsBundleAndMetaToManifest() {
-    addFileToManifest(path.dirname(jsBundleFilePath), path.basename(jsBundleFilePath), manifest, function() {
-        var jsBundleMetaFilePath = jsBundleFilePath + ".meta";
-        addFileToManifest(path.dirname(jsBundleMetaFilePath), path.basename(jsBundleMetaFilePath), manifest, function() {
-            manifest = manifest.sort();
-            var finalHash = crypto.createHash(HASH_ALGORITHM)
-                .update(JSON.stringify(manifest))
-                .digest("hex");
-
-            console.log(finalHash);
-
-            var savedResourcesManifestPath = assetsDir + "/" + CODE_PUSH_HASH_FILE_NAME;
-            fs.writeFileSync(savedResourcesManifestPath, finalHash);
-
-            // "CodePushHash.json" file name breaks flow type checking.
-            // To fix the issue we need to delete "CodePushHash.json" file and
-            // use "CodePushHash" file name instead to store the hash value.
-            // Relates to https://github.com/microsoft/react-native-code-push/issues/577
-            var oldSavedResourcesManifestPath = assetsDir + "/" + CODE_PUSH_HASH_OLD_FILE_NAME;
-            if (fs.existsSync(oldSavedResourcesManifestPath)) {
-                fs.unlinkSync(oldSavedResourcesManifestPath);
-            }
-        });
+  addFileToManifest(path.dirname(jsBundleFilePath), path.basename(jsBundleFilePath), manifest, function (jsBundleFileHash) {
+    var jsBundleMetaFilePath = jsBundleFilePath + ".meta";
+    addFileToManifest(path.dirname(jsBundleMetaFilePath), path.basename(jsBundleMetaFilePath), manifest, function () {
+      manifest = manifest.sort();
+      const finalHash = crypto.createHash(HASH_ALGORITHM)
+        .update(JSON.stringify(manifest))
+        .digest("hex");
+
+      const bundleHashDada = path.join(CODE_PUSH_FOLDER_PREFIX, path.basename(jsBundleFilePath)).replace(/\\/g, "/") + ":" + jsBundleFileHash;
+      const bundleHash = crypto.createHash(HASH_ALGORITHM)
+        .update(JSON.stringify([bundleHashDada]))
+        .digest("hex");
+
+      const assetHash = crypto.createHash(HASH_ALGORITHM)
+        .update(JSON.stringify([...manifest].filter(it => it !== bundleHashDada).sort()))
+        .digest("hex");
+
+      const manifestMetadata = {
+        [CODE_PUSH_PACKAGE_HASH]: finalHash,
+        [CODE_PUSH_BUNDLE_HASH]: bundleHash,
+        [CODE_PUSH_ASSET_HASH]: assetHash, ...(getBundleResourceEntries(resourcesDir, assetsDir))
+      }
+
+      console.log(finalHash);
+
+      fs.writeFileSync(path.join(assetsDir, CODE_PUSH_HASH_FILE_NAME), finalHash);
+      fs.writeFileSync(path.join(assetsDir, CODE_PUSH_METADATA_FILE_NAME), JSON.stringify(manifestMetadata));
+
+      // "CodePushHash.json" file name breaks flow type checking.
+      // To fix the issue we need to delete "CodePushHash.json" file and
+      // use "CodePushHash" file name instead to store the hash value.
+      // Relates to https://github.com/microsoft/react-native-code-push/issues/577
+      var oldSavedResourcesManifestPath = assetsDir + "/" + CODE_PUSH_HASH_OLD_FILE_NAME;
+      if (fs.existsSync(oldSavedResourcesManifestPath)) {
+        fs.unlinkSync(oldSavedResourcesManifestPath);
+      }
     });
+  });
 }
 
 function addFileToManifest(folder, assetFile, manifest, done) {
-    var fullFilePath = path.join(folder, assetFile);
-    if (!fileExists(fullFilePath)) {
-        done();
-        return;
-    }
-
-    var readStream = fs.createReadStream(path.join(folder, assetFile));
-    var hashStream = crypto.createHash(HASH_ALGORITHM);
-
-    readStream.pipe(hashStream)
-        .on("error", function(error) {
-            throw error;
-        })
-        .on("finish", function() {
-            hashStream.end();
-            var buffer = hashStream.read();
-            var fileHash = buffer.toString("hex");
-            manifest.push(path.join(CODE_PUSH_FOLDER_PREFIX, assetFile).replace(/\\/g, "/") + ":" + fileHash);
-            done();
-        });
+  var fullFilePath = path.join(folder, assetFile);
+  if (!fileExists(fullFilePath)) {
+    done(undefined);
+    return;
+  }
+
+  var readStream = fs.createReadStream(path.join(folder, assetFile));
+  var hashStream = crypto.createHash(HASH_ALGORITHM);
+
+  readStream.pipe(hashStream)
+    .on("error", function (error) {
+      throw error;
+    })
+    .on("finish", function () {
+      hashStream.end();
+      var buffer = hashStream.read();
+      var fileHash = buffer.toString("hex");
+      manifest.push(path.join(CODE_PUSH_FOLDER_PREFIX, assetFile).replace(/\\/g, "/") + ":" + fileHash);
+      done(fileHash);
+    });
 }
 
 function fileExists(file) {
-    try { return fs.statSync(file).isFile(); }
-    catch (e) { return false; }
+  try {
+    return fs.statSync(file).isFile();
+  } catch (e) {
+    return false;
+  }
 }
 
 if (tempFileLocalPath) {
-    fs.unlinkSync(tempFileLocalPath);
-}
+  fs.unlinkSync(tempFileLocalPath);
+}

package/android/src/main/java/com/microsoft/codepush/react/TLSSocketFactory.java

@@ -1,72 +0,0 @@
-package com.microsoft.codepush.react;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-
-public class TLSSocketFactory extends SSLSocketFactory {
-
-    private SSLSocketFactory delegate;
-
-    public TLSSocketFactory() throws KeyManagementException, NoSuchAlgorithmException {
-        SSLContext context = SSLContext.getInstance("TLS");
-        context.init(null, null, null);
-        delegate = context.getSocketFactory();
-    }
-
-    @Override
-    public String[] getDefaultCipherSuites() {
-        return delegate.getDefaultCipherSuites();
-    }
-
-    @Override
-    public String[] getSupportedCipherSuites() {
-        return delegate.getSupportedCipherSuites();
-    }
-
-    @Override
-    public Socket createSocket() throws IOException {
-        return enableTLSOnSocket(delegate.createSocket());
-    }
-
-    @Override
-    public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
-        return enableTLSOnSocket(delegate.createSocket(s, host, port, autoClose));
-    }
-
-    @Override
-    public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-        return enableTLSOnSocket(delegate.createSocket(host, port));
-    }
-
-    @Override
-    public Socket createSocket(String host, int port, InetAddress localHost, int localPort)
-            throws IOException, UnknownHostException {
-        return enableTLSOnSocket(delegate.createSocket(host, port, localHost, localPort));
-    }
-
-    @Override
-    public Socket createSocket(InetAddress host, int port) throws IOException {
-        return enableTLSOnSocket(delegate.createSocket(host, port));
-    }
-
-    @Override
-    public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort)
-            throws IOException {
-        return enableTLSOnSocket(delegate.createSocket(address, port, localAddress, localPort));
-    }
-
-    private Socket enableTLSOnSocket(Socket socket) {
-        if (socket != null && (socket instanceof SSLSocket)) {
-            ((SSLSocket) socket).setEnabledProtocols(new String[] { "TLSv1.1", "TLSv1.2" });
-        }
-        return socket;
-    }
-}

package/ios/CodePush/CodePushDownloadHandler.m

@@ -1,130 +0,0 @@
-#import "CodePush.h"
-
-@implementation CodePushDownloadHandler {
-    // Header chars used to determine if the file is a zip.
-    char _header[4];
-}
-
-- (id)init:(NSString *)downloadFilePath
-operationQueue:(dispatch_queue_t)operationQueue
-progressCallback:(void (^)(long long, long long))progressCallback
-doneCallback:(void (^)(BOOL))doneCallback
-failCallback:(void (^)(NSError *err))failCallback {
-    self.outputFileStream = [NSOutputStream outputStreamToFileAtPath:downloadFilePath
-                                                              append:NO];
-    self.receivedContentLength = 0;
-    self.operationQueue = operationQueue;
-    self.progressCallback = progressCallback;
-    self.doneCallback = doneCallback;
-    self.failCallback = failCallback;
-    return self;
-}
-
-- (void)download:(NSString *)url {
-    self.downloadUrl = url;
-    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url]
-                                             cachePolicy:NSURLRequestUseProtocolCachePolicy
-                                         timeoutInterval:60.0];
-    NSURLConnection *connection = [[NSURLConnection alloc] initWithRequest:request
-                                                                  delegate:self
-                                                          startImmediately:NO];
-    if ([NSOperationQueue instancesRespondToSelector:@selector(setUnderlyingQueue:)]) {
-        NSOperationQueue *delegateQueue = [NSOperationQueue new];
-        delegateQueue.underlyingQueue = self.operationQueue;
-        [connection setDelegateQueue:delegateQueue];
-    } else {
-        [connection scheduleInRunLoop:[NSRunLoop mainRunLoop]
-                              forMode:NSDefaultRunLoopMode];
-    }
-
-    [connection start];
-}
-
-#pragma mark NSURLConnection Delegate Methods
-
-- (NSCachedURLResponse *)connection:(NSURLConnection *)connection
-                  willCacheResponse:(NSCachedURLResponse*)cachedResponse {
-    // Return nil to indicate not necessary to store a cached response for this connection
-    return nil;
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
-    if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
-        NSInteger statusCode = [(NSHTTPURLResponse *)response statusCode];
-        if (statusCode >= 400) {
-            [self.outputFileStream close];
-            [connection cancel];
-            NSError *err = [CodePushErrorUtils errorWithMessage:[NSString stringWithFormat: @"Received %ld response from %@", (long)statusCode, self.downloadUrl]];
-            self.failCallback(err);
-            return;
-        }
-    }
-    
-    self.expectedContentLength = response.expectedContentLength;
-    [self.outputFileStream open];
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
-    if (self.receivedContentLength < 4) {
-        for (int i = 0; i < [data length]; i++) {
-            int headerOffset = (int)self.receivedContentLength + i;
-            if (headerOffset >= 4) {
-                break;
-            }
-
-            const char *bytes = [data bytes];
-            _header[headerOffset] = bytes[i];
-        }
-    }
-
-    self.receivedContentLength = self.receivedContentLength + [data length];
-
-    NSInteger bytesLeft = [data length];
-
-    do {
-        NSInteger bytesWritten = [self.outputFileStream write:[data bytes]
-                                                     maxLength:bytesLeft];
-        if (bytesWritten == -1) {
-            break;
-        }
-
-        bytesLeft -= bytesWritten;
-    } while (bytesLeft > 0);
-
-    self.progressCallback(self.expectedContentLength, self.receivedContentLength);
-
-    // bytesLeft should not be negative.
-    assert(bytesLeft >= 0);
-
-    if (bytesLeft) {
-        [self.outputFileStream close];
-        [connection cancel];
-        self.failCallback([self.outputFileStream streamError]);
-    }
-}
-
-- (void)connection:(NSURLConnection*)connection didFailWithError:(NSError*)error
-{
-    [self.outputFileStream close];
-    self.failCallback(error);
-}
-
-- (void)connectionDidFinishLoading:(NSURLConnection *)connection {
-    [self.outputFileStream close];
-    if (self.receivedContentLength < 1) {
-        NSError *err = [CodePushErrorUtils errorWithMessage:[NSString stringWithFormat:@"Received empty response from %@", self.downloadUrl]];
-        self.failCallback(err);
-        return;
-    }
-    
-    // expectedContentLength might be -1 when NSURLConnection don't know the length(e.g. response encode with gzip)
-    if (self.expectedContentLength > 0) {
-        // We should have received all of the bytes if this is called.
-        assert(self.receivedContentLength == self.expectedContentLength);
-    }
-
-    BOOL isZip = _header[0] == 'P' && _header[1] == 'K' && _header[2] == 3 && _header[3] == 4;
-    self.doneCallback(isZip);
-}
-
-@end

package/ios/CodePush/CodePushErrorUtils.m

@@ -1,20 +0,0 @@
-#import "CodePush.h"
-
-@implementation CodePushErrorUtils
-
-static NSString *const CodePushErrorDomain = @"CodePushError";
-static const int CodePushErrorCode = -1;
-
-+ (NSError *)errorWithMessage:(NSString *)errorMessage
-{
-    return [NSError errorWithDomain:CodePushErrorDomain
-                               code:CodePushErrorCode
-                           userInfo:@{ NSLocalizedDescriptionKey: NSLocalizedString(errorMessage, nil) }];
-}
-
-+ (BOOL)isCodePushError:(NSError *)err
-{
-    return err != nil && [CodePushErrorDomain isEqualToString:err.domain];
-}
-
-@end

package/ios/CodePush/CodePushUtils.m

@@ -1,9 +0,0 @@
-#import "CodePush.h"
-
-void CPLog(NSString *formatString, ...) {
-    va_list args;
-    va_start(args, formatString);
-    NSString *prependedFormatString = [NSString stringWithFormat:@"\n[CodePush] %@", formatString];
-    NSLogv(prependedFormatString, args);
-    va_end(args);
-}