Load whitelist only on server startup

app.js

@@ -45,6 +45,7 @@ app.use(cacheMiddleware);
 
 import apiViews from './modules/api/views.js';
 import debugViews from './modules/debug/views.js';
+
 apiViews(app);
 debugViews(app);
 
@@ -174,4 +175,4 @@ app.get('/', function(req, res) {
   res.end();
 });
 
-process.title = "iframely";
+process.title = "iframely";

config.js

@@ -20,6 +20,8 @@
         use_http2: true,
         DEBUG: false,
 
+        WHITELIST_LOAD_ON_INIT: true,   // Whitelist is always loaded by lib init. Otherwise use `initializeWhitelistLoader();`.
+        WHITELIST_DIR: './whitelist',   // Set `null` to disable loading from file.
         WHITELIST_URL: 'https://iframely.com/qa/domains.json',
         WHITELIST_URL_RELOAD_PERIOD: 60 * 60 * 1000,  // will reload WL every hour, if no local files are found in /whitelist folder
 
@@ -440,4 +442,4 @@
         config.HTTP2_RETRY_CODES[item] = 1;
     });
 
-    export default config;
+    export default config;

lib/whitelist.js

@@ -1,4 +1,3 @@
-    import * as chokidar from 'chokidar';
     import * as fs from 'fs';
     import * as path from 'path';
     import * as crypto from 'crypto';
@@ -18,7 +17,6 @@
     var whitelistObject = {domains: {}};
     var whitelistLastModified;
     var currentWhitelistFilename;
-    var WHITELIST_DIR = path.resolve(__dirname, '../whitelist');
 
     function hash(value) {
         return crypto.createHash('md5').update(value).digest("hex");
@@ -281,11 +279,11 @@
 
     function findLastWhitelist() {
 
-        if (!fs.existsSync(WHITELIST_DIR)) {
+        if (!fs.existsSync(CONFIG.WHITELIST_DIR)) {
             return null;
         }
 
-        var files = fs.readdirSync(WHITELIST_DIR);
+        var files = fs.readdirSync(CONFIG.WHITELIST_DIR);
 
         files = files.filter(function(path) {
             return /iframely-.*\.json$/.test(path);
@@ -294,65 +292,63 @@
         files.sort();
 
         if (files.length) {
-            return path.resolve(WHITELIST_DIR, files[files.length -1]);
+            return path.resolve(CONFIG.WHITELIST_DIR, files[files.length -1]);
         } else {
             return null;
         }
     }
 
     function loadLastWhitelist() {
-
-        var filename = findLastWhitelist();
-
-        if (filename && filename != currentWhitelistFilename) {
-            readWhitelist(filename);
+        if (CONFIG.WHITELIST_DIR) {
+            var filename = findLastWhitelist();
+
+            if (filename && filename != currentWhitelistFilename) {
+                readWhitelist(filename);
+            } else {
+                console.log('No local domains file detected...');
+                addWildcard();
+            }
         } else {
-            console.log('No local domains file detected...');
             addWildcard();
         }
-
     }
 
     var loadFileTimeout;
 
     function startScanWhitelist() {
-
-        var watcher = chokidar.watch(WHITELIST_DIR, {
-            interval: 1000,
-            binaryInterval: 1000,
-            ignoreInitial: true
-        });
-
-        watcher.on('add', function(p) {
-            p = path.resolve('.', p);
-            // Check if newer file added.
-            if (p.match(/iframely-.*\.json/)) {
-                // Wait sometime to be sure write finished.
-                clearTimeout(loadFileTimeout);
-                loadFileTimeout = setTimeout(function() {
-                    loadLastWhitelist();
-                }, 5000);
-            }
-        });
-
-        watcher.on('change', function(p) {
-            p = path.resolve('.', p);
-            // Reload last whitelist.
-            if (p == currentWhitelistFilename) {
-                // Wait sometime to be sure write finished.
-                clearTimeout(loadFileTimeout);
-                loadFileTimeout = setTimeout(function() {
-                    readWhitelist(p);
-                }, 5000);
+        if (CONFIG.WHITELIST_DIR) {
+            try {
+                fs.watch(CONFIG.WHITELIST_DIR, {}, function(eventType, filename) {
+                    if (!filename) return;
+
+                    var p = path.resolve(CONFIG.WHITELIST_DIR, filename);
+
+                    if (filename.match(/iframely-.*\.json/)) {
+                        if (eventType === 'rename') {
+                            // File added or removed - check if it's the newest
+                            clearTimeout(loadFileTimeout);
+                            loadFileTimeout = setTimeout(function() {
+                                loadLastWhitelist();
+                            }, 500);
+                        } else if (eventType === 'change') {
+                            // File changed - reload if it's current whitelist
+                            if (p == currentWhitelistFilename) {
+                                clearTimeout(loadFileTimeout);
+                                loadFileTimeout = setTimeout(function() {
+                                    readWhitelist(p);
+                                }, 500);
+                            }
+                        }
+                    }
+                });
+            } catch (ex) {
+                console.log('Error watching whitelist directory:', ex);
             }
-        });
+        }
 
         loadLastWhitelist();
     }
 
-    startScanWhitelist();
-    loadWhitelistUrl();
-
     function loadWhitelistUrl() {
 
         if (!currentWhitelistFilename && CONFIG.WHITELIST_URL && CONFIG.WHITELIST_URL_RELOAD_PERIOD) {
@@ -398,3 +394,18 @@
                 });
         }
     }
+
+    function privateInitializeWhitelistLoader() {
+        startScanWhitelist();
+        loadWhitelistUrl();
+    }
+
+    export function initializeWhitelistLoader() {
+        if (!CONFIG.WHITELIST_LOAD_ON_INIT) {
+            privateInitializeWhitelistLoader();
+        }
+    }
+
+    if (CONFIG.WHITELIST_LOAD_ON_INIT) {
+        privateInitializeWhitelistLoader();
+    }

package.json

@@ -23,7 +23,6 @@
         "@adobe/fetch": "^4.1.11",
         "async": "^3.2.4",
         "cheerio": "^1.1.2",
-        "chokidar": "^4.0.3",
         "cookie": "^1.0.2",
         "dom-serializer": "^2.0.0",
         "domutils": "^3.0.1",