minor fixes found from issues

cthackers · Jun 1, 2024 · 9c37fa8 · skoniks · Jun 5, 2024 · nima-ap
1 parent d3f5d7b
commit 9c37fa8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/adm-zip.js b/adm-zip.js
@@ -429,7 +429,7 @@ module.exports = function (/**String*/ input, /** object */ options) {
             // prepare new entry
             if (!update) {
                 entry = new ZipEntry();
-                entry.entryName = entryName;
+                entry.entryName = Utils.canonical(entryName);
             }
             entry.comment = comment || "";
 
@@ -464,6 +464,8 @@ module.exports = function (/**String*/ input, /** object */ options) {
 
             entry.setData(content);
             if (!update) _zip.setEntry(entry);
+
+            return entry;
         },
 
         /**

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "url": "https://github.com/cthackers/adm-zip.git"
   },
   "engines": {
-    "node": ">=6.0"
+    "node": ">=12.0"
   },
   "devDependencies": {
     "chai": "^4.3.4",

diff --git a/zipEntry.js b/zipEntry.js
@@ -12,7 +12,8 @@ module.exports = function (/*Buffer*/ input) {
         _extra = Buffer.alloc(0);
 
     function getCompressedDataFromZip() {
-        if (!input || !Buffer.isBuffer(input)) {
+        //if (!input || !Buffer.isBuffer(input)) {
+        if (!input || !(input instanceof Uint8Array)) {
             return Buffer.alloc(0);
         }
         _centralHeader.loadLocalHeaderFromBinary(input);