From 26fb50d32e17114a8890212c48a67ece905b0b3e Mon Sep 17 00:00:00 2001 From: bengo <171782+gobengo@users.noreply.github.com> Date: Thu, 21 Mar 2024 14:30:15 -0700 Subject: [PATCH] log for ci test debugging --- packages/api/src/config.js | 2 +- packages/api/src/utils/context.js | 10 +++++++--- packages/api/src/utils/w3up.js | 11 +++++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/packages/api/src/config.js b/packages/api/src/config.js index 1a52da6648..6ea03d0f36 100644 --- a/packages/api/src/config.js +++ b/packages/api/src/config.js @@ -137,7 +137,7 @@ export function loadConfigVariables() { vars[name] = val } else { if (globals.DEBUG === 'true') { - console.warn(`Missing optional config variables: ${name}`) + // console.warn(`Missing optional config variables: ${name}`) } } } diff --git a/packages/api/src/utils/context.js b/packages/api/src/utils/context.js index aa5dc82315..de9541bf0e 100644 --- a/packages/api/src/utils/context.js +++ b/packages/api/src/utils/context.js @@ -69,7 +69,11 @@ export async function getContext(event, params) { } let w3up - if (config.W3UP_URL) { + if ( + config.W3UP_URL && + config.W3_NFTSTORAGE_PRINCIPAL && + config.W3_NFTSTORAGE_PROOF + ) { console.warn('in getContext', { W3UP_URL: config.W3UP_URL, W3_NFTSTORAGE_PRINCIPAL: config.W3_NFTSTORAGE_PRINCIPAL, @@ -77,8 +81,8 @@ export async function getContext(event, params) { }) w3up = await createW3upClientFromConfig({ url: config.W3UP_URL, - principal: config.W3_NFTSTORAGE_PRINCIPAL ?? '', - proof: config.W3_NFTSTORAGE_PROOF ?? '', + principal: config.W3_NFTSTORAGE_PRINCIPAL, + proof: config.W3_NFTSTORAGE_PROOF, }) } diff --git a/packages/api/src/utils/w3up.js b/packages/api/src/utils/w3up.js index 95d3351483..dc42d96da3 100644 --- a/packages/api/src/utils/w3up.js +++ b/packages/api/src/utils/w3up.js @@ -111,7 +111,14 @@ export async function encodeDelegationAsCid(delegation) { * @param {string} options.proof */ export async function createW3upClientFromConfig(options) { - const url = new URL(options.url) + let url + try { + url = new URL(options.url) + } catch (error) { + throw new Error(`unable to parse w3up URL from "${options.url}"`, { + cause: error, + }) + } const principal = ed25519.parse(options.principal) const connection = connect({ id: { did: () => 'did:web:web3.storage' }, @@ -130,7 +137,7 @@ export async function createW3upClientFromConfig(options) { access: connection, filecoin: connection, }, - receiptsEndpoint: new URL('/receipt/', options.url), + receiptsEndpoint: url && new URL('/receipt/', url.toString()), }) await w3up.addSpace(await parseW3Proof(options.proof)) return w3up