Merge pull request #7 from totaljs/total4

Total.js

Author: petersirka

bundle.sh

@@ -8,6 +8,7 @@ cp -a ../schemas/ schemas
 cp -a ../public/ public
 cp -a ../resources/ resources
 cp -a ../views/ views
+cp -a ../workers/ workers
 cp ../clone.sh clone.sh
 
 totaljs --bundle code.bundle

changelog.txt

@@ -1,3 +1,10 @@
+========================= 1.5
+
+- added color palette
+- added version parser
+- added Transform to Responsive
+- updated tree by adding `Show this folder only`
+
 ========================= 1.4
 
 - new and improved UI

code.bundle

@@ -1,8 +1,8 @@
 name                  : Code
 allow_custom_titles   : true
 
-cookie                : __sauth
-authkey               : seEdCollabo
+cookie   (generate)   : 10
+authkey  (generate)   : 10
 
 backup                : /www/tmp/backup/
 autodiscover          : /www/www/

config

@@ -1,7 +1,9 @@
+const CP = require('child_process');
 const READDIROPTIONS = { withFileTypes: true };
 const Path = require('path');
 const Fs = require('fs');
-const Exec = require('child_process').exec;
+const Exec = CP.exec;
+const Spawn = CP.spawn;
 
 exports.install = function() {
 
@@ -41,8 +43,10 @@ exports.install = function() {
 	ROUTE('+GET     /api/projects/timespent/',                                timespent);
 	ROUTE('+GET     /api/projects/{id}/modify/',                           	  files_modify);
 	ROUTE('+GET     /api/projects/{id}/bundle/',                           	  makebundle, [10000]);
-	ROUTE('+GET     /api/projects/{id}/localize/          *Projects           --> @localize', [10000]);
+	ROUTE('+GET     /api/projects/{id}/wiki/              *Projects           --> @wiki_make', [30000]);
+	ROUTE('+GET     /api/projects/{id}/localize/          *Projects           --> @localize', [30000]);
 	ROUTE('+GET     /api/projects/discover/',                                 autodiscover);
+	ROUTE('GET      /wiki/{id}/                           *Projects           --> @wiki_read');
 
 	ROUTE('+POST    /api/database/pg/                     *DBCommand          --> @exec', [10000]);
 
@@ -63,14 +67,15 @@ exports.install = function() {
 	ROUTE('+GET     /api/templates/{id}/',                                    template);
 	ROUTE('+GET     /api/download/{id}/',                                     files_download);
 	ROUTE('+GET     /api/metainfo/{id}/',                                     files_metainfo);
-	ROUTE('+POST    /api/files/minify/                     *Minify',          files_minify);
+	ROUTE('+POST    /api/files/minify/                     *Minify           --> @exec');
 	ROUTE('+GET     /logout/',                                                redirect_logout);
 
 	ROUTE('+GET    /api/users/online/',                                       users_online);
 	ROUTE('+GET    /api/users/refresh/',                                      users_refresh);
 	ROUTE('+GET    /api/users/export/',                                       users_export);
 	ROUTE('+GET    /api/common/directories/',                                 directories);
 	ROUTE('+GET    /api/common/uid/',                                         custom_uid);
+	ROUTE('+GET    /api/common/uid16/',                                       custom_uid16);
 	ROUTE('+GET    /api/common/ip/',                                          custom_ip);
 	ROUTE('+GET    /api/common/ipserver/',                                    custom_ipsever);
 	ROUTE('+POST   /api/common/encrypt/                   *Encoder            --> @exec');
@@ -262,19 +267,21 @@ function users_online() {
 	var self = this;
 	var arr = [];
 
-	for (var i = 0; i < MAIN.ws._keys.length; i++) {
-		var key = MAIN.ws._keys[i];
-		var conn = MAIN.ws.connections[key];
+	if (MAIN.ws && MAIN.ws.keys) {
+		for (var i = 0; i < MAIN.ws.keys.length; i++) {
+			var key = MAIN.ws.keys[i];
+			var conn = MAIN.ws.connections[key];
 
-		var item = {};
+			var item = {};
 
-		var project = conn.code.projectid ? MAIN.projects.findItem('id', conn.code.projectid) : null;
-		if (project)
-			item.project = project.name + (conn.code.fileid || '');
+			var project = conn.code.projectid ? MAIN.projects.findItem('id', conn.code.projectid) : null;
+			if (project)
+				item.project = project.name + (conn.code.fileid || '');
 
-		item.name = conn.user.name;
-		item.ip = conn.ip;
-		arr.push(item);
+			item.name = conn.user.name;
+			item.ip = conn.ip;
+			arr.push(item);
+		}
 	}
 
 	self.json(arr);
@@ -289,32 +296,34 @@ function users_refresh() {
 		self.invalid('error-permissions');
 }
 
-function files_minify() {
-	var self = this;
-	self.body.$workflow('exec', (err, response) => self.plain(response || ''));
-}
-
 function custom_uid() {
 	this.plain(UID('custom'));
 }
 
+function custom_uid16() {
+	this.plain(UID16('custom'));
+}
+
 function custom_ip() {
 	this.plain(this.ip);
 }
 
 function custom_ipsever() {
 	var self = this;
-	REQUEST('https://ipecho.net/plain', ['get'], function(err, response) {
-		self.plain(response || 'undefined');
-	});
+	var opt = {};
+	opt.url = 'https://ipecho.net/plain';
+	opt.callback = function(err, response) {
+		self.plain(response.body || 'undefined');
+	};
+	REQUEST(opt);
 }
 
 function files_changes(id) {
 	var self = this;
 	var builder = NOSQL(id + '_changes').find2();
 
 	if (self.query.recent)
-		builder.rule(doc => doc.type === 'save' | doc.type === 'save_sync');
+		builder.rule('doc.type===\'save\'||doc.type===\'save_sync\'');
 
 	builder.take(self.query.recent ? 30 : 50).callback(function(err, response) {
 		for (var i = 0; i < response.length; i++) {
@@ -418,15 +427,11 @@ function makerequest() {
 	var beg = Date.now();
 
 	builder.exec(function(err, response, output) {
-		if (err)
-			self.invalid(err.toString());
-		else {
-			output.url = method + ' ' + url;
-			output.value = undefined;
-			output.duration = Date.now() - beg;
-			output.statustext = U.httpStatus(output.status);
-			self.json(output);
-		}
+		output.url = method + ' ' + url;
+		output.value = undefined;
+		output.duration = Date.now() - beg;
+		output.statustext = U.httpstatus(output.status);
+		self.json(output);
 	});
 }
 
@@ -460,11 +465,13 @@ function makerequestscript(id) {
 		}
 	}
 
+	var meta = {};
 	var beg = Date.now();
+	var id = self.query.id;
 
-	self.childtimeout = setTimeout(function() {
-		child.kill(9);
-	}, 19000);
+	meta.childtimeout = setTimeout(function() {
+		meta.child.kill(9);
+	}, id ? (60000 * 30) : 19000);
 
 	var ext = U.getExtension(self.query.path);
 	var can = { js: 1, sh: 1 };
@@ -474,13 +481,35 @@ function makerequestscript(id) {
 		return;
 	}
 
-	var child = Exec((ext === 'sh' ? 'bash ' : 'node ') + Path.join(project.path, self.query.path), function(err, stdout, stderr) {
-		clearTimeout(self.childtimeout);
-		var data = {};
-		data.response = stderr || stdout;
-		data.duration = Date.now() - beg;
-		self.json(data);
-	});
+	if (id) {
+
+		self.success();
+
+		MAIN.spawns[id] = meta.child = Spawn((ext === 'sh' ? 'bash ' : 'node'), [Path.join(project.path, self.query.path)], { detached: true, cwd: project.path });
+		meta.child.on('close', function() {
+			delete MAIN.spawns[id];
+			MAIN.send({ TYPE: 'spawn', id: id, body: '\n--END--\n' + (Date.now() - beg) + ' ms' }, user);
+			clearTimeout(meta.childtimeout);
+			meta = null;
+		});
+
+		meta.child.stdout.on('data', function(data) {
+			MAIN.send({ TYPE: 'spawn', id: id, body: data.toString('utf8') }, user);
+		});
+
+		meta.child.stderr.on('data', function(data) {
+			MAIN.send({ TYPE: 'spawn', id: id, body: data.toString('utf8'), error: true }, user);
+		});
+
+	} else {
+		meta.child = Exec((ext === 'sh' ? 'bash ' : 'node ') + Path.join(project.path, self.query.path), function(err, stdout, stderr) {
+			clearTimeout(meta.childtimeout);
+			var data = {};
+			data.response = stderr || stdout;
+			data.duration = Date.now() - beg;
+			self.json(data);
+		});
+	}
 }
 
 function timespent() {
@@ -610,7 +639,7 @@ function makebundle(id) {
 		if (filename.toLowerCase().lastIndexOf('.bundle') === -1)
 			filename += '.bundle';
 
-		F.backup(filename, project.path, function(err) {
+		BACKUP(filename, project.path, function(err) {
 			if (err)
 				self.invalid(err);
 			else {

controllers/api.js

@@ -10,7 +10,7 @@ exports.install = function() {
 	ROUTE('+GET /docs/{id}/', docs);
 
 	// File routes
-	FILE('/manifest.json', manifest);
+	ROUTE('FILE /manifest.json', manifest);
 };
 
 function manifest(req, res) {
@@ -26,14 +26,6 @@ function docs(id) {
 		return;
 	}
 
-	if (!self.user.sa) {
-		var user = project.users.indexOf($.user.id);
-		if (!user) {
-			self.throw401();
-			return;
-		}
-	}
-
 	NOSQL(id + '_parts').find().callback(function(err, response) {
 		var docs = JSON.stringify(response);
 		Fs.readFile(PATH.public('docs.html'), function(err, data) {

controllers/default.js

@@ -3,7 +3,7 @@ const MSG_ONLINE = { TYPE: 'online' };
 const MSG_OFFLINE = { TYPE: 'offline' };
 
 exports.install = function() {
-	WEBSOCKET('/', realtime, ['authorize'], 1024);
+	ROUTE('+SOCKET /', realtime, ['text'], 1024);
 };
 
 function realtime() {
@@ -42,18 +42,26 @@ function realtime() {
 		// {"TYPE":"edit"
 		// {"TYPE":"online"
 		// {"TYPE":"offline"
+		// {"TYPE":"x" -> spawn destroy
 		if (msg[9] === 'e') {
 			msg = msg.parseJSON();
-			client.code.fileid && refresh_collaborators(self, client);
-			client.code.projectid = msg.projectid || '';
-			client.code.fileid = msg.fileid;
-			client.code.openid = (msg.openid || 0).toString();
-			client.code.ts = Date.now();
-			refresh_collaborators(self, client, true);
+			if (msg) {
+				client.code.fileid && refresh_collaborators(self, client);
+				client.code.projectid = msg.projectid || '';
+				client.code.fileid = msg.fileid;
+				client.code.openid = (msg.openid || 0).toString();
+				client.code.ts = Date.now();
+				refresh_collaborators(self, client, true);
+			}
 		} else if (msg[9] === 's' && msg[12] === 'e')
-			self.send2(msg);
-		else
-			self.send2(msg, openidcomparer);
+			self.send(msg);
+		else if (msg[9] === 'x') {
+			msg = msg.parseJSON();
+			if (MAIN.spawns[msg.id]) {
+				MAIN.spawns[msg.id].kill(9);
+			}
+		} else
+			self.send(msg, openidcomparer);
 	});
 }
 
@@ -70,8 +78,8 @@ function refresh_collaborators(ws, client, add) {
 	MSG_OPEN.project = [];
 	MSG_OPEN.file = [];
 
-	for (var i = 0; i < ws._keys.length; i++) {
-		var key = ws._keys[i];
+	for (var i = 0; i < ws.keys.length; i++) {
+		var key = ws.keys[i];
 		var con = ws.connections[key];
 
 		if (!con.code.fileid || (con.code.id !== client.code.id && !add))
@@ -89,5 +97,5 @@ function refresh_collaborators(ws, client, add) {
 	else
 		MSG_OPEN.TYPE = 'close';
 
-	ws.send2(MSG_OPEN);
+	ws.send(MSG_OPEN);
 }

controllers/realtime.js

@@ -1,5 +1,13 @@
 #!/bin/sh
 
-tar -cvf $1 $2
-tar --append --file $1 $3
-tar --append --file $1 $4
+echo "$2/logs/debug.log"
+
+tar --exclude="$2logs" -cvf $1 $2
+
+if [ -f "$3" ]; then
+	tar --append --file $1 $3
+fi
+
+if [ -f "$4" ]; then
+	tar --append --file $1 $4
+fi

databases/branch_backup.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
 
-rm -r $2*
+# rm -r $2* !("/logs/")
+find $2 | grep -v "logs" | grep -v ".pid" | xargs -0 rm -rf
 tar -xf $1 -C /