Merge change from branch imp (#10)

* new update

* implement function microgear.writeFeed()

* Update README.md

* Update README.th.md

* Update README.md

* Update README.md

Author: chavee

MicroGear.cpp

@@ -7,6 +7,8 @@ void (* cb_message)(char*, uint8_t*,unsigned int);
 void (* cb_present)(char*, uint8_t*,unsigned int);
 void (* cb_absent)(char*, uint8_t*,unsigned int);
 void (* cb_connected)(char*, uint8_t*,unsigned int);
+void (* cb_error)(char*, uint8_t*,unsigned int);
+void (* cb_info)(char*, uint8_t*,unsigned int);
 
 void msgCallback(char* topic, uint8_t* payload, unsigned int length) {
     /* remove /appid/ */
@@ -31,6 +33,18 @@ void msgCallback(char* topic, uint8_t* payload, unsigned int length) {
             if (mg) mg->resetEndpoint();
         }
     }
+    else if (*topic == '@') {
+        if (strcmp(topic,"@error")==0) {
+            if (cb_error)  {
+                cb_error("error",payload,length);
+            }
+        }
+        else if (strcmp(topic,"@info")==0) {
+            if (cb_info)  {
+                cb_info("info",payload,length);
+            }
+        }
+    }
     else if (cb_message) {
         cb_message(topic,payload,length);  
     }
@@ -100,18 +114,19 @@ void MicroGear::initEndpoint(Client *client, char* endpoint) {
         char pstr[100];
         int port = this->securemode?GEARAUTHSECUREPORT:GEARAUTHPORT;
 
-        client->connect(GEARAUTHHOST,port);
-        sprintf(pstr,"GET /api/endpoint/%s HTTP/1.1\r\n\r\n",this->gearkey);
-        client->write((const uint8_t *)pstr,strlen(pstr));
+        if(client->connect(GEARAUTHHOST,port)){
+			sprintf(pstr,"GET /api/endpoint/%s HTTP/1.1\r\n\r\n",this->gearkey);
+			client->write((const uint8_t *)pstr,strlen(pstr));
 
-        delay(1000);
-        getHTTPReply(client,pstr,200);
+			delay(1000);
+			getHTTPReply(client,pstr,200);
 
-        if (strlen(pstr)>6) {
-            strcpy(endpoint,pstr+6);
-            writeEEPROM(endpoint,EEPROM_ENDPOINTSOFFSET,MAXENDPOINTLENGTH);
-        }
-        client->stop();
+			if (strlen(pstr)>6) {
+				strcpy(endpoint,pstr+6);
+				writeEEPROM(endpoint,EEPROM_ENDPOINTSOFFSET,MAXENDPOINTLENGTH);
+			}
+			client->stop();
+		}
     }
 }
 
@@ -122,62 +137,63 @@ void MicroGear::syncTime(Client *client, unsigned long *bts) {
     int port = (this->securemode)?GEARAUTHSECUREPORT:GEARAUTHPORT;
 
     *bts = 0;
-    client->connect(GEARAUTHHOST,port);
-
-    if (this->securemode) {
-        WiFiClientSecure *clientsecure = (WiFiClientSecure *)(client);
-
-        // verify a certificate fingerprint against a fingerprint saved in eeprom
-        readEEPROM(tstr, EEPROM_CERTFINGERPRINT, FINGERPRINTSIZE);
-        #ifdef DEBUG_H
-            Serial.print("fingerprint loaded from eeprom : ");
-            Serial.println(tstr);
-        #endif
-        if (clientsecure->verify(tstr, GEARAUTHHOST)) {
-            #ifdef DEBUG_H
-                Serial.println("fingerprint matched");
-            #endif
-        }
-        else {
-            #ifdef DEBUG_H
-                Serial.println("fingerprint mismatched, going to update");
-            #endif
-            AuthClient::randomString(nonce,8);
-            sprintf(tstr,"GET /api/fingerprint/%s/%s HTTP/1.1\r\n\r\n",this->gearkey,nonce);
-            clientsecure->write((const uint8_t *)tstr,strlen(tstr));
-            delay(800);
-            getHTTPReply(clientsecure,tstr,200);
-            tstr[FINGERPRINTSIZE-1] = '\0';        // split fingerprint and signature
-            sprintf(hashkey,"%s&%s&%s",this->gearkey,this->gearsecret,nonce);
-            Sha1.initHmac((uint8_t*)hashkey,strlen(hashkey));
-            Sha1.HmacBase64(hash, tstr);
-            for (int i=0;i<HMACSIZE;i++)
-                if (hash[i]=='/') hash[i] = '_';
-
-            if(strcmp(hash,tstr+FINGERPRINTSIZE)==0) {
-                #ifdef DEBUG_H
-                    Serial.println("new fingerprint updated");
-                #endif
-                writeEEPROM(tstr, EEPROM_CERTFINGERPRINT, FINGERPRINTSIZE);
-            }
-            else {
-                #ifdef DEBUG_H
-                    Serial.println("fingerprint verification failed, abort");
-                #endif
-                clientsecure->stop();
-                delay(5000);
-                return;
-            }
-        }
-    }
-
-    strcpy(tstr,"GET /api/time HTTP/1.1\r\n\r\n");
-    client->write((const uint8_t *)tstr,strlen(tstr));
-
-    delay(1000);
-    getHTTPReply(client,tstr,200);
-    *bts = atol(tstr) - millis()/1000;
-    client->stop();
+    if(client->connect(GEARAUTHHOST,port)){
+
+		if (this->securemode) {
+			WiFiClientSecure *clientsecure = (WiFiClientSecure *)(client);
+
+			// verify a certificate fingerprint against a fingerprint saved in eeprom
+			readEEPROM(tstr, EEPROM_CERTFINGERPRINT, FINGERPRINTSIZE);
+			#ifdef DEBUG_H
+				Serial.print("fingerprint loaded from eeprom : ");
+				Serial.println(tstr);
+			#endif
+			if (clientsecure->verify(tstr, GEARAUTHHOST)) {
+				#ifdef DEBUG_H
+					Serial.println("fingerprint matched");
+				#endif
+			}
+			else {
+				#ifdef DEBUG_H
+					Serial.println("fingerprint mismatched, going to update");
+				#endif
+				AuthClient::randomString(nonce,8);
+				sprintf(tstr,"GET /api/fingerprint/%s/%s HTTP/1.1\r\n\r\n",this->gearkey,nonce);
+				clientsecure->write((const uint8_t *)tstr,strlen(tstr));
+				delay(800);
+				getHTTPReply(clientsecure,tstr,200);
+				tstr[FINGERPRINTSIZE-1] = '\0';        // split fingerprint and signature
+				sprintf(hashkey,"%s&%s&%s",this->gearkey,this->gearsecret,nonce);
+				Sha1.initHmac((uint8_t*)hashkey,strlen(hashkey));
+				Sha1.HmacBase64(hash, tstr);
+				for (int i=0;i<HMACSIZE;i++)
+					if (hash[i]=='/') hash[i] = '_';
+
+				if(strcmp(hash,tstr+FINGERPRINTSIZE)==0) {
+					#ifdef DEBUG_H
+						Serial.println("new fingerprint updated");
+					#endif
+					writeEEPROM(tstr, EEPROM_CERTFINGERPRINT, FINGERPRINTSIZE);
+				}
+				else {
+					#ifdef DEBUG_H
+						Serial.println("fingerprint verification failed, abort");
+					#endif
+					clientsecure->stop();
+					delay(5000);
+					return;
+				}
+			}
+		}
+
+		strcpy(tstr,"GET /api/time HTTP/1.1\r\n\r\n");
+		client->write((const uint8_t *)tstr,strlen(tstr));
+
+		delay(1000);
+		getHTTPReply(client,tstr,200);
+		*bts = atol(tstr) - millis()/1000;
+		client->stop();
+	}
 }
 
 MicroGear::MicroGear(Client& netclient ) {
@@ -198,6 +214,9 @@ MicroGear::MicroGear(Client& netclient ) {
     cb_connected = NULL;
     cb_absent = NULL;
     cb_present = NULL;
+    cb_error = NULL;
+    cb_info = NULL;
+
     eepromready = false;
 
     mg = (MicroGear *)this;
@@ -220,6 +239,13 @@ void MicroGear::on(unsigned char event, void (* callback)(char*, uint8_t*,unsign
                 break;
         case CONNECTED : 
                 if (callback) cb_connected = callback;
+                break;
+        case ERROR : 
+                if (callback) cb_error = callback;
+                break;
+        case INFO : 
+                if (callback) cb_info = callback;
+                break;
     }
 }
 
@@ -257,20 +283,21 @@ void MicroGear::resetToken() {
                 char revokecode[REVOKECODESIZE+1];
                 int port = this->securemode?GEARAUTHSECUREPORT:GEARAUTHPORT;
 
-                sockclient->connect(GEARAUTHHOST,port);
-                readEEPROM(token,EEPROM_TOKENOFFSET,TOKENSIZE);
-                readEEPROM(revokecode,EEPROM_REVOKECODEOFFSET,REVOKECODESIZE);
-                sprintf(pstr,"GET /api/revoke/%s/%s HTTP/1.1\r\n\r\n",token,revokecode);
-                sockclient->write((const uint8_t *)pstr,strlen(pstr));
-
-                delay(1000);
-                getHTTPReply(sockclient,pstr,200);
-
-                if (strcmp(pstr,"FAILED")!=0) {    
-                    *state = EEPROM_STATE_NUL;
-                    writeEEPROM(state,EEPROM_STATEOFFSET,1);
-                }
-                sockclient->stop();
+                if(sockclient->connect(GEARAUTHHOST,port)){
+					readEEPROM(token,EEPROM_TOKENOFFSET,TOKENSIZE);
+					readEEPROM(revokecode,EEPROM_REVOKECODEOFFSET,REVOKECODESIZE);
+					sprintf(pstr,"GET /api/revoke/%s/%s HTTP/1.1\r\n\r\n",token,revokecode);
+					sockclient->write((const uint8_t *)pstr,strlen(pstr));
+
+					delay(1000);
+					getHTTPReply(sockclient,pstr,200);
+
+					if (strcmp(pstr,"FAILED")!=0) {    
+						*state = EEPROM_STATE_NUL;
+						writeEEPROM(state,EEPROM_STATEOFFSET,1);
+					}
+					sockclient->stop();
+				}
             }
             else { 
                 *state = EEPROM_STATE_NUL;
@@ -375,6 +402,7 @@ bool MicroGear::getToken(char *gkey, char *galias, char* token, char* tokensecre
                     #endif
 	                authclient->stop();
                     delay(1000);
+					break;
                 }
             }
             #ifdef DEBUG_H
@@ -466,9 +494,7 @@ int MicroGear::connectBroker(char* appid) {
     int gbport;
     bool tokenOK;
 
-    do {
-        syncTime(sockclient, &bootts);
-    } while (bootts == 0);
+    syncTime(sockclient, &bootts);
 
     #ifdef DEBUG_H
         Serial.print("Time stamp : ");
@@ -633,10 +659,64 @@ bool MicroGear::publish(char* topic, String message) {
 
 bool MicroGear::publish(char* topic, String message, bool retained) {
     char buff[MAXBUFFSIZE];
-    message.toCharArray(buff,MAXBUFFSIZE);
+    message.toCharArray(buff,MAXBUFFSIZE-1);
     return publish(topic, buff, retained);
 }
 
+bool MicroGear::publish(char* topic, String message, String apikey) {
+    char buff[MAXBUFFSIZE];
+    message.toCharArray(buff,MAXBUFFSIZE-1);
+    
+	char top[MAXTOPICSIZE] = "";
+	strcat(top,topic);
+	if(apikey!=""){
+		strcat(top,"/");
+		char buffapikey[MAXBUFFSIZE];
+		apikey.toCharArray(buffapikey,MAXBUFFSIZE);
+		strcat(top,buffapikey);
+	}
+    return publish(top, buff);
+}
+
+bool MicroGear::publish(char* topic, String message, char* apikey) {
+    char buff[MAXBUFFSIZE];
+    message.toCharArray(buff,MAXBUFFSIZE-1);
+    
+	char top[MAXTOPICSIZE] = "";
+	strcat(top,topic);
+	if(apikey!=""){
+		strcat(top,"/");
+		strcat(top,apikey);
+	}
+    return publish(top, buff);
+}
+
+bool MicroGear::writeFeed(char* feedname, char *data, char* apikey) {
+    char buff[MAXBUFFSIZE] = "/@writefeed/";
+    
+	strcat(buff,feedname);
+	if(apikey!=NULL && strlen(apikey)>0){
+		strcat(buff,"/");
+		strcat(buff,apikey);
+	}
+    return publish(buff, data);
+}
+
+bool MicroGear::writeFeed(char* feedname, char *data) {
+    return writeFeed(feedname, data, NULL);
+}
+
+bool MicroGear::writeFeed(char* feedname, String data, char* apikey) {
+    char buff[MAXBUFFSIZE];
+    data.toCharArray(buff,MAXBUFFSIZE-1);
+    
+    return writeFeed(feedname, data,apikey);
+}
+
+bool MicroGear::writeFeed(char* feedname, String data) {
+    return writeFeed(feedname, data,NULL);
+}
+
 /*
   setName() is deprecated 
 */

MicroGear.h

@@ -67,6 +67,8 @@
 #define ABSENT                     3
 #define CONNECTED                  4
 #define CALLBACK                   5
+#define ERROR          		       6
+#define INFO                  	   7
 
 
 class MicroGear {
@@ -119,6 +121,13 @@ class MicroGear {
 		bool publish(char*, int, bool);
 		bool publish(char*, String);
 		bool publish(char*, String, bool);
+		bool publish(char*, String, String);
+		bool publish(char*, String, char*);
+
+		bool writeFeed(char*, char*);
+		bool writeFeed(char*, char*, char*);
+		bool writeFeed(char*, String);
+		bool writeFeed(char*, String, char*);
 
 		bool chat(char*, char*);
 		bool chat(char*, int);

README.md

@@ -251,6 +251,22 @@ cancel subscription
 **arguments**
 * *topic* - name of topic to be send a message to.
 
+---
+**void microgear.writeFeed (char* feedid, char *datajson)**<br/>
+**void microgear.writeFeed (char* feedid, char *datajson, char *apikey)**<br/>
+**void microgear.writeFeed (char* feedid, String datajson)**<br/>
+**void microgear.writeFeed (char* feedid, String datajson, char *apikey)**<br/>
+
+write time series data to a feed storage
+
+**arguments**
+* *feedid* - name of the feed 
+* *datajson* - data string in json format 
+* *apikey* - apikey for authorization. If apikey is not specified, you will need to allow the AppID to access feed and then the default apikey will be assigned automatically.
+
+```js
+microgear.writeFeed("homesensor","{temp:25.7,humid:62.8,light:8.5}");
+```
 ---
 
 **void MicroGear::resetToken()**

README.th.md

@@ -236,6 +236,22 @@ microgear อาจจะมีความสนใจใน topic ใดเป
 * *topic* - ชื่อของ topic ที่ต้องการจะส่งข้อความไปถึง
 
 ---
+**void microgear.writeFeed (char* feedid, char *datajson)**<br/>
+**void microgear.writeFeed (char* feedid, char *datajson, char *apikey)**<br/>
+**void microgear.writeFeed (char* feedid, String datajson)**<br/>
+**void microgear.writeFeed (char* feedid, String datajson, char *apikey)**<br/>
+เขียนข้อมูลลง feed storage
+
+**arguments**
+* *feedid* - ชื่อของ feed ที่ต้องการจะเขียนข้อมูล 
+* *datajson* - ข้อมูลที่จะบันทึก ในรูปแบบ json 
+* *apikey* - apikey สำหรับตรวจสอบสิทธิ์ หากไม่กำหนด จะใช้ default apikey ของ feed ที่ให้สิทธิ์ไว้กับ AppID
+
+```js
+microgear.writeFeed("homesensor","{temp:25.7,humid:62.8,light:8.5}");
+```
+---
+
 
 **void MicroGear::resetToken()**
 

library.properties

@@ -1,5 +1,5 @@
 name=ESP8266 Microgear
-version=1.2.0
+version=1.2.1
 author=Chavee Issariyapat <i@chavee.com>
 maintainer=Chavee Issariyapat <i@chavee.com>
 sentence=A client library for ESP8266 to connect to NETPIE IOT Platform.