fix(install): fix dat install process

watilde · Aug 19, 2017 · 5a630bb · 5a630bb
1 parent 76e3281
commit 5a630bb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/lib/install/installer/dat.js b/lib/install/installer/dat.js
@@ -2,7 +2,7 @@ const Dat = require('../../utils/dat')
 
 module.exports = (pkg, cwd) => {
   return new Promise((resolve, reject) => {
-    Dat(cwd, {key: pkg.url, sparse: true}, (e, dat) => {
+    Dat(cwd, {key: pkg.url}, (e, dat) => {
       if (e) return reject(e)
       dat.joinNetwork()
       const archive = dat.archive
@@ -16,7 +16,10 @@ module.exports = (pkg, cwd) => {
           if (st.downloaded !== st.length) {
             reject('all blocks are not downloaded')
           }
-          resolve()
+          dat.close((e) => {
+            if (e) reject(e)
+            resolve()
+          })
         })
       })
     })

diff --git a/lib/install/resolver/fetchers/dat.js b/lib/install/resolver/fetchers/dat.js
@@ -15,19 +15,21 @@ module.exports = (name, spec, result) => {
           reject(e)
         }
         if (!content) return
-        dat.leaveNetwork()
-        rimraf.sync(tmp)
-        try {
-          const pkg = JSON.parse(content.toString())
-          resolve({
-            type: 'dat',
-            version: pkg.version,
-            dependencies: pkg.dependencies,
-            url: spec
-          })
-        } catch (e) {
-          reject(e)
-        }
+        dat.close((e) => {
+          if (e) reject(e)
+          rimraf.sync(tmp)
+          try {
+            const pkg = JSON.parse(content.toString())
+            resolve({
+              type: 'dat',
+              version: pkg.version,
+              dependencies: pkg.dependencies,
+              url: spec
+            })
+          } catch (e) {
+            reject(e)
+          }
+        })
       })
     })
   })