@appcircle/react-native-code-push 0.0.2-alpha.4 → 0.0.2-alpha.5

package/CONTRIBUTING.md

@@ -132,3 +132,37 @@ NPM=true CORE=true npm run test:android
 ```
 
 ...and so on!
+
+## Publishing Guidelines
+
+- After changes, run the command `yarn run postversion`. It will push a new tag to the repository.
+- Jenkins will take care of the rest.
+
+### Publishing to NPM
+
+To publish a new version on NPM, use the following command:
+
+```shell
+npm version <version>
+```
+
+#### Examples
+
+```shell
+## To publish a beta version
+$ npm version 1.0.0-beta.1
+
+$ npm version 1.0.0
+```
+
+## Jenkins Pipeline
+
+- Jenkins will look for the tag that matches `v*`, `v*-beta*`, `v*-alpha*`.
+
+- If a new tag is published, the pipeline will be triggered automatically and publish the application.
+
+- If the tag is `v*`, the app will be published to the stable channel.
+
+- If the tag is `v*-beta*`, the app will be published to the beta channel.
+
+- If the tag is `v*-alpha*`, the app will be published to the alpha channel.

package/android/app/proguard-rules.pro

@@ -21,5 +21,13 @@
     private final ** mBundleLoader;
 }
 
+-keepclassmembers class com.facebook.react.runtime.ReactHostImpl {
+    private final ** mReactHostDelegate;
+}
+
+-keep interface com.facebook.react.runtime.ReactHostDelegate { *; }
+
+-keep class * implements com.facebook.react.runtime.ReactHostDelegate { *; }
+
 # Can't find referenced class org.bouncycastle.**
 -dontwarn com.nimbusds.jose.**

package/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -21,6 +21,18 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CodePush implements ReactPackage {
+    private static final Object LOCK = new Object();
+    private static volatile CodePush mCurrentInstance;
+    public static CodePush getInstance(String deploymentKey, Context context, boolean isDebugMode) {
+        if (mCurrentInstance == null) {
+            synchronized (LOCK) {
+                if (mCurrentInstance == null) {
+                    mCurrentInstance = new CodePush(deploymentKey, context, isDebugMode);
+                }
+            }
+        }
+        return mCurrentInstance;
+    }
 
     private static boolean sIsRunningBinaryVersion = false;
     private static boolean sNeedToReportRollback = false;
@@ -38,7 +50,7 @@ public class CodePush implements ReactPackage {
 
     // Config properties.
     private String mDeploymentKey;
-    private static String mServerUrl = "https://codepush.appcenter.ms/";
+    private static String mServerUrl = "https://api.appcircle.io/codepush";
 
     private Context mContext;
     private final boolean mIsDebugMode;
@@ -49,8 +61,6 @@ public class CodePush implements ReactPackage {
 
     private static ReactHostHolder mReactHostHolder;
 
-    private static CodePush mCurrentInstance;
-
     public CodePush(String deploymentKey, Context context) {
         this(deploymentKey, context, false);
     }
@@ -59,7 +69,7 @@ public class CodePush implements ReactPackage {
         return mServerUrl;
     }
 
-    public CodePush(String deploymentKey, Context context, boolean isDebugMode) {
+    private CodePush(String deploymentKey, Context context, boolean isDebugMode) {
         mContext = context.getApplicationContext();
 
         mUpdateManager = new CodePushUpdateManager(context.getFilesDir().getAbsolutePath());
@@ -90,18 +100,18 @@ public class CodePush implements ReactPackage {
         initializeUpdateAfterRestart();
     }
 
-    public CodePush(String deploymentKey, Context context, boolean isDebugMode, String serverUrl) {
+    private CodePush(String deploymentKey, Context context, boolean isDebugMode, String serverUrl) {
         this(deploymentKey, context, isDebugMode);
         mServerUrl = serverUrl;
     }
 
-    public CodePush(String deploymentKey, Context context, boolean isDebugMode, int publicKeyResourceDescriptor) {
+    private CodePush(String deploymentKey, Context context, boolean isDebugMode, int publicKeyResourceDescriptor) {
         this(deploymentKey, context, isDebugMode);
 
         mPublicKey = getPublicKeyByResourceDescriptor(publicKeyResourceDescriptor);
     }
 
-    public CodePush(String deploymentKey, Context context, boolean isDebugMode, String serverUrl, Integer publicKeyResourceDescriptor) {
+    private CodePush(String deploymentKey, Context context, boolean isDebugMode, String serverUrl, Integer publicKeyResourceDescriptor) {
         this(deploymentKey, context, isDebugMode);
 
         if (publicKeyResourceDescriptor != null) {
@@ -131,10 +141,10 @@ public class CodePush implements ReactPackage {
 
     private String getCustomPropertyFromStringsIfExist(String propertyName) {
         String property;
-      
+
         String packageName = mContext.getPackageName();
         int resId = mContext.getResources().getIdentifier("CodePush" + propertyName, "string", packageName);
-        
+
         if (resId != 0) {
             property = mContext.getString(resId);
 
@@ -142,7 +152,7 @@ public class CodePush implements ReactPackage {
                 return property;
             } else {
                 CodePushUtils.log("Specified " + propertyName + " is empty");
-            } 
+            }
         }
 
         return null;
@@ -431,4 +441,4 @@ public class CodePush implements ReactPackage {
     public List<ViewManager> createViewManagers(ReactApplicationContext reactApplicationContext) {
         return new ArrayList<>();
     }
-}
+}

package/android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateManager.java

@@ -157,9 +157,6 @@ public class CodePushUpdateManager {
 
         String downloadUrlString = updatePackage.optString(CodePushConstants.DOWNLOAD_URL_KEY, null);
         HttpURLConnection connection = null;
-        BufferedInputStream bin = null;
-        FileOutputStream fos = null;
-        BufferedOutputStream bout = null;
         File downloadFile = null;
         boolean isZip = false;
 
@@ -178,52 +175,51 @@ public class CodePushUpdateManager {
             }
 
             connection.setRequestProperty("Accept-Encoding", "identity");
-            bin = new BufferedInputStream(connection.getInputStream());
 
             long totalBytes = connection.getContentLength();
             long receivedBytes = 0;
 
             File downloadFolder = new File(getCodePushPath());
             downloadFolder.mkdirs();
+            
             downloadFile = new File(downloadFolder, CodePushConstants.DOWNLOAD_FILE_NAME);
-            fos = new FileOutputStream(downloadFile);
-            bout = new BufferedOutputStream(fos, CodePushConstants.DOWNLOAD_BUFFER_SIZE);
             byte[] data = new byte[CodePushConstants.DOWNLOAD_BUFFER_SIZE];
             byte[] header = new byte[4];
 
-            int numBytesRead = 0;
-            while ((numBytesRead = bin.read(data, 0, CodePushConstants.DOWNLOAD_BUFFER_SIZE)) >= 0) {
-                if (receivedBytes < 4) {
-                    for (int i = 0; i < numBytesRead; i++) {
-                        int headerOffset = (int) (receivedBytes) + i;
-                        if (headerOffset >= 4) {
-                            break;
+            try (
+                BufferedInputStream bin = new BufferedInputStream(connection.getInputStream());
+                FileOutputStream fos = new FileOutputStream(downloadFile);
+                BufferedOutputStream bout = new BufferedOutputStream(fos, CodePushConstants.DOWNLOAD_BUFFER_SIZE)
+            ) {
+                int numBytesRead = 0;
+                while ((numBytesRead = bin.read(data, 0, CodePushConstants.DOWNLOAD_BUFFER_SIZE)) >= 0) {
+                    if (receivedBytes < 4) {
+                        for (int i = 0; i < numBytesRead; i++) {
+                            int headerOffset = (int) (receivedBytes) + i;
+                            if (headerOffset >= 4) {
+                                break;
+                            }
+
+                            header[headerOffset] = data[i];
                         }
-
-                        header[headerOffset] = data[i];
                     }
+
+                    receivedBytes += numBytesRead;
+                    bout.write(data, 0, numBytesRead);
+                    progressCallback.call(new DownloadProgress(totalBytes, receivedBytes));
                 }
 
-                receivedBytes += numBytesRead;
-                bout.write(data, 0, numBytesRead);
-                progressCallback.call(new DownloadProgress(totalBytes, receivedBytes));
-            }
+                if (totalBytes != receivedBytes) {
+                    throw new CodePushUnknownException("Received " + receivedBytes + " bytes, expected " + totalBytes);
+                }
 
-            if (totalBytes != receivedBytes) {
-                throw new CodePushUnknownException("Received " + receivedBytes + " bytes, expected " + totalBytes);
+                isZip = ByteBuffer.wrap(header).getInt() == 0x504b0304;
             }
-
-            isZip = ByteBuffer.wrap(header).getInt() == 0x504b0304;
         } catch (MalformedURLException e) {
             throw new CodePushMalformedDataException(downloadUrlString, e);
         } finally {
-            try {
-                if (bout != null) bout.close();
-                if (fos != null) fos.close();
-                if (bin != null) bin.close();
-                if (connection != null) connection.disconnect();
-            } catch (IOException e) {
-                throw new CodePushUnknownException("Error closing IO resources.", e);
+            if (connection != null) {
+                connection.disconnect();
             }
         }
 
@@ -347,32 +343,35 @@ public class CodePushUpdateManager {
     public void downloadAndReplaceCurrentBundle(String remoteBundleUrl, String bundleFileName) throws IOException {
         URL downloadUrl;
         HttpURLConnection connection = null;
-        BufferedInputStream bin = null;
-        FileOutputStream fos = null;
-        BufferedOutputStream bout = null;
+
         try {
             downloadUrl = new URL(remoteBundleUrl);
             connection = (HttpURLConnection) (downloadUrl.openConnection());
-            bin = new BufferedInputStream(connection.getInputStream());
+
             File downloadFile = new File(getCurrentPackageBundlePath(bundleFileName));
-            downloadFile.delete();
-            fos = new FileOutputStream(downloadFile);
-            bout = new BufferedOutputStream(fos, CodePushConstants.DOWNLOAD_BUFFER_SIZE);
-            byte[] data = new byte[CodePushConstants.DOWNLOAD_BUFFER_SIZE];
-            int numBytesRead = 0;
-            while ((numBytesRead = bin.read(data, 0, CodePushConstants.DOWNLOAD_BUFFER_SIZE)) >= 0) {
-                bout.write(data, 0, numBytesRead);
+            if (downloadFile.exists() && !downloadFile.delete()) {
+                // Silent failure, but execution continues
+            }
+
+            try (
+                BufferedInputStream bin = new BufferedInputStream(connection.getInputStream());
+                FileOutputStream fos = new FileOutputStream(downloadFile);
+                BufferedOutputStream bout = new BufferedOutputStream(fos, CodePushConstants.DOWNLOAD_BUFFER_SIZE)
+            ) {
+                byte[] data = new byte[CodePushConstants.DOWNLOAD_BUFFER_SIZE];
+                int numBytesRead;
+                while ((numBytesRead = bin.read(data, 0, CodePushConstants.DOWNLOAD_BUFFER_SIZE)) >= 0) {
+                    bout.write(data, 0, numBytesRead);
+                }
             }
+
         } catch (MalformedURLException e) {
             throw new CodePushMalformedDataException(remoteBundleUrl, e);
+        } catch (IOException e) {
+            throw new CodePushUnknownException("Error handling IO streams.", e);
         } finally {
-            try {
-                if (bout != null) bout.close();
-                if (fos != null) fos.close();
-                if (bin != null) bin.close();
-                if (connection != null) connection.disconnect();
-            } catch (IOException e) {
-                throw new CodePushUnknownException("Error closing IO resources.", e);
+            if (connection != null) {
+                connection.disconnect();
             }
         }
     }
@@ -380,4 +379,4 @@ public class CodePushUpdateManager {
     public void clearUpdates() {
         FileUtils.deleteDirectoryAtPath(getCodePushPath());
     }
-}
+}

package/android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java

@@ -62,11 +62,14 @@ public class CodePushUpdateUtils {
             if (file.isDirectory()) {
                 addContentsOfFolderToManifest(fullFilePath, relativePath, manifest);
             } else {
-                try {
-                    manifest.add(relativePath + ":" + computeHash(new FileInputStream(file)));
+                try (FileInputStream fis = new FileInputStream(file)) {
+                    manifest.add(relativePath + ":" + computeHash(fis));
                 } catch (FileNotFoundException e) {
                     // Should not happen.
                     throw new CodePushUnknownException("Unable to compute hash of update contents.", e);
+                } catch (IOException e) {
+                    // Should not happen.
+                    throw new CodePushUnknownException("Error occurred while reading file for hashing.", e);
                 }
             }
         }
@@ -272,4 +275,4 @@ public class CodePushUpdateUtils {
 
         CodePushUtils.log("The update contents succeeded the code signing check.");
     }
-}
+}

package/android/app/src/main/java/com/microsoft/codepush/react/FileUtils.java

@@ -29,26 +29,19 @@ public class FileUtils {
                         CodePushUtils.appendPathComponent(destinationDirectoryPath, sourceFile.getName()));
             } else {
                 File destFile = new File(destDir, sourceFile.getName());
-                FileInputStream fromFileStream = null;
-                BufferedInputStream fromBufferedStream = null;
-                FileOutputStream destStream = null;
                 byte[] buffer = new byte[WRITE_BUFFER_SIZE];
-                try {
-                    fromFileStream = new FileInputStream(sourceFile);
-                    fromBufferedStream = new BufferedInputStream(fromFileStream);
-                    destStream = new FileOutputStream(destFile);
+                try (
+                    FileInputStream fromFileStream = new FileInputStream(sourceFile);
+                    BufferedInputStream fromBufferedStream = new BufferedInputStream(fromFileStream);
+                    FileOutputStream destStream = new FileOutputStream(destFile)
+                )
+                {
                     int bytesRead;
                     while ((bytesRead = fromBufferedStream.read(buffer)) > 0) {
                         destStream.write(buffer, 0, bytesRead);
                     }
-                } finally {
-                    try {
-                        if (fromFileStream != null) fromFileStream.close();
-                        if (fromBufferedStream != null) fromBufferedStream.close();
-                        if (destStream != null) destStream.close();
-                    } catch (IOException e) {
-                        throw new CodePushUnknownException("Error closing IO resources.", e);
-                    }
+                } catch (IOException e) {
+                    throw new CodePushUnknownException("Error closing IO resources.", e);
                 }
             }
         }
@@ -200,4 +193,4 @@ public class FileUtils {
             if (out != null) out.close();
         }
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcircle/react-native-code-push",
-  "version": "0.0.2-alpha.4",
+  "version": "0.0.2-alpha.5",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",

package/react-native.config.js

@@ -3,8 +3,9 @@ module.exports = {
         platforms: {
             android: {
                 packageInstance:
-                    "new CodePush(getResources().getString(R.string.CodePushDeploymentKey), getApplicationContext(), BuildConfig.DEBUG)"
+                    "CodePush.getInstance(getResources().getString(R.string.CodePushDeploymentKey), getApplicationContext(), BuildConfig.DEBUG)",
+                sourceDir: './android/app',
             }
         }
     }
-};
+};

package/android/app/src/main/java/com/microsoft/codepush/react/CodePushBuilder.java

@@ -1,37 +0,0 @@
-package com.microsoft.codepush.react;
-
-import android.content.Context;
-
-public class CodePushBuilder {
-    private String mDeploymentKey;
-    private Context mContext;
-
-    private boolean mIsDebugMode;
-    private String mServerUrl;
-    private Integer mPublicKeyResourceDescriptor;
-
-    public CodePushBuilder(String deploymentKey, Context context) {
-        this.mDeploymentKey = deploymentKey;
-        this.mContext = context;
-        this.mServerUrl = CodePush.getServiceUrl();
-    }
-
-    public CodePushBuilder setIsDebugMode(boolean isDebugMode) {
-        this.mIsDebugMode = isDebugMode;
-        return this;
-    }
-
-    public CodePushBuilder setServerUrl(String serverUrl) {
-        this.mServerUrl = serverUrl;
-        return this;
-    }
-
-    public CodePushBuilder setPublicKeyResourceDescriptor(int publicKeyResourceDescriptor) {
-        this.mPublicKeyResourceDescriptor = publicKeyResourceDescriptor;
-        return this;
-    }
-
-    public CodePush build() {
-        return new CodePush(this.mDeploymentKey, this.mContext, this.mIsDebugMode, this.mServerUrl, this.mPublicKeyResourceDescriptor);
-    }
-}