Magic: return NFT collection icon

functions/common.js

@@ -86,18 +86,24 @@ export async function viewCall({ contractId, method, args }) {
 
 export async function nftToImageUrl({ contractId, tokenId }) {
   const [token, nftMetadata] = await Promise.all([
-    viewCall({
-      contractId,
-      method: "nft_token",
-      args: { token_id: tokenId },
-    }),
+    tokenId
+      ? viewCall({
+          contractId,
+          method: "nft_token",
+          args: { token_id: tokenId },
+        })
+      : Promise.resolve(null),
     viewCall({
       contractId,
       method: "nft_metadata",
       args: {},
     }),
   ]);
 
+  if (!tokenId) {
+    return nftMetadata.icon;
+  }
+
   const tokenMetadata = token?.metadata || {};
   const tokenMedia = tokenMetadata.media || "";
 
@@ -146,12 +152,13 @@ export async function internalImageToUrl(env, image) {
     try {
       const { contractId, tokenId } = image.nft;
       const NftKV = env.NftKV;
+      const path = tokenId ? `${contractId}/${tokenId}` : contractId;
 
-      let imageUrl = await NftKV.get(`${contractId}/${tokenId}`);
+      let imageUrl = await NftKV.get(path);
       if (!imageUrl) {
         imageUrl = await nftToImageUrl({ contractId, tokenId });
         if (imageUrl) {
-          await NftKV.put(`${contractId}/${tokenId}`, imageUrl);
+          await NftKV.put(path, imageUrl);
         }
       }
       return imageUrl;

functions/magic/img/nft/[[index]].js

@@ -3,7 +3,7 @@ import { internalImageToUrl } from "../../../common";
 export async function onRequest({ request, next, env }) {
   const url = new URL(request.url);
   const parts = url.pathname.split("/");
-  if (parts.length !== 6) {
+  if (parts.length !== 5 && parts.length !== 6) {
     return next();
   }
   const contractId = parts[4];