add proper support for relative paths

Hacker0x01 · Nov 19, 2015 · 761445f · 761445f
1 parent a4f3b7e
commit 761445f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git a/bin/slackin b/bin/slackin
@@ -12,6 +12,7 @@ program
 .option('-c, --channels [<chan>]', 'One or more comma-separated channel names to allow single-channel guests [$SLACK_CHANNELS]', process.env.SLACK_CHANNELS)
 .option('-c, --channel <chan>', 'Single channel guest invite (deprecated) [$SLACK_CHANNEL]', process.env.SLACK_CHANNEL)
 .option('-i, --interval <int>', 'How frequently (ms) to poll Slack [$SLACK_INTERVAL or 5000]', process.env.SLACK_INTERVAL || 5000)
+.option('-P, --path', 'Path to serve slackin under', '/')
 .option('-s, --silent', 'Do not print out warns or errors')
 .option('-c, --css <file>', 'Full URL to a custom CSS file to use on the main page')
 .parse(process.argv);

diff --git a/lib/assets/client.js b/lib/assets/client.js
@@ -33,7 +33,7 @@ body.addEventListener('submit', function(ev){
 
 function invite(channel, email, fn){
   request
-  .post('invite')
+  .post(data.path + 'invite')
   .send({
     channel: channel,
     email: email
@@ -52,7 +52,7 @@ function invite(channel, email, fn){
 var url = document.createElement('a');
 url.href = window.location;
 // realtime updates
-var socket = io({path: (url.pathname + '/socket.io').replace('//','/')});
+var socket = io({ path: data.path + 'socket.io' });
 socket.on('data', function(users){
   for (var i in users) update(i, users[i]);
 });

diff --git a/lib/assets/iframe.js b/lib/assets/iframe.js
@@ -56,7 +56,7 @@
     // use dom element for better cross browser compatibility
     var url = document.createElement('a');
     url.href = window.location;
-    var socket = io({path: (url.pathname.replace(/\/iframe$/, '') + '/socket.io').replace('//','/')});
+    var socket = io({ path: data.path + 'socket.io' });
     var count = document.getElementsByClassName('slack-count')[0];
 
     socket.on('data', function(users){

diff --git a/lib/iframe.js b/lib/iframe.js
@@ -6,7 +6,7 @@ const logo = read(__dirname + '/assets/slack.svg').toString('base64');
 const js = read(__dirname + '/assets/iframe.js').toString();
 const css = read(__dirname + '/assets/iframe-button.css').toString();
 
-export default function button({ active, total, large }){
+export default function iframe({ path, active, total, large }){
   let str = '';
   if (active) str = `${active}/`;
   if (total) str += total;
@@ -25,6 +25,7 @@ export default function button({ active, total, large }){
     }),
     dom('script', `
       data = {};
+      data.path = ${JSON.stringify(path)};
       data.total = ${total != null ? total : 'null'};
       data.active = ${active != null ? active : 'null'};
     `),

diff --git a/lib/index.js b/lib/index.js
@@ -23,6 +23,7 @@ export default function slackin({
   interval = 5000, // jshint ignore:line
   org,
   css,
+  path='/',
   channels,
   silent = false // jshint ignore:line
 }){
@@ -70,7 +71,7 @@ export default function slackin({
         dom('link rel="shortcut icon" href=https://slack.global.ssl.fastly.net/272a/img/icons/favicon-32.png'),
         css && dom('link rel=stylesheet', { href: css })
       ),
-      splash({ css, name, org, logo, channels, active, total })
+      splash({ path, css, name, org, logo, channels, active, total })
     );
     res.type('html');
     res.send(page.toHTML());
@@ -129,7 +130,7 @@ export default function slackin({
     let large = 'large' in req.query;
     let { active, total } = slack.users;
     res.type('html');
-    res.send(iframe({ active, total, large }).toHTML());
+    res.send(iframe({ path, active, total, large }).toHTML());
   });
 
   app.get('/iframe/dialog', (req, res) => {

diff --git a/lib/splash.js b/lib/splash.js
@@ -1,7 +1,7 @@
 
 import dom from 'vd';
 
-export default function splash({ name, org, logo, active, total, channels, iframe }){
+export default function splash({ path, name, org, logo, active, total, channels, iframe }){
   let div = dom('.splash',
     !iframe && dom('.logos',
       logo && dom('.logo.org'),
@@ -43,9 +43,13 @@ export default function splash({ name, org, logo, active, total, channels, ifram
     ),
     style({ logo, active, iframe }),
     // xxx: single build
+    dom('script', `
+      data = {};
+      data.path = ${JSON.stringify(path)};
+    `),
     dom('script src=https://cdn.socket.io/socket.io-1.3.2.js'),
-    dom('script src=assets/superagent.js'),
-    dom('script src=assets/client.js')
+    dom(`script src=${path}assets/superagent.js`),
+    dom(`script src=${path}assets/client.js`)
   );
   return div;
 }