move catch pinning error to correct place

Author: banciur

src/deploy.js

@@ -213,15 +213,7 @@ async function unpin (dnsServices, pinServices, logger) {
 
   for (const pinProvider of pinServices) {
     logger.info(`Unpinning ${cidToUnpin} from ${pinProvider.displayName}`)
-    try {
-      await pinProvider.unpinCid(cidToUnpin)
-    } catch (e) {
-      if (e.name === 'HTTPError' && e.message === 'not pinned or pinned indirectly') {
-        logger.info(`${cidToUnpin} not pinned to ${pinProvider.displayName}, moving forward`)
-      } else {
-        throw (e)
-      }
-    }
+    await pinProvider.unpinCid(cidToUnpin, logger)
   }
 }
 

src/pinners/ipfs-cluster.js

@@ -8,6 +8,7 @@ const { getDirFormData } = require('./utils')
 /**
  * @typedef {import('./types').IPFSClusterOptions} IPFSClusterOptions
  * @typedef {import('./types').PinDirOptions} PinDirOptions
+ * @typedef {import('../types').Logger} Logger
  */
 
 class IpfsCluster {
@@ -75,8 +76,9 @@ class IpfsCluster {
 
   /**
    * @param {string} cid
+   * @param {Logger} logger
    */
-  async unpinCid (cid) {
+  async unpinCid (cid, logger) {
     throw new Error('unpinCid not implemented in IpfsCluster')
   }
 

src/pinners/ipfs-node.js

@@ -7,6 +7,7 @@ const path = require('path')
 /**
  * @typedef {import('ipfs-http-client').Options} IpfsOptions
  * @typedef {import('./types').PinDirOptions} PinDirOptions
+ * @typedef {import('../types').Logger} Logger
  */
 
 class IpfsNode {
@@ -45,9 +46,18 @@ class IpfsNode {
 
   /**
    * @param {string} cid
+   * @param {Logger} logger
    */
-  async unpinCid (cid) {
-    await this.ipfs.pin.rm(cid)
+  async unpinCid (cid, logger) {
+    try {
+      await this.ipfs.pin.rm(cid)
+    } catch (e) {
+      if (e.name === 'HTTPError' && e.message === 'not pinned or pinned indirectly') {
+        logger.info(`${cid} not pinned to ${this.displayName}, moving forward`)
+      } else {
+        throw (e)
+      }
+    }
   }
 
   /**

src/pinners/pinata.js

@@ -7,6 +7,7 @@ const { getDirFormData } = require('./utils')
 /**
  * @typedef {import('./types').PinataOptions} PinataOptions
  * @typedef {import('./types').PinDirOptions} PinDirOptions
+ * @typedef {import('../types').Logger} Logger
  */
 
 const MAX_RETRIES = 3
@@ -93,8 +94,9 @@ class Pinata {
 
   /**
    * @param {string} cid
+   * @param {Logger} logger
    */
-  async unpinCid (cid) {
+  async unpinCid (cid, logger) {
     throw new Error('unpinCid not implemented in Pinata')
   }
 

src/pinners/types.ts

@@ -1,3 +1,5 @@
+import type { Logger } from '../types'
+
 export interface PinDirOptions {
   tag?: string
   hidden?: boolean
@@ -6,7 +8,7 @@ export interface PinDirOptions {
 export interface PinningService {
   pinDir: (dir: string, options: PinDirOptions|undefined) => Promise<string>
   pinCid: (cid: string, tag: string|undefined) => void
-  unpinCid: (cid: string) => void
+  unpinCid: (cid: string, logger: Logger) => void
   gatewayUrl: (cid: string) => string
   displayName: string
 }