react-native-zip-archive 6.0.9 → 6.1.1

package/README.md

@@ -51,7 +51,7 @@ import { MainBundlePath, DocumentDirectoryPath } from 'react-native-fs'
 
 > zip source to target
 
-***NOTE: only support zip folder, not file entries***
+***NOTE: the string version of source is for folder, the string[] version is for file, so if you want to zip a single file, use zip([file]) instead of zip(file)***
 
 Example
 
@@ -72,7 +72,7 @@ zip(sourcePath, targetPath)
 
 > zip source to target
 
-***NOTE: only support zip folder, not file entries***
+***NOTE: the string version of source is for folder, the string[] version is for file, so if you want to zip a single file, use zip([file]) instead of zip(file)***
 
 ***NOTE: encryptionType is not supported on iOS yet, so it would be igonred on that platform.***
 
@@ -192,3 +192,7 @@ You can use this repo, https://github.com/plrthink/RNZATestApp, for testing and
 
 - [ZipArchive](https://github.com/ZipArchive/ZipArchive)
 - [zip4j](https://github.com/srikanth-lingala/zip4j)
+
+---
+
+[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/plrthink)

package/RNZipArchive.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.preserve_paths = '*.js'
 
   s.dependency 'React-Core'
-  s.dependency 'SSZipArchive', '~>2.2'
+  s.dependency 'SSZipArchive', '~>2.5.5'
   s.compiler_flags = '-GCC_PREPROCESSOR_DEFINITIONS="HAVE_INTTYPES_H HAVE_PKCRYPT HAVE_STDINT_H HAVE_WZAES HAVE_ZLIB MZ_ZIP_NO_SIGNING $(inherited)"'
 
   s.subspec 'Core' do |ss|

package/android/src/main/java/com/rnziparchive/RNZipArchiveModule.java

@@ -26,7 +26,7 @@ import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
+//import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 
 import net.lingala.zip4j.exception.ZipException;
@@ -141,70 +141,15 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
           final long[] extractedBytes = {0};
           final int[] lastPercentage = {0};
 
-          ZipFile zipFile = null;
+          net.lingala.zip4j.ZipFile zipFile = null;
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            zipFile = new ZipFile(zipFilePath, Charset.forName(charset));
+            zipFile = new net.lingala.zip4j.ZipFile(zipFilePath);
+            zipFile.setCharset(Charset.forName(charset));
           } else {
-            zipFile = new ZipFile(zipFilePath);
+            zipFile = new net.lingala.zip4j.ZipFile(zipFilePath);
           }
 
-          final Enumeration<? extends ZipEntry> entries = zipFile.entries();
-          Log.d(TAG, "Zip has " + zipFile.size() + " entries");
-          while (entries.hasMoreElements()) {
-            final ZipEntry entry = entries.nextElement();
-            if (entry.isDirectory()) continue;
-
-            StreamUtil.ProgressCallback cb = new StreamUtil.ProgressCallback() {
-              @Override
-              public void onCopyProgress(long bytesRead) {
-                extractedBytes[0] += bytesRead;
-
-                int lastTime = lastPercentage[0];
-                int percentDone = (int) ((double) extractedBytes[0] * 100 / (double) totalUncompressedBytes);
-
-                // update at most once per percent.
-                if (percentDone > lastTime) {
-                  lastPercentage[0] = percentDone;
-                  updateProgress(extractedBytes[0], totalUncompressedBytes, zipFilePath);
-                }
-              }
-            };
-
-            File fout = new File(destDirectory, entry.getName());
-            String canonicalPath = fout.getCanonicalPath();
-            String destDirCanonicalPath = (new File(destDirectory).getCanonicalPath()) + File.separator;
-
-            if (!canonicalPath.startsWith(destDirCanonicalPath)) {
-                 throw new SecurityException(String.format("Found Zip Path Traversal Vulnerability with %s", canonicalPath));
-            }
-            
-            if (!fout.exists()) {
-              //noinspection ResultOfMethodCallIgnored
-              (new File(fout.getParent())).mkdirs();
-            }
-            InputStream in = null;
-            BufferedOutputStream Bout = null;
-            try {
-              in = zipFile.getInputStream(entry);
-              Bout = new BufferedOutputStream(new FileOutputStream(fout));
-              StreamUtil.copy(in, Bout, cb);
-              Bout.close();
-              in.close();
-            } catch (IOException ex) {
-              if (in != null) {
-                try {
-                  in.close();
-                } catch (Exception ignored) {
-                }
-              }
-              if (Bout != null) {
-                try {
-                  Bout.close();
-                } catch (Exception ignored) {
-                }
-              }
-            }
-          }
+          zipFile.extractAll(destDirectory);
 
           zipFile.close();
           updateProgress(1, 1, zipFilePath); // force 100%
@@ -471,6 +416,12 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
             .emit(PROGRESS_EVENT_NAME, map);
   }
 
+  @ReactMethod
+  public void getUncompressedSize(String zipFilePath, String charset, final Promise promise) {
+    long totalSize = getUncompressedSize(zipFilePath, charset);
+    promise.resolve((double) totalSize);
+  }
+  
   /**
    * Return the uncompressed size of the ZipFile (only works for files on disk, not in assets)
    *
@@ -479,20 +430,22 @@ public class RNZipArchiveModule extends ReactContextBaseJavaModule {
   private long getUncompressedSize(String zipFilePath, String charset) {
     long totalSize = 0;
     try {
-      ZipFile zipFile = null;
+      net.lingala.zip4j.ZipFile zipFile = null;
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        zipFile = new ZipFile(zipFilePath, Charset.forName(charset));
+        zipFile = new net.lingala.zip4j.ZipFile(zipFilePath);
+        zipFile.setCharset(Charset.forName(charset));
       } else {
-        zipFile = new ZipFile(zipFilePath);
+        zipFile = new net.lingala.zip4j.ZipFile(zipFilePath);
       }
-      Enumeration<? extends ZipEntry> entries = zipFile.entries();
-      while (entries.hasMoreElements()) {
-        ZipEntry entry = entries.nextElement();
-        long size = entry.getSize();
+
+      final List <FileHeader> files = zipFile.getFileHeaders();
+      for(FileHeader it : files) {
+        long size = it.getUncompressedSize();
         if (size != -1) {
           totalSize += size;
         }
       }
+
       zipFile.close();
     } catch (IOException ignored) {
       return -1;

package/index.d.ts

@@ -12,4 +12,5 @@ declare module 'react-native-zip-archive' {
   export function unzipWithPassword(assetPath: string, target: string, password: string): Promise<string>;
   export function unzipAssets(assetPath: string, target: string): Promise<string>;
   export function subscribe(callback: ({ progress, filePath }: { progress: number, filePath: string }) => void): NativeEventSubscription;
+  export function getUncompressedSize(source: string, charset?: string): Promise<number>;
 }

package/index.js

@@ -64,3 +64,7 @@ export const unzipAssets = (source, target) => {
 export const subscribe = (callback) => {
   return rnzaEmitter.addListener("zipArchiveProgressEvent", callback);
 };
+
+export const getUncompressedSize = (source, charset = "UTF-8") => {
+  return RNZipArchive.getUncompressedSize(normalizeFilePath(source), charset);
+};

package/ios/RNZipArchive.m

@@ -194,6 +194,22 @@ RCT_EXPORT_METHOD(zipFilesWithPassword:(NSArray<NSString *> *)from
     }
 }
 
+
+RCT_EXPORT_METHOD(getUncompressedSize:(NSString *)path
+                  charset:(NSString *)charset
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    NSError *error = nil;
+    NSNumber *wantedFileSize = [SSZipArchive payloadSizeForArchiveAtPath:path error:&error];
+
+    if (error == nil) {
+        resolve(wantedFileSize);
+    } else {
+//        reject(@"get_uncompressed_size_error", [error localizedDescription], error);
+        resolve(@-1);
+    }
+}
+
 - (dispatch_queue_t)methodQueue {
     return dispatch_queue_create("com.mockingbot.ReactNative.ZipArchiveQueue", DISPATCH_QUEUE_SERIAL);
 }

package/package.json

@@ -1,12 +1,8 @@
 {
   "name": "react-native-zip-archive",
-  "version": "6.0.9",
+  "version": "6.1.1",
   "description": "A little wrapper on ZipArchive for react-native",
   "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "lint": "eslint index.js"
-  },
   "repository": {
     "type": "git",
     "url": "git@github.com:mockingbot/react-native-zip-archive.git"
@@ -33,5 +29,9 @@
   "peerDependencies": {
     "react": ">=16.8.6",
     "react-native": ">=0.60.0"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "eslint index.js"
   }
-}
+}

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Mon Mar 29 09:05:03 CST 2021
-gradle.version=6.1.1

package/android/.idea/gradle.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
-        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

package/android/.idea/misc.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

package/android/.idea/modules/android.iml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" />
-        <option name="LAST_KNOWN_AGP_VERSION" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../.." />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/android/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/android.iml" filepath="$PROJECT_DIR$/.idea/modules/android.iml" />
-    </modules>
-  </component>
-</project>

package/android/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

package/android/.idea/workspace.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="b0bced97-300a-4538-b12f-a5abc82a33ad" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/../index.js" beforeDir="false" afterPath="$PROJECT_DIR$/../index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/../package-lock.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../yarn.lock" beforeDir="false" afterPath="$PROJECT_DIR$/../yarn.lock" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="ProjectId" id="1qPSjWq7ZHlBLnw5dIVURz7OyRW" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="b0bced97-300a-4538-b12f-a5abc82a33ad" name="Default Changelist" comment="" />
-      <created>1616979867926</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1616979867926</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="2922" y="480" key="IDE.errors.dialog" timestamp="1616980291852">
-      <screen x="1792" y="25" width="2560" height="1415" />
-    </state>
-    <state x="2922" y="480" key="IDE.errors.dialog/1792.25.2560.1415/0.25.1792.1095@1792.25.2560.1415" timestamp="1616980291852" />
-  </component>
-</project>

package/android/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Mon Mar 29 09:04:26 CST 2021
-sdk.dir=/Users/plrthink/Library/Android/sdk