diff --git a/README.md b/README.md index 090f7e4..b81113e 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,9 @@ installed and invoked through its [published package](https://www.npmjs.com/pack ```console $ npx gx-it-proxy --version -$ npx gx-it-proxy --sessions test.sqlite --port 8001 +$ npx gx-it-proxy --sessions test.sqlite --port 8001 # use SQLite +$ npx gx-it-proxy --sessions test.json --port 8001 # use a JSON file +$ npx gx-it-proxy --sessions postgresql:///galaxy?host=/var/run/postgresql --port 8001 # use PostgreSQL ``` ## Double Proxy @@ -18,3 +20,34 @@ To double-proxy (e.g. from Galaxy to a remote proxy that proxies to the applicat host1$ ./lib/main.js --sessions test.sqlite --forwardIP host2 --forwardPort 8001 host2$ ./lib/main.js --port 8001 ``` + +## Sessions + +The proxy loads sessions from the file or database passed with the `--sessions` +option. SQLite and JSON files are watched and reloaded on every change. +PostgreSQL databases are polled every five seconds by default. The polling +interval can be configured via the `--pollingInterval` option (in ms). + +Faster updates for PostgreSQL databases are possible via +[PostgreSQL asynchronous notifications](https://www.postgresql.org/docs/16/libpq-notify.html). +To enable them, create a PostgreSQL trigger that sends a +NOTIFY message to the channel `gxitproxy` every time the table `gxitproxy` +changes. + +```SQL +CREATE OR REPLACE FUNCTION notify_gxitproxy() +RETURNS trigger AS $$ +BEGIN + PERFORM pg_notify('gxitproxy', 'Table "gxitproxy" changed'); + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +CREATE TRIGGER gxitproxy_notify +AFTER INSERT OR UPDATE OR DELETE ON gxitproxy +FOR EACH ROW EXECUTE FUNCTION notify_gxitproxy(); +``` + +Although it is possible to disable polling using `--pollingInterval 0`, it is +strongly discouraged, as the delivery of asynchronous notifications is not +guaranteed. diff --git a/lib/main.js b/lib/main.js index 3474a37..9f93308 100755 --- a/lib/main.js +++ b/lib/main.js @@ -13,6 +13,13 @@ args .option("--ip ", "Public-facing IP of the proxy", "localhost") .option("--port ", "Public-facing port of the proxy", parseInt) .option("--sessions ", "Routes file to monitor") + .option( + "--pollingInterval ", + "Polling interval for PostgreSQL databases (in ms, defaults to 5000, " + + "use 0 to disable polling)", + parseInt, + 5000 + ) .option("--proxyPathPrefix ", "Path-based proxy prefix") .option("--forwardIP ", "Forward all requests to IP") .option("--forwardPort ", "Forward all requests to port", parseInt) @@ -28,7 +35,7 @@ const main = function (argv_) { let sessions = null; if (args.sessions) { - sessions = mapFor(args.sessions); + sessions = mapFor(args.sessions, args.pollingInterval); } const dynamicProxyOptions = { diff --git a/lib/mapper.js b/lib/mapper.js index 14e8365..7eec533 100644 --- a/lib/mapper.js +++ b/lib/mapper.js @@ -1,6 +1,13 @@ var fs = require("fs"); var sqlite3 = require("sqlite3"); -var watch = require("node-watch"); +var postgresClient = require("pg-native"); +var watchFile = require("node-watch"); + +var startsWith = function (subjectString, searchString) { + var reversedSubjectString = subjectString.split('').reverse().join(''); + var reversedSearchString = searchString.split('').reverse().join(''); + return endsWith(reversedSubjectString, reversedSearchString); +} var endsWith = function (subjectString, searchString) { var position = subjectString.length; @@ -89,17 +96,82 @@ var updateFromSqlite = function (path, map) { var db = new sqlite3.Database(path, loadSessions); }; -var mapFor = function (path) { +var updateFromPostgres = function(path, map) { + var db = postgresClient(); + var loadedSessions = {}; + db.connectSync(path); + + var queryResult = db.querySync( + "SELECT key, key_type, token, host, port, info FROM gxitproxy" + ); + for (var row of queryResult) { + var info = row.info; + if (info) { + info = JSON.parse(info); + } + loadedSessions[row.key] = { + target: { host: row.host, port: parseInt(row.port) }, + key_type: row.key_type, + token: row.token, + requires_path_in_url: info?.requires_path_in_url, + requires_path_in_header_named: info?.requires_path_in_header_named, + }; + } + + for (var oldSession in map) { + if (!(oldSession in loadedSessions)) { + delete map[oldSession]; + } + } + for (var loadedSession in loadedSessions) { + map[loadedSession] = loadedSessions[loadedSession]; + } + // console.log("Updated map:", map) + db.end(); +}; + +var watchPostgres = function(path, loadMap, pollingInterval) { + // poll the database every `pollingInterval` seconds + if (pollingInterval > 0) { + setInterval(loadMap, pollingInterval) + } + + // watch changes using PostgresSQL asynchronous notifications + // (https://www.postgresql.org/docs/16/libpq-notify.html) + var db = postgresClient(); + db.connect(path, function(err) { + if(err) throw err; + + db.on("notification", function(msg) {loadMap(path, loadMap)}); + db.query("LISTEN gxitproxy", function(err, res) {if(err) throw err}); + }); + // requires creating a notification function and a trigger for the gxitproxy + // table on the database (see README.md for more details) + // delivery of notifications is not guaranteed, therefore, combining polling + // with asynchronous notifications is strongly recommended +} + +var mapFor = function (path, pollingInterval) { var map = {}; var loadMap; + var watch; if (endsWith(path, ".sqlite")) { loadMap = function () { updateFromSqlite(path, map); }; + watch = watchFile; + } else if (startsWith(path, "postgresql://")) { + loadMap = function () { + updateFromPostgres(path, map); + }; + watch = function (path, loadMap) { + return watchPostgres(path, loadMap, pollingInterval); + }; } else { loadMap = function () { updateFromJson(path, map); }; + watch = watchFile; } console.log("Watching path " + path); loadMap();