You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2016/09/09 17:21:04 UTC
[whimsy] branch master updated: show transcript/exceptions
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new d8fc6cb show transcript/exceptions
d8fc6cb is described below
commit d8fc6cb935838b3003e77a9dde62d1daeef0d1db
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Fri Sep 9 13:20:47 2016 -0400
show transcript/exceptions
---
www/secmail/public/fetch.js | 330 +++++++++++++++++++++++++++++++++++++
www/secmail/public/tasklist.js | 76 ++++++++-
www/secmail/server.rb | 26 ++-
www/secmail/views/tasklist.html.rb | 2 +-
4 files changed, 416 insertions(+), 18 deletions(-)
diff --git a/www/secmail/public/fetch.js b/www/secmail/public/fetch.js
new file mode 100644
index 0000000..0beb144
--- /dev/null
+++ b/www/secmail/public/fetch.js
@@ -0,0 +1,330 @@
+(function() {
+ 'use strict';
+
+ if (self.fetch) {
+ return
+ }
+
+ function normalizeName(name) {
+ if (typeof name !== 'string') {
+ name = name.toString();
+ }
+ if (/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(name)) {
+ throw new TypeError('Invalid character in header field name')
+ }
+ return name.toLowerCase()
+ }
+
+ function normalizeValue(value) {
+ if (typeof value !== 'string') {
+ value = value.toString();
+ }
+ return value
+ }
+
+ function Headers(headers) {
+ this.map = {}
+
+ if (headers instanceof Headers) {
+ headers.forEach(function(value, name) {
+ this.append(name, value)
+ }, this)
+
+ } else if (headers) {
+ Object.getOwnPropertyNames(headers).forEach(function(name) {
+ this.append(name, headers[name])
+ }, this)
+ }
+ }
+
+ Headers.prototype.append = function(name, value) {
+ name = normalizeName(name)
+ value = normalizeValue(value)
+ var list = this.map[name]
+ if (!list) {
+ list = []
+ this.map[name] = list
+ }
+ list.push(value)
+ }
+
+ Headers.prototype['delete'] = function(name) {
+ delete this.map[normalizeName(name)]
+ }
+
+ Headers.prototype.get = function(name) {
+ var values = this.map[normalizeName(name)]
+ return values ? values[0] : null
+ }
+
+ Headers.prototype.getAll = function(name) {
+ return this.map[normalizeName(name)] || []
+ }
+
+ Headers.prototype.has = function(name) {
+ return this.map.hasOwnProperty(normalizeName(name))
+ }
+
+ Headers.prototype.set = function(name, value) {
+ this.map[normalizeName(name)] = [normalizeValue(value)]
+ }
+
+ Headers.prototype.forEach = function(callback, thisArg) {
+ Object.getOwnPropertyNames(this.map).forEach(function(name) {
+ this.map[name].forEach(function(value) {
+ callback.call(thisArg, value, name, this)
+ }, this)
+ }, this)
+ }
+
+ function consumed(body) {
+ if (body.bodyUsed) {
+ return Promise.reject(new TypeError('Already read'))
+ }
+ body.bodyUsed = true
+ }
+
+ function fileReaderReady(reader) {
+ return new Promise(function(resolve, reject) {
+ reader.onload = function() {
+ resolve(reader.result)
+ }
+ reader.onerror = function() {
+ reject(reader.error)
+ }
+ })
+ }
+
+ function readBlobAsArrayBuffer(blob) {
+ var reader = new FileReader()
+ reader.readAsArrayBuffer(blob)
+ return fileReaderReady(reader)
+ }
+
+ function readBlobAsText(blob) {
+ var reader = new FileReader()
+ reader.readAsText(blob)
+ return fileReaderReady(reader)
+ }
+
+ var support = {
+ blob: 'FileReader' in self && 'Blob' in self && (function() {
+ try {
+ new Blob();
+ return true
+ } catch(e) {
+ return false
+ }
+ })(),
+ formData: 'FormData' in self
+ }
+
+ function Body() {
+ this.bodyUsed = false
+
+
+ this._initBody = function(body) {
+ this._bodyInit = body
+ if (typeof body === 'string') {
+ this._bodyText = body
+ } else if (support.blob && Blob.prototype.isPrototypeOf(body)) {
+ this._bodyBlob = body
+ } else if (support.formData && FormData.prototype.isPrototypeOf(body)) {
+ this._bodyFormData = body
+ } else if (!body) {
+ this._bodyText = ''
+ } else {
+ throw new Error('unsupported BodyInit type')
+ }
+ }
+
+ if (support.blob) {
+ this.blob = function() {
+ var rejected = consumed(this)
+ if (rejected) {
+ return rejected
+ }
+
+ if (this._bodyBlob) {
+ return Promise.resolve(this._bodyBlob)
+ } else if (this._bodyFormData) {
+ throw new Error('could not read FormData body as blob')
+ } else {
+ return Promise.resolve(new Blob([this._bodyText]))
+ }
+ }
+
+ this.arrayBuffer = function() {
+ return this.blob().then(readBlobAsArrayBuffer)
+ }
+
+ this.text = function() {
+ var rejected = consumed(this)
+ if (rejected) {
+ return rejected
+ }
+
+ if (this._bodyBlob) {
+ return readBlobAsText(this._bodyBlob)
+ } else if (this._bodyFormData) {
+ throw new Error('could not read FormData body as text')
+ } else {
+ return Promise.resolve(this._bodyText)
+ }
+ }
+ } else {
+ this.text = function() {
+ var rejected = consumed(this)
+ return rejected ? rejected : Promise.resolve(this._bodyText)
+ }
+ }
+
+ if (support.formData) {
+ this.formData = function() {
+ return this.text().then(decode)
+ }
+ }
+
+ this.json = function() {
+ return this.text().then(JSON.parse)
+ }
+
+ return this
+ }
+
+ // HTTP methods whose capitalization should be normalized
+ var methods = ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'POST', 'PUT']
+
+ function normalizeMethod(method) {
+ var upcased = method.toUpperCase()
+ return (methods.indexOf(upcased) > -1) ? upcased : method
+ }
+
+ function Request(url, options) {
+ options = options || {}
+ this.url = url
+
+ this.credentials = options.credentials || 'omit'
+ this.headers = new Headers(options.headers)
+ this.method = normalizeMethod(options.method || 'GET')
+ this.mode = options.mode || null
+ this.referrer = null
+
+ if ((this.method === 'GET' || this.method === 'HEAD') && options.body) {
+ throw new TypeError('Body not allowed for GET or HEAD requests')
+ }
+ this._initBody(options.body)
+ }
+
+ function decode(body) {
+ var form = new FormData()
+ body.trim().split('&').forEach(function(bytes) {
+ if (bytes) {
+ var split = bytes.split('=')
+ var name = split.shift().replace(/\+/g, ' ')
+ var value = split.join('=').replace(/\+/g, ' ')
+ form.append(decodeURIComponent(name), decodeURIComponent(value))
+ }
+ })
+ return form
+ }
+
+ function headers(xhr) {
+ var head = new Headers()
+ var pairs = xhr.getAllResponseHeaders().trim().split('\n')
+ pairs.forEach(function(header) {
+ var split = header.trim().split(':')
+ var key = split.shift().trim()
+ var value = split.join(':').trim()
+ head.append(key, value)
+ })
+ return head
+ }
+
+ Body.call(Request.prototype)
+
+ function Response(bodyInit, options) {
+ if (!options) {
+ options = {}
+ }
+
+ this._initBody(bodyInit)
+ this.type = 'default'
+ this.url = null
+ this.status = options.status
+ this.ok = this.status >= 200 && this.status < 300
+ this.statusText = options.statusText
+ this.headers = options.headers instanceof Headers ? options.headers : new Headers(options.headers)
+ this.url = options.url || ''
+ }
+
+ Body.call(Response.prototype)
+
+ self.Headers = Headers;
+ self.Request = Request;
+ self.Response = Response;
+
+ self.fetch = function(input, init) {
+ // TODO: Request constructor should accept input, init
+ var request
+ if (Request.prototype.isPrototypeOf(input) && !init) {
+ request = input
+ } else {
+ request = new Request(input, init)
+ }
+
+ return new Promise(function(resolve, reject) {
+ var xhr = new XMLHttpRequest()
+
+ function responseURL() {
+ if ('responseURL' in xhr) {
+ return xhr.responseURL
+ }
+
+ // Avoid security warnings on getResponseHeader when not allowed by CORS
+ if (/^X-Request-URL:/m.test(xhr.getAllResponseHeaders())) {
+ return xhr.getResponseHeader('X-Request-URL')
+ }
+
+ return;
+ }
+
+ xhr.onload = function() {
+ var status = (xhr.status === 1223) ? 204 : xhr.status
+ if (status < 100 || status > 599) {
+ reject(new TypeError('Network request failed'))
+ return
+ }
+ var options = {
+ status: status,
+ statusText: xhr.statusText,
+ headers: headers(xhr),
+ url: responseURL()
+ }
+ var body = 'response' in xhr ? xhr.response : xhr.responseText;
+ resolve(new Response(body, options))
+ }
+
+ xhr.onerror = function() {
+ reject(new TypeError('Network request failed'))
+ }
+
+ xhr.open(request.method, request.url, true)
+
+ if (request.credentials === 'include') {
+ xhr.withCredentials = true
+ }
+
+ if ('responseType' in xhr && support.blob) {
+ xhr.responseType = 'blob'
+ }
+
+ request.headers.forEach(function(value, name) {
+ xhr.setRequestHeader(name, value)
+ })
+
+ xhr.send(typeof request._bodyInit === 'undefined' ? null : request._bodyInit)
+ })
+ }
+ self.fetch.polyfill = true
+})();
diff --git a/www/secmail/public/tasklist.js b/www/secmail/public/tasklist.js
index c7dd7fd..c1b3e6b 100644
--- a/www/secmail/public/tasklist.js
+++ b/www/secmail/public/tasklist.js
@@ -1,19 +1,77 @@
var tasks = $('h3');
-var spinner = $('<img src="../spinner.gif"/>')
+var spinner = $('<img src="../spinner.gif"/>');
-function fake() {
- if (tasks.length) {
- tasks.first().parent().append(spinner);
+// Load fetch shim, if needed (e.g., by Safari)
+if (typeof fetch === 'undefined') {
+ var script = document.createElement('script');
+ script.type = 'text/javascript';
+ scrit.src = 'public/fetch.fs';
+ $('head').append(script);
+};
+
+// Conditionally process next task in the list
+function nexttask(proceed) {
+ if (proceed && tasks.length) {
+ // remove first task from list
+ var task = tasks.slice(0,1);
tasks = tasks.slice(1);
- setTimeout(fake, 2000);
- } else {
+
+ // extract task name, add to the parameter list
+ params.task = task.text();
+
+ // add/move spinner to this task
+ task.parent().append(spinner);
+
+ // build fetch options
+ options = {
+ method: 'POST',
+ headers: {'Content-Type': 'application/json'},
+ body: JSON.stringify(params),
+ credentials: 'include'
+ }
+
+ // perform fetch operation
+ fetch('', options).then(function(response) {
+ // display output
+ response.json().then(function(json) {
+ if (json.transcript) {
+ var pre = $('<pre>');
+ pre.text(json.transcript.join("\n"));
+ task.append(pre);
+ }
+
+ if (json.exception) {
+ var pre = $('<pre class="bg-danger">');
+ if (json.backtrace) {
+ json.exception += "\n " + json.backtrace.join("\n ");
+ }
+ pre.text(json.exception);
+ task.append(pre);
+ }
+ });
+
+ // conditionally proceed to the next task
+ nexttask(response.ok || confirm(response.statusText + "; continue?"));
+ }).catch(function(error) {
+ nexttask(confirm(error.message + "; continue?"));
+ });
+
+ } else { // done
+
spinner.remove();
- window.parent.frames[0].postMessage('hi', '*')
+
+ if (tasks.length) {
+ message = {status: 'aborted'}
+ } else {
+ message = {status: 'complete'}
+ }
+
+ window.parent.frames[0].postMessage(message, '*')
}
-}
+};
$('button').click(function(event) {
$(this).prop('disabled', true);
- fake();
+ nexttask(true);
});
diff --git a/www/secmail/server.rb b/www/secmail/server.rb
index 160de9e..b505d0b 100644
--- a/www/secmail/server.rb
+++ b/www/secmail/server.rb
@@ -16,8 +16,17 @@ require_relative 'models/events'
class Wunderbar::JsonBuilder
def _task(title, &block)
- @_target[:tasklist] ||= []
- @_target[:tasklist] << title
+ if @task
+ rc = _.system ['echo', 'hi']
+ rc = _.system ['echo', rc.to_s]
+ rc = _.system ['svn', 'foobar']
+ rc = _.system ['echo', rc.to_s]
+ rc = _.system ['foobar']
+ @task = nil
+ else
+ @_target[:tasklist] ||= []
+ @_target[:tasklist] << title
+ end
end
end
@@ -50,13 +59,14 @@ end
# task lists
post '/tasklist/:file' do
- @params = params.dup
- @params.delete :file
- @params.delete 'splat'
- @params.delete 'captures'
+ @jsmtime = File.mtime('public/tasklist.js').to_i
- @dryrun = JSON.parse(_json(:"actions/#{params[:file]}"))
- _html :tasklist
+ if request.content_type == 'application/json'
+ _json(:"actions/#{params[:file]}")
+ else
+ @dryrun = JSON.parse(_json(:"actions/#{params[:file]}"))
+ _html :tasklist
+ end
end
# posted actions
diff --git a/www/secmail/views/tasklist.html.rb b/www/secmail/views/tasklist.html.rb
index a0d9e56..55ad72d 100644
--- a/www/secmail/views/tasklist.html.rb
+++ b/www/secmail/views/tasklist.html.rb
@@ -19,6 +19,6 @@ _html do
_script "var params = #{JSON.generate(params)};"
- _script src: '../tasklist.js'
+ _script src: "../tasklist.js?#{@jsmtime}"
end
end
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].