fix: null-guard progress and enable migration 9 (#34)

Also use the `ipfs:` namespace for logs

Author: achingbrain

migrations/index.js

@@ -1,8 +1,5 @@
 'use strict'
 
-// Do not modify this file manually as it will be overridden when running 'add' CLI command.
-// Modify migration-templates.js file
-
 const emptyMigration = {
   description: 'Empty migration.',
   migrate: () => {},
@@ -18,5 +15,6 @@ module.exports = [
   Object.assign({version: 5}, emptyMigration),
   Object.assign({version: 6}, emptyMigration),
   Object.assign({version: 7}, emptyMigration),
-  require('./migration-8')
+  require('./migration-8'),
+  require('./migration-9')
 ]

migrations/migration-8/index.js

@@ -3,7 +3,7 @@
 const CID = require('cids')
 const Key = require('interface-datastore').Key
 const mb = require('multibase')
-const log = require('debug')('ipfs-repo-migrations:migration-8')
+const log = require('debug')('ipfs:repo:migrator:migration-8')
 const uint8ArrayToString = require('uint8arrays/to-string')
 const { createStore } = require('../../src/utils')
 const length = require('it-length')

migrations/migration-9/index.js

@@ -15,9 +15,12 @@ async function pinsToDatastore (blockstore, datastore, pinstore, onProgress) {
   const cid = new CID(mh)
   const pinRootBuf = await blockstore.get(cidToKey(cid))
   const pinRoot = dagpb.util.deserialize(pinRootBuf)
-
-  const pinCount = (await length(pinset.loadSet(blockstore, pinRoot, PinTypes.recursive))) + (await length(pinset.loadSet(blockstore, pinRoot, PinTypes.direct)))
   let counter = 0
+  let pinCount
+
+  if (onProgress) {
+    pinCount = (await length(pinset.loadSet(blockstore, pinRoot, PinTypes.recursive))) + (await length(pinset.loadSet(blockstore, pinRoot, PinTypes.direct)))
+  }
 
   for await (const cid of pinset.loadSet(blockstore, pinRoot, PinTypes.recursive)) {
     counter++
@@ -35,7 +38,9 @@ async function pinsToDatastore (blockstore, datastore, pinstore, onProgress) {
 
     await pinstore.put(cidToKey(cid), cbor.encode(pin))
 
-    onProgress((counter / pinCount) * 100, `Migrated recursive pin ${cid}`)
+    if (onProgress) {
+      onProgress((counter / pinCount) * 100, `Migrated recursive pin ${cid}`)
+    }
   }
 
   for await (const cid of pinset.loadSet(blockstore, pinRoot, PinTypes.direct)) {
@@ -64,15 +69,13 @@ async function pinsToDatastore (blockstore, datastore, pinstore, onProgress) {
 async function pinsToDAG (blockstore, datastore, pinstore, onProgress) {
   let recursivePins = []
   let directPins = []
-
+  let counter = 0
   let pinCount
 
   if (onProgress) {
     pinCount = await length(pinstore.query({ keysOnly: true }))
   }
 
-  let counter = 0
-
   for await (const { key, value } of pinstore.query({})) {
     counter++
     const pin = cbor.decode(value)

src/index.js

@@ -5,7 +5,7 @@ const repoVersion = require('./repo/version')
 const repoLock = require('./repo/lock')
 const errors = require('./errors')
 
-const log = require('debug')('repo-migrations:migrator')
+const log = require('debug')('ipfs:repo:migrator')
 
 exports.getCurrentRepoVersion = repoVersion.getVersion
 exports.errors = errors

src/repo/init.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const log = require('debug')('repo-migrations:repo:init')
+const log = require('debug')('ipfs:repo:migrator:repo:init')
 const { CONFIG_KEY, VERSION_KEY, createStore } = require('../utils')
 const { MissingRepoOptionsError } = require('../errors')
 

src/repo/lock-memory.js

@@ -1,11 +1,8 @@
 'use strict'
 
 const debug = require('debug')
-
-const log = debug('repo-migrations:repo_mem_lock')
-
+const log = debug('ipfs:repo:migrator:repo_mem_lock')
 const lockFile = 'repo.lock'
-
 const LOCKS = {}
 
 /**

src/repo/lock.js

@@ -3,7 +3,7 @@
 const debug = require('debug')
 const { lock } = require('proper-lockfile')
 
-const log = debug('repo-migrations:repo_fs_lock')
+const log = debug('ipfs:repo:migrator:repo_fs_lock')
 const lockFile = 'repo.lock'
 
 /**