Adding fix for response JSON parse error (#114)

* Adding fix for response JSON parse error

Signed-off-by: Prashant Shahi <[email protected]>

Author: prashant-shahi

generated/api_pb.js

@@ -18,8 +18,8 @@ export declare class Txn {
     queryWithVars(q: string, vars?: {
         [k: string]: any;
     }, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<types.Response>;
-    mutate(mu: types.Mutation, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<messages.Response>;
-    doRequest(req: messages.Request, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<messages.Response>;
+    mutate(mu: types.Mutation, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<types.Response>;
+    doRequest(req: messages.Request, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<types.Response>;
     commit(metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<void>;
     discard(metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<void>;
     private mergeContext;

lib/txn.d.ts

@@ -30,12 +30,7 @@ var Payload = (function (_super) {
         else {
             jsonStr = util_1.b64ToStr(value);
         }
-        try {
-            return JSON.parse(jsonStr);
-        }
-        catch (e) {
-            return jsonStr;
-        }
+        return util_1.strToJson(jsonStr);
     };
     Payload.prototype.getData_asB64 = function () {
         var value = _super.prototype.getData.call(this);
@@ -84,7 +79,7 @@ var Response = (function (_super) {
         else {
             jsonStr = util_1.b64ToStr(value);
         }
-        return JSON.parse(jsonStr);
+        return util_1.strToJson(jsonStr);
     };
     Response.prototype.getJson_asB64 = function () {
         var value = _super.prototype.getJson.call(this);
@@ -133,7 +128,7 @@ var Mutation = (function (_super) {
         else {
             jsonStr = util_1.b64ToStr(value);
         }
-        return JSON.parse(jsonStr);
+        return util_1.strToJson(jsonStr);
     };
     Mutation.prototype.getSetJson_asB64 = function () {
         var value = _super.prototype.getSetJson.call(this);
@@ -170,7 +165,7 @@ var Mutation = (function (_super) {
         else {
             jsonStr = util_1.b64ToStr(value);
         }
-        return JSON.parse(jsonStr);
+        return util_1.strToJson(jsonStr);
     };
     Mutation.prototype.getDeleteJson_asB64 = function () {
         var value = _super.prototype.getDeleteJson.call(this);

lib/types.js

@@ -14,3 +14,4 @@ export declare function strToB64(str: string): string;
 export declare function strToU8(str: string): Uint8Array;
 export declare function b64ToStr(b64Str: string): string;
 export declare function u8ToStr(arr: Uint8Array): string;
+export declare function strToJson(jsonStr: string): any;

lib/util.d.ts

@@ -74,3 +74,12 @@ function u8ToStr(arr) {
     return buf.toString();
 }
 exports.u8ToStr = u8ToStr;
+function strToJson(jsonStr) {
+    try {
+        return JSON.parse(jsonStr);
+    }
+    catch (e) {
+        return {};
+    }
+}
+exports.strToJson = strToJson;

lib/util.js

@@ -106,7 +106,7 @@ export class Txn {
      * operations on it will fail.
      */
     public async mutate(
-        mu: types.Mutation, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<messages.Response> {
+        mu: types.Mutation, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<types.Response> {
 
         const req = new messages.Request();
         req.setStartTs(this.ctx.getStartTs());
@@ -117,7 +117,7 @@ export class Txn {
     }
 
     public async doRequest(
-        req: messages.Request, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<messages.Response> {
+        req: messages.Request, metadata?: grpc.Metadata, options?: grpc.CallOptions): Promise<types.Response> {
         const mutationList = req.getMutationsList();
         if (this.finished) {
             this.dc.debug(`Do request (ERR_FINISHED):\nquery = ${req.getQuery()}\nvars = ${req.getVarsMap()}`);

src/txn.ts

@@ -2,7 +2,7 @@ import * as jspb from "google-protobuf";
 
 import * as messages from "../generated/api_pb";
 
-import { b64ToStr, isBase64, strToB64, strToU8, u8ToStr } from "./util";
+import { b64ToStr, isBase64, strToB64, strToJson, strToU8, u8ToStr } from "./util";
 
 // tslint:disable max-classes-per-file
 
@@ -21,11 +21,7 @@ export class Payload extends messages.Payload {
             jsonStr = b64ToStr(value);
         }
 
-        try {
-            return JSON.parse(jsonStr);
-        } catch (e) {
-            return jsonStr;
-        }
+        return strToJson(jsonStr);
     }
 
     public getData_asB64(): string {
@@ -68,10 +64,10 @@ export function createPayload(oldPayload: messages.Payload): Payload {
     );
 }
 
-// Query classes.
+// Mutation and Query classes.
 
 /**
- * Response represents the return value of a query operation.
+ * Response represents the return value of a mutation or query operations.
  */
 export class Response extends messages.Response {
     public getJson(): any { // tslint:disable-line no-any
@@ -83,7 +79,7 @@ export class Response extends messages.Response {
             jsonStr = b64ToStr(value);
         }
 
-        return JSON.parse(jsonStr);
+        return strToJson(jsonStr);
     }
 
     public getJson_asB64(): string {
@@ -141,7 +137,7 @@ export class Mutation extends messages.Mutation {
             jsonStr = b64ToStr(value);
         }
 
-        return JSON.parse(jsonStr);
+        return strToJson(jsonStr);
     }
 
     public getSetJson_asB64(): string {
@@ -185,7 +181,7 @@ export class Mutation extends messages.Mutation {
             jsonStr = b64ToStr(value);
         }
 
-        return JSON.parse(jsonStr);
+        return strToJson(jsonStr);
     }
 
     public getDeleteJson_asB64(): string {

src/types.ts

@@ -96,3 +96,11 @@ export function u8ToStr(arr: Uint8Array): string {
 
     return buf.toString();
 }
+
+export function strToJson(jsonStr: string): any { // tslint:disable-line no-any
+    try {
+        return JSON.parse(jsonStr);
+    } catch (e) {
+        return {};
+    }
+}