Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-30 22:24:06 +01:00
Code Issues Projects Releases Wiki Activity

Moved Web* to webpackage and added server-to-client configuration (server-side).

Browse Source
This commit is contained in:
FrozenCow 2011-01-26 00:38:36 +01:00
parent 36d1a7676e
commit 99ae8a8f3b
4 changed files with 74 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configuration.txt
View File

@ -14,3 +14,11 @@ webserver-bindaddress: 0.0.0.0
# The TCP-port the webserver will listen on.
webserver-port: 8123
web:
# Interval the browser should poll for updates.
updaterate: 2000
showchatballoon: true
shownmaps:
defaultmap: DefaultMapType
cavemap: CaveMapType

1
src/main/java/org/dynmap/DynmapPlugin.java
View File

@ -12,6 +12,7 @@ import org.bukkit.plugin.*;
import org.bukkit.plugin.java.*;
import org.bukkit.util.config.Configuration;
import org.dynmap.debug.BukkitPlayerDebugger;
import org.dynmap.web.WebServer;
public class DynmapPlugin extends JavaPlugin {

9
src/main/java/org/dynmap/WebServer.java → src/main/java/org/dynmap/web/WebServer.java
View File

@ -1,4 +1,4 @@
package org.dynmap;
package org.dynmap.web;
import java.io.IOException;
import java.net.InetAddress;
@ -7,7 +7,10 @@ import java.net.Socket;
import java.util.logging.Logger;
import org.bukkit.Server;
import org.bukkit.util.config.Configuration;
import org.bukkit.util.config.ConfigurationNode;
import org.dynmap.MapManager;
import org.dynmap.PlayerList;
import org.dynmap.debug.Debugger;
public class WebServer extends Thread {
@ -23,12 +26,14 @@ public class WebServer extends Thread {
private MapManager mgr;
private Server server;
private PlayerList playerList;
private ConfigurationNode configuration;
public WebServer(MapManager mgr, Server server, PlayerList playerList, Debugger debugger, ConfigurationNode configuration) throws IOException
{
this.mgr = mgr;
this.server = server;
this.playerList = playerList;
this.configuration = configuration;
this.debugger = debugger;
String bindAddress = configuration.getString("webserver-bindaddress", "0.0.0.0");
@ -46,7 +51,7 @@ public class WebServer extends Thread {
while (running) {
try {
Socket socket = sock.accept();
WebServerRequest requestThread = new WebServerRequest(socket, mgr, server, playerList, debugger);
WebServerRequest requestThread = new WebServerRequest(socket, mgr, server, playerList, configuration, debugger);
requestThread.start();
}
catch (IOException e) {

60
src/main/java/org/dynmap/WebServerRequest.java → src/main/java/org/dynmap/web/WebServerRequest.java
View File

@ -1,4 +1,4 @@
package org.dynmap;
package org.dynmap.web;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
@ -10,11 +10,18 @@ import java.io.InputStreamReader;
import java.net.Socket;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.logging.Logger;
import org.bukkit.Server;
import org.bukkit.entity.Player;
import org.bukkit.util.config.ConfigurationNode;
import org.dynmap.ChatQueue;
import org.dynmap.MapManager;
import org.dynmap.PlayerList;
import org.dynmap.TileUpdate;
import org.dynmap.ChatQueue.ChatMessage;
import org.dynmap.debug.Debugger;
public class WebServerRequest extends Thread {
@ -25,14 +32,16 @@ public class WebServerRequest extends Thread {
private MapManager mgr;
private Server server;
private PlayerList playerList;
private ConfigurationNode configuration;
public WebServerRequest(Socket socket, MapManager mgr, Server server, PlayerList playerList, Debugger debugger)
public WebServerRequest(Socket socket, MapManager mgr, Server server, PlayerList playerList, ConfigurationNode configuration, Debugger debugger)
{
this.debugger = debugger;
this.socket = socket;
this.mgr = mgr;
this.server = server;
this.playerList = playerList;
this.configuration = configuration;
}
private static void writeHttpHeader(BufferedOutputStream out, int statusCode, String statusText) throws IOException {
@ -73,7 +82,9 @@ public class WebServerRequest extends Thread {
String path = request.substring(4, request.length() - 9);
debugger.debug("request: " + path);
if (path.startsWith("/up/")) {
if (path.equals("/up/configuration")) {
handleConfiguration(out);
} else if (path.startsWith("/up/")) {
handleUp(out, path.substring(3));
} else if (path.startsWith("/tiles/")) {
handleMapToDirectory(out, path.substring(6), mgr.tileDirectory);
@ -98,6 +109,49 @@ public class WebServerRequest extends Thread {
}
}
public String stringifyJson(Object o) {
if (o == null) {
return "null";
} else if (o instanceof String) {
return "\"" + o + "\"";
} else if (o instanceof Integer || o instanceof Long || o instanceof Float || o instanceof Double) {
return o.toString();
} else if (o instanceof LinkedHashMap<?, ?>) {
LinkedHashMap<String, Object> m = (LinkedHashMap<String, Object>)o;
StringBuilder sb = new StringBuilder();
sb.append("{");
boolean first = true;
for (String key : m.keySet()) {
if (first) first = false;
else sb.append(",");
sb.append(stringifyJson(key));
sb.append(": ");
sb.append(stringifyJson(m.get(key)));
}
sb.append("}");
return sb.toString();
} else {
return "undefined";
}
}
public void handleConfiguration(BufferedOutputStream out) throws IOException {
String s = stringifyJson(configuration.getProperty("web"));
byte[] bytes = s.getBytes();
String dateStr = new Date().toString();
writeHttpHeader(out, 200, "OK");
writeHeaderField(out, "Date", dateStr);
writeHeaderField(out, "Content-Type", "text/plain");
writeHeaderField(out, "Expires", "Thu, 01 Dec 1994 16:00:00 GMT");
writeHeaderField(out, "Last-modified", dateStr);
writeHeaderField(out, "Content-Length", Integer.toString(bytes.length));
writeEndOfHeaders(out);
out.write(bytes);
}
public void handleUp(BufferedOutputStream out, String path) throws IOException {
int current = (int) (System.currentTimeMillis() / 1000);
long cutoff = 0;