forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more standalone httpd compatibility

This commit is contained in:
Adam D. Ruppe 2012-02-06 00:28:32 -05:00
parent 491434c645
commit ac83e27d21
4 changed files with 252 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cgi.d
View File

@ -1,5 +1,7 @@
module arsd.cgi;
// FIXME: the location header is supposed to be an absolute url I guess.
// FIXME: would be cool to flush part of a dom document before complete
// somehow in here and dom.d.

11
netman.d
View File

@ -525,7 +525,16 @@ version(threaded_connections) {
auto manager = new NetworkManager();
connection.parentManager = manager;
manager.addConnection(connection, connection.socket, connection.addr, connection.port);
while(manager.proceed()) {}
bool breakNext = false;
while(manager.proceed()) {
if(breakNext)
break;
if(connection.disconnectQueued)
if(connection.writeBufferLength)
breakNext = true;
else
break;
}
}
}
}

144
rtud.d
View File

@ -56,6 +56,17 @@ class UpdateStream {
net.close();
}
void deleteMessage(string messageId) {
import arsd.cgi; // : encodeVariables;
string message = encodeVariables([
"id" : messageId,
"operation" : "delete"
]);
net.writeln(message);
net.flush();
}
void sendMessage(string eventType, string messageText, long ttl = 2500) {
import arsd.cgi; // : encodeVariables;
string message = encodeVariables([
@ -120,7 +131,17 @@ void writeToFd(int fd, string s) {
import arsd.cgi;
int handleListenerGateway(Cgi cgi, string channelPrefix) {
/// The throttledConnection param is useful for helping to get
/// around browser connection limitations.
/// If the user opens a bunch of tabs, these long standing
/// connections can hit the per-host connection limit, breaking
/// navigation until the connection times out.
/// The throttle option sets a long retry period and polls
/// instead of waits. This sucks, but sucks less than your whole
/// site hanging because the browser is queuing your connections!
int handleListenerGateway(Cgi cgi, string channelPrefix, bool throttledConnection = false) {
cgi.setCache(false);
auto f = openNetworkFd("localhost", 7070);
@ -142,13 +163,22 @@ int handleListenerGateway(Cgi cgi, string channelPrefix) {
if(cgi.lastEventId.length)
variables["last-message-id"] = cgi.lastEventId;
cgi.write(":\n"); // the comment ensures apache doesn't skip us
if(throttledConnection) {
cgi.write("retry: 15000\n");
} else {
cgi.write(":\n"); // the comment ensures apache doesn't skip us
}
cgi.flush(); // sending the headers along
} else {
// gotta handle it as ajax polling
variables["close-time"] = "0"; // ask for long polling
}
if(throttledConnection)
variables["close-time"] = "-1"; // close immediately
writeToFd(f, encodeVariables(variables) ~ "\n");
string wegot;
@ -171,21 +201,19 @@ int handleListenerGateway(Cgi cgi, string channelPrefix) {
}
}
// this is to support older browsers
if(!isSse) {
// FIXME
// we have to parse it out and reformat for plain cgi...
cgi.write("LAME LAME LAME\n");
cgi.write(wegot);
auto lol = parseMessages(wegot);
//cgi.setResponseContentType("text/json");
// FIXME gotta reorganize my json stuff
//cgi.write(toJson(lol));
return 1;
}
return 0;
}
version(rtud_daemon) :
import arsd.netman;
struct Message {
string type;
string id;
@ -197,6 +225,96 @@ struct Message {
}
Message[] getMessages(string channel, string eventTypeFilter = null, long maxAge = 0) {
auto f = openNetworkFd("localhost", 7070);
scope(exit) linux.close(f);
string[string] variables;
variables["channel"] = channel;
if(maxAge)
variables["minimum-time"] = to!string(getUtcTime() - maxAge);
variables["close-time"] = "-1"; // close immediately
writeToFd(f, encodeVariables(variables) ~ "\n");
string wegot;
string[4096] buffer;
for(;;) {
auto num = linux.read(f, buffer.ptr, buffer.length);
if(num < 0)
throw new Exception("read error");
if(num == 0)
break;
auto chunk = buffer[0 .. num];
wegot ~= cast(string) chunk;
}
return parseMessages(wegot, eventTypeFilter);
}
Message[] parseMessages(string wegot, string eventTypeFilter = null) {
// gotta parse this since rtud writes out the format for browsers
Message[] ret;
foreach(message; wegot.split("\n\n")) {
Message m;
foreach(line; message.split("\n")) {
if(line.length == 0)
throw new Exception("wtf");
if(line[0] == ':')
line = line[1 .. $];
if(line.length == 0)
continue; // just an empty comment
auto idx = line.indexOf(":");
if(idx == -1)
continue; // probably just a comment
if(idx + 2 > line.length)
continue; // probably just a comment too
auto name = line[0 .. idx];
auto data = line[idx + 2 .. $];
switch(name) {
default: break; // do nothing
case "timestamp":
m.timestamp = to!long(data);
break;
case "ttl":
m.ttl = to!long(data);
break;
case "operation":
m.operation = data;
break;
case "id":
m.id = data;
break;
case "event":
m.type = data;
break;
case "data":
m.data ~= data;
break;
}
}
if(eventTypeFilter is null || eventTypeFilter == m.type)
ret ~= m;
}
return ret;
}
version(rtud_daemon) :
import arsd.netman;
// Real time update daemon
/*
You push messages out to channels, where they are held for a certain length of time.
@ -327,7 +445,7 @@ class NotificationConnection : RtudConnection {
daemon.writeMessagesTo(backMessages, this, "backed-up");
// if(closeTime > 0 && closeTime != long.max)
// closeTime = getUTCtime() + closeTime; // FIXME: do i use this? Should I use this?
// closeTime = getUtcTime() + closeTime; // FIXME: do i use this? Should I use this?
}
override void onDisconnect() {
@ -361,7 +479,7 @@ class DataConnection : RtudConnection {
// we have to create the message and send it out
m.type = getStr("type", "message");
m.data = getStr("data", "");
m.timestamp = to!long(getStr("timestamp", to!string(getUTCtime())));
m.timestamp = to!long(getStr("timestamp", to!string(getUtcTime())));
m.ttl = to!long(getStr("ttl", "1000"));
}
@ -420,7 +538,7 @@ class RealTimeUpdateDaemon : NetworkManager {
return messages[id];
if(id.length == 0)
id = to!string(getUTCtime());
id = to!string(getUtcTime());
longerId:
if(id in messages) {
@ -462,7 +580,7 @@ class RealTimeUpdateDaemon : NetworkManager {
void writeMessagesTo(Message*[] messages, NotificationConnection connection, string operation) {
foreach(messageMain; messages) {
if(messageMain.timestamp + messageMain.ttl < getUTCtime)
if(messageMain.timestamp + messageMain.ttl < getUtcTime)
deleteMessage(messageMain); // too old, kill it
Message message = *messageMain;
message.operation = operation;

125
web.d
View File

@ -423,11 +423,21 @@ class ApiProvider : WebDotDBaseType {
void writeFunctions(Element list, in ReflectionInfo* reflection, string base) {
string[string] handled;
foreach(func; reflection.functions) {
foreach(key, func; reflection.functions) {
if(func.originalName in handled)
continue;
handled[func.originalName] = func.originalName;
list.addChild("li", new Link(base ~ func.name, beautify(func.originalName)));
// skip these since the root is what this is there for
if(func.originalName == "GET" || func.originalName == "POST")
continue;
// the builtins aren't interesting either
if(key.startsWith("builtin."))
continue;
if(func.originalName.length)
list.addChild("li", new Link(base ~ func.name, beautify(func.originalName)));
}
handled = null;
@ -444,7 +454,10 @@ class ApiProvider : WebDotDBaseType {
}
auto list = container.addChild("ul");
writeFunctions(list, reflection, _baseUrl ~ "/");
auto starting = _baseUrl;
if(starting is null)
starting = cgi.scriptName ~ cgi.pathInfo; // FIXME
writeFunctions(list, reflection, starting ~ "/");
return list.parentNode.removeChild(list);
}
@ -2209,7 +2222,8 @@ string toUrlName(string name) {
string beautify(string name) {
string n;
if(name.length == 0)
// all caps names shouldn't get spaces
if(name.length == 0 || name.toUpper() == name)
return name;
n ~= toUpper(name[0..1]);
@ -2556,6 +2570,7 @@ class Session {
return;
if(force || changed) {
std.file.write(getFilePath(), toJson(data));
changed = false;
// We have to make sure that only we can read this file,
// since otherwise, on shared hosts, our session data might be
// easily stolen. Note: if your shared host doesn't have different
@ -2603,16 +2618,46 @@ void setLoginCookie(Cgi cgi, string name, string value) {
}
void applyTemplateToElement(Element e, in string[string] vars) {
immutable(string[]) monthNames = [
"January",
"February",
"March",
"April",
"May",
"June",
"July",
"August",
"September",
"October",
"November",
"December"
];
immutable(string[]) weekdayNames = [
"Sunday",
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday"
];
void applyTemplateToElement(Element e, in string[string] vars, in string delegate(string, string[], in Element, string)[string] pipeFunctions = null) {
foreach(ele; e.tree) {
auto tc = cast(TextNode) ele;
if(tc !is null) {
// text nodes have no attributes, but they do have text we might replace.
tc.contents = htmlTemplateWithData(tc.contents, vars, false);
tc.contents = htmlTemplateWithData(tc.contents, vars, pipeFunctions, false);
} else {
auto rs = cast(RawSource) ele;
if(rs !is null)
rs.source = htmlTemplateWithData(rs.source, vars, true); /* FIXME: might be wrong... */
rs.source = htmlTemplateWithData(rs.source, vars, pipeFunctions, true); /* FIXME: might be wrong... */
// if it is not a text node, it has no text where templating is valid, except the attributes
// note: text nodes have no attributes, which is why this is in the separate branch.
foreach(k, v; ele.attributes) {
@ -2621,7 +2666,7 @@ void applyTemplateToElement(Element e, in string[string] vars) {
v = v.replace("%7B%24", "{$");
v = v.replace("%7D", "}");
}
ele.attributes[k] = htmlTemplateWithData(v, vars, false);
ele.attributes[k] = htmlTemplateWithData(v, vars, pipeFunctions, false);
}
}
}
@ -2630,7 +2675,7 @@ void applyTemplateToElement(Element e, in string[string] vars) {
// this thing sucks a little less now.
// set useHtml to false if you're working on internal data (such as TextNode.contents, or attribute);
// it should only be set to true if you're doing input that has already been ran through toString or something.
string htmlTemplateWithData(in string text, in string[string] vars, bool useHtml = true) {
string htmlTemplateWithData(in string text, in string[string] vars, in string delegate(string, string[], in Element, string)[string] pipeFunctions, bool useHtml) {
if(text is null)
return null;
@ -2641,7 +2686,46 @@ string htmlTemplateWithData(in string text, in string[string] vars, bool useHtml
size_t nameStart;
size_t replacementStart;
size_t lastAppend = 0;
string name = null;
string replacement = null;
string currentPipe = null;
foreach(i, c; text) {
void stepHandler() {
if(name is null)
name = text[nameStart .. i];
else if(nameStart != i)
currentPipe = text[nameStart .. i];
nameStart = i + 1;
auto it = name in vars;
if(it !is null)
replacement = *it;
}
void pipeHandler() {
if(currentPipe is null || replacement is null)
return;
switch(currentPipe) {
case "date":
auto date = to!long(replacement);
import std.date;
auto day = dateFromTime(date);
auto year = yearFromTime(date);
auto month = monthNames[monthFromTime(date)];
replacement = format("%s %d, %d", month, day, year);
break;
default:
}
currentPipe = null;
}
switch(state) {
default: assert(0);
case 0:
@ -2661,21 +2745,27 @@ string htmlTemplateWithData(in string text, in string[string] vars, bool useHtml
state = 0; // empty names aren't allowed; ignore it
} else {
nameStart = i;
name = null;
state++;
}
break;
case 3: // reading a name
if(c == '}') {
// the pipe operator lets us filter the text
if(c == '|') {
pipeHandler();
stepHandler();
} else if(c == '}') {
// just finished reading it, let's do our replacement.
string name = text[nameStart .. i];
auto it = name in vars;
if(it !is null) {
pipeHandler(); // anything that was there
stepHandler(); // might make a new pipe if the first...
pipeHandler(); // new names/pipes since this is the last go
if(name !is null && replacement !is null) {
newText ~= text[lastAppend .. replacementStart];
string replacement = *it;
if(useHtml)
replacement = htmlEntitiesEncode(replacement).replace("\n", "<br />");
newText ~= *it;
newText ~= replacement;
lastAppend = i + 1;
replacement = null;
}
state = 0;
@ -2696,13 +2786,16 @@ string htmlTemplateWithData(in string text, in string[string] vars, bool useHtml
class TemplatedDocument : Document {
override string toString() const {
if(this.root !is null)
applyTemplateToElement(cast() this.root, vars); /* FIXME: I shouldn't cast away const, since it's rude to modify an object in any toString.... but that's what I'm doing for now */
applyTemplateToElement(cast() this.root, vars, viewFunctions); /* FIXME: I shouldn't cast away const, since it's rude to modify an object in any toString.... but that's what I'm doing for now */
return super.toString();
}
public:
string[string] vars; /// use this to set up the string replacements. document.vars["name"] = "adam"; then in doc, <p>hellp, {$name}.</p>. Note the vars are converted lazily at toString time and are always HTML escaped.
/// In the html templates, you can write {$varname} or {$varname|func} (or {$varname|func arg arg|func} and so on). This holds the functions available these. The TemplatedDocument constructor puts in a handful of generic ones.
string delegate(string, string[], in Element, string)[string] viewFunctions;
this(string src) {
super();