fix: check if unpinned then downgrade to v0

packages/api/src/car.js

@@ -11,7 +11,7 @@ import retry from 'p-retry'
 import { GATEWAY, LOCAL_ADD_THRESHOLD, MAX_BLOCK_SIZE } from './constants.js'
 import { JSONResponse } from './utils/json-response.js'
 import { getPins, PIN_OK_STATUS, waitAndUpdateOkPins } from './utils/pin.js'
-import { normalizeCid } from './utils/normalize-cid.js'
+import { normalizeCid } from './utils/cid.js'
 
 /**
  * @typedef {import('multiformats/cid').CID} CID

packages/api/src/pins.js

@@ -1,5 +1,5 @@
 import { JSONResponse, notFound } from './utils/json-response.js'
-import { normalizeCid } from './utils/normalize-cid.js'
+import { normalizeCid } from './utils/cid.js'
 import { getPins, PIN_OK_STATUS, waitAndUpdateOkPins } from './utils/pin.js'
 
 /**

packages/api/src/status.js

@@ -1,5 +1,5 @@
 import { JSONResponse, notFound } from './utils/json-response.js'
-import { normalizeCid } from './utils/normalize-cid.js'
+import { normalizeCid } from './utils/cid.js'
 
 /**
  * Returns pin and deal status info for a given CID.

packages/api/src/utils/normalize-cid.js → packages/api/src/utils/cid.js

@@ -14,3 +14,11 @@ export function normalizeCid (cid) {
     throw new InvalidCidError(cid)
   }
 }
+
+export function denormalizeCid (cid) {
+  try {
+    return CID.parse(cid).toV0().toString()
+  } catch (err) {
+    throw new InvalidCidError(cid)
+  }
+}

packages/cron/package.json

@@ -24,9 +24,10 @@
     "debug": "^4.3.1",
     "dotenv": "^9.0.2",
     "limiter": "2.0.1",
-    "pg": "^8.7.1",
+    "multiformats": "^9.6.2",
     "node-fetch": "^2.6.1",
     "p-retry": "^4.6.1",
+    "pg": "^8.7.1",
     "piggybacker": "^2.0.0"
   },
   "devDependencies": {

packages/cron/src/jobs/pins.js

@@ -2,6 +2,7 @@ import debug from 'debug'
 import { toPinStatusEnum } from '@web3-storage/api/src/utils/pin.js'
 import retry from 'p-retry'
 import { piggyback } from 'piggybacker'
+import { denormalizeCid } from '../lib/cid.js'
 
 const MAX_PIN_REQUESTS_PER_RUN = 400
 const log = debug('pins:updatePinStatuses')
@@ -63,9 +64,22 @@ export async function updatePinStatuses ({ cluster, db }) {
         return null // not tracked by our cluster
       }
 
-      const status = toPinStatusEnum(peerMap[pin.location.peerId].status)
+      let status = toPinStatusEnum(peerMap[pin.location.peerId].status)
 
       if (status !== 'Pinned' && status !== 'Remote') {
+        const cidV0 = denormalizeCid(pin.contentCid)
+
+        try {
+          peerMap = await getPinStatus(cidV0)
+        } catch (err) {
+          reSyncPins.push(pin)
+          return null
+        }
+
+        if (!peerMap[pin.location.peerId]) return null
+
+        status = toPinStatusEnum(peerMap[pin.location.peerId].status)
+
         reSyncPins.push(pin)
       }
 

packages/cron/src/lib/cid.js

@@ -0,0 +1,24 @@
+import { CID } from 'multiformats/cid'
+import { InvalidCidError } from './errors.js'
+
+/**
+ * Parse CID and return normalized b32 v1
+ *
+ * @param {string} cid
+ */
+export function normalizeCid (cid) {
+  try {
+    const c = CID.parse(cid)
+    return c.toV1().toString()
+  } catch (err) {
+    throw new InvalidCidError(cid)
+  }
+}
+
+export function denormalizeCid (cid) {
+  try {
+    return CID.parse(cid).toV0().toString()
+  } catch (err) {
+    throw new InvalidCidError(cid)
+  }
+}

packages/cron/src/lib/errors.js

@@ -0,0 +1,12 @@
+export class InvalidCidError extends Error {
+  /**
+   * @param {string} cid
+   */
+  constructor (cid) {
+    super(`Invalid CID: ${cid}`)
+    this.name = 'InvalidCid'
+    this.status = 400
+    this.code = InvalidCidError.CODE
+  }
+}
+InvalidCidError.CODE = 'ERROR_INVALID_CID'

packages/db/test/pinning.spec.js

@@ -1,6 +1,6 @@
 /* eslint-env mocha, browser */
 import assert from 'assert'
-import { normalizeCid } from '../../api/src/utils/normalize-cid'
+import { normalizeCid } from '../../api/src/utils/cid'
 import { DBClient } from '../index'
 import { createUpload, createUser, createUserAuthKey, token } from './utils.js'
 import { CID } from 'multiformats/cid'