ofac - npm Package Compare versions

Comparing version 1.0.10 to 1.0.11

index.js

@@ -18,17 +18,8 @@ const fs = require('fs');
     },
-    init: async (opts = self.opts) => {
+    init: (opts = self.opts) => {
         self.config(opts);  
-        var {force} = self.opts;
 
-        // if database already fetched, don't fetch again
-
-        var fn = self.fn(self.url);
-        if (!fs.existsSync(fn) || force)
-            await self.fetch();
-
-        self.db = self.fn();
-        if (!fs.existsSync(self.db) || force)
-            await self.zipExtract(fn, self.opts.xml, self.opts.path);
-
-        return self.db;
+        return self.fetch()
+            .then(zip => self.zipExtract(zip))
+            .then(xml => self.db = xml);
     },
@@ -40,21 +31,29 @@ fn: (url) => {
     fetch: (url = self.url) => {
-        return self.opts.fetch(url).then(res => {
-            var fn = self.fn(url);
-            const dest = fs.createWriteStream(fn);
-            res.body.pipe(dest);
-            return fn;
-        });
+        var fn = self.fn(url);
+
+        return (fs.existsSync(fn) && !self.opts.force)
+            ? Promise.resolve(fn)
+            : self.opts.fetch(url).then(res => {
+                const dest = fs.createWriteStream(fn);
+                res.body.pipe(dest);
+                return fn;
+            });
     },
-    zipExtract: (zip, fn, dest = '.') => {
+    zipExtract: (zip, fn = self.opts.xml, dest = self.opts.path) => {
+        var xml = dest + '/' + fn;
+        if (fs.existsSync(xml) && !self.opts.force)
+            return xml;
+
         var z = new Zip({file: zip});
         return new Promise((resolve, reject) => {
-            var ret = {zip, fn: dest + '/' + fn};
             z.on('error', (err) => {
-                reject(Object.assign(ret, {src: 'on', err}));
+                reject({zip, xml, src: 'on', err});
             });
             z.on('ready', () => {
                 z.extract(fn, dest, err => {
-                    if (err) reject(Object.assign(ret, {src: 'ready', err}));
-                    resolve(dest + '/' + fn);
-                    z.close();
+                    if (err) reject({zip, xml, src: 'ready', err});
+                    else {
+                        resolve(xml);
+                        z.close();
+                    }
                 })
@@ -61,0 +60,0 @@ });

package.json

 {
   "name": "ofac",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "A module to facilitate local OFAC searches",
@@ -5,0 +5,0 @@ "main": "index.js",

t/index.js

@@ -65,3 +65,3 @@ var fs = require('fs');
 						zip: "t/sdn.xml.zip-fail",
-						fn: "/tmp/sdn.xml",
+						xml: "/tmp/sdn.xml",
 						src: "on",
@@ -68,0 +68,0 @@ err: {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

26977

decreased by-0.17%

No dependency changes