Merge pull request #16 from lenchv/develop

Develop

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-[0.1.1](https://github.com/lenchv/hive-driver/releases/tag/v0.1.1) 2020-02-21
+[0.1.2](https://github.com/lenchv/hive-driver/releases/tag/v0.1.2) 2020-02-24
+
+- Fixed setting response in OperationStateError
+
+[0.1.1](https://github.com/lenchv/hive-driver/releases/tag/v0.1.1) 2020-02-23
 
 - Changed version in package.json
 - Fixed retrieving data when Hive does not return hasResultSet

dist/connection/transports/TlsTransport.d.ts

@@ -7,6 +7,7 @@ export default class TlsTransport implements ITransport {
     private connection;
     private tlsOptions;
     private options;
+    private tls;
     constructor(host: string, port: number, options?: TlsOptions);
     setOptions(option: string, value: any): void;
     getOptions(): object;

dist/errors/OperationStateError.d.ts

@@ -1,6 +1,6 @@
 import HiveDriverError from "./HiveDriverError";
 import { GetOperationStatusResponse } from "../hive/Commands/GetOperationStatusCommand";
 export default class OperationStateError extends HiveDriverError {
-    response?: GetOperationStatusResponse;
-    setResponse(response: GetOperationStatusResponse): void;
+    response: GetOperationStatusResponse;
+    constructor(message: string, response: GetOperationStatusResponse);
 }

lib/connection/transports/TlsTransport.ts

@@ -9,8 +9,10 @@ export default class TlsTransport implements ITransport {
     private connection: any;
     private tlsOptions: TlsOptions;
     private options: object;
+    private tls: any;
 
     constructor(host: string, port: number, options: TlsOptions = {}) {
+        this.tls = tls;
         this.host = host;
         this.port = port;
         this.tlsOptions = {
@@ -41,7 +43,7 @@ export default class TlsTransport implements ITransport {
     }
 
     connect(): any {
-        this.connection = tls.connect(this.port, this.host, this.tlsOptions);
+        this.connection = this.tls.connect(this.port, this.host, this.tlsOptions);
         this.connection.setMaxSendFragment(65536);
         this.connection.setNoDelay(true);
     };

lib/errors/OperationStateError.ts

@@ -2,9 +2,11 @@ import HiveDriverError from "./HiveDriverError";
 import { GetOperationStatusResponse } from "../hive/Commands/GetOperationStatusCommand";
 
 export default class OperationStateError extends HiveDriverError {
-    public response?: GetOperationStatusResponse;
+    public response: GetOperationStatusResponse;
 
-    setResponse(response: GetOperationStatusResponse) {
+    constructor(message: string, response: GetOperationStatusResponse) {
+        super(message);
+
         this.response = response;
     }
 }

lib/utils/WaitUntilReady.ts

@@ -26,40 +26,39 @@ export default class WaitUntilReady {
         }
 
         try {
-            const isReady = this.isReady(response.operationState);
+            const isReady = this.isReady(response);
 
             if (isReady) {
                 return this.operation;
             } else {
                 return this.execute(progress, callback);
             }
         } catch (error) {
-            error.setResponse(response);
             throw error;
         }
     }
 
-    private isReady(operationState?: number): boolean {
-        switch(operationState) {
+    private isReady(response: GetOperationStatusResponse): boolean {
+        switch(response.operationState) {
             case this.TCLIService_types.TOperationState.INITIALIZED_STATE:
                 return false;
             case this.TCLIService_types.TOperationState.RUNNING_STATE:
                 return false;
             case this.TCLIService_types.TOperationState.FINISHED_STATE:
                 return true;
             case this.TCLIService_types.TOperationState.CANCELED_STATE:
-                throw new OperationStateError('The operation was canceled by a client');
+                throw new OperationStateError('The operation was canceled by a client', response);
             case this.TCLIService_types.TOperationState.CLOSED_STATE:
-                throw new OperationStateError('The operation was closed by a client');
+                throw new OperationStateError('The operation was closed by a client', response);
             case this.TCLIService_types.TOperationState.ERROR_STATE:
-                throw new OperationStateError('The operation failed due to an error');
+                throw new OperationStateError('The operation failed due to an error', response);
             case this.TCLIService_types.TOperationState.PENDING_STATE:
-                throw new OperationStateError('The operation is in a pending state');
+                throw new OperationStateError('The operation is in a pending state', response);
             case this.TCLIService_types.TOperationState.TIMEDOUT_STATE:
-                throw new OperationStateError('The operation is in a timedout state');
+                throw new OperationStateError('The operation is in a timedout state', response);
             case this.TCLIService_types.TOperationState.UKNOWN_STATE:
             default:
-                throw new OperationStateError('The operation is in an unrecognized state');
+                throw new OperationStateError('The operation is in an unrecognized state', response);
         }  
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hive-driver",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Driver for connection to Apache Hive via Thrift API.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",