diff --git a/decentralize.js b/decentralize.js
index 15c98a6..b77b3e9 100644
--- a/decentralize.js
+++ b/decentralize.js
@@ -6,46 +6,31 @@ var procure = require('procure');
var Maki = require('maki');
var Soundcloud = require('./lib/Soundcloud');
var Engine = require('./lib/Engine');
-var WebSocket = require('ws');
-var jsonpatch = require('fast-json-patch');
+var Sessions = require('maki-sessions');
+var ProxAuth = require('maki-auth-proxy');
+var Policies = require('maki-auth-tokens');
+
+var rest = require('restler');
var home = 'https://' + config.service.authority;
var source = config.source;
-source.authority = source.host + (([80, 443].indexOf( parseInt(source.port) ) === -1) ? ':' + source.port : '');
+source.authority = source.host;
+if ([80, 443].indexOf( parseInt(source.port) ) === -1) {
+ source.authority += ':' + source.port;
+}
var decentralize = new Maki( config );
var soundcloud = new Soundcloud( config.soundcloud );
-Show = decentralize.define('Show', {
- attributes: {
- title: { type: String , slug: true },
- slug: { type: String },
- recorded: { type: Date },
- released: { type: Date , default: Date.now , required: true },
- description: { type: String },
- audio: { type: String },
- // TODO: replace with a sources list.
- youtube: { type: String }
- },
- names: { get: 'item' },
- source: source.proto + '://' + source.authority + '/recordings',
- icon: 'sound'
-});
+var policies = new Policies();
+var sessions = new Sessions();
-Index = decentralize.define('Index', {
- name: 'Index',
- routes: { query: '/' },
- templates: { query: 'index' },
- requires: {
- 'Show': {
- filter: {}
- }
- },
- static: true,
- internal: true
-});
+decentralize.use( sessions );
+
+Show = decentralize.define('Show', require('./resources/Show') );
+Index = decentralize.define('Index', require('./resources/Index') );
procure( source.proto + '://' + source.authority + '/shows/decentralize', function(err, show) {
if (err) return console.error(err);
@@ -77,6 +62,25 @@ procure( source.proto + '://' + source.authority + '/shows/decentralize', functi
return next();
}
});
+ decentralize.app.get('/shows/:showSlug/edit', function(req, res, next) {
+ Show.get({ slug: req.param('showSlug') }, function(err, show) {
+ return res.render('show-edit', {
+ item: show
+ });
+ });
+ });
+ decentralize.app.post('/shows/:showSlug', function(req, res, next) {
+ rest.patch( source.proto + '://' + source.authority + '/recordings/' + req.param('showSlug') , {
+ headers: {
+ Accept: 'application/json'
+ },
+ data: req.body
+ }).on('complete', function(data, request) {
+ if (request.statusCode !== 200) return res.error('Editing failed');
+ req.flash('success', 'Content edited successfully!');
+ return res.redirect('/shows/' + req.param('showSlug'));
+ });
+ });
decentralize.app.get('/rss', function(req, res, next) {
res.redirect( 301 , '/feed' );
});
@@ -90,38 +94,13 @@ procure( source.proto + '://' + source.authority + '/shows/decentralize', functi
});
});
- // subscribe to updates to important things.
- // mainly, recordings
- var ws = new WebSocket(source.sockets + source.authority + '/recordings');
- ws.on('error', function(err) {
- console.error( err );
- });
- ws.on('message', function(data) {
- console.log('DATAGRAM:' , data );
- var msg = JSON.parse( data );
- if (msg.method === 'patch') {
- if (msg.params.channel === '/recordings') {
- jsonpatch.apply( decentralize.resources['Show'].data , msg.params.ops );
- }
-
- if (msg.params.channel.match(/\/recordings\/(.*)/)) {
- var recordings = decentralize.resources['Show'].data;
- for (var i = 0; i < recordings.length; i++) {
- if (msg.params.channel === '/recordings/' + recordings[ i ].slug ) {
- jsonpatch.apply( recordings[ i ] , msg.params.ops );
- }
- }
- }
-
- }
- });
-
- var engine = new Engine( config );
+ var engine = new Engine( config , decentralize );
setInterval(function() {
engine.sync();
}, /*/ 2500 /*/ 1 * 3600 * 1000 /**/ );
engine.sync();
+ engine.subscribe();
});
diff --git a/lib/Engine.js b/lib/Engine.js
index a4638c4..e437b74 100644
--- a/lib/Engine.js
+++ b/lib/Engine.js
@@ -4,13 +4,81 @@ var request = require('request');
var jsonpatch = require('fast-json-patch');
var contentDisposition = require('content-disposition');
+var WebSocket = require('ws');
var Soundcloud = require('./Soundcloud');
var Form = require('form-data');
-function Engine( config ) {
+var TRY_TIMES = [ 100 , 250 , 2500 , 10000 , 60 * 1000 , 5 * 60 * 1000 , 10 * 60 * 1000 , 60 * 60 * 1000 ];
+
+function Engine( config , decentralize ) {
this.config = config;
+ this.decentralize = decentralize;
this.soundcloud = new Soundcloud( config.soundcloud );
-}
+
+ this.tries = 0;
+
+};
+
+Engine.prototype.subscribe = function( cb ) {
+ var self = this;
+ // subscribe to updates to important things.
+ // mainly, recordings
+
+ console.log('initializing socket...');
+
+ try {
+ self.ws = new WebSocket( self.config.source.sockets + self.config.source.authority + '/recordings');
+ } catch (e) {
+ console.log('exception connecting');
+ }
+
+ self.ws.on('error', function(err) {
+ console.error( err );
+ });
+ self.ws.on('open', function() {
+ self.tries = 0;
+ console.log('socket now open.');
+ });
+ self.ws.on('close', function() {
+ console.log('socket closed wat');
+
+ function attemptReconnect() {
+ self.ws.removeAllListeners('open');
+ self.ws.removeAllListeners('close');
+ self.ws.removeAllListeners('error');
+ self.ws.removeAllListeners('message');
+
+ delete self.ws;
+
+ self.subscribe();
+
+ setTimeout( attemptReconnect , TRY_TIMES[ self.tries++ ] );
+
+ };
+
+ attemptReconnect();
+
+ });
+ self.ws.on('message', function(data) {
+ console.log('DATAGRAM:' , data );
+ var msg = JSON.parse( data );
+ if (msg.method === 'patch') {
+ if (msg.params.channel === '/recordings') {
+ jsonpatch.apply( self.decentralize.resources['Show'].data , msg.params.ops );
+ }
+
+ if (msg.params.channel.match(/\/recordings\/(.*)/)) {
+ var recordings = self.decentralize.resources['Show'].data;
+ for (var i = 0; i < recordings.length; i++) {
+ if (msg.params.channel === '/recordings/' + recordings[ i ].slug ) {
+ jsonpatch.apply( recordings[ i ] , msg.params.ops );
+ }
+ }
+ }
+
+ }
+ });
+};
Engine.prototype.sync = function( cb ) {
if (!cb) var cb = new Function();
@@ -90,6 +158,6 @@ Engine.prototype.sync = function( cb ) {
});
});
});
-}
+};
module.exports = Engine;
diff --git a/package.json b/package.json
index 25aa7e0..a39400b 100644
--- a/package.json
+++ b/package.json
@@ -23,10 +23,12 @@
"dependencies": {
"async": "^0.9.0",
"content-disposition": "^0.5.0",
- "fast-json-patch": "^0.5.1",
+ "fast-json-patch": "^0.5.2",
"form-data": "^0.2.0",
"lodash": "^3.3.0",
"maki": "git://github.com/martindale/maki",
+ "maki-auth-proxy": "0.0.0",
+ "maki-sessions": "^0.1.0",
"node-torrent-stream": "git://github.com/unusualbob/node-torrent-stream",
"procure": "^0.1.3",
"request": "^2.53.0",
diff --git a/public/js/marked.min.js b/public/js/marked.min.js
new file mode 100644
index 0000000..a5164c4
--- /dev/null
+++ b/public/js/marked.min.js
@@ -0,0 +1,6 @@
+/**
+ * marked - a markdown parser
+ * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
+ * https://github.com/chjj/marked
+ */
+(function(){var block={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:noop,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:noop,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment|closed|closing) *(?:\n{2,}|\s*$)/,def:/^ *\[([^\]]+)\]: *([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:noop,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};block.bullet=/(?:[*+-]|\d+\.)/;block.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;block.item=replace(block.item,"gm")(/bull/g,block.bullet)();block.list=replace(block.list)(/bull/g,block.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+block.def.source+")")();block.blockquote=replace(block.blockquote)("def",block.def)();block._tag="(?!(?:"+"a|em|strong|small|s|cite|q|dfn|abbr|data|time|code"+"|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo"+"|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b";block.html=replace(block.html)("comment",//)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/ "+text+"
"}return'"+(escaped?code:escape(code,true))+"\n
\n"};Renderer.prototype.blockquote=function(quote){return"'+(escaped?code:escape(code,true))+"\n\n"+quote+"
\n"};Renderer.prototype.html=function(html){return html};Renderer.prototype.heading=function(text,level,raw){return"
\n":"
\n"};Renderer.prototype.list=function(body,ordered){var type=ordered?"ol":"ul";return"<"+type+">\n"+body+""+type+">\n"};Renderer.prototype.listitem=function(text){return"\n"+"\n"+header+"\n"+"\n"+body+"\n"+"
\n"};Renderer.prototype.tablerow=function(content){return"\n"+content+" \n"};Renderer.prototype.tablecell=function(content,flags){var type=flags.header?"th":"td";var tag=flags.align?"<"+type+' style="text-align:'+flags.align+'">':"<"+type+">";return tag+content+""+type+">\n"};Renderer.prototype.strong=function(text){return""+text+""};Renderer.prototype.em=function(text){return""+text+""};Renderer.prototype.codespan=function(text){return""+text+""};Renderer.prototype.br=function(){return this.options.xhtml?"
":"
"};Renderer.prototype.del=function(text){return""+text+""};Renderer.prototype.link=function(href,title,text){if(this.options.sanitize){try{var prot=decodeURIComponent(unescape(href)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return""}if(prot.indexOf("javascript:")===0){return""}}var out='"+text+"";return out};Renderer.prototype.image=function(href,title,text){var out='":">";return out};function Parser(options){this.tokens=[];this.token=null;this.options=options||marked.defaults;this.options.renderer=this.options.renderer||new Renderer;this.renderer=this.options.renderer;this.renderer.options=this.options}Parser.parse=function(src,options,renderer){var parser=new Parser(options,renderer);return parser.parse(src)};Parser.prototype.parse=function(src){this.inline=new InlineLexer(src.links,this.options,this.renderer);this.tokens=src.reverse();var out="";while(this.next()){out+=this.tok()}return out};Parser.prototype.next=function(){return this.token=this.tokens.pop()};Parser.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0};Parser.prototype.parseText=function(){var body=this.token.text;while(this.peek().type==="text"){body+="\n"+this.next().text}return this.inline.output(body)};Parser.prototype.tok=function(){switch(this.token.type){case"space":{return""}case"hr":{return this.renderer.hr()}case"heading":{return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,this.token.text)}case"code":{return this.renderer.code(this.token.text,this.token.lang,this.token.escaped)}case"table":{var header="",body="",i,row,cell,flags,j;cell="";for(i=0;i
"+escape(e.message+"",true)+""}throw e}}marked.options=marked.setOptions=function(opt){merge(marked.defaults,opt);return marked};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,smartLists:false,silent:false,highlight:null,langPrefix:"lang-",smartypants:false,headerPrefix:"",renderer:new Renderer,xhtml:false};marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=Renderer;marked.Lexer=Lexer;marked.lexer=Lexer.lex;marked.InlineLexer=InlineLexer;marked.inlineLexer=InlineLexer.output;marked.parse=marked;if(typeof module!=="undefined"&&typeof exports==="object"){module.exports=marked}else if(typeof define==="function"&&define.amd){define(function(){return marked})}else{this.marked=marked}}).call(function(){return this||(typeof window!=="undefined"?window:global)}()); \ No newline at end of file diff --git a/resources/Index.js b/resources/Index.js new file mode 100644 index 0000000..a56349b --- /dev/null +++ b/resources/Index.js @@ -0,0 +1,12 @@ +module.exports = { + name: 'Index', + routes: { query: '/' }, + templates: { query: 'index' }, + requires: { + 'Show': { + filter: {} + } + }, + static: true, + internal: true +}; diff --git a/resources/Show.js b/resources/Show.js new file mode 100644 index 0000000..5996214 --- /dev/null +++ b/resources/Show.js @@ -0,0 +1,17 @@ +var source = require('../config').source; + +module.exports = { + attributes: { + title: { type: String , slug: true }, + slug: { type: String }, + recorded: { type: Date }, + released: { type: Date , default: Date.now , required: true }, + description: { type: String , format: 'markdown' }, + audio: { type: String }, + // TODO: replace with a sources list. + youtube: { type: String } + }, + names: { get: 'item' }, + source: source.proto + '://' + source.authority + '/recordings', + icon: 'sound' +} diff --git a/views/layouts/default.jade b/views/layouts/default.jade index 1a638ce..07d09f1 100644 --- a/views/layouts/default.jade +++ b/views/layouts/default.jade @@ -36,6 +36,7 @@ html.no-js script(src="/js/highlight.pack.js") script(src="/js/uuid.js") script(src="/js/jsonrpc.js") + script(src="/js/marked.min.js") script(src="/js/maki.js") diff --git a/views/show-edit.jade b/views/show-edit.jade new file mode 100644 index 0000000..2d2a1a1 --- /dev/null +++ b/views/show-edit.jade @@ -0,0 +1,41 @@ +extends layouts/default + +block content + + h1 #{item.title} + + h2 Preview + .preview !{ markdown( item.description ) } + + h2 Edit + + form.ui.form(action="/shows/#{item.slug}", method="POST") + input(type="hidden", name="method", value="PATCH") + + .field + label Description + textarea(name="description", style="height: 20em;") #{item.description} + + .field + label YouTube Video ID + input(type="text", name="youtube", value="#{item.youtube || ''}") + + .two.fields + .field + label decentral.fm Username + input(type="text", name="username") + .field + label decentral.fm Password + input(type="password", name="password") + + button.ui.submit.button(type="submit") Edit » + +block scripts + script. + $('textarea[name=description]').keyup( renderPreview ); + + function renderPreview() { + var value = this.value; + var rendered = marked( value ); + $('.preview').html( rendered ); + }