From a628d12361f2fce054943a3ee433f4326edb6f26 Mon Sep 17 00:00:00 2001 From: reality Date: Sun, 14 Apr 2013 17:21:24 +0000 Subject: [PATCH] Initial API module [#361] --- modules/api/api.js | 50 ++++++++++++++++++++++++++++++++++++++++++ modules/imgur/imgur.js | 2 ++ modules/web/web.js | 14 ++++++------ 3 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 modules/api/api.js diff --git a/modules/api/api.js b/modules/api/api.js new file mode 100644 index 0000000..1dcb58d --- /dev/null +++ b/modules/api/api.js @@ -0,0 +1,50 @@ +/** + * Name: API + * Description: Expose DBot API functionality with a REST API + */ +var _ = require('underscore')._; + +var api = function(dbot) { + this.onLoad = function() { + dbot.modules.web.app.get('/api/:module/:method', function(req, res) { + var module = req.params.module, + method = req.params.method, + body = { 'err': null, 'data': null }; + + if(!_.has(dbot.api, module)) { + body.err = 'No such API module'; + } else if(!_.has(dbot.api[module], method)) { + body.err = 'No such API function in ' + module; + } else if(dbot.api[module][method].external !== true) { + body.err = 'API function ' + module + '.' + method + + ' not enabled for external access'; + } + + if(!body.err) { + var func = dbot.api[module][method]; + var paramNames = func.extMap; + var args = []; + + // TODO: Use request params to map to extMap args + + var callbackIndex = paramNames.indexOf('callback'); + if(callbackIndex != -1) { + args[callbackIndex] = function() { + body.data = Array.prototype.slice.call(arguments, 0); + res.json(body); + }; + func.apply(null, args); + } else { + body.data = func.call(null, args); + res.json(body); + } + } else { + res.json(body); + } + }.bind(this)); + }.bind(this); +}; + +exports.fetch = function(dbot) { + return new api(dbot); +}; diff --git a/modules/imgur/imgur.js b/modules/imgur/imgur.js index 27209c1..90f091b 100644 --- a/modules/imgur/imgur.js +++ b/modules/imgur/imgur.js @@ -67,6 +67,8 @@ var imgur = function(dbot) { }); } }; + this.api['getRandomImage'].external = true; + this.api['getRandomImage'].extMap = [ 'callback' ]; this.commands = { '~ri': function(event) { diff --git a/modules/web/web.js b/modules/web/web.js index d860f32..4d0c702 100644 --- a/modules/web/web.js +++ b/modules/web/web.js @@ -3,17 +3,17 @@ var express = require('express'), fs = require('fs'); var webInterface = function(dbot) { - var pub = 'public'; - var app = express(); + this.pub = 'public'; + this.app = express(); - app.use(express.static(pub)); - app.set('view engine', 'jade'); + this.app.use(express.static(this.pub)); + this.app.set('view engine', 'jade'); - app.get('/', function(req, res) { + this.app.get('/', function(req, res) { res.render('index', { 'name': dbot.config.name }); }); - var server = app.listen(dbot.config.web.webPort); + var server = this.app.listen(dbot.config.web.webPort); this.reloadPages = function() { var pages = dbot.pages; @@ -21,7 +21,7 @@ var webInterface = function(dbot) { if(_.has(pages, p)) { var func = pages[p]; var mod = func.module; - app.get(p, (function(req, resp) { + this.app.get(p, (function(req, resp) { // Crazy shim to seperate module views. var shim = Object.create(resp); shim.render = (function(view, one, two) {