fix(pkglock): fall back to regular ensure-pkg if installer fails-ish

lib/lock-worker.js

@@ -1,23 +1,36 @@
 'use strict'
+
 let config
+let ensurePkg
+let prepare
+
 if (require.main === module && process.argv[2] === 'ensure-pkg') {
-  process.nextTick(async function () {
-    let [cache, integrity, pkg] = process.argv.slice(3)
-    pkg = JSON.parse(pkg)
-    if (!config) { config = require('./config.js') }
-    const opts = config().concat({
-      cache,
-      integrity,
-      log: require('npmlog'),
-      // loglevel: 'silly',
-      'restore-missing': true,
-      force: true
-    }, {
-      other () { return true }
-    })
-    opts.log.heading = 'tink'
-    opts.log.level = opts.loglevel
-    opts.log.notice('fs', 'unpacking', `${pkg.name}@${pkg.version}`)
-    await require('./commands/prepare.js').handler(opts, [pkg.name])
+  main(...process.argv.slice(3))
+}
+
+module.exports = main
+async function main (cache, integrity, pkg) {
+  pkg = JSON.parse(pkg)
+  if (!config) { config = require('./config.js') }
+  const opts = config().concat({
+    cache,
+    integrity,
+    log: require('npmlog'),
+    // loglevel: 'silly',
+    'restore-missing': true,
+    force: true
+  }, {
+    other () { return true }
   })
+  opts.log.heading = 'tink'
+  opts.log.level = opts.loglevel
+  opts.log.notice('fs', 'unpacking', `${pkg.name}@${pkg.version}`)
+  try {
+    if (!prepare) { prepare = require('./commands/prepare.js') }
+    const { pkgCount } = await prepare.handler(opts, [pkg.name])
+    if (!pkgCount) { throw new Error('no packages installed') }
+  } catch (err) {
+    if (!ensurePkg) { ensurePkg = require('./ensure-package.js') }
+    await ensurePkg(cache, pkg.name, pkg, opts)
+  }
 }

lib/pkglock.js

@@ -305,13 +305,19 @@ function getPkg (cache, scope, pkgName) {
 
 let ensurePkg
 let config
+let ensureDep
 async function fetchPackage (cache, pkg, hash) {
   if (!ensurePkg) { ensurePkg = require('./ensure-package.js') }
   if (!config) { config = require('./config.js') }
-  await ensurePkg(cache, pkg.name, pkg, config().concat({
-    cache,
-    integrity: hash
-  }))
+  if (!ensureDep) { ensureDep = require('./lock-worker.js') }
+  try {
+    await ensureDep(cache, hash, pkg)
+  } catch (err) {
+    await ensurePkg(cache, pkg.name, pkg, config().concat({
+      cache,
+      integrity: hash
+    }))
+  }
 }
 
 function fetchPackageSync (cache, pkg, integrity) {