Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,19 +194,26 @@ async function testRetrieval({
return
}

const dataSetIdHeaderValue = res.headers.get('x-data-set-id')
const resolvedAs = await describeResolvedDataSet({
pdpVerifier,
fwssStateView,
serviceProviderRegistry,
dataSetIdHeaderValue,
})
const dataSetIdHeaderValue = res.headers.get('x-data-set-id') || ''
const resolvedAs = await Promise.all(
dataSetIdHeaderValue
.split(',')
.filter(Boolean)
.map((dataSetId) =>
describeResolvedDataSet({
pdpVerifier,
fwssStateView,
serviceProviderRegistry,
dataSetIdString: dataSetId,
}),
),
)

console.error(
'ALERT Cannot retrieve data set %s piece %s (resolved as %s) from %s via %s: %s %s',
String(dataSetId),
String(pieceId),
resolvedAs,
resolvedAs.length > 0 ? resolvedAs.join(', ') : '<data set not reported>',
botLocation ?? '<dev>',
url,
res.status,
Expand All @@ -226,24 +233,20 @@ async function testRetrieval({
* @param {PdpVerifier} args.pdpVerifier
* @param {FilecoinWarmStorageServiceStateView} args.fwssStateView
* @param {ServiceProviderRegistry} args.serviceProviderRegistry
* @param {string | null} args.dataSetIdHeaderValue
* @param {string} args.dataSetIdString
Comment thread
juliangruber marked this conversation as resolved.
* @returns {Promise<string | undefined>} Description of the provider
*/
async function describeResolvedDataSet({
pdpVerifier,
fwssStateView,
serviceProviderRegistry,
dataSetIdHeaderValue,
dataSetIdString,
}) {
if (dataSetIdHeaderValue === null || dataSetIdHeaderValue === '') {
return `<data set not reported>`
}

let dataSetId
try {
dataSetId = BigInt(dataSetIdHeaderValue)
dataSetId = BigInt(dataSetIdString)
} catch (err) {
return `<invalid data set ID ${dataSetIdHeaderValue}>`
return `<invalid data set ID ${dataSetIdString}>`
}

try {
Expand Down Expand Up @@ -274,7 +277,7 @@ async function describeResolvedDataSet({
).toString()

return [
`dataSetId=${dataSetIdHeaderValue}`,
`dataSetId=${dataSetIdString}`,
'from',
isApprovedProvider ? 'approved' : 'unapproved',
isActive ? 'active' : 'inactive',
Expand Down