Merge branches/quickjs to trunk. This is the way.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3621 ed5197a5-7fde-0310-b194-c3ffbd925b24
2021-01-02 18:10:00 +00:00
parent d293637741
commit 79022e1e1f
703 changed files with 419987 additions and 30640 deletions
--- a/core/app.js
+++ b/core/app.js
@ -0,0 +1,127 @@
+"use strict";
+
+function App() {
+	this._on_output = null;
+	this._send_queue = [];
+	return this;
+}
+
+App.prototype.readOutput = function(callback) {
+	this._on_output = callback;
+}
+
+App.prototype.makeFunction = function(api) {
+	let self = this;
+	let result = function() {
+		let message = {action: api[0]};
+		for (let i = 1; i < api.length; i++) {
+			message[api[i]] = arguments[i - 1];
+		}
+		self.send(message);
+	};
+	Object.defineProperty(result, 'name', {value: api[0], writable: false});
+	return result;
+}
+
+App.prototype.send = function(message) {
+	if (message) {
+		this._send_queue.push(message);
+	}
+	if (this._on_output) {
+		this._send_queue.forEach(message => this._on_output(message));
+		this._send_queue = [];
+	}
+}
+
+function socket(request, response, client) {
+	var process;
+	var options = {};
+	var credentials = auth.query(request.headers);
+
+	response.onMessage = async function(event) {
+		if (event.opCode == 0x1 || event.opCode == 0x2) {
+			var message;
+			try {
+				message = JSON.parse(event.data);
+			} catch (error) {
+				print("ERROR", error, event.data, event.data.length, event.opCode);
+				return;
+			}
+			if (message.action == "hello") {
+				var packageOwner;
+				var packageName;
+				var blobId;
+				var match;
+				if (match = /^\/(&[^\.]*\.\w+)(\/?.*)/.exec(message.path)) {
+					blobId = match[1];
+				} else if (match = /^\/\~([^\/]+)\/([^\/]+)\/$/.exec(message.path)) {
+					var user = match[1];
+					var path = match[2];
+					blobId = await new Database(user).get('path:' + path);
+					if (!blobId) {
+						response.send(JSON.stringify({action: "error", error: message.path + ' not found'}), 0x1);
+						request.close();
+					}
+				}
+				response.send(JSON.stringify({action: "session", credentials: credentials}), 0x1);
+
+				options.api = message.api || [];
+				options.credentials = credentials;
+				var sessionId = makeSessionId();
+				if (blobId) {
+					process = await getSessionProcessBlob(blobId, sessionId, options);
+				}
+				if (process) {
+					process.app.readOutput(function(message) {
+						response.send(JSON.stringify(message), 0x1);
+					});
+					process.app.send();
+				}
+
+				var ping = function() {
+					var now = Date.now();
+					var again = true;
+					if (now - process.lastActive < process.timeout) {
+						// Active.
+					} else if (process.lastPing > process.lastActive) {
+						// We lost them.
+						if (process.task) {
+							process.task.kill();
+						}
+						again = false;
+					} else {
+						// Idle.  Ping them.
+						response.send("", 0x9);
+						process.lastPing = now;
+					}
+
+					if (again) {
+						setTimeout(ping, process.timeout);
+					}
+				}
+
+				if (process && process.timeout > 0) {
+					setTimeout(ping, process.timeout);
+				}
+			} else {
+				if (process && process.eventHandlers['message']) {
+					await invoke(process.eventHandlers['message'], [message]);
+				}
+			}
+		} else if (event.opCode == 0x8) {
+			// Close.
+			if (process) {
+				process.task.kill();
+			}
+			response.send(event.data, 0x8);
+		} else if (event.opCode == 0xa) {
+			// PONG
+		}
+
+		if (process) {
+			process.lastActive = Date.now();
+		}
+	}
+}
+
+exports.socket = socket;
--- a/core/auth.html
+++ b/core/auth.html
@ -7,8 +7,8 @@
 				document.getElementById("confirmPassword").style.display = document.getElementById("register").checked ? "block" : "none";
 			}
 		</script>
-		<link type="text/css" rel="stylesheet" href="/terminal/style.css">
-		<link type="image/png" rel="shortcut icon" href="/terminal/favicon.png">
+		<link type="text/css" rel="stylesheet" href="/static/style.css">
+		<link type="image/png" rel="shortcut icon" href="/static/favicon.png">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<!--HEAD-->
 	</head>
--- a/core/auth.js
+++ b/core/auth.js
@ -1,27 +1,14 @@
 "use strict";
-var kAccountsFile = "data/auth/accounts.json";

-var gAccounts = {};
 var gTokens = {};

-var bCryptLib = require('bCrypt');
-bCrypt = new bCryptLib.bCrypt();
-
 var form = require('form');
 var http = require('http');

-File.makeDirectory("data");
-File.makeDirectory("data/auth");
-File.makeDirectory("data/auth/db");
-var gDatabase = new Database("data/auth/db");
-
-try {
-	gAccounts = JSON.parse(new TextDecoder("UTF-8").decode(File.readFile(kAccountsFile)));
-} catch (error) {
-}
+var gDatabase = new Database("auth");

 function readSession(session) {
-	var result = session ? gDatabase.get("session_" + session) : null;
+	var result = session ? gDatabase.get("session:" + session) : null;

 	if (result) {
 		result = JSON.parse(result);
@ -38,11 +25,11 @@ function readSession(session) {
 }

 function writeSession(session, value) {
-	gDatabase.set("session_" + session, JSON.stringify(value));
+	gDatabase.set("session:" + session, JSON.stringify(value));
 }

 function removeSession(session, value) {
-	gDatabase.remove("session_" + session);
+	gDatabase.remove("session:" + session);
 }

 function newSession() {
@ -95,12 +82,14 @@ function authHandler(request, response) {
 			sessionIsNew = true;
 			formData = form.decodeForm(request.body, formData);
 			if (formData.submit == "Login") {
+				var account = gDatabase.get("user:" + formData.name);
+				account = account ? JSON.parse(account) : account;
 				if (formData.register == "1") {
-					if (!gAccounts[formData.name] &&
+					if (!account &&
 						formData.password == formData.confirm) {
-						gAccounts[formData.name] = {password: hashPassword(formData.password)};
 						writeSession(session, {name: formData.name});
-						File.writeFile(kAccountsFile, JSON.stringify(gAccounts));
+						account = {password: hashPassword(formData.password)};
+						gDatabase.set("user:" + formData.name, JSON.stringify(account));
 						if (noAdministrator()) {
 							makeAdministrator(formData.name);
 						}
@ -108,9 +97,9 @@ function authHandler(request, response) {
 						loginError = "Error registering account.";
 					}
 				} else {
-					if (gAccounts[formData.name] &&
-						gAccounts[formData.name].password &&
-						verifyPassword(formData.password, gAccounts[formData.name].password)) {
+					if (account &&
+						account.password &&
+						verifyPassword(formData.password, account.password)) {
 						writeSession(session, {name: formData.name});
 						if (noAdministrator()) {
 							makeAdministrator(formData.name);
@ -142,44 +131,6 @@ function authHandler(request, response) {
 				}
 				contents += '<div><a href="/login/logout">Logout</a></div>\n';
 			} else {
-				if (gGlobalSettings && gGlobalSettings['google-signin-client_id']) {
-					html = html.replace("<!--HEAD-->", `
-		<script src="https://apis.google.com/js/platform.js" async defer></script>
-		<meta name="google-signin-client_id" content="${gGlobalSettings['google-signin-client_id']}">
-		<script>
-			function onGoogleSignIn(user) {
-				var token = user.getAuthResponse().id_token;
-				var xhr = new XMLHttpRequest();
-				xhr.open("POST", "/login/google");
-				xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-				xhr.onload = function() {
-					if (xhr.status == 200) {
-						var redirected = false;
-						if (window.location.search.length) {
-							var query = window.location.search.substring(1);
-							var parts = query.split("&");
-							for (var i = 0; i < parts.length; i++) {
-								var part = decodeURIComponent(parts[i]);
-								var key = part.substring(0, part.indexOf('='));
-								var value = part.substring(part.indexOf('=') + 1);
-								if (key == "return") {
-									redirected = true;
-									window.location.href = value;
-								}
-							}
-						}
-						if (!redirected) {
-							window.location.path = "/";
-						}
-					} else {
-						alert(xhr.response);
-					}
-				};
-				xhr.send('token=' + token);
-			}
-		</script>
-		`);
-				}
 				contents += '<form method="POST">\n';
 				if (loginError) {
 					contents += "<p>" + loginError + "</p>\n";
@ -197,10 +148,6 @@ function authHandler(request, response) {
 				contents += '<div><input id="loginButton" type="submit" name="submit" value="Login"></div>\n';
 				contents += '</div>';
 				contents += '<div class="auth_or"> - or - </div>';
-				if (gGlobalSettings && gGlobalSettings['google-signin-client_id']) {
-					contents += '<div class="g-signin2" data-onsuccess="onGoogleSignIn" data-scope="profile"></div>';
-					contents += '<div class="auth_or"> - or - </div>';
-				}
 				contents += '<div id="auth_guest">\n';
 				contents += '<input id="guestButton" type="submit" name="submit" value="Proceeed as Guest">\n';
 				contents += '</div>\n';
@ -215,47 +162,12 @@ function authHandler(request, response) {
 		removeSession(session);
 		response.writeHead(303, {"Set-Cookie": "session=; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT", "Location": "/login" + (request.query ? "?" + request.query : "")});
 		response.end();
-	} else if (request.uri == "/login/google") {
-		var formData = form.decodeForm(request.query, form.decodeForm(request.body));
-		return verifyGoogleToken(formData.token).then(function(user) {
-			if (user && user.aud == gGlobalSettings['google-signin-client_id']) {
-				session = newSession();
-				var userId = user.name;
-				if (gAccounts[userId] && !gAccounts[userId].google) {
-					response.writeHead(500, {"Content-Type": "text/plain; charset=utf-8", "Connection": "close"});
-					response.end("Account already exists and is not a Google account.");
-				} else {
-					if (!gAccounts[userId]) {
-						gAccounts[userId] = {google: true};
-						File.writeFile(kAccountsFile, JSON.stringify(gAccounts));
-						if (noAdministrator()) {
-							makeAdministrator(userId);
-						}
-					}
-
-					writeSession(session, {name: userId, google: true});
-
-					var cookie = "session=" + session + "; path=/; Max-Age=604800";
-					response.writeHead(200, {"Content-Type": "text/json; charset=utf-8", "Connection": "close", "Set-Cookie": cookie});
-					response.end(JSON.stringify(user));
-				}
-			} else {
-				response.writeHead(500, {"Content-Type": "text/plain; charset=utf-8", "Connection": "close"});
-				response.end();
-			}
-		});
 	} else {
 		response.writeHead(200, {"Content-Type": "text/plain; charset=utf-8", "Connection": "close"});
 		response.end("Hello, " + request.client.peerName + ".");
 	}
 }

-function verifyGoogleToken(token) {
-	return http.get("https://www.googleapis.com/oauth2/v3/tokeninfo?id_token=" + token).then(function(response) {
-		return JSON.parse(response.body);
-	});
-}
-
 function getPermissions(session) {
 	var permissions;
 	var entry = readSession(session);
--- a/core/bCrypt.js
+++ b/core/bCrypt.js
@ -1,533 +0,0 @@
-var isaac = require('isaac');
-
-function bCrypt() {
-	this.GENSALT_DEFAULT_LOG2_ROUNDS = 10;
-	this.BCRYPT_SALT_LEN = 16;
-	this.BLOWFISH_NUM_ROUNDS = 16;
-	this.MAX_EXECUTION_TIME = 100;
-	this.P_orig = [0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822,
-			0x299f31d0, 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377,
-			0xbe5466cf, 0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5,
-			0xb5470917, 0x9216d5d9, 0x8979fb1b];
-	this.S_orig = [0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed,
-			0x6a267e96, 0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7,
-			0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3,
-			0xf4933d7e, 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-			0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013, 0xc5d1b023,
-			0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e,
-			0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27, 0x78af2fda,
-			0x55605c60, 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-			0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, 0xa15486af,
-			0x7c72e993, 0xb3ee1411, 0x636fbc2a, 0x2ba9c55d, 0x741831f6,
-			0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, 0x7a325381,
-			0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-			0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d,
-			0xe98575b1, 0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5,
-			0x0f6d6ff3, 0x83f44239, 0x2e0b4482, 0xa4842004, 0x69c8f04a,
-			0x9e1f9b5e, 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-			0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, 0x6eef0b6c,
-			0x137a3be4, 0xba3bf050, 0x7efb2a98, 0xa1f1651d, 0x39af0176,
-			0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3,
-			0x3b8b5ebe, 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-			0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, 0x37d0d724,
-			0xd00a1248, 0xdb0fead3, 0x49f1c09b, 0x075372c9, 0x80991b7b,
-			0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b, 0x976ce0bd,
-			0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-			0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f,
-			0x9b30952c, 0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd,
-			0x660f2807, 0x192e4bb3, 0xc0cba857, 0x45c8740f, 0xd20b5f39,
-			0xb9d3fbdb, 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-			0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8, 0x3c7516df,
-			0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760,
-			0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e,
-			0xdf1769db, 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-			0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, 0x10fa3d98,
-			0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, 0x9a53e479, 0xb6f84565,
-			0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341,
-			0xcee4c6e8, 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-			0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0,
-			0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64,
-			0x8888b812, 0x900df01c, 0x4fad5ea0, 0x688fc31c, 0xd1cff191,
-			0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-			0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, 0xb4a84fe0,
-			0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266, 0x80957705,
-			0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5,
-			0xfb9d35cf, 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-			0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, 0x2464369b,
-			0xf009b91e, 0x5563911d, 0x59dfa6aa, 0x78c14389, 0xd95a537f,
-			0x207d5ba2, 0x02e5b9c5, 0x83260376, 0x6295cfa9, 0x11c81968,
-			0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-			0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5,
-			0x571be91f, 0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6,
-			0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799,
-			0x6e85076a, 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-			0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, 0xecaa8c71,
-			0x699a17ff, 0x5664526c, 0xc2b19ee1, 0x193602a5, 0x75094c29,
-			0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, 0x6b8fe4d6,
-			0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-			0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f,
-			0x3ebaefc9, 0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286,
-			0xb79c5305, 0xaa500737, 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec,
-			0x5716f2b8, 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-			0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, 0xd19113f9,
-			0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc,
-			0xc8b57634, 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e,
-			0xa4751e41, 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-			0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf, 0x2cb81290,
-			0x24977c79, 0x5679b072, 0xbcaf89af, 0xde9a771f, 0xd9930810,
-			0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124, 0x501adde6,
-			0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-			0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847,
-			0x3215d908, 0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451,
-			0x50940002, 0x133ae4dd, 0x71dff89e, 0x10314e55, 0x81ac77d6,
-			0x5f11199b, 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-			0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, 0x86e34570,
-			0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa,
-			0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978,
-			0x9c10b36a, 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-			0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, 0x5223a708,
-			0xf71312b6, 0xebadfe6e, 0xeac31f66, 0xe3bc4595, 0xa67bc883,
-			0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, 0x65582185,
-			0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-			0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830,
-			0xeb61bd96, 0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239,
-			0xd59e9e0b, 0xcbaade14, 0xeecc86bc, 0x60622ca7, 0x9cab5cab,
-			0xb2f3846e, 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-			0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, 0x9b540b19,
-			0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77,
-			0x11ed935f, 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1,
-			0x7858ba99, 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-			0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128, 0x58ebf2ef,
-			0x34c6ffea, 0xfe28ed61, 0xee7c3c73, 0x5d4a14d9, 0xe864b7e3,
-			0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15,
-			0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-			0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2,
-			0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492,
-			0x47848a0b, 0x5692b285, 0x095bbf00, 0xad19489d, 0x1462b174,
-			0x23820e00, 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-			0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, 0x7cde3759,
-			0xcbee7460, 0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e,
-			0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc,
-			0x800bcadc, 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-			0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340, 0xc5c43465,
-			0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7, 0x8fb03d4a,
-			0xe6e39f2b, 0xdb83adf7, 0xe93d5a68, 0x948140f7, 0xf64c261c,
-			0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-			0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e,
-			0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af,
-			0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0,
-			0x31cb8504, 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-			0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, 0x68dc1462,
-			0xd7486900, 0x680ec0a4, 0x27a18dee, 0x4f3ffea2, 0xe887ad8c,
-			0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, 0xce78a399,
-			0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-			0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74,
-			0xdd5b4332, 0x6841e7f7, 0xca7820fb, 0xfb0af54e, 0xd8feb397,
-			0x454056ac, 0xba489527, 0x55533a3a, 0x20838d87, 0xfe6ba9b7,
-			0xd096954b, 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-			0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, 0xfdf8e802,
-			0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22,
-			0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4,
-			0x5d886e17, 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-			0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2,
-			0x02e1329e, 0xaf664fd1, 0xcad18115, 0x6b2395e0, 0x333e92e1,
-			0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, 0xde720c8c,
-			0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-			0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, 0x0a476341,
-			0x992eff74, 0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8,
-			0x991be14c, 0xdb6e6b0d, 0xc67b5510, 0x6d672c37, 0x2765d43b,
-			0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-			0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, 0xbb132f88,
-			0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979,
-			0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc,
-			0x782ef11c, 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-			0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, 0x44421659,
-			0x0a121386, 0xd90cec6e, 0xd5abea2a, 0x64af674e, 0xda86a85f,
-			0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, 0x60787bf8,
-			0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-			0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be,
-			0xbde8ae24, 0x55464299, 0xbf582e61, 0x4e58f48f, 0xf2ddfda2,
-			0xf474ef38, 0x8789bdc2, 0x5366f9c3, 0xc8b38e74, 0xb475f255,
-			0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-			0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, 0xb90bace1,
-			0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09,
-			0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025,
-			0x1d6efe10, 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-			0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, 0x50115e01,
-			0xa70683fa, 0xa002b5c4, 0x0de6d027, 0x9af88c27, 0x773f8641,
-			0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, 0x006058aa,
-			0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-			0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, 0x6f05e409,
-			0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9,
-			0x1ac15bb4, 0xd39eb8fc, 0xed545578, 0x08fca5b5, 0xd83d7cd3,
-			0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-			0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234,
-			0x92638212, 0x670efa8e, 0x406000e0, 0x3a39ce37, 0xd3faf5cf,
-			0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740,
-			0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-			0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f,
-			0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d,
-			0xd5730a1d, 0x4cd04dc6, 0x2939bbdb, 0xa9ba4650, 0xac9526e8,
-			0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-			0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, 0x83c061ba,
-			0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1,
-			0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69,
-			0x77fa0a59, 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-			0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a,
-			0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, 0x1f9f25cf, 0xadf2b89b,
-			0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6, 0x47b0acfd,
-			0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-			0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4,
-			0x88f46dba, 0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2,
-			0x97271aec, 0xa93a072a, 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb,
-			0x26dcf319, 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-			0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, 0x4de81751,
-			0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce,
-			0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369,
-			0x6413e680, 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-			0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, 0x5bbef7dd,
-			0x1b588d40, 0xccd2017f, 0x6bb4e3bb, 0xdda26a7e, 0x3a59ff45,
-			0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, 0x8d6612ae,
-			0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-			0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08,
-			0x4eb4e2cc, 0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d,
-			0x06b89fb4, 0xce6ea048, 0x6f3f3b82, 0x3520ab82, 0x011a1d4b,
-			0x277227f8, 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-			0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, 0xe01cc87e,
-			0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a,
-			0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c,
-			0xe0b12b4f, 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-			0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525, 0xfae59361,
-			0xceb69ceb, 0xc2a86459, 0x12baa8d1, 0xb6c1075e, 0xe3056a0c,
-			0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be,
-			0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-			0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d,
-			0x9b992f2e, 0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891,
-			0xce6279cf, 0xcd3e7e6f, 0x1618b166, 0xfd2c1d05, 0x848fd2c5,
-			0xf6fb2299, 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-			0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, 0xde966292,
-			0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a,
-			0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2,
-			0x35bdd2f6, 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-			0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c,
-			0xf746ce76, 0x77afa1c5, 0x20756060, 0x85cbfe4e, 0x8ae88dd8,
-			0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4,
-			0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-			0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6];
-	this.bf_crypt_ciphertext = [0x4f727068, 0x65616e42, 0x65686f6c, 0x64657253,
-			0x63727944, 0x6f756274];
-	this.base64_code = ['.', '/', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
-			'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V',
-			'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
-			'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-			'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8',
-			'9'];
-	this.index_64 = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1,
-			54, 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, -1, -1,
-			2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-			21, 22, 23, 24, 25, 26, 27, -1, -1, -1, -1, -1, -1, 28, 29, 30, 31,
-			32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
-			49, 50, 51, 52, 53, -1, -1, -1, -1, -1];
-	this.P;
-	this.S;
-	this.lr;
-	this.offp;
-};
-bCrypt.prototype.getByte = function(c) {
-	var ret = 0;
-	try {
-		var b = c.charCodeAt(0);
-	} catch (err) {
-		b = c;
-	}
-	if (b > 127) {
-		return -128 + (b % 128);
-	} else {
-		return b;
-	}
-};
-bCrypt.prototype.encode_base64 = function(d, len) {
-	var off = 0;
-	var rs = [];
-	var c1;
-	var c2;
-	if (len <= 0 || len > d.length)
-		throw "Invalid len";
-	while (off < len) {
-		c1 = d[off++] & 0xff;
-		rs.push(this.base64_code[(c1 >> 2) & 0x3f]);
-		c1 = (c1 & 0x03) << 4;
-		if (off >= len) {
-			rs.push(this.base64_code[c1 & 0x3f]);
-			break;
-		}
-		c2 = d[off++] & 0xff;
-		c1 |= (c2 >> 4) & 0x0f;
-		rs.push(this.base64_code[c1 & 0x3f]);
-		c1 = (c2 & 0x0f) << 2;
-		if (off >= len) {
-			rs.push(this.base64_code[c1 & 0x3f]);
-			break;
-		}
-		c2 = d[off++] & 0xff;
-		c1 |= (c2 >> 6) & 0x03;
-		rs.push(this.base64_code[c1 & 0x3f]);
-		rs.push(this.base64_code[c2 & 0x3f]);
-	}
-	return rs.join('');
-};
-bCrypt.prototype.char64 = function(x) {
-	var code = x.charCodeAt(0);
-	if (code < 0 || code > this.index_64.length) {
-		return -1;
-	}
-	return this.index_64[code];
-};
-bCrypt.prototype.decode_base64 = function(s, maxolen) {
-	var off = 0;
-	var slen = s.length;
-	var olen = 0;
-	var rs = [];
-	var c1, c2, c3, c4, o;
-	if (maxolen <= 0)
-		throw "Invalid maxolen";
-	while (off < slen - 1 && olen < maxolen) {
-		c1 = this.char64(s.charAt(off++));
-		c2 = this.char64(s.charAt(off++));
-		if (c1 == -1 || c2 == -1) {
-			break;
-		}
-		o = this.getByte(c1 << 2);
-		o |= (c2 & 0x30) >> 4;
-		rs.push(String.fromCharCode(o));
-		if (++olen >= maxolen || off >= slen) {
-			break;
-		}
-		c3 = this.char64(s.charAt(off++));
-		if (c3 == -1) {
-			break;
-		}
-		o = this.getByte((c2 & 0x0f) << 4);
-		o |= (c3 & 0x3c) >> 2;
-		rs.push(String.fromCharCode(o));
-		if (++olen >= maxolen || off >= slen) {
-			break;
-		}
-		c4 = this.char64(s.charAt(off++));
-		o = this.getByte((c3 & 0x03) << 6);
-		o |= c4;
-		rs.push(String.fromCharCode(o));
-		++olen;
-	}
-	var ret = [];
-	for (off = 0; off < olen; off++) {
-		ret.push(this.getByte(rs[off]));
-	}
-	return ret;
-};
-bCrypt.prototype.encipher = function(lr, off) {
-	var i;
-	var n;
-	var l = lr[off];
-	var r = lr[off + 1];
-
-	l ^= this.P[0];
-	for (i = 0; i <= this.BLOWFISH_NUM_ROUNDS - 2;) {
-		// Feistel substitution on left word
-		n = this.S[(l >> 24) & 0xff];
-		n += this.S[0x100 | ((l >> 16) & 0xff)];
-		n ^= this.S[0x200 | ((l >> 8) & 0xff)];
-		n += this.S[0x300 | (l & 0xff)];
-		r ^= n ^ this.P[++i];
-
-		// Feistel substitution on right word
-		n = this.S[(r >> 24) & 0xff];
-		n += this.S[0x100 | ((r >> 16) & 0xff)];
-		n ^= this.S[0x200 | ((r >> 8) & 0xff)];
-		n += this.S[0x300 | (r & 0xff)];
-		l ^= n ^ this.P[++i];
-	}
-	lr[off] = r ^ this.P[this.BLOWFISH_NUM_ROUNDS + 1];
-	lr[off + 1] = l;
-};
-bCrypt.prototype.streamtoword = function(data, offp) {
-	var i;
-	var word = 0;
-	var off = offp;
-	for (i = 0; i < 4; i++) {
-		word = (word << 8) | (data[off] & 0xff);
-		off = (off + 1) % data.length;
-	}
-	this.offp = off;
-	return word;
-};
-bCrypt.prototype.init_key = function() {
-	this.P = this.P_orig.slice();
-	this.S = this.S_orig.slice();
-};
-bCrypt.prototype.key = function(key) {
-	var i;
-	this.offp = 0;
-	var lr = new Array(0x00000000, 0x00000000);
-	var plen = this.P.length;
-	var slen = this.S.length;
-
-	for (i = 0; i < plen; i++) {
-		this.P[i] = this.P[i] ^ this.streamtoword(key, this.offp);
-	}
-	for (i = 0; i < plen; i += 2) {
-		this.encipher(lr, 0);
-		this.P[i] = lr[0];
-		this.P[i + 1] = lr[1];
-	}
-
-	for (i = 0; i < slen; i += 2) {
-		this.encipher(lr, 0);
-		this.S[i] = lr[0];
-		this.S[i + 1] = lr[1];
-	}
-};
-bCrypt.prototype.ekskey = function(data, key) {
-	var i;
-	this.offp = 0;
-	var lr = new Array(0x00000000, 0x00000000);
-	var plen = this.P.length;
-	var slen = this.S.length;
-
-	for (i = 0; i < plen; i++)
-		this.P[i] = this.P[i] ^ this.streamtoword(key, this.offp);
-	this.offp = 0;
-	for (i = 0; i < plen; i += 2) {
-		lr[0] ^= this.streamtoword(data, this.offp);
-		lr[1] ^= this.streamtoword(data, this.offp);
-		this.encipher(lr, 0);
-		this.P[i] = lr[0];
-		this.P[i + 1] = lr[1];
-	}
-	for (i = 0; i < slen; i += 2) {
-		lr[0] ^= this.streamtoword(data, this.offp);
-		lr[1] ^= this.streamtoword(data, this.offp);
-		this.encipher(lr, 0);
-		this.S[i] = lr[0];
-		this.S[i + 1] = lr[1];
-	}
-};
-
-bCrypt.prototype.crypt_raw = function(password, salt, log_rounds) {
-	var rounds;
-	var j;
-	var cdata = this.bf_crypt_ciphertext.slice();
-	var clen = cdata.length;
-	var one_percent;
-
-	if (log_rounds < 4 || log_rounds > 31)
-		throw "Bad number of rounds";
-	if (salt.length != this.BCRYPT_SALT_LEN)
-		throw "Bad salt length";
-
-	rounds = 1 << log_rounds;
-	one_percent = Math.floor(rounds / 100) + 1;
-	this.init_key();
-	this.ekskey(salt, password);
-
-	var obj = this;
-	var i = 0;
-	for (; i < rounds;) {
-		i = i + 1;
-		obj.key(password);
-		obj.key(salt);
-	}
-
-	for (i = 0; i < 64; i++) {
-		for (j = 0; j < (clen >> 1); j++) {
-			obj.encipher(cdata, j << 1);
-		}
-	}
-	var ret = [];
-	for (i = 0; i < clen; i++) {
-		ret.push(obj.getByte((cdata[i] >> 24) & 0xff));
-		ret.push(obj.getByte((cdata[i] >> 16) & 0xff));
-		ret.push(obj.getByte((cdata[i] >> 8) & 0xff));
-		ret.push(obj.getByte(cdata[i] & 0xff));
-	}
-	return ret;
-}
-
-bCrypt.prototype.hashpw = function(password, salt) {
-	var real_salt;
-	var passwordb = [];
-	var saltb = [];
-	var hashed = [];
-	var minor = String.fromCharCode(0);
-	var rounds = 0;
-	var off = 0;
-
-	if (!progress){
-	        var progress = function() {};
-	}
-
-	if (salt.charAt(0) != '$' || salt.charAt(1) != '2')
-		throw "Invalid salt version";
-	if (salt.charAt(2) == '$')
-		off = 3;
-	else {
-		minor = salt.charAt(2);
-		if (minor != 'a' || salt.charAt(3) != '$')
-			throw "Invalid salt revision";
-		off = 4;
-	}
-
-	// Extract number of rounds
-	if (salt.charAt(off + 2) > '$')
-		throw "Missing salt rounds";
-	var r1 = parseInt(salt.substring(off, off + 1)) * 10;
-	var r2 = parseInt(salt.substring(off + 1, off + 2));
-	rounds = r1 + r2;
-	real_salt = salt.substring(off + 3, off + 25);
-	password = password + (minor >= 'a' ? "\000" : "");
-	for (var r = 0; r < password.length; r++) {
-		passwordb.push(this.getByte(password.charAt(r)));
-	}
-	saltb = this.decode_base64(real_salt, this.BCRYPT_SALT_LEN);
-	var obj = this;
-	var hashed = this.crypt_raw(passwordb, saltb, rounds);
-	var rs = [];
-	rs.push("$2");
-	if (minor >= 'a')
-		rs.push(minor);
-	rs.push("$");
-	if (rounds < 10)
-		rs.push("0");
-	rs.push(rounds.toString());
-	rs.push("$");
-	rs.push(obj.encode_base64(saltb, saltb.length));
-	rs.push(obj.encode_base64(hashed, obj.bf_crypt_ciphertext.length * 4 - 1));
-	return rs.join('');
-};
-
-bCrypt.prototype.gensalt = function(rounds) {
-	var iteration_count = rounds;
-	if (iteration_count < 4 || iteration_count > 31) {
-		iteration_count = this.GENSALT_DEFAULT_LOG2_ROUNDS;
-	}
-	var output = [];
-	output.push("$2a$");
-	if (iteration_count < 10)
-		output.push("0");
-	output.push(iteration_count.toString());
-	output.push('$');
-	var s1 = [];	
-	for (var r = 0; r < this.BCRYPT_SALT_LEN; r++){
-		s1.push(Math.abs(isaac.rand()));
-	}
-	output.push(this.encode_base64(s1,this.BCRYPT_SALT_LEN))
-	return output.join('');
-};
-
-bCrypt.prototype.ready = function(){
-	return true;
-};
-
-exports.bCrypt = bCrypt;
--- a/core/client.js
+++ b/core/client.js
@ -2,16 +2,10 @@

 var gSocket;
 var gCredentials;
-var gErrorCount = 0;
-var gCommandHistory = [];
-var gSendKeyEvents = false;
-var gSendDeviceOrientationEvents = false;
-var gGeolocatorWatch;

+var gCurrentFile;
+var gFiles = {};
 var gEditor;
-var gBackup;
-
-var kMaxCommandHistory = 16;

 var kErrorColor = "#dc322f";
 var kStatusColor = "#fff";
@ -35,31 +29,6 @@ window.addEventListener("keydown", function(event) {
 	}
 });

-function keydown(event) {
-	if (event.keyCode == 13) {
-		gCommandHistory.push(document.getElementById("input").value);
-		if (gCommandHistory.length > kMaxCommandHistory) {
-			gCommandHistory.shift();
-		}
-		send();
-		event.preventDefault();
-	} else if (event.keyCode == 38 && !event.altKey) {
-		if (gCommandHistory.length) {
-			var input = document.getElementById("input");
-			gCommandHistory.unshift(input.value);
-			input.value = gCommandHistory.pop();
-			event.preventDefault();
-		}
-	} else if (event.keyCode == 40 && !event.altKey) {
-		if (gCommandHistory.length) {
-			var input = document.getElementById("input");
-			gCommandHistory.push(input.value);
-			input.value = gCommandHistory.shift();
-			event.preventDefault();
-		}
-	}
-}
-
 function ensureLoaded(nodes, callback) {
 	if (!nodes.length) {
 		callback();
@ -107,49 +76,42 @@ function edit() {
 	}

 	ensureLoaded([
-		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/codemirror.min.js"}},
-		{tagName: "link", attributes: {rel: "stylesheet", href: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/theme/base16-dark.min.css"}},
-		{tagName: "link", attributes: {rel: "stylesheet", href: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/addon/search/matchesonscrollbar.min.css"}},
-		{tagName: "link", attributes: {rel: "stylesheet", href: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/addon/dialog/dialog.min.css"}},
-		{tagName: "link", attributes: {rel: "stylesheet", href: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/codemirror.min.css"}},
-		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/addon/edit/trailingspace.min.js"}},
-		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/addon/dialog/dialog.min.js"}},
-		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/addon/search/search.min.js"}},
-		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/addon/search/searchcursor.min.js"}},
-		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/addon/search/jump-to-line.min.js"}},
-		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/addon/search/matchesonscrollbar.min.js"}},
-		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/addon/scroll/annotatescrollbar.min.js"}},
-		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.23.0/mode/javascript/javascript.min.js"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/codemirror.min.js"}},
+		{tagName: "link", attributes: {rel: "stylesheet", href: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/theme/base16-dark.min.css"}},
+		{tagName: "link", attributes: {rel: "stylesheet", href: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/addon/search/matchesonscrollbar.min.css"}},
+		{tagName: "link", attributes: {rel: "stylesheet", href: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/addon/dialog/dialog.min.css"}},
+		{tagName: "link", attributes: {rel: "stylesheet", href: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/codemirror.min.css"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/addon/edit/trailingspace.min.js"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/addon/dialog/dialog.min.js"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/addon/search/search.min.js"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/addon/search/searchcursor.min.js"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/addon/search/jump-to-line.min.js"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/addon/search/matchesonscrollbar.min.js"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/addon/scroll/annotatescrollbar.min.js"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/mode/javascript/javascript.min.js"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/mode/css/css.min.js"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/mode/xml/xml.min.js"}},
+		{tagName: "script", attributes: {src: "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.57.0/mode/htmlmixed/htmlmixed.min.js"}},
 	], function() {
 		load();
 	});
-
 }

-function load() {
+function guessMode(name) {
+	return name.endsWith(".js") ? "javascript" :
+		name.endsWith(".html") ? "htmlmixed" :
+		null;
+}
+
+function loadFile(name, id) {
 	var request = new XMLHttpRequest();
 	request.addEventListener("loadend", function() {
-		if (request.status == 200 || request.status == 404) {
-			document.getElementById("editPane").style.display = 'flex';
-			if (!gEditor) {
-				gEditor = CodeMirror.fromTextArea(document.getElementById("editor"), {
-					'theme': 'base16-dark',
-					'lineNumbers': true,
-					'tabSize': 4,
-					'indentUnit': 4,
-					'indentWithTabs': true,
-					'showTrailingSpace': true,
-				});
+		if (request.status == 200) {
+			gFiles[name].doc = new CodeMirror.Doc(request.responseText, guessMode(name));
+			if (!Object.values(gFiles).some(x => !x.doc)) {
+				document.getElementById("editPane").style.display = 'flex';
+				openFile(Object.keys(gFiles).sort()[0]);
 			}
-			var text;
-			if (request.status == 200) {
-				text = request.responseText;
-			} else {
-				text = '// New script\nterminal.print("Hello, world!");\n';
-			}
-			gEditor.setValue(text);
-			gEditor.focus();
-			gBackup = text;
 		}
 	});
 	request.addEventListener("error", function() {
@ -164,7 +126,67 @@ function load() {
 		alert("Loading source aborted.");
 		closeEditor();
 	});
-	request.open("GET", url() + "/view");
+	request.open("GET", "/" + id + "/view");
+	request.send();
+}
+
+function load() {
+	var request = new XMLHttpRequest();
+	request.addEventListener("loadend", function() {
+		if (request.status == 200 || request.status == 404) {
+			if (!gEditor) {
+				gEditor = CodeMirror.fromTextArea(document.getElementById("editor"), {
+					'theme': 'base16-dark',
+					'lineNumbers': true,
+					'tabSize': 4,
+					'indentUnit': 4,
+					'indentWithTabs': true,
+					'showTrailingSpace': true,
+				});
+			}
+			gFiles = {};
+			var text;
+			var isApp = false;
+			if (request.status == 200) {
+				text = request.responseText;
+				try {
+					var json = JSON.parse(text);
+					if (json && json['type'] == 'tildefriends-app') {
+						isApp = true;
+						Object.keys(json['files']).forEach(function(name) {
+							gFiles[name] = {};
+							loadFile(name, json['files'][name]);
+						});
+					}
+				} catch {
+				}
+			}
+			if (!isApp) {
+				document.getElementById("editPane").style.display = 'flex';
+				if (!text) {
+					text = '// New script.\n';
+				}
+				gCurrentFile = 'app.js';
+				gFiles[gCurrentFile] = {
+					doc: new CodeMirror.Doc(text, guessMode(gCurrentFile)),
+				};
+				openFile(gCurrentFile);
+			}
+		}
+	});
+	request.addEventListener("error", function() {
+		alert("Error loading source.");
+		closeEditor();
+	});
+	request.addEventListener("timeout", function() {
+		alert("Timed out loading source.");
+		closeEditor();
+	});
+	request.addEventListener("abort", function() {
+		alert("Loading source aborted.");
+		closeEditor();
+	});
+	request.open("GET", url() + "view");
 	request.send();
 }

@ -172,73 +194,114 @@ function closeEditor() {
 	document.getElementById("editPane").style.display = 'none';
 }

-function revert() {
-	gEditor.setValue(gBackup);
-}
-
 function explodePath() {
 	return /^\/~([^\/]+)\/([^\/]+)(.*)/.exec(window.location.pathname);
 }

-function packageOwner() {
-	return explodePath()[1];
-}
-
-function packageName() {
-	return explodePath()[2];
-}
-
-function save(newName) {
+function save() {
 	document.getElementById("save").disabled = true;
-	document.getElementById("saveAs").disabled = true;
+	if (gCurrentFile) {
+		gFiles[gCurrentFile].doc = gEditor.getDoc();
+	}

-	var contents = gEditor.getValue();
 	var run = document.getElementById("run").checked;

-	var request = new XMLHttpRequest();
+	var appFinished = function(success) {
+		document.getElementById("save").disabled = false;
+	}

 	var always = function() {
-		document.getElementById("save").disabled = false;
-		document.getElementById("saveAs").disabled = false;
+		var anyUnfinished = Object.values(gFiles).some(x => x.request);
+		var anyUnsaved = Object.values(gFiles).some(x => !x.id);
+		if (!anyUnfinished && !anyUnsaved) {
+			var app = {
+				type: "tildefriends-app",
+				files: Object.fromEntries(Object.keys(gFiles).map(x => [x, gFiles[x].id])),
+			};
+			Object.values(gFiles).forEach(function(file) { delete file.id; });
+
+			var request = new XMLHttpRequest();
+			request.addEventListener("error", function() {
+				alert("Error saving: " + request.responseText);
+				appFinished(false);
+			});
+			request.addEventListener("loadend", function() {
+				if (request.status == 200) {
+					var latest = document.getElementById('latest');
+					latest.href = request.responseText;
+					latest.style.visibility = request.responseText != window.location.path ? 'visible' : 'hidden';
+					if (run) {
+						if (request.responseText) {
+							reconnect(request.responseText);
+						} else {
+							reconnect(window.location.path);
+						}
+					}
+					appFinished(true);
+				} else {
+					alert("Unable to save: " + request.responseText);
+					appFinished(false);
+				}
+			});
+			request.addEventListener("timeout", function() {
+				alert("Timed out saving: " + request.responseText);
+				appFinished(false);
+			});
+			request.addEventListener("abort", function() {
+				alert("Save aborted: " + request.responseText);
+				appFinished(false);
+			});
+
+			var saveTo = null;
+			var name = document.getElementById("name");
+			if (name && name.value) {
+				saveTo = name.value + "save";
+			} else {
+				saveTo = url() + "save";
+			}
+			request.open("POST", saveTo, true);
+			request.setRequestHeader("Content-Type", "text/json");
+			request.send(JSON.stringify(app));
+		} else if (!anyUnfinished) {
+			appFinished(false);
+		}
 	};

-	request.addEventListener("error", function() {
-		alert("Error saving: " + request.responseText);
-		always();
-	});
-	request.addEventListener("loadend", function() {
-		if (request.status == 200) {
-			gBackup = contents;
-			if (run) {
-				if (newName) {
-					window.location.href = "/~" + packageOwner() + "/" + newName + hash();
-				} else {
-					reconnect();
+	Object.values(gFiles).forEach(function(file) {
+		delete file.id;
+		file.request = new XMLHttpRequest();
+		file.request.addEventListener("error", function() {
+			alert("Error saving: " + file.request.responseText);
+			file.request = null;
+			always();
+		});
+		file.request.addEventListener("loadend", function() {
+			if (file.request.status == 200) {
+				file.id = file.request.responseText;
+				if (file.id.charAt(0) == '/') {
+					file.id = file.id.substr(1);
 				}
+			} else {
+				alert("Unable to save: " + file.request.responseText);
 			}
-		} else {
-			alert("Unable to save: " + request.responseText);
-		}
-		always();
-	});
-	request.addEventListener("timeout", function() {
-		alert("Timed out saving: " + request.responseText);
-		always();
-	});
-	request.addEventListener("abort", function() {
-		alert("Save aborted: " + request.responseText);
-		always();
-	});
-	request.open("POST", newName ? newName + "/save" : packageName() + "/save", true);
-	request.setRequestHeader("Content-Type", "text/plain");
-	request.send(contents);
-}
+			file.request = null;
+			always();
+		});
+		file.request.addEventListener("timeout", function() {
+			alert("Timed out saving: " + file.request.responseText);
+			file.request = null;
+			always();
+		});
+		file.request.addEventListener("abort", function() {
+			alert("Save aborted: " + file.request.responseText);
+			file.request = null;
+			always();
+		});

-function saveAs() {
-	var newName = prompt("Save as:", packageName());
-	if (newName) {
-		save(newName);
-	}
+		file.request.open("POST", "/save", true);
+		file.request.setRequestHeader("Content-Type", "text/plain");
+		file.request.send(file.doc.getValue());
+	});
 }

 function url() {
@ -260,191 +323,30 @@ function hash() {
 	return window.location.hash != "#" ? window.location.hash : "";
 }

-function split(container, children) {
-	if (container) {
-		while (container.firstChild) {
-			container.removeChild(container.firstChild);
-		}
-	}
-	if (children) {
-		for (var i = 0; i < children.length; i++) {
-			if (children[i].name) {
-				var node = document.createElement("div");
-				node.setAttribute("id", "terminal_" + children[i].name);
-				var grow = children[i].grow || "1";
-				var shrink = children[i].shrink || "1";
-				var basis = children[i].basis || "auto";
-				var style = children[i].style || "";
-				node.setAttribute("style", style + "; flex: " + grow + " " + shrink + " " + basis);
-
-				var classes = ["terminal"];
-				if (children[i].type == "vertical") {
-					classes.push("vbox");
-				} else if (children[i].type == "horizontal") {
-					classes.push("hbox");
-				}
-				node.setAttribute("class", classes.join(" "));
-				container.appendChild(node);
-			} else if (children[i].type) {
-				node = document.createElement("div");
-				if (children[i].type == "horizontal") {
-					node.setAttribute("class", "hbox");
-				} else if (children[i].type == "vertical") {
-					node.setAttribute("class", "vbox");
-				}
-				container.appendChild(node);
-				split(node, children[i].children);
-			}
+function receive(message) {
+	if (message && message.action == "session") {
+		setStatusMessage("...Executing...", kStatusColor, true);
+		gCredentials = message.credentials;
+		updateLogin();
+	} else if (message && message.action == "ready") {
+		setStatusMessage(null);
+		if (window.location.hash) {
+			send({event: "hashChange", hash: window.location.hash});
 		}
+	} else if (message && message.action == "setDocument") {
+		var iframe = document.getElementById("document");
+		iframe.srcdoc = message.content;
+	} else if (message && message.action == "postMessage") {
+		var iframe = document.getElementById("document");
+		iframe.contentWindow.postMessage(message.message, "*");
+	} else if (message && message.action == "ping") {
+		gSocket.send(JSON.stringify({action: "pong"}));
+	} else if (message && message.action == "error") {
+		setStatusMessage(message.error.message + '\n' + message.error.stack, '#f00', false);
+		console.log(message.error);
 	}
 }

-var gCorkCount = 0;
-var gCorkLines = [];
-
-function receive(data) {
-	for (var i in data.lines) {
-		var line = data.lines[i];
-
-		if (line && line[0] && line[0].action == "cork"
-			|| line && line.value && line.value[0].action == "cork") {
-			++gCorkCount;
-			continue;
-		} else if (line && line[0] && line[0].action == "uncork"
-			|| line && line.value && line.value[0].action == "uncork") {
-			if (--gCorkCount <= 0) {
-				receive({lines: gCorkLines});
-				gCorkLines.length = 0;
-			}
-			continue;
-		}
-
-		if (gCorkCount > 0) {
-			gCorkLines.push(line);
-			continue;
-		}
-
-		var target = document.getElementsByClassName("terminal")[0].id;
-		if (line && line.terminal) {
-			if (document.getElementById("terminal_" + line.terminal)) {
-				target = "terminal_" + line.terminal;
-			}
-			line = line.value;
-		}
-
-		if (line && line.action == "ping") {
-			gSocket.send(JSON.stringify({action: "pong"}));
-		} else if (line && line.action == "session") {
-			setStatusMessage("...Executing...", kStatusColor, true);
-			gCredentials = line.credentials;
-			updateLogin();
-		} else if (line && line[0] && line[0].action == "ready") {
-			setStatusMessage(null);
-			if (window.location.hash) {
-				send({event: "hashChange", hash: window.location.hash});
-			}
-		} else if (line && line[0] && line[0].action == "notify") {
-			if (window.Notification) {
-				new Notification(line[0].title, line[0].options);
-			}
-		} else if (line && line[0] && line[0].action == "setTitle") {
-			window.document.title = line[0].value;
-		} else if (line && line[0] && line[0].action == "setPrompt") {
-			var prompt = document.getElementById("prompt");
-			while (prompt.firstChild) {
-				prompt.removeChild(prompt.firstChild);
-			}
-			prompt.appendChild(document.createTextNode(line[0].value));
-		} else if (line && line[0] && line[0].action == "setPassword") {
-			var prompt = document.getElementById("input");
-			prompt.setAttribute("type", line[0].value ? "password" : "text");
-		} else if (line && line[0] && line[0].action == "setHash") {
-			window.location.hash = line[0].value;
-		} else if (line && line[0] && line[0].action == "update") {
-			document.getElementById("update").setAttribute("Style", "display: inline");
-		} else if (line && line[0] && line[0].action == "split") {
-			split(document.getElementById("terminals"), line[0].options);
-		} else if (line && line[0] && line[0].action == "postMessageToIframe") {
-			var iframe = document.getElementById("iframe_" + line[0].name);
-			if (iframe) {
-				iframe.contentWindow.postMessage(line[0].message, "*");
-			}
-		} else if (line && line[0] && line[0].action == "setSendKeyEvents") {
-			var value = line[0].value;
-			if (value && !gSendKeyEvents) {
-				window.addEventListener("keydown", keyEvent);
-				window.addEventListener("keypress", keyEvent);
-				window.addEventListener("keyup", keyEvent);
-			} else if (!value && gSendKeyEvents) {
-				window.removeEventListener("keydown", keyEvent);
-				window.removeEventListener("keypress", keyEvent);
-				window.removeEventListener("keyup", keyEvent);
-			}
-			gSendKeyEvents = value;
-		} else if (line && line[0] && line[0].action == "getCurrentPosition") {
-				navigator.geolocation.getCurrentPosition(geolocationPosition, geolocationError, line[0].options);
-		} else if (line && line[0] && line[0].action == "watchPosition") {
-			if (navigator && navigator.geolocation && gGeolocatorWatch === undefined) {
-				gGeolocatorWatch = navigator.geolocation.watchPosition(geolocationPosition, geolocationError, line[0].options);
-			}
-		} else if (line && line[0] && line[0].action == "clearWatch") {
-			if (navigator && navigator.geolocation && gGeolocatorWatch !== undefined) {
-				navigator.geolocation.clearWatch(gGeolocatorWatch);
-			}
-		} else if (line && line[0] && line[0].action == "setSendDeviceOrientationEvents") {
-			let value = line[0].value;
-			if (value && !gSendDeviceOrientationEvents) {
-				window.addEventListener("deviceorientation", deviceOrientation);
-			} else if (!value && gSendDeviceOrientationEvents) {
-				window.removeEventListener("deviceorientation", deviceOrientation);
-			}
-			gSendDeviceOrientationEvents = value;
-		} else {
-			print(document.getElementById(target), line);
-		}
-	}
-}
-
-function geolocationPosition(position) {
-	send({
-		event: 'geolocation',
-		position: {
-			timestamp: position.timestamp,
-			coords: {
-				latitude: position.coords.latitude,
-				longitude: position.coords.longitude,
-				altitude: position.coords.altitude,
-				accuracy: position.coords.accuracy,
-				altitudeAccuracy: position.coords.altitudeAccuracy,
-				heading: position.coords.heading,
-				speed: position.coords.speed,
-			},
-		},
-	});
-}
-
-function geolocationError(error) {
-	send({
-		event: 'geolocation',
-		error: {
-			code: error.code,
-			message: error.message,
-		},
-	});
-}
-
-function deviceOrientation(event) {
-	send({
-		event: 'deviceorientation',
-		orientation: {
-			alpha: event.alpha,
-			beta: event.beta,
-			gamma: event.gamma,
-			absolute: event.absolute,
-		},
-	});
-};
-
 function keyEvent(event) {
 	send({
 		event: "key",
@ -458,133 +360,6 @@ function keyEvent(event) {
 	});
 }

-function autoNewLine(terminal) {
-	terminal.appendChild(document.createElement("br"));
-}
-
-function print(terminal, data) {
-	autoNewLine(terminal);
-	printStructured(terminal, data);
-	autoScroll(terminal);
-}
-
-function printSvg(container, data, name, namespace) {
-	var node;
-	if (typeof data == "string") {
-		node = document.createTextNode(data);
-	} else {
-		node = document.createElementNS("http://www.w3.org/2000/svg", name);
-		for (var i in data.attributes) {
-			node.setAttribute(i, data.attributes[i]);
-		}
-		if (data.children) {
-			for (var i in data.children) {
-				node.appendChild(printSvg(node, data.children[i], data.children[i].name));
-			}
-		}
-	}
-	return node;
-}
-
-function printStructured(container, data) {
-	if (typeof data == "string") {
-		container.appendChild(document.createTextNode(data));
-	} else if (data && data[0] !== undefined) {
-		for (var i in data) {
-			printStructured(container, data[i]);
-		}
-	} else if (data && data.action == "clear") {
-		while (container.firstChild) {
-			container.removeChild(container.firstChild);
-		}
-	} else if (data) {
-		var node;
-		if (data.href) {
-			node = document.createElement("a");
-			node.setAttribute("href", data.href);
-			node.setAttribute("target", data.target || "_blank");
-		} else if (data.iframe) {
-			node = document.createElement("iframe");
-			if (data.src) {
-				node.setAttribute("src", data.src);
-			} else {
-				node.setAttribute("srcdoc", data.iframe);
-			}
-			node.setAttribute("sandbox", "allow-forms allow-scripts allow-top-navigation allow-same-origin");
-			if (data.width !== null) {
-				node.setAttribute("width", data.width || 320);
-			}
-			if (data.height !== null) {
-				node.setAttribute("height", data.height || 240);
-			}
-			if (data.name) {
-				node.setAttribute("id", "iframe_" + data.name);
-			}
-		} else if (data.svg) {
-			node = printSvg(container, data.svg, "svg");
-		} else if (data.image) {
-			node = document.createElement("img");
-			node.setAttribute("src", data.image);
-		} else if (data.input) {
-			node = document.createElement("input");
-			node.setAttribute("type", data.input);
-			if (data.name) {
-				node.name = data.name;
-			}
-			if (data.input == "submit") {
-				node.onclick = submitButton;
-			}
-		} else {
-			node = document.createElement("span");
-		}
-
-		if (data.style) {
-			node.setAttribute("style", data.style);
-		}
-		if (data.class) {
-			node.setAttribute("class", data.class);
-		}
-		var value = data.value || data.href || data.command || "";
-		if (data.input) {
-			node.value = value;
-		} else if (!value && data.message && data.stackTrace) {
-			printStructured(node, data.message);
-			node.appendChild(document.createElement("br"));
-			printStructured(node, data.fileName + ":" + data.lineNumber + ":");
-			node.appendChild(document.createElement("br"));
-			if (data.stackTrace.length) {
-				for (var i = 0; i < data.stackTrace.length; i++) {
-					printStructured(node, data.stackTrace[i]);
-					node.appendChild(document.createElement("br"));
-				}
-			} else {
-				printStructured(node, data.sourceLine);
-			}
-		} else if (value === undefined) {
-			printStructured(node, JSON.stringify(value));
-		} else {
-			printStructured(node, value);
-		}
-		if (data.command) {
-			node.dataset.command = data.command;
-			node.onclick = commandClick;
-			node.setAttribute("class", "command");
-		}
-		container.appendChild(node);
-	} else {
-		printStructured(container, JSON.stringify(data));
-	}
-}
-
-function commandClick() {
-	send(this.dataset.command);
-	document.getElementById("input").focus();
-}
-
-function autoScroll(terminal) {
-	terminal.scrollTop = terminal.scrollHeight - terminal.clientHeight;
-}
-
 function setStatusMessage(message, color, keep) {
 	var node = document.getElementById("status");
 	if (!keep) {
@ -594,18 +369,13 @@ function setStatusMessage(message, color, keep) {
 	}
 	if (message) {
 		node.appendChild(document.createTextNode(message));
-		node.setAttribute("style", "display: inline; color: " + (color || kErrorColor));
+		node.setAttribute("style", "display: inline-block; vertical-align: top; white-space: pre; color: " + (color || kErrorColor));
 	}
 }

-function send(command) {
-	var value = command;
-	if (!command) {
-		value = document.getElementById("input").value;
-		document.getElementById("input").value = "";
-	}
+function send(value) {
 	try {
-		gSocket.send(JSON.stringify({action: "command", command: value}));
+		gSocket.send(JSON.stringify(value));
 	} catch (error) {
 		setStatusMessage("Send failed: " + error.toString(), kErrorColor);
 	}
@ -620,15 +390,7 @@ function updateLogin() {
 	var a = document.createElement("a");
 	if (gCredentials && gCredentials.session) {
 		a.appendChild(document.createTextNode("logout " + gCredentials.session.name));
-		if (gCredentials.session.google) {
-			gapi.load("auth2", function() {
-				gapi.auth2.init();
-			});
-			a.setAttribute("onclick", "logoutGoogle()");
-			a.setAttribute("href", "#");
-		} else {
-			a.setAttribute("href", "/login/logout?return=" + encodeURIComponent(url() + hash()));
-		}
+		a.setAttribute("href", "/login/logout?return=" + encodeURIComponent(url() + hash()));
 	} else {
 		a.appendChild(document.createTextNode("login"));
 		a.setAttribute("href", "/login?return=" + encodeURIComponent(url() + hash()));
@ -636,12 +398,6 @@ function updateLogin() {
 	login.appendChild(a);
 }

-function logoutGoogle() {
-	gapi.auth2.getAuthInstance().signOut().then(function() {
-		window.location.href = "/login/logout?return=" + encodeURIComponent(url() + hash());
-	});
-}
-
 var gOriginalInput;
 function dragHover(event) {
 	event.stopPropagation();
@ -731,7 +487,6 @@ function enableDragDrop() {
 	var body = document.body;
 	body.addEventListener("dragover", dragHover);
 	body.addEventListener("dragleave", dragHover);
-
 	body.addEventListener("drop", fileDrop);
 }

@ -753,77 +508,42 @@ function blur() {
 	}
 }

-function onMessage(event) {
+function message(event) {
 	if (event.data && event.data.event == "resizeMe" && event.data.width && event.data.height) {
 		var iframe = document.getElementById("iframe_" + event.data.name);
 		iframe.setAttribute("width", event.data.width);
 		iframe.setAttribute("height", event.data.height);
-		var node = iframe.parentElement;
-		while (node && !node.classList.contains("terminal")) {
-			node = node.parentElement;
-		}
-		if (node) {
-			autoScroll(node);
-		}
 	} else {
-		send({event: "onWindowMessage", message: event.data});
+		send({event: "message", message: event.data});
 	}
 }

-function submitButton() {
-	var inputs = document.getElementsByTagName("input");
-	var data = {};
-	for (var i in inputs) {
-		var input = inputs[i];
-		if (input.name) {
-			data[input.name] = input.value;
-		}
-	}
-	send({event: "submit", value: data});
-}
-
-function reconnect() {
+function reconnect(path) {
 	let oldSocket = gSocket;
 	gSocket = null
 	oldSocket.onclose = function() {}
 	oldSocket.onmessage = function() {}
 	oldSocket.close();
-	split(document.getElementById("terminals"), [{name: "terminal_"}]);
-	connectSocket();
+	connectSocket(path);
 }

-function connectSocket() {
+function connectSocket(path) {
 	if (!gSocket || gSocket.readyState == gSocket.CLOSED) {
 		setStatusMessage("Connecting...", kStatusColor, true);
 		gSocket = new WebSocket(
 			(window.location.protocol == "https:" ? "wss://" : "ws://")
 			+ window.location.hostname
 			+ (window.location.port.length ? ":" + window.location.port : "")
-			+ "/terminal/socket");
+			+ "/app/socket");
 		gSocket.onopen = function() {
 			setStatusMessage("...Authenticating...", kStatusColor, true);
 			gSocket.send(JSON.stringify({
 				action: "hello",
-				path: window.location.pathname,
-				terminalApi: [
-					['clear'],
-					['notify', 'title', 'options'],
-					['postMessageToIframe', 'name', 'message'],
-					['setHash', 'value'],
-					['setPassword', 'value'],
-					['setPrompt', 'value'],
-					['setTitle', 'value'],
-					['split', 'options'],
-					['setSendKeyEvents', 'value'],
-
-					['getCurrentPosition', 'options'],
-					['watchPosition', 'options'],
-					['clearWatch'],
-
-					['cork'],
-					['uncork'],
-
-					['setSendDeviceOrientationEvents', 'value'],
+				path: path,
+				api: [
+					['setDocument', 'content'],
+					['postMessage', 'message'],
+					['error', 'error'],
 				],
 			}));
 		}
@ -836,18 +556,71 @@ function connectSocket() {
 	}
 }

+function openFile(name) {
+	var newDoc = (name && gFiles[name]) ? gFiles[name].doc : new CodeMirror.Doc("", guessMode(name));
+	var oldDoc = gEditor.swapDoc(newDoc);
+	if (gFiles[gCurrentFile]) {
+		gFiles[gCurrentFile].doc = oldDoc;
+	}
+	gCurrentFile = name;
+	updateFiles();
+	gEditor.focus();
+}
+
+function onFileClicked(event) {
+	openFile(event.target.textContent);
+}
+
+function updateFiles() {
+	var node = document.getElementById("files");
+	while (node.firstChild) {
+		node.removeChild(node.firstChild);
+	}
+
+	for (var file of Object.keys(gFiles).sort()) {
+		var li = document.createElement("li");
+		li.onclick = onFileClicked;
+		li.appendChild(document.createTextNode(file));
+		if (file == gCurrentFile) {
+			li.classList.add("current");
+		}
+		node.appendChild(li);
+	}
+
+	gEditor.focus();
+}
+
+function makeNewFile(name) {
+	gFiles[name] = {
+		doc: new CodeMirror.Doc("", guessMode(name))
+	};
+	openFile(name);
+}
+
+function newFile() {
+	var name = prompt("Name of new file:", "file.js");
+	if (name && !gFiles[name]) {
+		makeNewFile(name);
+	}
+}
+
+function removeFile() {
+	if (confirm("Remove " + gCurrentFile + "?")) {
+		delete gFiles[gCurrentFile];
+		openFile(Object.keys(gFiles)[0]);
+	}
+}
+
 window.addEventListener("load", function() {
 	if (window.Notification) {
 		Notification.requestPermission();
 	}
-	var input = document.getElementById("input");
-	input.addEventListener("keydown", keydown);
-	input.focus();
 	window.addEventListener("hashchange", hashChange);
 	window.addEventListener("focus", focus);
 	window.addEventListener("blur", blur);
-	window.addEventListener("message", onMessage, false);
+	window.addEventListener("message", message, false);
 	window.addEventListener("online", connectSocket);
+	document.getElementById("name").value = window.location.pathname;
 	enableDragDrop();
-	connectSocket();
+	connectSocket(window.location.pathname);
 });
--- a/core/core.js
+++ b/core/core.js
@ -3,9 +3,8 @@
 require("encoding-indexes");
 require("encoding");

-var terminal = require("terminal");
 var auth = require("auth");
-var network = require("network");
+var app = require("app");

 var gProcessIndex = 0;
 var gProcesses = {};
@ -51,11 +50,29 @@ function printError(out, error) {
 	}
 }

+function invoke(handlers, argv) {
+	var promises = [];
+	if (handlers) {
+		for (var i = 0; i < handlers.length; ++i) {
+			try {
+				promises.push(handlers[i](...argv));
+			} catch (error) {
+				handlers.splice(i, 1);
+				i--;
+				promises.push(new Promise(function(resolve, reject) { reject(error); }));
+			}
+		}
+	}
+	return Promise.all(promises);
+}
+
 function broadcastEvent(eventName, argv) {
 	var promises = [];
 	for (var i in gProcesses) {
 		var process = gProcesses[i];
-		promises.push(invoke(process.eventHandlers[eventName], argv));
+		if (process.eventHandlers[eventName]) {
+			promises.push(invoke(process.eventHandlers[eventName], argv));
+		}
 	}
 	return Promise.all(promises);
 }
@ -75,53 +92,6 @@ function broadcast(message) {
 	return Promise.all(promises);
 }

-function getDatabase(process) {
-	if (!process.database) {
-		File.makeDirectory("data");
-		File.makeDirectory("data/" + process.packageOwner);
-		File.makeDirectory("data/" + process.packageOwner + "/" + process.packageName);
-		File.makeDirectory("data/" + process.packageOwner + "/" + process.packageName + "/db");
-		process.database = new Database("data/" + process.packageOwner + "/" + process.packageName + "/db");
-	}
-	return process.database;
-}
-
-function databaseGet(key) {
-	return getDatabase(this).get(key);
-}
-
-function databaseSet(key, value) {
-	return getDatabase(this).set(key, value);
-}
-
-function databaseRemove(key) {
-	return getDatabase(this).remove(key);
-}
-
-function databaseGetAll() {
-	return getDatabase(this).getAll();
-}
-
-async function getPackages() {
-	var packages = [];
-	var packageOwners = File.readDirectory("packages/");
-	for (var i = 0; i < packageOwners.length; i++) {
-		if (packageOwners[i].charAt(0) != ".") {
-			var packageNames = File.readDirectory("packages/" + packageOwners[i] + "/");
-			for (var j = 0; j < packageNames.length; j++) {
-				if (packageNames[j].charAt(0) != ".") {
-					packages.push({
-						owner: packageOwners[i],
-						name: packageNames[j],
-						manifest: await getManifest("packages/" + packageOwners[i] + "/" + packageNames[j] + "/" + packageNames[j] + ".js"),
-					});
-				}
-			}
-		}
-	}
-	return packages;
-}
-
 function getUser(caller, process) {
 	return {
 		name: process.userName,
@ -147,7 +117,9 @@ function getUsers(packageOwner, packageName) {
 }

 function postMessageInternal(from, to, message) {
-	return invoke(to.eventHandlers['onMessage'], [getUser(from, from), message]);
+	if (to.eventHandlers['message']) {
+		return invoke(to.eventHandlers['message'], [getUser(from, from), message]);
+	}
 }

 function killProcess(process) {
@ -156,47 +128,20 @@ function killProcess(process) {
 	}
 }

-async function getService(service, packageName) {
-	let process = this;
-	let serviceName = process.packageName + '_' + service;
-	let serviceProcess = await getServiceProcess(process.packageOwner, packageName || process.packageName, serviceName);
-	return serviceProcess.ready.then(function() {
-		return {
-			postMessage: postMessageInternal.bind(process, process, serviceProcess),
-			kill: killProcess.bind(process, serviceProcess),
-		}
-	});
-}
-
-function getSessionProcess(packageOwner, packageName, session, options) {
-	var actualOptions = {terminal: true, timeout: kPingInterval};
+async function getSessionProcessBlob(blobId, session, options) {
+	var actualOptions = {timeout: kPingInterval};
 	if (options) {
 		for (var i in options) {
 			actualOptions[i] = options[i];
 		}
 	}
-	return getProcess(packageOwner, packageName, 'session_' + session, actualOptions);
-}
-
-function getServiceProcess(packageOwner, packageName, service, options) {
-	return getProcess(packageOwner, packageName, 'service_' + packageOwner + '_' + packageName + '_' + service, options || {});
-}
-
-function badName(name) {
-	var bad = false;
-	if (name) {
-		for (var i = 0; i < name.length; i++) {
-			if ("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz01234567890-_".indexOf(name.charAt(i)) == -1) {
-				bad = true;
-				break;
-			}
-		}
-	}
-	return bad;
+	return getProcessBlob(blobId, 'session_' + session, actualOptions);
 }

 function readFileUtf8(fileName) {
-	return new TextDecoder("UTF-8").decode(File.readFile(fileName));
+	let data = File.readFile(fileName);
+	data = utf8Decode(data);
+	return data;
 }

 let gManifestCache = {};
@ -235,33 +180,23 @@ async function getManifest(fileName) {
 	return result;
 }

-async function getProcess(packageOwner, packageName, key, options) {
+async function getProcessBlob(blobId, key, options) {
 	var process = gProcesses[key];
 	if (!process
-		&& !(options && "create" in options && !options.create)
-		&& !badName(packageOwner) 
-		&& !badName(packageName)) {
+		&& !(options && "create" in options && !options.create)) {
 		try {
-			print("Creating task for " + packageName + " " + key);
-			var fileName = "packages/" + packageOwner + "/" + packageName + "/" + packageName + ".js";
-			var manifest = await getManifest(fileName);
+			print("Creating task for " + blobId + " " + key);
 			process = {};
 			process.key = key;
 			process.index = gProcessIndex++;
-			process.userName = options.userName || ('user' + process.index);
+			process.userName = 'user' + process.index;
 			process.credentials = options.credentials || {};
 			process.task = new Task();
 			process.eventHandlers = {};
-			process.packageOwner = packageOwner;
-			process.packageName = packageName;
-			if (options.terminal) {
-				process.terminal = new Terminal();
-			}
-			process.database = null;
+			process.app = new App();
 			process.lastActive = Date.now();
 			process.lastPing = null;
 			process.timeout = options.timeout;
-			process.connections = [];
 			var resolveReady;
 			var rejectReady;
 			process.ready = new Promise(function(resolve, reject) {
@ -271,24 +206,12 @@ async function getProcess(packageOwner, packageName, key, options) {
 			gProcesses[key] = process;
 			process.task.onExit = function(exitCode, terminationSignal) {
 				broadcastEvent('onSessionEnd', [getUser(process, process)]);
-				if (process.terminal) {
-					if (terminationSignal) {
-						process.terminal.print("Process terminated with signal " + terminationSignal + ".");
-					} else {
-						process.terminal.print("Process ended with exit code " + exitCode + ".");
-					}
-				}
-				for (let i = 0; i < process.connections.length; i++) {
-					process.connections[i].close();
-				}
-				process.connections.length = 0;
+				process.task = null;
 				delete gProcesses[key];
 			};
 			var imports = {
 				'core': {
 					'broadcast': broadcast.bind(process),
-					'getService': getService.bind(process),
-					'getPackages': getPackages.bind(process),
 					'getUsers': getUsers.bind(process),
 					'register': function(eventName, handler) {
 						if (!process.eventHandlers[eventName]) {
@ -297,7 +220,7 @@ async function getProcess(packageOwner, packageName, key, options) {
 						process.eventHandlers[eventName].push(handler);
 					},
 					'unregister': function(eventHandle, handler) {
-						if (process.eventHandlers(eventName)) {
+						if (process.eventHandlers[eventName]) {
 							let index = process.eventHandlers[eventName].indexOf(handler);
 							if (index != -1) {
 								process.eventHandlers[eventName].splice(index, 1);
@ -309,97 +232,62 @@ async function getProcess(packageOwner, packageName, key, options) {
 					},
 					'getUser': getUser.bind(null, process, process),
 					'user': getUser(process, process),
-				},
-				'database': {
-					'get': databaseGet.bind(process),
-					'set': databaseSet.bind(process),
-					'remove': databaseRemove.bind(process),
-					'getAll': databaseGetAll.bind(process),
-				},
+				}
 			};
-			if (options.terminal) {
-				imports.terminal = {
-					'print': process.terminal.print.bind(process.terminal),
-					'readLine': process.terminal.readLine.bind(process.terminal),
-					'setEcho': process.terminal.setEcho.bind(process.terminal),
-					'select': process.terminal.select.bind(process.terminal),
+			if (options.api) {
+				imports.app = {};
+				for (let i in options.api) {
+					let api = options.api[i];
+					imports.app[api[0]] = process.app.makeFunction(api);
+				}
+			}
+			process.task.onError = function(error) {
+				try {
+					process.app.send({action: 'error', error: error});
+				} catch(e) {
+					print(e);
+				}
+			};
+			imports.ssb = Object.fromEntries(Object.keys(ssb).map(key => [key, ssb[key].bind(ssb)]));
+			if (process.credentials &&
+				process.credentials.session &&
+				process.credentials.session.name) {
+				imports.database = function(key) {
+					var db = new Database(process.credentials.session.name + ':' + key);
+					return Object.fromEntries(Object.keys(db).map(x => [x, db[x].bind(db)]));
 				};
-				if (options.terminalApi) {
-					for (let i in options.terminalApi) {
-						let api = options.terminalApi[i];
-						imports.terminal[api[0]] = process.terminal.makeFunction(api);
-					}
-				}
-			}
-			if (manifest
-				&& manifest.permissions
-				&& manifest.permissions.indexOf("administration") != -1) {
-				if (getPermissionsForUser(packageOwner).administration) {
-					imports.administration = {
-						'setGlobalSettings': setGlobalSettings.bind(process),
-						'getGlobalSettings': getGlobalSettings.bind(process),
-						'getStatistics': function() { return statistics; },
-					};
-				} else {
-					throw new Error(packageOwner + " does not have right to permission 'administration'.");
-				}
-			}
-			if (manifest
-				&& manifest.permissions
-				&& manifest.permissions.indexOf("network") != -1) {
-				if (getPermissionsForUser(packageOwner).network) {
-					imports.network = {
-						'newConnection': newConnection.bind(process),
-					};
-				} else {
-					throw new Error(packageOwner + " does not have right to permission 'network'.");
-				}
-			}
-			if (manifest && manifest.require) {
-				let source = {};
-				for (let i in manifest.require) {
-					let name = manifest.require[i];
-					source[name] = readFileUtf8("packages/" + process.packageOwner + "/" + name + "/" + name + ".js");
-				}
-				process.task.setRequires(source);
 			}
 			process.task.setImports(imports);
-			print("Activating task");
 			process.task.activate();
-			print("Executing task");
-			await process.task.execute({name: fileName, source: readFileUtf8(fileName)});
-			print("Task ready");
+			let source = await ssb.blobGet(blobId);
+			var appSource = utf8Decode(source);
+			try {
+				var app = JSON.parse(appSource);
+				if (app.type == "tildefriends-app") {
+					var id = app.files["app.js"];
+					var blob = await ssb.blobGet(id);
+					appSource = utf8Decode(blob);
+					await Promise.all(Object.keys(app.files).map(async function(f) {
+						await process.task.loadFile([f, await ssb.blobGet(app.files[f])]);
+					}));
+				}
+			} catch (e) {
+				printError({print: print}, e);
+			}
 			broadcastEvent('onSessionBegin', [getUser(process, process)]);
 			resolveReady(process);
-			if (process.terminal) {
-				process.terminal.print({action: "ready"});
+			if (process.app) {
+				process.app.send({action: "ready"});
 			}
+			await process.task.execute({name: blobId, source: appSource});
 		} catch (error) {
-			printError(process.terminal, error);
+			printError({print: print}, error);
 			rejectReady();
 		}
 	}
 	return process;
 }

-function updateProcesses(packageOwner, packageName) {
-	for (var i in gProcesses) {
-		var process = gProcesses[i];
-		if (process.packageOwner == packageOwner
-			&& process.packageName == packageName) {
-			try {
-				if (process.terminal) {
-					process.terminal.notifyUpdate();
-				} else {
-					process.task.kill();
-				}
-			} catch (error) {
-				print(error);
-			}
-		}
-	}
-}
-
 function makeDirectoryForFile(fileName) {
 	var parts = fileName.split("/");
 	var path = "";
@ -429,6 +317,147 @@ try {
 	print("Error loading settings from " + kGlobalSettingsFile + ": " + error);
 }

+var kStaticFiles = [
+	{uri: '/', path: 'index.html', type: 'text/html; charset=UTF-8'},
+	{uri: '/style.css', path: 'style.css', type: 'text/css; charset=UTF-8'},
+	{uri: '/favicon.png', path: 'favicon.png', type: 'image/png'},
+	{uri: '/client.js', path: 'client.js', type: 'text/javascript; charset=UTF-8'},
+	{uri: '/robots.txt', path: 'robots.txt', type: 'text/plain; charset=UTF-8'},
+];
+
+function startsWithBytes(data, bytes) {
+	if (data.byteLength >= bytes.length) {
+		var dataBytes = new Uint8Array(data.slice(0, bytes.length));
+		for (var i = 0; i < bytes.length; i++) {
+			if (dataBytes[i] != bytes[i] || bytes[i] === null) {
+				return;
+			}
+		}
+		return true;
+	}
+}
+
+async function staticFileHandler(request, response, blobId, uri) {
+	for (var i in kStaticFiles) {
+		if (uri === kStaticFiles[i].uri) {
+			var data = File.readFile("core/" + kStaticFiles[i].path);
+			response.writeHead(200, {"Content-Type": kStaticFiles[i].type, "Content-Length": data.byteLength});
+			response.end(data);
+			return;
+		}
+	}
+
+	response.writeHead(404, {"Content-Type": "text/plain; charset=utf-8", "Content-Length": "File not found".length});
+	response.end("File not found");
+}
+
+function sendData(response, data) {
+	if (data) {
+		if (startsWithBytes(data, [0xff, 0xd8, 0xff, 0xdb]) ||
+			startsWithBytes(data, [0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01]) ||
+			startsWithBytes(data, [0xff, 0xd8, 0xff, 0xee]) ||
+			startsWithBytes(data, [0xff, 0xd8, 0xff, 0xe1, null, null, 0x45, 0x78, 0x69, 0x66, 0x00, 0x00])) {
+			response.writeHead(200, {"Content-Type": "image/jpeg", "Content-Length": data.byteLength});
+			response.end(data);
+		} else if (startsWithBytes(data, [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a])) {
+			response.writeHead(200, {"Content-Type": "image/png", "Content-Length": data.byteLength});
+			response.end(data);
+		} else if (startsWithBytes(data, [0x47, 0x49, 0x46, 0x38, 0x37, 0x61]) ||
+			startsWithBytes(data, [0x47, 0x49, 0x46, 0x38, 0x39, 0x61])) {
+			response.writeHead(200, {"Content-Type": "image/gif", "Content-Length": data.byteLength});
+			response.end(data);
+		} else {
+			response.writeHead(200, {"Content-Type": "text/javascript; charset=utf-8", "Content-Length": data.byteLength});
+			response.end(data);
+		}
+	} else {
+		response.writeHead(404, {"Content-Type": "text/plain; charset=utf-8", "Content-Length": "File not found".length});
+		response.end("File not found");
+	}
+}
+
+async function blobHandler(request, response, blobId, uri) {
+	var found = false;
+	if (!found) {
+		for (var i in kStaticFiles) {
+			if (uri === kStaticFiles[i].uri) {
+				found = true;
+				var data = File.readFile("core/" + kStaticFiles[i].path);
+				response.writeHead(200, {"Content-Type": kStaticFiles[i].type, "Content-Length": data.byteLength});
+				response.end(data);
+				break;
+			}
+		}
+	}
+
+	if (!uri) {
+		response.writeHead(301, {"Location": blobId + "/"});
+		response.end(data);
+		return;
+	}
+
+	if (!found) {
+		var process;
+		if (uri == "/view") {
+			var data;
+			if (match = /^\/\~(\w+)\/(\w+)$/.exec(blobId)) {
+				var id = await new Database(match[1]).get('path:' + match[2]);
+				if (id) {
+					data = await ssb.blobGet(id);
+					if (match[3]) {
+						var app = JSON.parse(data);
+						data = app.files[match[3]];
+					}
+				}
+			} else {
+				data = await ssb.blobGet(blobId);
+			}
+			sendData(response, data);
+		} else if (uri == "/save") {
+			let newBlobId = await ssb.blobStore(request.body);
+
+			var match;
+			if (match = /^\/\~(\w+)\/(\w+)$/.exec(blobId)) {
+				var user = match[1];
+				var app = match[2];
+				var credentials = auth.query(request.headers);
+				if (!credentials || !credentials.session || credentials.session.name != user) {
+					response.writeHead(401, {"Content-Type": "text/plain; charset=utf-8"});
+					response.end("401 Unauthorized");
+					return;
+				}
+				var database = new Database(user);
+				await database.set('path:' + app, newBlobId);
+			}
+
+			response.writeHead(200, {"Content-Type": "text/plain; charset=utf-8"});
+			response.end("/" + newBlobId);
+		} else {
+			var data;
+			if (match = /^\/\~(\w+)\/(\w+)$/.exec(blobId)) {
+				var db = new Database(match[1]);
+				var id = await db.get('path:' + match[2]);
+				if (id) {
+					data = utf8Decode(await ssb.blobGet(id));
+					var app = JSON.parse(data);
+					print(JSON.stringify(app));
+					data = app.files[uri.substring(1)];
+					data = await ssb.blobGet(data);
+				}
+			}
+			sendData(response, data);
+		}
+	}
+}
+
+ssb.onBroadcastsChanged = function() {
+	broadcastEvent('onBroadcastsChanged', []);
+}
+
+ssb.onConnectionsChanged = function() {
+	broadcastEvent('onConnectionsChanged', []);
+}
+
 var auth = require("auth");
 var httpd = require("httpd");
 httpd.all("/login", auth.handler);
@ -437,12 +466,20 @@ httpd.all("", function(request, response) {
 	if (request.uri === "/" || request.uri === "") {
 		response.writeHead(303, {"Location": gGlobalSettings.index, "Content-Length": "0"});
 		return response.end();
-	} else if (match = /^\/terminal(\/.*)/.exec(request.uri)) {
-		return terminal.handler(request, response, null, null, match[1]);
-	} else if (match = /^\/\~([^\/]+)\/([^\/]+)(.*)/.exec(request.uri)) {
-		return terminal.handler(request, response, match[1], match[2], match[3]);
+	} else if (match = /^(\/~[^\/]+\/[^\/]+)(\/?.*)$/.exec(request.uri)) {
+		return blobHandler(request, response, match[1], match[2]);
+	} else if (match = /^\/(&[^\.]*\.\w+)(\/?.*)/.exec(request.uri)) {
+		return blobHandler(request, response, match[1], match[2]);
+	} else if (match = /^\/static(\/.*)/.exec(request.uri)) {
+		return staticFileHandler(request, response, null, match[1]);
+	} else if (match = /^(.*)(\/save)$/.exec(request.uri)) {
+		return blobHandler(request, response, match[1], match[2]);
+	} else if (match = /^\/trace$/.exec(request.uri)) {
+		var data = trace();
+		response.writeHead(404, {"Content-Type": "application/json; charset=utf-8", "Content-Length": data.length.toString()});
+		return response.end(data);
 	} else if (request.uri == "/robots.txt") {
-		return terminal.handler(request, response, null, null, request.uri);
+		return blobHandler(request, response, null, request.uri);
 	} else if ((match = /^\/.well-known\/(.*)/.exec(request.uri)) && request.uri.indexOf("..") == -1) {
 		var data = File.readFile("data/global/.well-known/" + match[1]);
 		if (data) {
@ -458,4 +495,4 @@ httpd.all("", function(request, response) {
 		return response.end(data);
 	}
 });
-httpd.registerSocketHandler("/terminal/socket", terminal.socket);
+httpd.registerSocketHandler("/app/socket", app.socket);
--- a/core/httpd.js
+++ b/core/httpd.js
@ -212,11 +212,17 @@ function handleWebSocketRequest(request, response, client) {
 			packet.push((message.length >> 8) & 0xff);
 			packet.push(message.length & 0xff);
 		} else {
+			var high = 0; //(message.length / (1 ** 32)) & 0xffffffff;
+			var low = message.length & 0xffffffff;
 			packet.push((mask ? (1 << 7) : 0) | 127);
-			packet.push((message.length >> 24) & 0xff);
-			packet.push((message.length >> 16) & 0xff);
-			packet.push((message.length >> 8) & 0xff);
-			packet.push(message.length & 0xff);
+			packet.push((high >> 24) & 0xff);
+			packet.push((high >> 16) & 0xff);
+			packet.push((high >> 8) & 0xff);
+			packet.push((high >> 0) & 0xff);
+			packet.push((low >> 24) & 0xff);
+			packet.push((low >> 16) & 0xff);
+			packet.push((low >> 8) & 0xff);
+			packet.push(low & 0xff);
 		}

 		var array = new Uint8Array(packet.length + message.length);
@ -235,7 +241,7 @@ function handleWebSocketRequest(request, response, client) {
 			newBuffer.set(data, buffer.length);
 			buffer = newBuffer;

-			if (buffer.length >= 2) {
+			while (buffer.length >= 2) {
 				var bits0 = buffer[0];
 				var bits1 = buffer[1];
 				if (bits1 & (1 << 7) == 0) {
@ -291,6 +297,8 @@ function handleWebSocketRequest(request, response, client) {
 						}
 						frame = new Uint8Array(0);
 					}
+				} else {
+					break;
 				}
 			}
 		}
@ -444,24 +452,22 @@ function handleConnection(client) {

 var kBacklog = 8;
 var kHost = "0.0.0.0"
-var kHttpPort = gGlobalSettings.httpPort || 12345;
-var kHttpsPort = gGlobalSettings.httpsPort || null;

 var socket = new Socket();
-socket.bind(kHost, kHttpPort).then(function() {
+socket.bind(kHost, tildefriends.http_port).then(function() {
 	var listenResult = socket.listen(kBacklog, function() {
 		socket.accept().then(handleConnection).catch(function(error) {
-			logError("[" + new Date() + "] " + error);
+			logError("[" + new Date() + "] accept error " + error);
 		});
 	});
 }).catch(function(error) {
-	logError("[" + new Date() + "] " + error);
+	logError("[" + new Date() + "] bind error " + error);
 });

-if (kHttpsPort) {
+if (tildefriends.https_port) {
 	var tls = {};
 	var secureSocket = new Socket();
-	secureSocket.bind(kHost, kHttpsPort).then(function() {
+	secureSocket.bind(kHost, tildefriends.https_port).then(function() {
 		return secureSocket.listen(kBacklog, function() {
 			return secureSocket.accept().then(function(client) {
 				handleConnection(client);
@ -496,7 +502,7 @@ if (kHttpsPort) {
 			});
 		});
 	}).catch(function(error) {
-		logError("[" + new Date() + "] " + error);
+		logError("[" + new Date() + "] bind error " + error);
 	});
 }

--- a/core/index.html
+++ b/core/index.html
@ -2,8 +2,8 @@
 <html>
 	<head>
 		<title>Tilde Friends</title>
-		<link type="text/css" rel="stylesheet" href="/terminal/style.css">
-		<link type="image/png" rel="shortcut icon" href="/terminal/favicon.png">
+		<link type="text/css" rel="stylesheet" href="/static/style.css">
+		<link type="image/png" rel="shortcut icon" href="/static/favicon.png">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
 		<!--HEAD-->
 	</head>
@ -13,31 +13,39 @@
 			<span id="title">Tilde Friends</span>
 			<a href="/">home</a>
 			<a href="#" onclick="event.preventDefault(); edit()">edit</a>
-			<a href="$(VIEW_SOURCE)">view source</a>
-			<a href="/~cory/about">about</a>
+			<a href="/trace">trace</a>
 			<span id="status"></span>
-			<span id="update">update available! <a href="">refresh</a> to update</span>
 			<span id="login"></span>
 		</div>
 		<div id="content" class="hbox" style="flex: 1 1; width: 100%">
-			<div id="editPane" style="flex: 0 0 50%; display: none; flex-flow: column; overflow: auto">
+			<div id="editPane" class="vbox" style="display: none">
 				<div class="navigation">
 					<input type="button" id="closeEditor" name="closeEditor" value="Close" onclick="closeEditor()">
 					<input type="button" id="save" name="save" value="Save" onclick="save()">
-					<input type="button" id="saveAs" name="saveAs" value="Save As" onclick="saveAs()">
+					<input type="text" id="name" name="name"></input>
 					<input type="checkbox" id="run" name="run" checked><label for="run">Restart after save</label>
 					<input type="button" id="revert" name="revert" value="Revert to Saved" onclick="revert()">
+					<a id="latest" href="">Latest</a>
+				</div>
+				<div class="hbox" style="height: 100%">
+					<div id="filesPane">
+						<ul id="files">
+						</ul>
+						<br>
+						<div><button onclick="newFile()">New File</button></div>
+						<div><button onclick="removeFile()">Remove File</button></div>
+					</div>
+					<div id="docPane" style="display: flex; flex: 1 1 50%; flex-flow: column">
+						<div style="flex: 1 1 50%; position: relative">
+							<textarea id="editor" class="main"></textarea>
+						</div>
+					</div>
 				</div>
-				<textarea id="editor" class="main"></textarea>
 			</div>
 			<div class="vbox" style="flex: 1 0 50%; overflow: auto">
-				<div id="terminals" class="vbox"><div id="terminal_" class="terminal" style="flex: 1 1"></div></div>
-				<div class="input">
-					<span id="prompt">&gt;</span>
-					<input type='text' id='input'>
-				</div>
+				<iframe id="document" sandbox="allow-forms allow-scripts allow-top-navigation allow-modals" style="width: 100%; height: 100%; border: 0"></iframe>
 			</div>
 		</div>
-		<script src="/terminal/client.js"></script>
+		<script src="/static/client.js"></script>
 	</body>
 </html>
--- a/core/isaac.js
+++ b/core/isaac.js
@ -1,239 +0,0 @@
-/* ----------------------------------------------------------------------
- * Copyright (c) 2012 Yves-Marie K. Rinquin
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * ----------------------------------------------------------------------
- *
- * ISAAC is a cryptographically secure pseudo-random number generator
- * (or CSPRNG for short) designed by Robert J. Jenkins Jr. in 1996 and
- * based on RC4. It is designed for speed and security.
- *
- * ISAAC's informations & analysis:
- *   http://burtleburtle.net/bob/rand/isaac.html
- * ISAAC's implementation details:
- *   http://burtleburtle.net/bob/rand/isaacafa.html
- *
- * ISAAC succesfully passed TestU01
- *
- * ----------------------------------------------------------------------
- *
- * Usage:
- *   <script src="isaac.js"></script>
- *   var random_number = isaac.random();
- *
- * Output: [ 0x00000000; 0xffffffff]
- *         [-2147483648; 2147483647]
- *
- */
-
-
-/* js string (ucs-2/utf16) to a 32-bit integer (utf-8 chars, little-endian) array */
-String.prototype.toIntArray = function() {
-  var w1, w2, u, r4 = [], r = [], i = 0;
-  var s = this + '\0\0\0'; // pad string to avoid discarding last chars
-  var l = s.length - 1;
-
-  while(i < l) {
-    w1 = s.charCodeAt(i++);
-    w2 = s.charCodeAt(i+1);
-    if       (w1 < 0x0080) {
-      // 0x0000 - 0x007f code point: basic ascii
-      r4.push(w1);
-    } else if(w1 < 0x0800) {
-      // 0x0080 - 0x07ff code point
-      r4.push(((w1 >>>  6) & 0x1f) | 0xc0);
-      r4.push(((w1 >>>  0) & 0x3f) | 0x80);
-    } else if((w1 & 0xf800) != 0xd800) {
-      // 0x0800 - 0xd7ff / 0xe000 - 0xffff code point
-      r4.push(((w1 >>> 12) & 0x0f) | 0xe0);
-      r4.push(((w1 >>>  6) & 0x3f) | 0x80);
-      r4.push(((w1 >>>  0) & 0x3f) | 0x80);
-    } else if(((w1 & 0xfc00) == 0xd800)
-           && ((w2 & 0xfc00) == 0xdc00)) {
-      // 0xd800 - 0xdfff surrogate / 0x10ffff - 0x10000 code point
-      u = ((w2 & 0x3f) | ((w1 & 0x3f) << 10)) + 0x10000;
-      r4.push(((u >>> 18) & 0x07) | 0xf0);
-      r4.push(((u >>> 12) & 0x3f) | 0x80);
-      r4.push(((u >>>  6) & 0x3f) | 0x80);
-      r4.push(((u >>>  0) & 0x3f) | 0x80);
-      i++;
-    } else {
-      // invalid char
-    }
-    /* add integer (four utf-8 value) to array */
-    if(r4.length > 3) {
-      // little endian
-      r.push((r4.shift() <<  0) | (r4.shift() <<  8) |
-             (r4.shift() << 16) | (r4.shift() << 24));
-    }
-  }
-
-  return r;
-}
-
-/* isaac module pattern */
-var isaac = (function(){
-
-  /* private: internal states */
-  var m = Array(256), // internal memory
-      acc = 0,        // accumulator
-      brs = 0,        // last result
-      cnt = 0,        // counter
-      r = Array(256), // result array
-      gnt = 0;        // generation counter
-
-  seed(Math.random() * 0xffffffff);
-
-  /* private: 32-bit integer safe adder */
-  function add(x, y) {
-    var lsb = (x & 0xffff) + (y & 0xffff);
-    var msb = (x >>>   16) + (y >>>   16) + (lsb >>> 16);
-    return (msb << 16) | (lsb & 0xffff);
-  }
-
-  /* public: initialisation */
-  function reset() {
-    acc = brs = cnt = 0;
-    for(var i = 0; i < 256; ++i)
-      m[i] = r[i] = 0;
-    gnt = 0;
-  }
-
-  /* public: seeding function */
-  function seed(s) {
-    var a, b, c, d, e, f, g, h, i;
-
-    /* seeding the seeds of love */
-    a = b = c = d =
-    e = f = g = h = 0x9e3779b9; /* the golden ratio */
-
-    if(s && typeof(s) === 'string')
-      s = s.toIntArray();
-
-    if(s && typeof(s) === 'number') {
-      s = [s];
-    }
-
-    if(s instanceof Array) {
-      reset();
-      for(i = 0; i < s.length; i++)
-        r[i & 0xff] += (typeof(s[i]) === 'number') ? s[i] : 0;
-    }
-
-    /* private: seed mixer */
-    function seed_mix() {
-      a ^= b <<  11; d = add(d, a); b = add(b, c);
-      b ^= c >>>  2; e = add(e, b); c = add(c, d);
-      c ^= d <<   8; f = add(f, c); d = add(d, e);
-      d ^= e >>> 16; g = add(g, d); e = add(e, f);
-      e ^= f <<  10; h = add(h, e); f = add(f, g);
-      f ^= g >>>  4; a = add(a, f); g = add(g, h);
-      g ^= h <<   8; b = add(b, g); h = add(h, a);
-      h ^= a >>>  9; c = add(c, h); a = add(a, b);
-    }
-
-    for(i = 0; i < 4; i++) /* scramble it */
-      seed_mix();
-
-    for(i = 0; i < 256; i += 8) {
-      if(s) { /* use all the information in the seed */
-        a = add(a, r[i + 0]); b = add(b, r[i + 1]);
-        c = add(c, r[i + 2]); d = add(d, r[i + 3]);
-        e = add(e, r[i + 4]); f = add(f, r[i + 5]);
-        g = add(g, r[i + 6]); h = add(h, r[i + 7]);
-      }
-      seed_mix();
-      /* fill in m[] with messy stuff */
-      m[i + 0] = a; m[i + 1] = b; m[i + 2] = c; m[i + 3] = d;
-      m[i + 4] = e; m[i + 5] = f; m[i + 6] = g; m[i + 7] = h;
-    }
-    if(s) {
-      /* do a second pass to make all of the seed affect all of m[] */
-      for(i = 0; i < 256; i += 8) {
-        a = add(a, m[i + 0]); b = add(b, m[i + 1]);
-        c = add(c, m[i + 2]); d = add(d, m[i + 3]);
-        e = add(e, m[i + 4]); f = add(f, m[i + 5]);
-        g = add(g, m[i + 6]); h = add(h, m[i + 7]);
-        seed_mix();
-        /* fill in m[] with messy stuff (again) */
-        m[i + 0] = a; m[i + 1] = b; m[i + 2] = c; m[i + 3] = d;
-        m[i + 4] = e; m[i + 5] = f; m[i + 6] = g; m[i + 7] = h;
-      }
-    }
-
-    prng(); /* fill in the first set of results */
-    gnt = 256;  /* prepare to use the first set of results */;
-  }
-
-  /* public: isaac generator, n = number of run */
-  function prng(n){
-    var i, x, y;
-
-    n = (n && typeof(n) === 'number')
-      ? Math.abs(Math.floor(n)) : 1;
-
-    while(n--) {
-      cnt = add(cnt,   1);
-      brs = add(brs, cnt);
-
-      for(i = 0; i < 256; i++) {
-        switch(i & 3) {
-          case 0: acc ^= acc <<  13; break;
-          case 1: acc ^= acc >>>  6; break;
-          case 2: acc ^= acc <<   2; break;
-          case 3: acc ^= acc >>> 16; break;
-        }
-        acc        = add(m[(i +  128) & 0xff], acc); x = m[i];
-        m[i] =   y = add(m[(x >>>  2) & 0xff], add(acc, brs));
-        r[i] = brs = add(m[(y >>> 10) & 0xff], x);
-      }
-    }
-  }
-
-  /* public: return a random number between */
-  function rand() {
-    if(!gnt--) {
-      prng(); gnt = 255;
-    }
-    return r[gnt];
-  }
-
-  /* public: return internals in an object*/
-  function internals(){
-    return {a: acc, b: brs, c: cnt, m: m, r: r};
-  }
-
-  /* return class object */
-  return {
-    'reset': reset,
-    'seed':  seed,
-    'prng':  prng,
-    'rand':  rand,
-    'internals': internals
-  };
-})(); /* declare and execute */
-
-/* public: output*/
-isaac.random = function() {
-  return 0.5 + this.rand() * 2.3283064365386963e-10; // 2^-32
-}
-
-exports.rand = isaac.rand;
--- a/core/network.js
+++ b/core/network.js
@ -1,103 +0,0 @@
-"use strict";
-
-function Connection() {
-	this.socket = null;
-	this.buffer = null;
-	this.onReadCallback = null;
-	this.onErrorCallback = null;
-	this.tlsContext = null;
-	this._exported = null;
-	return this;
-}
-
-Connection.prototype.connect = function(host, port) {
-	let connection = this;
-	connection.close();
-	connection.socket = new Socket();
-	connection.socket.noDelay = true;
-	return connection.socket.connect(host, port).then(function() {
-		connection.buffer = "";
-		return Promise.all([
-			connection.socket.onError(function(error) {
-				if (connection.onErrorCallback) {
-					connection.onErrorCallback(error);
-				}
-				connection.close();
-			}),
-			connection.socket.read(function(data) {
-				if (connection.onReadCallback) {
-					connection.onReadCallback(data);
-				} else {
-					connection.buffer += data;
-				}
-			}),
-		]);
-	});
-};
-
-Connection.prototype.isConnected = function() {
-	return this.socket && this.socket.isConnected;
-};
-
-Connection.prototype.read = function(callback) {
-	this.onReadCallback = callback;
-	if (this.buffer) {
-		callback(this.buffer);
-	}
-	this.buffer = "";
-};
-
-Connection.prototype.onError = function(callback) {
-	this.onErrorCallback = callback;
-};
-
-Connection.prototype.write = function(data) {
-	return this.socket.write(data);
-};
-
-Connection.prototype.close = function() {
-	let socket = this.socket;
-	this.socket = null;
-	if (socket) {
-		return socket.close();
-	}
-};
-
-Connection.prototype.startTls = function() {
-	return this.socket.startTls(this.tlsContext);
-};
-
-Connection.prototype.getPeerCertificate = function() {
-	return this.socket.peerCertificate;
-};
-
-Connection.prototype.addTrustedCertificate = function(certificate) {
-	if (!this.tlsContext) {
-		this.tlsContext = new TlsContext();
-	}
-	return this.tlsContext.addTrustedCertificate(certificate);
-};
-
-Connection.prototype.exported = function() {
-	if (!this._exported) {
-		this._exported = {
-			isConnected: this.isConnected.bind(this),
-			connect: this.connect.bind(this),
-			startTls: this.startTls.bind(this),
-			write: this.write.bind(this),
-			read: this.read.bind(this),
-			onError: this.onError.bind(this),
-			close: this.close.bind(this),
-			getPeerCertificate: this.getPeerCertificate.bind(this),
-			addTrustedCertificate: this.addTrustedCertificate.bind(this),
-		};
-	}
-	return this._exported;
-};
-
-function newConnection() {
-	let process = this;
-	let connection = new Connection();
-	process.connections.push(connection);
-	return connection.exported();
-}
--- a/core/style.css
+++ b/core/style.css
@ -20,25 +20,10 @@ body {
 	margin: 4px;
 }

-#terminals {
-	flex: 1;
-	flex-flow: column;
-	margin: 4px;
-}
-
 #logo {
 	vertical-align: middle;
 }

-.terminal {
-	outline: none;
-	white-space: pre-wrap;
-	resize: none;
-	overflow: auto;
-	height: auto;
-	width: auto;
-}
-
 .hbox {
 	display: flex;
 	flex-direction: row;
@ -49,30 +34,6 @@ body {
 	flex-direction: column;
 }

-.terminal > img {
-	vertical-align: middle;
-}
-
-a:link, .command {
-	color: #268bd2;
-	cursor: pointer;
-}
-
-a:visited, .command:visited {
-	color: #6c71c4;
-	cursor: pointer;
-}
-
-a:hover, .command:hover {
-	color: #2aa198;
-	cursor: pointer;
-}
-
-a:active, .command:active {
-	color: #dc322f;
-	cursor: pointer;
-}
-
 .input {
 	display: flex;
 	flex-flow: row;
@ -100,6 +61,11 @@ a:active, .command:active {
 .CodeMirror {
 	height: 100%;
 	padding: 0;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	position: absolute;
 }

 .cm-tab {
@ -179,3 +145,18 @@ a:active, .command:active {
 .blue { color: #268bd2; }
 .cyan { color: #2aa198; }
 .green { color: #859900; }
+
+#files {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+}
+
+#files > li {
+	padding: 0.5em;
+}
+
+#files > li.current {
+	font-weight: bold;
+	background-color: #2aa198;
+}
--- a/core/terminal.js
+++ b/core/terminal.js
@ -1,314 +0,0 @@
-"use strict";
-
-var kStaticFiles = [
-	{uri: '', path: 'index.html', type: 'text/html; charset=UTF-8'},
-	{uri: '/style.css', path: 'style.css', type: 'text/css; charset=UTF-8'},
-	{uri: '/favicon.png', path: 'favicon.png', type: 'image/png'},
-	{uri: '/client.js', path: 'client.js', type: 'text/javascript; charset=UTF-8'},
-	{uri: '/robots.txt', path: 'robots.txt', type: 'text/plain; charset=UTF-8'},
-];
-
-var auth = require('auth');
-var form = require('form');
-
-function Terminal() {
-	this._index = 0;
-	this._firstLine = 0;
-	this._sentIndex = -1;
-	this._lines = [];
-	this._lastRead = null;
-	this._lastWrite = null;
-	this._echo = true;
-	this._readLine = null;
-	this._selected = null;
-	this._onOutput = null;
-	return this;
-}
-
-Terminal.kBacklog = 64;
-
-Terminal.prototype.readOutput = function(callback) {
-	this._onOutput = callback;
-	this.dispatch();
-}
-
-Terminal.prototype.dispatch = function(data) {
-	var payload = this._lines.slice(Math.max(0, this._sentIndex + 1 - this._firstLine));
-	if (data) {
-		payload.push(data);
-	}
-	if (this._onOutput && (this._sentIndex < this._index - 1 || data)) {
-		this._sentIndex = this._index - 1;
-		this._onOutput({lines: payload});
-	}
-}
-
-Terminal.prototype.print = function() {
-	var data = arguments;
-	if (this._selected) {
-		data = {
-			terminal: this._selected,
-			value: data
-		};
-	}
-	this._lines.push(data);
-	this._index++;
-	if (this._lines.length >= Terminal.kBacklog * 2) {
-		this._firstLine = this._index - Terminal.kBacklog;
-		this._lines = this._lines.slice(this._lines.length - Terminal.kBacklog);
-	}
-	this.dispatch();
-	this._lastWrite = new Date();
-}
-
-Terminal.prototype.notifyUpdate = function() {
-	this.print({action: "update"});
-}
-
-Terminal.prototype.select = function(name) {
-	this._selected = name;
-}
-
-Terminal.prototype.ping = function() {
-	this.dispatch({action: "ping"});
-}
-
-Terminal.prototype.setEcho = function(echo) {
-	this._echo = echo;
-}
-
-Terminal.prototype.readLine = function() {
-	var self = this;
-	if (self._readLine) {
-		self._readLine[1]();
-	}
-	return new Promise(function(resolve, reject) {
-		self._readLine = [resolve, reject];
-	});
-}
-
-Terminal.prototype.makeFunction = function(api) {
-	let self = this;
-	return function() {
-		let message = {action: api[0]};
-		for (let i = 1; i < api.length; i++) {
-			message[api[i]] = arguments[i - 1];
-		}
-		self.print(message);
-	}
-}
-
-function invoke(handlers, argv) {
-	var promises = [];
-	if (handlers) {
-		for (var i = 0; i < handlers.length; ++i) {
-			try {
-				promises.push(handlers[i].apply({}, argv));
-			} catch (error) {
-				handlers.splice(i, 1);
-				i--;
-				promises.push(new Promise(function(resolve, reject) { reject(error); }));
-			}
-		}
-	}
-	return Promise.all(promises);
-}
-
-function socket(request, response, client) {
-	var process;
-
-	var options = {};
-	var credentials = auth.query(request.headers);
-	if (credentials && credentials.session) {
-		options.userName = credentials.session.name;
-	}
-	options.credentials = credentials;
-
-	response.onMessage = async function(event) {
-		if (event.opCode == 0x1 || event.opCode == 0x2) {
-			var message;
-			try {
-				message = JSON.parse(event.data);
-			} catch (error) {
-				print("ERROR", error, event.data, event.data.length, event.opCode);
-				return;
-			}
-			if (message.action == "hello") {
-				var packageOwner;
-				var packageName;
-				var match;
-				if (match = /^\/\~([^\/]+)\/([^\/]+)(.*)/.exec(message.path)) {
-					packageOwner = match[1];
-					packageName = match[2];
-				}
-				response.send(JSON.stringify({lines: [{action: "session", credentials: credentials}]}), 0x1);
-
-				options.terminalApi = message.terminalApi || [];
-				var sessionId = makeSessionId();
-				process = await getSessionProcess(packageOwner, packageName, sessionId, options);
-				process.terminal.readOutput(function(message) {
-					response.send(JSON.stringify(message), 0x1);
-				});
-
-				var ping = function() {
-					var now = Date.now();
-					var again = true;
-					if (now - process.lastActive < process.timeout) {
-						// Active.
-					} else if (process.lastPing > process.lastActive) {
-						// We lost them.
-						process.task.kill();
-						again = false;
-					} else {
-						// Idle.  Ping them.
-						response.send("", 0x9);
-						process.lastPing = now;
-					}
-
-					if (again) {
-						setTimeout(ping, process.timeout);
-					}
-				}
-
-				if (process.timeout > 0) {
-					setTimeout(ping, process.timeout);
-				}
-			} else if (message.action == "command") {
-				var command = message.command;
-				var eventName = 'unknown';
-				if (typeof command == "string") {
-					if (process.terminal._echo) {
-						process.terminal.print("> " + command);
-					}
-					if (process.terminal._readLine) {
-						let promise = process.terminal._readLine;
-						process.terminal._readLine = null;
-						promise[0](command);
-					}
-					eventName = 'onInput';
-				} else if (command.event) {
-					eventName = command.event;
-				}
-				return invoke(process.eventHandlers[eventName], [command]).catch(function(error) {
-					process.terminal.print(error);
-				});
-			}
-		} else if (event.opCode == 0x8) {
-			// Close.
-			process.task.kill();
-			response.send(event.data, 0x8);
-		} else if (event.opCode == 0xa) {
-			// PONG
-		}
-
-		if (process) {
-			process.lastActive = Date.now();
-		}
-	}
-}
-
-async function handler(request, response, packageOwner, packageName, uri) {
-	var found = false;
-
-	if (badName(packageOwner) || badName(packageName)) {
-		var data = "File not found";
-		response.writeHead(404, {"Content-Type": "text/plain; charset=utf-8", "Content-Length": data.length});
-		response.end(data);
-		found = true;
-	}
-
-	if (!found) {
-		for (var i in kStaticFiles) {
-			if (uri === kStaticFiles[i].uri) {
-				found = true;
-				var data = File.readFile("core/" + kStaticFiles[i].path);
-				if (kStaticFiles[i].type.indexOf("text/") == 0) {
-					data = new TextDecoder("UTF-8").decode(data);
-					if (kStaticFiles[i].uri == "") {
-						if (gGlobalSettings && gGlobalSettings['google-signin-client_id']) {
-							data = data.replace("<!--HEAD-->", `
-		<script src="https://apis.google.com/js/platform.js" async defer></script>
-		<meta name="google-signin-client_id" content="${gGlobalSettings['google-signin-client_id']}">`);
-						}
-						data = data.replace("$(VIEW_SOURCE)", "/~" + packageOwner + "/" + packageName + "/view");
-					}
-					data = new TextEncoder("UTF-8").encode(data);
-				}
-				response.writeHead(200, {"Content-Type": kStaticFiles[i].type, "Content-Length": data.length});
-				response.end(data);
-				break;
-			}
-		}
-	}
-
-	if (!found) {
-		var process;
-		if (uri === "/view") {
-			var data = File.readFile("packages/" + packageOwner + "/" + packageName + "/" + packageName + ".js");
-			if (data) {
-				response.writeHead(200, {"Content-Type": "text/javascript; charset=utf-8", "Content-Length": data.length});
-				response.end(data);
-			} else {
-				response.writeHead(404, {"Content-Type": "text/plain; charset=utf-8", "Content-Length": "File not found".length});
-				response.end("File not found");
-			}
-		} else if (uri == "/save") {
-			var credentials = auth.query(request.headers);
-			var userName = credentials && credentials.session && credentials.session.name ? credentials.session.name : "guest";
-			if (badName(packageName)) {
-				response.writeHead(403, {"Content-Type": "text/plain; charset=utf-8"});
-				response.end("Invalid package name: " + packageName);
-			} else if (badName(userName)) {
-				response.writeHead(403, {"Content-Type": "text/plain; charset=utf-8"});
-				response.end("Invalid user name: " + userName);
-			} else {
-				File.makeDirectory("packages/" + userName);
-				File.makeDirectory("packages/" + userName + "/" + packageName);
-				if (!File.writeFile("packages/" + userName + "/" + packageName + "/" + packageName + ".js", request.body || "")) {
-					response.writeHead(200, {"Content-Type": "text/plain; charset=utf-8"});
-					response.end("/~" + userName + "/" + packageName);
-					updateProcesses(userName, packageName);
-				} else {
-					response.writeHead(500, {"Content-Type": "text/plain; charset=utf-8"});
-					response.end("Problem saving: " + packageName);
-				}
-			}
-		} else if (uri === "/submit") {
-				var process = await getServiceProcess(packageOwner, packageName, "submit");
-				process.lastActive = Date.now();
-				return process.ready.then(function() {
-					var payload = form.decodeForm(request.body, form.decodeForm(request.query));
-					return invoke(process.eventHandlers['onSubmit'], [payload]).then(function() {
-						response.writeHead(200, {
-							"Content-Type": "text/plain; charset=utf-8",
-							"Content-Length": "0",
-							"Cache-Control": "no-cache, no-store, must-revalidate",
-							"Pragma": "no-cache",
-							"Expires": "0",
-						});
-						return response.end("");
-					});
-				});
-		} else if (uri === "/atom") {
-			var process = await getServiceProcess(packageOwner, packageName, "atom");
-			process.lastActive = Date.now();
-			return process.ready.then(function() {
-				var payload = form.decodeForm(request.body, form.decodeForm(request.query));
-				return invoke(process.eventHandlers['onAtom'], [payload]).then(function(content) {
-					var atomContent = content.join();
-					response.writeHead(200, {
-						"Content-Type": "application/atom+xml; charset=utf-8",
-						"Content-Length": atomContent.length.toString(),
-						"Cache-Control": "no-cache, no-store, must-revalidate",
-						"Pragma": "no-cache",
-						"Expires": "0",
-					});
-					return response.end(atomContent);
-				});
-			});
-		}
-	}
-}
-
-exports.handler = handler;
-exports.socket = socket;