diff --git a/.classpath b/.classpath index aa55a3852..76e8efce1 100644 --- a/.classpath +++ b/.classpath @@ -3,7 +3,7 @@ - + diff --git a/README.md b/README.md index cb471ea8a..6442842ad 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,17 @@ ScriptCraft plugin … [ic]: http://canarymod.net/releases [cmapi]: https://ci.visualillusionsent.net/job/CanaryLib/javadoc/ +# BlocklyCraft visual editor + +ScriptCraft now includes a graphical editor. This allows even younger aspiring programmers +to create Minecraft Mods without (initially) having to learn how to type even a single line of JavaScript, +making it (also) a visual programming environment, and not only a text-based code one. This visual editor +is web-based, and based on Google's Blockly (which was influenced by MIT's Scratch, which was inspired by +Logo, the original "turtle graphics" educational programming language designed in 1967 equally at MIT.) + +[http://localhost:7070/blocklycraft/](http://localhost:7070/blocklycraft/index.html) opens this intuitive editor, and [this first video introduces](https://www.youtube.com/watch?v=cat5f-Hy16k) how to use it, [this video in Italian](https://www.youtube.com/watch?v=83I8DzWjnNQ) is from Devoxx4kids Ticino 2015, where [BlocklyMinecraft was born during a Hackergarten](https://www.flickr.com/photos/132694685@N07/16616720023/in/set-72157649797804723). + + # Contributing If you would like to contribute source code and/or documentation changes please [read contributing.md][contrib] diff --git a/TODO.md b/TODO.md new file mode 100644 index 000000000..3b9a6106f --- /dev/null +++ b/TODO.md @@ -0,0 +1,36 @@ +## ToDo + +[ ] BlocklyCraft: Translate Italian-only blocks to French & German +[ ] Create HTML version of MinecraftModdingIdeas_20150416.docx, link it as Help? +[ ] Video/s more, Blog, Tweet.. +[ ] announce it on https://groups.google.com/forum/#!forum/blockly +[ ] get linked on https://blockly-games.appspot.com/about?lang=en +[ ] Save using https://blockly-demo.appspot.com/static/demos/storage/index.html & https://developers.google.com/blockly/installation/cloud-storage +[ ] How-to refresh() without restarting the web server? If figured out, then re-enable the commented out httpServer.openURL(); in *BOTH* ScriptCraftPlugin classes +[ ] https://github.com/maxogden/javascript-editor +[ ] support Java (Xtend?) instead of JavaScript coding (use Hotea) + + +## Done + +# 2015.05.30 +[X] Michael integrated Lauro's clean-up and English instead of Italian only Translations; submitted pull request to Walter! + +# 2015.04.26 +[X] Web Server handles POST to update JS files, under fixed folder, to later support Save from Blockly (using POST instead of GET) +[X] Bundled complete BlocklyCraft, as received in Lauro's ZIP - but complete separate 3rd-party from our code +[X] Introduced it in README.md incl. link to https://www.youtube.com/watch?v=cat5f-Hy16k + +# 2015.04.22 +[X] Integrated js/plugins/blocklycraft (without Blockly in www/, yet) + [X] copy 2-3 files, works! now showing in Git. + [X] remove hard-coded path.. avoid error on start-up + [X] cleaned up files much, formatting, header, etc. + +# 2015.04.19 +[X] Given hugely successful Devoxx4Kids workshop in Lugano, Ticino, Switzerland using this ScriptCraft + BlocklyCraft ;) +[X] Integrated Web Server + * Can serve static files + * HTTP host and port configured via -Dorg.scriptcraftjs.webserver.WebServer.port and *.host + * HTTP Request/Response details logging intentionally disabled + * Automatically opens web browser diff --git a/build.xml b/build.xml index f76a9ff3b..e9770f424 100644 --- a/build.xml +++ b/build.xml @@ -7,6 +7,7 @@ * Glowstone (which is bukkit-compatible) * Spigot (which is bukkit-compatible) --> + @@ -60,7 +61,8 @@ + verbose="true" + skipexisting="true" /> @@ -73,6 +75,7 @@ target="1.6" destdir="${build}" debug="true"> + @@ -189,7 +192,7 @@ Walter Higgins - + @@ -202,7 +205,7 @@ Walter Higgins + excludes="modules/**, plugins/**, www/**"> @@ -210,14 +213,15 @@ Walter Higgins + dest="${dist}/js/modules/underscore.js" + skipexisting="true"/> + excludes="lib/**, plugins/**, www/**"> @@ -225,11 +229,20 @@ Walter Higgins + excludes="lib/**, modules/**, www/**"> - + + + + + + + @@ -262,4 +275,8 @@ Walter Higgins + + + + diff --git a/release-notes.md b/release-notes.md index 33297c330..1e46a5dde 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,6 +1,10 @@ RELEASE NOTES ============= +TBD Release (2015 ? ?) +-------------------------- +Added BlocklyMinecraft visual editor contributed by Lauro Canonica and Michael Vorburger.ch + 3.1.4 Release (2015 05 09) -------------------------- Various bug fixes and new 'inventory' module. diff --git a/src/main/java/bukkit/org/scriptcraftjs/bukkit/ScriptCraftPlugin.java b/src/main/java/bukkit/org/scriptcraftjs/bukkit/ScriptCraftPlugin.java index 9713500dc..f6ab5391d 100644 --- a/src/main/java/bukkit/org/scriptcraftjs/bukkit/ScriptCraftPlugin.java +++ b/src/main/java/bukkit/org/scriptcraftjs/bukkit/ScriptCraftPlugin.java @@ -1,16 +1,18 @@ package org.scriptcraftjs.bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.event.Listener; -import org.bukkit.plugin.java.JavaPlugin; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.List; import javax.script.Invocable; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.List; + +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.event.Listener; +import org.bukkit.plugin.java.JavaPlugin; +import org.scriptcraftjs.webserver.ScriptCraftWebServer; public class ScriptCraftPlugin extends JavaPlugin implements Listener { @@ -22,6 +24,8 @@ public class ScriptCraftPlugin extends JavaPlugin implements Listener private String NO_JAVASCRIPT_MESSAGE = "No JavaScript Engine available. ScriptCraft will not work without Javascript."; protected ScriptEngine engine = null; + protected ScriptCraftWebServer httpServer = new ScriptCraftWebServer(); + @Override public void onEnable() { Thread currentThread = Thread.currentThread(); @@ -37,6 +41,11 @@ public class ScriptCraftPlugin extends JavaPlugin implements Listener this.engine.eval(new InputStreamReader(this.getResource("boot.js"))); inv.invokeFunction("__scboot", this, engine); } + + httpServer.start(); + this.getLogger().info(httpServer.getStartedLogMessage()); + // httpServer.openURL(); + } catch (Exception e) { e.printStackTrace(); this.getLogger().severe(e.getMessage()); @@ -45,6 +54,12 @@ public class ScriptCraftPlugin extends JavaPlugin implements Listener } } + @Override public void onDisable() { + super.onDisable(); + httpServer.stop(); + this.getLogger().info("HTTP web server stopped"); + } + public List onTabComplete(CommandSender sender, Command cmd, String alias, String[] args) diff --git a/src/main/java/canary/org/scriptcraftjs/canarymod/ScriptCraftPlugin.java b/src/main/java/canary/org/scriptcraftjs/canarymod/ScriptCraftPlugin.java index 6c16cc171..73528de2d 100644 --- a/src/main/java/canary/org/scriptcraftjs/canarymod/ScriptCraftPlugin.java +++ b/src/main/java/canary/org/scriptcraftjs/canarymod/ScriptCraftPlugin.java @@ -1,24 +1,29 @@ package org.scriptcraftjs.canarymod; import java.io.InputStreamReader; -import javax.script.ScriptEngineManager; -import javax.script.ScriptEngine; -import javax.script.Invocable; -import java.util.List; import java.util.ArrayList; +import java.util.List; -import net.canarymod.plugin.Plugin; -import net.canarymod.plugin.PluginListener; -import net.canarymod.tasks.ServerTask; -import net.canarymod.tasks.TaskOwner; -import net.canarymod.commandsys.CommandListener; +import javax.script.Invocable; +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; + +import net.canarymod.Canary; +import net.canarymod.chat.MessageReceiver; import net.canarymod.commandsys.Command; +import net.canarymod.commandsys.CommandListener; import net.canarymod.commandsys.TabComplete; import net.canarymod.chat.MessageReceiver; import net.canarymod.Canary; // event help stuff import net.canarymod.hook.Dispatcher; import net.canarymod.hook.Hook; +import net.canarymod.plugin.Plugin; +import net.canarymod.plugin.PluginListener; +import net.canarymod.tasks.ServerTask; +import net.canarymod.tasks.TaskOwner; + +import org.scriptcraftjs.webserver.ScriptCraftWebServer; public class ScriptCraftPlugin extends Plugin implements PluginListener, CommandListener { @@ -28,8 +33,12 @@ public class ScriptCraftPlugin extends Plugin implements PluginListener, Command "ScriptCraft will not work without Javascript."; protected ScriptEngine engine = null; + protected ScriptCraftWebServer httpServer = new ScriptCraftWebServer(); + @Override public void disable(){ + httpServer.stop(); + this.getLogman().info("HTTP web server stopped"); try { ((Invocable)this.engine).invokeFunction("__onDisable", this.engine, this); }catch ( Exception e) { @@ -56,12 +65,16 @@ public boolean enable() } Canary.commands().registerCommands(this, this, false); + + httpServer.start(); + this.getLogman().info(httpServer.getStartedLogMessage()); + // httpServer.openURL(); + }catch(Exception e){ e.printStackTrace(); this.getLogman().error(e.getMessage()); } - - + return true; } @@ -151,12 +164,12 @@ private List complete(MessageReceiver sender, String[] args, String cmd) } return result; } - + @TabComplete (commands = { "js" }) public List jsComplete(MessageReceiver sender, String[] args){ return complete(sender, args, "js"); } - + @TabComplete (commands = { "jsp" }) public List jspComplete(MessageReceiver sender, String[] args){ return complete(sender, args, "jsp"); diff --git a/src/main/java/common/fi/iki/elonen/InternalRewrite.java b/src/main/java/common/fi/iki/elonen/InternalRewrite.java new file mode 100644 index 000000000..b84d88ed8 --- /dev/null +++ b/src/main/java/common/fi/iki/elonen/InternalRewrite.java @@ -0,0 +1,28 @@ +package fi.iki.elonen; + +import java.util.Map; + +import static fi.iki.elonen.NanoHTTPD.Response; + +/** + * @author Paul S. Hawke (paul.hawke@gmail.com) + * On: 9/15/13 at 2:52 PM + */ +public class InternalRewrite extends Response { + private final String uri; + private final Map headers; + + public InternalRewrite(Map headers, String uri) { + super(null); + this.headers = headers; + this.uri = uri; + } + + public String getUri() { + return uri; + } + + public Map getHeaders() { + return headers; + } +} diff --git a/src/main/java/common/fi/iki/elonen/LICENSE.md b/src/main/java/common/fi/iki/elonen/LICENSE.md new file mode 100644 index 000000000..8dc4ca7c6 --- /dev/null +++ b/src/main/java/common/fi/iki/elonen/LICENSE.md @@ -0,0 +1,12 @@ +Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010 by Konstantinos Togias +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +* Neither the name of the NanoHttpd organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/src/main/java/common/fi/iki/elonen/NanoHTTPD.java b/src/main/java/common/fi/iki/elonen/NanoHTTPD.java new file mode 100644 index 000000000..edc704c60 --- /dev/null +++ b/src/main/java/common/fi/iki/elonen/NanoHTTPD.java @@ -0,0 +1,1420 @@ +package fi.iki.elonen; + +import java.io.*; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.SocketException; +import java.net.SocketTimeoutException; +import java.net.URLDecoder; +import java.nio.ByteBuffer; +import java.nio.channels.FileChannel; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.TimeZone; + +/** + * A simple, tiny, nicely embeddable HTTP server in Java + *

+ *

+ * NanoHTTPD + *

Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010 by Konstantinos Togias

+ *

+ *

+ * Features + limitations: + *

    + *

    + *

  • Only one Java file
    • + *
  • Java 5 compatible
    • + *
  • Released as open source, Modified BSD licence
    • + *
  • No fixed config files, logging, authorization etc. (Implement yourself if you need them.)
    • + *
  • Supports parameter parsing of GET and POST methods (+ rudimentary PUT support in 1.25)
    • + *
  • Supports both dynamic content and file serving
    • + *
  • Supports file upload (since version 1.2, 2010)
    • + *
  • Supports partial content (streaming)
    • + *
  • Supports ETags
    • + *
  • Never caches anything
    • + *
  • Doesn't limit bandwidth, request time or simultaneous connections
    • + *
  • Default code serves files and shows all HTTP parameters and headers
    • + *
  • File server supports directory listing, index.html and index.htm
    • + *
  • File server supports partial content (streaming)
    • + *
  • File server supports ETags
    • + *
  • File server does the 301 redirection trick for directories without '/'
    • + *
  • File server supports simple skipping for files (continue download)
    • + *
  • File server serves also very long files without memory overhead
    • + *
  • Contains a built-in list of most common mime types
    • + *
  • All header names are converted lowercase so they don't vary between browsers/clients
    • + *

    + *

+ *

+ *

+ * How to use: + *

    + *

    + *

  • Subclass and implement serve() and embed to your own program
    • + *

    + *

+ *

+ * See the separate "LICENSE.md" file for the distribution license (Modified BSD licence) + */ +public abstract class NanoHTTPD { + /** + * Maximum time to wait on Socket.getInputStream().read() (in milliseconds) + * This is required as the Keep-Alive HTTP connections would otherwise + * block the socket reading thread forever (or as long the browser is open). + */ + public static final int SOCKET_READ_TIMEOUT = 5000; + /** + * Common mime type for dynamic content: plain text + */ + public static final String MIME_PLAINTEXT = "text/plain"; + /** + * Common mime type for dynamic content: html + */ + public static final String MIME_HTML = "text/html"; + /** + * Pseudo-Parameter to use to store the actual query string in the parameters map for later re-processing. + */ + private static final String QUERY_STRING_PARAMETER = "NanoHttpd.QUERY_STRING"; + private final String hostname; + private final int myPort; + private ServerSocket myServerSocket; + private Set openConnections = new HashSet(); + private Thread myThread; + /** + * Pluggable strategy for asynchronously executing requests. + */ + private AsyncRunner asyncRunner; + /** + * Pluggable strategy for creating and cleaning up temporary files. + */ + private TempFileManagerFactory tempFileManagerFactory; + + /** + * Constructs an HTTP server on given port. + */ + public NanoHTTPD(int port) { + this(null, port); + } + + /** + * Constructs an HTTP server on given hostname and port. + */ + public NanoHTTPD(String hostname, int port) { + this.hostname = hostname; + this.myPort = port; + setTempFileManagerFactory(new DefaultTempFileManagerFactory()); + setAsyncRunner(new DefaultAsyncRunner()); + } + + protected static final void safeClose(Closeable closeable) { + if (closeable != null) { + try { + closeable.close(); + } catch (IOException e) { + } + } + } + + private static final void safeClose(Socket closeable) { + if (closeable != null) { + try { + closeable.close(); + } catch (IOException e) { + } + } + } + + private static final void safeClose(ServerSocket closeable) { + if (closeable != null) { + try { + closeable.close(); + } catch (IOException e) { + } + } + } + + /** + * Start the server. + * + * @throws IOException if the socket is in use. + */ + public void start() throws IOException { + myServerSocket = new ServerSocket(); + myServerSocket.bind((hostname != null) ? new InetSocketAddress(hostname, myPort) : new InetSocketAddress(myPort)); + + myThread = new Thread(new Runnable() { + @Override + public void run() { + do { + try { + final Socket finalAccept = myServerSocket.accept(); + registerConnection(finalAccept); + finalAccept.setSoTimeout(SOCKET_READ_TIMEOUT); + final InputStream inputStream = finalAccept.getInputStream(); + asyncRunner.exec(new Runnable() { + @Override + public void run() { + OutputStream outputStream = null; + try { + outputStream = finalAccept.getOutputStream(); + TempFileManager tempFileManager = tempFileManagerFactory.create(); + HTTPSession session = new HTTPSession(tempFileManager, inputStream, outputStream, finalAccept.getInetAddress()); + while (!finalAccept.isClosed()) { + session.execute(); + } + } catch (Exception e) { + // When the socket is closed by the client, we throw our own SocketException + // to break the "keep alive" loop above. + if (!(e instanceof SocketException && "NanoHttpd Shutdown".equals(e.getMessage()))) { + e.printStackTrace(); + } + } finally { + safeClose(outputStream); + safeClose(inputStream); + safeClose(finalAccept); + unRegisterConnection(finalAccept); + } + } + }); + } catch (IOException e) { + } + } while (!myServerSocket.isClosed()); + } + }); + myThread.setDaemon(true); + myThread.setName("NanoHttpd Main Listener"); + myThread.start(); + } + + /** + * Stop the server. + */ + public void stop() { + try { + safeClose(myServerSocket); + closeAllConnections(); + if (myThread != null) { + myThread.join(); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Registers that a new connection has been set up. + * + * @param socket the {@link Socket} for the connection. + */ + public synchronized void registerConnection(Socket socket) { + openConnections.add(socket); + } + + /** + * Registers that a connection has been closed + * + * @param socket + * the {@link Socket} for the connection. + */ + public synchronized void unRegisterConnection(Socket socket) { + openConnections.remove(socket); + } + + /** + * Forcibly closes all connections that are open. + */ + public synchronized void closeAllConnections() { + for (Socket socket : openConnections) { + safeClose(socket); + } + } + + public final int getListeningPort() { + return myServerSocket == null ? -1 : myServerSocket.getLocalPort(); + } + + public final boolean wasStarted() { + return myServerSocket != null && myThread != null; + } + + public final boolean isAlive() { + return wasStarted() && !myServerSocket.isClosed() && myThread.isAlive(); + } + + /** + * Override this to customize the server. + *

+ *

+ * (By default, this delegates to serveFile() and allows directory listing.) + * + * @param uri Percent-decoded URI without parameters, for example "/index.cgi" + * @param method "GET", "POST" etc. + * @param parms Parsed, percent decoded parameters from URI and, in case of POST, data. + * @param headers Header entries, percent decoded + * @return HTTP response, see class Response for details + */ + @Deprecated + public Response serve(String uri, Method method, Map headers, Map parms, + Map files) { + return new Response(Response.Status.NOT_FOUND, MIME_PLAINTEXT, "Not Found"); + } + + /** + * Override this to customize the server. + *

+ *

+ * (By default, this delegates to serveFile() and allows directory listing.) + * + * @param session The HTTP session + * @return HTTP response, see class Response for details + */ + public Response serve(IHTTPSession session) { + Map files = new HashMap(); + Method method = session.getMethod(); + if (Method.PUT.equals(method) || Method.POST.equals(method)) { + try { + session.parseBody(files); + } catch (IOException ioe) { + return new Response(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage()); + } catch (ResponseException re) { + return new Response(re.getStatus(), MIME_PLAINTEXT, re.getMessage()); + } + } + + Map parms = session.getParms(); + parms.put(QUERY_STRING_PARAMETER, session.getQueryParameterString()); + return serve(session.getUri(), method, session.getHeaders(), parms, files); + } + + /** + * Decode percent encoded String values. + * + * @param str the percent encoded String + * @return expanded form of the input, for example "foo%20bar" becomes "foo bar" + */ + protected String decodePercent(String str) { + String decoded = null; + try { + decoded = URLDecoder.decode(str, "UTF8"); + } catch (UnsupportedEncodingException ignored) { + } + return decoded; + } + + /** + * Decode parameters from a URL, handing the case where a single parameter name might have been + * supplied several times, by return lists of values. In general these lists will contain a single + * element. + * + * @param parms original NanoHttpd parameters values, as passed to the serve() method. + * @return a map of String (parameter name) to List<String> (a list of the values supplied). + */ + protected Map> decodeParameters(Map parms) { + return this.decodeParameters(parms.get(QUERY_STRING_PARAMETER)); + } + + /** + * Decode parameters from a URL, handing the case where a single parameter name might have been + * supplied several times, by return lists of values. In general these lists will contain a single + * element. + * + * @param queryString a query string pulled from the URL. + * @return a map of String (parameter name) to List<String> (a list of the values supplied). + */ + protected Map> decodeParameters(String queryString) { + Map> parms = new HashMap>(); + if (queryString != null) { + StringTokenizer st = new StringTokenizer(queryString, "&"); + while (st.hasMoreTokens()) { + String e = st.nextToken(); + int sep = e.indexOf('='); + String propertyName = (sep >= 0) ? decodePercent(e.substring(0, sep)).trim() : decodePercent(e).trim(); + if (!parms.containsKey(propertyName)) { + parms.put(propertyName, new ArrayList()); + } + String propertyValue = (sep >= 0) ? decodePercent(e.substring(sep + 1)) : null; + if (propertyValue != null) { + parms.get(propertyName).add(propertyValue); + } + } + } + return parms; + } + + // ------------------------------------------------------------------------------- // + // + // Threading Strategy. + // + // ------------------------------------------------------------------------------- // + + /** + * Pluggable strategy for asynchronously executing requests. + * + * @param asyncRunner new strategy for handling threads. + */ + public void setAsyncRunner(AsyncRunner asyncRunner) { + this.asyncRunner = asyncRunner; + } + + // ------------------------------------------------------------------------------- // + // + // Temp file handling strategy. + // + // ------------------------------------------------------------------------------- // + + /** + * Pluggable strategy for creating and cleaning up temporary files. + * + * @param tempFileManagerFactory new strategy for handling temp files. + */ + public void setTempFileManagerFactory(TempFileManagerFactory tempFileManagerFactory) { + this.tempFileManagerFactory = tempFileManagerFactory; + } + + /** + * HTTP Request methods, with the ability to decode a String back to its enum value. + */ + public enum Method { + GET, PUT, POST, DELETE, HEAD, OPTIONS; + + static Method lookup(String method) { + for (Method m : Method.values()) { + if (m.toString().equalsIgnoreCase(method)) { + return m; + } + } + return null; + } + } + + /** + * Pluggable strategy for asynchronously executing requests. + */ + public interface AsyncRunner { + void exec(Runnable code); + } + + /** + * Factory to create temp file managers. + */ + public interface TempFileManagerFactory { + TempFileManager create(); + } + + // ------------------------------------------------------------------------------- // + + /** + * Temp file manager. + *

+ *

Temp file managers are created 1-to-1 with incoming requests, to create and cleanup + * temporary files created as a result of handling the request.

+ */ + public interface TempFileManager { + TempFile createTempFile() throws Exception; + + void clear(); + } + + /** + * A temp file. + *

+ *

Temp files are responsible for managing the actual temporary storage and cleaning + * themselves up when no longer needed.

+ */ + public interface TempFile { + OutputStream open() throws Exception; + + void delete() throws Exception; + + String getName(); + } + + /** + * Default threading strategy for NanoHttpd. + *

+ *

By default, the server spawns a new Thread for every incoming request. These are set + * to daemon status, and named according to the request number. The name is + * useful when profiling the application.

+ */ + public static class DefaultAsyncRunner implements AsyncRunner { + private long requestCount; + + @Override + public void exec(Runnable code) { + ++requestCount; + Thread t = new Thread(code); + t.setDaemon(true); + t.setName("NanoHttpd Request Processor (#" + requestCount + ")"); + t.start(); + } + } + + /** + * Default strategy for creating and cleaning up temporary files. + *

+ *

This class stores its files in the standard location (that is, + * wherever java.io.tmpdir points to). Files are added + * to an internal list, and deleted when no longer needed (that is, + * when clear() is invoked at the end of processing a + * request).

+ */ + public static class DefaultTempFileManager implements TempFileManager { + private final String tmpdir; + private final List tempFiles; + + public DefaultTempFileManager() { + tmpdir = System.getProperty("java.io.tmpdir"); + tempFiles = new ArrayList(); + } + + @Override + public TempFile createTempFile() throws Exception { + DefaultTempFile tempFile = new DefaultTempFile(tmpdir); + tempFiles.add(tempFile); + return tempFile; + } + + @Override + public void clear() { + for (TempFile file : tempFiles) { + try { + file.delete(); + } catch (Exception ignored) { + } + } + tempFiles.clear(); + } + } + + /** + * Default strategy for creating and cleaning up temporary files. + *

+ *

By default, files are created by File.createTempFile() in + * the directory specified.

+ */ + public static class DefaultTempFile implements TempFile { + private File file; + private OutputStream fstream; + + public DefaultTempFile(String tempdir) throws IOException { + file = File.createTempFile("NanoHTTPD-", "", new File(tempdir)); + fstream = new FileOutputStream(file); + } + + @Override + public OutputStream open() throws Exception { + return fstream; + } + + @Override + public void delete() throws Exception { + safeClose(fstream); + file.delete(); + } + + @Override + public String getName() { + return file.getAbsolutePath(); + } + } + + /** + * HTTP response. Return one of these from serve(). + */ + public static class Response { + /** + * HTTP status code after processing, e.g. "200 OK", HTTP_OK + */ + private IStatus status; + /** + * MIME type of content, e.g. "text/html" + */ + private String mimeType; + /** + * Data of the response, may be null. + */ + private InputStream data; + /** + * Headers for the HTTP response. Use addHeader() to add lines. + */ + private Map header = new HashMap(); + /** + * The request method that spawned this response. + */ + private Method requestMethod; + /** + * Use chunkedTransfer + */ + private boolean chunkedTransfer; + + /** + * Default constructor: response = HTTP_OK, mime = MIME_HTML and your supplied message + */ + public Response(String msg) { + this(Status.OK, MIME_HTML, msg); + } + + /** + * Basic constructor. + */ + public Response(IStatus status, String mimeType, InputStream data) { + this.status = status; + this.mimeType = mimeType; + this.data = data; + } + + /** + * Convenience method that makes an InputStream out of given text. + */ + public Response(IStatus status, String mimeType, String txt) { + this.status = status; + this.mimeType = mimeType; + try { + this.data = txt != null ? new ByteArrayInputStream(txt.getBytes("UTF-8")) : null; + } catch (java.io.UnsupportedEncodingException uee) { + uee.printStackTrace(); + } + } + + /** + * Adds given line to the header. + */ + public void addHeader(String name, String value) { + header.put(name, value); + } + + public String getHeader(String name) { + return header.get(name); + } + + /** + * Sends given response to the socket. + */ + protected void send(OutputStream outputStream) { + String mime = mimeType; + SimpleDateFormat gmtFrmt = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss 'GMT'", Locale.US); + gmtFrmt.setTimeZone(TimeZone.getTimeZone("GMT")); + + try { + if (status == null) { + throw new Error("sendResponse(): Status can't be null."); + } + PrintWriter pw = new PrintWriter(outputStream); + pw.print("HTTP/1.1 " + status.getDescription() + " \r\n"); + + if (mime != null) { + pw.print("Content-Type: " + mime + "\r\n"); + } + + if (header == null || header.get("Date") == null) { + pw.print("Date: " + gmtFrmt.format(new Date()) + "\r\n"); + } + + if (header != null) { + for (String key : header.keySet()) { + String value = header.get(key); + pw.print(key + ": " + value + "\r\n"); + } + } + + sendConnectionHeaderIfNotAlreadyPresent(pw, header); + + if (requestMethod != Method.HEAD && chunkedTransfer) { + sendAsChunked(outputStream, pw); + } else { + int pending = data != null ? data.available() : 0; + sendContentLengthHeaderIfNotAlreadyPresent(pw, header, pending); + pw.print("\r\n"); + pw.flush(); + sendAsFixedLength(outputStream, pending); + } + outputStream.flush(); + safeClose(data); + } catch (IOException ioe) { + // Couldn't write? No can do. + } + } + + protected void sendContentLengthHeaderIfNotAlreadyPresent(PrintWriter pw, Map header, int size) { + if (!headerAlreadySent(header, "content-length")) { + pw.print("Content-Length: "+ size +"\r\n"); + } + } + + protected void sendConnectionHeaderIfNotAlreadyPresent(PrintWriter pw, Map header) { + if (!headerAlreadySent(header, "connection")) { + pw.print("Connection: keep-alive\r\n"); + } + } + + private boolean headerAlreadySent(Map header, String name) { + boolean alreadySent = false; + for (String headerName : header.keySet()) { + alreadySent |= headerName.equalsIgnoreCase(name); + } + return alreadySent; + } + + private void sendAsChunked(OutputStream outputStream, PrintWriter pw) throws IOException { + pw.print("Transfer-Encoding: chunked\r\n"); + pw.print("\r\n"); + pw.flush(); + int BUFFER_SIZE = 16 * 1024; + byte[] CRLF = "\r\n".getBytes(); + byte[] buff = new byte[BUFFER_SIZE]; + int read; + while ((read = data.read(buff)) > 0) { + outputStream.write(String.format("%x\r\n", read).getBytes()); + outputStream.write(buff, 0, read); + outputStream.write(CRLF); + } + outputStream.write(String.format("0\r\n\r\n").getBytes()); + } + + private void sendAsFixedLength(OutputStream outputStream, int pending) throws IOException { + if (requestMethod != Method.HEAD && data != null) { + int BUFFER_SIZE = 16 * 1024; + byte[] buff = new byte[BUFFER_SIZE]; + while (pending > 0) { + int read = data.read(buff, 0, ((pending > BUFFER_SIZE) ? BUFFER_SIZE : pending)); + if (read <= 0) { + break; + } + outputStream.write(buff, 0, read); + pending -= read; + } + } + } + + public IStatus getStatus() { + return status; + } + + public void setStatus(Status status) { + this.status = status; + } + + public String getMimeType() { + return mimeType; + } + + public void setMimeType(String mimeType) { + this.mimeType = mimeType; + } + + public InputStream getData() { + return data; + } + + public void setData(InputStream data) { + this.data = data; + } + + public Method getRequestMethod() { + return requestMethod; + } + + public void setRequestMethod(Method requestMethod) { + this.requestMethod = requestMethod; + } + + public void setChunkedTransfer(boolean chunkedTransfer) { + this.chunkedTransfer = chunkedTransfer; + } + + public interface IStatus { + int getRequestStatus(); + String getDescription(); + } + + /** + * Some HTTP response status codes + */ + public enum Status implements IStatus { + SWITCH_PROTOCOL(101, "Switching Protocols"), OK(200, "OK"), CREATED(201, "Created"), ACCEPTED(202, "Accepted"), NO_CONTENT(204, "No Content"), PARTIAL_CONTENT(206, "Partial Content"), REDIRECT(301, + "Moved Permanently"), NOT_MODIFIED(304, "Not Modified"), BAD_REQUEST(400, "Bad Request"), UNAUTHORIZED(401, + "Unauthorized"), FORBIDDEN(403, "Forbidden"), NOT_FOUND(404, "Not Found"), METHOD_NOT_ALLOWED(405, "Method Not Allowed"), RANGE_NOT_SATISFIABLE(416, + "Requested Range Not Satisfiable"), INTERNAL_ERROR(500, "Internal Server Error"); + private final int requestStatus; + private final String description; + + Status(int requestStatus, String description) { + this.requestStatus = requestStatus; + this.description = description; + } + + @Override + public int getRequestStatus() { + return this.requestStatus; + } + + @Override + public String getDescription() { + return "" + this.requestStatus + " " + description; + } + } + } + + public static final class ResponseException extends Exception { + + private final Response.Status status; + + public ResponseException(Response.Status status, String message) { + super(message); + this.status = status; + } + + public ResponseException(Response.Status status, String message, Exception e) { + super(message, e); + this.status = status; + } + + public Response.Status getStatus() { + return status; + } + } + + /** + * Default strategy for creating and cleaning up temporary files. + */ + private class DefaultTempFileManagerFactory implements TempFileManagerFactory { + @Override + public TempFileManager create() { + return new DefaultTempFileManager(); + } + } + + /** + * Handles one session, i.e. parses the HTTP request and returns the response. + */ + public interface IHTTPSession { + void execute() throws IOException; + + Map getParms(); + + Map getHeaders(); + + /** + * @return the path part of the URL. + */ + String getUri(); + + String getQueryParameterString(); + + Method getMethod(); + + InputStream getInputStream(); + + CookieHandler getCookies(); + + /** + * Adds the files in the request body to the files map. + * @arg files - map to modify + */ + void parseBody(Map files) throws IOException, ResponseException; + } + + protected class HTTPSession implements IHTTPSession { + public static final int BUFSIZE = 8192; + private final TempFileManager tempFileManager; + private final OutputStream outputStream; + private PushbackInputStream inputStream; + private int splitbyte; + private int rlen; + private String uri; + private Method method; + private Map parms; + private Map headers; + private CookieHandler cookies; + private String queryParameterString; + + public HTTPSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream) { + this.tempFileManager = tempFileManager; + this.inputStream = new PushbackInputStream(inputStream, BUFSIZE); + this.outputStream = outputStream; + } + + public HTTPSession(TempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream, InetAddress inetAddress) { + this.tempFileManager = tempFileManager; + this.inputStream = new PushbackInputStream(inputStream, BUFSIZE); + this.outputStream = outputStream; + String remoteIp = inetAddress.isLoopbackAddress() || inetAddress.isAnyLocalAddress() ? "127.0.0.1" : inetAddress.getHostAddress().toString(); + headers = new HashMap(); + + headers.put("remote-addr", remoteIp); + headers.put("http-client-ip", remoteIp); + } + + @Override + public void execute() throws IOException { + try { + // Read the first 8192 bytes. + // The full header should fit in here. + // Apache's default header limit is 8KB. + // Do NOT assume that a single read will get the entire header at once! + byte[] buf = new byte[BUFSIZE]; + splitbyte = 0; + rlen = 0; + { + int read = -1; + try { + read = inputStream.read(buf, 0, BUFSIZE); + } catch (Exception e) { + safeClose(inputStream); + safeClose(outputStream); + throw new SocketException("NanoHttpd Shutdown"); + } + if (read == -1) { + // socket was been closed + safeClose(inputStream); + safeClose(outputStream); + throw new SocketException("NanoHttpd Shutdown"); + } + while (read > 0) { + rlen += read; + splitbyte = findHeaderEnd(buf, rlen); + if (splitbyte > 0) + break; + read = inputStream.read(buf, rlen, BUFSIZE - rlen); + } + } + + if (splitbyte < rlen) { + inputStream.unread(buf, splitbyte, rlen - splitbyte); + } + + parms = new HashMap(); + if(null == headers) { + headers = new HashMap(); + } + + // Create a BufferedReader for parsing the header. + BufferedReader hin = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(buf, 0, rlen))); + + // Decode the header into parms and header java properties + Map pre = new HashMap(); + decodeHeader(hin, pre, parms, headers); + + method = Method.lookup(pre.get("method")); + if (method == null) { + throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Syntax error."); + } + + uri = pre.get("uri"); + + cookies = new CookieHandler(headers); + + // Ok, now do the serve() + Response r = serve(this); + if (r == null) { + throw new ResponseException(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: Serve() returned a null response."); + } else { + cookies.unloadQueue(r); + r.setRequestMethod(method); + r.send(outputStream); + } + } catch (SocketException e) { + // throw it out to close socket object (finalAccept) + throw e; + } catch (SocketTimeoutException ste) { + throw ste; + } catch (IOException ioe) { + Response r = new Response(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage()); + r.send(outputStream); + safeClose(outputStream); + } catch (ResponseException re) { + Response r = new Response(re.getStatus(), MIME_PLAINTEXT, re.getMessage()); + r.send(outputStream); + safeClose(outputStream); + } finally { + tempFileManager.clear(); + } + } + + @Override + public void parseBody(Map files) throws IOException, ResponseException { + RandomAccessFile randomAccessFile = null; + BufferedReader in = null; + try { + + randomAccessFile = getTmpBucket(); + + long size; + if (headers.containsKey("content-length")) { + size = Integer.parseInt(headers.get("content-length")); + } else if (splitbyte < rlen) { + size = rlen - splitbyte; + } else { + size = 0; + } + + // Now read all the body and write it to f + byte[] buf = new byte[512]; + while (rlen >= 0 && size > 0) { + rlen = inputStream.read(buf, 0, (int)Math.min(size, 512)); + size -= rlen; + if (rlen > 0) { + randomAccessFile.write(buf, 0, rlen); + } + } + + // Get the raw body as a byte [] + ByteBuffer fbuf = randomAccessFile.getChannel().map(FileChannel.MapMode.READ_ONLY, 0, randomAccessFile.length()); + randomAccessFile.seek(0); + + // Create a BufferedReader for easily reading it as string. + InputStream bin = new FileInputStream(randomAccessFile.getFD()); + in = new BufferedReader(new InputStreamReader(bin)); + + // If the method is POST, there may be parameters + // in data section, too, read it: + if (Method.POST.equals(method)) { + String contentType = ""; + String contentTypeHeader = headers.get("content-type"); + + StringTokenizer st = null; + if (contentTypeHeader != null) { + st = new StringTokenizer(contentTypeHeader, ",; "); + if (st.hasMoreTokens()) { + contentType = st.nextToken(); + } + } + + if ("multipart/form-data".equalsIgnoreCase(contentType)) { + // Handle multipart/form-data + if (!st.hasMoreTokens()) { + throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Content type is multipart/form-data but boundary missing. Usage: GET /example/file.html"); + } + + String boundaryStartString = "boundary="; + int boundaryContentStart = contentTypeHeader.indexOf(boundaryStartString) + boundaryStartString.length(); + String boundary = contentTypeHeader.substring(boundaryContentStart, contentTypeHeader.length()); + if (boundary.startsWith("\"") && boundary.endsWith("\"")) { + boundary = boundary.substring(1, boundary.length() - 1); + } + + decodeMultipartData(boundary, fbuf, in, parms, files); + } else { + String postLine = ""; + StringBuilder postLineBuffer = new StringBuilder(); + char pbuf[] = new char[512]; + int read = in.read(pbuf); + while (read >= 0 && !postLine.endsWith("\r\n")) { + postLine = String.valueOf(pbuf, 0, read); + postLineBuffer.append(postLine); + read = in.read(pbuf); + } + postLine = postLineBuffer.toString().trim(); + // Handle application/x-www-form-urlencoded + if ("application/x-www-form-urlencoded".equalsIgnoreCase(contentType)) { + decodeParms(postLine, parms); + } else if (postLine.length() != 0) { + // Special case for raw POST data => create a special files entry "postData" with raw content data + files.put("postData", postLine); + } + } + } else if (Method.PUT.equals(method)) { + files.put("content", saveTmpFile(fbuf, 0, fbuf.limit())); + } + } finally { + safeClose(randomAccessFile); + safeClose(in); + } + } + + /** + * Decodes the sent headers and loads the data into Key/value pairs + */ + private void decodeHeader(BufferedReader in, Map pre, Map parms, Map headers) + throws ResponseException { + try { + // Read the request line + String inLine = in.readLine(); + if (inLine == null) { + return; + } + + StringTokenizer st = new StringTokenizer(inLine); + if (!st.hasMoreTokens()) { + throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Syntax error. Usage: GET /example/file.html"); + } + + pre.put("method", st.nextToken()); + + if (!st.hasMoreTokens()) { + throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Missing URI. Usage: GET /example/file.html"); + } + + String uri = st.nextToken(); + + // Decode parameters from the URI + int qmi = uri.indexOf('?'); + if (qmi >= 0) { + decodeParms(uri.substring(qmi + 1), parms); + uri = decodePercent(uri.substring(0, qmi)); + } else { + uri = decodePercent(uri); + } + + // If there's another token, it's protocol version, + // followed by HTTP headers. Ignore version but parse headers. + // NOTE: this now forces header names lowercase since they are + // case insensitive and vary by client. + if (st.hasMoreTokens()) { + String line = in.readLine(); + while (line != null && line.trim().length() > 0) { + int p = line.indexOf(':'); + if (p >= 0) + headers.put(line.substring(0, p).trim().toLowerCase(Locale.US), line.substring(p + 1).trim()); + line = in.readLine(); + } + } + + pre.put("uri", uri); + } catch (IOException ioe) { + throw new ResponseException(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage(), ioe); + } + } + + /** + * Decodes the Multipart Body data and put it into Key/Value pairs. + */ + private void decodeMultipartData(String boundary, ByteBuffer fbuf, BufferedReader in, Map parms, + Map files) throws ResponseException { + try { + int[] bpositions = getBoundaryPositions(fbuf, boundary.getBytes()); + int boundarycount = 1; + String mpline = in.readLine(); + while (mpline != null) { + if (!mpline.contains(boundary)) { + throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Content type is multipart/form-data but next chunk does not start with boundary. Usage: GET /example/file.html"); + } + boundarycount++; + Map item = new HashMap(); + mpline = in.readLine(); + while (mpline != null && mpline.trim().length() > 0) { + int p = mpline.indexOf(':'); + if (p != -1) { + item.put(mpline.substring(0, p).trim().toLowerCase(Locale.US), mpline.substring(p + 1).trim()); + } + mpline = in.readLine(); + } + if (mpline != null) { + String contentDisposition = item.get("content-disposition"); + if (contentDisposition == null) { + throw new ResponseException(Response.Status.BAD_REQUEST, "BAD REQUEST: Content type is multipart/form-data but no content-disposition info found. Usage: GET /example/file.html"); + } + StringTokenizer st = new StringTokenizer(contentDisposition, ";"); + Map disposition = new HashMap(); + while (st.hasMoreTokens()) { + String token = st.nextToken().trim(); + int p = token.indexOf('='); + if (p != -1) { + disposition.put(token.substring(0, p).trim().toLowerCase(Locale.US), token.substring(p + 1).trim()); + } + } + String pname = disposition.get("name"); + pname = pname.substring(1, pname.length() - 1); + + String value = ""; + if (item.get("content-type") == null) { + while (mpline != null && !mpline.contains(boundary)) { + mpline = in.readLine(); + if (mpline != null) { + int d = mpline.indexOf(boundary); + if (d == -1) { + value += mpline; + } else { + value += mpline.substring(0, d - 2); + } + } + } + } else { + if (boundarycount > bpositions.length) { + throw new ResponseException(Response.Status.INTERNAL_ERROR, "Error processing request"); + } + int offset = stripMultipartHeaders(fbuf, bpositions[boundarycount - 2]); + String path = saveTmpFile(fbuf, offset, bpositions[boundarycount - 1] - offset - 4); + files.put(pname, path); + value = disposition.get("filename"); + value = value.substring(1, value.length() - 1); + do { + mpline = in.readLine(); + } while (mpline != null && !mpline.contains(boundary)); + } + parms.put(pname, value); + } + } + } catch (IOException ioe) { + throw new ResponseException(Response.Status.INTERNAL_ERROR, "SERVER INTERNAL ERROR: IOException: " + ioe.getMessage(), ioe); + } + } + + /** + * Find byte index separating header from body. It must be the last byte of the first two sequential new lines. + */ + private int findHeaderEnd(final byte[] buf, int rlen) { + int splitbyte = 0; + while (splitbyte + 3 < rlen) { + if (buf[splitbyte] == '\r' && buf[splitbyte + 1] == '\n' && buf[splitbyte + 2] == '\r' && buf[splitbyte + 3] == '\n') { + return splitbyte + 4; + } + splitbyte++; + } + return 0; + } + + /** + * Find the byte positions where multipart boundaries start. + */ + private int[] getBoundaryPositions(ByteBuffer b, byte[] boundary) { + int matchcount = 0; + int matchbyte = -1; + List matchbytes = new ArrayList(); + for (int i = 0; i < b.limit(); i++) { + if (b.get(i) == boundary[matchcount]) { + if (matchcount == 0) + matchbyte = i; + matchcount++; + if (matchcount == boundary.length) { + matchbytes.add(matchbyte); + matchcount = 0; + matchbyte = -1; + } + } else { + i -= matchcount; + matchcount = 0; + matchbyte = -1; + } + } + int[] ret = new int[matchbytes.size()]; + for (int i = 0; i < ret.length; i++) { + ret[i] = matchbytes.get(i); + } + return ret; + } + + /** + * Retrieves the content of a sent file and saves it to a temporary file. The full path to the saved file is returned. + */ + private String saveTmpFile(ByteBuffer b, int offset, int len) { + String path = ""; + if (len > 0) { + FileOutputStream fileOutputStream = null; + try { + TempFile tempFile = tempFileManager.createTempFile(); + ByteBuffer src = b.duplicate(); + fileOutputStream = new FileOutputStream(tempFile.getName()); + FileChannel dest = fileOutputStream.getChannel(); + src.position(offset).limit(offset + len); + dest.write(src.slice()); + path = tempFile.getName(); + } catch (Exception e) { // Catch exception if any + throw new Error(e); // we won't recover, so throw an error + } finally { + safeClose(fileOutputStream); + } + } + return path; + } + + private RandomAccessFile getTmpBucket() { + try { + TempFile tempFile = tempFileManager.createTempFile(); + return new RandomAccessFile(tempFile.getName(), "rw"); + } catch (Exception e) { + throw new Error(e); // we won't recover, so throw an error + } + } + + /** + * It returns the offset separating multipart file headers from the file's data. + */ + private int stripMultipartHeaders(ByteBuffer b, int offset) { + int i; + for (i = offset; i < b.limit(); i++) { + if (b.get(i) == '\r' && b.get(++i) == '\n' && b.get(++i) == '\r' && b.get(++i) == '\n') { + break; + } + } + return i + 1; + } + + /** + * Decodes parameters in percent-encoded URI-format ( e.g. "name=Jack%20Daniels&pass=Single%20Malt" ) and + * adds them to given Map. NOTE: this doesn't support multiple identical keys due to the simplicity of Map. + */ + private void decodeParms(String parms, Map p) { + if (parms == null) { + queryParameterString = ""; + return; + } + + queryParameterString = parms; + StringTokenizer st = new StringTokenizer(parms, "&"); + while (st.hasMoreTokens()) { + String e = st.nextToken(); + int sep = e.indexOf('='); + if (sep >= 0) { + p.put(decodePercent(e.substring(0, sep)).trim(), + decodePercent(e.substring(sep + 1))); + } else { + p.put(decodePercent(e).trim(), ""); + } + } + } + + @Override + public final Map getParms() { + return parms; + } + + public String getQueryParameterString() { + return queryParameterString; + } + + @Override + public final Map getHeaders() { + return headers; + } + + @Override + public final String getUri() { + return uri; + } + + @Override + public final Method getMethod() { + return method; + } + + @Override + public final InputStream getInputStream() { + return inputStream; + } + + @Override + public CookieHandler getCookies() { + return cookies; + } + } + + public static class Cookie { + private String n, v, e; + + public Cookie(String name, String value, String expires) { + n = name; + v = value; + e = expires; + } + + public Cookie(String name, String value) { + this(name, value, 30); + } + + public Cookie(String name, String value, int numDays) { + n = name; + v = value; + e = getHTTPTime(numDays); + } + + public String getHTTPHeader() { + String fmt = "%s=%s; expires=%s"; + return String.format(fmt, n, v, e); + } + + public static String getHTTPTime(int days) { + Calendar calendar = Calendar.getInstance(); + SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss z", Locale.US); + dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); + calendar.add(Calendar.DAY_OF_MONTH, days); + return dateFormat.format(calendar.getTime()); + } + } + + /** + * Provides rudimentary support for cookies. + * Doesn't support 'path', 'secure' nor 'httpOnly'. + * Feel free to improve it and/or add unsupported features. + * + * @author LordFokas + */ + public class CookieHandler implements Iterable { + private HashMap cookies = new HashMap(); + private ArrayList queue = new ArrayList(); + + public CookieHandler(Map httpHeaders) { + String raw = httpHeaders.get("cookie"); + if (raw != null) { + String[] tokens = raw.split(";"); + for (String token : tokens) { + String[] data = token.trim().split("="); + if (data.length == 2) { + cookies.put(data[0], data[1]); + } + } + } + } + + @Override public Iterator iterator() { + return cookies.keySet().iterator(); + } + + /** + * Read a cookie from the HTTP Headers. + * + * @param name The cookie's name. + * @return The cookie's value if it exists, null otherwise. + */ + public String read(String name) { + return cookies.get(name); + } + + /** + * Sets a cookie. + * + * @param name The cookie's name. + * @param value The cookie's value. + * @param expires How many days until the cookie expires. + */ + public void set(String name, String value, int expires) { + queue.add(new Cookie(name, value, Cookie.getHTTPTime(expires))); + } + + public void set(Cookie cookie) { + queue.add(cookie); + } + + /** + * Set a cookie with an expiration date from a month ago, effectively deleting it on the client side. + * + * @param name The cookie name. + */ + public void delete(String name) { + set(name, "-delete-", -30); + } + + /** + * Internally used by the webserver to add all queued cookies into the Response's HTTP Headers. + * + * @param response The Response object to which headers the queued cookies will be added. + */ + public void unloadQueue(Response response) { + for (Cookie cookie : queue) { + response.addHeader("Set-Cookie", cookie.getHTTPHeader()); + } + } + } +} diff --git a/src/main/java/common/fi/iki/elonen/README.md b/src/main/java/common/fi/iki/elonen/README.md new file mode 100644 index 000000000..ecc56ff5f --- /dev/null +++ b/src/main/java/common/fi/iki/elonen/README.md @@ -0,0 +1,11 @@ + +Exact copy/pasted 100% from: + +https://github.com/NanoHttpd/nanohttpd + +Git rev. ab6feae737b3038532d057e87fd83c58bad3b3cc + +Just done for simplicity, instead of using a Git sobmodule, ext. Maven dependency with shadowed über-JAR, or so. + +Instead of changing anything in this package, please submit pull requests to +github.com/NanoHttpd/nanohttpd and then when re-copy/paste the ENTIRE nanohttpd src here. diff --git a/src/main/java/common/fi/iki/elonen/ServerRunner.java b/src/main/java/common/fi/iki/elonen/ServerRunner.java new file mode 100644 index 000000000..313097a56 --- /dev/null +++ b/src/main/java/common/fi/iki/elonen/ServerRunner.java @@ -0,0 +1,32 @@ +package fi.iki.elonen; + +import java.io.IOException; + +public class ServerRunner { + public static void run(Class serverClass) { + try { + executeInstance((NanoHTTPD) serverClass.newInstance()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public static void executeInstance(NanoHTTPD server) { + try { + server.start(); + } catch (IOException ioe) { + System.err.println("Couldn't start server:\n" + ioe); + System.exit(-1); + } + + System.out.println("Server started, Hit Enter to stop.\n"); + + try { + System.in.read(); + } catch (Throwable ignored) { + } + + server.stop(); + System.out.println("Server stopped.\n"); + } +} diff --git a/src/main/java/common/fi/iki/elonen/SimpleWebServer.java b/src/main/java/common/fi/iki/elonen/SimpleWebServer.java new file mode 100644 index 000000000..40ea34273 --- /dev/null +++ b/src/main/java/common/fi/iki/elonen/SimpleWebServer.java @@ -0,0 +1,541 @@ +package fi.iki.elonen; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ServiceLoader; +import java.util.StringTokenizer; + +public class SimpleWebServer extends NanoHTTPD { + /** + * Common mime type for dynamic content: binary + */ + public static final String MIME_DEFAULT_BINARY = "application/octet-stream"; + /** + * Default Index file names. + */ + public static final List INDEX_FILE_NAMES = new ArrayList() {{ + add("index.html"); + add("index.htm"); + }}; + /** + * Hashtable mapping (String)FILENAME_EXTENSION -> (String)MIME_TYPE + */ + private static final Map MIME_TYPES = new HashMap() {{ + put("css", "text/css"); + put("htm", "text/html"); + put("html", "text/html"); + put("xml", "text/xml"); + put("java", "text/x-java-source, text/java"); + put("md", "text/plain"); + put("txt", "text/plain"); + put("asc", "text/plain"); + put("gif", "image/gif"); + put("jpg", "image/jpeg"); + put("jpeg", "image/jpeg"); + put("png", "image/png"); + put("mp3", "audio/mpeg"); + put("m3u", "audio/mpeg-url"); + put("mp4", "video/mp4"); + put("ogv", "video/ogg"); + put("flv", "video/x-flv"); + put("mov", "video/quicktime"); + put("swf", "application/x-shockwave-flash"); + put("js", "application/javascript"); + put("pdf", "application/pdf"); + put("doc", "application/msword"); + put("ogg", "application/x-ogg"); + put("zip", "application/octet-stream"); + put("exe", "application/octet-stream"); + put("class", "application/octet-stream"); + }}; + /** + * The distribution licence + */ + private static final String LICENCE = + "Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010 by Konstantinos Togias\n" + + "\n" + + "Redistribution and use in source and binary forms, with or without\n" + + "modification, are permitted provided that the following conditions\n" + + "are met:\n" + + "\n" + + "Redistributions of source code must retain the above copyright notice,\n" + + "this list of conditions and the following disclaimer. Redistributions in\n" + + "binary form must reproduce the above copyright notice, this list of\n" + + "conditions and the following disclaimer in the documentation and/or other\n" + + "materials provided with the distribution. The name of the author may not\n" + + "be used to endorse or promote products derived from this software without\n" + + "specific prior written permission. \n" + + " \n" + + "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n" + + "IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n" + + "OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n" + + "IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\n" + + "INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n" + + "NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n" + + "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n" + + "THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n" + + "(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n" + + "OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + private static Map mimeTypeHandlers = new HashMap(); + private final List rootDirs; + private final boolean quiet; + + public SimpleWebServer(String host, int port, File wwwroot, boolean quiet) { + super(host, port); + this.quiet = quiet; + this.rootDirs = new ArrayList(); + this.rootDirs.add(wwwroot); + + this.init(); + } + + public SimpleWebServer(String host, int port, List wwwroots, boolean quiet) { + super(host, port); + this.quiet = quiet; + this.rootDirs = new ArrayList(wwwroots); + + this.init(); + } + + /** + * Used to initialize and customize the server. + */ + public void init() { + } + + /** + * Starts as a standalone file server and waits for Enter. + */ + public static void main(String[] args) { + // Defaults + int port = 8080; + + String host = "127.0.0.1"; + List rootDirs = new ArrayList(); + boolean quiet = false; + Map options = new HashMap(); + + // Parse command-line, with short and long versions of the options. + for (int i = 0; i < args.length; ++i) { + if (args[i].equalsIgnoreCase("-h") || args[i].equalsIgnoreCase("--host")) { + host = args[i + 1]; + } else if (args[i].equalsIgnoreCase("-p") || args[i].equalsIgnoreCase("--port")) { + port = Integer.parseInt(args[i + 1]); + } else if (args[i].equalsIgnoreCase("-q") || args[i].equalsIgnoreCase("--quiet")) { + quiet = true; + } else if (args[i].equalsIgnoreCase("-d") || args[i].equalsIgnoreCase("--dir")) { + rootDirs.add(new File(args[i + 1]).getAbsoluteFile()); + } else if (args[i].equalsIgnoreCase("--licence")) { + System.out.println(LICENCE + "\n"); + } else if (args[i].startsWith("-X:")) { + int dot = args[i].indexOf('='); + if (dot > 0) { + String name = args[i].substring(0, dot); + String value = args[i].substring(dot + 1, args[i].length()); + options.put(name, value); + } + } + } + + if (rootDirs.isEmpty()) { + rootDirs.add(new File(".").getAbsoluteFile()); + } + + options.put("host", host); + options.put("port", ""+port); + options.put("quiet", String.valueOf(quiet)); + StringBuilder sb = new StringBuilder(); + for (File dir : rootDirs) { + if (sb.length() > 0) { + sb.append(":"); + } + try { + sb.append(dir.getCanonicalPath()); + } catch (IOException ignored) {} + } + options.put("home", sb.toString()); + + ServiceLoader serviceLoader = ServiceLoader.load(WebServerPluginInfo.class); + for (WebServerPluginInfo info : serviceLoader) { + String[] mimeTypes = info.getMimeTypes(); + for (String mime : mimeTypes) { + String[] indexFiles = info.getIndexFilesForMimeType(mime); + if (!quiet) { + System.out.print("# Found plugin for Mime type: \"" + mime + "\""); + if (indexFiles != null) { + System.out.print(" (serving index files: "); + for (String indexFile : indexFiles) { + System.out.print(indexFile + " "); + } + } + System.out.println(")."); + } + registerPluginForMimeType(indexFiles, mime, info.getWebServerPlugin(mime), options); + } + } + + ServerRunner.executeInstance(new SimpleWebServer(host, port, rootDirs, quiet)); + } + + protected static void registerPluginForMimeType(String[] indexFiles, String mimeType, WebServerPlugin plugin, Map commandLineOptions) { + if (mimeType == null || plugin == null) { + return; + } + + if (indexFiles != null) { + for (String filename : indexFiles) { + int dot = filename.lastIndexOf('.'); + if (dot >= 0) { + String extension = filename.substring(dot + 1).toLowerCase(); + MIME_TYPES.put(extension, mimeType); + } + } + INDEX_FILE_NAMES.addAll(Arrays.asList(indexFiles)); + } + mimeTypeHandlers.put(mimeType, plugin); + plugin.initialize(commandLineOptions); + } + + private File getRootDir() { + return rootDirs.get(0); + } + + private List getRootDirs() { + return rootDirs; + } + + private void addWwwRootDir(File wwwroot) { + rootDirs.add(wwwroot); + } + + /** + * URL-encodes everything between "/"-characters. Encodes spaces as '%20' instead of '+'. + */ + private String encodeUri(String uri) { + String newUri = ""; + StringTokenizer st = new StringTokenizer(uri, "/ ", true); + while (st.hasMoreTokens()) { + String tok = st.nextToken(); + if (tok.equals("/")) + newUri += "/"; + else if (tok.equals(" ")) + newUri += "%20"; + else { + try { + newUri += URLEncoder.encode(tok, "UTF-8"); + } catch (UnsupportedEncodingException ignored) { + } + } + } + return newUri; + } + + public Response serve(IHTTPSession session) { + Map header = session.getHeaders(); + Map parms = session.getParms(); + String uri = session.getUri(); + + if (!quiet) { + System.out.println(session.getMethod() + " '" + uri + "' "); + + Iterator e = header.keySet().iterator(); + while (e.hasNext()) { + String value = e.next(); + System.out.println(" HDR: '" + value + "' = '" + header.get(value) + "'"); + } + e = parms.keySet().iterator(); + while (e.hasNext()) { + String value = e.next(); + System.out.println(" PRM: '" + value + "' = '" + parms.get(value) + "'"); + } + } + + for (File homeDir : getRootDirs()) { + // Make sure we won't die of an exception later + if (!homeDir.isDirectory()) { + return getInternalErrorResponse("given path is not a directory (" + homeDir + ")."); + } + } + return respond(Collections.unmodifiableMap(header), session, uri); + } + + private Response respond(Map headers, IHTTPSession session, String uri) { + // Remove URL arguments + uri = uri.trim().replace(File.separatorChar, '/'); + if (uri.indexOf('?') >= 0) { + uri = uri.substring(0, uri.indexOf('?')); + } + + // Prohibit getting out of current directory + if (uri.startsWith("src/main") || uri.endsWith("src/main") || uri.contains("../")) { + return getForbiddenResponse("Won't serve ../ for security reasons."); + } + + boolean canServeUri = false; + File homeDir = null; + List roots = getRootDirs(); + for (int i = 0; !canServeUri && i < roots.size(); i++) { + homeDir = roots.get(i); + canServeUri = canServeUri(uri, homeDir); + } + if (!canServeUri) { + return getNotFoundResponse(); + } + + // Browsers get confused without '/' after the directory, send a redirect. + File f = new File(homeDir, uri); + if (f.isDirectory() && !uri.endsWith("/")) { + uri += "/"; + Response res = createResponse(Response.Status.REDIRECT, NanoHTTPD.MIME_HTML, "Redirected: " + uri + ""); + res.addHeader("Location", uri); + return res; + } + + if (f.isDirectory()) { + // First look for index files (index.html, index.htm, etc) and if none found, list the directory if readable. + String indexFile = findIndexFileInDirectory(f); + if (indexFile == null) { + if (f.canRead()) { + // No index file, list the directory if it is readable + return createResponse(Response.Status.OK, NanoHTTPD.MIME_HTML, listDirectory(uri, f)); + } else { + return getForbiddenResponse("No directory listing."); + } + } else { + return respond(headers, session, uri + indexFile); + } + } + + String mimeTypeForFile = getMimeTypeForFile(uri); + WebServerPlugin plugin = mimeTypeHandlers.get(mimeTypeForFile); + Response response = null; + if (plugin != null) { + response = plugin.serveFile(uri, headers, session, f, mimeTypeForFile); + if (response != null && response instanceof InternalRewrite) { + InternalRewrite rewrite = (InternalRewrite) response; + return respond(rewrite.getHeaders(), session, rewrite.getUri()); + } + } else { + response = serveFile(uri, headers, f, mimeTypeForFile); + } + return response != null ? response : getNotFoundResponse(); + } + + protected Response getNotFoundResponse() { + return createResponse(Response.Status.NOT_FOUND, NanoHTTPD.MIME_PLAINTEXT, + "Error 404, file not found."); + } + + protected Response getForbiddenResponse(String s) { + return createResponse(Response.Status.FORBIDDEN, NanoHTTPD.MIME_PLAINTEXT, "FORBIDDEN: " + + s); + } + + protected Response getInternalErrorResponse(String s) { + return createResponse(Response.Status.INTERNAL_ERROR, NanoHTTPD.MIME_PLAINTEXT, + "INTERNAL ERRROR: " + s); + } + + private boolean canServeUri(String uri, File homeDir) { + boolean canServeUri; + File f = new File(homeDir, uri); + canServeUri = f.exists(); + if (!canServeUri) { + String mimeTypeForFile = getMimeTypeForFile(uri); + WebServerPlugin plugin = mimeTypeHandlers.get(mimeTypeForFile); + if (plugin != null) { + canServeUri = plugin.canServeUri(uri, homeDir); + } + } + return canServeUri; + } + + /** + * Serves file from homeDir and its' subdirectories (only). Uses only URI, ignores all headers and HTTP parameters. + */ + Response serveFile(String uri, Map header, File file, String mime) { + Response res; + try { + // Calculate etag + String etag = Integer.toHexString((file.getAbsolutePath() + file.lastModified() + "" + file.length()).hashCode()); + + // Support (simple) skipping: + long startFrom = 0; + long endAt = -1; + String range = header.get("range"); + if (range != null) { + if (range.startsWith("bytes=")) { + range = range.substring("bytes=".length()); + int minus = range.indexOf('-'); + try { + if (minus > 0) { + startFrom = Long.parseLong(range.substring(0, minus)); + endAt = Long.parseLong(range.substring(minus + 1)); + } + } catch (NumberFormatException ignored) { + } + } + } + + // Change return code and add Content-Range header when skipping is requested + long fileLen = file.length(); + if (range != null && startFrom >= 0) { + if (startFrom >= fileLen) { + res = createResponse(Response.Status.RANGE_NOT_SATISFIABLE, NanoHTTPD.MIME_PLAINTEXT, ""); + res.addHeader("Content-Range", "bytes 0-0/" + fileLen); + res.addHeader("ETag", etag); + } else { + if (endAt < 0) { + endAt = fileLen - 1; + } + long newLen = endAt - startFrom + 1; + if (newLen < 0) { + newLen = 0; + } + + final long dataLen = newLen; + FileInputStream fis = new FileInputStream(file) { + @Override + public int available() throws IOException { + return (int) dataLen; + } + }; + fis.skip(startFrom); + + res = createResponse(Response.Status.PARTIAL_CONTENT, mime, fis); + res.addHeader("Content-Length", "" + dataLen); + res.addHeader("Content-Range", "bytes " + startFrom + "-" + endAt + "/" + fileLen); + res.addHeader("ETag", etag); + } + } else { + if (etag.equals(header.get("if-none-match"))) + res = createResponse(Response.Status.NOT_MODIFIED, mime, ""); + else { + res = createResponse(Response.Status.OK, mime, new FileInputStream(file)); + res.addHeader("Content-Length", "" + fileLen); + res.addHeader("ETag", etag); + } + } + } catch (IOException ioe) { + res = getForbiddenResponse("Reading file failed."); + } + + return res; + } + + // Get MIME type from file name extension, if possible + private String getMimeTypeForFile(String uri) { + int dot = uri.lastIndexOf('.'); + String mime = null; + if (dot >= 0) { + mime = MIME_TYPES.get(uri.substring(dot + 1).toLowerCase()); + } + return mime == null ? MIME_DEFAULT_BINARY : mime; + } + + // Announce that the file server accepts partial content requests + private Response createResponse(Response.Status status, String mimeType, InputStream message) { + Response res = new Response(status, mimeType, message); + res.addHeader("Accept-Ranges", "bytes"); + return res; + } + + // Announce that the file server accepts partial content requests + protected Response createResponse(Response.Status status, String mimeType, String message) { + Response res = new Response(status, mimeType, message); + res.addHeader("Accept-Ranges", "bytes"); + return res; + } + + private String findIndexFileInDirectory(File directory) { + for (String fileName : INDEX_FILE_NAMES) { + File indexFile = new File(directory, fileName); + if (indexFile.exists()) { + return fileName; + } + } + return null; + } + + protected String listDirectory(String uri, File f) { + String heading = "Directory " + uri; + StringBuilder msg = new StringBuilder("" + heading + "" + + "

" + heading + "

"); + + String up = null; + if (uri.length() > 1) { + String u = uri.substring(0, uri.length() - 1); + int slash = u.lastIndexOf('/'); + if (slash >= 0 && slash < u.length()) { + up = uri.substring(0, slash + 1); + } + } + + List files = Arrays.asList(f.list(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return new File(dir, name).isFile(); + } + })); + Collections.sort(files); + List directories = Arrays.asList(f.list(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return new File(dir, name).isDirectory(); + } + })); + Collections.sort(directories); + if (up != null || directories.size() + files.size() > 0) { + msg.append("
    "); + if (up != null || directories.size() > 0) { + msg.append("
    "); + if (up != null) { + msg.append("
  • ..
    • "); + } + for (String directory : directories) { + String dir = directory + "/"; + msg.append("
  • ").append(dir).append("
    • "); + } + msg.append("
    "); + } + if (files.size() > 0) { + msg.append("
    "); + for (String file : files) { + msg.append("
  • ").append(file).append(""); + File curFile = new File(f, file); + long len = curFile.length(); + msg.append(" ("); + if (len < 1024) { + msg.append(len).append(" bytes"); + } else if (len < 1024 * 1024) { + msg.append(len / 1024).append(".").append(len % 1024 / 10 % 100).append(" KB"); + } else { + msg.append(len / (1024 * 1024)).append(".").append(len % (1024 * 1024) / 10 % 100).append(" MB"); + } + msg.append(")
    • "); + } + msg.append("
    "); + } + msg.append("
"); + } + msg.append(""); + return msg.toString(); + } +} diff --git a/src/main/java/common/fi/iki/elonen/WebServerPlugin.java b/src/main/java/common/fi/iki/elonen/WebServerPlugin.java new file mode 100644 index 000000000..08a9f22cd --- /dev/null +++ b/src/main/java/common/fi/iki/elonen/WebServerPlugin.java @@ -0,0 +1,19 @@ +package fi.iki.elonen; + +import java.io.File; +import java.util.Map; + +import fi.iki.elonen.NanoHTTPD.IHTTPSession; + +/** +* @author Paul S. Hawke (paul.hawke@gmail.com) +* On: 9/14/13 at 8:09 AM +*/ +public interface WebServerPlugin { + + void initialize(Map commandLineOptions); + + boolean canServeUri(String uri, File rootDir); + + NanoHTTPD.Response serveFile(String uri, Map headers, IHTTPSession session, File file, String mimeType); +} diff --git a/src/main/java/common/fi/iki/elonen/WebServerPluginInfo.java b/src/main/java/common/fi/iki/elonen/WebServerPluginInfo.java new file mode 100644 index 000000000..1e3deb7e9 --- /dev/null +++ b/src/main/java/common/fi/iki/elonen/WebServerPluginInfo.java @@ -0,0 +1,13 @@ +package fi.iki.elonen; + +/** +* @author Paul S. Hawke (paul.hawke@gmail.com) +* On: 9/14/13 at 8:09 AM +*/ +public interface WebServerPluginInfo { + String[] getMimeTypes(); + + String[] getIndexFilesForMimeType(String mime); + + WebServerPlugin getWebServerPlugin(String mimeType); +} diff --git a/src/main/java/common/org/scriptcraftjs/webserver/ScriptCraftWebServer.java b/src/main/java/common/org/scriptcraftjs/webserver/ScriptCraftWebServer.java new file mode 100644 index 000000000..a7cf392d7 --- /dev/null +++ b/src/main/java/common/org/scriptcraftjs/webserver/ScriptCraftWebServer.java @@ -0,0 +1,37 @@ +package org.scriptcraftjs.webserver; + +import fi.iki.elonen.ServerRunner; + + +/** + * Web Server for BlocklyCraft in ScriptCraft. + * + * General HTTP server code that is not related to ScriptCraft (or BlocklyCraft) should go into the WebServer parent class. + * + * @author Michael Vorburger & Lauro Canonica + */ +public class ScriptCraftWebServer extends WebServer { + + private static final String SCRIPTCRAFT_WWW_DIRECTORY = "scriptcraft/www"; + private static final String BLOCKLYCRAFT_POST_DIRECTORY = "scriptcraft/plugins/blocklycraft"; + + public ScriptCraftWebServer() { + super(SCRIPTCRAFT_WWW_DIRECTORY, BLOCKLYCRAFT_POST_DIRECTORY); + } + + public ScriptCraftWebServer(String wwwroot, String httpPostDirectory) { + super(wwwroot, httpPostDirectory); + } + + public String getStartedLogMessage() { + return "HTTP web server for content in " + SCRIPTCRAFT_WWW_DIRECTORY + " now available on " + getURL(); + } + + public static void main(String[] args) { + ScriptCraftWebServer webServer = new ScriptCraftWebServer("src/main/js/www", "src/main/js/plugins/blocklycraft"); + System.out.println(webServer.getStartedLogMessage()); + webServer.openURL(); + ServerRunner.executeInstance(webServer.createServer()); + } + +} diff --git a/src/main/java/common/org/scriptcraftjs/webserver/SimpleWebServerWithPOST.java b/src/main/java/common/org/scriptcraftjs/webserver/SimpleWebServerWithPOST.java new file mode 100644 index 000000000..9eb6f0dde --- /dev/null +++ b/src/main/java/common/org/scriptcraftjs/webserver/SimpleWebServerWithPOST.java @@ -0,0 +1,87 @@ +package org.scriptcraftjs.webserver; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Map; + +import fi.iki.elonen.NanoHTTPD; +import fi.iki.elonen.SimpleWebServer; + +/** + * POST support for fi.iki.elonen's nanohttpd SimpleWebServer. + * + * Saves POST'ed content as files into a fixed directory. + * + * @author Michael Vorburger + */ +public class SimpleWebServerWithPOST extends SimpleWebServer { + + private static final String CONTENT_LENGTH = "content-length"; + + private static final String FILE_SUFFIX = "clientScript.js"; + + private final File httpPostDirectory; + + public SimpleWebServerWithPOST(String host, int port, File wwwroot, File httpPostDirectory, boolean quiet) { + super(host, port, wwwroot, quiet); + this.httpPostDirectory = httpPostDirectory; + } + + public Response serve(IHTTPSession session) { + if (!Method.POST.equals(session.getMethod())) { + return super.serve(session); + } // else: handle a POST now... + +// if (session.getUri().length() < 2) { +// return createResponse(Response.Status.BAD_REQUEST, NanoHTTPD.MIME_PLAINTEXT, "URI too short to POST to: " + session.getUri()); +// } +// String uri = session.getUri().substring(1); +// // TODO for real security, probably need to handle (un)escaped / etc. here as well? +// if (uri.contains("/") || uri.contains("\\") || uri.contains("..")) { +// // throw new IllegalArgumentException("Invalid POST URI: " + uri); +// return createResponse(Response.Status.FORBIDDEN, NanoHTTPD.MIME_PLAINTEXT, "Invalid POST URI: " + uri); +// } + + Map headers = session.getHeaders(); + if (!headers.containsKey(CONTENT_LENGTH)) { + return createResponse(Response.Status.BAD_REQUEST, NanoHTTPD.MIME_PLAINTEXT, "Missing header " + CONTENT_LENGTH); + } + int size = Integer.parseInt(headers.get(CONTENT_LENGTH)); + + String IP = headers.get("http-client-ip").replaceAll("[:.]", ""); + File file = new File(httpPostDirectory, /*uri*/ IP + "_" + FILE_SUFFIX); + InputStream is = session.getInputStream(); + try { + copy(is, size, file); + } catch (IOException e) { + e.printStackTrace(); // TODO real logging.. but PITA in ScriptScraft, as it targets two Server APIs + return createResponse(Response.Status.INTERNAL_ERROR, NanoHTTPD.MIME_PLAINTEXT, e.getMessage()); + } + + return createResponse(Response.Status.OK, NanoHTTPD.MIME_PLAINTEXT, "OK"); + } + + protected void copy(InputStream is, int size, File targetFile) throws IOException { + // when moving to Java 7, use java.nio.file.Files.copy(InputStream, Path, CopyOption...) + // similar utility is also found in com.google.common.io.Files or org.apache.commons.io.IOUtils or (better) FileUtils + OutputStream os = new FileOutputStream(targetFile); + try { + int bytesRead = 0; + byte[] buffer = new byte[8 * 1024]; + // @see fi.iki.elonen.NanoHTTPD.HTTPSession.parseBody(Map) + while (bytesRead >= 0 && size > 0) { + bytesRead = is.read(buffer, 0, (int)Math.min(size, buffer.length)); + size -= bytesRead; + if (bytesRead > 0) { + os.write(buffer, 0, bytesRead); + } + } + } finally { + safeClose(os); + // do *NOT* safeClose(is); + } + } +} diff --git a/src/main/java/common/org/scriptcraftjs/webserver/WebServer.java b/src/main/java/common/org/scriptcraftjs/webserver/WebServer.java new file mode 100644 index 000000000..76630b109 --- /dev/null +++ b/src/main/java/common/org/scriptcraftjs/webserver/WebServer.java @@ -0,0 +1,84 @@ +package org.scriptcraftjs.webserver; + +import java.awt.Desktop; +import java.io.File; +import java.io.IOException; +import java.net.URI; + +import fi.iki.elonen.NanoHTTPD; +import fi.iki.elonen.SimpleWebServer; + +/** + * Simple HTTP Web Server. + * + * Currently simply a wrapper around fi.iki.elonen's nanohttpd; in the future + * could be using Jetty, or com.sun.net.httpserver.HttpServer, or extend my very + * own antique https://github.com/vorburger/SimpleHTTPServer. + * + * Code that is not General HTTP server related but specific to ScriptCraft (or BlocklyCraft) should go into the ScriptCraftWebServer subclass. + * + * @author Michael Vorburger & Lauro Canonica + */ +public class WebServer { + + private static final String HOST = WebServer.class.getName() + ".host"; + private static final String PORT = WebServer.class.getName() + ".port"; + + // Following are just defaults, can be changed, see below + private String host = "127.0.0.1"; + private int port = 7070; + + private final File wwwroot; + private final File httpPostDirectory; + private NanoHTTPD server; + + public WebServer(File wwwroot, File httpPostDirectory) { + this.wwwroot = wwwroot; + this.httpPostDirectory = httpPostDirectory; + } + + public WebServer(String wwwroot, String httpPostDirectory) { + this(new File(wwwroot), new File(httpPostDirectory)); + } + + public void start() throws IOException { + server = createServer(); + server.start(); + } + + protected SimpleWebServer createServer() { + if (server != null) + throw new IllegalStateException("HTTP Server is already running"); + + String hostSystemProperty = System.getProperty(HOST); + if (hostSystemProperty != null) + host = hostSystemProperty; + String portSystemProperty = System.getProperty(PORT); + if (portSystemProperty != null) + port = Integer.parseInt(portSystemProperty); + + boolean quiet = true; + return new SimpleWebServerWithPOST(host, port, wwwroot, httpPostDirectory, quiet); + } + + public void stop() { + server.stop(); + server = null; + } + + public String getURL() { + return "http://" + host + ":" + port + "/"; + } + + public void openURL() { + if (Desktop.isDesktopSupported()) { + URI uri = URI.create(getURL()); + try { + Desktop.getDesktop().browse(uri); + } catch (IOException e) { + // Never mind.. ;) + } + } + } + +} diff --git a/src/main/js/.gitignore b/src/main/js/.gitignore new file mode 100644 index 000000000..82f0c3ac6 --- /dev/null +++ b/src/main/js/.gitignore @@ -0,0 +1 @@ +/data/ diff --git a/src/main/js/modules/.gitignore b/src/main/js/modules/.gitignore new file mode 100644 index 000000000..b1e767cc5 --- /dev/null +++ b/src/main/js/modules/.gitignore @@ -0,0 +1 @@ +/underscore.js diff --git a/src/main/js/modules/utils/utils.js b/src/main/js/modules/utils/utils.js index 0a418f607..b0e15fbee 100644 --- a/src/main/js/modules/utils/utils.js +++ b/src/main/js/modules/utils/utils.js @@ -752,3 +752,67 @@ This function also contains values for each possible stat so you can get at stat ***/ exports.stat = __plugin.canary ? getStatCanary: getStatBukkit; + +/************************************************************************ +### utils.watchFile() function + +Watches for changes to the given file or directory and calls the function provided +when the file changes. + +#### Parameters + + * File - the file to watch (can be a file or directory) + * Callback - The callback to invoke when the file has changed. The callback takes the + changed file as a parameter. + +#### Example + +```javascript +var utils = require('utils'); +utils.watchFile( 'test.txt', function( file ) { + console.log( file + ' has changed'); +}); +``` +***/ +var filesWatched = {}; +exports.watchFile = function( file, callback ) { + if ( typeof file == 'string' ) { + file = new File(file); + } + filesWatched[file.canonicalPath] = { + callback: callback, + lastModified: file.lastModified() + }; +}; +/************************************************************************ +### utils.unwatchFile() function + +Removes a file from the watch list. + +#### Example +```javascript +var utils = require('utils'); +utils.unwatchFile( 'test.txt'); +``` + +***/ +exports.unwatchFile = function( file, callback ) { + if ( typeof file == 'string' ) { + file = new File(file); + } + delete filesWatched[file.canonicalPath]; +}; + + +function fileWatcher() { + for (var file in filesWatched) { + var fileObject = new File(file); + var lm = fileObject.lastModified(); + if ( lm != filesWatched[file].lastModified ) { + filesWatched[file].lastModified = lm; + filesWatched[file].callback(fileObject); + } + } + setTimeout( fileWatcher, 5000 ); +}; +setTimeout( fileWatcher, 5000 ); diff --git a/src/main/js/plugins/blocklycraft/.gitignore b/src/main/js/plugins/blocklycraft/.gitignore new file mode 100644 index 000000000..8dadf0e9c --- /dev/null +++ b/src/main/js/plugins/blocklycraft/.gitignore @@ -0,0 +1 @@ +/*_clientScript.js diff --git a/src/main/js/plugins/blocklycraft/devoxxExtensions.js b/src/main/js/plugins/blocklycraft/devoxxExtensions.js new file mode 100644 index 000000000..600a1ca9d --- /dev/null +++ b/src/main/js/plugins/blocklycraft/devoxxExtensions.js @@ -0,0 +1,108 @@ +/******************************************************************************* + * Authors: - Lauro Canonica: Original author (Devoxx4kids Lugano 2015.04) - + * Michael Vorburger: Clean-up for initial ScriptCraft Git contribution + * + * + * Define the functions useful for runing a Devoxx4kids session + */ + +var items = require('items'); +var utils = require('utils'); + +command('daytime', function(parameters, player) { + player.location.world.setTime(4000); +}); + +command('nighttime', function(parameters, player) { + player.location.world.setTime(12000); +}); + +// explosive ray +command('exp', function(parameters, player) { + var theDrone = new Drone(player); + for ( var count = 0; count < 5; count++) { + theDrone.fwd(); + theDrone.fwd(); + + player.world.makeExplosion(player, theDrone.getLocation(), 2.5, true); + } +}); + +/* + * command for the final mob attack. + * usage example to create a group 2x2 of zombies: jsp mob zombie 2 + */ +command('mob', function(parameters, player) { + if (!isOp(player)) { + echo(player, 'Only operators can perform this command'); + return; + } + var myEntity = parameters[0]; + var groupWidth = parameters[1]; + var theDrone = new Drone(player); + theDrone.up(); + theDrone.chkpt('start'); + var timeoutStop = new Date().getTime() + 500; + for ( var count2 = 0; count2 < groupWidth; count2++) { + if (new Date().getTime() > timeoutStop) { + console.log('timeout reached'); + break; + } + ; + theDrone.chkpt('start'); + for ( var count = 0; count < groupWidth; count++) { + if (new Date().getTime() > timeoutStop) { + console.log('timeout reached'); + break; + } + ; + Packages.net.canarymod.Canary.factory().entityFactory.newEntity(Packages.net.canarymod.api.entity.EntityType[(myEntity).toUpperCase()], + theDrone.getLocation()).spawn(); + theDrone.fwd(); + theDrone.fwd(); + } + theDrone.move('start'); + theDrone.right(); + theDrone.right(); + } +}); + + +//remove the night. This stops mobs from spawning naturally +function skipTheNight() { + // naturally + var wrld = utils.world('default'); + var currTime = utils.time(wrld); + if (currTime > 12500 && currTime < 23500) { // evening + wrld.setTime(23500); // early morning + } + // console.log(currTime); + setTimeout(skipTheNight, 30000); +}; + + +// setup the player with armor and tools. +// make the player able to fly +function preparePlayer(event) { // give the default tools to the new players + var player = event.player; + player.getInventory().addItem(items.diamondPickaxe()); + player.getInventory().addItem(items.diamondSword()); + player.getInventory().addItem(items.diamondAxe()); + player.getInventory().addItem(items.diamondHoe()); + player.getInventory().addItem(items.diamondSpade()); + player.getInventory().addItem(items.bow()); + player.getInventory().addItem(items.arrow(64)); + player.getInventory().addItem(items.diamondBoots()); + player.getInventory().addItem(items.diamondChestplate()); + player.getInventory().addItem(items.diamondHelmet()); + player.getInventory().addItem(items.diamondLeggings()); + + server.consoleCommand('fly ' + player.name); // this command might fail if the fly plugin is not installed +} + +// call 'jsp devoxx' after starting the server for a Devoxx4Kids session +command('devoxx', function(parameters, player) { + skipTheNight(); + events.playerRespawned(preparePlayer); + events.on(net.canarymod.hook.player.ConnectionHook, preparePlayer) +}); diff --git a/src/main/js/plugins/blocklycraft/scriptcraftExtensions.js b/src/main/js/plugins/blocklycraft/scriptcraftExtensions.js new file mode 100644 index 000000000..2ed2f365e --- /dev/null +++ b/src/main/js/plugins/blocklycraft/scriptcraftExtensions.js @@ -0,0 +1,72 @@ +/******************************************************************************* + * Authors: - Lauro Canonica: Original author (Devoxx4kids Lugano 2015.04) - + * Michael Vorburger: Clean-up for initial ScriptCraft Git contribution + */ + +var utils = require('utils'); + +var scriptFolder = 'scriptcraft/plugins/blocklycraft'; +var fileObject = new java.io.File(scriptFolder); + +//create a piramidal object +exports.piramid = function(drone, width, lenght, height) { + while (width >= 2 && lenght >= 2 && height >= 1) { + drone.box0(2, width, 1, lenght); + drone.fwd(); + drone.right(); + width = width - 2; + lenght = lenght - 2; + drone.box(3, width, 1, lenght); + drone.up(); + height--; + } +}; + +// create a rectangle with alternate block types +exports.boxAlternate = function(drone, width, lenght, material1, material2) { + for ( var count3 = 0; count3 < 2; count3++) { + for ( var count = 0; count < width / 2; count++) { + console.log('width ' + width + "count=" + count); + drone.box(material1); + drone.fwd(); + drone.box(material2); + drone.fwd(); + } + drone.turn(); + for ( var count2 = 0; count2 < lenght / 2; count2++) { + drone.box(material1); + drone.fwd(); + drone.box(material2); + drone.fwd(); + } + drone.turn(); + } +}; + +// monitor the files in the scriptfolder. Automatic reload for any changes +function watchMyFiles(folder) { + var names = folder.list(); + for ( var i = 0; i < names.length; i++) { + var fname = scriptFolder + "/" + names[i]; // TODO "\\" instead of "/" + // needed on Win, or OK? + console.log('watching ' + fname); + utils.watchFile(fname, function(fileModified) { // refresh after any + // file modification + refresh(); + }); + } +} + +// monitor the scriptfolder. Automatic reload for any changes +function onChangeRefresh() { + console.log('Monitoring folder ' + scriptFolder); + utils.watchFile(scriptFolder, function(folder) { // check the folder + console.log(folder + ' has changed!'); + watchMyFiles(fileObject); + }); +} + +// start watching +watchMyFiles(fileObject); +onChangeRefresh(); // start monitoring + diff --git a/src/main/js/www/.gitignore b/src/main/js/www/.gitignore new file mode 100644 index 000000000..f0a67af13 --- /dev/null +++ b/src/main/js/www/.gitignore @@ -0,0 +1,3 @@ +/prettify.css +/prettify.js +/media/ diff --git a/src/main/js/www/blocklycraft/.gitignore b/src/main/js/www/blocklycraft/.gitignore new file mode 100644 index 000000000..eb1586356 --- /dev/null +++ b/src/main/js/www/blocklycraft/.gitignore @@ -0,0 +1 @@ +/msg/ diff --git a/src/main/js/www/blocklycraft/3rd-party/.gitignore b/src/main/js/www/blocklycraft/3rd-party/.gitignore new file mode 100644 index 000000000..c436414ac --- /dev/null +++ b/src/main/js/www/blocklycraft/3rd-party/.gitignore @@ -0,0 +1,3 @@ +/google-blockly/ +/google-blockly-master.zip +jquery*.js diff --git a/src/main/js/www/blocklycraft/README.txt b/src/main/js/www/blocklycraft/README.txt new file mode 100644 index 000000000..df961ff02 --- /dev/null +++ b/src/main/js/www/blocklycraft/README.txt @@ -0,0 +1,40 @@ + +The index.html in this folder started out as a copy/paste based on / are strongly inspired from the google-blockly/demos/code. + +A number of other folders are an exact copy of google-blockly, +and are kept in sync through the build.xml, and are thus on .gitignore. +The file copy is necessary because in JS using something like + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Minecraft ... + + +
+ + + + + + + + + + + + + +
... JavaScript XML + + + + +
+
+
+
+ 

+  

+  

+  
+
+  
+
+
+
diff --git a/src/main/js/www/index.html b/src/main/js/www/index.html
new file mode 100644
index 000000000..47664a2a9
--- /dev/null
+++ b/src/main/js/www/index.html
@@ -0,0 +1 @@
+BlocklyScriptCraft
diff --git a/src/main/js/www/msg/js/ar.js b/src/main/js/www/msg/js/ar.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/ar.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/az-latn.js b/src/main/js/www/msg/js/az-latn.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/az-latn.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/az.js b/src/main/js/www/msg/js/az.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/az.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/bcc.js b/src/main/js/www/msg/js/bcc.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/bcc.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/be-tarask.js b/src/main/js/www/msg/js/be-tarask.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/be-tarask.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/bg.js b/src/main/js/www/msg/js/bg.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/bg.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/br.js b/src/main/js/www/msg/js/br.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/br.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/ca.js b/src/main/js/www/msg/js/ca.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/ca.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/cs.js b/src/main/js/www/msg/js/cs.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/cs.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/da.js b/src/main/js/www/msg/js/da.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/da.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/de.js b/src/main/js/www/msg/js/de.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/de.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/el.js b/src/main/js/www/msg/js/el.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/el.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/en.js b/src/main/js/www/msg/js/en.js
new file mode 100644
index 000000000..c9bc4c4a7
--- /dev/null
+++ b/src/main/js/www/msg/js/en.js
@@ -0,0 +1,208 @@
+
+Blockly.Msg.M_MATERIAL = "Material";
+Blockly.Msg.M_OBJECT = "Object";
+Blockly.Msg.M_DRONE = "Drone";
+Blockly.Msg.M_MOUVEMENT = "Mouvement";
+Blockly.Msg.M_SPECIALS = "Extra";
+Blockly.Msg.M_ANIMALS = "Animals";
+
+Blockly.Msg.DEPLOY_SUCCESS="Perfect, now you can test your command in Minecraft"
+Blockly.Msg.MISSING_NAME="Your command doesn't have a name."
+
+
+Blockly.Msg.RECTANGLE = "Rectangle";
+Blockly.Msg.CIRCLE = "Circle";
+Blockly.Msg.WIDTH = "Width";
+Blockly.Msg.LENGTH = "Length";
+Blockly.Msg.RADIUS = "Radius";
+Blockly.Msg.FULL = "Full";
+Blockly.Msg.EMPTY = "Empty";
+
+
+Blockly.Msg.M_MOUVEMENT_UP = "up";
+Blockly.Msg.M_MOUVEMENT_DOWN = "down";
+Blockly.Msg.M_MOUVEMENT_FWD = "forward";
+Blockly.Msg.M_MOUVEMENT_BACK = "back";
+Blockly.Msg.M_MOUVEMENT_RIGHT = "right";
+Blockly.Msg.M_MOUVEMENT_LEFT = "left";
+Blockly.Msg.M_MOUVEMENT_TURN_RIGHT = "turn right";
+Blockly.Msg.M_MOUVEMENT_TURN_LEFT = "turn left";
+Blockly.Msg.M_MOUVEMENT_BACKTOSTART = "go back to start";
+Blockly.Msg.M_MOUVEMENT_SAVESTART = "save this start";
+
+Blockly.Msg.ANIMALS_BAT="bat";
+Blockly.Msg.ANIMALS_CHICKEN="chicken";
+Blockly.Msg.ANIMALS_COW="cow";
+Blockly.Msg.ANIMALS_PIG="pig";
+Blockly.Msg.ANIMALS_RABBIT="rabbit";
+Blockly.Msg.ANIMALS_WOLF="wolf";
+Blockly.Msg.ANIMALS_SHEEP="sheep";
+Blockly.Msg.ANIMALS_HORSE="horse";
+Blockly.Msg.ANIMALS_OCELOT="ocelot";
+
+Blockly.Msg.OAK="oak";
+Blockly.Msg.BED="bed"; 
+Blockly.Msg.DOOR="door"; 
+
+
+
+Blockly.Msg.OBJNAMES = [] // init blocks array
+Blockly.Msg.OBJNAMES[0] = "air";
+Blockly.Msg.OBJNAMES[1] = "stone";
+Blockly.Msg.OBJNAMES[2] = "grass";
+Blockly.Msg.OBJNAMES[3] = "dirt";
+Blockly.Msg.OBJNAMES[4] = "cobblestone";
+Blockly.Msg.OBJNAMES[5] = "oak";
+Blockly.Msg.OBJNAMES[6] =  "sapling oak";
+Blockly.Msg.OBJNAMES[7] = "bedrock";
+Blockly.Msg.OBJNAMES[8] = "water";
+Blockly.Msg.OBJNAMES[9] = "water still";
+Blockly.Msg.OBJNAMES[10] = "lava";
+Blockly.Msg.OBJNAMES[11] = "lava still";
+Blockly.Msg.OBJNAMES[12] = "sand";
+Blockly.Msg.OBJNAMES[13] = "gravel";
+Blockly.Msg.OBJNAMES[14] = "gold ore";
+Blockly.Msg.OBJNAMES[15] = "iron ore";
+Blockly.Msg.OBJNAMES[16] = "coal ore";
+Blockly.Msg.OBJNAMES[17] = "wood";
+Blockly.Msg.OBJNAMES[18] = "leaves";
+Blockly.Msg.OBJNAMES[19] = "sponge";
+Blockly.Msg.OBJNAMES[20] = "glass";
+Blockly.Msg.OBJNAMES[21] = "lapis lazuli ore";
+Blockly.Msg.OBJNAMES[22] = "lapis lazuli block";
+Blockly.Msg.OBJNAMES[23] = "dispenser";
+Blockly.Msg.OBJNAMES[24] = "sandstone";
+Blockly.Msg.OBJNAMES[25] = "note";
+Blockly.Msg.OBJNAMES[26] = "bed";
+Blockly.Msg.OBJNAMES[27] = "powered rail";
+Blockly.Msg.OBJNAMES[28] = "detector rail";
+Blockly.Msg.OBJNAMES[29] = "sticky piston";
+Blockly.Msg.OBJNAMES[30] = "cobweb";
+Blockly.Msg.OBJNAMES[31] = "grass tall";
+Blockly.Msg.OBJNAMES[32] = "dead bush";
+Blockly.Msg.OBJNAMES[33] = "piston";
+Blockly.Msg.OBJNAMES[34] = "piston extn";
+Blockly.Msg.OBJNAMES[35] =  "wool white";
+Blockly.Msg.OBJNAMES[37] = "dandelion";
+Blockly.Msg.OBJNAMES[37] = "flower yellow";
+Blockly.Msg.OBJNAMES[38] = "rose";
+Blockly.Msg.OBJNAMES[38] = "flower red";
+Blockly.Msg.OBJNAMES[39] = "mushroom brown";
+Blockly.Msg.OBJNAMES[40] = "mushroom red";
+Blockly.Msg.OBJNAMES[41] = "gold";
+Blockly.Msg.OBJNAMES[42] = "iron";
+Blockly.Msg.OBJNAMES[46] = "tnt";
+Blockly.Msg.OBJNAMES[47] = "bookshelf";
+Blockly.Msg.OBJNAMES[48] = "moss stone";
+Blockly.Msg.OBJNAMES[49] = "obsidian";
+Blockly.Msg.OBJNAMES[50] = "torch";
+Blockly.Msg.OBJNAMES[51] = "fire";
+Blockly.Msg.OBJNAMES[52] = "monster spawner";
+Blockly.Msg.OBJNAMES[53] =  "stairs oak";
+Blockly.Msg.OBJNAMES[67] =  "stairs cobblestone";
+Blockly.Msg.OBJNAMES[54] = "chest";
+Blockly.Msg.OBJNAMES[55] = "redstone wire";
+Blockly.Msg.OBJNAMES[56] = "diamond ore";
+Blockly.Msg.OBJNAMES[57] = "diamond";
+Blockly.Msg.OBJNAMES[58] = "crafting table";
+Blockly.Msg.OBJNAMES[59] = "wheat seeds";
+Blockly.Msg.OBJNAMES[60] = "farmland";
+Blockly.Msg.OBJNAMES[61] = "furnace";
+Blockly.Msg.OBJNAMES[62] = "furnace burning";
+Blockly.Msg.OBJNAMES[63] = "sign post";
+Blockly.Msg.OBJNAMES[64] = "door wood";
+Blockly.Msg.OBJNAMES[65] = "ladder";
+Blockly.Msg.OBJNAMES[66] = "rail";
+Blockly.Msg.OBJNAMES[68] = "sign";
+Blockly.Msg.OBJNAMES[69] = "lever";
+Blockly.Msg.OBJNAMES[70] = "pressure plate stone";
+Blockly.Msg.OBJNAMES[71] = "door iron";
+Blockly.Msg.OBJNAMES[72] = "pressure plate wood";
+Blockly.Msg.OBJNAMES[73] = "redstone ore";
+Blockly.Msg.OBJNAMES[74] = "redstone ore glowing";
+Blockly.Msg.OBJNAMES[75] = "torch redstone";
+Blockly.Msg.OBJNAMES[76] = "torch redstone active";
+Blockly.Msg.OBJNAMES[77] = "stone button";
+Blockly.Msg.OBJNAMES[79] = "ice";
+Blockly.Msg.OBJNAMES[80] = "snow";
+Blockly.Msg.OBJNAMES[81] = "cactus";
+Blockly.Msg.OBJNAMES[82] = "clay";
+Blockly.Msg.OBJNAMES[83] = "sugar cane";
+Blockly.Msg.OBJNAMES[84] = "jukebox";
+Blockly.Msg.OBJNAMES[85] = "fence";
+Blockly.Msg.OBJNAMES[86] = "pumpkin";
+Blockly.Msg.OBJNAMES[87] = "netherrack";
+Blockly.Msg.OBJNAMES[88] = "soulsand";
+Blockly.Msg.OBJNAMES[89] = "glowstone";
+Blockly.Msg.OBJNAMES[90] = "netherportal";
+Blockly.Msg.OBJNAMES[91] = "jackolantern";
+Blockly.Msg.OBJNAMES[92] = "cake";
+Blockly.Msg.OBJNAMES[93] = "redstone repeater";
+Blockly.Msg.OBJNAMES[94] = "redeston repeater active";
+Blockly.Msg.OBJNAMES[95] =  "stained glass white";
+Blockly.Msg.OBJNAMES[96] = "trapdoor";
+Blockly.Msg.OBJNAMES[97] = "monster egg";
+Blockly.Msg.OBJNAMES[98] =  "brick stone";
+Blockly.Msg.OBJNAMES[45] =  "brick red";
+Blockly.Msg.OBJNAMES[99] = "mushroom brown huge";
+Blockly.Msg.OBJNAMES[100] = "mushroom red huge";
+Blockly.Msg.OBJNAMES[101] = "iron bars";
+Blockly.Msg.OBJNAMES[102] = "glass pane";
+Blockly.Msg.OBJNAMES[103] = "melon";
+Blockly.Msg.OBJNAMES[104] = "pumpkin stem";
+Blockly.Msg.OBJNAMES[105] = "melon stem";
+Blockly.Msg.OBJNAMES[106] = "vines";
+Blockly.Msg.OBJNAMES[107] = "fence gate";
+Blockly.Msg.OBJNAMES[110] = "mycelium";
+Blockly.Msg.OBJNAMES[111] = "lily pad";
+Blockly.Msg.OBJNAMES[112] = "nether";
+Blockly.Msg.OBJNAMES[113] = "nether fence";
+Blockly.Msg.OBJNAMES[115] = "netherwart";
+Blockly.Msg.OBJNAMES[116] = "table enchantment";
+Blockly.Msg.OBJNAMES[117] = "brewing stand";
+Blockly.Msg.OBJNAMES[118] = "cauldron";
+Blockly.Msg.OBJNAMES[119] = "endportal";
+Blockly.Msg.OBJNAMES[120] = "endportal frame";
+Blockly.Msg.OBJNAMES[121] = "endstone";
+Blockly.Msg.OBJNAMES[122] = "dragon egg";
+Blockly.Msg.OBJNAMES[123] = "redstone lamp";
+Blockly.Msg.OBJNAMES[124] = "redstone lamp active";
+Blockly.Msg.OBJNAMES[43] =  "double slab stone";
+Blockly.Msg.OBJNAMES[78] =  "slab snow";
+Blockly.Msg.OBJNAMES[44] =  "slab stone";
+Blockly.Msg.OBJNAMES[126] =  "slab oak";
+Blockly.Msg.OBJNAMES[127] = "cocoa";
+Blockly.Msg.OBJNAMES[129] = "emerald ore";
+Blockly.Msg.OBJNAMES[130] = "enderchest";
+Blockly.Msg.OBJNAMES[131] = "tripwire hook";
+Blockly.Msg.OBJNAMES[132] = "tripwire";
+Blockly.Msg.OBJNAMES[133] = "emerald";
+Blockly.Msg.OBJNAMES[137] = "command";
+Blockly.Msg.OBJNAMES[138] = "beacon";
+Blockly.Msg.OBJNAMES[139] = "cobblestone wall";
+Blockly.Msg.OBJNAMES[140] = "flowerpot";
+Blockly.Msg.OBJNAMES[141] = "carrots";
+Blockly.Msg.OBJNAMES[142] = "potatoes";
+Blockly.Msg.OBJNAMES[143] = "button wood";
+Blockly.Msg.OBJNAMES[144] = "mobhead";
+Blockly.Msg.OBJNAMES[145] = "anvil";
+Blockly.Msg.OBJNAMES[146] = "chest trapped";
+Blockly.Msg.OBJNAMES[147] = "pressure plate weighted light";
+Blockly.Msg.OBJNAMES[148] = "pressure plate weighted heavy";
+Blockly.Msg.OBJNAMES[149] = "redstone comparator";
+Blockly.Msg.OBJNAMES[150] = "redstone comparator active";
+Blockly.Msg.OBJNAMES[151] = "daylight sensor";
+Blockly.Msg.OBJNAMES[152] = "redstone";
+Blockly.Msg.OBJNAMES[153] = "netherquartzore";
+Blockly.Msg.OBJNAMES[154] = "hopper";
+Blockly.Msg.OBJNAMES[155] = "quartz";
+Blockly.Msg.OBJNAMES[157] = "rail activator";
+Blockly.Msg.OBJNAMES[158] = "dropper";
+Blockly.Msg.OBJNAMES[159] =  "stained clay white";
+Blockly.Msg.OBJNAMES[170] = "hay";
+Blockly.Msg.OBJNAMES[171] =  "carpet white";
+Blockly.Msg.OBJNAMES[172] = "hardened clay";
+Blockly.Msg.OBJNAMES[173] = "coal block";
+Blockly.Msg.OBJNAMES[174] = "packed ice";
+Blockly.Msg.OBJNAMES[175] = "double plant";
+
diff --git a/src/main/js/www/msg/js/en_us.js b/src/main/js/www/msg/js/en_us.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/en_us.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/es.js b/src/main/js/www/msg/js/es.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/es.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/fa.js b/src/main/js/www/msg/js/fa.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/fa.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/fi.js b/src/main/js/www/msg/js/fi.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/fi.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/fr.js b/src/main/js/www/msg/js/fr.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/fr.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/he.js b/src/main/js/www/msg/js/he.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/he.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/hi.js b/src/main/js/www/msg/js/hi.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/hi.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/hrx.js b/src/main/js/www/msg/js/hrx.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/hrx.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/hu.js b/src/main/js/www/msg/js/hu.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/hu.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/ia.js b/src/main/js/www/msg/js/ia.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/ia.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/id.js b/src/main/js/www/msg/js/id.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/id.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/is.js b/src/main/js/www/msg/js/is.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/is.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/it.js b/src/main/js/www/msg/js/it.js
new file mode 100644
index 000000000..706aa3a27
--- /dev/null
+++ b/src/main/js/www/msg/js/it.js
@@ -0,0 +1,210 @@
+
+
+Blockly.Msg.M_MATERIAL = "Materiale";
+Blockly.Msg.M_OBJECT = "Oggetto";
+Blockly.Msg.M_DRONE = "Drone";
+Blockly.Msg.M_MOUVEMENT = "Movimento";
+Blockly.Msg.M_SPECIALS = "Extra";
+Blockly.Msg.M_ANIMALS = "Animali";
+
+Blockly.Msg.DEPLOY_SUCCESS="OK, ora puoi provare il tuo comando in minecraft.";
+Blockly.Msg.MISSING_NAME="Il tuo comando non ha un nome valido";
+
+
+
+
+Blockly.Msg.RECTANGLE = "Rettangolo";
+Blockly.Msg.CIRCLE = "Cerchio";
+Blockly.Msg.WIDTH = "Larghezza";
+Blockly.Msg.LENGTH = "Lughezza";
+Blockly.Msg.RADIUS = "raggio";
+Blockly.Msg.FULL = "Pieno";
+Blockly.Msg.EMPTY = "Vuoto";
+
+
+Blockly.Msg.M_MOUVEMENT_UP = "su";
+Blockly.Msg.M_MOUVEMENT_DOWN = "giu";
+Blockly.Msg.M_MOUVEMENT_FWD = "in avanti";
+Blockly.Msg.M_MOUVEMENT_BACK = "in dietro";
+Blockly.Msg.M_MOUVEMENT_RIGHT = "destra";
+Blockly.Msg.M_MOUVEMENT_LEFT = "sinistra";
+Blockly.Msg.M_MOUVEMENT_TURN_RIGHT = "gira a destra";
+Blockly.Msg.M_MOUVEMENT_TURN_LEFT = "gira a sinistra";
+Blockly.Msg.M_MOUVEMENT_BACKTOSTART = "ritorna alla partenza";
+Blockly.Msg.M_MOUVEMENT_SAVESTART = "salva questa partenza";
+
+Blockly.Msg.ANIMALS_BAT="pipistrello";
+Blockly.Msg.ANIMALS_CHICKEN="pollo";
+Blockly.Msg.ANIMALS_COW="mucca";
+Blockly.Msg.ANIMALS_PIG="maiale";
+Blockly.Msg.ANIMALS_RABBIT="coniglio";
+Blockly.Msg.ANIMALS_WOLF="lupo";
+Blockly.Msg.ANIMALS_SHEEP="pecora";
+Blockly.Msg.ANIMALS_HORSE="cavallo";
+Blockly.Msg.ANIMALS_OCELOT="ocelot";
+
+Blockly.Msg.OAK="quercia"; 
+Blockly.Msg.BED="letto"; 
+Blockly.Msg.DOOR="porta"; 
+
+
+
+Blockly.Msg.OBJNAMES = [] // init blocks array
+Blockly.Msg.OBJNAMES[0] = "aria";
+Blockly.Msg.OBJNAMES[1] = "pietra";
+Blockly.Msg.OBJNAMES[2] = "erba";
+Blockly.Msg.OBJNAMES[3] = "terra";
+Blockly.Msg.OBJNAMES[4] = "pietrisco";
+Blockly.Msg.OBJNAMES[5] = "oak";
+Blockly.Msg.OBJNAMES[6] =  "sapling oak";
+Blockly.Msg.OBJNAMES[7] = "bedrock";
+Blockly.Msg.OBJNAMES[8] = "acqua";
+Blockly.Msg.OBJNAMES[9] = "acqua ferma";
+Blockly.Msg.OBJNAMES[10] = "lava";
+Blockly.Msg.OBJNAMES[11] = "lava ferma";
+Blockly.Msg.OBJNAMES[12] = "sabbia";
+Blockly.Msg.OBJNAMES[13] = "ghiaia";
+Blockly.Msg.OBJNAMES[14] = "oro grezzo";
+Blockly.Msg.OBJNAMES[15] = "ferro grezzo";
+Blockly.Msg.OBJNAMES[16] = "carbone grezzo";
+Blockly.Msg.OBJNAMES[17] = "legno";
+Blockly.Msg.OBJNAMES[18] = "foglie";
+Blockly.Msg.OBJNAMES[19] = "spugna";
+Blockly.Msg.OBJNAMES[20] = "vetro";
+Blockly.Msg.OBJNAMES[21] = "lapis_lazuli grezzo";
+Blockly.Msg.OBJNAMES[22] = "lapis_lazuli_block";
+Blockly.Msg.OBJNAMES[23] = "dispenser";
+Blockly.Msg.OBJNAMES[24] = "sandstone";
+Blockly.Msg.OBJNAMES[25] = "note";
+Blockly.Msg.OBJNAMES[26] = "bed";
+Blockly.Msg.OBJNAMES[27] = "rotaie elettriche";
+Blockly.Msg.OBJNAMES[28] = "detector_rail";
+Blockly.Msg.OBJNAMES[29] = "sticky_piston";
+Blockly.Msg.OBJNAMES[30] = "ragnatela";
+Blockly.Msg.OBJNAMES[31] = "grass_tall";
+Blockly.Msg.OBJNAMES[32] = "dead_bush";
+Blockly.Msg.OBJNAMES[33] = "piston";
+Blockly.Msg.OBJNAMES[34] = "piston_extn";
+Blockly.Msg.OBJNAMES[35] =  "wool white";
+Blockly.Msg.OBJNAMES[37] = "fiore giallo";
+Blockly.Msg.OBJNAMES[38] = "rose";
+Blockly.Msg.OBJNAMES[38] = "flower_red";
+Blockly.Msg.OBJNAMES[39] = "mushroom_brown";
+Blockly.Msg.OBJNAMES[40] = "mushroom_red";
+Blockly.Msg.OBJNAMES[41] = "gold";
+Blockly.Msg.OBJNAMES[42] = "iron";
+Blockly.Msg.OBJNAMES[46] = "tnt";
+Blockly.Msg.OBJNAMES[47] = "bookshelf";
+Blockly.Msg.OBJNAMES[48] = "moss_stone";
+Blockly.Msg.OBJNAMES[49] = "ossidiana";
+Blockly.Msg.OBJNAMES[50] = "torcia";
+Blockly.Msg.OBJNAMES[51] = "fuoco";
+Blockly.Msg.OBJNAMES[52] = "monster_spawner";
+Blockly.Msg.OBJNAMES[53] =  "stairs oak";
+Blockly.Msg.OBJNAMES[67] =  "stairs cobblestone";
+Blockly.Msg.OBJNAMES[54] = "cassa";
+Blockly.Msg.OBJNAMES[55] = "pietrarossa cavo";
+Blockly.Msg.OBJNAMES[56] = "diamante grezzo";
+Blockly.Msg.OBJNAMES[57] = "diamante";
+Blockly.Msg.OBJNAMES[58] = "banco da lavoro";
+Blockly.Msg.OBJNAMES[59] = "wheat_seeds";
+Blockly.Msg.OBJNAMES[60] = "farmland";
+Blockly.Msg.OBJNAMES[61] = "fornace";
+Blockly.Msg.OBJNAMES[62] = "furnace_burning";
+Blockly.Msg.OBJNAMES[63] = "sign_post";
+Blockly.Msg.OBJNAMES[64] = "porta di legno";
+Blockly.Msg.OBJNAMES[65] = "scala a pioli";
+Blockly.Msg.OBJNAMES[66] = "rotaie";
+Blockly.Msg.OBJNAMES[68] = "cartello";
+Blockly.Msg.OBJNAMES[69] = "lever";
+Blockly.Msg.OBJNAMES[70] = "pressure_plate_stone";
+Blockly.Msg.OBJNAMES[71] = "door_iron";
+Blockly.Msg.OBJNAMES[72] = "pressure_plate_wood";
+Blockly.Msg.OBJNAMES[73] = "pietrarossa grezza";
+Blockly.Msg.OBJNAMES[74] = "pietrarossa grezza luminosa";
+Blockly.Msg.OBJNAMES[75] = "torch_redstone";
+Blockly.Msg.OBJNAMES[76] = "torch_redstone_active";
+Blockly.Msg.OBJNAMES[77] = "stone_button";
+Blockly.Msg.OBJNAMES[79] = "ghiaccio";
+Blockly.Msg.OBJNAMES[80] = "neve";
+Blockly.Msg.OBJNAMES[81] = "cactus";
+Blockly.Msg.OBJNAMES[82] = "clay";
+Blockly.Msg.OBJNAMES[83] = "sugar_cane";
+Blockly.Msg.OBJNAMES[84] = "jukebox";
+Blockly.Msg.OBJNAMES[85] = "fence";
+Blockly.Msg.OBJNAMES[86] = "pumpkin";
+Blockly.Msg.OBJNAMES[87] = "netherrack";
+Blockly.Msg.OBJNAMES[88] = "soulsand";
+Blockly.Msg.OBJNAMES[89] = "pietraluce";
+Blockly.Msg.OBJNAMES[90] = "netherportal";
+Blockly.Msg.OBJNAMES[91] = "jackolantern";
+Blockly.Msg.OBJNAMES[92] = "torta";
+Blockly.Msg.OBJNAMES[93] = "redstone_repeater";
+Blockly.Msg.OBJNAMES[94] = "redeston_repeater_active";
+Blockly.Msg.OBJNAMES[95] =  "stained_glass white";
+Blockly.Msg.OBJNAMES[96] = "trapdoor";
+Blockly.Msg.OBJNAMES[97] = "monster_egg";
+Blockly.Msg.OBJNAMES[98] =  "brick stone";
+Blockly.Msg.OBJNAMES[45] =  "brick red";
+Blockly.Msg.OBJNAMES[99] = "mushroom_brown_huge";
+Blockly.Msg.OBJNAMES[100] = "mushroom_red_huge";
+Blockly.Msg.OBJNAMES[101] = "iron_bars";
+Blockly.Msg.OBJNAMES[102] = "glass_pane";
+Blockly.Msg.OBJNAMES[103] = "melone";
+Blockly.Msg.OBJNAMES[104] = "pumpkin_stem";
+Blockly.Msg.OBJNAMES[105] = "melon_stem";
+Blockly.Msg.OBJNAMES[106] = "vines";
+Blockly.Msg.OBJNAMES[107] = "fence_gate";
+Blockly.Msg.OBJNAMES[110] = "mycelium";
+Blockly.Msg.OBJNAMES[111] = "lily_pad";
+Blockly.Msg.OBJNAMES[112] = "nether";
+Blockly.Msg.OBJNAMES[113] = "nether_fence";
+Blockly.Msg.OBJNAMES[115] = "netherwart";
+Blockly.Msg.OBJNAMES[116] = "table_enchantment";
+Blockly.Msg.OBJNAMES[117] = "brewing_stand";
+Blockly.Msg.OBJNAMES[118] = "cauldron";
+Blockly.Msg.OBJNAMES[119] = "endportal";
+Blockly.Msg.OBJNAMES[120] = "endportal_frame";
+Blockly.Msg.OBJNAMES[121] = "endstone";
+Blockly.Msg.OBJNAMES[122] = "dragon_egg";
+Blockly.Msg.OBJNAMES[123] = "redstone_lamp";
+Blockly.Msg.OBJNAMES[124] = "redstone_lamp_active";
+Blockly.Msg.OBJNAMES[43] =  "double_slab stone";
+Blockly.Msg.OBJNAMES[78] =  "slab snow";
+Blockly.Msg.OBJNAMES[44] =  "slab stone";
+Blockly.Msg.OBJNAMES[126] =  "slab oak";
+Blockly.Msg.OBJNAMES[127] = "cocoa";
+Blockly.Msg.OBJNAMES[129] = "smeraldo grezzo";
+Blockly.Msg.OBJNAMES[130] = "enderchest";
+Blockly.Msg.OBJNAMES[131] = "tripwire_hook";
+Blockly.Msg.OBJNAMES[132] = "tripwire";
+Blockly.Msg.OBJNAMES[133] = "emerald";
+Blockly.Msg.OBJNAMES[137] = "command";
+Blockly.Msg.OBJNAMES[138] = "beacon";
+Blockly.Msg.OBJNAMES[139] = "cobblestone_wall";
+Blockly.Msg.OBJNAMES[140] = "flowerpot";
+Blockly.Msg.OBJNAMES[141] = "carote";
+Blockly.Msg.OBJNAMES[142] = "patate";
+Blockly.Msg.OBJNAMES[143] = "button_wood";
+Blockly.Msg.OBJNAMES[144] = "mobhead";
+Blockly.Msg.OBJNAMES[145] = "anvil";
+Blockly.Msg.OBJNAMES[146] = "chest_trapped";
+Blockly.Msg.OBJNAMES[147] = "pressure_plate_weighted_light";
+Blockly.Msg.OBJNAMES[148] = "pressure_plate_weighted_heavy";
+Blockly.Msg.OBJNAMES[149] = "redstone_comparator";
+Blockly.Msg.OBJNAMES[150] = "redstone_comparator_active";
+Blockly.Msg.OBJNAMES[151] = "daylight_sensor";
+Blockly.Msg.OBJNAMES[152] = "redstone";
+Blockly.Msg.OBJNAMES[153] = "netherquartzore";
+Blockly.Msg.OBJNAMES[154] = "hopper";
+Blockly.Msg.OBJNAMES[155] = "quartz";
+Blockly.Msg.OBJNAMES[157] = "rail_activator";
+Blockly.Msg.OBJNAMES[158] = "dropper";
+Blockly.Msg.OBJNAMES[159] =  "stained_clay white";
+Blockly.Msg.OBJNAMES[170] = "hay";
+Blockly.Msg.OBJNAMES[171] =  "carpet white";
+Blockly.Msg.OBJNAMES[172] = "hardened_clay";
+Blockly.Msg.OBJNAMES[173] = "coal_block";
+Blockly.Msg.OBJNAMES[174] = "packed_ice";
+Blockly.Msg.OBJNAMES[175] = "girasole";
+
diff --git a/src/main/js/www/msg/js/ja.js b/src/main/js/www/msg/js/ja.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/ja.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/ko.js b/src/main/js/www/msg/js/ko.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/ko.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/lb.js b/src/main/js/www/msg/js/lb.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/lb.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/lrc.js b/src/main/js/www/msg/js/lrc.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/lrc.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/lt.js b/src/main/js/www/msg/js/lt.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/lt.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/mk.js b/src/main/js/www/msg/js/mk.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/mk.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/ms.js b/src/main/js/www/msg/js/ms.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/ms.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/nb.js b/src/main/js/www/msg/js/nb.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/nb.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/nl.js b/src/main/js/www/msg/js/nl.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/nl.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/no.js b/src/main/js/www/msg/js/no.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/no.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/oc.js b/src/main/js/www/msg/js/oc.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/oc.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/pl.js b/src/main/js/www/msg/js/pl.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/pl.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/pms.js b/src/main/js/www/msg/js/pms.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/pms.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/pt-br.js b/src/main/js/www/msg/js/pt-br.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/pt-br.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/pt.js b/src/main/js/www/msg/js/pt.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/pt.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/ro.js b/src/main/js/www/msg/js/ro.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/ro.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/ru.js b/src/main/js/www/msg/js/ru.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/ru.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/sc.js b/src/main/js/www/msg/js/sc.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/sc.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/sk.js b/src/main/js/www/msg/js/sk.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/sk.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/sq.js b/src/main/js/www/msg/js/sq.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/sq.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/sr.js b/src/main/js/www/msg/js/sr.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/sr.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/sv.js b/src/main/js/www/msg/js/sv.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/sv.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/th.js b/src/main/js/www/msg/js/th.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/th.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/tl.js b/src/main/js/www/msg/js/tl.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/tl.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/tlh.js b/src/main/js/www/msg/js/tlh.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/tlh.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/tr.js b/src/main/js/www/msg/js/tr.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/tr.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/uk.js b/src/main/js/www/msg/js/uk.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/uk.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/vi.js b/src/main/js/www/msg/js/vi.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/vi.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/zh-hans.js b/src/main/js/www/msg/js/zh-hans.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/zh-hans.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/js/www/msg/js/zh-hant.js b/src/main/js/www/msg/js/zh-hant.js
new file mode 100644
index 000000000..9d09dcfc0
--- /dev/null
+++ b/src/main/js/www/msg/js/zh-hant.js
@@ -0,0 +1 @@
+// Defaulting to 'en.js'. To override the default, redefine the same variables here
diff --git a/src/main/resources/boot.js b/src/main/resources/boot.js
index d0f4d543b..d1536b6a1 100644
--- a/src/main/resources/boot.js
+++ b/src/main/resources/boot.js
@@ -61,7 +61,7 @@ var __scboot = null;
   {
     var logger = plugin.canary ? plugin.logman : plugin.logger, 
       initScriptFile = new File(jsPlugins,initScript),
-      zips = ['lib','plugins','modules'],
+      zips = ['lib','plugins','modules', 'www'],
       i = 0,
       zis,
       len = zips.length;