rubyfox-server 2.11.1.0 → 2.12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a8735b57f569c416fbe21e96234977d16e654a1
-  data.tar.gz: b7de5f982638ea93c87c1998b356acc0c23a2209
+  metadata.gz: 97fe4c3be4c84f15de9191d692b3e3f3450bde2d
+  data.tar.gz: 3c77e3db9931f80c0e2d85329a5e9df85d3dac73
 SHA512:
-  metadata.gz: c683ea0867225d440a74128ec799f4774edee2f30ae81a31538f92beea41e76f2fa42902c48023f0e7c7fcb630c46682924fdcce3895c4f238ae68c2b3ceefb1
-  data.tar.gz: 0a5384500465547e7521fce3bd79b23a8682ee270552eacbfae7bf68d88c5351291cb96416d1e680a17bb86dee79c9895027b983b74a7605d71a5ef786c7939e
+  metadata.gz: 7a3aad083802307edcc7905a8e464d51f2a7aeea144a7dac668a7de3a2e58a202334aacab75ac359600bbe974f7dc367608e4c3ac78f02d5ba371ffccdc46619
+  data.tar.gz: a8b16168452b97853246e8df30b197ffe984e830adac84cd3a35af5c48159a9758b61a26e3c669693f81300aa4d522d2692bc0cd43302fd3f8570cb9d3070b81

data/lib/rubyfox/server/data/config/admin/admintool.xml

@@ -0,0 +1,23 @@
+<admintool>
+	
+	<!--
+		Administration Tool modules
+		- List in the required order of appearance on the client
+		- Save module icons in the icons/ folder as png; name must be equal to the module id
+		- Icon should be 30x30 px, but the transparent canvas must be 50x50 px
+	-->
+	<modules>
+		<module id="Dashboard" name="Dashboard" description="Access the global runtime informations of the SmartFoxServer instance" />
+		<module id="ZoneMonitor" name="Zone Monitor" description="Monitor SmartFoxServer Zones, Rooms and Users behavior at runtime, and live edit some of their settings"/>
+		<module id="Analytics" name="Analytics" description="Check the SmartFoxServer usage statistics from a business point of view"/>
+		<module id="BanManager" name="Ban Manager" description="Check banned users lists, cancel bannings and ban other users/IPs"/>
+		<module id="LogViewer" name="Log Viewer" description="Check and download SmartFoxServer boot and runtime logs"/>
+		<module id="BlueBoxMonitor" name="BlueBox Monitor" description="Monitor clients connected through the BlueBox http tunnelling system"/>
+		<!-- <module id="Console" name="Console" description="Interact with the SmartFoxServer instance via command line"/> -->
+		<module id="ServerConfigurator" name="Server Configurator" description="Edit the global settings of the SmartFoxServer instance"/>
+		<module id="ZoneConfigurator" name="Zone Configurator" description="Create and delete SmartFoxServer Zones and static Rooms, or edit the settings of the existing ones"/>
+		<module id="ExtensionManager" name="Extension Manager" description="Upload Extension files to the SmartFoxServer instance"/>
+		<module id="LicenseManager" name="License Manager" description="Configure the license of the SmartFoxServer instance"/>
+	</modules>
+	
+</admintool>

data/lib/rubyfox/server/data/config/{descriptors → admin/descriptors}/config_room.txt

@@ -117,6 +117,15 @@
 	"value":{$BasicValue=badWordsFilter.isActive}
 },
 
+// ALLOW JOIN INVITATIONS FOR ROOM OWNERS ONLY
+{
+	"name":"allowOwnerInvitation",
+	"label":"Restrict JoinRoom invitations to Room owner",
+	"tooltip":"If enabled, only the Room's owner will be able to invite users in the Room. If disabled any User will be able to invite more users, with the exception of spectators in a game-type Room",
+	"type":"CheckBox",
+	"value":{$BasicValue=roomSettings.allowOwnerInvitation}
+},
+
 //-------------------------------------------
 // PERMISSIONS AND EVENTS
 //-------------------------------------------

data/lib/rubyfox/server/data/config/{descriptors → admin/descriptors}/config_server.txt

@@ -7,6 +7,16 @@
 // GENERAL SETTINGS
 //-------------------------------------------
 
+
+// SERVER NAME
+{
+	"name":"serverName",
+	"label":"Server name",
+	"tooltip":"Custom name assigned to the server, for easier identification in case of environments running multiple SmartFoxServer instances. The name is displayed in the title bar of all modules, together with the server's address and port",
+	"type":"TextInput",
+	"value":"{$BasicValue=serverSettings.serverName}"
+},
+
 // SOCKET ADDRESSES
 {
 	"name":"socketAddresses",
@@ -91,7 +101,7 @@
 	"value":{$BasicValue=serverSettings.protocolCompressionThreshold},
 	"componentParams":
 	{
-		"minimum":50,
+		"minimum":256,
 		"maximum":2147483647
 	}
 },
@@ -201,7 +211,7 @@
 			"validator":"ip",
 			"componentParams":
 			{
-				"restrict":"0-9."
+				"restrict":"0-9./"
 			}
 		}
 	],
@@ -226,7 +236,7 @@
 			"validator":"ip",
 			"componentParams":
 			{
-				"restrict":"0-9."
+				"restrict":"0-9./"
 			}
 		}
 	],
@@ -604,7 +614,12 @@
 		}
 	],
 	"listValues":{$List=administrators, instance=remoteAdmin, fields=login;password;allowHalt;disabledModulesString},
-	"clazz":"ServerSettings$AdminUser"
+	"clazz":"AdminUser",
+	"separator":
+	{
+		"pos":"before",
+		"text":"<b>IMPORTANT</b>: al the settings below, except 'Use encryption', are <b>applied immediately</b> on submission, without a server restart being required"
+	}
 },
 
 // ALLOWED REMOTE ADDRESSES
@@ -647,6 +662,16 @@
 	}
 },
 
+// USE ENCRYPTION
+{
+	"name":"remoteAdmin.useEncryption",
+	"label":"Use encryption",
+	"tooltip":"Enable connection encryption for the Admin Tool; after the restart, the 'Use encryption' checkbox on the login screen must be flagged in order to be able to establish a connection with the server",
+	"category":"Remote admin",
+	"type":"CheckBox",
+	"value":{$BasicValue=remoteAdmin.useEncryption}
+},
+
 //-------------------------------------------
 // ANALYTICS MODULE SETTINGS
 //-------------------------------------------
@@ -869,36 +894,6 @@
 	"value":{$BasicValue=systemThreadPoolSettings.logActivity}
 },
 
-// SYSTEM FULL QUEUE WARNING INTERVAL
-{
-	"name":"systemThreadPoolSettings.queueFullWarningInterval",
-	"label":"Full queue warning interval",
-	"tooltip":"The interval, expressed in seconds, between two consecutive warnings being logged if the messages queue is full",
-	"category":"Thread pools",
-	"type":"NumericStepper",
-	"value":{$BasicValue=systemThreadPoolSettings.queueFullWarningInterval},
-	"componentParams":
-	{
-		"minimum":1,
-		"maximum":10000
-	}
-},
-
-// SYSTEM REQUEST QUEUE SIZE
-{
-	"name":"systemControllerRequestQueueSize",
-	"label":"System Controller request queue size",
-	"tooltip":"Modifies the maximum size of the System Controller messages queue",
-	"category":"Thread pools",
-	"type":"NumericStepper",
-	"value":{$BasicValue=serverSettings.systemControllerRequestQueueSize},
-	"componentParams":
-	{
-		"minimum":10,
-		"maximum":2147483647
-	}
-},
-
 //-------------------------------------------
 
 // EXTENSION CORE THREADS
@@ -931,7 +926,7 @@
 	"value":{$BasicValue=extensionThreadPoolSettings.backupThreads},
 	"componentParams":
 	{
-		"minimum":0,
+		"minimum":1,
 		"maximum":10000
 	}
 },
@@ -946,7 +941,7 @@
 	"value":{$BasicValue=extensionThreadPoolSettings.maxBackups},
 	"componentParams":
 	{
-		"minimum":0,
+		"minimum":1,
 		"maximum":10000
 	}
 },
@@ -1021,36 +1016,6 @@
 	"value":{$BasicValue=extensionThreadPoolSettings.logActivity}
 },
 
-// EXTENSION FULL QUEUE WARNING INTERVAL
-{
-	"name":"extensionThreadPoolSettings.queueFullWarningInterval",
-	"label":"Full queue warning interval",
-	"tooltip":"The interval, expressed in seconds, between two consecutive warnings being logged if the messages queue is full",
-	"category":"Thread pools",
-	"type":"NumericStepper",
-	"value":{$BasicValue=extensionThreadPoolSettings.queueFullWarningInterval},
-	"componentParams":
-	{
-		"minimum":1,
-		"maximum":10000
-	}
-},
-
-// EXTENSION REQUEST QUEUE SIZE
-{
-	"name":"extensionControllerRequestQueueSize",
-	"label":"Extensions Controller request queue size",
-	"tooltip":"Modifies the maximum size of the Extensions Controller messages queue",
-	"category":"Thread pools",
-	"type":"NumericStepper",
-	"value":{$BasicValue=serverSettings.extensionControllerRequestQueueSize},
-	"componentParams":
-	{
-		"minimum":10,
-		"maximum":2147483647
-	}
-},
-
 //-------------------------------------------
 // JVM SETTINGS
 //-------------------------------------------

data/lib/rubyfox/server/data/config/{descriptors → admin/descriptors}/config_zone.txt

@@ -20,8 +20,8 @@
 // USE ENCRYPTION
 {
 	"name":"isEncrypted",
-	"label":"Use Encryption",
-	"tooltip":"When turned on the server will only accept encrypted connections for this Zone",
+	"label":"Use encryption",
+	"tooltip":"If turned on, the server will only accept encrypted connections for this Zone; otherwise either encrypted and non-encrypted connections are allowed",
 	"type":"CheckBox",
 	"value":{$BasicValue=zoneSettings.isEncrypted}
 },
@@ -30,7 +30,7 @@
 {
 	"name":"isCustomLogin",
 	"label":"Use custom login",
-	"tooltip":"If turned on the login logic will be handled by the developer's Zone Extension",
+	"tooltip":"If turned on, the login logic will be handled by the developer's Zone Extension",
 	"type":"CheckBox",
 	"value":{$BasicValue=zoneSettings.isCustomLogin}
 },
@@ -44,6 +44,29 @@
 	"value":{$BasicValue=zoneSettings.isForceLogout}
 },
 
+// TOGGLE GEOLOCATION
+{
+	"name":"geoLocationEnabled",
+	"label":"Enable geolocation",
+	"tooltip":"Toggles geolocation service, resolving the client IP address from a local database at minimal performance cost",
+	"type":"CheckBox",
+	"value":{$BasicValue=zoneSettings.geoLocationEnabled}
+},
+
+// MAX FAILED LOGIN ATTEMPTS
+{
+	"name":"maxFailedLogins",
+	"label":"Maximum # of failed logins",
+	"tooltip":"The maximum number of login attempts (in the same session) allowed by the Zone",
+	"type":"NumericStepper",
+	"value":{$BasicValue=zoneSettings.maxFailedLogins},
+	"componentParams":
+	{
+		"minimum":1,
+		"maximum":30
+	}
+},
+
 // MAX USERS
 {
 	"name":"maxUsers",
@@ -259,6 +282,29 @@
 	"value":{$BasicValue=zoneSettings.allowUploads}
 },
 
+// ALLOW JOIN INVITATIONS FOR BUDDIES ONLY
+{
+	"name":"allowInvitationsOnlyForBuddies",
+	"label":"Allow Join Invitations for Buddies only",
+	"tooltip":"If enabled, clients will only be able to invite Buddies via the JoinRoomInvitationRequest. If disabled they will be able to invite any online User.",
+	"type":"CheckBox",
+	"value":{$BasicValue=zoneSettings.allowInvitationsOnlyForBuddies}
+},
+
+// MAX USERS PER JOIN INVITATION
+{
+	"name":"maxUsersPerJoinInvitationRequest",
+	"label":"Max Users per Join Invitation",
+	"tooltip":"The mamximum number of Users that can be invited at once via a client-side JoinRoomInvitationRequest",
+	"type":"NumericStepper",
+	"value":{$BasicValue=zoneSettings.maxUsersPerJoinInvitationRequest},
+	"componentParams":
+	{
+		"minimum":1,
+		"maximum":8
+	}
+},
+
 //-------------------------------------------
 // ADVANCED
 //-------------------------------------------

data/lib/rubyfox/server/data/config/{descriptors → admin/descriptors}/runtime_room.txt

@@ -227,6 +227,17 @@
 	"edit":false
 },
 
+// ALLOW JOIN INVITATIONS FOR ROOM OWNERS ONLY
+{
+	"name":"allowOwnerInvitations",
+	"label":"Restrict JoinRoom invitations to Room owner",
+	"tooltip":"If enabled, only the Room's owner will be able to invite users in the Room. If disabled any User will be able to invite more users, with the exception of spectators in a game-type Room",
+	"category":"Runtime Room settings",
+	"type":"CheckBox",
+	"value":{$BasicValue=room.allowOwnerInvitations},
+	"edit":true
+},
+
 //-------------------------------------------
 // PERMISSIONS AND EVENTS
 //-------------------------------------------

data/lib/rubyfox/server/data/config/{descriptors → admin/descriptors}/runtime_zone.txt

@@ -203,6 +203,21 @@
 	"edit":false
 },
 
+// USER RECONNECTION TIME
+{
+	"name":"userReconnectionSeconds",
+	"label":"User reconnection timeframe",
+	"tooltip":"Maximum waiting-timeframe (in seconds) for transparent client reconnection",
+	"category":"Runtime Zone settings",
+	"type":"NumericStepper",
+	"value":{$BasicValue=zone.userReconnectionSeconds},
+	"componentParams":
+	{
+		"minimum":0,
+		"maximum":2147483647
+	}
+},
+
 // USER MAX IDLE TIME
 {
 	"name":"maxUserIdleTime",

data/lib/rubyfox/server/data/config/admin/gmc/gmc.py

@@ -0,0 +1,118 @@
+import types
+import sys
+
+__CONSOLE_LOCK = False
+
+import java
+from com.smartfoxserver.v2.entities.data import *
+
+__scripts = [	
+				{'name':'version()', 'doc':'Shows the Console extension version'},
+				{'name':'reloadScripts()', 'doc':'Reload the dynamic server scripts'},
+				{'name':'execute()', 'doc':'Launches the last loaded script again'},
+				{'name':'files(path)', 'doc':'Shows the files at the specified path'},
+				{'name':'controller(id)', 'doc':'Obtain one of the controllers from its id. 0=System, 1=Extension, 2=Smasher'},
+				{'name':'zones()', 'doc':'List of active zones'}
+			]
+			
+__shortcuts = [	
+				{'name':'ESC', 'doc':'Clears current command'},
+				{'name':'UP ARROW', 'doc':'Previous command in history'},
+				{'name':'DOWN ARROW', 'doc':'Next command in history'},
+				{'name':'CTRL + SPACE', 'doc':'Show command history'},
+				{'name':'CTRL + BACKSPACE', 'doc':'Clear console text'}
+			]
+
+grid = None
+
+if sfs.isGrid():
+	from com.smartfoxserver.grid import SFSGrid
+	grid = SFSGrid.manager()
+	_2XGlobals_['grid'] = grid
+
+
+def help():
+	"""Shows a list of useful global objects"""
+	text = ""
+	for (key, value) in _2XGlobals_.items():
+		if value != None:
+			cl = str(value.getClass())
+			text += "<font color='#FFCC00'>" + key + "</font>\t\t\t" + cl.split(".")[-1] + "\n"
+
+	text += "\n<font color='#FFCC00'>extras()</font>\t\tFor more custom function calls"
+	text += "\n<font color='#FFCC00'>shortcuts()</font>\tFor keyboard shortcuts details\n"
+	return text
+
+def shortcuts():
+	"""Shows list of useful keyboard shortcuts"""
+	return __showList__(__shortcuts)
+	
+
+def extras():
+	"""Shows list of useful methods"""
+	return __showList__(__scripts)
+	
+		
+def version():
+	return __parent__.VER
+
+def controller(id):
+	from java.lang import Byte
+	bb = Byte(id)
+	return eng.controllerManager.getControllerById(bb)
+
+def reloadScripts():
+	__parent__.init()
+	return "<font color='#ffCC00'>[[ Reload success! ]]</font>"
+
+def files(path='.'):
+	import os
+	return os.listdir(path)
+
+def zones():
+	return zm.getZoneList()
+
+
+
+def __showList__(someList):
+	text = ""
+	
+	for item in someList:
+		text += "<font color='#FFCC00'>" + item['name'] + "</font>"
+		text += ":" + __getSpacer__(item['name']) + item['doc'] + "\n"
+	return text
+
+def __hints__(obj, target):
+	if obj == None:
+		return
+
+	hints = None
+
+	try:
+		hints = [item for item in dir(obj)]
+	except:
+		pass
+
+	# No hints available
+	if hints == None or len(hints) == 0:
+		hints = []
+
+	# Send hint list
+	from com.smartfoxserver.v2.entities.data import SFSObject
+
+	sfso = SFSObject()
+	sfso.putUtfStringArray('h', hints)
+	
+	return sfso
+
+def __getSpacer__(inputStr):
+	DEFAULT_SPACES = 25
+	spacer = " "
+	
+	nSpaces = DEFAULT_SPACES - len(inputStr)
+	if nSpaces > 0:
+		spacer = " " * nSpaces
+	
+	return spacer
+
+	

data/lib/rubyfox/server/data/config/core.xml

@@ -1,9 +1,9 @@
 <!--
-	SmartFoxServer 2X v.2.9.x
+	SmartFoxServer 2X v 2.12.x
 	<<< Core Configuration >>>
 	
-	(c) gotoAndPlay 2009-2014
-	www.smartfoxserver.com
+	(c) gotoAndPlay  2009-2016
+	- www.smartfoxserver.com -
 -->
 
 <coreSettings>
@@ -17,8 +17,8 @@
 	
 	<!-- Editable settings -->
 	
-	<!-- Max size of incoming packet -->
-	<maxIncomingRequestSize>1000000</maxIncomingRequestSize>
+	<!-- Max size of incoming packet, in bytes -->
+	<maxIncomingRequestSize>500000</maxIncomingRequestSize>
 	
 	<!-- Max Size for read buffer -->
 	<maxReadBufferSize>1024</maxReadBufferSize>
@@ -27,7 +27,7 @@
 	<maxWriteBufferSize>32768</maxWriteBufferSize>
 	
 	<!-- Session Queue Size -->
-	<sessionPacketQueueSize>160</sessionPacketQueueSize>
+	<sessionPacketQueueSize>150</sessionPacketQueueSize>
 	
 	<!-- Thread Pool Size of the 3 main stages of the Bitswarm Engine -->
 	<socketAcceptorThreadPoolSize>1</socketAcceptorThreadPoolSize>

data/lib/rubyfox/server/data/config/server.xml

@@ -32,6 +32,7 @@
     <allowedRemoteAddresses>
     </allowedRemoteAddresses>
     <adminTcpPort>9933</adminTcpPort>
+    <useEncryption>false</useEncryption>
   </remoteAdmin>
   <bannedUserManager>
     <isAutoRemove>true</isAutoRemove>
@@ -55,7 +56,7 @@
   </webServer>
   <webSocket>
     <isActive>false</isActive>
-    <bindAddress>127.0.0.1</bindAddress>
+    <bindAddress>0.0.0.0</bindAddress>
     <tcpPort>8888</tcpPort>
 	<sslPort>8843</sslPort>
 	<isSSL>false</isSSL>
@@ -75,7 +76,7 @@
  <systemThreadPoolSettings>
    <name>Sys</name>
    <coreThreads>4</coreThreads>
-   <backupThreads>8</backupThreads>
+   <backupThreads>16</backupThreads>
    <maxBackups>16</maxBackups>
    <queueSizeTriggeringBackup>100</queueSizeTriggeringBackup>
    <secondsTriggeringBackup>50</secondsTriggeringBackup>
@@ -87,7 +88,7 @@
  <extensionThreadPoolSettings>
    <name>Ext</name>
    <coreThreads>4</coreThreads>
-   <backupThreads>8</backupThreads>
+   <backupThreads>16</backupThreads>
    <maxBackups>16</maxBackups>
    <queueSizeTriggeringBackup>100</queueSizeTriggeringBackup>
    <secondsTriggeringBackup>50</secondsTriggeringBackup>

data/lib/rubyfox/server/data/extensions/pyTest/Simple.py

@@ -0,0 +1,42 @@
+from com.smartfoxserver.v2.core import *
+from com.smartfoxserver.v2.exceptions import *
+from com.smartfoxserver.v2.entities import *
+from com.smartfoxserver.v2.entities.data import *
+from com.smartfoxserver.bitswarm.sessions import *
+from com.smartfoxserver.v2.api import *
+from com.smartfoxserver.v2.util import *
+
+from java.lang import Thread
+
+class ServerEventListener(ISFSEventListener):
+	def handleServerEvent(self, event):
+		trace("Event: " + event.toString())
+
+sfsEventListener = None
+VERSION = "1.0.1"
+
+def init():
+	global sfsEventListener
+	from java.io import *
+
+	sfsEventListener = ServerEventListener()
+	_base.addEventListener(SFSEventType.SERVER_READY, sfsEventListener)
+	
+	trace("Python extension started: ", _base, _sfsApi)
+	trace("Version: ", VERSION)
+	trace("Folder: ", _base.getCurrentFolder())
+
+def destroy():
+	_base.removeEventListener(SFSEventType.SERVER_READY, sfsEventListener)
+	trace("Python extension destroyed: ", _base)
+	
+def handleClientRequest(cmd, sender, params):
+	trace("Request: ", cmd, sender, params)
+	
+	if cmd == "hello":
+		response = SFSObject()
+		response.putUtfString("res", "Hello to you, " + sender.getName())	
+		_base.send("hello", response, sender)
+	
+	
+