Updated all examples to remove protocol, clean up, and test

Author: robotconscience

example_client_blob/src/ofApp.cpp

@@ -2,6 +2,7 @@
 
 //--------------------------------------------------------------
 void ofApp::setup(){
+    // connect to either the "server blob" or "server blob video" example!
     client.connect("localhost", 9093);
 
     client.addListener(this);
@@ -57,11 +58,14 @@ void ofApp::onIdle( ofxLibwebsockets::Event& args ){
 void ofApp::onMessage( ofxLibwebsockets::Event& args ){
     if ( locked ) return;
     // need to load this next frame!
-    //cout << args.isBinary << ":" << args.size << endl;
-    buff.clear();
-    buff.set(args.data.getBinaryBuffer(), args.data.size());
-    locked = true;
-    needToLoad = true;
+    if ( args.isBinary ){
+        buff.clear();
+        buff.set(args.data.getBinaryBuffer(), args.data.size());
+        locked = true;
+        needToLoad = true;
+    } else {
+        // got a string message
+    }
 }
 
 //--------------------------------------------------------------

example_client_hello_world/example_client_hello_world.xcodeproj/project.pbxproj

@@ -2,9 +2,33 @@
 
 //--------------------------------------------------------------
 void ofApp::setup(){
+    ofBackground(0);
     ofSetLogLevel(OF_LOG_VERBOSE);
-    client.connect("echo.websocket.org");
-    //    client.connect("echo.websocket.org", true); // optionally use SSL
+    // basic connection:
+    // client.connect("echo.websocket.org");
+    // OR optionally use SSL
+    // client.connect("echo.websocket.org", true);
+    
+    // advanced: set keep-alive timeouts for events like
+    // loss of internet
+    
+    // 1 - get default options
+    ofxLibwebsockets::ClientOptions options = ofxLibwebsockets::defaultClientOptions();
+    
+    // 2 - set basic params
+    options.host = "echo.websocket.org";
+    
+    // 3 - set keep alive params
+    // BIG GOTCHA: on BSD systems, e.g. Mac OS X, these time params are system-wide
+    // ...so ka_time just says "check if alive when you want" instead of "check if
+    // alive after X seconds"
+    options.ka_time     = 1;
+//    options.ka_probes   = 1;
+//    options.ka_interval = 1;
+    
+    // 4 - connect
+    client.connect(options);
+    
     ofSetLogLevel(OF_LOG_ERROR);
 
     client.addListener(this);
@@ -17,6 +41,8 @@ void ofApp::update(){
 
 //--------------------------------------------------------------
 void ofApp::draw(){
+    ofDrawBitmapString("Type anywhere to send 'hello' to your server\nCheck the console for output!", 10,20);
+    ofDrawBitmapString(client.isConnected() ? "Client is connected" : "Client disconnected :(", 10,50);
 }
 
 //--------------------------------------------------------------

example_client_hello_world/src/ofApp.cpp

@@ -2,11 +2,7 @@
 
 //--------------------------------------------------------------
 void ofApp::setup(){
-   
-    ofxLibwebsockets::ClientOptions options = ofxLibwebsockets::defaultClientOptions();
-    options.port = 9092; 
-    options.protocol = "of-protocol";
-    client.connect( options );
+    client.connect( "localhost", 9092 );
     bConnected = false;
 
     client.addListener(this);

example_client_sharedcanvas/src/ofApp.cpp

@@ -4,7 +4,7 @@ ofPixels sendPixels;
 
 //--------------------------------------------------------------
 void ofApp::setup(){
-    ofSetVerticalSync(true);
+    ofSetFrameRate(60);
 
     // setup client @ port 9093
     client.connect("localhost", 9093);

example_particles_client/src/ofApp.cpp

@@ -125,10 +125,10 @@ function onMessage( messageEvent ){
 function setupSocket(){
 	// setup!
 	if (BrowserDetect.browser == "Firefox") {
-		socket = new MozWebSocket( get_appropriate_ws_url(), "of-protocol" );
+		socket = new MozWebSocket( get_appropriate_ws_url() );
 		socket.binaryType = "arraybuffer";
 	} else {
-		socket = new WebSocket( get_appropriate_ws_url(), "of-protocol");	
+		socket = new WebSocket( get_appropriate_ws_url());	
 		socket.binaryType = "arraybuffer";
 	}
 

example_server_binary_video/bin/data/web/js/main.js

@@ -17,7 +17,6 @@ void ofApp::setup(){
 
     ofxLibwebsockets::ServerOptions options = ofxLibwebsockets::defaultServerOptions();
     options.port = 9093;
-    options.protocol = "of-protocol";
     bool connected = server.setup( options );
 
     // this adds your app as a listener for the server

example_server_binary_video/src/ofApp.cpp

@@ -69,10 +69,10 @@ function onMessage( messageEvent ){
 function setupSocket(){
 	// setup!
 	if (BrowserDetect.browser == "Firefox") {
-		socket = new MozWebSocket( get_appropriate_ws_url(), "of-protocol" );
+		socket = new MozWebSocket( get_appropriate_ws_url());
 		socket.binaryType = "blob";
 	} else {
-        socket = new WebSocket( get_appropriate_ws_url(), "of-protocol");
+        socket = new WebSocket( get_appropriate_ws_url());
 		socket.binaryType = "blob";
 	}
 

example_server_blob/bin/data/web/js/main.js

@@ -21,8 +21,6 @@ void ofApp::setup(){
 
     ofxLibwebsockets::ServerOptions options = ofxLibwebsockets::defaultServerOptions();
     options.port = 9093;
-    options.protocol = "of-protocol";
-    options.bBinaryProtocol = true;
 
     bool connected = server.setup( options );
 
@@ -219,7 +217,14 @@ void ofApp::mouseMoved(int x, int y ){}
 void ofApp::mouseDragged(int x, int y, int button){}
 
 //-----------------------------------------------------------   ---
-void ofApp::mousePressed(int x, int y, int button){}
+void ofApp::mousePressed(int x, int y, int button){
+    string url = "http";
+    if ( server.usingSSL() ){
+        url += "s";
+    }
+    url += "://localhost:" + ofToString( server.getPort() );
+    ofLaunchBrowser(url);
+}
 
 //--------------------------------------------------------------
 void ofApp::mouseReleased(int x, int y, int button){}

example_server_blob/src/ofApp.cpp

@@ -1,20 +1,15 @@
 #include "ofApp.h"
 
+// quality of image: higher is more readable, lower is faster!
+int jpegquality = 100;
+
 //--------------------------------------------------------------
 void ofApp::setup(){
-    // setup a server with default options on port 9092
-    // - pass in true after port to set up with SSL
-    //bool connected = server.setup( 9092 );
-    
-    // Uncomment this to set up a server with a protocol
-    // Right now, clients created via libwebsockets that are connecting to servers
-    // made via libwebsockets seem to want a protocol. Hopefully this gets fixed, 
-    // but until now you have to do something like this:
-    
     //setup video grabber
     video.listDevices();
     bVideoSetup = video.initGrabber(640,480);
 
+    // setup a server with default options on port 9093
     ofxLibwebsockets::ServerOptions options = ofxLibwebsockets::defaultServerOptions();
     options.port = 9093;
     bool connected = server.setup( options );
@@ -42,7 +37,7 @@ void ofApp::update(){
         // the second param == quality. play with this to get a better framerate
         // you can also try resizing your image!
         //currentImage.resize(160, 120);
-        unsigned char * compressed = turbo.compress(currentImage,50,&size);
+        unsigned char * compressed = turbo.compress(currentImage,jpegquality,&size);
         server.sendBinary(compressed, size);
         free(compressed);
     }
@@ -59,6 +54,12 @@ void ofApp::draw(){
     }
     if ( bVideoSetup ) video.draw(0,0);
       ofDrawBitmapString(ofToString(ofGetFrameRate())+"fps", 10, 15);
+    
+    ofSetColor(255);
+    ofDrawBitmapString("WebSocket server setup at "+ofToString( server.getPort() ) + ( server.usingSSL() ? " with SSL" : " without SSL"), 10, 40);
+    
+    ofDrawBitmapString("Click anywhere to open up browser client", 10, 60);
+    ofDrawBitmapString("+/- changes image quality: "+ofToString(jpegquality), 10, 80);
 }
 
 //--------------------------------------------------------------
@@ -107,7 +108,13 @@ void ofApp::onBroadcast( ofxLibwebsockets::Event& args ){
 
 //--------------------------------------------------------------
 void ofApp::keyPressed(int key){
-
+    if ( key == '+'){
+        jpegquality ++;
+        jpegquality = jpegquality > 100 ? 100 : jpegquality;
+    } else if (key == '-'){
+        jpegquality--;
+        jpegquality = jpegquality < 0 ? 0 : jpegquality;
+    }
 }
 
 //--------------------------------------------------------------
@@ -127,7 +134,12 @@ void ofApp::mouseDragged(int x, int y, int button){
 
 //--------------------------------------------------------------
 void ofApp::mousePressed(int x, int y, int button){
-
+    string url = "http";
+    if ( server.usingSSL() ){
+        url += "s";
+    }
+    url += "://localhost:" + ofToString( server.getPort() );
+    ofLaunchBrowser(url);
 }
 
 //--------------------------------------------------------------