Merge pull request #125 from curbengh/refactor-url-api

perf: utilize legacy url.parse() in url_for() & full_url_for()
hexojs · Nov 10, 2019 · 71fce3f · 71fce3f
2 parents 71bbcc4 + bd99335
commit 71fce3f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 32 deletions.
diff --git a/lib/full_url_for.js b/lib/full_url_for.js
@@ -1,25 +1,17 @@
 'use strict';
 
-const { URL } = require('url');
+const { parse, URL } = require('url');
 const encodeURL = require('./encode_url');
 
-const urlObj = (str) => {
-  try {
-    return new URL(str);
-  } catch (err) {
-    return str;
-  }
-};
-
 function fullUrlForHelper(path = '/') {
   if (path.startsWith('//')) return path;
+
   const { config } = this;
-  const data = urlObj(path);
+  const sitehost = parse(config.url).hostname || config.url;
+  const data = new URL(path, `http://${sitehost}`);
 
-  // Exit if this is an external path
-  if (typeof data === 'object') {
-    if (data.origin !== 'null') return path;
-  }
+  // Exit if this is an external link
+  if (data.origin !== 'null' && data.hostname !== sitehost) return path;
 
   path = encodeURL(config.url + `/${path}`.replace(/\/{2,}/g, '/'));
   return path;

diff --git a/lib/url_for.js b/lib/url_for.js
@@ -1,35 +1,26 @@
 'use strict';
 
-const { URL } = require('url');
+const { parse, URL } = require('url');
 const encodeURL = require('./encode_url');
 const relative_url = require('./relative_url');
 
-const urlObj = (str) => {
-  try {
-    return new URL(str);
-  } catch (err) {
-    return str;
-  }
-};
-
 function urlForHelper(path = '/', options) {
-  if (path[0] === '#' || path.startsWith('//')) {
+  if (path.startsWith('#') || path.startsWith('//')) {
     return path;
   }
 
   const { config } = this;
   const { root } = config;
-  const data = urlObj(path);
+  const sitehost = parse(config.url).hostname || config.url;
+  const data = new URL(path, `http://${sitehost}`);
+
+  // Exit if this is an external link
+  if (data.origin !== 'null' && data.hostname !== sitehost) return path;
 
   options = Object.assign({
     relative: config.relative_link
   }, options);
 
-  // Exit if this is an external path
-  if (typeof data === 'object') {
-    if (data.origin !== 'null') return path;
-  }
-
   // Resolve relative url
   if (options.relative) {
     return relative_url(this.path, path);

diff --git a/test/full_url_for.spec.js b/test/full_url_for.spec.js
@@ -2,7 +2,9 @@
 
 describe('full_url_for', () => {
   const ctx = {
-    config: {}
+    config: {
+      url: 'http://example.com'
+    }
   };
 
   const fullUrlFor = require('../lib/full_url_for').bind(ctx);

diff --git a/test/url_for.spec.js b/test/url_for.spec.js
@@ -2,7 +2,9 @@
 
 describe('url_for', () => {
   const ctx = {
-    config: {}
+    config: {
+      url: 'http://example.com'
+    }
   };
 
   const urlFor = require('../lib/url_for').bind(ctx);