Move hosted-git-info handling to npm service based on dependency changes

ryanhefner · ryanhefner · commit 221baa754ad1 · 2020-07-11T06:17:06.000-04:00
diff --git a/services/npm.js b/services/npm.js
@@ -6,6 +6,7 @@ const LRU = require('lru-cache');
 const express = require('express');
 const npmUser = require('@pkgstats/npm-user');
 const router = express.Router();
+const hostedGitInfo = require('hosted-git-info');
 
 const Rollbar = require("rollbar");
 const rollbar = new Rollbar(process.env.ROLLBAR_ACCESS_TOKEN);
@@ -112,6 +113,20 @@ router.get('/pkg/:pkg/:version?', async (req, res) => {
 
     const response = await fetch(url);
     const json = await response.json();
+
+    if (json.hasOwnProperty('repository') && json.repository.url) {
+      try {
+        const gitInfo = hostedGitInfo.fromUrl(json.repository.url);
+        if (gitInfo) {
+          json.repository.url = gitInfo.browse();
+        }
+      }
+      catch (e) {
+        rollbar.error('Error parsing repository url', e);
+        console.error('Error parsing repository url', e);
+      }
+    }
+
     cache.set(req.url, json);
 
     res.json(json);
diff --git a/src/pages/pkg.js b/src/pages/pkg.js
@@ -8,7 +8,6 @@ import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
 import gravatar from 'gravatar';
 import ReactMarkdown from 'react-markdown/with-html';
-import hostedGitInfo from 'hosted-git-info';
 
 import Link from 'components/base/Link';
 import CopyButton from 'components/packages/CopyButton';
@@ -152,7 +151,8 @@ class Pkg extends Component {
             break;
 
           case 'repository':
-            linkUrl = `${hostedGitInfo.fromUrl(pkg.repository.url).browse()}?ref=pkgstats.com`;
+            console.debug(pkg.repository.url);
+            linkUrl = `${pkg.repository.url}?ref=pkgstats.com`;
             linkString = <svg viewBox="0 0 92 92" version="1.1" xmlns="http://www.w3.org/2000/svg"><title>Git</title><g stroke="none"><path d="M90.155,41.965 L50.036,1.847 C47.726,-0.464 43.979,-0.464 41.667,1.847 L33.336,10.179 L43.904,20.747 C46.36,19.917 49.176,20.474 51.133,22.431 C53.102,24.401 53.654,27.241 52.803,29.706 L62.989,39.891 C65.454,39.041 68.295,39.59 70.264,41.562 C73.014,44.311 73.014,48.768 70.264,51.519 C67.512,54.271 63.056,54.271 60.303,51.519 C58.235,49.449 57.723,46.409 58.772,43.861 L49.272,34.362 L49.272,59.358 C49.942,59.69 50.575,60.133 51.133,60.69 C53.883,63.44 53.883,67.896 51.133,70.65 C48.383,73.399 43.924,73.399 41.176,70.65 C38.426,67.896 38.426,63.44 41.176,60.69 C41.856,60.011 42.643,59.497 43.483,59.153 L43.483,33.925 C42.643,33.582 41.858,33.072 41.176,32.389 C39.093,30.307 38.592,27.249 39.661,24.691 L29.243,14.271 L1.733,41.779 C-0.578,44.092 -0.578,47.839 1.733,50.15 L41.854,90.268 C44.164,92.578 47.91,92.578 50.223,90.268 L90.155,50.336 C92.466,48.025 92.466,44.275 90.155,41.965"></path></g></svg>;
             break;
 
@@ -307,13 +307,15 @@ class Pkg extends Component {
           <div className="details--main">
             <div className="details__readme">
               <h3 className="details__header">Readme</h3>
-              <ReactMarkdown
-                className="details__readme__src"
-                source={pkg.readme || readme}
-                linkTarget="_blank"
-                escapeHtml={false}
-                transformLinkUri={this.parseTransformLinkUri}
-              />
+              {!!(pkg.readme || readme) && (
+                <ReactMarkdown
+                  className="details__readme__src"
+                  source={pkg.readme || readme}
+                  linkTarget="_blank"
+                  escapeHtml={false}
+                  transformLinkUri={this.parseTransformLinkUri}
+                />
+              )}
             </div>
           </div>
         </Styled.DetailsSection>
