added OVERLOADS and HTML support

Author: mrRay

VVOSCQueryProtocol/VVOSCQueryConstants.h

@@ -40,6 +40,8 @@ extern NSString * kVVOSCQ_OptAttr_Range_Vals;	//	VALS
 extern NSString * kVVOSCQ_OptAttr_Clipmode;	//	CLIPMODE
 extern NSString * kVVOSCQ_OptAttr_Unit;		//	UNIT
 extern NSString * kVVOSCQ_OptAttr_Critical;	//	CRITICAL
+extern NSString * kVVOSCQ_OptAttr_Overloads;	//	OVERLOADS
+extern NSString * kVVOSCQ_OptAttr_HTML;	//	HTML
 
 /*		most OSC queries are "recursive" in the sense that they're going to return a full tree of 
 OSC nodes, gathered recursively.  really, the only queries that aren't recursive are queries 

VVOSCQueryProtocol/VVOSCQueryConstants.m

@@ -29,6 +29,8 @@
 NSString * kVVOSCQ_OptAttr_Clipmode = @"CLIPMODE";
 NSString * kVVOSCQ_OptAttr_Unit = @"UNIT";
 NSString * kVVOSCQ_OptAttr_Critical = @"CRITICAL";
+NSString * kVVOSCQ_OptAttr_Overloads = @"OVERLOADS";
+NSString * kVVOSCQ_OptAttr_HTML = @"HTML";
 
 
 NSArray<NSString*> * kVVOSCQ_NonRecursiveAttrs = nil;
@@ -68,14 +70,19 @@ @implementation VVOSCQueryConstants
 
 + (void) initialize	{
 	kVVOSCQ_NonRecursiveAttrs = @[
-		kVVOSCQ_OptAttr_Tags,
+		kVVOSCQ_ReqAttr_Desc,
 		kVVOSCQ_ReqAttr_Type,
+		kVVOSCQ_ReqAttr_HostInfo,
+		kVVOSCQ_OptAttr_Tags,
+		kVVOSCQ_OptAttr_Ext_Type,
 		kVVOSCQ_OptAttr_Access,
 		kVVOSCQ_OptAttr_Value,
 		kVVOSCQ_OptAttr_Range,
 		kVVOSCQ_OptAttr_Clipmode,
 		kVVOSCQ_OptAttr_Unit,
-		kVVOSCQ_OptAttr_Critical
+		kVVOSCQ_OptAttr_Critical,
+		kVVOSCQ_OptAttr_Overloads,
+		kVVOSCQ_OptAttr_HTML
 	];
 }
 

VVOSCQueryProtocol/VVOSCQueryReply.h

@@ -32,7 +32,8 @@
 	range:(NSArray *)inRangeArray
 	clipmode:(NSArray *)inClipmodeArray	//	nil by default.  if non-nil, must be an array consisting only of instances of the kVVOSCQueryNodeClipMode* constants above.
 	units:(NSArray *)inUnitsArray
-	critical:(BOOL)inCritical;	//	NO by default.  if YES, try to use a TCP connection to send data to this node.
+	critical:(BOOL)inCritical	//	NO by default.  if YES, try to use a TCP connection to send data to this node.
+	overloads:(NSArray*)inOverloadsArray;
 #else
 + (NSDictionary *) jsonObjectWithPath:(NSString *)inFullPath	//	full path to this node in the OSC address space
 	contents:(NSArray*)inContents	//	subnodes (may be a hierarchy)
@@ -45,7 +46,8 @@
 	range:(NSArray *)inRangeArray
 	clipmode:(NSArray *)inClipmodeArray	//	nil by default.  if non-nil, must be an array consisting only of instances of the kVVOSCQueryNodeClipMode* constants above.
 	units:(NSArray *)inUnitsArray
-	critical:(BOOL)inCritical;	//	NO by default.  if YES, try to use a TCP connection to send data to this node.
+	critical:(BOOL)inCritical	//	NO by default.  if YES, try to use a TCP connection to send data to this node.
+	overloads:(NSArray*)inOverloadsArray;
 #endif
 - (instancetype) initWithJSONObject:(NSDictionary *)jo;
 - (instancetype) initWithErrorCode:(int)ec;

VVOSCQueryProtocol/VVOSCQueryReply.m

@@ -17,7 +17,8 @@ + (NSDictionary *) jsonObjectWithPath:(NSString *)inFullPath
 range:(NSArray *)inRangeArray
 clipmode:(NSArray *)inClipmodeArray
 units:(NSArray *)inUnitsArray
-critical:(BOOL)inCritical	{
+critical:(BOOL)inCritical
+overloads:(NSArray *)inOverloadsArray	{
 	NSMutableDictionary		*returnMe = [NSMutableDictionary dictionaryWithCapacity:0];
 	if (inFullPath != nil)
 		[returnMe setObject:inFullPath forKey:kVVOSCQ_ReqAttr_Path];
@@ -45,6 +46,8 @@ + (NSDictionary *) jsonObjectWithPath:(NSString *)inFullPath
 		[returnMe setObject:inUnitsArray forKey:kVVOSCQ_OptAttr_Unit];
 	if (inCritical)
 		[returnMe setObject:[NSNumber numberWithBool:inCritical] forKey:kVVOSCQ_OptAttr_Critical];
+	if (inOverloadsArray)
+		[returnMe setObject:inOverloadsArray forKey:kVVOSCQ_OptAttr_Overloads];
 	return returnMe;
 }
 + (void) initialize	{

VVOSCQueryProtocol/VVOSCQueryServer.h

@@ -42,6 +42,7 @@
 @property (readonly) int webServerPort;
 @property (retain) NSString * name;
 @property (retain) NSString * bonjourName;
+@property (retain,setter=setHTMLDirectory:) NSString * htmlDirectory;
 #if __has_feature(objc_arc)
 @property (weak) id<VVOSCQueryServerDelegate> delegate;
 #else

VVOSCQueryProtocol/VVOSCQueryServer.mm

@@ -2,7 +2,7 @@
 #import <SystemConfiguration/SystemConfiguration.h>
 #import <VVOSCQueryProtocol/VVOSCQuery.h>
 #import <VVOSCQueryProtocol/VVOSCQueryReply.h>
-
+#import "NSStringAdditions.h"
 #include "WSPPServer.hpp"
 
 
@@ -43,21 +43,42 @@ - (instancetype) init	{
 				NSArray				*queryItems = [urlComponents queryItems];
 				NSMutableDictionary	*urlParams = [[NSMutableDictionary alloc] init];
 				BOOL				hasHostInfoQuery = NO;
+				BOOL				isHTMLQuery = NO;
 				for (NSURLQueryItem *queryItem in queryItems)	{
 					NSString	*tmpKey = [queryItem name];
 					if (tmpKey == nil)
 						continue;
 					if ([tmpKey isEqualToString:kVVOSCQ_ReqAttr_HostInfo])
 						hasHostInfoQuery = YES;
+					else if ([tmpKey isEqualToString:kVVOSCQ_OptAttr_HTML])
+						isHTMLQuery = YES;
 					id			tmpVal = [queryItem value];
 					if (tmpVal == nil)
 						tmpVal = [NSNull null];
 					[urlParams setObject:tmpVal forKey:tmpKey];
 				}
+				
+				//	if it's an HTML query, return a false along with the path of the resource to serve- we don't want to return a query reply, we want to serve a file.  this is the only time the server returns a false reply (the client returns a false reply under different circumstances)
+				if (isHTMLQuery)	{
+					NSString		*basePath = [self htmlDirectory];
+					if (basePath != nil)
+						basePath = [basePath stringByDeletingLastAndAddingFirstSlash];
+					NSString		*frontPath = [urlComponents path];
+					NSString		*fullPath = nil;
+					if (basePath == nil)
+						fullPath = frontPath;
+					else
+						fullPath = [NSString stringWithFormat:@"%@%@",basePath,frontPath];
+					
+					return WSPPQueryReply(false, std::string([fullPath UTF8String]));
+				}
+				
 				NSArray				*urlParamKeys = [urlParams allKeys];
 				//	if the URL was querying a specific key, the query isn't looking for a recursive reply...
 				BOOL			isRecursive = YES;
-				if (urlParamKeys!=nil && [urlParamKeys firstObjectCommonWithArray:kVVOSCQ_NonRecursiveAttrs]!=nil)
+				if (hasHostInfoQuery || isHTMLQuery)
+					isRecursive = NO;
+				else if (urlParamKeys!=nil && [urlParamKeys firstObjectCommonWithArray:kVVOSCQ_NonRecursiveAttrs]!=nil)
 					isRecursive = NO;
 
 				//	make an VVOSCQuery that describes this HTTP request
@@ -298,7 +319,7 @@ - (void) setBonjourName:(NSString *)n	{
 - (NSString *) bonjourName	{
 	return bonjourName;
 }
-
+@synthesize htmlDirectory;
 - (void) _resetBonjourService	{
 	//NSLog(@"%s",__func__);
 	if (bonjourService != nil)	{

VVOSCQueryProtocol/WSPPQueryReply.hpp

@@ -12,7 +12,7 @@ class WSPPQueryReply	{
 	WSPPQueryReply() {}
 	WSPPQueryReply(const std::string & rs) : replyString(rs), replyCode(-1), performReply(true) {}
 	WSPPQueryReply(const int & rc) : replyString(""), replyCode(rc), performReply(true) {}
-	WSPPQueryReply(const bool & pr) : replyString(""), replyCode(-1), performReply(pr) {}
+	WSPPQueryReply(const bool & pr, const std::string & rs="") : replyString(rs), replyCode(-1), performReply(pr) {}
 	~WSPPQueryReply() {}
 
 	const std::string & getReplyString() const	{	return replyString;	}

VVOSCQueryProtocol/WSPPServer.cpp

@@ -2,6 +2,9 @@
 #include "VVOSCQueryStringUtilities.hpp"
 #include "rapidjson/document.h"
 //#include <websocketpp/connection.hpp>
+#include <fstream>
+#include <iostream>
+#include <streambuf>
 
 
 WSPPServer::WSPPServer()	{
@@ -27,25 +30,78 @@ void WSPPServer::set_http_callback(HTTPCallback inCallback)	{
 	if (server != nullptr)	{
 		//	pass a block to the websocketpp backend that will extract the URI from the connection nad pass it to the provided callback, which will return an WSPPQueryReply object that will be used to assemble a reply
 		server->set_http_handler([=](connection_hdl hdl)	{
+			//cout << __PRETTY_FUNCTION__ << endl;
+			
 			lib::error_code			ec;
 			server_t::connection_ptr		conn = server->get_con_from_hdl(hdl, ec);
 			//	change some headers...
-			conn->replace_header("Content-Type", "application/json; charset=utf-8");
-			conn->replace_header("Connection", "close");
+			//conn->replace_header("Content-Type", "application/json; charset=utf-8");
+			//conn->replace_header("Connection", "close");
 			//	pull the full URI out, this is what we're going to pass to the callback
 			uri_ptr				uri = conn->get_uri();
 			const string		&fullURI = uri->str();
 			//	use the provided callback to get a reply for the URI
 			const WSPPQueryReply		&tmpReply = (httpCallback==nullptr) ? WSPPQueryReply(400) : httpCallback(fullURI);
 			//	use the WSPPQueryReply to reply to the http request
 			try	{
-				if (tmpReply.getReplyCode()<0)	{
+				if (!tmpReply.getPerformReply())	{
+					//cout << "should be vending a file here " << __PRETTY_FUNCTION__ << endl;
+					
+					
+					
+					//	get the resource from the query reply
+					const std::string		&tmpResource = tmpReply.getReplyString();
+					//cout << "file i should be vending is " << tmpResource << endl;
+					
+					std::ifstream		file;
+					std::string			response;
+					
+					file.open(tmpResource.c_str(), std::ios::in);
+					if (!file)	{
+						conn->set_status(websocketpp::http::status_code::not_found);
+						//conn->set_status((http::status_code::value)404);
+						
+						//	change some headers...
+						//conn->replace_header("Content-Type", "application/json; charset=utf-8");
+						conn->replace_header("Connection", "close");
+					
+					}
+					else	{
+						file.seekg(0, std::ios::end);
+						response.reserve(file.tellg());
+						file.seekg(0, std::ios::beg);
+						
+						response.assign((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
+						conn->set_body(response);
+						conn->set_status(websocketpp::http::status_code::ok);
+						conn->replace_header("Connection", "close");
+					}
+					
+					
+					
+					
+					//	change some headers...
+					//conn->replace_header("Content-Type", "application/json; charset=utf-8");
+					//conn->replace_header("Connection", "close");
+				}
+				else if (tmpReply.getReplyCode()<0)	{
+					//cout << "\treply code is < 0..." << endl;
+					
 					conn->set_body(std::move(tmpReply.getReplyString()));
 					conn->set_status(websocketpp::http::status_code::ok);
+					
+					//	change some headers...
+					conn->replace_header("Content-Type", "application/json; charset=utf-8");
+					conn->replace_header("Connection", "close");
 				}
 				else	{
+					//cout << "\treturning a status code" << endl;
+					
 					//conn->set_status(websocketpp::http::status_code::not_found);
 					conn->set_status((http::status_code::value)tmpReply.getReplyCode());
+					//	change some headers...
+					conn->replace_header("Content-Type", "application/json; charset=utf-8");
+					conn->replace_header("Connection", "close");
 				}
 			}
 			catch (const websocketpp::exception& e)	{