Merge pull request #14 from sajera/feature/URL

feature/URL

.env

@@ -4,6 +4,7 @@ DEBUG=true
 # API local configuration
 PORT=3000
 HOST=localhost
+RENDER_FALLBACK=true
 
 # Redis local configuration
 REDIS_URL=redis://127.0.0.1:6379

docker-compose.yaml

@@ -11,6 +11,7 @@ services:
       DEBUG: 1
       PORT: 3000
       HOST: 0.0.0.0
+      RENDER_FALLBACK: 0
       REDIS_URL: redis://cache:6379/0
       CHROME_FORWARD_HEADERS: 1
       CHROME_DEBUGGING_PORT: 9222

package.json

@@ -16,8 +16,7 @@
     "chrome-remote-interface": "^0.31.3",
     "dotenv": "^16.0.1",
     "redis": "^4.2.0",
-    "uuid": "^8.3.2",
-    "valid-url": "^1.0.9"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "nodemon": "^2.0.19"

src/config.js

@@ -10,6 +10,7 @@ export const DEBUG = varBoolean(process.env.DEBUG);
 export const API = {
   port: varNumber(process.env.PORT) || 80,
   host: varString(process.env.HOST) || '0.0.0.0',
+  renderFallback: varBoolean(process.env.RENDER_FALLBACK),
 };
 // NOTE for now Redis only
 export const CACHE = {
@@ -59,7 +60,6 @@ export function defaultCleanupHtmlScript () {
   }
 })(['noscript', 'script', 'style'])`;
 }
-
 /******************************************************
  *        ¯\(ヅ)/¯ helpers ᕦ(ツ)ᕤ
  *****************************************************/
@@ -73,3 +73,5 @@ const logWithTime = (text, data) => console.log(
   text,
   data === undefined ? '' : DEBUG ? JSON.stringify(data, null, 4) : JSON.stringify(data),
 );
+const urlRegExp = /(?:https?):\/\/(\w+:?\w*)?(\S+)(:\d+)?(\/|\/([\w#!:.?+=&%!\-\/]))?/;
+export const isUrl = url => urlRegExp.test(url);

src/index.js

@@ -1,13 +1,12 @@
 
 // outsource dependencies
 import qs from 'node:querystring';
-import { isWebUri } from 'valid-url';
 
 // local dependencies
 import api from './api/index.js';
 import cache from './cache/index.js';
 import prerender from './prerender/index.js';
-import { logError, log, API, CACHE, PRERENDER } from './config.js';
+import { isUrl, logError, log, API, CACHE, PRERENDER } from './config.js';
 
 // NOTE log unhandled promise exception
 process.on('unhandledRejection', error => logError('[service:unhandledRejection]', error && {
@@ -43,19 +42,24 @@ render.contentType = 'text/html';
 async function render (request) {
   if (!cache.isReady()) { throw { code: 503, message: 'Service not ready yet' }; }
   const url = qs.unescape(qs.parse(request.url.query).url);
-  if (!isWebUri(url)) { throw { code: 400, message: `Invalid query parameter url "${url}"` }; }
+  if (!isUrl(url)) { throw { code: 400, message: `Invalid query parameter url "${url}"` }; }
   const results = await cache.get(url);
-  results && log('[api:cache]', url);
-  return results || refresh(request);
+  if (results) {
+    log('[api:cache]', url);
+    return results;
+  }
+  if (API.renderFallback) {
+    return refresh(request);
+  }
+  throw { code: 404, message: `Cache empty for "${url}"` };
 }
 
 api.middleware['/refresh'] = refresh;
 refresh.contentType = 'text/html';
 async function refresh (request) {
-  console.log(request.url.query);
   if (!prerender.isReady() || !cache.isReady()) { throw { code: 503, message: 'Service not ready yet' }; }
   const url = qs.unescape(qs.parse(request.url.query).url);
-  if (!isWebUri(url)) { throw { code: 400, message: `Invalid query parameter url "${url}"` }; }
+  if (!isUrl(url)) { throw { code: 400, message: `Invalid query parameter url "${url}"` }; }
   const results = await prerender.render(url);
   log('[api:generate]', url);
   await cache.set(url, results);