Merge pull request #29 from StauroDEV/verbose-logs-dnslink

fix: a dumb dnslink bug and add verbose mode to dnslink
StauroDEV · Mar 30, 2024 · 78d5d21 · 78d5d21
2 parents d3e7347 + 5b8f4ae
commit 78d5d21
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/actions/deploy.ts b/src/actions/deploy.ts
@@ -30,7 +30,7 @@ export const deployAction = async (
   dir: string,
   {
     strict, ens, chain = 'mainnet', safe, name: customName,
-    dist, verbose, providers: providersList, resolverAddress,
+    dist, verbose = false, providers: providersList, resolverAddress,
     dnslink,
   }: DeployActionArgs,
 ) => {
@@ -128,6 +128,6 @@ export const deployAction = async (
   }
 
   if (dnslink) {
-    await dnsLinkAction(cid, dnslink)
+    await dnsLinkAction(cid, dnslink, {verbose})
   }
 }
diff --git a/src/actions/dnslink.ts b/src/actions/dnslink.ts
@@ -3,7 +3,7 @@ import { updateDnsLink } from '../utils/dnslink.js'
 import { logger } from '../utils/logger.js'
 
 export const dnsLinkAction = async (
-  cid: string, name: string, /* { init = false }: { init?: boolean } */
+  cid: string, name: string, {verbose}:{verbose:boolean} /* { init = false }: { init?: boolean } */
 ) => {
   const apiKey = process.env.BLUMEN_CF_KEY
   const zoneId = process.env.BLUMEN_CF_ZONE_ID
@@ -20,9 +20,9 @@ export const dnsLinkAction = async (
   // else {
   logger.info(`Updating DNSLink`)
   try {
-    const response = await updateDnsLink({ cid, zoneId, apiKey, name })
+    const response = await updateDnsLink({ cid, zoneId, apiKey, name, verbose })
 
-    if (response.errors) return logger.error(response.errors[0].message)
+    if (response.errors.length !== 0) return logger.error(response.errors[0].message)
 
     logger.success(`${response.result.name} now points to ${response.result.dnslink}`)
   }

diff --git a/src/cli.ts b/src/cli.ts
@@ -54,6 +54,7 @@ cli.command('ping <cid> <endpoint>', 'Ping an endpoint until it resolves content
 
 cli.command('dnslink <cid> <name>', 'Update DNSLink with a given CID using Cloudflare')
   // .option('--init', 'Create a DNSLink gateway', { default: false })
+  .option('--verbose', 'More verbose logs', {default:false})
   .action(dnsLinkAction)
 
 cli.help()

diff --git a/src/utils/dnslink.ts b/src/utils/dnslink.ts
@@ -1,5 +1,6 @@
 import { CLOUDFLARE_API_URL } from '../constants.js'
 import { DnsLinkError, MissingDnsLinkError } from '../errors.js'
+import { logger } from './logger.js';
 
 // export const createDnsLink = async (
 //   { cid, zoneId, apiKey }:
@@ -25,14 +26,15 @@ import { DnsLinkError, MissingDnsLinkError } from '../errors.js'
 // }
 
 export const updateDnsLink = async (
-  { cid, zoneId, apiKey, name }:
-  { cid: string, zoneId: string, apiKey: string, name: string },
+  { cid, zoneId, apiKey, name,verbose }:
+  { cid: string, zoneId: string, apiKey: string, name: string; verbose: boolean },
 ) => {
   const res = await fetch(`${CLOUDFLARE_API_URL}/zones/${zoneId}/web3/hostnames`, {
     headers: {
       Authorization: `Bearer ${apiKey}`,
     },
   })
+  if (verbose) logger.request('GET', res.url, res.status)
   const json = await res.json() as {
     result: { name: string, id: string }[]
     errors: { message: string, code: number }[]
@@ -46,7 +48,7 @@ export const updateDnsLink = async (
 
   if (!record) throw new MissingDnsLinkError()
 
-  return await fetch(`${CLOUDFLARE_API_URL}/zones/${zoneId}/web3/hostnames/${record.id}`, {
+  const res2 = await fetch(`${CLOUDFLARE_API_URL}/zones/${zoneId}/web3/hostnames/${record.id}`, {
     method: 'PATCH',
     headers: {
       'Authorization': `Bearer ${apiKey}`,
@@ -57,5 +59,6 @@ export const updateDnsLink = async (
       description: `Powered by Blumen`,
     }),
   })
-    .then(res => res.json())
+  if (verbose) logger.request('POST', res.url, res.status)
+  return res2.json()
 }