@manifoldxyz/marketplace-sdk 3.0.9 → 3.0.11

package/dist/lib/MarketplaceListing.js

@@ -1218,7 +1218,7 @@ class MarketplaceListing {
                             tokenData = JSON.parse(decodeURIComponent(tokenURI.slice(22)));
                         }
                     }
-                    else if (tokenURI.startsWith("data:application/json;,")) {
+                    else if (tokenURI.startsWith('data:application/json;,')) {
                         try {
                             tokenData = JSON.parse(tokenURI.slice(23));
                         }
@@ -1279,24 +1279,23 @@ class MarketplaceListing {
             let response;
             const isArweave = tokenURI.match(/^https:\/\/arweave.net/);
             const isIPFS = tokenURI.match(/^https:\/\/ipfs.io/);
-            // Note from Campion - not really sure what is going on here, but for tokens that point to OS, there
-            // is a weird character in them. Maybe to prevent bots? Specifically, this is for a token I wrapped
-            // to sell on my own contract. The "new" token points to the "old" token's URI, which was on OS.
-            if (tokenURI.includes('')) {
-                tokenURI = tokenURI.replace('', '');
-            }
-            try {
-                response = yield MarketplaceListing._fetchWithTimeout(tokenURI, {}, isArweave ? 2000 : 60000);
-            }
-            catch (error) {
-                console.log(`Error fetching metadata: from ${tokenURI}`, error);
-                // Do nothing
-            }
-            if (response && response.status === 200) {
-                return response.json();
+            const isOpenSea = tokenURI.match(/^https:\/\/api.opensea.io/);
+            // Attempt a direct fetch of metadata from source server if not OpenSea
+            // OpenSea API now requires an API key, so we need to defer to our server.
+            if (!isOpenSea) {
+                try {
+                    response = yield MarketplaceListing._fetchWithTimeout(tokenURI, {}, isArweave || isIPFS ? 2000 : 60000);
+                }
+                catch (error) {
+                    console.log(`Error fetching metadata: from ${tokenURI}`, error);
+                    // Do nothing
+                }
+                if (response && response.status === 200) {
+                    return response.json();
+                }
             }
-            // No response, so fallback to server only if Arweave endpoints
-            if (isArweave || isIPFS) {
+            // No response, so fallback to server only if Arweave, IPFS or OpenSea endpoints
+            if (isArweave || isIPFS || isOpenSea) {
                 response = yield fetch(`${this._getEndpoint()}/token/${tokenAddress}/${tokenId}/metadata`);
                 if (response.status === 200) {
                     return response.json();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manifoldxyz/marketplace-sdk",
-  "version": "3.0.9",
+  "version": "3.0.11",
   "typings": "dist/index.d.ts",
   "description": "",
   "main": "dist/index.js",
@@ -45,7 +45,7 @@
     "@manifoldxyz/contract-abis": "^1.0.0",
     "@manifoldxyz/ens-batch-lookup-ethers": "^0.0.2",
     "@manifoldxyz/frontend-provider-types": "^1.0.0",
-    "@manifoldxyz/manifold-provider-client": "^0.0.4",
+    "@manifoldxyz/manifold-provider-client": "^0.0.5",
     "keccak256": "^1.0.6",
     "merkletreejs": "^0.2.32"
   }

package/src/lib/MarketplaceListing.ts

@@ -1514,7 +1514,7 @@ class MarketplaceListing {
           } catch (error) {
             tokenData = JSON.parse(decodeURIComponent(tokenURI.slice(22)));
           }
-        } else if (tokenURI.startsWith("data:application/json;,")) {
+        } else if (tokenURI.startsWith('data:application/json;,')) {
           try {
             tokenData = JSON.parse(tokenURI.slice(23));
           } catch (error) {
@@ -1592,24 +1592,27 @@ class MarketplaceListing {
     let response;
     const isArweave = tokenURI.match(/^https:\/\/arweave.net/);
     const isIPFS = tokenURI.match(/^https:\/\/ipfs.io/);
+    const isOpenSea = tokenURI.match(/^https:\/\/api.opensea.io/);
 
-    // Note from Campion - not really sure what is going on here, but for tokens that point to OS, there
-    // is a weird character in them. Maybe to prevent bots? Specifically, this is for a token I wrapped
-    // to sell on my own contract. The "new" token points to the "old" token's URI, which was on OS.
-    if (tokenURI.includes('')) {
-      tokenURI = tokenURI.replace('', '');
-    }
-    try {
-      response = await MarketplaceListing._fetchWithTimeout(tokenURI, {}, isArweave ? 2000 : 60000);
-    } catch (error) {
-      console.log(`Error fetching metadata: from ${tokenURI}`, error);
-      // Do nothing
-    }
-    if (response && response.status === 200) {
-      return response.json();
+    // Attempt a direct fetch of metadata from source server if not OpenSea
+    // OpenSea API now requires an API key, so we need to defer to our server.
+    if (!isOpenSea) {
+      try {
+        response = await MarketplaceListing._fetchWithTimeout(
+          tokenURI,
+          {},
+          isArweave || isIPFS ? 2000 : 60000
+        );
+      } catch (error) {
+        console.log(`Error fetching metadata: from ${tokenURI}`, error);
+        // Do nothing
+      }
+      if (response && response.status === 200) {
+        return response.json();
+      }
     }
-    // No response, so fallback to server only if Arweave endpoints
-    if (isArweave || isIPFS) {
+    // No response, so fallback to server only if Arweave, IPFS or OpenSea endpoints
+    if (isArweave || isIPFS || isOpenSea) {
       response = await fetch(`${this._getEndpoint()}/token/${tokenAddress}/${tokenId}/metadata`);
       if (response.status === 200) {
         return response.json();