From f002fac331c79baff7fde57899d76be0410ffe10 Mon Sep 17 00:00:00 2001 From: cel Date: Sat, 26 Jan 2019 15:02:43 -1000 Subject: Add /script route --- lib/app.js | 24 ++++++++++++++++++++++++ lib/serve.js | 18 ++++++++++++++++++ 2 files changed, 42 insertions(+) (limited to 'lib') diff --git a/lib/app.js b/lib/app.js index e0b4417..0b7784c 100644 --- a/lib/app.js +++ b/lib/app.js @@ -42,6 +42,8 @@ function App(sbot, config) { var host1 = /:/.test(this.host) ? '[' + this.host + ']' : this.host this.baseUrl = 'http://' + host1 + ':' + this.port + this.dir = path.join(config.path, conf.dir || 'patchfoo') + this.scriptDir = path.join(this.dir, conf.scriptDir || 'script') var base = conf.base || '/' this.opts = { @@ -78,6 +80,9 @@ function App(sbot, config) { this.about = new About(this, sbot.id, this.follows) this.serveSsbNpmRegistry = SsbNpmRegistry.respond(this.sbot, this.config) + this.mtimes = {} + this.getScript = memo({cache: false}, this.getScript) + this.monitorBlobWants() this.navLinks = conf.nav || [ 'new', @@ -1246,3 +1251,22 @@ App.prototype.verifyGitObjectSignature = function (obj, cb) { }) } } + +App.prototype.getScript = function (filepath, cb) { + var filename = path.join(this.scriptDir, filepath) + var self = this + fs.stat(filename, function (err, stat) { + if (err) return cb(err) + var resolved = require.resolve(filename) + var prevMtime = self.mtimes[resolved] + var mtime = stat.mtime.getTime() + if (mtime !== prevMtime) { + delete require.cache[resolved] + self.mtimes[filename] = mtime + } + var module + try { module = require(resolved) } + catch(e) { return cb(e) } + cb(null, module) + }) +} diff --git a/lib/serve.js b/lib/serve.js index e3901a0..30b529b 100644 --- a/lib/serve.js +++ b/lib/serve.js @@ -390,6 +390,7 @@ Serve.prototype.path = function (url) { case '/shard': return this.shard(m[2]) case '/zip': return this.zip(m[2]) case '/web': return this.web(m[2]) + case '/script': return this.script(m[2]) } return this.respond(404, 'Not found') } @@ -3043,6 +3044,23 @@ Serve.prototype.web = function (url) { }) } +Serve.prototype.script = function (url) { + var self = this + var filepath = url.split('?')[0] + this.app.getScript(filepath, function (err, fn) { + try { + if (err) throw err + fn(self) + } catch(e) { + return pull( + pull.once(u.renderError(e).outerHTML), + self.wrapPage('local: ' + path), + self.respondSink(400) + ) + } + }) +} + // wrap a binary source and render it or turn into an embed Serve.prototype.wrapBinary = function (opts) { var self = this -- cgit v1.2.3