rubyfox-server 2.12.5.1 → 2.13.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9da6b1476517c9814bda131e3aaf18875baba7e4
-  data.tar.gz: 550d639832f38e5ff0e683576eae9696b89990f1
+  metadata.gz: '0802a76d4ecd0d4c60e5f27f41fe0e258837a032'
+  data.tar.gz: bbad872e5dec906868072213bb80d4df5173a4ef
 SHA512:
-  metadata.gz: 1a157bc52205ac0cee7767202a138bb14619446bdda72fd1be4f68e7b5de3b60dd43c2091a29aaf677d788ae932d54707345e5699dae18413b91a95c7b1f6124
-  data.tar.gz: 3b9a1404d55aaa0557dc4b958bbfd024f6c21c527013d586845e6f36c7945482dd1991db19ff1c8f2b770033b291c4e6cff10c7e84039edf86a559cf66fccbad
+  metadata.gz: ee74e8b5372128029ddcd24ccc5132a096e4c43564d8b527d5a0fc9e08d4edf00c1a41a4db0813b0d027087df5e10fbdebe9a3d9529da472b9a8ab3ae42dd90e
+  data.tar.gz: fc4666030a72b2e79923da5a6508693f3ed69f0fe5aad0b3d1b4bba736faf0ab7cd7c360936eea864ad6f69427f5627fecf165387da9d942e007489e1f188290

data/lib/rubyfox/server/data/config/admin/descriptors/config_room.txt

@@ -258,7 +258,7 @@
 {
 	"name":"extension.name",
 	"label":"Name",
-	"tooltip":"The name of the Extension to be plugged at Room level; the '__lib__' folder is also listed, in case one or more Extension jar files are deployed there for specific class-loading purposes\n\nIf a new Extension is deployed on the server while editing the Zone settings, cancel and re-edit the zone to update this list",
+	"tooltip":"The name of the Extension to be plugged at Room level; the '__lib__' folder is also listed, in case one or more Java Extensions are deployed there for specific class-loading purposes\n\nIf a new Extension is deployed on the server while editing the Zone settings, cancel and re-edit the zone to update this list",
 	"category":"Room Extension",
 	"type":"ComboBox",
 	"value":"{$BasicValue=extension.name}",
@@ -281,7 +281,7 @@
 	"trigger":true,
 	"componentParams":
 	{
-		"dataProvider":"JAVA,PYTHON"
+		"dataProvider":"JAVA,JAVASCRIPT,PYTHON"
 	}
 },
 
@@ -289,7 +289,7 @@
 {
 	"name":"extension.file",
 	"label":"Main class",
-	"tooltip":"The fully qualified name of the main Extension class; this class must extend either SFSExtension or BaseSFSExtension classes",
+	"tooltip":"The fully qualified name of the main Extension class; Java Extensions must extend either SFSExtension or BaseSFSExtension classes",
 	"category":"Room Extension",
 	"type":"ComboBox",
 	"value":"{$BasicValue=extension.file}",
@@ -303,7 +303,7 @@
 {
 	"name":"extension.filterClass",
 	"label":"Use naming convention",
-	"tooltip":"Filter the 'Main class' box showing the classes with names ending with the word 'Extension' only (for example 'com.example.MyJavaExtension' or 'MyPythonExtension.py')\n\n<b>NOTE</b>: this setting is used to improve the Admin Tool usage only, so it doesn't affect the server configuration in any way",
+	"tooltip":"Filter the 'Main class' box showing the classes with names ending with the word 'Extension' only (for example 'com.example.MyJavaExtension' or 'MyJavaScriptExtension.js')\n\n<b>NOTE</b>: this setting is used to improve the Admin Tool usage only, so it doesn't affect the server configuration in any way",
 	"category":"Room Extension",
 	"type":"CheckBox",
 	"value":false,

data/lib/rubyfox/server/data/config/admin/descriptors/config_server.txt

@@ -281,98 +281,6 @@
 	}
 },
 
-//-------------------------------------------
-// HTML WEBSOCKETS
-//-------------------------------------------
-
-// ACTIVE
-{
-	"name":"webSocket.isActive",
-	"label":"Activate WebSocket protocol",
-	"tooltip":"Enable/disable the HTML5 WebSockets protocol support",
-	"category":"HTML5 WebSockets",
-	"type":"CheckBox",
-	"value":{$BasicValue=webSocket.isActive}
-},
-
-// LISTENER ADDRESS
-{
-	"name":"webSocket.bindAddress",
-	"label":"WebSocket listener address",
-	"tooltip":"IP address used for WebSocket communication",
-	"category":"HTML5 WebSockets",
-	"type":"ComboBox",
-	"value":"{$BasicValue=webSocket.bindAddress}",
-	"componentParams":
-	{
-		"dataProvider":"{$BasicValue=adminHelper.availableSocketAddresses}"
-	}
-},
-
-// LISTENER TCP PORT
-{
-	"name":"webSocket.tcpPort",
-	"label":"WebSocket listener port",
-	"tooltip":"TCP port used for WebSocket communication",
-	"category":"HTML5 WebSockets",
-	"type":"NumericStepper",
-	"value":{$BasicValue=webSocket.tcpPort},
-	"componentParams":
-	{
-		"minimum":0,
-		"maximum":65535
-	}
-},
-
-// LISTENER SSL PORT
-{
-	"name":"webSocket.sslPort",
-	"label":"WebSocket Secure listener port",
-	"tooltip":"SSL port used for encrypted WebSocket communication",
-	"category":"HTML5 WebSockets",
-	"type":"NumericStepper",
-	"value":{$BasicValue=webSocket.sslPort},
-	"componentParams":
-	{
-		"minimum":0,
-		"maximum":65535
-	}
-},
-
-// USE SSL
-{
-	"name":"webSocket.isSSL",
-	"label":"Use WSS protocol",
-	"tooltip":"Enable/disable the SSL encryption of WebSockets protocol",
-	"category":"HTML5 WebSockets",
-	"type":"CheckBox",
-	"value":{$BasicValue=webSocket.isSSL}
-},
-
-// KEYSTORE FILE
-{
-	"name":"webSocket.keyStoreFile",
-	"label":"KeyStore file",
-	"tooltip":"Location of the repository of security certificates to be used when WSS is enabled",
-	"category":"HTML5 WebSockets",
-	"type":"TextInput",
-	"value":"{$BasicValue=webSocket.keyStoreFile}"
-},
-
-// KEYSTORE PASSWORD
-{
-	"name":"webSocket.keyStorePassword",
-	"label":"KeyStore password",
-	"tooltip":"Password of the KeyStore repository",
-	"category":"HTML5 WebSockets",
-	"type":"TextInput",
-	"value":"{$BasicValue=webSocket.keyStorePassword}",
-	"componentParams":
-	{
-		"displayAsPassword":true
-	}
-},
-
 //-------------------------------------------
 // WEB SERVER
 //-------------------------------------------
@@ -397,11 +305,11 @@
 	"value":{$BasicValue=webServer.enableHttp}
 },
 
-// HTTP PORT
+// HTTP/WS PORT
 {
 	"name":"webServer.httpPort",
-	"label":"HTTP port",
-	"tooltip":"TCP port used by the embedded web server for HTTP communication",
+	"label":"HTTP/WS port",
+	"tooltip":"TCP port used by the embedded web server for HTTP and WS communication",
 	"category":"Web server",
 	"type":"NumericStepper",
 	"value":{$BasicValue=webServer.httpPort},
@@ -422,11 +330,11 @@
 	"value":{$BasicValue=webServer.enableHttps}
 },
 
-// HTTPS PORT
+// HTTPS/WSS PORT
 {
 	"name":"webServer.httpsPort",
-	"label":"HTTPS port",
-	"tooltip":"TCP port used by the embedded web server for HTTPS communication",
+	"label":"HTTPS/WSS port",
+	"tooltip":"TCP port used by the embedded web server for HTTPS and WSS communication",
 	"category":"Web server",
 	"type":"NumericStepper",
 	"value":{$BasicValue=webServer.httpsPort},
@@ -437,6 +345,26 @@
 	}
 },
 
+// ENABLE WS/WSS COMMUNICATION
+{
+	"name":"webServer.isWSActive",
+	"label":"Enable WS/WSS",
+	"tooltip":"Enable/disable the WebSocket communication (both WS and WSS) through the HTTP/S modules; requires one of the two modules (or both) to be active",
+	"category":"Web server",
+	"type":"CheckBox",
+	"value":{$BasicValue=webServer.isWSActive}
+},
+
+// USE WS BINARY PROTOCOL
+{
+	"name":"webServer.useWSBinaryProtocol",
+	"label":"Use WS binary protocol",
+	"tooltip":"Use binary protocol for WebSocket communication; this must match the specs of the client API",
+	"category":"Web server",
+	"type":"CheckBox",
+	"value":{$BasicValue=webServer.useWSBinaryProtocol}
+},
+
 // BLUEBOX POLLING TIMEOUT
 {
 	"name":"webServer.blueBoxPollingTimeout",
@@ -894,6 +822,16 @@
 	"value":{$BasicValue=systemThreadPoolSettings.logActivity}
 },
 
+// PRE START CORE THREADS
+{
+	"name":"systemThreadPoolSettings.prestartAllCoreThreads",
+	"label":"Prestart all core threads",
+	"tooltip":"Immediately instantiate all core threads. When turned off threads will be created lazily, when actual work is submitted",
+	"category":"Thread pools",
+	"type":"CheckBox",
+	"value":{$BasicValue=systemThreadPoolSettings.prestartAllCoreThreads}
+},
+
 //-------------------------------------------
 
 // EXTENSION CORE THREADS
@@ -1016,6 +954,16 @@
 	"value":{$BasicValue=extensionThreadPoolSettings.logActivity}
 },
 
+// PRE START CORE THREADS
+{
+	"name":"extensionThreadPoolSettings.prestartAllCoreThreads",
+	"label":"Prestart all core threads",
+	"tooltip":"Immediately instantiate all core threads. When turned off threads will be created lazily, when actual work is submitted",
+	"category":"Thread pools",
+	"type":"CheckBox",
+	"value":{$BasicValue=extensionThreadPoolSettings.prestartAllCoreThreads}
+},
+
 //-------------------------------------------
 // JVM SETTINGS
 //-------------------------------------------

data/lib/rubyfox/server/data/config/admin/descriptors/config_zone.txt

@@ -689,7 +689,7 @@
 {
 	"name":"extension.name",
 	"label":"Name",
-	"tooltip":"The name of the Extension to be plugged at Zone level; the '__lib__' folder is also listed, in case one or more Extension jar files are deployed there for specific class-loading purposes\n\nIf a new Extension is deployed on the server while editing the Zone settings, cancel and re-edit the Zone to update this list",
+	"tooltip":"The name of the Extension to be plugged at Zone level; the '__lib__' folder is also listed, in case one or more Java Extensions are deployed there for specific class-loading purposes\n\nIf a new Extension is deployed on the server while editing the Zone settings, cancel and re-edit the Zone to update this list",
 	"category":"Zone Extension",
 	"type":"ComboBox",
 	"value":"{$BasicValue=extension.name}",
@@ -712,7 +712,7 @@
 	"trigger":true,
 	"componentParams":
 	{
-		"dataProvider":"JAVA,PYTHON"
+		"dataProvider":"JAVA,JAVASCRIPT,PYTHON"
 	}
 },
 
@@ -720,7 +720,7 @@
 {
 	"name":"extension.file",
 	"label":"Main class",
-	"tooltip":"The fully qualified name of main Extension class; this class must extend either SFSExtension or BaseSFSExtension classes",
+	"tooltip":"The fully qualified name of main Extension class; Java Extensions must extend either SFSExtension or BaseSFSExtension classes",
 	"category":"Zone Extension",
 	"type":"ComboBox",
 	"value":"{$BasicValue=extension.file}",

data/lib/rubyfox/server/data/config/admin/descriptors/runtime_user.txt

@@ -428,6 +428,13 @@
 				"dataProvider":"BOOLEAN,INT,DOUBLE,STRING,OBJECT,ARRAY"
 			}
 		},
+		{
+			"name":"private",
+			"label":"Private",
+			"tooltip":"Private variable updates are sent to the owner's client only",
+			"type":"CheckBox",
+			"value":false
+		},
 		{
 			"name":"hidden",
 			"label":"Hidden",
@@ -444,7 +451,7 @@
 			"validator":"notNull"
 		}
 	],
-	"listValues":{$List=variables, instance=user, fields=name;type;hidden;value},
+	"listValues":{$List=variables, instance=user, fields=name;type;private;hidden;value},
 	"edit":false
 },
 

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

@@ -1,8 +1,8 @@
 <!--
-	SmartFoxServer 2X v 2.12.x
+	SmartFoxServer 2X v 2.13.x
 	<<< Core Configuration >>>
 	
-	(c) gotoAndPlay  2009-2016
+	(c) gotoAndPlay  2009-2017
 	- www.smartfoxserver.com -
 -->
 

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

@@ -53,16 +53,9 @@
     <isActive>true</isActive>
     <blueBoxPollingTimeout>26</blueBoxPollingTimeout>
     <blueBoxMsgQueueSize>40</blueBoxMsgQueueSize>
+	<isWSActive>true</isWSActive>
+	<useWSBinaryProtocol>true</useWSBinaryProtocol>
   </webServer>
-  <webSocket>
-    <isActive>false</isActive>
-    <bindAddress>0.0.0.0</bindAddress>
-    <tcpPort>8888</tcpPort>
-	<sslPort>8843</sslPort>
-	<isSSL>false</isSSL>
-    <keyStoreFile>config/keystore.jks</keyStoreFile>
-    <keyStorePassword>password</keyStorePassword>
-  </webSocket>
   <analytics>
     <isActive>false</isActive>
     <runOnDay>[everyday]</runOnDay>
@@ -77,7 +70,7 @@
    <name>Sys</name>
    <coreThreads>4</coreThreads>
    <backupThreads>16</backupThreads>
-   <maxBackups>16</maxBackups>
+   <maxBackups>64</maxBackups>
    <queueSizeTriggeringBackup>100</queueSizeTriggeringBackup>
    <secondsTriggeringBackup>50</secondsTriggeringBackup>
    <backupThreadsExpiry>3600</backupThreadsExpiry>
@@ -89,7 +82,7 @@
    <name>Ext</name>
    <coreThreads>4</coreThreads>
    <backupThreads>16</backupThreads>
-   <maxBackups>16</maxBackups>
+   <maxBackups>64</maxBackups>
    <queueSizeTriggeringBackup>100</queueSizeTriggeringBackup>
    <secondsTriggeringBackup>50</secondsTriggeringBackup>
    <backupThreadsExpiry>3600</backupThreadsExpiry>
@@ -105,4 +98,4 @@
   <licenseEmails></licenseEmails>
   <ghostHunterEnabled>true</ghostHunterEnabled>
   <statsExtraLoggingEnabled>true</statsExtraLoggingEnabled>
-</serverSettings>
+</serverSettings>

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

@@ -13,7 +13,7 @@ class ServerEventListener(ISFSEventListener):
 		trace("Event: " + event.toString())
 
 sfsEventListener = None
-VERSION = "1.0.1"
+VERSION = "1.0.0"
 
 def init():
 	global sfsEventListener

data/lib/rubyfox/server/data/lib/jetty/etc/jetty.xml

@@ -135,6 +135,43 @@
 	    </Set>
 	  </New>
 	</Set>
+	
+	
+    <!-- =========================================================== -->
+    <!-- configure rewrite handler                                   -->
+    <!-- =========================================================== -->
+    <Call name="insertHandler">
+      <Arg>
+        <New class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
+  			<Set name="rewriteRequestURI"><Property name="jetty.rewrite.rewriteRequestURI" deprecated="rewrite.rewriteRequestURI" default="true"/></Set>
+  			<Set name="rewritePathInfo"><Property name="jetty.rewrite.rewritePathInfo" deprecated="rewrite.rewritePathInfo" default="false"/></Set>
+  			<Set name="originalPathAttribute"><Property name="jetty.rewrite.originalPathAttribute" deprecated="rewrite.originalPathAttribute" default="requestedPath"/></Set>
+
+			<!-- Set DispatcherTypes  -->
+	  	<Set name="dispatcherTypes">
+	  	  <Array type="javax.servlet.DispatcherType">
+	  	    <Item><Call class="javax.servlet.DispatcherType" name="valueOf"><Arg>REQUEST</Arg></Call></Item>
+	  	    <Item><Call class="javax.servlet.DispatcherType" name="valueOf"><Arg>ASYNC</Arg></Call></Item>
+	  	  </Array>
+	  	</Set>
+
+          <Get id="Rewrite" name="ruleContainer"/>
+
+  	<!-- see rewrite-compactpath.xml for example how to add a rule -->
+		<Call name="addRule">
+	        <Arg>
+	          <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
+	            <Set name="pattern">/websocket/*</Set>
+	            <Set name="replacement">/BlueBox/websocket/</Set>
+	          </New>
+	        </Arg>
+	      </Call>
+
+        </New>
+      </Arg>
+    </Call>
+	
+	
 	<Ref refid="RequestLog">
 	  <Set name="requestLog">
 	    <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">