Skip to content

Feature bug report api #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuwilbur wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Feature bug report api #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7bd3eb3
Added base architecture for bug report
yuwilbur May 8, 2015
cb64c84
Added connection to allow BugReport to communicate to LeapSvc
yuwilbur May 8, 2015
6b63d7e
Added myself onto CONTRIBUTORS list
yuwilbur May 8, 2015
4ebf528
Added retriever for progress, duration and active
yuwilbur May 13, 2015
b9f4f46
Added version 7 to the protocol
yuwilbur May 22, 2015
f428e20
Clean up tests for new protocol v7
pehrlich May 22, 2015
4c3f100
Add example/test page
pehrlich May 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CONTRIBUTORS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,7 @@ Email: victor@logotype.se
10. Carl Goldberg
Github account: ceg1236
Email: carlgoldberg1236@gmail.com

11. Wilbur Yu
Github account: yuwilbur
Email: yuwilbur@gmail.com
19 changes: 19 additions & 0 deletions examples/bugReport.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<html>
<head>
<title>Dumper - Leap</title>
<script src="../leap-0.6.4.js"></script>
<script>
Leap.loop({background: true});
Leap.loopController.on('frame', function(){
var bugReport = Leap.loopController.bugReport;
document.getElementById('out').innerHTML = "BugReport: Active: " + bugReport.isActive + " Duration: " + bugReport.duration + " seconds. Progress: " + parseInt(bugReport.progress*100) + "%";
});
</script>
</head>
<div id="out"></div>
<button onclick="Leap.loopController.bugReport.beginRecording();">Begin Report</button>
<button onclick="Leap.loopController.bugReport.endRecording();">Close Report</button>
<p>
The bug report will close after 30 seconds or when the Close Report button is clicked.
</p>
</html>
2 changes: 1 addition & 1 deletion integration_test/protocol_versions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ downgradeProtocol = function(){
// Once a controller tried to connect, it will always be trying to reconnect. For now we just use two ports.
var passed = false;

var expected = ['/v6.json', '/v5.json', '/v4.json', '/v3.json', '/v2.json', '/v1.json'];
var expected = ['/v7.json', '/v6.json', '/v5.json', '/v4.json', '/v3.json', '/v2.json', '/v1.json'];

var wss = new WebSocketServer({port: 9494})
wss.on('connection', function(ws) {
Expand Down
82 changes: 54 additions & 28 deletions leap-0.6.4.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* http://github.com/leapmotion/leapjs/
*
* Copyright 2013 LeapMotion, Inc. and other contributors
* Released under the Apache-2.0 license
* http://github.com/leapmotion/leapjs/blob/master/LICENSE.txt
* Released under the Apache-2.0 license
* http://github.com/leapmotion/leapjs/blob/master/LICENSE
*/
;(function(e,t,n){function i(n,s){if(!t[n]){if(!e[n]){var o=typeof require=="function"&&require;if(!s&&o)return o(n,!0);if(r)return r(n,!0);throw new Error("Cannot find module '"+n+"'")}var u=t[n]={exports:{}};e[n][0].call(u.exports,function(t){var r=e[n][1][t];return i(r?r:t)},u,u.exports)}return t[n].exports}var r=typeof require=="function"&&require;for(var s=0;s<n.length;s++)i(n[s]);return i})({1:[function(require,module,exports){
var Pointable = require('./pointable'),
Expand Down Expand Up @@ -171,7 +171,22 @@ Bone.prototype.direction = function(){

};

},{"./pointable":14,"gl-matrix":23,"underscore":24}],2:[function(require,module,exports){
},{"./pointable":15,"gl-matrix":24,"underscore":25}],2:[function(require,module,exports){
var BugReport = module.exports = function(connection) {
this.connection = connection;
this.progress = 0;
this.duration = 0;
this.isActive = false;
};

BugReport.prototype.beginRecording = function() {
this.connection.send(this.connection.protocol.encode({SetBugReportRecording: true}));
};

BugReport.prototype.endRecording = function() {
this.connection.send(this.connection.protocol.encode({SetBugReportRecording: false}));
};
},{}],3:[function(require,module,exports){
var CircularBuffer = module.exports = function(size) {
this.pos = 0;
this._buf = [];
Expand All @@ -190,7 +205,7 @@ CircularBuffer.prototype.push = function(o) {
return this.pos++;
}

},{}],3:[function(require,module,exports){
},{}],4:[function(require,module,exports){
var chooseProtocol = require('../protocol').chooseProtocol
, EventEmitter = require('events').EventEmitter
, _ = require('underscore');
Expand Down Expand Up @@ -226,7 +241,7 @@ var BaseConnection = module.exports = function(opts) {
};

// The latest available:
BaseConnection.defaultProtocolVersion = 6;
BaseConnection.defaultProtocolVersion = 7;

BaseConnection.prototype.getUrl = function() {
return this.scheme + "//" + this.host + ":" + this.port + "/v" + this.opts.requestProtocolVersion + ".json";
Expand Down Expand Up @@ -358,7 +373,7 @@ BaseConnection.prototype.reportFocus = function(state) {
}

_.extend(BaseConnection.prototype, EventEmitter.prototype);
},{"../protocol":15,"events":21,"underscore":24}],4:[function(require,module,exports){
},{"../protocol":16,"events":22,"underscore":25}],5:[function(require,module,exports){
var BaseConnection = module.exports = require('./base')
, _ = require('underscore');

Expand Down Expand Up @@ -458,7 +473,7 @@ BrowserConnection.prototype.stopFocusLoop = function() {
delete this.focusDetectorTimer;
}

},{"./base":3,"underscore":24}],5:[function(require,module,exports){
},{"./base":4,"underscore":25}],6:[function(require,module,exports){
var process=require("__browserify_process");var Frame = require('./frame')
, Hand = require('./hand')
, Pointable = require('./pointable')
Expand All @@ -468,6 +483,7 @@ var process=require("__browserify_process");var Frame = require('./frame')
, EventEmitter = require('events').EventEmitter
, gestureListener = require('./gesture').gestureListener
, Dialog = require('./dialog')
, BugReport = require('./bugreport')
, _ = require('underscore');

/**
Expand Down Expand Up @@ -557,6 +573,7 @@ var Controller = module.exports = function(opts) {
this.connectionType = opts.connectionType;
}
this.connection = new this.connectionType(opts);
this.bugReport = new BugReport(this.connection);
this.streamingCount = 0;
this.devices = {};
this.plugins = {};
Expand Down Expand Up @@ -705,6 +722,7 @@ Controller.prototype.processFinishedFrame = function(frame) {
frame = this.pipeline.run(frame);
if (!frame) frame = Frame.Invalid;
}

this.emit('frame', frame);
this.emitHandEvents(frame);
}
Expand Down Expand Up @@ -907,6 +925,13 @@ Controller.prototype.setupConnectionEvents = function() {

});

this.connection.on('bugReportEvent', function(event) {
if(event.state) {
controller.bugReport.progress = event.state["progress"];
controller.bugReport.duration = event.state["duration"];
controller.bugReport.isActive = event.state["active"];
}
});

this.on('newListener', function(event, listener) {
if( event == 'deviceConnected' || event == 'deviceDisconnected' ) {
Expand Down Expand Up @@ -1202,7 +1227,7 @@ Controller.prototype.useRegisteredPlugins = function(){

_.extend(Controller.prototype, EventEmitter.prototype);

},{"./circular_buffer":2,"./connection/browser":4,"./connection/node":20,"./dialog":6,"./finger":7,"./frame":8,"./gesture":9,"./hand":10,"./pipeline":13,"./pointable":14,"__browserify_process":22,"events":21,"underscore":24}],6:[function(require,module,exports){
},{"./bugreport":2,"./circular_buffer":3,"./connection/browser":5,"./connection/node":21,"./dialog":7,"./finger":8,"./frame":9,"./gesture":10,"./hand":11,"./pipeline":14,"./pointable":15,"__browserify_process":23,"events":22,"underscore":25}],7:[function(require,module,exports){
var process=require("__browserify_process");var Dialog = module.exports = function(message, options){
this.options = (options || {});
this.message = message;
Expand Down Expand Up @@ -1349,7 +1374,7 @@ Dialog.warnBones = function(){
}

}
},{"__browserify_process":22}],7:[function(require,module,exports){
},{"__browserify_process":23}],8:[function(require,module,exports){
var Pointable = require('./pointable'),
Bone = require('./bone')
, Dialog = require('./dialog')
Expand Down Expand Up @@ -1540,7 +1565,7 @@ Finger.prototype.toString = function() {

Finger.Invalid = { valid: false };

},{"./bone":1,"./dialog":6,"./pointable":14,"underscore":24}],8:[function(require,module,exports){
},{"./bone":1,"./dialog":7,"./pointable":15,"underscore":25}],9:[function(require,module,exports){
var Hand = require("./hand")
, Pointable = require("./pointable")
, createGesture = require("./gesture").createGesture
Expand Down Expand Up @@ -2045,7 +2070,7 @@ Frame.Invalid = {
translation: function() { return vec3.create(); }
};

},{"./finger":7,"./gesture":9,"./hand":10,"./interaction_box":12,"./pointable":14,"gl-matrix":23,"underscore":24}],9:[function(require,module,exports){
},{"./finger":8,"./gesture":10,"./hand":11,"./interaction_box":13,"./pointable":15,"gl-matrix":24,"underscore":25}],10:[function(require,module,exports){
var glMatrix = require("gl-matrix")
, vec3 = glMatrix.vec3
, EventEmitter = require('events').EventEmitter
Expand Down Expand Up @@ -2530,7 +2555,7 @@ KeyTapGesture.prototype.toString = function() {
return "KeyTapGesture ["+JSON.stringify(this)+"]";
}

},{"events":21,"gl-matrix":23,"underscore":24}],10:[function(require,module,exports){
},{"events":22,"gl-matrix":24,"underscore":25}],11:[function(require,module,exports){
var Pointable = require("./pointable")
, Bone = require('./bone')
, glMatrix = require("gl-matrix")
Expand Down Expand Up @@ -2984,7 +3009,7 @@ Hand.Invalid = {
translation: function() { return vec3.create(); }
};

},{"./bone":1,"./pointable":14,"gl-matrix":23,"underscore":24}],11:[function(require,module,exports){
},{"./bone":1,"./pointable":15,"gl-matrix":24,"underscore":25}],12:[function(require,module,exports){
/**
* Leap is the global namespace of the Leap API.
* @namespace Leap
Expand Down Expand Up @@ -3071,7 +3096,7 @@ module.exports = {
}
}

},{"./circular_buffer":2,"./controller":5,"./finger":7,"./frame":8,"./gesture":9,"./hand":10,"./interaction_box":12,"./pointable":14,"./protocol":15,"./ui":16,"./version.js":19,"events":21,"gl-matrix":23,"underscore":24}],12:[function(require,module,exports){
},{"./circular_buffer":3,"./controller":6,"./finger":8,"./frame":9,"./gesture":10,"./hand":11,"./interaction_box":13,"./pointable":15,"./protocol":16,"./ui":17,"./version.js":20,"events":22,"gl-matrix":24,"underscore":25}],13:[function(require,module,exports){
var glMatrix = require("gl-matrix")
, vec3 = glMatrix.vec3;

Expand Down Expand Up @@ -3213,7 +3238,7 @@ InteractionBox.prototype.toString = function() {
*/
InteractionBox.Invalid = { valid: false };

},{"gl-matrix":23}],13:[function(require,module,exports){
},{"gl-matrix":24}],14:[function(require,module,exports){
var Pipeline = module.exports = function (controller) {
this.steps = [];
this.controller = controller;
Expand Down Expand Up @@ -3267,7 +3292,7 @@ Pipeline.prototype.addWrappedStep = function (type, callback) {
this.addStep(step);
return step;
};
},{}],14:[function(require,module,exports){
},{}],15:[function(require,module,exports){
var glMatrix = require("gl-matrix")
, vec3 = glMatrix.vec3;

Expand Down Expand Up @@ -3484,7 +3509,7 @@ Pointable.prototype.hand = function(){
*/
Pointable.Invalid = { valid: false };

},{"gl-matrix":23}],15:[function(require,module,exports){
},{"gl-matrix":24}],16:[function(require,module,exports){
var Frame = require('./frame')
, Hand = require('./hand')
, Pointable = require('./pointable')
Expand All @@ -3506,6 +3531,7 @@ exports.chooseProtocol = function(header) {
case 4:
case 5:
case 6:
case 7:
protocol = JSONProtocol(header);
protocol.sendBackground = function(connection, state) {
connection.send(protocol.encode({background: state}));
Expand Down Expand Up @@ -3560,12 +3586,12 @@ var JSONProtocol = exports.JSONProtocol = function(header) {



},{"./finger":7,"./frame":8,"./hand":10,"./pointable":14,"events":21,"underscore":24}],16:[function(require,module,exports){
},{"./finger":8,"./frame":9,"./hand":11,"./pointable":15,"events":22,"underscore":25}],17:[function(require,module,exports){
exports.UI = {
Region: require("./ui/region"),
Cursor: require("./ui/cursor")
};
},{"./ui/cursor":17,"./ui/region":18}],17:[function(require,module,exports){
},{"./ui/cursor":18,"./ui/region":19}],18:[function(require,module,exports){
var Cursor = module.exports = function() {
return function(frame) {
var pointable = frame.pointables.sort(function(a, b) { return a.z - b.z })[0]
Expand All @@ -3576,7 +3602,7 @@ var Cursor = module.exports = function() {
}
}

},{}],18:[function(require,module,exports){
},{}],19:[function(require,module,exports){
var EventEmitter = require('events').EventEmitter
, _ = require('underscore')

Expand Down Expand Up @@ -3664,17 +3690,17 @@ Region.prototype.mapToXY = function(position, width, height) {
}

_.extend(Region.prototype, EventEmitter.prototype)
},{"events":21,"underscore":24}],19:[function(require,module,exports){
},{"events":22,"underscore":25}],20:[function(require,module,exports){
// This file is automatically updated from package.json by grunt.
module.exports = {
full: '0.6.4',
major: 0,
minor: 6,
dot: 4
}
},{}],20:[function(require,module,exports){

},{}],21:[function(require,module,exports){

},{}],22:[function(require,module,exports){
var process=require("__browserify_process");if (!process.EventEmitter) process.EventEmitter = function () {};

var EventEmitter = exports.EventEmitter = process.EventEmitter;
Expand Down Expand Up @@ -3870,7 +3896,7 @@ EventEmitter.listenerCount = function(emitter, type) {
return ret;
};

},{"__browserify_process":22}],22:[function(require,module,exports){
},{"__browserify_process":23}],23:[function(require,module,exports){
// shim for using process in browser

var process = module.exports = {};
Expand Down Expand Up @@ -3925,7 +3951,7 @@ process.chdir = function (dir) {
throw new Error('process.chdir is not supported');
};

},{}],23:[function(require,module,exports){
},{}],24:[function(require,module,exports){
/**
* @fileoverview gl-matrix - High performance matrix and vector operations
* @author Brandon Jones
Expand Down Expand Up @@ -8175,7 +8201,7 @@ if(typeof(exports) !== 'undefined') {
})(shim.exports);
})(this);

},{}],24:[function(require,module,exports){
},{}],25:[function(require,module,exports){
// Underscore.js 1.4.4
// http://underscorejs.org
// (c) 2009-2013 Jeremy Ashkenas, DocumentCloud Inc.
Expand Down Expand Up @@ -9403,7 +9429,7 @@ if(typeof(exports) !== 'undefined') {

}).call(this);

},{}],25:[function(require,module,exports){
},{}],26:[function(require,module,exports){
if (typeof(window) !== 'undefined' && typeof(window.requestAnimationFrame) !== 'function') {
window.requestAnimationFrame = (
window.webkitRequestAnimationFrame ||
Expand All @@ -9416,5 +9442,5 @@ if (typeof(window) !== 'undefined' && typeof(window.requestAnimationFrame) !== '

Leap = require("../lib/index");

},{"../lib/index":11}]},{},[25])
},{"../lib/index":12}]},{},[26])
;
10 changes: 5 additions & 5 deletions leap-0.6.4.min.js
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions lib/bugreport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
var BugReport = module.exports = function(connection) {
this.connection = connection;
this.progress = 0;
this.duration = 0;
this.isActive = false;
};

BugReport.prototype.beginRecording = function() {
this.connection.send(this.connection.protocol.encode({SetBugReportRecording: true}));
};

BugReport.prototype.endRecording = function() {
this.connection.send(this.connection.protocol.encode({SetBugReportRecording: false}));
};
2 changes: 1 addition & 1 deletion lib/connection/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var BaseConnection = module.exports = function(opts) {
};

// The latest available:
BaseConnection.defaultProtocolVersion = 6;
BaseConnection.defaultProtocolVersion = 7;

BaseConnection.prototype.getUrl = function() {
return this.scheme + "//" + this.host + ":" + this.port + "/v" + this.opts.requestProtocolVersion + ".json";
Expand Down
10 changes: 10 additions & 0 deletions lib/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var Frame = require('./frame')
, EventEmitter = require('events').EventEmitter
, gestureListener = require('./gesture').gestureListener
, Dialog = require('./dialog')
, BugReport = require('./bugreport')
, _ = require('underscore');

/**
Expand Down Expand Up @@ -96,6 +97,7 @@ var Controller = module.exports = function(opts) {
this.connectionType = opts.connectionType;
}
this.connection = new this.connectionType(opts);
this.bugReport = new BugReport(this.connection);
this.streamingCount = 0;
this.devices = {};
this.plugins = {};
Expand Down Expand Up @@ -244,6 +246,7 @@ Controller.prototype.processFinishedFrame = function(frame) {
frame = this.pipeline.run(frame);
if (!frame) frame = Frame.Invalid;
}

this.emit('frame', frame);
this.emitHandEvents(frame);
}
Expand Down Expand Up @@ -446,6 +449,13 @@ Controller.prototype.setupConnectionEvents = function() {

});

this.connection.on('bugReportEvent', function(event) {
if(event.state) {
controller.bugReport.progress = event.state["progress"];
controller.bugReport.duration = event.state["duration"];
controller.bugReport.isActive = event.state["active"];
}
});

this.on('newListener', function(event, listener) {
if( event == 'deviceConnected' || event == 'deviceDisconnected' ) {
Expand Down
Loading