@tdxvolt/volt-client-grpc 0.11.1 → 0.11.4

package/lib/index.cjs

@@ -987,7 +987,15 @@ class GRPCCall extends EventEmitter__default["default"] {
           streamResponse,
         );
         if (parsedResponse.payload) {
-          this.emit("data", parsedResponse.payload);
+          // Interpret a non-empty status message as an error.
+          if (parsedResponse.payload?.status?.message) {
+            this.emit(
+              "error",
+              new Error(parsedResponse.payload.status.message),
+            );
+          } else {
+            this.emit("data", parsedResponse.payload);
+          }
         } else if (parsedResponse.ended) {
           if (parsedResponse.error) {
             this.emit("error", new Error(parsedResponse.error));
@@ -1026,7 +1034,8 @@ class GRPCCall extends EventEmitter__default["default"] {
     });
 
     if (this._initialRequest.request) {
-      this._call.write(this._initialRequest.request);
+      // Allow callee to attach event handlers before we actually send the initial payload.
+      process.nextTick(() => this._call.write(this._initialRequest.request));
     }
 
     return this;
@@ -2088,8 +2097,68 @@ class VoltClient extends EventEmitter__default["default"] {
   SqlExecute(request) {
     const grpcClient = this.getVoltAPIClient();
 
-    const subscribeCall = new GRPCCall(this, "Execute", "METHOD_TYPE_BIDI");
-    return subscribeCall.start(grpcClient, request);
+    const call = new GRPCCall(this, "Execute", "METHOD_TYPE_BIDI");
+    return call.start(grpcClient, request);
+  }
+
+  /**
+   * A synchronous version of SqlExecute that returns the result as an array of JSON objects.
+   */
+  SqlExecuteJSON(request) {
+    return new Promise((resolve, reject) => {
+      const call = this.SqlExecute(request);
+
+      let header;
+      const rows = [];
+
+      call.on("error", reject);
+      call.on("end", () => {
+        resolve(rows);
+      });
+
+      call.on("data", (response) => {
+        if (response.header) {
+          header = response.header;
+        } else if (response.row) {
+          const row = response.row;
+          const obj = {};
+
+          for (let idx = 0; idx < header.column.length; idx++) {
+            const column = header.column[idx];
+
+            if (row.column[idx].data === "null") {
+              obj[column.name] = null;
+              continue;
+            }
+
+            switch (column.type) {
+              case "DATA_TYPE_TEXT": {
+                obj[column.name] = row.column[idx].text;
+                break;
+              }
+              case "DATA_TYPE_INTEGER": {
+                obj[column.name] = parseInt(row.column[idx].integer);
+                break;
+              }
+              case "DATA_TYPE_REAL": {
+                obj[column.name] = parseFloat(row.column[idx].real);
+                break;
+              }
+              case "DATA_TYPE_BLOB": {
+                obj[column.name] = row.column[idx].blob;
+                break;
+              }
+              default: {
+                obj[column.name] = `unrecognised data type: ${column.type}`;
+                break;
+              }
+            }
+          }
+
+          rows.push(obj);
+        }
+      });
+    });
   }
 
   /**

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.11.1",
+  "version": "0.11.4",
   "description": "tdx Volt library for nodejs clients",
   "type": "module",
   "exports": {

package/src/grpc-call.js

@@ -203,7 +203,15 @@ export default class GRPCCall extends EventEmitter {
           streamResponse,
         );
         if (parsedResponse.payload) {
-          this.emit("data", parsedResponse.payload);
+          // Interpret a non-empty status message as an error.
+          if (parsedResponse.payload?.status?.message) {
+            this.emit(
+              "error",
+              new Error(parsedResponse.payload.status.message),
+            );
+          } else {
+            this.emit("data", parsedResponse.payload);
+          }
         } else if (parsedResponse.ended) {
           if (parsedResponse.error) {
             this.emit("error", new Error(parsedResponse.error));
@@ -242,7 +250,8 @@ export default class GRPCCall extends EventEmitter {
     });
 
     if (this._initialRequest.request) {
-      this._call.write(this._initialRequest.request);
+      // Allow callee to attach event handlers before we actually send the initial payload.
+      process.nextTick(() => this._call.write(this._initialRequest.request));
     }
 
     return this;

package/src/volt-client.js

@@ -530,8 +530,68 @@ export class VoltClient extends EventEmitter {
   SqlExecute(request) {
     const grpcClient = this.getVoltAPIClient();
 
-    const subscribeCall = new GRPCCall(this, "Execute", "METHOD_TYPE_BIDI");
-    return subscribeCall.start(grpcClient, request);
+    const call = new GRPCCall(this, "Execute", "METHOD_TYPE_BIDI");
+    return call.start(grpcClient, request);
+  }
+
+  /**
+   * A synchronous version of SqlExecute that returns the result as an array of JSON objects.
+   */
+  SqlExecuteJSON(request) {
+    return new Promise((resolve, reject) => {
+      const call = this.SqlExecute(request);
+
+      let header;
+      const rows = [];
+
+      call.on("error", reject);
+      call.on("end", () => {
+        resolve(rows);
+      });
+
+      call.on("data", (response) => {
+        if (response.header) {
+          header = response.header;
+        } else if (response.row) {
+          const row = response.row;
+          const obj = {};
+
+          for (let idx = 0; idx < header.column.length; idx++) {
+            const column = header.column[idx];
+
+            if (row.column[idx].data === "null") {
+              obj[column.name] = null;
+              continue;
+            }
+
+            switch (column.type) {
+              case "DATA_TYPE_TEXT": {
+                obj[column.name] = row.column[idx].text;
+                break;
+              }
+              case "DATA_TYPE_INTEGER": {
+                obj[column.name] = parseInt(row.column[idx].integer);
+                break;
+              }
+              case "DATA_TYPE_REAL": {
+                obj[column.name] = parseFloat(row.column[idx].real);
+                break;
+              }
+              case "DATA_TYPE_BLOB": {
+                obj[column.name] = row.column[idx].blob;
+                break;
+              }
+              default: {
+                obj[column.name] = `unrecognised data type: ${column.type}`;
+                break;
+              }
+            }
+          }
+
+          rows.push(obj);
+        }
+      });
+    });
   }
 
   /**