# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1451908803 0
# Node ID 7da8b3c95bb1f64c5a6e21c7f545700a20e1b8d0
# Parent  2e4c32c4fb6bf39e33361e882570e815b27a74a5
Add and remove missing/deleted files

diff -r 2e4c32c4fb6b -r 7da8b3c95bb1 eventstreams.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eventstreams.lua	Mon Jan 04 12:00:03 2016 +0000
@@ -0,0 +1,35 @@
+local stream_methods = {};
+local stream_mt = { __index = stream_methods };
+
+local response_head = 	table.concat({
+	"HTTP/1.1 200 OK";
+	"Content-Type: text/event-stream";
+	"";
+	"";	
+}, "\r\n");
+
+function stream_methods:add_watcher(conn)
+	conn:write(response_head);
+	self.watchers[conn] = true;
+end
+
+function stream_methods:remove_watcher(conn)
+	self.watchers[conn] = nil;
+end
+
+function stream_methods:push(data)
+	data = "data: "..data:gsub("\n", "\ndata: \n").."\n\n";
+	for conn in pairs(self.watchers) do
+		conn:write(data);
+	end
+end
+
+function stream_methods:is_unwatched()
+	return next(self.watchers) == nil;
+end
+
+local function new()
+	return setmetatable({ watchers = {} }, stream_mt);
+end
+
+return { new = new };
diff -r 2e4c32c4fb6b -r 7da8b3c95bb1 net/cqueues.lua
--- a/net/cqueues.lua	Mon Jan 04 11:44:40 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
--- Prosody IM
--- Copyright (C) 2014 Daurnimator
---
--- This project is MIT/X11 licensed. Please see the
--- COPYING file in the source package for more information.
---
--- This module allows you to use cqueues with a net.server mainloop
---
-
-local server = require "net.server";
-local cqueues = require "cqueues";
-
--- Create a single top level cqueue
-local cq;
-
-if server.cq then -- server provides cqueues object
-	cq = server.cq;
-elseif server.get_backend() == "select" and server._addtimer then -- server_select
-	cq = cqueues.new();
-	local function step()
-		assert(cq:loop(0));
-	end
-
-	-- Use wrapclient (as wrapconnection isn't exported) to get server_select to watch cq fd
-	local handler = server.wrapclient({
-		getfd = function() return cq:pollfd(); end;
-		settimeout = function() end; -- Method just needs to exist
-		close = function() end; -- Need close method for 'closeall'
-	}, nil, nil, {});
-
-	-- Only need to listen for readable; cqueues handles everything under the hood
-	-- readbuffer is called when `select` notes an fd as readable
-	handler.readbuffer = step;
-
-	-- Use server_select low lever timer facility,
-	-- this callback gets called *every* time there is a timeout in the main loop
-	server._addtimer(function(current_time)
-		-- This may end up in extra step()'s, but cqueues handles it for us.
-		step();
-		return cq:timeout();
-	end);
-elseif server.event and server.base then -- server_event
-	cq = cqueues.new();
-	-- Only need to listen for readable; cqueues handles everything under the hood
-	local EV_READ = server.event.EV_READ;
-	server.base:addevent(cq:pollfd(), EV_READ, function(e)
-			assert(cq:loop(0));
-			-- Convert a cq timeout to an acceptable timeout for luaevent
-			local t = cq:timeout();
-			if t == 0 then -- if you give luaevent 0, it won't call this callback again
-				t = 0.000001; -- 1 microsecond is the smallest that works (goes into a `struct timeval`)
-			elseif t == nil then -- you always need to give a timeout, pick something big if we don't have one
-				t = 0x7FFFFFFF; -- largest 32bit int
-			end
-			return EV_READ, t;
-		end,
-		-- Schedule the callback to fire on first tick to ensure any cq:wrap calls that happen during start-up are serviced.
-		0.000001);
-else
-	error "NYI"
-end
-
-return {
-	cq = cq;
-}
diff -r 2e4c32c4fb6b -r 7da8b3c95bb1 net/websocket.lua
--- a/net/websocket.lua	Mon Jan 04 11:44:40 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,272 +0,0 @@
--- Prosody IM
--- Copyright (C) 2012 Florian Zeitz
--- Copyright (C) 2014 Daurnimator
---
--- This project is MIT/X11 licensed. Please see the
--- COPYING file in the source package for more information.
---
-
-local t_concat = table.concat;
-
-local http = require "net.http";
-local frames = require "net.websocket.frames";
-local base64 = require "util.encodings".base64;
-local sha1 = require "util.hashes".sha1;
-local random_bytes = require "util.random".bytes;
-local timer = require "util.timer";
-local log = require "util.logger".init "websocket";
-
-local close_timeout = 3; -- Seconds to wait after sending close frame until closing connection.
-
-local websockets = {};
-
-local websocket_listeners = {};
-function websocket_listeners.ondisconnect(handler, err)
-	local s = websockets[handler];
-	websockets[handler] = nil;
-	if s.close_timer then
-		timer.stop(s.close_timer);
-		s.close_timer = nil;
-	end
-	s.readyState = 3;
-	if s.close_code == nil and s.onerror then s:onerror(err); end
-	if s.onclose then s:onclose(s.close_code, s.close_message or err); end
-end
-
-function websocket_listeners.ondetach(handler)
-	websockets[handler] = nil;
-end
-
-local function fail(s, code, reason)
-	module:log("warn", "WebSocket connection failed, closing. %d %s", code, reason);
-	s:close(code, reason);
-	s.handler:close();
-	return false
-end
-
-function websocket_listeners.onincoming(handler, buffer, err)
-	local s = websockets[handler];
-	s.readbuffer = s.readbuffer..buffer;
-	while true do
-		local frame, len = frames.parse(s.readbuffer);
-		if frame == nil then break end
-		s.readbuffer = s.readbuffer:sub(len+1);
-
-		log("debug", "Websocket received frame: opcode=%0x, %i bytes", frame.opcode, #frame.data);
-
-		-- Error cases
-		if frame.RSV1 or frame.RSV2 or frame.RSV3 then -- Reserved bits non zero
-			return fail(s, 1002, "Reserved bits not zero");
-		end
-
-		if frame.opcode < 0x8 then
-			local databuffer = s.databuffer;
-			if frame.opcode == 0x0 then -- Continuation frames
-				if not databuffer then
-					return fail(s, 1002, "Unexpected continuation frame");
-				end
-				databuffer[#databuffer+1] = frame.data;
-			elseif frame.opcode == 0x1 or frame.opcode == 0x2 then -- Text or Binary frame
-				if databuffer then
-					return fail(s, 1002, "Continuation frame expected");
-				end
-				databuffer = {type=frame.opcode, frame.data};
-				s.databuffer = databuffer;
-			else
-				return fail(s, 1002, "Reserved opcode");
-			end
-			if frame.FIN then
-				s.databuffer = nil;
-				if s.onmessage then
-					s:onmessage(t_concat(databuffer), databuffer.type);
-				end
-			end
-		else -- Control frame
-			if frame.length > 125 then -- Control frame with too much payload
-				return fail(s, 1002, "Payload too large");
-			elseif not frame.FIN then -- Fragmented control frame
-				return fail(s, 1002, "Fragmented control frame");
-			end
-			if frame.opcode == 0x8 then -- Close request
-				if frame.length == 1 then
-					return fail(s, 1002, "Close frame with payload, but too short for status code");
-				end
-				local status_code, message = frames.parse_close(frame.data);
-				if status_code == nil then
-					--[[ RFC 6455 7.4.1
-					1005 is a reserved value and MUST NOT be set as a status code in a
-					Close control frame by an endpoint.  It is designated for use in
-					applications expecting a status code to indicate that no status
-					code was actually present.
-					]]
-					status_code = 1005
-				elseif status_code < 1000 then
-					return fail(s, 1002, "Closed with invalid status code");
-				elseif ((status_code > 1003 and status_code < 1007) or status_code > 1011) and status_code < 3000 then
-					return fail(s, 1002, "Closed with reserved status code");
-				end
-				s.close_code, s.close_message = status_code, message;
-				s:close(1000);
-				return true;
-			elseif frame.opcode == 0x9 then -- Ping frame
-				frame.opcode = 0xA;
-				frame.MASK = true; -- RFC 6455 6.1.5: If the data is being sent by the client, the frame(s) MUST be masked
-				handler:write(frames.build(frame));
-			elseif frame.opcode == 0xA then -- Pong frame
-				log("debug", "Received unexpected pong frame: " .. tostring(frame.data));
-			else
-				return fail(s, 1002, "Reserved opcode");
-			end
-		end
-	end
-	return true;
-end
-
-local websocket_methods = {};
-local function close_timeout_cb(now, timerid, s)
-	s.close_timer = nil;
-	log("warn", "Close timeout waiting for server to close, closing manually.");
-	s.handler:close();
-end
-function websocket_methods:close(code, reason)
-	if self.readyState < 2 then
-		code = code or 1000;
-		log("debug", "closing WebSocket with code %i: %s" , code , tostring(reason));
-		self.readyState = 2;
-		local handler = self.handler;
-		handler:write(frames.build_close(code, reason, true));
-		-- Do not close socket straight away, wait for acknowledgement from server.
-		self.close_timer = timer.add_task(close_timeout, close_timeout_cb, self);
-	elseif self.readyState == 2 then
-		log("debug", "tried to close a closing WebSocket, closing the raw socket.");
-		-- Stop timer
-		if self.close_timer then
-			timer.stop(self.close_timer);
-			self.close_timer = nil;
-		end
-		local handler = self.handler;
-		handler:close();
-	else
-		log("debug", "tried to close a closed WebSocket, ignoring.");
-	end
-end
-function websocket_methods:send(data, opcode)
-	if self.readyState < 1 then
-		return nil, "WebSocket not open yet, unable to send data.";
-	elseif self.readyState >= 2 then
-		return nil, "WebSocket closed, unable to send data.";
-	end
-	if opcode == "text" or opcode == nil then
-		opcode = 0x1;
-	elseif opcode == "binary" then
-		opcode = 0x2;
-	end
-	local frame = {
-		FIN = true;
-		MASK = true; -- RFC 6455 6.1.5: If the data is being sent by the client, the frame(s) MUST be masked
-		opcode = opcode;
-		data = tostring(data);
-	};
-	log("debug", "WebSocket sending frame: opcode=%0x, %i bytes", frame.opcode, #frame.data);
-	return self.handler:write(frames.build(frame));
-end
-
-local websocket_metatable = {
-	__index = websocket_methods;
-};
-
-local function connect(url, ex, listeners)
-	ex = ex or {};
-
-	--[[RFC 6455 4.1.7:
-		The request MUST include a header field with the name
-	|Sec-WebSocket-Key|.  The value of this header field MUST be a
-	nonce consisting of a randomly selected 16-byte value that has
-	been base64-encoded (see Section 4 of [RFC4648]).  The nonce
-	MUST be selected randomly for each connection.
-	]]
-	local key = base64.encode(random_bytes(16));
-
-	-- Either a single protocol string or an array of protocol strings.
-	local protocol = ex.protocol;
-	if type(protocol) == "string" then
-		protocol = { protocol, [protocol] = true };
-	elseif type(protocol) == "table" and protocol[1] then
-		for _, v in ipairs(protocol) do
-			protocol[v] = true;
-		end
-	else
-		protocol = nil;
-	end
-
-	local headers = {
-		["Upgrade"] = "websocket";
-		["Connection"] = "Upgrade";
-		["Sec-WebSocket-Key"] = key;
-		["Sec-WebSocket-Protocol"] = protocol and t_concat(protocol, ", ");
-		["Sec-WebSocket-Version"] = "13";
-		["Sec-WebSocket-Extensions"] = ex.extensions;
-	}
-	if ex.headers then
-		for k,v in pairs(ex.headers) do
-			headers[k] = v;
-		end
-	end
-
-	local s = setmetatable({
-		readbuffer = "";
-		databuffer = nil;
-		handler = nil;
-		close_code = nil;
-		close_message = nil;
-		close_timer = nil;
-		readyState = 0;
-		protocol = nil;
-
-		url = url;
-
-		onopen = listeners.onopen;
-		onclose = listeners.onclose;
-		onmessage = listeners.onmessage;
-		onerror = listeners.onerror;
-	}, websocket_metatable);
-
-	local http_url = url:gsub("^(ws)", "http");
-	local http_req = http.request(http_url, {
-		method = "GET";
-		headers = headers;
-		sslctx = ex.sslctx;
-	}, function(b, c, r, http_req)
-		if c ~= 101
-		   or r.headers["connection"]:lower() ~= "upgrade"
-		   or r.headers["upgrade"] ~= "websocket"
-		   or r.headers["sec-websocket-accept"] ~= base64.encode(sha1(key .. "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"))
-		   or (protocol and not protocol[r.headers["sec-websocket-protocol"]])
-		   then
-			s.readyState = 3;
-			log("warn", "WebSocket connection to %s failed: %s", url, tostring(b));
-			if s.onerror then s:onerror("connecting-failed"); end
-			return;
-		end
-
-		s.protocol = r.headers["sec-websocket-protocol"];
-
-		-- Take possession of socket from http
-		http_req.conn = nil;
-		local handler = http_req.handler;
-		s.handler = handler;
-		websockets[handler] = s;
-		handler:setlistener(websocket_listeners);
-
-		log("debug", "WebSocket connected successfully to %s", url);
-		s.readyState = 1;
-		if s.onopen then s:onopen(); end
-		websocket_listeners.onincoming(handler, b);
-	end);
-
-	return s;
-end
-
-return {
-	connect = connect;
-};
diff -r 2e4c32c4fb6b -r 7da8b3c95bb1 net/websocket/frames.lua
--- a/net/websocket/frames.lua	Mon Jan 04 11:44:40 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,195 +0,0 @@
--- Prosody IM
--- Copyright (C) 2012 Florian Zeitz
--- Copyright (C) 2014 Daurnimator
---
--- This project is MIT/X11 licensed. Please see the
--- COPYING file in the source package for more information.
---
-
-local softreq = require "util.dependencies".softreq;
-local log = require "util.logger".init "websocket.frames";
-local random_bytes = require "util.random".bytes;
-
-local bit;
-pcall(function() bit = require"bit"; end);
-bit = bit or softreq"bit32"
-if not bit then log("error", "No bit module found. Either LuaJIT 2, lua-bitop or Lua 5.2 is required"); end
-local band = bit.band;
-local bor = bit.bor;
-local bxor = bit.bxor;
-local lshift = bit.lshift;
-local rshift = bit.rshift;
-
-local t_concat = table.concat;
-local s_byte = string.byte;
-local s_char= string.char;
-local s_sub = string.sub;
-
-local function read_uint16be(str, pos)
-	local l1, l2 = s_byte(str, pos, pos+1);
-	return l1*256 + l2;
-end
--- FIXME: this may lose precision
-local function read_uint64be(str, pos)
-	local l1, l2, l3, l4, l5, l6, l7, l8 = s_byte(str, pos, pos+7);
-	return lshift(l1, 56) + lshift(l2, 48) + lshift(l3, 40) + lshift(l4, 32)
-		+ lshift(l5, 24) + lshift(l6, 16) + lshift(l7, 8) + l8;
-end
-local function pack_uint16be(x)
-	return s_char(rshift(x, 8), band(x, 0xFF));
-end
-local function get_byte(x, n)
-	return band(rshift(x, n), 0xFF);
-end
-local function pack_uint64be(x)
-	return s_char(rshift(x, 56), get_byte(x, 48), get_byte(x, 40), get_byte(x, 32),
-		get_byte(x, 24), get_byte(x, 16), get_byte(x, 8), band(x, 0xFF));
-end
-
-local function parse_frame_header(frame)
-	if #frame < 2 then return; end
-
-	local byte1, byte2 = s_byte(frame, 1, 2);
-	local result = {
-		FIN = band(byte1, 0x80) > 0;
-		RSV1 = band(byte1, 0x40) > 0;
-		RSV2 = band(byte1, 0x20) > 0;
-		RSV3 = band(byte1, 0x10) > 0;
-		opcode = band(byte1, 0x0F);
-
-		MASK = band(byte2, 0x80) > 0;
-		length = band(byte2, 0x7F);
-	};
-
-	local length_bytes = 0;
-	if result.length == 126 then
-		length_bytes = 2;
-	elseif result.length == 127 then
-		length_bytes = 8;
-	end
-
-	local header_length = 2 + length_bytes + (result.MASK and 4 or 0);
-	if #frame < header_length then return; end
-
-	if length_bytes == 2 then
-		result.length = read_uint16be(frame, 3);
-	elseif length_bytes == 8 then
-		result.length = read_uint64be(frame, 3);
-	end
-
-	if result.MASK then
-		result.key = { s_byte(frame, length_bytes+3, length_bytes+6) };
-	end
-
-	return result, header_length;
-end
-
--- XORs the string `str` with the array of bytes `key`
--- TODO: optimize
-local function apply_mask(str, key, from, to)
-	from = from or 1
-	if from < 0 then from = #str + from + 1 end -- negative indicies
-	to = to or #str
-	if to < 0 then to = #str + to + 1 end -- negative indicies
-	local key_len = #key
-	local counter = 0;
-	local data = {};
-	for i = from, to do
-		local key_index = counter%key_len + 1;
-		counter = counter + 1;
-		data[counter] = s_char(bxor(key[key_index], s_byte(str, i)));
-	end
-	return t_concat(data);
-end
-
-local function parse_frame_body(frame, header, pos)
-	if header.MASK then
-		return apply_mask(frame, header.key, pos, pos + header.length - 1);
-	else
-		return frame:sub(pos, pos + header.length - 1);
-	end
-end
-
-local function parse_frame(frame)
-	local result, pos = parse_frame_header(frame);
-	if result == nil or #frame < (pos + result.length) then return; end
-	result.data = parse_frame_body(frame, result, pos+1);
-	return result, pos + result.length;
-end
-
-local function build_frame(desc)
-	local data = desc.data or "";
-
-	assert(desc.opcode and desc.opcode >= 0 and desc.opcode <= 0xF, "Invalid WebSocket opcode");
-	if desc.opcode >= 0x8 then
-		-- RFC 6455 5.5
-		assert(#data <= 125, "WebSocket control frames MUST have a payload length of 125 bytes or less.");
-	end
-
-	local b1 = bor(desc.opcode,
-		desc.FIN and 0x80 or 0,
-		desc.RSV1 and 0x40 or 0,
-		desc.RSV2 and 0x20 or 0,
-		desc.RSV3 and 0x10 or 0);
-
-	local b2 = #data;
-	local length_extra;
-	if b2 <= 125 then -- 7-bit length
-		length_extra = "";
-	elseif b2 <= 0xFFFF then -- 2-byte length
-		b2 = 126;
-		length_extra = pack_uint16be(#data);
-	else -- 8-byte length
-		b2 = 127;
-		length_extra = pack_uint64be(#data);
-	end
-
-	local key = ""
-	if desc.MASK then
-		local key_a = desc.key
-		if key_a then
-			key = s_char(unpack(key_a, 1, 4));
-		else
-			key = random_bytes(4);
-			key_a = {key:byte(1,4)};
-		end
-		b2 = bor(b2, 0x80);
-		data = apply_mask(data, key_a);
-	end
-
-	return s_char(b1, b2) .. length_extra .. key .. data
-end
-
-local function parse_close(data)
-	local code, message
-	if #data >= 2 then
-		code = read_uint16be(data, 1);
-		if #data > 2 then
-			message = s_sub(data, 3);
-		end
-	end
-	return code, message
-end
-
-local function build_close(code, message, mask)
-	local data = pack_uint16be(code);
-	if message then
-		assert(#message<=123, "Close reason must be <=123 bytes");
-		data = data .. message;
-	end
-	return build_frame({
-		opcode = 0x8;
-		FIN = true;
-		MASK = mask;
-		data = data;
-	});
-end
-
-return {
-	parse_header = parse_frame_header;
-	parse_body = parse_frame_body;
-	parse = parse_frame;
-	build = build_frame;
-	parse_close = parse_close;
-	build_close = build_close;
-};
diff -r 2e4c32c4fb6b -r 7da8b3c95bb1 util/hex.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util/hex.lua	Mon Jan 04 12:00:03 2016 +0000
@@ -0,0 +1,26 @@
+local s_char = string.char;
+local s_format = string.format;
+local s_gsub = string.gsub;
+local s_lower = string.lower;
+
+local char_to_hex = {};
+local hex_to_char = {};
+
+do
+	local char, hex;
+	for i = 0,255 do
+		char, hex = s_char(i), s_format("%02x", i);
+		char_to_hex[char] = hex;
+		hex_to_char[hex] = char;
+	end
+end
+
+local function to(s)
+	return (s_gsub(s, ".", char_to_hex));
+end
+
+local function from(s)
+	return (s_gsub(s_lower(s), "%X*(%x%x)%X*", hex_to_char));
+end
+
+return { to = to, from = from }
diff -r 2e4c32c4fb6b -r 7da8b3c95bb1 util/random.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util/random.lua	Mon Jan 04 12:00:03 2016 +0000
@@ -0,0 +1,22 @@
+-- Prosody IM
+-- Copyright (C) 2008-2014 Matthew Wild
+-- Copyright (C) 2008-2014 Waqas Hussain
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
+local urandom = assert(io.open("/dev/urandom", "r+"));
+
+local function seed(x)
+	urandom:write(x);
+end
+
+local function bytes(n)
+	return urandom:read(n);
+end
+
+return {
+	seed = seed;
+	bytes = bytes;
+};
diff -r 2e4c32c4fb6b -r 7da8b3c95bb1 util/uuid.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/util/uuid.lua	Mon Jan 04 12:00:03 2016 +0000
@@ -0,0 +1,32 @@
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
+--
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
+local random = require "util.random";
+local random_bytes = random.bytes;
+local hex = require "util.hex".to;
+local m_ceil = math.ceil;
+
+local function get_nibbles(n)
+	return hex(random_bytes(m_ceil(n/2))):sub(1, n);
+end
+
+local function get_twobits()
+	return ("%x"):format(get_nibbles(1):byte() % 4 + 8);
+end
+
+local function generate()
+	-- generate RFC 4122 complaint UUIDs (version 4 - random)
+	return get_nibbles(8).."-"..get_nibbles(4).."-4"..get_nibbles(3).."-"..(get_twobits())..get_nibbles(3).."-"..get_nibbles(12);
+end
+
+return {
+	get_nibbles=get_nibbles;
+	generate = generate ;
+	-- COMPAT
+	seed = random.seed;
+};