diff --git a/.babelrc b/.babelrc index 8a960cf..c80907e 100644 --- a/.babelrc +++ b/.babelrc @@ -1,10 +1,28 @@ { - "presets": [ - "es2015", - "react" + "presets": [ + "es2015", + "react" + ], + "plugins": [ + "transform-object-rest-spread", + "transform-runtime", + "syntax-class-properties", + "transform-export-default-name", + [ + "transform-async-functions", + { + "module": "bluebird", + "method": "coroutine" + } ], - "plugins": [ - "transform-object-rest-spread", - "transform-runtime" - ] + [ + "transform-async-to-module-method", + { + "module": "bluebird", + "method": "coroutine" + } + ], + "transform-class-properties", + "syntax-async-functions" + ] } \ No newline at end of file diff --git a/.scriberc b/.scriberc new file mode 100644 index 0000000..eb710d8 --- /dev/null +++ b/.scriberc @@ -0,0 +1,141 @@ +{ + "app": "Scribe", + "id": "instance-0", + "handleUncaughtException": true, + "reader": "reader/BasicConsole", + "expose": { + "default": [ + "mongo-socket", + "bash" + ], + "express": [ + "express-mongo-socket", + "express-bash" + ] + }, + "expose/pipeline": { + "mongo-socket": [ + "transform/ErrorExtractor", + "transform/ToJSON2", + "transform/FullTextSerialize", + "writer/MongoDB", + "writer/SocketIO" + ], + "express-mongo-socket": [ + "transform/ExpressExtractor", + "transform/ErrorExtractor", + "transform/ToJSON2", + "transform/FullTextSerialize", + "writer/MongoDB", + "writer/SocketIO" + ], + "bash": [ + "transform/Inspector", + "writer/DefaultConsole" + ], + "express-bash": [ + "transform/ExpressExtractor", + "transform/ExpressInspector", + "transform/Inspector", + "writer/DefaultConsole" + ] + }, + "module": { + "middleware/ExpressLogger": { + "expose": "express", + "ignore": ["(scribe)"] + }, + "writer/MongoDB": { + "uri": "mongodb://localhost/scribe" + }, + "writer/SocketIO": { + "port": 4000, + "options": {} + }, + "transform/Inspector": { + "colors": true, + "showHidden": false, + "depth": 5, + "pre": true, + "callsite": true, + "tags": true, + "args": true, + "metrics": true + }, + "router/Viewer": { + "mongoUri": "mongodb://localhost/scribe", + "basePath": "/scribe", + "username": "build", + "password": "build", + "authentication": true, + "sessionSecret": "scribe-session", + "useBodyParser": true, + "useSession": true + }, + "router/Viewer/native": { + "protocol": "", + "host": "", + "port": "", + "pathname": "" + }, + "router/Viewer/client": { + "background": "#222", + "socketPorts": [ + 4000 + ], + "socketOptions": {}, + "queries": { + "all": { + "label": "all", + "query": { + "expose": { + "$exists": true + } + } + }, + "error": { + "label": "error", + "query": { + "expose": "error" + }, + "color": "red" + }, + "express": { + "label": "express", + "query": { + "expose": "express" + }, + "color": "blue" + }, + "info": { + "label": "info", + "query": { + "expose": "info" + }, + "color": "cyan" + }, + "log": { + "label": "log", + "query": { + "expose": "log" + }, + "color": "green" + }, + "warn": { + "label": "warn", + "query": { + "expose": "warn" + }, + "color": "yellow" + }, + "trace": { + "label": "trace", + "query": { + "expose": "trace" + }, + "color": "magenta" + } + } + } + } +} \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 8b799db..dcfbc7c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -104,7 +104,7 @@ module.exports = function (grunt) { map: false, processors: [ require('autoprefixer')({ - browsers: ['Chrome > 20'] + browsers: ['> 1%'] }) ] }, @@ -178,7 +178,7 @@ module.exports = function (grunt) { grunt.registerTask('styles', ['sass:dist', 'postcss:dist']); grunt.registerTask('build', ['get-deps', 'sass:dist', 'postcss:dist', 'browserify:dist', 'copy', 'imagemin', 'babel']); grunt.registerTask('default', 'build'); - grunt.registerTask('auto-build-scripts', ['browserify:dev']); - grunt.registerTask('auto-build-styles', ['sass:dev', 'watch:sass']); + grunt.registerTask('watch-scripts', ['browserify:dev']); + grunt.registerTask('watch-styles', ['sass:dev', 'watch:sass']); grunt.registerTask('production', ['env-force-production', 'clean', 'build', 'uglify:dist', 'env-restore']); }; \ No newline at end of file diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..dc38b77 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: node ./herokuapp/app.js diff --git a/README.md b/README.md index 1b9fbf9..dd1e5e6 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Node.js logging made simple! Online access to logs and more... ```bash -npm install git://github.com/bluejamesbond/Scribe.js.git#dev +npm install scribe@3.0.0-alpha.5 ``` ### Features @@ -16,19 +16,21 @@ npm install git://github.com/bluejamesbond/Scribe.js.git#dev - Support for multithreading (clusters) - Support for logging custom metrics i.e. `databaseResponseTime` - ES6 and Promise support - see examples +- Aggregated timeseries of the log entries +- Range selection +- Keyword searching ### Future - Add client-side options i.e. hide/display tags, show timings, abstract away search - Endpoint response time graphing - Graphing tools for custom metrics - Support for third-party plugins i.e. data parsing and performance tracking (in progress) -- Delete logs from front-end ## Console ![](/screenshots/console-0.png) ## Web -![](/screenshots/web-panel-1.png) +![](https://www.dropbox.com/s/pgjd6eu692fen8y/Screenshot%202016-04-10%2019.52.57.png?dl=1) ## Native ![](/screenshots/native-0.png) diff --git a/asr/viewer/Bootstrap.jsx b/asr/viewer/Bootstrap.jsx index 3b038d1..1abe250 100644 --- a/asr/viewer/Bootstrap.jsx +++ b/asr/viewer/Bootstrap.jsx @@ -1,11 +1,13 @@ import App from './components/App.jsx' import React from 'react' import MongoDB from './libs/MongoDB' -import { render } from 'react-dom' +import {render} from 'react-dom' + +window.Meteor = {Collection: {ObjectID: Function}}; const db = new MongoDB(); db.init() - .then(db=>window.db = db) - .then(()=>db.addCollection('Entry')) - .then(()=>render(, document.getElementById('app'))); \ No newline at end of file + .then(db=>window.db = db) + .then(()=>db.addCollection('Entry')) + .then(()=>render(, document.getElementById('app'))); \ No newline at end of file diff --git a/asr/viewer/components/App.jsx b/asr/viewer/components/App.jsx index 4ad3c4e..fcb790c 100644 --- a/asr/viewer/components/App.jsx +++ b/asr/viewer/components/App.jsx @@ -8,6 +8,43 @@ import Sidebar from './views/Sidebar.jsx' import ReactList from 'react-list'; import querystring from 'querystring' +class ReactListTracked extends ReactList { + constructor(...args) { + super(...args); + + this._triggerTimeSeriesBound = this._triggerTimeSeries.bind(this); + this.session = null; + } + + componentDidUpdate() { + super.componentDidUpdate(); + + this._triggerTimeSeries(); + } + + _triggerTimeSeries() { + const [first] = this.getVisibleRange(); + + if (this.props.entries[first]) { + Dispatcher.emit(Dispatcher.Events.REQUEST_TIMESERIES_DATE, this.props.entries[first].date); + } + } + + componentWillUnmount() { + super.componentWillUnmount(); + + this.scrollParent.removeEventListener("scroll", this._triggerTimeSeriesBound); + } + + componentDidMount() { + super.componentDidMount(); + + this.scrollParent.addEventListener("scroll", this._triggerTimeSeriesBound); + + window.document.body.style.background = config.background; + } +} + class App extends Influx.Component { constructor(...args) { super(...args); @@ -24,6 +61,12 @@ class App extends Influx.Component { } _onEntryStoreUpdated() { + const session = EntryStore.getSessionId(); + if (this.session !== session) { + this.lastLength = null; + this.session = session; + } + this.setState({entries: EntryStore.getSearchResults()}); } @@ -31,7 +74,13 @@ class App extends Influx.Component { Dispatcher.emit(Dispatcher.Events.REQUEST_INIT_SOCKET); } + componentDidUpdate() { + const {entries} = this.state; + } + componentDidMount() { + super.componentDidMount(); + Dispatcher.emit(Dispatcher.Events.REQUEST_INIT_DATABASE); } @@ -41,25 +90,33 @@ class App extends Influx.Component { const maxLineChars = String(length).length + 3; const rowRenderer = (i, key) => { - return + const entry = this.state.entries[i]; + if (i + 1 === length && this.lastLength !== length) { + Dispatcher.emit(Dispatcher.Events.REQUEST_GROW_SEARCH); + Dispatcher.emit(Dispatcher.Events.REQUEST_TIMESERIES_DATE, entry.date); + + this.lastLength = length; + } + + return }; - return ( -
- -
-
-
-
-
- -
+
+ +
+
+
+
+
+
+
); } } diff --git a/asr/viewer/components/views/Checkbox.jsx b/asr/viewer/components/views/Checkbox.jsx new file mode 100644 index 0000000..3d9825a --- /dev/null +++ b/asr/viewer/components/views/Checkbox.jsx @@ -0,0 +1,58 @@ +import React from 'react'; +import {ifcat} from '../../libs/utils'; + +class Checkbox extends React.Component { + static propTypes = { + defaultChecked: React.PropTypes.bool, + checked: React.PropTypes.bool, + toggle: React.PropTypes.bool, + style: React.PropTypes.object, + true: React.PropTypes.string, + false: React.PropTypes.string, + onChange: React.PropTypes.func + }; + + static defaultProps = { + defaultChecked: false, + checked: false, + style: {}, + true: 'on', + false: 'off', + toggle: false, + onChange: () => 0 + }; + + constructor(...args) { + super(...args); + + this.state = {checked: this.props.defaultChecked || this.props.checked}; + } + + componentWillReceiveProps(props) { + if (props.checked !== this.state.checked) { + this.setState({checked: props.checked}); + } + } + + handleChecked(e) { + if (this.props.onChange) { + e.target.checked = !this.state.checked; + this.props.onChange(e); + } + } + + render() { + return ( +
this.handleChecked(e)}> + {this.props.toggle ?
{this.state.checked ? this.props.true : this.props.false}
: null } +
+
+ ); + } +} + +export default Checkbox; diff --git a/asr/viewer/components/views/Entry.jsx b/asr/viewer/components/views/Entry.jsx index 7c55e00..f4ed55e 100644 --- a/asr/viewer/components/views/Entry.jsx +++ b/asr/viewer/components/views/Entry.jsx @@ -1,29 +1,51 @@ import React from 'react' +import Influx from 'react-influx' import {ifcat} from '../../libs/utils' +import EntryStore from '../../stores/EntryStore'; +import Dispatcher from '../../dispatchers/Dispatcher'; import ObjectInspector from 'react-object-inspector'; import _ from 'underscore' +import Checkbox from './Checkbox.jsx'; -export default class Entry extends React.Component { +export default class Entry extends Influx.Component { constructor(...args) { super(...args); - this.state = {visible: false, width: window.innerWidth}; + this.state = {visible: false, width: window.innerWidth, selected: EntryStore.isSelected(this.props.entry._id)}; this._onWindowResize = this._onWindowResize.bind(this); } componentWillUnmount() { - window.removeEventListener("resize", this._onWindowResize) + super.componentWillUnmount(); + + window.removeEventListener("resize", this._onWindowResize); } componentDidMount() { + super.componentDidMount(); + window.addEventListener("resize", this._onWindowResize, false) } + componentWillReceiveProps(nextProps) { + this.setState({selected: EntryStore.isSelected(nextProps.entry._id)}); + } + _onWindowResize() { this.setState({width: window.innerWidth}); } + getListeners() { + return [ + [EntryStore, EntryStore.Events.UPDATED_SELECTED, this._onUpdateSelected] + ] + } + + _onUpdateSelected() { + this.setState({selected: EntryStore.isSelected(this.props.entry._id)}); + } + _inspectPre(persistent) { - return {`${persistent.app}-${persistent.id}`}; + return {`${persistent.app}-${persistent.id}`}; } _inspectTags(tags, persistent) { @@ -35,7 +57,7 @@ export default class Entry extends React.Component { _inspectExpose(expose) { return {expose}; @@ -47,11 +69,11 @@ export default class Entry extends React.Component { _inspectMetrics(entry) { return ( - + {_.map(entry.transient.metrics, (value, key)=> { value = typeof value === 'number' ? value.toFixed(3) : value; return ( - + {key} {value} @@ -68,12 +90,12 @@ export default class Entry extends React.Component { const {entry} = this.props; return ( -
- -
- -
+
+ +
+
+
); } @@ -83,7 +105,7 @@ export default class Entry extends React.Component { if (entry.expose === 'express') { const express = entry.args[0]; args = ( - + {express.method} {express.originalUrl} {express.status} - {express.contentLength} @@ -104,13 +126,21 @@ export default class Entry extends React.Component { _inspectCallSite(entry) { let site = entry.transient.callsite; + let tooltip; if (entry.expose === 'express') { const express = entry.args[0]; - site = `${express.ip}` + site = `${express.ip}`; + tooltip = 'remote ip'; } else { site = `${site.file.substr(site.file.lastIndexOf('/') + 1)}:${site.line}`; + tooltip = site.func || 'anonymous'; } - return {site}; + return ( + + {site} + {tooltip} + + ); } render() { @@ -118,47 +148,55 @@ export default class Entry extends React.Component { const lineNumber = new Array(this.props.maxLineChars - String(this.props.line).length).join(' ') + this.props.line; const preSpace = new Array(this.props.maxLineChars).join(' '); + const isPushed = entry._pushed; if (this.state.width < 1280) { return ( -
-
- - {this._inspectPre(entry.persistent)} - {this._inspectTags(entry.persistent.tags, true)} - {this._inspectTags(entry.transient.tags)} - {this._inspectMetrics(entry)} - - {this._inspectExpose(entry.expose)} - {this._inspectCallSite(entry)} - -
-
- - {this._inspectArgs(entry)} -
- {this._inspectRaw(preSpace) } +
+
+ + Dispatcher.emit(Dispatcher.Events.REQUEST_SELECT_ENTRY, entry._id, e.target.checked)}/> + {this._inspectPre(entry.persistent)} + {this._inspectTags(entry.persistent.tags, true)} + {this._inspectTags(entry.transient.tags, false, isPushed)} + {this._inspectMetrics(entry)} + + {this._inspectExpose(entry.expose)} + {this._inspectCallSite(entry)} + { isPushed ? new : null } +
+
+ + {this._inspectArgs(entry)} +
+ { this._inspectRaw(preSpace) } +
); } return ( -
-
- - {this._inspectPre(entry.persistent)} - {this._inspectTags(entry.persistent.tags, true)} - {this._inspectTags(entry.transient.tags)} - {this._inspectMetrics(entry)} - {this._inspectArgs(entry)} - {this._inspectExpose(entry.expose)} - {this._inspectCallSite(entry)} - -
- {this._inspectRaw(preSpace) } +
+
+ + Dispatcher.emit(Dispatcher.Events.REQUEST_SELECT_ENTRY, entry._id, e.target.checked)}/> + {this._inspectPre(entry.persistent)} + {this._inspectTags(entry.persistent.tags, true)} + {this._inspectTags(entry.transient.tags, false, isPushed)} + {this._inspectMetrics(entry)} + {this._inspectArgs(entry)} + {this._inspectExpose(entry.expose)} + {this._inspectCallSite(entry)} + { isPushed ? new : null } +
+ {this._inspectRaw(preSpace) } +
); } } \ No newline at end of file diff --git a/asr/viewer/components/views/Header.jsx b/asr/viewer/components/views/Header.jsx index e59c4b5..86185b8 100644 --- a/asr/viewer/components/views/Header.jsx +++ b/asr/viewer/components/views/Header.jsx @@ -4,6 +4,10 @@ import {ifcat} from '../../libs/utils' import EntryStore from '../../stores/EntryStore' import Dispatcher from '../../dispatchers/Dispatcher' import Spinner from 'react-spinkit' +import _ from 'underscore'; +import moment from 'moment'; +import TimeSeries from './TimeSeries.jsx'; +import DatePicker from 'react-datepicker' import AceEditor from 'react-ace'; import brace from 'brace' @@ -13,22 +17,54 @@ import 'brace/theme/monokai'; export default class Header extends Influx.Component { constructor(...args) { super(...args); - this.state = {search: {}, searchEnabled: false}; + this.state = { + search: { + period: {} + }, + selected: [], + searchEnabled: false, + startDate: moment(), + endDate: moment() + }; + this.search = {}; + this.text = null; + this.expanded = true; + this.isTyping = false; } getListeners() { return [ - [EntryStore, EntryStore.Events.UPDATED, this._onEntryStoreUpdated] + [EntryStore, EntryStore.Events.UPDATED, this._onEntryStoreUpdated], + [EntryStore, EntryStore.Events.UPDATED_SELECTED, this._onEntryStoreUpdatedSelected] ] } _onEntryStoreUpdated() { - const search = {query: EntryStore.getSearchQuery(), options: EntryStore.getSearchOptions()}; - this.setState({search, searchEnabled: true}); + const search = { + query: EntryStore.getSearchQuery(), + options: EntryStore.getSearchOptions(), + period: EntryStore.getSearchPeriod(), + text: EntryStore.getSessionText() + }; + + if (!this.isTyping) { + this.refs.input.value = search.text || ''; + } + + const startDate = moment(search.period.$gt); + const endDate = moment(search.period.$lt).subtract(1, 'days'); + + this.setState({search, searchEnabled: true, startDate, endDate}); this.search = JSON.stringify(search); } + _onEntryStoreUpdatedSelected() { + const selected = EntryStore.getSelected(); + this.setState({selected}); + this.selected = JSON.stringify(selected); + } + _handleChange(key, data) { if (!this.state.searchEnabled) { return; @@ -44,16 +80,148 @@ export default class Header extends Influx.Component { _handleSearch() { try { const {query,options} = this.state.search; - Dispatcher.emit(Dispatcher.Events.REQUEST_ENTRY_SEARCH, query, options, true); + + Dispatcher.emit(Dispatcher.Events.REQUEST_ENTRY_SEARCH, query, options); } catch (e) { console.error(e); } } + _triggerTextSearch() { + try { + const {query, options, period} = this.state.search; + Dispatcher.emit(Dispatcher.Events.REQUEST_ENTRY_SEARCH, query, options, period, this.text); + } catch (e) { + console.error(e); + } + } + + _handleTextSearch(text) { + clearTimeout(this.triggerTid); + this.text = text; + this.isTyping = true; + this.triggerTid = setTimeout(() => this._triggerTextSearch(), 400); + } + + _handleDateChange({ startDate, endDate }) { + startDate = startDate || this.state.startDate; + endDate = endDate || this.state.endDate; + + if (startDate.isAfter(endDate)) { + var temp = startDate; + startDate = endDate; + endDate = temp + } + + // if (moment.duration(endDate.diff(startDate)).asDays() > 5) { + // startDate = moment(endDate).subtract(5, 'days'); + // } + + Dispatcher.emit(Dispatcher.Events.REQUEST_PERIOD, { + $lt: endDate.add(1, 'days').startOf('day').toISOString(), + $gt: startDate.startOf('day').toISOString() + }); + + this.setState({startDate, endDate}) + } + + _handleChangeStartDate(startDate) { + this._handleDateChange({startDate}) + } + + _handleChangeEndDate(endDate) { + this._handleDateChange({endDate}) + } + + componentDidMount() { + super.componentDidMount(); + + this._crushHeader(); + } + + _growHeader() { + if (this.expanded) return; + + this.expanded = true; + + this.refs.root.style.minHeight = '245px'; + this.refs.root.style.maxHeight = '245px'; + + this.refs.inside.style.minHeight = '125px'; + this.refs.inside.style.maxHeight = '125px'; + this.refs.inside.style.height = '125px'; + + this.refs.arrow.classList.remove('rotate-down'); + + clearTimeout(this.tid); + this.tid = setTimeout(() => { + this.refs.query.classList.remove('visibility-hidden'); + this.refs.select.classList.remove('visibility-hidden'); + }, 450); + } + + _crushHeader() { + if (!this.expanded) return; + + this.expanded = false; + + this.refs.query.classList.add('visibility-hidden'); + this.refs.select.classList.add('visibility-hidden'); + this.refs.arrow.classList.add('rotate-down'); + + clearTimeout(this.tid); + this.tid = setTimeout(() => { + this.refs.root.style.minHeight = '170px'; + this.refs.root.style.maxHeight = '170px'; + + this.refs.inside.style.minHeight = '50px'; + this.refs.inside.style.maxHeight = '50px'; + this.refs.inside.style.height = '50px'; + }, 450); + } + + _toggleCrush() { + if (this.expanded) { + this._crushHeader(); + } else { + this._growHeader(); + } + } + render() { + const querystring = EntryStore.getQueryString({_id: {$in: this.state.selected}}, []); + return ( -
-
+
+
+ this._handleTextSearch(e.target.value)}/> + this._toggleCrush()}/> +
+
+
+
+
+
range
+
+
+ this._handleChangeStartDate(a)}/> + to + this._handleChangeEndDate(a)}/> +
+
+
+
+
+
query
@@ -70,7 +238,7 @@ export default class Header extends Influx.Component {
options
@@ -83,7 +251,36 @@ export default class Header extends Influx.Component {
+
+
+
+
SELECT
+
+ +
+
+
+
+ PERMALINK +
+
+
Dispatcher.emit(Dispatcher.Events.REQUEST_SELECT_ALL_ENTRIES)}> + SELECT ALL +
+
+
+
Dispatcher.emit(Dispatcher.Events.REQUEST_SELECT_CLEAR_ENTRIES)}> + CLEAR +
+
+
+ +
); } } \ No newline at end of file diff --git a/asr/viewer/components/views/Sidebar.jsx b/asr/viewer/components/views/Sidebar.jsx index cb34664..c9f0c46 100644 --- a/asr/viewer/components/views/Sidebar.jsx +++ b/asr/viewer/components/views/Sidebar.jsx @@ -11,7 +11,7 @@ export default class Sidebar extends Influx.Component { constructor(...args) { super(...args); - this.state = {date: moment().startOf('day')}; + this.state = {}; } getListeners() { @@ -21,58 +21,49 @@ export default class Sidebar extends Influx.Component { ] } - _onEntryStoreDatabaseReady() { - const exposed = Object.keys(config.exposed); - this._selectExpose(exposed[0], config.exposed[exposed[0]]); + _onEntryStoreDatabaseReady(selected) { + const exposed = Object.keys(config.queries); + if (!selected) { + this._selectExpose(exposed[0], config.queries[exposed[0]]); + } } _onDispatcherRequestEntrySearch(query, sort) { - const {expose} = query; - for (const [k, exposed] of Object.entries(config.exposed)) { - if (_.isEqual(exposed.query.expose, expose)) { - return this.setState({label: exposed.label}); + const _query = JSON.parse(JSON.stringify(query)); + delete _query.serialized; + + for (const [k, exposed] of Object.entries(config.queries)) { + if (_.isEqual(_query, exposed.query)) { + return this.setState({i: k}); } } - this.setState({label: undefined}); + this.setState({i: undefined}); } - _selectExpose(i, expose, date = this.state.date) { + _selectExpose(i, expose) { this.setState({i}); - Dispatcher.emit(Dispatcher.Events.REQUEST_ENTRY_SEARCH, - Object.assign({}, expose.query, {date: this._getRange(date)})); - } - _getRange(date = moment()) { - const today = moment(date).startOf('day'); - const tomorrow = moment(today).add(1, 'days'); - - return {$gte: today.toISOString(), $lt: tomorrow.toISOString()}; - } - - _selectDate(date) { - const query = EntryStore.getSearchQuery(); - this.setState({date}); - Dispatcher.emit(Dispatcher.Events.REQUEST_ENTRY_SEARCH, - Object.assign({}, query, {date: this._getRange(date)})); + Dispatcher.emit(Dispatcher.Events.REQUEST_ENTRY_SEARCH, Object.assign({}, expose.query)); } render() { - - const exposed = _.map(config.exposed, (expose, i)=> { - return
{ + return
{expose.label}
; }); + + exposed.push(
USER-DEFINED
); + return ( -
-
-
Exposed -
- {exposed} -
+
+
+ Scribe.js + {exposed}
+
); } } \ No newline at end of file diff --git a/asr/viewer/components/views/Timeseries.jsx b/asr/viewer/components/views/Timeseries.jsx new file mode 100644 index 0000000..e3e2123 --- /dev/null +++ b/asr/viewer/components/views/Timeseries.jsx @@ -0,0 +1,135 @@ +import React from 'react' +import Influx from 'react-influx' +import {ifcat} from '../../libs/utils' +import EntryStore from '../../stores/EntryStore' +import Dispatcher from '../../dispatchers/Dispatcher' +import Spinner from 'react-spinkit' +import _ from 'underscore'; +import moment from 'moment'; + +const GROWTH = 1; + +export default class TimeSeries extends Influx.Component { + constructor(...args) { + super(...args); + + this.state = {data: [], series: []}; + } + + getListeners() { + return [ + [EntryStore, EntryStore.Events.UPDATED_TIMESERIES, this._onEntryStoreUpdatedTimeSeries], + [Dispatcher, Dispatcher.Events.REQUEST_TIMESERIES_DATE, this._onDispatcherRequestTimeSeriesDate] + ] + } + + _onDispatcherRequestTimeSeriesDate(date) { + date = moment(date); + const {series} = this.state; + + for (var i = 0; i < series.length; i++) { + const data = series[i]; + + // console.log(data.date.toDate(), date.toDate()); + + if (data.date.diff(date) < 0) { + Array.prototype.forEach.call(document.getElementsByClassName('red-selected'), a => a.classList.remove('red-selected')); + this.refs[data.ref].classList.add('red-selected'); + return; + } + } + } + + _onEntryStoreUpdatedTimeSeries() { + const period = EntryStore.getSearchPeriod(); + const aggregations = EntryStore.getSearchTimeSeries(); + const data = _.groupBy(aggregations, a => `${a._id.hour.day}_${a._id.hour.hour}`); + const end = moment(period.$lt); + const series = []; + const exposers = Object.keys(_.indexBy(aggregations, a => a._id.expose)); + + let start = moment(period.$gt); + let max = 0; + + for (var i in data) { + const exposed = {}; + for (var k = 0; k < data[i].length; k++) { + const count = data[i][k].number; + exposed[data[i][k]._id.expose] = count; + + max = Math.max(max, count); + } + + data[i] = exposed; + } + + let count = 0; + const offset = new Date().getTimezoneOffset() * 60 * 1000; + + while (end.diff(start) > 0) { + const startOffset = moment(start.toDate().getTime() + offset); + const day = startOffset.date(); + const hour = startOffset.hour(); + const key = `${day}_${hour}`; + + series.push({date: moment(start), ref: `pos-${count++}`, count: data[key] || {}}); + start = start.add(1, 'hour'); + } + + var crushSeries = []; + var groupSize = parseInt(series.length / 24); + for (var i = 0; i < series.length; i += groupSize) { + const start = series[i]; + for (var k = i + 1; k < i + groupSize; k++) { + const curr = series[k]; + for (var e = 0; e < exposers.length; e++) { + const ee = exposers[e]; + start.count[ee] = start.count[ee] || 0; + start.count[ee] += (curr.count[ee] || 0) + + max = Math.max(start.count[ee], max); + } + } + + crushSeries.push(start); + } + + this.setState({series: crushSeries.reverse(), exposers, max}); + } + + render() { + const maxHeight = 80; + const {series, exposers, max} = this.state; + + const elems = series.map((data, i) => { + const exposed = exposers.map(expose => { + const count = data.count[expose] || 0; + const height = Math.min(count / max * maxHeight * GROWTH, maxHeight); + + return ( +
+ {`${expose}: ${count}`} +
+ ); + }); + + return ( +
+
+ {exposed} +
{data.date.format('M/D hA')}
+
+
+ ); + }); + + return ( +
+ {elems} +
+ ) + } +} \ No newline at end of file diff --git a/asr/viewer/dispatchers/Dispatcher.js b/asr/viewer/dispatchers/Dispatcher.js index 4447a28..2155898 100644 --- a/asr/viewer/dispatchers/Dispatcher.js +++ b/asr/viewer/dispatchers/Dispatcher.js @@ -2,10 +2,16 @@ import Influx from 'react-influx' import keyMirror from 'keymirror' const Events = keyMirror({ - REQUEST_INIT_DATABASE: null, - REQUEST_INIT_SOCKET: null, - REQUEST_ENTRY_SEARCH: null -}); + REQUEST_GROW_SEARCH: null, + REQUEST_INIT_DATABASE: null, + REQUEST_INIT_SOCKET: null, + REQUEST_ENTRY_SEARCH: null, + REQUEST_SELECT_ENTRY: null, + REQUEST_SELECT_ALL_ENTRIES: null, + REQUEST_SELECT_CLEAR_ENTRIES: null, + REQUEST_TIMESERIES_DATE: null, + REQUEST_PERIOD: null + }); class Dispatcher extends Influx.Dispatcher { // override as needed diff --git a/asr/viewer/libs/MongoDB.js b/asr/viewer/libs/MongoDB.js index da7c8a1..00c4a13 100644 --- a/asr/viewer/libs/MongoDB.js +++ b/asr/viewer/libs/MongoDB.js @@ -23,12 +23,18 @@ function JQueryHttpClient(method, url, params, data, success, error) { req.end((err, res) => { if (err) return error(err); - return success(res.body.docs || []); + let docs = []; + try { + docs = JSON.parse(res.text); + } catch (e) { + // ignore + } + return success(docs); }).on('progress', e => console.log('Percentage done: ', e.percent)); } export default class MongoDB { - constructor(url = 'rest/', namespace = 'scribe', client = 'webapp') { + constructor(url = 'rest/db/', namespace = 'scribe', client = 'webapp') { this.url = url; this.namespace = namespace; this.client = client; diff --git a/asr/viewer/stores/EntryStore.js b/asr/viewer/stores/EntryStore.js index c136cd3..c2e8efb 100644 --- a/asr/viewer/stores/EntryStore.js +++ b/asr/viewer/stores/EntryStore.js @@ -2,55 +2,124 @@ import Influx from 'react-influx' import keyMirror from 'keymirror' import Dispatcher from '../dispatchers/Dispatcher' import * as JSON2 from '../../../src/libs/JSON2' +import moment from 'moment'; +import _ from 'underscore'; +import request from 'superagent' +const OVERFLOW = 200; const Events = keyMirror({ - DATABASE_READY: null, - SOCKET_READY: null, - UPDATED: null -}); + DATABASE_READY: null, + SOCKET_READY: null, + UPDATED: null, + UPDATED_SELECTED: null, + UPDATED_TIMESERIES: null + }); class EntryStore extends Influx.Store { constructor(...args) { super(Dispatcher/*, additional dispatchers you have */); - this.data = {entries: [], search: [], history: {}, options: {sort: {date: -1}}}; + this.data = Object.assign( + { + entries: [], selected: {}, + options: {sort: {date: -1}, limit: OVERFLOW}, + period: { + $gt: moment().startOf('day').toISOString(), + $lt: moment().add(1, 'days').startOf('day').toISOString() + } + }, this.fromQueryString(window.location.hash.substr(1))); + + this.setMaxListeners(Number.MAX_SAFE_INTEGER); } getSearchResults() { - return this.data.search; + return this.data.entries; } getDispatcherListeners() { return [ [Dispatcher, Dispatcher.Events.REQUEST_INIT_DATABASE, this._onDispatcherRequestInitDatabase], [Dispatcher, Dispatcher.Events.REQUEST_INIT_SOCKET, this._onDispatcherRequestInitSocket], - [Dispatcher, Dispatcher.Events.REQUEST_ENTRY_SEARCH, this._onDispatcherRequestEntrySearch] + [Dispatcher, Dispatcher.Events.REQUEST_PERIOD, this._onDispatcherRequestPeriod], + [Dispatcher, Dispatcher.Events.REQUEST_SELECT_ENTRY, this._onDispatcherRequestSelectEntry], + [Dispatcher, Dispatcher.Events.REQUEST_SELECT_ALL_ENTRIES, this._onDispatcherRequestSelectAllEntry], + [Dispatcher, Dispatcher.Events.REQUEST_SELECT_CLEAR_ENTRIES, this._onDispatcherRequestClearEntries], + [Dispatcher, Dispatcher.Events.REQUEST_ENTRY_SEARCH, this._onDispatcherRequestEntrySearch], + [Dispatcher, Dispatcher.Events.REQUEST_GROW_SEARCH, this._onDispatcherRequestGrowSearch] ] } _onDispatcherRequestInitDatabase() { - db.Entry.find({}).fetch(()=>this.emit(Events.DATABASE_READY), ()=>this.emit(Events.DATABASE_READY)); + const presearch = Object.keys(this.data.query || {}).length; + this.emit(Events.DATABASE_READY, presearch); + + if (presearch) { + Dispatcher.emit(Dispatcher.Events.REQUEST_ENTRY_SEARCH, this.data.query, this.data.options, this.data.period); + } + } + + _onDispatcherRequestSelectEntry(id, selected) { + if (selected) { + this.data.selected[id] = true; + } else { + delete this.data.selected[id]; + } + + this.emit(Events.UPDATED_SELECTED); + this.emit(Events.UPDATED_SELECTED + id, true); + } + + isSelected(id) { + return !!this.data.selected[id]; + } + + getSelected() { + return Object.keys(this.data.selected); + } + + _onDispatcherRequestSelectAllEntry() { + const plucked = _.pluck(this.data.entries, '_id'); + plucked.forEach(a => this.data.selected[a] = true); + + this.emit(Events.UPDATED_SELECTED); + plucked.forEach(id => this.emit(Events.UPDATED_SELECTED + id, true)); + } + + _onDispatcherRequestClearEntries() { + const keys = Object.keys(this.data.selected); + + this.data.selected = {}; + + this.emit(Events.UPDATED_SELECTED); + keys.forEach(id => this.emit(Events.UPDATED_SELECTED + id, false)); } _onDispatcherRequestInitSocket() { const url = window.location; (config.socketPorts || []).map(port => { this.socket = io(`${url.protocol}//${url.hostname}:${port}`); - this.socket.on('connection', function (socket) { - console.log('sup!!!'); - }); this.socket.on('data', data => { - console.log(data); - db.localDb.Entry.upsert(data, () => { - this.searchEntries(this.data.query, this.getSearchOptions()); - }); + data._pushed = true; + db.localDb.Entry.upsert(data, () => this.refreshSession()); }); }); this.emit(Events.SOCKET_READY); } - _onDispatcherRequestEntrySearch(query, options) { - this.searchEntries(query, options); + _onDispatcherRequestEntrySearch(...args) { + this.startSession(...args); + } + + _onDispatcherRequestGrowSearch() { + this.fetchSession(); + } + + _onDispatcherRequestPeriod(period) { + this.setSessionPeriod(period); + } + + getSearchTimeSeries() { + return this.data.timeseries; } getSearchQuery() { @@ -65,25 +134,124 @@ class EntryStore extends Influx.Store { setTimeout(() => super.emit(...args), 0); } - searchEntries(query = {}, options = this.data.options, remote = false) { - this.data.query = query; - this.data.options = options; + addEntries(entries, pre) { + this.data.entries = pre ? [...entries, ...this.data.entries] : [...this.data.entries, ...entries]; + } - const searchLocal = ()=> { - db.localDb.Entry.find(query, Object.assign({}, options)).fetch(entries => { - this.data.search = entries.map(e => JSON2.parse(JSON.stringify(e))); + fromQueryString(string) { + try { + return JSON.parse(string); + } catch (e) { + return {}; + } + } + + getQueryString(query = this.data.query, select = this.data.select) { + return JSON.stringify({ + query: query, + options: this.data.options, + period: this.data.period, + text: this.data.text, + select: select + }); + } + + getSessionDBQuery(date = this.data.period) { + return Object.assign({}, Object.assign({}, this.data.query, this.data.text ? { + serialized: { + $regex: `.*${this.data.text}.*`, + $options: 'i' + } + } : {}), {date}); + } + + getSessionDBOptionsQuery(options = this.data.options) { + return Object.assign({}, this.data.options, options); + } + + startSession(query = this.data.query, options = this.data.options, period = this.data.period, text = this.data.text) { + this.data.entries = []; + this.data.options = options; + this.data.query = query; + this.data.finished = false; + this.data.timeseries = []; + this.data.period = period; + this.data.text = text; + this.data.session = Date.now(); + + db.Entry.find(this.getSessionDBQuery(), this.getSessionDBOptionsQuery({skip: 0})) + .fetch(entries => { + this.data.entries = entries; this.emit(Events.UPDATED); }); - }; - const dateKey = JSON.stringify(query.date); - remote = remote || !this.data.history[dateKey]; - if (remote) { - this.data.history[dateKey] = true; - db.Entry.find({date: query.date}, Object.assign({}, options)).fetch(searchLocal); - } else { - searchLocal(); + request + .post('rest/timeseries') + .send(this.getSessionDBQuery()) + .end((err, res) => { + this.data.timeseries = res.body || []; + this.emit(Events.UPDATED_TIMESERIES); + }); + + window.location.hash = this.getQueryString(); + } + + getSearchPeriod() { + return this.data.period; + } + + getSessionText() { + return this.data.text || ''; + } + + setSessionText(text) { + this.data.text = text; + + this.startSession(); // restart + } + + setSessionPeriod(period) { + this.data.period = period; + + this.startSession(); // restart + } + + getSessionId() { + return this.data.session; + } + + refreshSession() { + db.localDb.Entry + .find(this.getSessionDBQuery(), this.getSessionDBOptionsQuery({limit: null, skip: 0})) + .fetch(entries => { + this.data.entries = entries; + this.emit(Events.UPDATED); + }); + } + + fetchSession(up) { + const {options, entries, query} = this.data; + const entry = entries[entries.length - 1]; + + if (entry) { + const periodCpy = JSON.parse(JSON.stringify(this.data.period)); + if (up) { + delete periodCpy.$gte; + delete periodCpy.$gt; + periodCpy.$gte = entry.date; + } else { + delete periodCpy.$lte; + delete periodCpy.$lt; + periodCpy.$lte = entry.date; + } + + db + .Entry + .find(this.getSessionDBQuery(periodCpy), this.getSessionDBOptionsQuery()) + .fetch(() => { + this.refreshSession(); + }); } } } diff --git a/deps.json b/deps.json index 5582797..85d5eb0 100644 --- a/deps.json +++ b/deps.json @@ -1,4 +1,14 @@ [ + { + "department": "kessler", + "relatedTo": "stuff", + "name": "JSONStream", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "(MIT OR Apache-2.0)", + "link": "git://github.com/dominictarr/JSONStream.git", + "comment": "1.1.1" + }, { "department": "kessler", "relatedTo": "stuff", @@ -9,6 +19,116 @@ "link": "git+https://github.com/caolan/async.git", "comment": "1.5.2" }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "babel-plugin-syntax-async-functions", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-async-functions", + "comment": "6.5.0" + }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "babel-plugin-syntax-class-properties", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "https://github.com/babel/babel/tree/master/packages/babel-plugin-syntax-class-properties", + "comment": "6.5.0" + }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "babel-plugin-transform-async-functions", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-async-functions", + "comment": "6.5.0" + }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "babel-plugin-transform-async-to-module-method", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-async-to-module-method", + "comment": "6.7.0" + }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "babel-plugin-transform-class-properties", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-class-properties", + "comment": "6.5.0" + }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "babel-plugin-transform-export-default-name", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "BSD-3-Clause", + "link": "git+https://github.com/gajus/babel-plugin-transform-export-default-name.git", + "comment": "1.0.4" + }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "babel-plugin-transform-object-rest-spread", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-object-rest-spread", + "comment": "6.5.0" + }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "babel-plugin-transform-runtime", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-runtime", + "comment": "6.5.2" + }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "babel-preset-es2015", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "https://github.com/babel/babel/tree/master/packages/babel-preset-es2015", + "comment": "6.5.0" + }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "babel-preset-react", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "https://github.com/babel/babel/tree/master/packages/babel-preset-react", + "comment": "6.5.0" + }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "babel-register", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "https://github.com/babel/babel/tree/master/packages/babel-register", + "comment": "6.5.2" + }, { "department": "kessler", "relatedTo": "stuff", @@ -29,6 +149,26 @@ "link": "https://github.com/jshttp/basic-auth", "comment": "1.0.3" }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "basic-auth-connect", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "https://github.com/expressjs/basic-auth-connect.git", + "comment": "1.0.0" + }, + { + "department": "kessler", + "relatedTo": "stuff", + "name": "bluebird", + "licensePeriod": "perpetual", + "material": "material", + "licenseType": "MIT", + "link": "git://github.com/petkaantonov/bluebird.git", + "comment": "3.3.4" + }, { "department": "kessler", "relatedTo": "stuff", @@ -216,7 +356,7 @@ "material": "material", "licenseType": "MIT", "link": "git://github.com/Hacker0x01/react-datepicker.git", - "comment": "0.18.0" + "comment": "0.25.0" }, { "department": "kessler", @@ -236,7 +376,7 @@ "material": "material", "licenseType": "ISC", "link": "git+https://github.com/bluejamesbond/Influx.js.git", - "comment": "1.0.8" + "comment": "1.1.5" }, { "department": "kessler", diff --git a/dist/libs/JSON2.js b/dist/libs/JSON2.js index 8ae3e8d..7200c92 100644 --- a/dist/libs/JSON2.js +++ b/dist/libs/JSON2.js @@ -4,10 +4,18 @@ Object.defineProperty(exports, "__esModule", { value: true }); +var _keys = require('babel-runtime/core-js/object/keys'); + +var _keys2 = _interopRequireDefault(_keys); + var _stringify = require('babel-runtime/core-js/json/stringify'); var _stringify2 = _interopRequireDefault(_stringify); +var _typeof2 = require('babel-runtime/helpers/typeof'); + +var _typeof3 = _interopRequireDefault(_typeof2); + var _promise = require('babel-runtime/core-js/promise'); var _promise2 = _interopRequireDefault(_promise); @@ -19,7 +27,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de function parse(str, reviver) { return JSON.parse(str, function (k, v) { - var rv = undefined; + var rv = void 0; if (typeof v === 'string') { if (/^Promise \{(.*?)}$/g.test(v)) { return new _promise2.default(function (r, e) { @@ -27,7 +35,7 @@ function parse(str, reviver) { }); } else if (/^function ([a-zA-Z0-9_\$]*?)\((.*?)\)\s?\{(.*?)}$/g.test(rv = v.replace(/\n/g, ''))) { try { - var x = undefined; + var x = void 0; eval('x = ' + v); if (x) { return x; @@ -50,8 +58,77 @@ function parse(str, reviver) { }); } +var stringifyOnce = function stringifyOnce(obj, replacer, indent) { + var printedObjects = []; + var printedObjectKeys = []; + + function printOnceReplacer(key, value) { + if (printedObjects.length > 2000) { + // browsers will not print more than 20K, I don't see the point to allow 2K.. algorithm will not be fast anyway if we have too many objects + return 'object too long'; + } + var printedObjIndex = false; + printedObjects.forEach(function (obj, index) { + if (obj === value) { + printedObjIndex = index; + } + }); + + if (key == '') { + //root element + printedObjects.push(obj); + printedObjectKeys.push("root"); + return value; + } else if (printedObjIndex + "" != "false" && (typeof value === 'undefined' ? 'undefined' : (0, _typeof3.default)(value)) == "object") { + if (printedObjectKeys[printedObjIndex] == "root") { + return "(pointer to root)"; + } else { + return "(see " + (!!value && !!value.constructor ? value.constructor.name.toLowerCase() : typeof value === 'undefined' ? 'undefined' : (0, _typeof3.default)(value)) + " with key " + printedObjectKeys[printedObjIndex] + ")"; + } + } else { + + var qualifiedKey = key || "(empty key)"; + printedObjects.push(value); + printedObjectKeys.push(qualifiedKey); + if (replacer) { + return replacer(key, value); + } else { + return value; + } + } + } + + return (0, _stringify2.default)(obj, printOnceReplacer, indent); +}; + +// http://www.z-car.com/blog/programming/how-to-escape-mongo-keys-using-node-js-in-a-flash +function escapeKeys(obj) { + if (!(Boolean(obj) && (typeof obj === 'undefined' ? 'undefined' : (0, _typeof3.default)(obj)) == 'object' && (0, _keys2.default)(obj).length > 0)) { + return false; + } + + (0, _keys2.default)(obj).forEach(function (key) { + if ((0, _typeof3.default)(obj[key]) == 'object') { + escapeKeys(obj[key]); + } else { + if (key.indexOf('.') !== -1) { + var newkey = key.replace(/\./g, '_dot_'); + obj[newkey] = obj[key]; + delete obj[key]; + } + if (key.indexOf('$') !== -1) { + var newkey = key.replace(/\$/g, '_amp_'); + obj[newkey] = obj[key]; + delete obj[key]; + } + } + }); + + return true; +} + function stringify(obj, replacer, spaces) { - return (0, _stringify2.default)(obj, function (k, v) { + var objStr = stringifyOnce(obj, function (k, v) { if (typeof v !== 'undefined' && v !== null) { if (typeof v.then === 'function') { return 'Promise { }'; @@ -64,4 +141,10 @@ function stringify(obj, replacer, spaces) { return v; }, spaces); + + var objCpy = JSON.parse(objStr); + + escapeKeys(objCpy); + + return (0, _stringify2.default)(objCpy); } diff --git a/dist/libs/MultiValueMap.js b/dist/libs/MultiValueMap.js index 1dd3ed6..8dc3dc2 100644 --- a/dist/libs/MultiValueMap.js +++ b/dist/libs/MultiValueMap.js @@ -18,14 +18,14 @@ var _createClass3 = _interopRequireDefault(_createClass2); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var _class = function () { - function _class() { - (0, _classCallCheck3.default)(this, _class); +var multiValueMap = function () { + function multiValueMap() { + (0, _classCallCheck3.default)(this, multiValueMap); this._map = new _map2.default(); } - (0, _createClass3.default)(_class, [{ + (0, _createClass3.default)(multiValueMap, [{ key: "get", value: function get(key) { if (!this._map.has(key)) { @@ -64,7 +64,7 @@ var _class = function () { this._map.remove(old); } }]); - return _class; + return multiValueMap; }(); -exports.default = _class; +exports.default = multiValueMap; diff --git a/dist/libs/time.js b/dist/libs/time.js new file mode 100644 index 0000000..d37efcc --- /dev/null +++ b/dist/libs/time.js @@ -0,0 +1,14 @@ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.default = time; +function time() { + if (typeof process !== 'undefined' && typeof process.hrtime === 'function') { + var duration = process.hrtime(); + return duration[0] * 1000 + duration[1] / 1e6; + } + + return Date.now(); +} diff --git a/dist/middleware/ExpressLogger.js b/dist/middleware/ExpressLogger.js new file mode 100644 index 0000000..3def1ab --- /dev/null +++ b/dist/middleware/ExpressLogger.js @@ -0,0 +1,85 @@ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _getIterator2 = require('babel-runtime/core-js/get-iterator'); + +var _getIterator3 = _interopRequireDefault(_getIterator2); + +var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck'); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _createClass2 = require('babel-runtime/helpers/createClass'); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _onFinished = require('on-finished'); + +var _onFinished2 = _interopRequireDefault(_onFinished); + +var _time = require('../libs/time'); + +var _time2 = _interopRequireDefault(_time); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var ExpressLogger = function () { + function ExpressLogger(scribe) { + (0, _classCallCheck3.default)(this, ExpressLogger); + + this.options = scribe.module('middleware/ExpressLogger').options; + this.scribe = scribe; + } + + (0, _createClass3.default)(ExpressLogger, [{ + key: 'getMiddleware', + value: function getMiddleware() { + var scribe = this.scribe; + var options = this.options; + + + return function (req, res, next) { + var start = (0, _time2.default)(); + (0, _onFinished2.default)(res, function () { + var originalUrl = req.originalUrl; + var _iteratorNormalCompletion = true; + var _didIteratorError = false; + var _iteratorError = undefined; + + try { + for (var _iterator = (0, _getIterator3.default)(options.ignore), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + var k = _step.value; + + if (new RegExp(k).test(originalUrl)) { + return; + } + } + } catch (err) { + _didIteratorError = true; + _iteratorError = err; + } finally { + try { + if (!_iteratorNormalCompletion && _iterator.return) { + _iterator.return(); + } + } finally { + if (_didIteratorError) { + throw _iteratorError; + } + } + } + + scribe[options.expose]({ req: req, res: res, duration: (0, _time2.default)() - start }); + }); + + next(); + }; + } + }]); + return ExpressLogger; +}(); + +exports.default = ExpressLogger; diff --git a/dist/middleware/index.js b/dist/middleware/index.js new file mode 100644 index 0000000..05a4a0f --- /dev/null +++ b/dist/middleware/index.js @@ -0,0 +1,16 @@ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _ExpressLogger = require('./ExpressLogger'); + +Object.defineProperty(exports, 'ExpressLogger', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_ExpressLogger).default; + } +}); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } diff --git a/dist/readers/BasicConsole.js b/dist/reader/BasicConsole.js similarity index 50% rename from dist/readers/BasicConsole.js rename to dist/reader/BasicConsole.js index 4d0a1ea..a1790e0 100644 --- a/dist/readers/BasicConsole.js +++ b/dist/reader/BasicConsole.js @@ -8,10 +8,6 @@ var _assign = require('babel-runtime/core-js/object/assign'); var _assign2 = _interopRequireDefault(_assign); -var _getIterator2 = require('babel-runtime/core-js/get-iterator'); - -var _getIterator3 = _interopRequireDefault(_getIterator2); - var _map = require('babel-runtime/core-js/map'); var _map2 = _interopRequireDefault(_map); @@ -44,28 +40,19 @@ var _callsite = require('callsite'); var _callsite2 = _interopRequireDefault(_callsite); -var _onFinished = require('on-finished'); +var _time2 = require('../libs/time'); -var _onFinished2 = _interopRequireDefault(_onFinished); +var _time3 = _interopRequireDefault(_time2); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -function _time() { - if (typeof process !== 'undefined' && typeof process.hrtime === 'function') { - var duration = process.hrtime(); - return duration[0] * 1000 + duration[1] / 1e6; - } +var basicConsole = function (_Console) { + (0, _inherits3.default)(basicConsole, _Console); - return Date.now(); -} + function basicConsole(app, id) { + (0, _classCallCheck3.default)(this, basicConsole); -var _class = function (_Console) { - (0, _inherits3.default)(_class, _Console); - - function _class(app, id) { - (0, _classCallCheck3.default)(this, _class); - - var _this = (0, _possibleConstructorReturn3.default)(this, (0, _getPrototypeOf2.default)(_class).call(this, app, id)); + var _this = (0, _possibleConstructorReturn3.default)(this, (0, _getPrototypeOf2.default)(basicConsole).call(this, app, id)); _this._times = new _map2.default(); @@ -80,7 +67,7 @@ var _class = function (_Console) { return _this; } - (0, _createClass3.default)(_class, [{ + (0, _createClass3.default)(basicConsole, [{ key: 'date', value: function date() { this.transient('date', new Date()); @@ -88,56 +75,10 @@ var _class = function (_Console) { }, { key: 'time', value: function time(label) { - this._times.set(label, _time()); + this._times.set(label, (0, _time3.default)()); return this; } - }, { - key: 'middleware', - value: function middleware() { - var _this2 = this; - - var expose = arguments.length <= 0 || arguments[0] === undefined ? 'express' : arguments[0]; - var ignore = arguments.length <= 1 || arguments[1] === undefined ? [/(scribe)/g] : arguments[1]; - - this.expose(expose); - - ignore = Array.isArray(ignore) ? ignore : [ignore]; - - return function (req, res, next) { - var start = _time(); - (0, _onFinished2.default)(res, function () { - var originalUrl = req.originalUrl; - var _iteratorNormalCompletion = true; - var _didIteratorError = false; - var _iteratorError = undefined; - - try { - for (var _iterator = (0, _getIterator3.default)(ignore), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { - var k = _step.value; - - if (new RegExp(k).test(originalUrl)) return; - } - } catch (err) { - _didIteratorError = true; - _iteratorError = err; - } finally { - try { - if (!_iteratorNormalCompletion && _iterator.return) { - _iterator.return(); - } - } finally { - if (_didIteratorError) { - throw _iteratorError; - } - } - } - - _this2[expose]({ req: req, res: res, duration: _time() - start }); - }); - next(); - }; - } }, { key: 'tag', value: function tag() { @@ -153,8 +94,13 @@ var _class = function (_Console) { key: 'metric', value: function metric() { var map = {}; - for (var i = 1; i < arguments.length; i += 2) { - map[arguments.length <= i - 1 + 0 ? undefined : arguments[i - 1 + 0]] = arguments.length <= i + 0 ? undefined : arguments[i + 0]; + + for (var _len2 = arguments.length, metrics = Array(_len2), _key2 = 0; _key2 < _len2; _key2++) { + metrics[_key2] = arguments[_key2]; + } + + for (var i = 1; i < metrics.length; i += 2) { + map[metrics[i - 1]] = metrics[i]; } this.transient('metrics', (0, _assign2.default)(this.transient('metrics') || {}, map)); @@ -164,7 +110,7 @@ var _class = function (_Console) { }, { key: 'trace', value: function trace(text) { - this.transient('callsite', this.callSite(4)); + this.transient('callsite', this.callSite(2)); return this.out('trace', new Error(text)); } }, { @@ -175,16 +121,16 @@ var _class = function (_Console) { throw new Error('No such label: ' + label); } + this.captureStackTrace(); + this._times.delete(label); - this.transient('callsite', this.callSite(5)); - - var duration = _time() - start; + var duration = (0, _time3.default)() - start; return this.metric(label, duration).timing(''); } }]); - return _class; + return basicConsole; }(_Console3.default); -exports.default = _class; +exports.default = basicConsole; diff --git a/dist/readers/Console.js b/dist/reader/Console.js similarity index 74% rename from dist/readers/Console.js rename to dist/reader/Console.js index 8dbefc0..8749f47 100644 --- a/dist/readers/Console.js +++ b/dist/reader/Console.js @@ -12,6 +12,10 @@ var _promise = require('babel-runtime/core-js/promise'); var _promise2 = _interopRequireDefault(_promise); +var _typeof2 = require('babel-runtime/helpers/typeof'); + +var _typeof3 = _interopRequireDefault(_typeof2); + var _keys = require('babel-runtime/core-js/object/keys'); var _keys2 = _interopRequireDefault(_keys); @@ -34,22 +38,44 @@ var _async2 = _interopRequireDefault(_async); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var _class = function () { - function _class() { - var app = arguments.length <= 0 || arguments[0] === undefined ? 'Scribe' : arguments[0]; - var id = arguments.length <= 1 || arguments[1] === undefined ? process.pid : arguments[1]; +var console = function () { + function _class(config) { (0, _classCallCheck3.default)(this, _class); this._transient = {}; this._persistent = {}; this._pipelines = {}; this._exposed = {}; + this._config = config; - this.persistent('app', app); - this.persistent('id', id); + this.persistent('app', this._config.app); + this.persistent('id', this._config.id); } (0, _createClass3.default)(_class, [{ + key: 'module', + value: function module(namespace) { + var _this = this; + + if (namespace) { + var _ret = function () { + var options = _this._config.module[namespace] || {}; + + options.isSet = function () { + return (0, _keys2.default)(options).length; + }; + + return { + v: { options: options } + }; + }(); + + if ((typeof _ret === 'undefined' ? 'undefined' : (0, _typeof3.default)(_ret)) === "object") return _ret.v; + } + + return this._config; + } + }, { key: 'transient', value: function transient(key, value) { if (arguments.length === 1) { @@ -71,13 +97,26 @@ var _class = function () { } }, { key: 'exposed', - value: function exposed() { + value: function exposed(expose) { + if (expose) { + return !!this._exposed[expose]; + } + return (0, _keys2.default)(this._exposed); } + }, { + key: 'captureStackTrace', + value: function captureStackTrace() { + var idx = arguments.length <= 0 || arguments[0] === undefined ? 3 : arguments[0]; + + if (!this.transient('callsite')) { + return this.transient('callsite', this.callSite(idx)); + } + } }, { key: 'callSite', value: function callSite() { - var idx = arguments.length <= 0 || arguments[0] === undefined ? 5 : arguments[0]; + var idx = arguments.length <= 0 || arguments[0] === undefined ? 3 : arguments[0]; try { var site = (0, _callsite2.default)()[idx]; @@ -85,7 +124,7 @@ var _class = function () { return { line: site.getLineNumber(), file: site.getFileName(), - func: site.getFunctionName() + func: site.getFunctionName() || 'anonymous' }; return site; @@ -101,22 +140,24 @@ var _class = function () { }, { key: 'out', value: function out(expose) { - var _this = this; + var _this2 = this; for (var _len = arguments.length, args = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) { args[_key - 1] = arguments[_key]; } + this.captureStackTrace(); + return new _promise2.default(function (resolve, reject) { - if (!_this._pipelines[expose]) { + if (!_this2._pipelines[expose]) { return resolve(); } - _this.preout(); + _this2.preout(); - var pipelines = _this._pipelines[expose]; - var transient = _this._transient; - var persistent = _this._persistent; + var pipelines = _this2._pipelines[expose]; + var transient = _this2._transient; + var persistent = _this2._persistent; var errs = []; var now = new Date(); @@ -125,7 +166,7 @@ var _class = function () { } if (!transient.callsite) { - transient.callsite = _this.callSite(); + transient.callsite = _this2.callSite(); } if (!args.length) { @@ -133,7 +174,7 @@ var _class = function () { } // reset before async - _this.reset(); + _this2.reset(); _async2.default.forEachOfSeries(pipelines, function (pipeline, name, callback) { var input = { @@ -223,4 +264,4 @@ var _class = function () { return _class; }(); -exports.default = _class; +exports.default = console; diff --git a/dist/reader/index.js b/dist/reader/index.js new file mode 100644 index 0000000..3104c71 --- /dev/null +++ b/dist/reader/index.js @@ -0,0 +1,25 @@ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _BasicConsole = require('./BasicConsole'); + +Object.defineProperty(exports, 'BasicConsole', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_BasicConsole).default; + } +}); + +var _Console = require('./Console'); + +Object.defineProperty(exports, 'Console', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_Console).default; + } +}); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } diff --git a/dist/router/index.js b/dist/router/index.js new file mode 100644 index 0000000..9757bca --- /dev/null +++ b/dist/router/index.js @@ -0,0 +1,16 @@ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _Viewer = require('./Viewer'); + +Object.defineProperty(exports, 'Viewer', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_Viewer).default; + } +}); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } diff --git a/dist/router/viewer.js b/dist/router/viewer.js new file mode 100644 index 0000000..d0423db --- /dev/null +++ b/dist/router/viewer.js @@ -0,0 +1,252 @@ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray'); + +var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); + +var _maxSafeInteger = require('babel-runtime/core-js/number/max-safe-integer'); + +var _maxSafeInteger2 = _interopRequireDefault(_maxSafeInteger); + +var _stringify = require('babel-runtime/core-js/json/stringify'); + +var _stringify2 = _interopRequireDefault(_stringify); + +var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck'); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _createClass2 = require('babel-runtime/helpers/createClass'); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _typeof2 = require('babel-runtime/helpers/typeof'); + +var _typeof3 = _interopRequireDefault(_typeof2); + +var _express = require('express'); + +var _express2 = _interopRequireDefault(_express); + +var _mongoose = require('mongoose'); + +var _mongoose2 = _interopRequireDefault(_mongoose); + +var _jade = require('jade'); + +var _jade2 = _interopRequireDefault(_jade); + +var _basicAuthConnect = require('basic-auth-connect'); + +var _basicAuthConnect2 = _interopRequireDefault(_basicAuthConnect); + +var _bodyParser = require('body-parser'); + +var _bodyParser2 = _interopRequireDefault(_bodyParser); + +var _JSONStream = require('JSONStream'); + +var _JSONStream2 = _interopRequireDefault(_JSONStream); + +var _nwBuilder = require('nw-builder'); + +var _nwBuilder2 = _interopRequireDefault(_nwBuilder); + +var _package = require('../../native/package.json'); + +var _package2 = _interopRequireDefault(_package); + +var _url = require('url'); + +var _MongoDB = require('../writer/MongoDB'); + +var _extend = require('extend'); + +var _extend2 = _interopRequireDefault(_extend); + +var _fs = require('fs'); + +var _fs2 = _interopRequireDefault(_fs); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +function getObject(d, def) { + if (typeof d === 'undefined' || d === null) { + return def || {}; + } else if ((typeof d === 'undefined' ? 'undefined' : (0, _typeof3.default)(d)) === 'object') { + return d; + } else { + try { + return JSON.parse(d); + } catch (e) { + return def || {}; + } + } +} + +var viewer = _jade2.default.compileFile(__dirname + '/../../views/viewer.jade'); +var login = _jade2.default.compileFile(__dirname + '/../../views/login.jade'); + +var Viewer = function () { + function Viewer(scribe) { + (0, _classCallCheck3.default)(this, Viewer); + + this.scribe = scribe; + } + + (0, _createClass3.default)(Viewer, [{ + key: 'getRouter', + value: function getRouter() { + var scribe = this.scribe; + var routerOptions = scribe.module('router/Viewer').options; + var clientOptions = scribe.module('router/Viewer/client').options; + + var conn = void 0, + Entry = void 0; + + _mongoose2.default.set('debug', routerOptions.debug); + conn = _mongoose2.default.createConnection(routerOptions.mongoUri); + Entry = conn.model('Entry', _MongoDB.EntrySchema); + + var router = new _express.Router(); + + if (routerOptions.username && routerOptions.password) { + router.use((0, _basicAuthConnect2.default)(routerOptions.username, routerOptions.password)); + } + + router.use(_express2.default.static(__dirname + '/../../public')); + + if (routerOptions.useBodyParser) { + router.use(_bodyParser2.default.json()); + } + + var render = function render(req, res) { + return res.send(viewer({ config: (0, _stringify2.default)(clientOptions) })); + }; + + router.get('/', render); + router.get('/viewer', render); + + router.post('/rest/timeseries', function (req, res) { + try { + if (req.body && req.body.date) { + req.body.date = req.body.date || {}; + + if (req.body.date.$gt) req.body.date.$gt = new Date(req.body.date.$gt); + if (req.body.date.$gte) req.body.date.$gte = new Date(req.body.date.$gte); + if (req.body.date.$eq) req.body.date.$eq = new Date(req.body.date.$eq); + if (req.body.date.$lt) req.body.date.$lt = new Date(req.body.date.$lt); + if (req.body.date.$lte) req.body.date.$lte = new Date(req.body.date.$lte); + if (req.body._id && Array.isArray(req.body._id.$in)) req.body._id.$in = req.body._id.$in.map(function (a) { + return _mongoose2.default.Types.ObjectId(a); + }); + if (req.body._id && typeof req.body._id === 'string') req.body._id = _mongoose2.default.Types.ObjectId(req.body._id); + } + } catch (e) { + // ignore + } + + Entry.aggregate([{ $match: req.body }, { + $project: { + hour: { + year: { $year: '$date' }, + month: { $month: '$date' }, + day: { $dayOfMonth: '$date' }, + hour: { $hour: '$date' } + }, + expose: '$expose' + } + }, { + $group: { + _id: { hour: '$hour', expose: '$expose' }, + number: { $sum: 1 } + } + }], function (err, out) { + return res.json(out || []); + }); + }); + + router.get('/rest/db/:collection', function (req, res) { + var _Entry$find; + + if (!routerOptions.mongoUri) { + return res.json({ err: 0, docs: [] }); + } + + var selector = getObject(req.query.selector); + var fields = typeof req.query.fields === 'string' ? req.query.fields : ''; + var sort = getObject(req.query.sort, { _id: -1 }); + var limit = !isNaN(req.query.limit) ? Math.max(0, parseInt(req.query.limit)) : _maxSafeInteger2.default; + var skip = !isNaN(req.query.skip) ? Math.max(0, parseInt(req.query.skip)) : 0; + + res.type('application/json'); + + var stream = (_Entry$find = Entry.find(selector)).select.apply(_Entry$find, (0, _toConsumableArray3.default)(fields.split(' '))).skip(skip).limit(limit).sort(sort).stream(); + + stream.pipe(_JSONStream2.default.stringify()).pipe(res); + }); + + router.delete('/rest/db/:collection', function (req, res) { + if (!routerOptions.mongoUri) { + res.status(410); + return res.send(); + } + + var ids = req.query.id; + + try { + ids = JSON.parse(ids); + } catch (e) { + // ignore + } + + if (!Array.isArray(ids)) { + ids = [req.param('id')]; + } + + Entry.remove({ _id: { $in: ids } }, function (err) { + res.status(err ? 410 : 200); + res.send(); + }); + }); + + if (routerOptions.native) {} + + return router; + } + }, { + key: 'getNative', + value: function getNative() { + var scribe = this.scribe; + var nativeOptions = scribe.module('router/Viewer/native').options; + + // update + _package2.default.main = (0, _url.format)(nativeOptions); + + // save + _fs2.default.writeFileSync(__dirname + '/../../native/package.json', (0, _stringify2.default)(_package2.default, null, 4), { encoding: 'utf8' }); + + var nw = new _nwBuilder2.default((0, _extend2.default)(true, { + platforms: ['win', 'osx', 'linux'], + buildDir: __dirname + '/../../public/native', + version: '0.12.3', + zip: true + }, nativeOptions, { files: __dirname + '/../../native/**/**' })); + + if (nativeOptions.debug) { + nw.on('log', function (d) { + return console.log(d); + }); + } + + return nw.build(); + } + }]); + return Viewer; +}(); + +exports.default = Viewer; diff --git a/dist/routers/viewer.js b/dist/routers/viewer.js deleted file mode 100644 index 9d4518f..0000000 --- a/dist/routers/viewer.js +++ /dev/null @@ -1,184 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _maxSafeInteger = require('babel-runtime/core-js/number/max-safe-integer'); - -var _maxSafeInteger2 = _interopRequireDefault(_maxSafeInteger); - -var _stringify = require('babel-runtime/core-js/json/stringify'); - -var _stringify2 = _interopRequireDefault(_stringify); - -var _assign = require('babel-runtime/core-js/object/assign'); - -var _assign2 = _interopRequireDefault(_assign); - -var _typeof2 = require('babel-runtime/helpers/typeof'); - -var _typeof3 = _interopRequireDefault(_typeof2); - -exports.create = create; - -var _express = require('express'); - -var _express2 = _interopRequireDefault(_express); - -var _mongoose = require('mongoose'); - -var _mongoose2 = _interopRequireDefault(_mongoose); - -var _entry = require('../schemas/entry'); - -var _entry2 = _interopRequireDefault(_entry); - -var _jade = require('jade'); - -var _jade2 = _interopRequireDefault(_jade); - -var _basicAuth = require('basic-auth'); - -var _basicAuth2 = _interopRequireDefault(_basicAuth); - -var _bodyParser = require('body-parser'); - -var _bodyParser2 = _interopRequireDefault(_bodyParser); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -function getObject(d, def) { - if (typeof d === 'undefined' || d === null) { - return def || {}; - } else if ((typeof d === 'undefined' ? 'undefined' : (0, _typeof3.default)(d)) === 'object') { - return d; - } else { - try { - return JSON.parse(d); - } catch (e) { - return def || {}; - } - } -} - -var viewer = _jade2.default.compileFile(__dirname + '/../../views/viewer.jade'); -var login = _jade2.default.compileFile(__dirname + '/../../views/login.jade'); - -function create() { - var mongoUri = arguments.length <= 0 || arguments[0] === undefined ? 'mongodb://localhost/scribe' : arguments[0]; - var routerConfig = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; - var clientConfig = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2]; - var debug = arguments.length <= 3 || arguments[3] === undefined ? false : arguments[3]; - - routerConfig = (0, _assign2.default)({ - useBodyParser: true, - username: 'build', - password: 'build' - }, routerConfig); - - var conn = undefined, - Entry = undefined; - - if (mongoUri) { - _mongoose2.default.set('debug', debug); - conn = _mongoose2.default.createConnection(mongoUri); - Entry = conn.model('Entry', _entry2.default); - } - - var router = new _express.Router(); - - var authenticate = function authenticate(req, res, next) { - function unauthorized(res) { - res.set('WWW-Authenticate', 'Basic realm=Authorization Required'); - return res.sendStatus(401); - } - - if (routerConfig.authentication === false || !routerConfig.username && !routerConfig.password) { - return next(); - } - - var user = (0, _basicAuth2.default)(req); - - if (!user || !user.name || !user.pass) { - return unauthorized(res); - } - - if (user.name === routerConfig.username && user.pass === routerConfig.password) { - return next(); - } else { - return unauthorized(res); - } - }; - - router.use(authenticate); - router.use(_express2.default.static(__dirname + '/../../public')); - - if (routerConfig.useBodyParser) { - router.use(_bodyParser2.default.json()); - } - - var renderViewer = function renderViewer(req, res) { - return res.send(viewer({ config: (0, _stringify2.default)(clientConfig) })); - }; - - router.get('/', renderViewer); - router.get('/viewer', renderViewer); - - router.get('/rest/:collection', function (req, res) { - if (!mongoUri) { - return res.json({ err: 0, docs: [] }); - } - - var collection = req.params.collection; - var selector = getObject(req.query.selector); - var fields = typeof req.query.fields === 'string' ? req.query.fields : ''; - var sort = getObject(req.query.sort, { _id: -1 }); - var limit = !isNaN(req.query.limit) ? Math.max(0, parseInt(Number(req.query.limit))) : _maxSafeInteger2.default; - var col = Entry; // defaulting to Entry for now - - if (!col) { - return res.json({ err: 1, docs: [] }); - } - - col.find(selector).select(fields).sort(sort).limit(limit).lean().exec(function () { - var err = arguments.length <= 0 || arguments[0] === undefined ? 0 : arguments[0]; - var docs = arguments.length <= 1 || arguments[1] === undefined ? [] : arguments[1]; - return res.json({ err: err, docs: docs }); - }); - }); - - router.delete('/rest/:collection', function (req, res) { - if (!mongoUri) { - res.status(410); - return res.send(); - } - - var collection = rreq.params.collection; - var ids = req.query.id; - - try { - ids = JSON.parse(ids); - } catch (e) { - // ignore - } - - if (!Array.isArray(ids)) { - ids = [req.param('id')]; - } - - var col = Entry; // defaulting to Entry for now - - if (col) { - return col.remove({ _id: { $in: ids } }, function (err) { - res.status(err ? 410 : 200); - res.send(); - }); - } - - res.status(410); - res.send(); - }); - - return router; -} diff --git a/dist/schemas/entry.js b/dist/schemas/entry.js deleted file mode 100644 index e243e76..0000000 --- a/dist/schemas/entry.js +++ /dev/null @@ -1,20 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _mongoose = require('mongoose'); - -var EntrySchema = new _mongoose.Schema({ - transient: _mongoose.Schema.Types.Object, - persistent: _mongoose.Schema.Types.Object, - args: _mongoose.Schema.Types.Object, - date: { type: Date, default: Date.now }, - expose: String, - serialized: String // experimental -}); - -EntrySchema.index({ 'persistent.app': 1, 'persistent.id': -1 }); - -exports.default = EntrySchema; diff --git a/dist/scribe.js b/dist/scribe.js index 7bcec4e..018e67f 100644 --- a/dist/scribe.js +++ b/dist/scribe.js @@ -3,90 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.Transform = exports.Reader = exports.Writer = undefined; +exports.Writer = exports.Transform = exports.Router = exports.Reader = exports.Middleware = undefined; -var _stringify = require('babel-runtime/core-js/json/stringify'); +var _keys = require('babel-runtime/core-js/object/keys'); -var _stringify2 = _interopRequireDefault(_stringify); +var _keys2 = _interopRequireDefault(_keys); -exports.default = function () { - var id = arguments.length <= 0 || arguments[0] === undefined ? process.pid : arguments[0]; - var opts = arguments.length <= 1 || arguments[1] === undefined ? (0, _rc2.default)('scribe', defaultOpts) : arguments[1]; +var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray'); - opts = (0, _extend2.default)(true, {}, defaultOpts, opts); +var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); - var console = new _BasicConsole2.default(opts.name, id || opts.instanceId); +var _typeof2 = require('babel-runtime/helpers/typeof'); - function appendTransforms(args) { - if (opts.mongo && opts.mongoUri && opts.socket && opts.socketPort) { - args.push(new _JSON2Converter2.default()); - args.push(new _MongoDB2.default(opts.mongoUri, opts.debug)); - args.push(new _SocketIO2.default(opts.socketPort, opts.debug)); - } else if (opts.mongo && opts.mongoUri) { - args.push(new _JSON2Converter2.default()); - args.push(new _MongoDB2.default(opts.mongoUri, opts.debug)); - } else if (opts.socket && opts.socketPort) { - args.push(new _JSON2Converter2.default()); - args.push(new _SocketIO2.default(opts.socketPort, opts.debug)); - } +var _typeof3 = _interopRequireDefault(_typeof2); - return args; - } +var _getIterator2 = require('babel-runtime/core-js/get-iterator'); - for (var _len = arguments.length, exposers = Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) { - exposers[_key - 2] = arguments[_key]; - } +var _getIterator3 = _interopRequireDefault(_getIterator2); - console.exposed().concat(exposers).forEach(function (expose) { - console.expose(expose); - - var args = appendTransforms([expose, 'mongo-socket', new _ErrorExtractor2.default()]); - - console.pipe.apply(console, args); - - console.pipe(expose, 'bash', new _Inspector2.default(opts.inspector), new _DefaultConsole2.default()); - }); - - var args = appendTransforms(['express', 'mongo-socket', new _ErrorExtractor2.default(), new _ExpressExtractor2.default()]); - - console.pipe.apply(console, args); - - console.pipe('express', 'bash', new _ExpressExtractor2.default(), new _ExpressInspector2.default(), new _Inspector2.default(opts.inspector), new _DefaultConsole2.default()); - - console.viewer = _viewer.create.bind(null, opts.mongo && opts.mongoUri, opts.web.router, opts.web.client, opts.debug); - - console.build = function () { - - // update - _package2.default.main = opts.publicUri + ':' + _path2.default.join(String(opts.web.client.port), opts.basePath); - - // save - _fs2.default.writeFileSync(__dirname + '/../native/package.json', (0, _stringify2.default)(_package2.default, null, 4), { encoding: 'utf8' }); - - var nw = new _nwBuilder2.default((0, _extend2.default)(true, { - platforms: ['win', 'osx', 'linux'], - buildDir: __dirname + '/../public/native', - version: '0.12.3', - zip: true - }, opts.nwjs, { files: __dirname + '/../native/**/**' })); - - if (opts.debug) { - nw.on('log', function (d) { - return console.log(d); - }); - } - - return nw.build(); - }; - - process.on('uncaughtException', function (e) { - return console.error(e).then(function () { - return process.exit(1); - }); - }); - - return console; -}; +exports.resolvePipeline = resolvePipeline; +exports.create = create; var _fs = require('fs'); @@ -96,111 +32,114 @@ var _path = require('path'); var _path2 = _interopRequireDefault(_path); -var _Console = require('./readers/Console'); - -var _Console2 = _interopRequireDefault(_Console); - -var _BasicConsole = require('./readers/BasicConsole'); - -var _BasicConsole2 = _interopRequireDefault(_BasicConsole); - -var _Inspector = require('./transforms/Inspector'); - -var _Inspector2 = _interopRequireDefault(_Inspector); - -var _ExpressInspector = require('./transforms/ExpressInspector'); - -var _ExpressInspector2 = _interopRequireDefault(_ExpressInspector); - -var _ExpressExtractor = require('./transforms/ExpressExtractor'); - -var _ExpressExtractor2 = _interopRequireDefault(_ExpressExtractor); - -var _JSON2Converter = require('./transforms/JSON2Converter'); - -var _JSON2Converter2 = _interopRequireDefault(_JSON2Converter); - -var _ErrorExtractor = require('./transforms/ErrorExtractor'); - -var _ErrorExtractor2 = _interopRequireDefault(_ErrorExtractor); - -var _MongoDB = require('./writers/MongoDB'); - -var _MongoDB2 = _interopRequireDefault(_MongoDB); - -var _SocketIO = require('./writers/SocketIO'); - -var _SocketIO2 = _interopRequireDefault(_SocketIO); - -var _DefaultConsole = require('./writers/DefaultConsole'); - -var _DefaultConsole2 = _interopRequireDefault(_DefaultConsole); - -var _viewer = require('./routers/viewer'); - -var _nwBuilder = require('nw-builder'); - -var _nwBuilder2 = _interopRequireDefault(_nwBuilder); - var _rc = require('rc'); var _rc2 = _interopRequireDefault(_rc); -var _package = require('./../native/package.json'); - -var _package2 = _interopRequireDefault(_package); - var _extend = require('extend'); var _extend2 = _interopRequireDefault(_extend); +var _middleware = require('./middleware'); + +var Middleware = _interopRequireWildcard(_middleware); + +var _reader = require('./reader'); + +var Reader = _interopRequireWildcard(_reader); + +var _router = require('./router'); + +var Router = _interopRequireWildcard(_router); + +var _transform = require('./transform'); + +var Transform = _interopRequireWildcard(_transform); + +var _writer = require('./writer'); + +var Writer = _interopRequireWildcard(_writer); + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var Writer = exports.Writer = { MongoDB: _MongoDB2.default, DefaultConsole: _DefaultConsole2.default }; -var Reader = exports.Reader = { BasicConsole: _BasicConsole2.default, Console: _Console2.default }; -var Transform = exports.Transform = { Inspector: _Inspector2.default, ExpressInspector: _ExpressInspector2.default, ExpressExtractor: _ExpressExtractor2.default, ErrorExtractor: _ErrorExtractor2.default, JSON2Converter: _JSON2Converter2.default }; +exports.Middleware = Middleware; +exports.Reader = Reader; +exports.Router = Router; +exports.Transform = Transform; +exports.Writer = Writer; +function resolvePipeline(scribe, pipeline) { + var resolved = []; + var _iteratorNormalCompletion = true; + var _didIteratorError = false; + var _iteratorError = undefined; -var defaultOpts = { - name: 'Scribe', - mongoUri: 'mongodb://localhost/scribe', - mongo: true, - basePath: 'scribe/', - socketPort: 4000, - socket: true, - inspector: { - colors: true, - showHidden: false, - depth: 5, - pre: true, - callsite: true, - tags: true, - args: true, - metrics: true - }, - web: { - router: { - username: 'build', - password: 'build', - authentication: true, - sessionSecret: 'scribe-session', - useBodyParser: true, - useSession: true - }, - client: { - socketPorts: [4000], - exposed: { - all: { label: 'all', query: { expose: { $exists: true } } } + try { + for (var _iterator = (0, _getIterator3.default)(pipeline), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) { + var through = _step.value; + + if (typeof through === 'function') { + resolved.push(new through(scribe)); + } else if ((typeof through === 'undefined' ? 'undefined' : (0, _typeof3.default)(through)) === 'object') { + resolved.push(through); + } else if (typeof through === 'string') { + var Class = require(_path2.default.join(__dirname, through)).default; + resolved.push(new Class(scribe)); } } - }, - //error: {label: 'error', query: {expose: 'error'}}, - //express: {label: 'express', query: {expose: 'express'}}, - //info: {label: 'info', query: {expose: 'info'}}, - //log: {label: 'log', query: {expose: 'log'}}, - //warn: {label: 'warn', query: {expose: 'warn'}}, - //trace: {label: 'trace', query: {expose: 'trace'}} - nwjs: {}, - debug: false -}; + } catch (err) { + _didIteratorError = true; + _iteratorError = err; + } finally { + try { + if (!_iteratorNormalCompletion && _iterator.return) { + _iterator.return(); + } + } finally { + if (_didIteratorError) { + throw _iteratorError; + } + } + } -; + return resolved; +} + +function create(opts) { + opts = (0, _extend2.default)(true, (0, _rc2.default)('scribe', {}), opts); + + // create default console + var console = new Reader.BasicConsole(opts); + var _opts = opts; + var exposeMap = _opts.expose; + var pipelineMap = _opts['expose/pipeline']; + + + [].concat((0, _toConsumableArray3.default)(console.exposed()), (0, _toConsumableArray3.default)((0, _keys2.default)(exposeMap))).forEach(function (expose) { + if (expose === 'default') return; + var pipelines = exposeMap[expose] || exposeMap.default; + if (Array.isArray(pipelines)) { + pipelines.forEach(function (pipeline) { + if (Array.isArray(pipelineMap[pipeline])) { + if (opts.debug) { + process.stdout.write('Exposing ' + expose + ' through ' + pipeline + '\n'); + } + + console.expose(expose); + console.pipe.apply(console, [expose, pipeline].concat((0, _toConsumableArray3.default)(resolvePipeline(console, pipelineMap[pipeline])))); + } + }); + } + }); + + if (opts.handleUncaughtException) { + process.on('uncaughtException', function (e) { + return console.error(e).then(function () { + return process.exit(1); + }); + }); + } + + return console; +} diff --git a/dist/transforms/ErrorExtractor.js b/dist/transform/ErrorExtractor.js similarity index 85% rename from dist/transforms/ErrorExtractor.js rename to dist/transform/ErrorExtractor.js index 6efada2..3873670 100644 --- a/dist/transforms/ErrorExtractor.js +++ b/dist/transform/ErrorExtractor.js @@ -27,7 +27,7 @@ var ErrorExtractor = function () { key: "through", value: function through(data, callback) { data.args = data.args.map(function (a) { - return a instanceof Error ? JSON.parse((0, _stringify2.default)(a, ["message", "arguments", "type", "name", "stack"])) : a; + return a instanceof Error ? a.toJSON ? a.toJSON() : JSON.parse((0, _stringify2.default)(a, ["message", "arguments", "type", "name", "stack", "code"])) : a; }); callback(null, data); diff --git a/dist/transforms/ExpressExtractor.js b/dist/transform/ExpressExtractor.js similarity index 98% rename from dist/transforms/ExpressExtractor.js rename to dist/transform/ExpressExtractor.js index fff91bc..08a34d2 100644 --- a/dist/transforms/ExpressExtractor.js +++ b/dist/transform/ExpressExtractor.js @@ -30,7 +30,7 @@ var ExpressExtractor = function () { (0, _createClass3.default)(ExpressExtractor, [{ key: 'ip', value: function ip(req) { - return req.ip || req._remoteAddress || req.remoteAddress || req.connection && req.connection.remoteAddress || req.headers['x-forwarded-for'] || undefined; + return req.ip || req._remoteAddress || req.remoteAddress || req.connection && req.connection.remoteAddress || req.headers['x-forwarded-for'] || 'xx.x.x.xx'; } }, { key: 'header', diff --git a/dist/transforms/ExpressInspector.js b/dist/transform/ExpressInspector.js similarity index 89% rename from dist/transforms/ExpressInspector.js rename to dist/transform/ExpressInspector.js index a601809..4653f85 100644 --- a/dist/transforms/ExpressInspector.js +++ b/dist/transform/ExpressInspector.js @@ -48,7 +48,7 @@ var ExpressInspector = function () { symbol = ''; } - var ret = undefined; + var ret = void 0; if (this.symbols) { ret = symbol + ' ' + stat; } else { @@ -63,7 +63,7 @@ var ExpressInspector = function () { var express = data.args[0]; data.transient['callsite'] = '' + express.ip; - data.args = [_chalk2.default.bgGreen.black(' ' + express.method + ' ') + ' ' + _chalk2.default.gray(express.url) + ' ' + this.status(express) + ' - ' + express.contentLength + ' ' + _chalk2.default.gray('(' + express.duration.toFixed(3) + 'ms)')]; + data.args = [_chalk2.default.bgGreen.black(' ' + express.method + ' ') + ' ' + _chalk2.default.gray(express.originalUrl) + ' ' + this.status(express) + ' - ' + express.contentLength + ' ' + _chalk2.default.gray('(' + express.duration.toFixed(3) + 'ms)')]; callback(null, data); } diff --git a/dist/transform/FullTextSerialize.js b/dist/transform/FullTextSerialize.js new file mode 100644 index 0000000..d991ff4 --- /dev/null +++ b/dist/transform/FullTextSerialize.js @@ -0,0 +1,38 @@ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck'); + +var _classCallCheck3 = _interopRequireDefault(_classCallCheck2); + +var _createClass2 = require('babel-runtime/helpers/createClass'); + +var _createClass3 = _interopRequireDefault(_createClass2); + +var _JSON = require('../libs/JSON2'); + +var JSON2 = _interopRequireWildcard(_JSON); + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +var FullTextSerialize = function () { + function FullTextSerialize() { + (0, _classCallCheck3.default)(this, FullTextSerialize); + } + + (0, _createClass3.default)(FullTextSerialize, [{ + key: 'through', + value: function through(data, callback) { + data.serialized = JSON2.stringify(data); + callback(null, data); + } + }]); + return FullTextSerialize; +}(); + +exports.default = FullTextSerialize; diff --git a/dist/transforms/Inspector.js b/dist/transform/Inspector.js similarity index 87% rename from dist/transforms/Inspector.js rename to dist/transform/Inspector.js index e1cbae4..6438148 100644 --- a/dist/transforms/Inspector.js +++ b/dist/transform/Inspector.js @@ -39,12 +39,10 @@ function inspect(x, ctx) { } var Inspector = function () { - function Inspector() { - var inspectOpts = arguments.length <= 0 || arguments[0] === undefined ? { colors: true, showHidden: false, - depth: 5, pre: true, args: true, metrics: true, tags: true } : arguments[0]; + function Inspector(scribe) { (0, _classCallCheck3.default)(this, Inspector); - this.inspectOpts = inspectOpts; + this.options = scribe.module('transform/Inspector').options; } (0, _createClass3.default)(Inspector, [{ @@ -54,7 +52,7 @@ var Inspector = function () { args[_key - 1] = arguments[_key]; } - var ctx = this.inspectOpts; + var ctx = this.options; if (typeof f !== 'string') { var objects = []; @@ -156,11 +154,11 @@ var Inspector = function () { data.args = ''; } - var pre = this.inspectOpts.pre ? this.inspectPre(data) + ' ' : ''; - var tags = this.inspectOpts.tags ? this.inspectTags(data) : ''; - var metrics = this.inspectOpts.metrics ? this.inspectMetrics(data) : ''; - var site = this.inspectOpts.callsite ? this.inspectCallSite(data) : ''; - var pretty = this.inspectOpts.args ? this.inspectArguments(data) : ''; + var pre = this.options.pre ? this.inspectPre(data) + ' ' : ''; + var tags = this.options.tags ? this.inspectTags(data) : ''; + var metrics = this.options.metrics ? this.inspectMetrics(data) : ''; + var site = this.options.callsite ? this.inspectCallSite(data) : ''; + var pretty = this.options.args ? this.inspectArguments(data) : ''; var inspected = pretty.split('\n').map(function (line) { return pre + ' ' + [tags, metrics, line, site].join(' '); }); diff --git a/dist/transforms/JSON2Converter.js b/dist/transform/ToJSON2.js similarity index 80% rename from dist/transforms/JSON2Converter.js rename to dist/transform/ToJSON2.js index 46699c0..f60c72f 100644 --- a/dist/transforms/JSON2Converter.js +++ b/dist/transform/ToJSON2.js @@ -20,18 +20,18 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var JSON2Converter = function () { - function JSON2Converter() { - (0, _classCallCheck3.default)(this, JSON2Converter); +var ToJSON2 = function () { + function ToJSON2() { + (0, _classCallCheck3.default)(this, ToJSON2); } - (0, _createClass3.default)(JSON2Converter, [{ + (0, _createClass3.default)(ToJSON2, [{ key: 'through', value: function through(data, callback) { callback(null, JSON.parse(JSON2.stringify(data))); } }]); - return JSON2Converter; + return ToJSON2; }(); -exports.default = JSON2Converter; +exports.default = ToJSON2; diff --git a/dist/transform/index.js b/dist/transform/index.js new file mode 100644 index 0000000..5395d4a --- /dev/null +++ b/dist/transform/index.js @@ -0,0 +1,52 @@ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _ErrorExtractor = require('./ErrorExtractor'); + +Object.defineProperty(exports, 'ErrorExtractor', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_ErrorExtractor).default; + } +}); + +var _ExpressExtractor = require('./ExpressExtractor'); + +Object.defineProperty(exports, 'ExpressExtractor', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_ExpressExtractor).default; + } +}); + +var _ExpressInspector = require('./ExpressInspector'); + +Object.defineProperty(exports, 'ExpressInspector', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_ExpressInspector).default; + } +}); + +var _Inspector = require('./Inspector'); + +Object.defineProperty(exports, 'Inspector', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_Inspector).default; + } +}); + +var _ToJSON = require('./ToJSON2'); + +Object.defineProperty(exports, 'ToJSON2', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_ToJSON).default; + } +}); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } diff --git a/dist/writers/DefaultConsole.js b/dist/writer/DefaultConsole.js similarity index 100% rename from dist/writers/DefaultConsole.js rename to dist/writer/DefaultConsole.js diff --git a/dist/writers/MongoDB.js b/dist/writer/MongoDB.js similarity index 54% rename from dist/writers/MongoDB.js rename to dist/writer/MongoDB.js index a38b0cd..264058b 100644 --- a/dist/writers/MongoDB.js +++ b/dist/writer/MongoDB.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.EntrySchema = undefined; var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck'); @@ -16,29 +17,55 @@ var _mongoose = require('mongoose'); var _mongoose2 = _interopRequireDefault(_mongoose); -var _entry = require('../schemas/entry'); - -var _entry2 = _interopRequireDefault(_entry); - var _JSON = require('../libs/JSON2'); var JSON2 = _interopRequireWildcard(_JSON); +var _express = require('express'); + +var _express2 = _interopRequireDefault(_express); + +var _jade = require('jade'); + +var _jade2 = _interopRequireDefault(_jade); + +var _basicAuthConnect = require('basic-auth-connect'); + +var _basicAuthConnect2 = _interopRequireDefault(_basicAuthConnect); + +var _bodyParser = require('body-parser'); + +var _bodyParser2 = _interopRequireDefault(_bodyParser); + +var _JSONStream = require('JSONStream'); + +var _JSONStream2 = _interopRequireDefault(_JSONStream); + function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +var EntrySchema = exports.EntrySchema = new _mongoose.Schema({ + transient: _mongoose.Schema.Types.Object, + persistent: _mongoose.Schema.Types.Object, + args: _mongoose.Schema.Types.Object, + date: { type: Date, default: Date.now }, + expose: String, + serialized: String +}); + +EntrySchema.index({ 'persistent.app': 1, 'persistent.id': -1 }); +EntrySchema.index({ 'serialized': 1, 'comment': 'text' }); + var MongoDB = function () { - function MongoDB() { - var address = arguments.length <= 0 || arguments[0] === undefined ? 'mongodb://localhost/scribe' : arguments[0]; - var debug = arguments.length <= 1 || arguments[1] === undefined ? false : arguments[1]; + function MongoDB(scribe) { (0, _classCallCheck3.default)(this, MongoDB); - _mongoose2.default.set('debug', debug); + this.options = scribe.module('writer/MongoDB').options; - var conn = _mongoose2.default.createConnection(address); - this._debug = debug; - this._entry = conn.model('Entry', _entry2.default); + var conn = _mongoose2.default.createConnection(this.options.uri); + this._debug = this.options.debug; + this._entry = conn.model('Entry', EntrySchema); } (0, _createClass3.default)(MongoDB, [{ diff --git a/dist/writers/SocketIO.js b/dist/writer/SocketIO.js similarity index 73% rename from dist/writers/SocketIO.js rename to dist/writer/SocketIO.js index 6584987..815e560 100644 --- a/dist/writers/SocketIO.js +++ b/dist/writer/SocketIO.js @@ -18,18 +18,16 @@ var _socket2 = _interopRequireDefault(_socket); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -var sio = undefined; +var sio = void 0; var SocketIO = function () { - function SocketIO() { - var port = arguments.length <= 0 || arguments[0] === undefined ? 4000 : arguments[0]; - var debug = arguments.length <= 1 || arguments[1] === undefined ? false : arguments[1]; + function SocketIO(scribe) { (0, _classCallCheck3.default)(this, SocketIO); - process.env.DEBUG = debug && 'socket.io*'; + this.options = scribe.module('writer/SocketIO').options; if (!sio) { - sio = (0, _socket2.default)(port); + sio = (0, _socket2.default)(this.options.port, this.options.options); } } diff --git a/dist/writer/index.js b/dist/writer/index.js new file mode 100644 index 0000000..5700760 --- /dev/null +++ b/dist/writer/index.js @@ -0,0 +1,34 @@ +'use strict'; + +Object.defineProperty(exports, "__esModule", { + value: true +}); + +var _DefaultConsole = require('./DefaultConsole'); + +Object.defineProperty(exports, 'DefaultConsole', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_DefaultConsole).default; + } +}); + +var _MongoDB = require('./MongoDB'); + +Object.defineProperty(exports, 'MongoDB', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_MongoDB).default; + } +}); + +var _SocketIO = require('./SocketIO'); + +Object.defineProperty(exports, 'SocketIO', { + enumerable: true, + get: function get() { + return _interopRequireDefault(_SocketIO).default; + } +}); + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } diff --git a/examples/cluster-server.js b/examples/cluster-server.js index 854d8b9..f2577ec 100644 --- a/examples/cluster-server.js +++ b/examples/cluster-server.js @@ -1,7 +1,7 @@ import cluster from 'cluster' import http from 'http' import express from 'express' -import Scribe from '../index.js' +import * as Scribe from '../index.js'; import * as JSON2 from '../src/libs/JSON2' const port = 4005; @@ -13,40 +13,23 @@ if (cluster.isMaster) { cluster.fork(); } } else { - const console = new Scribe(cluster.worker.id, { - name: 'ScribeCluster', - mongoUri: 'mongodb://localhost/scribe', - publicUri: 'http://localhost', - basePath: 'scribe/', - socketPort: socketPort + cluster.worker.id - 1, // assign a port to a worker worker - web: { - router: { - username: 'build', - password: 'build', - // authentication must be implemented by yourself - // if you are in cluster mode - authentication: false, - sessionSecret: 'scribe-session', - useBodyParser: true, - useSession: true + const options = { + "app": 'cluster-server', + "id": process.pid, + "module": { + "writer/SocketIO": { + "port": socketPort + cluster.worker.id - 1, + "options": {} }, - client: { - port: port, - socketPorts: [socketPort, socketPort + 1, socketPort + 2, socketPort + 3], - exposed: { - all: {label: 'all', query: {expose: {$exists: true}}}, - error: {label: 'error', query: {expose: 'error'}}, - express: {label: 'express', query: {expose: 'express'}}, - info: {label: 'info', query: {expose: 'info'}}, - log: {label: 'log', query: {expose: 'log'}}, - warn: {label: 'warn', query: {expose: 'warn'}}, - trace: {label: 'trace', query: {expose: 'trace'}}, - perf: {label: 'perf', query: {expose: 'perf'}} - } + "router/Viewer/client": { + "background": "#131B21", + "socketPorts": [socketPort, socketPort + 1, socketPort + 2, socketPort + 3] } }, - debug: false - }); + "debug": false + }; + + const console = Scribe.create(options); // default tags console.persistent('tags', ['mocha', 'scribe']); @@ -61,9 +44,14 @@ if (cluster.isMaster) { // express const app = express(); + const logger = new Scribe.Middleware.ExpressLogger(console); + const viewer = new Scribe.Router.Viewer(console); // express logger - app.use(console.middleware('express')); + app.use(logger.getMiddleware()); + + // viewer + app.use('/scribe', viewer.getRouter()); // test harness app.get('/test', (req, res) => { @@ -72,16 +60,8 @@ if (cluster.isMaster) { }); }); - // viewer - app.use('/scribe', console.viewer()); - app.listen(port, () => console.log(`Listening to ${port} - Cluster ${cluster.worker.id}`)); - // build native app - if (cluster.worker.id == 1) { - console.build().then(()=> console.log('Created native apps!')).catch(err => console.error(err)); - } - // override default console console.override(); diff --git a/examples/simple-server-stream-only.js b/examples/simple-server-stream-only.js index ba7cae2..6dbc108 100644 --- a/examples/simple-server-stream-only.js +++ b/examples/simple-server-stream-only.js @@ -1,73 +1,70 @@ import express from 'express' -import Scribe from '../index.js' +import * as Scribe from '../index.js'; import * as JSON2 from '../src/libs/JSON2' const port = 4005; const socketPort = 3000; -const console = new Scribe(process.pid, { - name: 'Scribe', - mongoUri: 'mongodb://localhost/scribe', - mongo: false, - publicUri: 'http://localhost', - basePath: 'scribe/', - socketPort: socketPort, - web: { - router: { - username: 'build', - password: 'build', - authentication: true, - sessionSecret: 'scribe-session', - useBodyParser: true, - useSession: true +const options = { + "app": 'simple-server-stream-only', + "id": process.pid, + "expose": { + "default": [ + "socket", + "bash" + ], + "express": [ + "express-socket", + "express-bash" + ] + }, + "expose/pipeline": { + "socket": [ + "transform/ErrorExtractor", + "transform/ToJSON2", + "transform/FullTextSerialize", + "writer/SocketIO" + ], + "express-socket": [ + "transform/ExpressExtractor", + "transform/ErrorExtractor", + "transform/ToJSON2", + "transform/FullTextSerialize", + "writer/SocketIO" + ] + }, + "module": { + "writer/SocketIO": { + "port": socketPort, + "options": {} }, - client: { - port: port, - socketPorts: [socketPort], - exposed: { - all: {label: 'all', query: {expose: {$exists: true}}}, - error: {label: 'error', query: {expose: 'error'}}, - express: {label: 'express', query: {expose: 'express'}}, - info: {label: 'info', query: {expose: 'info'}}, - log: {label: 'log', query: {expose: 'log'}}, - warn: {label: 'warn', query: {expose: 'warn'}}, - trace: {label: 'trace', query: {expose: 'trace'}}, - timing: {label: 'time', query: {expose: 'timing'}}, - user: {label: 'user', query: {'transient.tags': {$in: ['USER ID']}}} - } + "router/Viewer/client": { + "background": "#131B21", + "socketPorts": [ + socketPort + ] } }, - native: {}, - debug: false -}); + "debug": false +}; + +const console = Scribe.create(options); console.time('serverStartup'); // default tags console.persistent('tags', ['mocha', 'scribe']); -// modify an existing pipeline i.e. the express -console.pipe('express', 'mongo-socket').unshift({ - through(data, callback){ - const {req, res} = data.args[0]; // access the req, res objects - - // modify data as needed - - // i.e. - // add user tags - const tags = data.transient.tags || []; - tags.push('USER_ID'); // perhaps put in the user id here - data.transient.tags = tags; - - callback(null, data); - } -}); - // express const app = express(); +const logger = new Scribe.Middleware.ExpressLogger(console); +const viewer = new Scribe.Router.Viewer(console); // express logger -app.use(console.middleware('express')); +app.use(logger.getMiddleware()); + +// viewer +app.use('/scribe', viewer.getRouter()); // test harness app.get('/test', (req, res) => { @@ -76,9 +73,6 @@ app.get('/test', (req, res) => { }); }); -// viewer -app.use('/scribe', console.viewer()); - app.listen(port, () => { console.log(`Listening to ${port}`); @@ -97,6 +91,3 @@ app.listen(port, () => { console.timeEnd('serverStartup'); }); - -// build native app -console.build().then(()=> console.log('Created native apps!')).catch(err => console.error(err)); \ No newline at end of file diff --git a/examples/simple-server.js b/examples/simple-server.js index 56c38fb..dc65596 100644 --- a/examples/simple-server.js +++ b/examples/simple-server.js @@ -1,52 +1,34 @@ -import express from 'express' -import Scribe from '../index.js' -import * as JSON2 from '../src/libs/JSON2' +import express from 'express'; +import * as Scribe from '../index.js'; +import * as JSON2 from '../src/libs/JSON2'; const port = 4005; -const socketPort = 50000; - -const console = new Scribe(process.pid, { - name: 'Scribe', - mongoUri: 'mongodb://localhost/scribe', - publicUri: 'http://localhost', - basePath: 'scribe/', - socketPort: socketPort, - web: { - router: { - username: 'build', - password: 'build', - authentication: true, - sessionSecret: 'scribe-session', - useBodyParser: true, - useSession: true +const options = { + "app": 'simple-server', + "id": process.pid, + "module": { + "writer/SocketIO": { + "port": 50000, + "options": {} }, - client: { - port: port, - socketPorts: [socketPort], - exposed: { - all: {label: 'all', query: {expose: {$exists: true}}}, - error: {label: 'error', query: {expose: 'error'}}, - express: {label: 'express', query: {expose: 'express'}}, - info: {label: 'info', query: {expose: 'info'}}, - log: {label: 'log', query: {expose: 'log'}}, - warn: {label: 'warn', query: {expose: 'warn'}}, - trace: {label: 'trace', query: {expose: 'trace'}}, - timing: {label: 'time', query: {expose: 'timing'}}, - user: {label: 'user', query: {'transient.tags': {$in: ['USER ID']}}} - } + "router/Viewer/client": { + "background": "#131B21", + "socketPorts": [ + 50000 + ] } }, - native: {}, - debug: false -}); + "debug": false +}; + +const console = Scribe.create(options); console.time('serverStartup'); // default tags console.persistent('tags', ['mocha', 'scribe']); -// modify an existing pipeline i.e. the express -console.pipe('express', 'mongo-socket').unshift({ +var through = { through(data, callback){ const {req, res} = data.args[0]; // access the req, res objects @@ -60,13 +42,22 @@ console.pipe('express', 'mongo-socket').unshift({ callback(null, data); } -}); +}; + +// modify an existing pipeline i.e. the express +console.pipe('express', 'express-mongo-socket') + .unshift(through); // express const app = express(); +const logger = new Scribe.Middleware.ExpressLogger(console); +const viewer = new Scribe.Router.Viewer(console); // express logger -app.use(console.middleware('express')); +app.use(logger.getMiddleware()); + +// viewer +app.use('/scribe', viewer.getRouter()); // test harness app.get('/test', (req, res) => { @@ -75,9 +66,6 @@ app.get('/test', (req, res) => { }); }); -// viewer -app.use('/scribe', console.viewer()); - app.listen(port, () => { console.log(`Listening to ${port}`); @@ -103,4 +91,6 @@ app.listen(port, () => { }); // build native app -console.build().then(()=> console.log('Created native apps!')).catch(err => console.error(err)); \ No newline at end of file +viewer.getNative().then(()=> console.log('Created native apps!')).catch(err => console.error(err)); + +setInterval(() => console.log(`Heartbeat - ${Date.now()} ... every 5 seconds`), 5000); \ No newline at end of file diff --git a/herokuapp/app.js b/herokuapp/app.js index ebc1f96..1afcb07 100644 --- a/herokuapp/app.js +++ b/herokuapp/app.js @@ -1,88 +1,84 @@ /* jshint -W079 */ -(function() { - var scribe = require('../src/scribe')(), - console = process.console, - express = require('express'), - path = require('path'), - app = express(); +(function () { + var Scribe = require('../'); + var express = require('express'); + var path = require('path'); + var bodyParser = require('body-parser'); + var app = express(); - console.addLogger('log', 'green'); - console.addLogger('err', 'red'); + const options = { + "app": 'simple-server', + "id": process.pid, + "module": { + "writer/MongoDB": { + "uri": process.env.MONGOLAB_URI || "mongodb://localhost/scribe" + }, + "router/Viewer": { + "mongoUri": process.env.MONGOLAB_URI || "mongodb://localhost/scribe" + }, + "writer/SocketIO": { + "port": 50000, + "options": {} + }, + "router/Viewer/client": { + "background": "#222", + "socketPorts": [ + 50000 + ] + } + }, + "debug": false + }; - // port - app.set('port', (process.env.PORT || 5000)); + const console = Scribe.create(options); + const logger = new Scribe.Middleware.ExpressLogger(console); + const viewer = new Scribe.Router.Viewer(console); - // public dir - app.use('/', express.static(path.join(__dirname, 'public'))); + console.persistent('tags', ['scribe']); - // scribe - app.use(scribe.express.logger()); - app.use('/logs', scribe.webPanel()); + app.set('port', (process.env.PORT || 5000)); - // index - app.get('/', function(req, res) { - res.sendFile(path.join(__dirname, 'views', 'index.html')); - }); + app.use(logger.getMiddleware()); + app.use(bodyParser.urlencoded({extended: true})); + app.use(bodyParser.json()); - function _param(name) { - name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]"); - var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"); - var results = regex.exec("https://r.com?" + this.body); - return results === null ? "" : decodeURIComponent(results[1].replace(/\+/g, " ")); + app.use('/', express.static(path.join(__dirname, 'public'))); + + app.use('/scribe', viewer.getRouter()); + + app.post('/', function (req, res) { + var tag = req.param('tag'); + var msg = req.param('msg'); + + if (!msg) { + return res.status(400).send('Param `msg` not defined'); } - // log - app.post('/', function(req, res) { + try { + msg = JSON.parse(msg); + } catch (e) { + // ignore + } - req.body = ''; - req.setEncoding('utf8'); + // print + if (tag) { + console.tag(tag).log(msg); + } else { + console.log(msg); + } - req.on('data', function(chunk) { - req.body += chunk; - }); + res.status(200).send("Success! Check system logs to see your message."); + }); - req.on('end', function() { - req.param = _param; + var port = app.get('port'); - var tag = req.param('tag'); - var msg = req.param('msg'); + //log something every 10 minutes + setInterval(function () { + console.tag("Test").log("Hi there ! Server date : " + new Date()); + }, 10 * 60 * 1000); - if (!msg) { - return res.status(400).send('Param `msg` not defined'); - } - - try { - msg = JSON.parse(msg); - } catch (e) { - // ignore - } - - // print - if (tag) { - console.tag(tag).log(msg); - } else { - console.log(msg); - } - - res.status(200).send("Success! Check system logs to see your message."); - }); - - req.on('close', function(err){ - console.err(err); - res.status(400).json("Error! Check system logs to identify the error."); - }); - - }); - - var port = app.get('port'); - - //log something every 10 minutes - setInterval(function () { - console.tag("Test").log("Hi there ! Server date : " + new Date()); - }, 10 * 60 * 1000); - - app.listen(port, function() { - console.time().log('Server listening at port ' + port); - }); + app.listen(port, function () { + console.time().log('Server listening at port ' + port); + }); })(); diff --git a/herokuapp/public/img/screenshot-1.png b/herokuapp/public/img/screenshot-1.png index 66270ca..d068df9 100644 Binary files a/herokuapp/public/img/screenshot-1.png and b/herokuapp/public/img/screenshot-1.png differ diff --git a/herokuapp/public/index.html b/herokuapp/public/index.html new file mode 100644 index 0000000..22d63cb --- /dev/null +++ b/herokuapp/public/index.html @@ -0,0 +1,122 @@ + + + + + + + ScribeJS Demo + + + + + + + + +Fork me on GitHub +
+ +
+
+
+
Completed
+
+
+
+
+
+
+

Scribe.js

+

Simple. Clean. Minimal NodeJS logging framework
that is accessible from anywhere in the world. +

+
+
+

Demo

+
Enter some text to be printed out. JSON is supported as well. The text will be printed out by the + server using a scribe-enabled console. You can then view the logs to see your content + displayed.
+
+ + + +
+ +
+
Access System Logs
+
+
+
+

Web Access

+
All your logs can be accessed from the web with a rich HTML interface.
+ WebPanel screenshot +
+
+
+
+ + + diff --git a/herokuapp/public/js/jquery-2.1.3.min.js b/herokuapp/public/js/jquery-2.1.3.min.js deleted file mode 100644 index 4ab15b8..0000000 --- a/herokuapp/public/js/jquery-2.1.3.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v2.1.3 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ -!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.3",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=hb(),z=hb(),A=hb(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},eb=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fb){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function gb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+rb(o[l]);w=ab.test(a)&&pb(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function hb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ib(a){return a[u]=!0,a}function jb(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function kb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function lb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function nb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function ob(a){return ib(function(b){return b=+b,ib(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pb(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=gb.support={},f=gb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=gb.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",eb,!1):e.attachEvent&&e.attachEvent("onunload",eb)),p=!f(g),c.attributes=jb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=jb(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=jb(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(jb(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),jb(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&jb(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return lb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?lb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},gb.matches=function(a,b){return gb(a,null,null,b)},gb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return gb(b,n,null,[a]).length>0},gb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},gb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},gb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},gb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=gb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=gb.selectors={cacheLength:50,createPseudo:ib,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||gb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&gb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=gb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||gb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ib(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ib(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ib(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ib(function(a){return function(b){return gb(a,b).length>0}}),contains:ib(function(a){return a=a.replace(cb,db),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ib(function(a){return W.test(a||"")||gb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:ob(function(){return[0]}),last:ob(function(a,b){return[b-1]}),eq:ob(function(a,b,c){return[0>c?c+b:c]}),even:ob(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:ob(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:ob(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:ob(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function sb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function tb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ub(a,b,c){for(var d=0,e=b.length;e>d;d++)gb(a,b[d],c);return c}function vb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wb(a,b,c,d,e,f){return d&&!d[u]&&(d=wb(d)),e&&!e[u]&&(e=wb(e,f)),ib(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ub(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:vb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=vb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=vb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sb(function(a){return a===b},h,!0),l=sb(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sb(tb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wb(i>1&&tb(m),i>1&&rb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xb(a.slice(i,e)),f>e&&xb(a=a.slice(e)),f>e&&rb(a))}m.push(c)}return tb(m)}function yb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=vb(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&gb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ib(f):f}return h=gb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,yb(e,d)),f.selector=a}return f},i=gb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&pb(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&rb(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&pb(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=jb(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),jb(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||kb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&jb(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||kb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),jb(function(a){return null==a.getAttribute("disabled")})||kb(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),gb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+K.uid++}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c) -},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthx",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*\s*$/g,ib={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("