Lots of debugging. Added new plugin usercolours, player commands, proper tell().

Changed around import order so proxy.py has one instance. Sigh.

Author: minecraft server

config.py

@@ -1,10 +1,12 @@
-import os
+import os, sys
+
+DEBUG = 'debug' in sys.argv
 
 # Info for proxy
-LISTEN_ADDR = ('0.0.0.0', 25565)
+LISTEN_ADDR = ('0.0.0.0', 25565) if not DEBUG else ('0.0.0.0', 25564)
 SERVER_ADDR = ('127.0.0.1', 25042)
-LOG_FILE = '/var/minecraft/logs/proxy.log'
-PLUGIN_PATH = '/var/minecraft/Proxy2/plugins'
+LOG_FILE = '/var/minecraft/logs/proxy.log' if not DEBUG else '/var/minecraft/logs/proxy-debug.log'
+PLUGIN_PATH = '/var/minecraft/Proxy2/plugins' if not DEBUG else './plugins'
 
 # Buff sizes - shouldn't change
 MAX_SEND = 4096

helpers.py

@@ -1,10 +1,9 @@
 # -*- coding: cp1252 -*-
 """Helper functions for plugins"""
 
-import os
-from proxy import send_packet
-from proxy import server_cmd as cmd
+import os, sys
 from packet_decoder import names as packet_names
+from packet_decoder import Packet, SERVER_TO_CLIENT
 from config import *
 
 def ops():
@@ -13,6 +12,15 @@ def ops():
 	ret = [unicode(name) for name in ret]
 	return ret
 
+def server_cmd(command):
+	"""Send a command to server console. May OSError."""
+	p = Popen([COMMAND_SCRIPT, command], stderr=PIPE)
+	ret = p.wait()
+	if ret:
+		out, err = p.communicate()
+		raise OSError(command, ret, err.read().strip())
+	return
+
 colors = {
 		'black': u'0',
 		'dark blue': u'1',
@@ -33,18 +41,25 @@ def ops():
 	}
 def color(name):
 	"""Takes a color name and returns the string needed to turn the chat message that color."""
-	if name not in color_map:
+	if name not in colors:
 		raise ValueError('Bad color %s' % repr(name))
-	return u'§' + color_map[name]
+	return u'§' + colors[name]
+
+
+def all_users():
+	"""Returns list of users who ever played on the server"""
+	return [name[:-4] for name in os.listdir(os.path.join(WORLD_DIR, 'players'))]
 
 
 locks = set()
-def tell(user, message, delay=0, lock=None):
+def tell(user, message, delay=0, lock=None, prefix=''):
 	"""Send a server message to user.
+	Note: Splits multiline messages. See prefix, below.
 	Optional args:
 		delay: Wait delay seconds before sending message. Useful mainly with lock. See below.
 		lock: Until message sent (see delay) allow no new messages with the same user and lock value.
 			Generally speaking, expected to be a string. But it doesn't really matter.
+		prefix: Add given prefix to every line sent, eg '<server>: '.
 	Returns bool of whether message was sent (see lock)
 	"""
 	global locks
@@ -53,13 +68,17 @@ def tell(user, message, delay=0, lock=None):
 			return False
 		else:
 			locks.add((user, lock))
+	message = unicode(message)
 	def tell_send():
-		packet = Packet()
-		packet.ident = packet_names['Chat message']
-		packet.direction = CLIENT_TO_SERVER if to_server else SERVER_TO_CLIENT
-		packet.data = {'text': unicode(message)}
-		send_packet(packet, user, False)
-		locks.remove((user, lock))
+		reverse = dict([(y,x) for x,y in packet_names.items()])
+		for line in message.split('\n'):
+			packet = Packet()
+			packet.ident = reverse['Chat message']
+			packet.direction = SERVER_TO_CLIENT
+			packet.data = {'text': line}
+			send_packet(packet, user, False)
+		if lock is not None:
+			locks.remove((user, lock))
 
 	if delay:
 		schedule(tell_send, delay)

killproxy

@@ -1,4 +1,10 @@
 #!/bin/bash
 
-{ ps aux | grep 'python proxy\.py' | grep -v grep | awk '{print $2}' | xargs kill 2>/dev/null ; } &&
+if [ "$1" == "debug" ]; then
+	name="python proxy\.py debug"
+else
+	name="python proxy\.py"
+fi
+
+{ ps aux | grep "$name" | grep -v grep | awk '{print $2}' | xargs kill 2>/dev/null ; } &&
 	echo "Killed proxy"

plugins.py

@@ -3,7 +3,13 @@
 sys.path.append(PLUGIN_PATH)
 
 # Import plugins here
-import log_all, log_sorted, usernames, no_changes, sp_opcolor
+import log_all, log_sorted, usernames, no_changes, sp_opcolor, usercolors, bad_cmd
+import player_cmd as cmd
 
 # Set ordering here
-plugins = [log_all, log_sorted, usernames, sp_opcolor]
+plugins = []
+plugins.append(log_sorted) # Always first to catch all raw packets
+plugins.append(usernames) # The earlier the better, name the login packets sooner.
+plugins.append(cmd) # Should probably be before anything that depends on it
+plugins.append(usercolors)
+plugins.append(bad_cmd) # Always last out of chat commands

plugins/bad_cmd.py

@@ -0,0 +1,13 @@
+"""Simple plugin to catch bad commands and report them. Should be loaded last."""
+
+import player_cmd as cmd
+from helpers import tell
+
+def on_start():
+	cmd.register(r'/(.*)', uncaught_command)
+
+def on_packet(packet, user, to_server):
+	return packet
+
+def uncaught_command(message, user, command):
+	tell(user, "Bad command: %s" % command)

plugins/cmd.py plugins/player_cmd.py

@@ -5,12 +5,12 @@
 Modules shoud register a regex to match a chat message exactly.
 Along with this regex is a callback function that has args: (message, user, *regex_groups)
 	and returns False to let packet pass through or True to drop it.
+	If None is returned, defaults to dropping it.
 This behaviour is intended to allow further checking before deciding if the packet should be dropped.
 Messages are passed through all matching functions (unless dropped)
 	in the order of regsitration (shich should occur during on_start()).
 """
 
-from packet_decoder import names as packet_names
 import re
 
 registrations = [] # List of (regex obj, function)
@@ -23,15 +23,16 @@ def on_start():
 def on_packet(packet, user, to_server):
 	global registrations
 
-	if not to_server or packet.ident != packet_names['Chat message']:
+	if not to_server or packet.name() != 'Chat message':
 		return packet
 
 	message = packet.data['text']
 
 	for regex, func in registrations:
 		match = regex.match(message)
 		if match is not None:
-			if not func(message, user, *match.groups):
+			ret = func(message, user, *match.groups())
+			if ret is None or ret:
 				break # break skips the else and so returns [] immediately
 	else: # runs only if break is never reached, ie. no dropping matches.
 		return packet
@@ -53,6 +54,6 @@ def on_start():
 			cmd.register('/msg ([^ ]+) (.*)', private_msg)
 	"""
 	global registrations
-	regex = r'(?:%s)$' # Make match end of string also
+	regex = r'(?:%s)$' % regex # Make match end of string also
 	regex = re.compile(regex)
 	registrations.append((regex, func))

plugins/usercolors.py

@@ -1,50 +1,81 @@
-
-AUTHOR="ekimekim (based on sleepyparadox's 'sp_opcolor')"
-CONTACT='[email protected]'
-DESCRIPTION= """A plugin that highlights usernames in chat.
-Has different colours for ops, logged in users, not logged in users, and yourself.
-Colours have sensible defaults but are configurable with in-game commands:
-	/colors help
-	/colors TYPE COLOR
-"""
-
-from packet_decoder import Packet
-from helpers import ops, color
-
-opColor = color('red')
-userColor = color('dark cyan')
-
-def on_start():
-	cmd.register('/color (.*)', on_command)
-
-def on_packet(packet, user, to_server):
-    if packet.name() == 'Chat message':
-        #Highlight admin names in red
-        if not to_server:
-            for op in ops():
-                #insert op color flag before name and normal color flag after name
-                packet.data['text'] = packet.data['text'].replace(op, opColor + op + color('white'))
-            packet.data['text'] = packet.data['text'].replace(user.username, userColor + user.username + color('white'))
-                
-            #replace 'bitblitz' with developer name 'Sleepy Paradox'
-            packet.data['text'] = packet.data['text'].replace(u'bitblitz', u'Sleepy Paradox')
-    #return edited packet
-    return packet
-
-HELP = """Chat color commands:
-/color help - This message
-/color colors - List available colors
-/color all X - set all chat messages to X
-/color active X - set logged in usernames to X
-/color inactive X - set logged out usernames to X
-/color me X - set yourself to appear as X
-___Note: Only you see the new color, not everyone.
-/color ops X - set ops to appear as X
-Replace X with the color you want, as given by /color colors."""
-
-def on_command(message, user, command):
-	verb, value = command.split(' ', 1)
-	if verb == 'help':
-		user.tell(HELP)
-	elif verb in user.setcolors:
-		if value in color.colors
+
+AUTHOR="ekimekim (based on sleepyparadox's 'sp_opcolor')"
+CONTACT='[email protected]'
+DESCRIPTION= """A plugin that highlights usernames in chat.
+Has different colours for ops, logged in users, not logged in users, and yourself.
+Colours have sensible defaults but are configurable with in-game commands:
+	/colors help
+	/colors TYPE COLOR
+"""
+
+from packet_decoder import Packet
+from helpers import ops, color, colors, all_users, active_users, tell
+import player_cmd as cmd
+
+defaults = {
+	'all': color('white'),
+	'inactive': color('dark gray'),
+	'active': color('gray'),
+	'ops': color('red'),
+	'me': color('dark cyan')
+}
+
+users = {}
+
+def on_start():
+	cmd.register('/color (.*)', on_command)
+	cmd.register('/color ?', no_command)
+
+def on_packet(packet, user_obj, to_server):
+	if packet.name() == 'Chat message' and not to_server:
+		prefs = users.get(user_obj.username, defaults)
+		offlines = dict([(user, prefs['inactive']) for user in all_users()])
+		onlines = dict([(user, prefs['active']) for user in active_users()])
+		ops_dict = dict([(user, prefs['ops']) for user in ops()])
+		player = {user_obj.username: prefs['me']}
+		names = {}
+		names.update(offlines)
+		names.update(onlines)
+		names.update(ops_dict)
+		names.update(player)
+		packet.data['text'] = prefs['all'] + packet.data['text']
+		for name in names:
+			packet.data['text'] = packet.data['text'].replace(name, names[name] + name + prefs['all'])
+	return packet
+
+HELP = """Chat color commands:
+/color help - This message
+/color colors - List available colors
+/color all X - set all chat messages to X
+/color active X - set logged in usernames to X
+/color inactive X - set logged out usernames to X
+/color me X - set yourself to appear as X
+___Note: Only you see the new color, not everyone.
+/color ops X - set ops to appear as X
+Replace X with the color you want, as given by /color colors."""
+
+def on_command(message, user, command):
+	parts = command.split(' ', 1)
+	if len(parts) == 2:
+		verb, value = parts
+	else:
+		verb = parts[0]
+	if verb == 'help':
+		tell(user, HELP)
+	elif verb == 'colors':
+		for c in colors:
+			prefs = users.get(user.username, defaults)
+			tell(user, 'color: %s"%s"%s' % (color(c), c, prefs['all']))
+	elif verb in defaults:
+		if value in colors:
+			prefs = users.get(user.username, defaults.copy())
+			prefs[verb] = color(value)
+			users[user.username] = prefs
+		else:
+			tell(user, 'color: That is not a valid color!')
+	else:
+		tell(user, 'color: Bad command. Try "/color help"')
+
+
+def no_command(message, user):
+	tell(user, 'Modify user colors! Type "/color help".')