add keyTypes method. returns an object containing key:datatype pairs, because...

add keyTypes method. returns an object containing key:datatype pairs, because deuce wants an object.

exec/load/json-client.js

@@ -197,6 +197,17 @@ function JSONClient(serverAddr,serverPort) {
 		return this.wait();
 	}
 	
+	/* read object keys and key types (lock for reading or writing, blocking) */
+	this.keys=function(scope,location,lock) {
+		this.send(scope,"QUERY",{
+            oper:"KEYTYPES",
+            location:location,
+			lock:lock,
+ 			timeout:this.settings.TIMEOUT
+		});
+		return this.wait();
+	}
+
 	/* shift object data (lock for reading or writing, blocking) */
     this.shift=function(scope,location,lock) {
 		this.send(scope,"QUERY",{
@@ -290,18 +301,21 @@ function JSONClient(serverAddr,serverPort) {
 		if(!this.socket.data_waiting) 
 			return false;
 		var packet=this.socket.recvJSON();
-		switch(packet.func.toUpperCase()) {
-		case "PING":
-			this.socket.pingOut("PONG");
-			return false;
-		case "PONG":
-			this.socket.pingIn(packet);
-			return false;
-		case "ERROR":
-			throw(packet.data.description);
-			return false;
+		if(packet != null) {
+			switch(packet.func.toUpperCase()) {
+			case "PING":
+				this.socket.pingOut("PONG");
+				return false;
+			case "PONG":
+				this.socket.pingIn(packet);
+				return false;
+			case "ERROR":
+				throw(packet.data.description);
+				return false;
+			}
+			return packet;
 		}
-		return packet;
+		return false;
 	}
 	
 	/* do not return until the expected response is received */

exec/load/json-db.js

@@ -99,7 +99,8 @@ function JSONdb (fileName) {
 		WHO:10,
 		STATUS:11,
 		KEYS:12,
-		SLICE:13
+		SLICE:13,
+		KEYTYPES:14
 	}
 	
 	/* error constants */
@@ -429,7 +430,33 @@ function JSONdb (fileName) {
             return false;
         }
 	}
-    
+ 
+	/* retrieve a list of object keys */
+	this.keyTypes = function(request,record) {
+		var client = request.client;
+		var keys={};
+		/* if the requested data does not exist, result is undefined */
+		if(record.data === undefined) {
+            send_packet(client,undefined,"RESPONSE");
+			return true;
+		}
+		/* if this client has this record locked, read */
+		if(record.info.lock[client.id]) {
+			for(var k in record.data[record.property]) {
+				var type = typeof record.data[record.property][k];
+				if(record.data[record.property][k] instanceof Array)
+					type = "array";
+				keys[k] = type;
+			}
+            send_packet(client,keys,"RESPONSE");
+			return true;
+		}
+        /* if there is no lock for this client, error */
+        else {
+            return false;
+        }
+	}
+ 
     /* remove a record from the database (requires WRITE_LOCK) */
     this.remove = function(request,record) {
 		var client = request.client;
@@ -678,6 +705,9 @@ function JSONdb (fileName) {
 				case "KEYS":
 					result=this.keys(request,record);
 					break;
+				case "KEYTYPES":
+					result=this.keys(request,record);
+					break;
 				case "PUSH":
 					result=this.push(request,record);
 					break;