monetdb 2.0.2 → 2.2.0

package/src/mapi.ts

@@ -1,10 +1,10 @@
-import { Socket, SocketConnectOpts } from "node:net";
-import { once, EventEmitter, Abortable } from "events";
-import { Buffer, constants } from "buffer";
-import { createHash } from "node:crypto";
+import {Socket, SocketConnectOpts} from "node:net";
+import {once, EventEmitter} from "events";
+import {Buffer, constants} from "buffer";
+import {createHash} from "node:crypto";
 import defaults from "./defaults";
-import { URL } from "node:url";
-import { FileUploader, FileDownloader } from "./file-transfer";
+import {URL} from "node:url";
+import {FileUploader, FileDownloader} from "./file-transfer";
 
 const MAPI_BLOCK_SIZE = 1024 * 8 - 2;
 const MAPI_HEADER_SIZE = 2;
@@ -31,986 +31,1001 @@ const MAX_REDIRECTS = 10;
 const MAX_BUFF_SIZE = constants.MAX_LENGTH;
 
 enum MAPI_STATE {
-  INIT = 1,
-  CONNECTED,
-  READY,
+    INIT = 1,
+    CONNECTED,
+    READY,
 }
 
 enum MAPI_LANGUAGE {
-  SQL = "sql",
-  MAPI = "mapi",
-  CONTROL = "control", // ? Not implemented
+    SQL = "sql",
+    MAPI = "mapi",
+    CONTROL = "control", // ? Not implemented
 }
 
 interface MapiConfig {
-  database: string;
-  username?: string;
-  password?: string;
-  language?: MAPI_LANGUAGE;
-  host?: string;
-  port?: number;
-  unixSocket?: string;
-  timeout?: number;
-  autoCommit?: boolean;
-  replySize?: number;
+    database: string;
+    username?: string;
+    password?: string;
+    language?: MAPI_LANGUAGE;
+    host?: string;
+    port?: number;
+    unixSocket?: string;
+    timeout?: number;
+    autoCommit?: boolean;
+    replySize?: number;
 }
 
 class HandShakeOption {
-  level: number;
-  name: string;
-  value: any;
-  fallback?: (v: any) => void;
-  sent: boolean;
-  constructor(
-    level: number,
-    name: string,
-    value: any,
-    fallback: (v: any) => void,
-    sent = false
-  ) {
-    this.level = level;
-    this.name = name;
-    this.value = value;
-    this.fallback = fallback;
-    this.sent = sent;
-  }
+    level: number;
+    name: string;
+    value: any;
+    fallback?: (v: any) => void;
+    sent: boolean;
+    constructor(
+        level: number,
+        name: string,
+        value: any,
+        fallback: (v: any) => void,
+        sent = false
+    ) {
+        this.level = level;
+        this.name = name;
+        this.value = value;
+        this.fallback = fallback;
+        this.sent = sent;
+    }
 }
 
 function isMapiUri(uri: string): boolean {
-  const regx = new RegExp("^mapi:monetdb://*", "i");
-  return regx.test(uri);
+    const regx = new RegExp("^mapi:monetdb://*", "i");
+    return regx.test(uri);
 }
 
 function parseMapiUri(uri: string): MapiConfig {
-  if (isMapiUri(uri)) {
-    const url = new URL(uri.substring(5));
-    if (url.hostname) {
-      const host = url.hostname;
-      const port = parseInt(url.port);
-      const username = url.username;
-      const password = url.password;
-      const database = url.pathname.split("/")[1];
-      return {
-        host,
-        port,
-        username,
-        password,
-        database,
-      };
+    if (isMapiUri(uri)) {
+        const url = new URL(uri.substring(5));
+        if (url.hostname) {
+            const host = url.hostname;
+            const port = parseInt(url.port);
+            const username = url.username;
+            const password = url.password;
+            const database = url.pathname.split("/")[1];
+            return {
+                host,
+                port,
+                username,
+                password,
+                database,
+            };
+        }
     }
-  }
-  throw new Error(`Invalid MAPI URI ${uri}!`);
+    throw new Error(`Invalid MAPI URI ${uri}!`);
 }
 
 // validates and sets defaults on missing properties
 function createMapiConfig(params: MapiConfig): MapiConfig {
-  const database =
-    params && params.database ? params.database : defaults.database;
-  if (typeof database != "string") {
-    throw new Error("database name must be string");
-  }
-
-  const username =
-    params && params.username ? params.username : defaults.username;
-  const password =
-    params && params.password ? params.password : defaults.password;
-
-  let host = params && params.host;
-  const unixSocket = params && params.unixSocket;
-  if (!unixSocket && !host) host = defaults.host;
-  if (typeof host != "string") {
-    throw new TypeError(`${host} is not valid hostname`);
-  }
-  const port =
-    params && params.port ? Number(params.port) : Number(defaults.port);
-  if (isNaN(port)) {
-    throw new TypeError(`${port} is not valid port`);
-  }
-
-  const timeout = params && params.timeout ? Number(params.timeout) : undefined;
-  if (timeout && isNaN(timeout)) {
-    throw new TypeError("timeout must be number");
-  }
-  const language =
-    params && params.language ? params.language : MAPI_LANGUAGE.SQL;
-  const autoCommit = params.autoCommit || defaults.autoCommit;
-  const replySize = params.replySize || defaults.replySize;
-
-  return {
-    database,
-    username,
-    password,
-    language,
-    host,
-    port,
-    timeout,
-    unixSocket,
-    autoCommit,
-    replySize,
-  };
+    const database =
+        params && params.database ? params.database : defaults.database;
+    if (typeof database != "string") {
+        throw new Error("database name must be string");
+    }
+
+    const username =
+        params && params.username ? params.username : defaults.username;
+    const password =
+        params && params.password ? params.password : defaults.password;
+
+    let host = params && params.host;
+    const unixSocket = params && params.unixSocket;
+    if (!unixSocket && !host) host = defaults.host;
+    if (typeof host != "string") {
+        throw new TypeError(`${host} is not valid hostname`);
+    }
+    const port =
+        params && params.port ? Number(params.port) : Number(defaults.port);
+    if (isNaN(port)) {
+        throw new TypeError(`${port} is not valid port`);
+    }
+
+    const timeout = params && params.timeout ? Number(params.timeout) : undefined;
+    if (timeout && isNaN(timeout)) {
+        throw new TypeError("timeout must be number");
+    }
+    const language =
+        params && params.language ? params.language : MAPI_LANGUAGE.SQL;
+    const autoCommit = params.autoCommit || defaults.autoCommit;
+    const replySize = params.replySize || defaults.replySize;
+
+    return {
+        database,
+        username,
+        password,
+        language,
+        host,
+        port,
+        timeout,
+        unixSocket,
+        autoCommit,
+        replySize,
+    };
 }
 
 class Column {
-  table: string;
-  name: string;
-  type: string;
-  length?: number;
-  index?: number;
-  constructor(
-    table: string,
-    name: string,
-    type: string,
-    index?: number,
-    length?: number
-  ) {
-    this.table = table;
-    this.name = name;
-    this.type = type;
-    this.index = index;
-    this.length = length;
-  }
+    table: string;
+    name: string;
+    type: string;
+    length?: number;
+    index?: number;
+    constructor(
+        table: string,
+        name: string,
+        type: string,
+        index?: number,
+        length?: number
+    ) {
+        this.table = table;
+        this.name = name;
+        this.type = type;
+        this.index = index;
+        this.length = length;
+    }
 }
 
 type QueryResult = {
-  id?: number;
-  type?: string;
-  queryId?: number;
-  rowCnt?: number;
-  affectedRows?: number;
-  columnCnt?: number;
-  queryTime?: number; // microseconds
-  sqlOptimizerTime?: number; // microseconds
-  malOptimizerTime?: number; // microseconds
-  columns?: Column[];
-  headers?: ResponseHeaders;
-  data?: any[];
+    id?: number;
+    type?: string;
+    queryId?: number;
+    rowCnt?: number;
+    affectedRows?: number;
+    columnCnt?: number;
+    queryTime?: number; // microseconds
+    sqlOptimizerTime?: number; // microseconds
+    malOptimizerTime?: number; // microseconds
+    columns?: Column[];
+    headers?: ResponseHeaders;
+    data?: any[];
 };
 
 class QueryStream extends EventEmitter {
-  constructor() {
-    super();
-  }
+    constructor() {
+        super();
+    }
 
-  end(res?: QueryResult) {
-    this.emit("end", res);
-  }
+    end(res?: QueryResult) {
+        this.emit("end", res);
+    }
 }
 
 function parseHeaderLine(hdrLine: string): Object {
-  if (hdrLine.startsWith(MSG_HEADER)) {
-    const [head, tail] = hdrLine.substring(1).trim().split("#");
-    let res = {};
-    const vals = head.trim().split(",\t");
-    switch (tail.trim()) {
-      case "table_name":
-        res = { tableNames: vals };
-        break;
-      case "name":
-        res = { columnNames: vals };
-        break;
-      case "type":
-        res = { columnTypes: vals };
-        break;
-      default:
-        res = {};
-    }
-    return res;
-  }
-  throw TypeError("Invalid header format!");
+    if (hdrLine.startsWith(MSG_HEADER)) {
+        const [head, tail] = hdrLine.substring(1).trim().split("#");
+        let res = {};
+        const vals = head.trim().split(",\t");
+        switch (tail.trim()) {
+            case "table_name":
+                res = {tableNames: vals};
+                break;
+            case "name":
+                res = {columnNames: vals};
+                break;
+            case "type":
+                res = {columnTypes: vals};
+                break;
+            default:
+                res = {};
+        }
+        return res;
+    }
+    throw TypeError("Invalid header format!");
 }
 
 function parseTupleLine(line: string, types: string[]): any[] {
-  if (line.startsWith(MSG_TUPLE) && line.endsWith("]")) {
-    var resultline = [];
-    var cCol = 0;
-    var curtok = "";
-    var state = "INCRAP";
-    let endQuotes = 0;
-    /* mostly adapted from clients/R/MonetDB.R/src/mapisplit.c */
-    for (var curPos = 2; curPos < line.length - 1; curPos++) {
-      var chr = line.charAt(curPos);
-      switch (state) {
-        case "INCRAP":
-          if (chr != "\t" && chr != "," && chr != " ") {
-            if (chr == '"') {
-              state = "INQUOTES";
-            } else {
-              state = "INTOKEN";
-              curtok += chr;
+    if (line.startsWith(MSG_TUPLE) && line.endsWith("]")) {
+        var resultline = [];
+        var cCol = 0;
+        var curtok = "";
+        var state = "INCRAP";
+        let endQuotes = 0;
+        /* mostly adapted from clients/R/MonetDB.R/src/mapisplit.c */
+        for (var curPos = 2; curPos < line.length - 1; curPos++) {
+            var chr = line.charAt(curPos);
+            switch (state) {
+                case "INCRAP":
+                    if (chr != "\t" && chr != "," && chr != " ") {
+                        if (chr == '"') {
+                            state = "INQUOTES";
+                        } else {
+                            state = "INTOKEN";
+                            curtok += chr;
+                        }
+                    }
+                    break;
+                case "INTOKEN":
+                    if (chr == "," || curPos == line.length - 2) {
+                        if (curtok == "NULL" && endQuotes === 0) {
+                            resultline.push(null);
+                        } else {
+                            switch (types[cCol]) {
+                                case "boolean":
+                                    resultline.push(curtok == "true");
+                                    break;
+                                case "tinyint":
+                                case "smallint":
+                                case "int":
+                                case "wrd":
+                                case "bigint":
+                                    resultline.push(parseInt(curtok));
+                                    break;
+                                case "real":
+                                case "double":
+                                case "decimal":
+                                    resultline.push(parseFloat(curtok));
+                                    break;
+                                case "json":
+                                    try {
+                                        resultline.push(JSON.parse(curtok));
+                                    } catch (e) {
+                                        resultline.push(curtok);
+                                    }
+                                    break;
+                                default:
+                                    // we need to unescape double quotes
+                                    //valPtr = valPtr.replace(/[^\\]\\"/g, '"');
+                                    resultline.push(curtok);
+                                    break;
+                            }
+                        }
+                        cCol++;
+                        state = "INCRAP";
+                        curtok = "";
+                        endQuotes = 0;
+                    } else {
+                        curtok += chr;
+                    }
+                    break;
+                case "ESCAPED":
+                    state = "INQUOTES";
+                    switch (chr) {
+                        case "t":
+                            curtok += "\t";
+                            break;
+                        case "n":
+                            curtok += "\n";
+                            break;
+                        case "r":
+                            curtok += "\r";
+                            break;
+                        default:
+                            curtok += chr;
+                    }
+                    break;
+                case "INQUOTES":
+                    if (chr == '"') {
+                        state = "INTOKEN";
+                        endQuotes++;
+                        break;
+                    }
+                    if (chr == "\\") {
+                        state = "ESCAPED";
+                        break;
+                    }
+                    curtok += chr;
+                    break;
             }
-          }
-          break;
-        case "INTOKEN":
-          if (chr == "," || curPos == line.length - 2) {
-            if (curtok == "NULL" && endQuotes === 0) {
-              resultline.push(null);
-            } else {
-              switch (types[cCol]) {
-                case "boolean":
-                  resultline.push(curtok == "true");
-                  break;
-                case "tinyint":
-                case "smallint":
-                case "int":
-                case "wrd":
-                case "bigint":
-                  resultline.push(parseInt(curtok));
-                  break;
-                case "real":
-                case "double":
-                case "decimal":
-                  resultline.push(parseFloat(curtok));
-                  break;
-                case "json":
-                  try {
-                    resultline.push(JSON.parse(curtok));
-                  } catch (e) {
-                    resultline.push(curtok);
-                  }
-                  break;
-                default:
-                  // we need to unescape double quotes
-                  //valPtr = valPtr.replace(/[^\\]\\"/g, '"');
-                  resultline.push(curtok);
-                  break;
-              }
-            }
-            cCol++;
-            state = "INCRAP";
-            curtok = "";
-            endQuotes = 0;
-          } else {
-            curtok += chr;
-          }
-          break;
-        case "ESCAPED":
-          state = "INQUOTES";
-          switch (chr) {
-            case "t":
-              curtok += "\t";
-              break;
-            case "n":
-              curtok += "\n";
-              break;
-            case "r":
-              curtok += "\r";
-              break;
-            default:
-              curtok += chr;
-          }
-          break;
-        case "INQUOTES":
-          if (chr == '"') {
-            state = "INTOKEN";
-            endQuotes++;
-            break;
-          }
-          if (chr == "\\") {
-            state = "ESCAPED";
-            break;
-          }
-          curtok += chr;
-          break;
-      }
-    }
-    return resultline;
-  }
-  throw TypeError("Invalid tuple format!");
+        }
+        return resultline;
+    }
+    throw TypeError("Invalid tuple format!");
 }
 
 interface ResponseCallbacks {
-  resolve: (v: QueryResult | QueryStream | Promise<any>) => void;
-  reject: (err: Error) => void;
+    resolve: (v: QueryResult | QueryStream | Promise<any>) => void;
+    reject: (err: Error) => void;
 }
 
 interface ResponseHeaders {
-  tableNames?: string[];
-  columnNames?: string[];
-  columnTypes?: string[];
+    tableNames?: string[];
+    columnNames?: string[];
+    columnTypes?: string[];
 }
 
 interface ResponseOpt {
-  stream?: boolean;
-  callbacks?: ResponseCallbacks;
-  fileHandler?: any;
+    stream?: boolean;
+    callbacks?: ResponseCallbacks;
+    fileHandler?: any;
 }
 
 class Response {
-  buff: Buffer;
-  offset: number;
-  parseOffset: number;
-  stream: boolean;
-  settled: boolean;
-  segments: Segment[];
-  result?: QueryResult;
-  callbacks: ResponseCallbacks;
-  queryStream?: QueryStream;
-  headers?: ResponseHeaders;
-  fileHandler: any;
-
-  constructor(opt: ResponseOpt = {}) {
-    this.buff = Buffer.allocUnsafe(MAPI_BLOCK_SIZE).fill(0);
-    this.offset = 0;
-    this.parseOffset = 0;
-    this.segments = [];
-    this.settled = false;
-    this.stream = opt.stream;
-    this.callbacks = opt.callbacks;
-    this.fileHandler = opt.fileHandler;
-    if (opt.stream) {
-      this.queryStream = new QueryStream();
-      if (opt.callbacks && opt.callbacks.resolve)
-        opt.callbacks.resolve(this.queryStream);
-    }
-  }
-
-  append(data: Buffer): number {
-    let srcStartIndx = 0;
-    let srcEndIndx = srcStartIndx + data.length;
-    const l = this.segments.length;
-    let segment = (l > 0 && this.segments[l - 1]) || undefined;
-    let bytesCopied = 0;
-    let bytesProcessed = 0;
-    if (!this.complete()) {
-      // check if out of space
-      if (this.buff.length - this.offset < data.length) {
-        const bytes = this.expand(MAPI_BLOCK_SIZE);
-        console.log(`expanding by ${bytes} bytes!`);
-      }
-
-      if (segment === undefined || (segment && segment.isFull())) {
-        const hdr = data.readUInt16LE(0);
-        const last = (hdr & 1) === 1;
-        const bytes = hdr >> 1;
-        srcStartIndx = MAPI_HEADER_SIZE;
-        srcEndIndx = srcStartIndx + Math.min(bytes, data.length);
-        bytesCopied = data.copy(
-          this.buff,
-          this.offset,
-          srcStartIndx,
-          srcEndIndx
-        );
-        segment = new Segment(bytes, last, this.offset, bytesCopied);
-        this.segments.push(segment);
-        this.offset += bytesCopied;
-        bytesProcessed = MAPI_HEADER_SIZE + bytesCopied;
-      } else {
-        const byteCntToRead = segment.bytes - segment.bytesOffset;
-        srcEndIndx = srcStartIndx + byteCntToRead;
-        bytesCopied = data.copy(
-          this.buff,
-          this.offset,
-          srcStartIndx,
-          srcEndIndx
-        );
-        this.offset += bytesCopied;
-        segment.bytesOffset += bytesCopied;
-        // console.log(`segment is full ${segment.bytesOffset === segment.bytes}`);
-        bytesProcessed = bytesCopied;
-      }
-      if (this.isQueryResponse()) {
-        const tuples = [];
-        const firstPackage = this.parseOffset === 0;
-        this.parseOffset += this.parse(this.toString(this.parseOffset), tuples);
-        if (tuples.length > 0) {
-          if (this.queryStream) {
-            // emit header once
-            if (firstPackage && this.result && this.result.columns) {
-              this.queryStream.emit("header", this.result.columns);
-            }
-            // emit tuples
-            this.queryStream.emit("data", tuples);
-          } else {
-            this.result.data = this.result.data || [];
-            for (let t of tuples) {
-              this.result.data.push(t);
-            }
-          }
+    chunks: Buffer[];
+    buff: Buffer;
+    offset: number;
+    parseOffset: number;
+    stream: boolean;
+    settled: boolean;
+    headerEmitted: boolean;
+    result?: QueryResult;
+    callbacks: ResponseCallbacks;
+    queryStream?: QueryStream;
+    headers?: ResponseHeaders;
+    fileHandler: any;
+    last: boolean;
+    leftOver: number;
+    private _str: string;
+
+    constructor(opt: ResponseOpt = {}) {
+        this.chunks = [];
+        //this.buff = Buffer.allocUnsafe(MAPI_BLOCK_SIZE).fill(0);
+        this.offset = 0;
+        this.parseOffset = 0;
+        this.settled = false;
+        this.last = false;
+        this.headerEmitted = false;
+        this.stream = opt.stream;
+        this.callbacks = opt.callbacks;
+        this.fileHandler = opt.fileHandler;
+        this.leftOver = 0;
+        this._str = "";
+        if (opt.stream) {
+            this.queryStream = new QueryStream();
+            if (opt.callbacks && opt.callbacks.resolve)
+                opt.callbacks.resolve(this.queryStream);
         }
-      }
-    }
-    return bytesProcessed;
-  }
-
-  complete(): boolean {
-    const l = this.segments.length;
-    if (l > 0) {
-      const segment = this.segments[l - 1];
-      return segment.last && segment.isFull();
-    }
-    return false;
-  }
-
-  private seekOffset(): number {
-    const len = this.segments.length;
-    if (len) {
-      const last = this.segments[len - 1];
-      if (last.isFull()) return last.offset + last.bytes;
-      return last.offset;
-    }
-    return 0;
-  }
-
-  private expand(byteCount: number): number {
-    if (
-      this.buff.length + byteCount > MAX_BUFF_SIZE &&
-      this.fileHandler instanceof FileDownloader
-    ) {
-      const offset = this.seekOffset();
-      if (offset) {
-        this.fileHandler.writeChunk(this.buff.subarray(0, offset));
-        this.buff = this.buff.subarray(offset);
-        this.offset -= offset;
-      }
-    }
-    const buff = Buffer.allocUnsafe(this.buff.length + byteCount).fill(0);
-    const bytesCopied = this.buff.copy(buff);
-    this.buff = buff;
-    // should be byteCount
-    return this.buff.length - bytesCopied;
-  }
-
-  private firstCharacter(): string {
-    return this.buff.toString("utf8", 0, 1);
-  }
-
-  errorMessage(): string {
-    if (this.firstCharacter() === MSG_ERROR) {
-      return this.buff.toString("utf8", 1);
-    }
-    return "";
-  }
-
-  isFileTransfer(): boolean {
-    return this.toString().startsWith(MSG_FILETRANS);
-  }
-
-  isPrompt(): boolean {
-    // perhaps use toString
-    return this.complete() && this.firstCharacter() === "\x00";
-  }
-
-  isRedirect(): boolean {
-    return this.firstCharacter() === MSG_REDIRECT;
-  }
-
-  isQueryResponse(): boolean {
-    if (this.result && this.result.type) {
-      return this.result.type.startsWith(MSG_Q);
-    }
-    return this.firstCharacter() === MSG_Q;
-  }
-
-  isMsgMore(): boolean {
-    // server wants more ?
-    return this.toString().startsWith(MSG_MORE);
-  }
-
-  toString(start?: number) {
-    const res = this.buff.toString("utf8", 0, this.offset);
-    if (start) return res.substring(start);
-    return res;
-  }
-
-  settle(res?: Promise<any>): void {
-    if (this.settled === false && this.complete()) {
-      const errMsg = this.errorMessage();
-      const err = errMsg ? new Error(errMsg) : null;
-      if (this.queryStream) {
-        if (err) this.queryStream.emit("error", err);
-        this.queryStream.end();
-      } else {
-        if (this.callbacks) {
-          if (err) {
-            this.callbacks.reject(err);
-          } else {
-            this.callbacks.resolve(res || this.result);
-          }
-        } else if (this.fileHandler && this.isQueryResponse()) {
-          this.fileHandler.resolve(this.result);
-        } else if (this.fileHandler && (err || this.fileHandler.err)) {
-          this.fileHandler.reject(err || this.fileHandler.err);
+    }
+
+    append(data: Buffer): number {
+        //let srcStartIndx = 0;
+        //let srcEndIndx = srcStartIndx + data.length;
+        let bytesProcessed = 0;
+
+        if (this.leftOver == 0) {
+            // new mapi blk, read header
+            const hdr = data.readUInt16LE(0);
+            this.last = (hdr & 1) === 1;
+            this.leftOver = hdr >> 1;
+            data = data.subarray(MAPI_HEADER_SIZE);
+            bytesProcessed += MAPI_HEADER_SIZE;
+            //bytesCopied = data.copy(
+            //    this.buff,
+            //    this.offset,
+            //    srcStartIndx,
+            //    srcEndIndx
+            //);
+            //segment = new Segment(bytes, last, this.offset, bytesCopied);
+            //this.segments.push(segment);
+            //this.offset += bytesCopied;
+            //bytesProcessed = MAPI_HEADER_SIZE + bytesCopied;
         }
-      }
-      this.settled = true;
-    }
-  }
-
-  parse(data: string, res: any[]): number {
-    let offset = 0;
-    const lines = data.split("\n").length;
-    if (this.isQueryResponse()) {
-      let eol = data.indexOf("\n");
-      this.result = this.result || {};
-      if (
-        this.result.type === undefined &&
-        data.startsWith(MSG_Q) &&
-        lines > 0
-      ) {
-        // process 1st line
-        const line = data.substring(0, eol);
-        this.result.type = line.substring(0, 2);
-        const rest = line.substring(3).trim().split(" ");
-        if (this.result.type === MSG_QTABLE) {
-          const [
-            id,
-            rowCnt,
-            columnCnt,
-            rows,
-            queryId,
-            queryTime,
-            malOptimizerTime,
-            sqlOptimizerTime,
-          ] = rest;
-          this.result.id = parseInt(id);
-          this.result.rowCnt = parseInt(rowCnt);
-          this.result.columnCnt = parseInt(columnCnt);
-          this.result.queryId = parseInt(queryId);
-          this.result.queryTime = parseInt(queryTime);
-          this.result.malOptimizerTime = parseInt(malOptimizerTime);
-          this.result.sqlOptimizerTime = parseInt(sqlOptimizerTime);
-        } else if (this.result.type === MSG_QUPDATE) {
-          const [
-            affectedRowCnt,
-            autoIncrementId,
-            queryId,
-            queryTime,
-            malOptimizerTime,
-            sqlOptimizerTime,
-          ] = rest;
-          this.result.affectedRows = parseInt(affectedRowCnt);
-          this.result.queryId = parseInt(queryId);
-          this.result.queryTime = parseInt(queryTime);
-          this.result.malOptimizerTime = parseInt(malOptimizerTime);
-          this.result.sqlOptimizerTime = parseInt(sqlOptimizerTime);
-        } else if (this.result.type === MSG_QSCHEMA) {
-          const [queryTime, malOptimizerTime] = rest;
-          this.result.queryTime = parseInt(queryTime);
-          this.result.malOptimizerTime = parseInt(malOptimizerTime);
-        } else if (this.result.type === MSG_QTRANS) {
-          // skip
-        } else if (this.result.type === MSG_QPREPARE) {
-          const [id, rowCnt, columnCnt, rows] = rest;
-          this.result.id = parseInt(id);
-          this.result.rowCnt = parseInt(rowCnt);
-          this.result.columnCnt = parseInt(columnCnt);
+        //else {
+        //    const byteCntToRead = segment.bytes - segment.bytesOffset;
+        //    srcEndIndx = srcStartIndx + byteCntToRead;
+        //    bytesCopied = data.copy(
+        //        this.buff,
+        //        this.offset,
+        //        srcStartIndx,
+        //        srcEndIndx
+        //    );
+        //    this.offset += bytesCopied;
+        //    segment.bytesOffset += bytesCopied;
+        //    // console.log(`segment is full ${segment.bytesOffset === segment.bytes}`);
+        //    bytesProcessed = bytesCopied;
+        //}
+
+        const bytesToRead = Math.min(data.length, this.leftOver);
+        //console.log(`bytesToRead ${bytesToRead}`);
+        if (bytesToRead > 0) {
+            const chunk = data.subarray(0, bytesToRead);
+            this.chunks.push(chunk);
+            this.leftOver -= bytesToRead;
+            bytesProcessed += bytesToRead;
         }
-        // end 1st line
 
-        if (
-          this.headers === undefined &&
-          data.charAt(eol + 1) === MSG_HEADER &&
-          lines > 5
-        ) {
-          let headers: ResponseHeaders = {};
-          while (data.charAt(eol + 1) === MSG_HEADER) {
-            const hs = eol + 1;
-            eol = data.indexOf("\n", hs);
-            headers = {
-              ...headers,
-              ...parseHeaderLine(data.substring(hs, eol)),
-            };
-          }
-          this.headers = headers;
-          const colums: Column[] = [];
-          for (let i = 0; i < this.result.columnCnt; i++) {
-            const table = headers.tableNames && headers.tableNames[i];
-            const name = headers.columnNames && headers.columnNames[i];
-            const type = headers.columnTypes && headers.columnTypes[i];
-            colums.push({
-              table,
-              name,
-              type,
-              index: i,
-            });
-          }
-          this.result.columns = colums;
+
+        //if (this.isQueryResponse()) {
+        //    const tuples = [];
+        //    // const firstPackage = this.parseOffset === 0;
+        //    this.parseOffset += this.parseQueryResponse(
+        //        this.toString(this.parseOffset),
+        //        tuples
+        //    );
+        //    console.log("tuples");
+        //    console.log(tuples);
+        //    if (tuples.length > 0) {
+        //        if (this.queryStream) {
+        //            // emit header once
+        //            if (
+        //                this.headerEmitted === false &&
+        //                this.result &&
+        //                this.result.columns
+        //            ) {
+        //                this.queryStream.emit("header", this.result.columns);
+        //                this.headerEmitted = true;
+        //            }
+        //            // emit tuples
+        //            this.queryStream.emit("data", tuples);
+        //        } else {
+        //            this.result.data = this.result.data || [];
+        //            for (let t of tuples) {
+        //                this.result.data.push(t);
+        //            }
+        //        }
+        //    }
+        //}
+        //console.log(`bytesProcessed ${bytesToRead}`);
+        return bytesProcessed;
+    }
+
+    complete(): boolean {
+        return this.last && (this.leftOver == 0);
+    }
+
+    errorMessage(): string {
+        const msg = this.toString();
+        if (msg.startsWith(MSG_ERROR)) {
+            return msg;
         }
-      }
-      offset = eol + 1;
-      let ts: number = undefined; // tuple index
-      if (data.startsWith(MSG_TUPLE)) {
-        ts = 0;
-      } else if (data.charAt(eol + 1) === MSG_TUPLE) {
-        ts = eol + 1;
-        eol = data.indexOf("\n", ts);
-      }
-      if (ts !== undefined && eol > 0) {
-        // we have a data row
-        do {
-          offset = eol + 1;
-          const tuple = parseTupleLine(
-            data.substring(ts, eol),
-            this.headers.columnTypes
-          );
-          res.push(tuple);
-          if (data.charAt(eol + 1) === MSG_TUPLE) {
-            ts = eol + 1;
-            eol = data.indexOf("\n", ts);
-          } else {
-            ts = undefined;
-          }
-        } while (ts && eol > -1);
-      }
-    }
-    return offset;
-  }
-}
+        return "";
+    }
+
+    isFileTransfer(): boolean {
+        return this.toString().startsWith(MSG_FILETRANS);
+    }
+
+    isPrompt(): boolean {
+        return this.complete() && this.toString() == MSG_PROMPT;
+    }
+
+    isRedirect(): boolean {
+        return this.toString().startsWith(MSG_REDIRECT);
+    }
+
+    isQueryResponse(): boolean {
+        if (this.result && this.result.type) {
+            return this.result.type.startsWith(MSG_Q);
+        }
+        return this.toString().startsWith(MSG_Q);
+    }
+
+    isMsgMore(): boolean {
+        // server wants more ?
+        return this.toString().startsWith(MSG_MORE);
+    }
+
+    toString(start?: number) {
+        if (this.complete() && !this.queryStream && this._str) {
+            if (start)
+                return this._str.substring(start);
+            return this._str;
+        }
+        const buff = Buffer.concat(this.chunks);
+        this._str = buff.toString("utf8");
+        if (start) return this._str.substring(start);
+        return this._str;
+    }
+
+    settle(res?: Promise<any>): void {
+        if (this.settled === false && this.complete()) {
+            const errMsg = this.errorMessage();
+            const err = errMsg ? new Error(errMsg) : null;
+            if (this.queryStream) {
+                if (err) this.queryStream.emit("error", err);
+                this.queryStream.end();
+            } else {
+                if (this.callbacks) {
+                    if (err) {
+                        this.callbacks.reject(err);
+                    } else {
+                        this.callbacks.resolve(res || this.result);
+                    }
+                } else if (this.fileHandler && this.isQueryResponse()) {
+                    this.fileHandler.resolve(this.result);
+                } else if (this.fileHandler && (err || this.fileHandler.err)) {
+                    this.fileHandler.reject(err || this.fileHandler.err);
+                }
+            }
+            this.settled = true;
+            this._str = "";
+            this.chunks = [];
+        }
+    }
+
+    parseQueryResponse(data: string, res: any[]): number {
+        let offset = 0;
+        let eol = data.indexOf("\n");
+        let line = eol > 0 ? data.substring(0, eol) : undefined;
+        while (line) {
+            switch (line.charAt(0)) {
+                case MSG_Q:
+                    // first line
+                    this.result = this.result || {};
+                    this.result.type = line.substring(0, 2);
+                    const rest = line.substring(3).trim().split(" ");
+                    if (this.result.type === MSG_QTABLE) {
+                        const [
+                            id,
+                            rowCnt,
+                            columnCnt,
+                            rows,
+                            queryId,
+                            queryTime,
+                            malOptimizerTime,
+                            sqlOptimizerTime,
+                        ] = rest;
+                        this.result.id = parseInt(id);
+                        this.result.rowCnt = parseInt(rowCnt);
+                        this.result.columnCnt = parseInt(columnCnt);
+                        this.result.queryId = parseInt(queryId);
+                        this.result.queryTime = parseInt(queryTime);
+                        this.result.malOptimizerTime = parseInt(malOptimizerTime);
+                        this.result.sqlOptimizerTime = parseInt(sqlOptimizerTime);
+                    } else if (this.result.type === MSG_QUPDATE) {
+                        const [
+                            affectedRowCnt,
+                            autoIncrementId,
+                            queryId,
+                            queryTime,
+                            malOptimizerTime,
+                            sqlOptimizerTime,
+                        ] = rest;
+                        this.result.affectedRows = parseInt(affectedRowCnt);
+                        this.result.queryId = parseInt(queryId);
+                        this.result.queryTime = parseInt(queryTime);
+                        this.result.malOptimizerTime = parseInt(malOptimizerTime);
+                        this.result.sqlOptimizerTime = parseInt(sqlOptimizerTime);
+                    } else if (this.result.type === MSG_QSCHEMA) {
+                        const [queryTime, malOptimizerTime] = rest;
+                        this.result.queryTime = parseInt(queryTime);
+                        this.result.malOptimizerTime = parseInt(malOptimizerTime);
+                    } else if (this.result.type === MSG_QTRANS) {
+                        // skip
+                    } else if (this.result.type === MSG_QPREPARE) {
+                        const [id, rowCnt, columnCnt, rows] = rest;
+                        this.result.id = parseInt(id);
+                        this.result.rowCnt = parseInt(rowCnt);
+                        this.result.columnCnt = parseInt(columnCnt);
+                    }
+                    break;
+                case MSG_HEADER:
+                    const header = parseHeaderLine(line);
+                    if (this.result.headers !== undefined) {
+                        this.result.headers = {...this.result.headers, ...header};
+                    } else {
+                        this.result.headers = header;
+                    }
+                    // if we have all headers we can compile column info
+                    const haveAllHeaders =
+                        Boolean(this.result.headers.tableNames) &&
+                        Boolean(this.result.headers.columnNames) &&
+                        Boolean(this.result.headers.columnTypes);
+                    if (this.result.columns === undefined && haveAllHeaders) {
+                        const colums: Column[] = [];
+                        for (let i = 0; i < this.result.columnCnt; i++) {
+                            const table = this.result.headers.tableNames[i];
+                            const name = this.result.headers.columnNames[i];
+                            const type = this.result.headers.columnTypes[i];
+                            colums.push({
+                                table,
+                                name,
+                                type,
+                                index: i,
+                            });
+                        }
+                        this.result.columns = colums;
+                    }
+                    break;
+                case MSG_TUPLE:
+                    const tuple = parseTupleLine(line, this.result.headers.columnTypes);
+                    res.push(tuple);
+                    break;
+                default:
+                    throw TypeError(`Invalid query response line!\n${line}`);
+            }
+            // line is processed advance offset
+            offset = eol + 1;
+            // get next line
+            eol = data.indexOf("\n", offset);
+            line = eol > 0 ? data.substring(offset, eol) : undefined;
+        }
+        return offset;
+    }
 
-class Segment {
-  offset: number; // where segment starts
-  bytes: number;
-  bytesOffset: number; // meaningful bytes e.g. if offset + bytesOffset == bytes, then segment full
-  last: boolean;
-  constructor(
-    bytes: number,
-    last: boolean,
-    offset: number,
-    bytesOffset: number
-  ) {
-    this.bytes = bytes;
-    this.last = last;
-    this.offset = offset;
-    this.bytesOffset = bytesOffset;
-  }
-
-  isFull(): boolean {
-    return this.bytes === this.bytesOffset;
-  }
+    streamResult() {
+        if (this.queryStream && this.isQueryResponse()) {
+            const tuples = [];
+            this.parseOffset += this.parseQueryResponse(
+                this.toString(this.parseOffset),
+                tuples
+            );
+            if (tuples.length > 0) {
+                // emit header once
+                if (
+                    this.headerEmitted === false &&
+                    this.result &&
+                    this.result.columns
+                ) {
+                    this.queryStream.emit("header", this.result.columns);
+                    this.headerEmitted = true;
+                }
+                // emit tuples
+                this.queryStream.emit("data", tuples);
+            }
+        }
+    }
 }
 
 class MapiConnection extends EventEmitter {
-  state: MAPI_STATE;
-  socket: Socket;
-  database: string;
-  timeout: number;
-  username: string;
-  password: string;
-  host?: string;
-  unixSocket?: string;
-  port: number;
-  language: MAPI_LANGUAGE;
-  handShakeOptions?: HandShakeOption[];
-  redirects: number;
-  queue: Response[];
-
-  constructor(config: MapiConfig) {
-    super();
-    this.state = MAPI_STATE.INIT;
-    this.socket = this.createSocket(config.timeout);
-    // this.socket = new Socket();
-    // if (config.timeout) this.socket.setTimeout(config.timeout);
-    // this.socket.addListener("data", this.recv.bind(this));
-    // this.socket.addListener("error", this.handleSocketError.bind(this));
-    // this.socket.addListener("timeout", this.handleTimeout.bind(this));
-    // this.socket.addListener("close", () => {
-    //   console.log("socket close event");
-    //   this.emit("end");
-    // });
-    this.redirects = 0;
-    this.queue = [];
-    this.database = config.database;
-    this.language = config.language || MAPI_LANGUAGE.SQL;
-    this.unixSocket = config.unixSocket;
-    this.host = config.host;
-    this.port = config.port;
-    this.username = config.username;
-    this.password = config.password;
-    this.timeout = config.timeout;
-  }
-
-  private createSocket = (timeout?: number): Socket => {
-    const socket = new Socket();
-    if (timeout) socket.setTimeout(timeout);
-    socket.addListener("data", this.recv.bind(this));
-    socket.addListener("error", this.handleSocketError.bind(this));
-    socket.addListener("timeout", this.handleTimeout.bind(this));
-    socket.addListener("close", () => {
-      console.log("socket close event");
-      this.emit("end");
-    });
-    return socket;
-  };
-
-  connect(handShakeOptions: HandShakeOption[] = []): Promise<any[]> {
-    this.handShakeOptions = handShakeOptions;
-    // TODO unix socket
-    const opt: SocketConnectOpts = {
-      port: this.port,
-      host: this.host,
-      noDelay: true,
-    };
-    const socket =
-      this.socket && !this.socket.destroyed
-        ? this.socket
-        : this.createSocket(this.timeout);
-    socket.connect(opt, () => {
-      this.state = MAPI_STATE.CONNECTED;
-      this.socket.setKeepAlive(true);
-    });
-    this.socket = socket;
-
-    return once(this, "ready");
-  }
-
-  ready(): boolean {
-    return this.state === MAPI_STATE.READY;
-  }
-
-  disconnect(): Promise<boolean> {
-    return new Promise((resolve, reject) => {
-      this.socket.end(() => {
-        this.redirects = 0;
+    state: MAPI_STATE;
+    socket: Socket;
+    database: string;
+    timeout: number;
+    username: string;
+    password: string;
+    host?: string;
+    unixSocket?: string;
+    port: number;
+    language: MAPI_LANGUAGE;
+    handShakeOptions?: HandShakeOption[];
+    redirects: number;
+    queue: Response[];
+
+    constructor(config: MapiConfig) {
+        super();
         this.state = MAPI_STATE.INIT;
-        this.socket.destroy();
-        resolve(this.state === MAPI_STATE.INIT);
-      });
-    });
-  }
-
-  private login(challenge: string): void {
-    const challengeParts = challenge.split(":");
-    const [salt, identity, protocol, hashes, endian, algo, opt_level] =
-      challengeParts;
-    let password: string;
-    try {
-      password = createHash(algo).update(this.password).digest("hex");
-    } catch (err) {
-      console.error(err);
-      this.emit("error", new TypeError(`Algorithm ${algo} not supported`));
-      return;
-    }
-    let pwhash = null;
-    // try hash algorithms in the order provided by the server
-    for (const algo of hashes.split(",")) {
-      try {
-        const hash = createHash(algo);
-        pwhash = `{${algo}}` + hash.update(password + salt).digest("hex");
-        break;
-      } catch {}
-    }
-    if (pwhash) {
-      let counterResponse = `LIT:${this.username}:${pwhash}:${this.language}:${this.database}:`;
-      if (opt_level && opt_level.startsWith("sql=")) {
-        let level = 0;
-        counterResponse += "FILETRANS:";
+        this.redirects = 0;
+        this.queue = [];
+        this.database = config.database;
+        this.language = config.language || MAPI_LANGUAGE.SQL;
+        this.unixSocket = config.unixSocket;
+        this.host = config.host;
+        this.port = config.port;
+        this.username = config.username;
+        this.password = config.password;
+        this.timeout = config.timeout;
+    }
+
+    private createSocket = (timeout?: number): Socket => {
+        const socket = new Socket();
+        if (timeout) socket.setTimeout(timeout);
+        socket.addListener("data", this.recv.bind(this));
+        socket.addListener("error", this.handleSocketError.bind(this));
+        socket.addListener("timeout", this.handleTimeout.bind(this));
+        socket.once("end", () => {
+            console.log("Server has ended the connection");
+        });
+        return socket;
+    };
+
+    connect(handShakeOptions: HandShakeOption[] = []): Promise<any[]> {
+        this.handShakeOptions = handShakeOptions;
+        // TODO unix socket
+        const opt: SocketConnectOpts = {
+            port: this.port,
+            host: this.host,
+            noDelay: true,
+        };
+        const socket =
+            this.socket && !this.socket.destroyed
+                ? this.socket
+                : this.createSocket(this.timeout);
+        socket.connect(opt, () => {
+            this.state = MAPI_STATE.CONNECTED;
+            this.socket.setKeepAlive(true);
+        });
+        this.socket = socket;
+
+        return once(this, "ready");
+    }
+
+    ready(): boolean {
+        return this.socket && this.socket.writable && this.state === MAPI_STATE.READY;
+    }
+
+    disconnect(): Promise<true> {
+        return new Promise((resolve, reject) => {
+            if (!this.socket || this.socket.destroyed) {
+                this.socket = null;
+                this.state = MAPI_STATE.INIT;
+                return resolve(true);
+            }
+
+            const onClose = () => {
+                cleanup();
+                this.socket = null;
+                this.state = MAPI_STATE.INIT;
+                resolve(true);
+            };
+
+            const onError = (err: Error) => {
+                console.error(err);
+                cleanup();
+                this.socket?.destroy(); // force cleanup
+                this.socket = null;
+                this.state = MAPI_STATE.INIT;
+                reject(err);
+            };
+
+            const cleanup = () => {
+                this.socket?.removeListener("close", onClose);
+                this.socket?.removeListener("error", onError);
+            };
+
+            this.socket.once("close", onClose);
+            this.socket.once("error", onError);
+
+            // Initiate graceful shutdown
+            this.socket.end();
+        });
+    }
+
+    destroy() {
+        if (this.socket && !this.socket.destroyed)
+            this.socket.destroy();
+        this.socket = null;
+    }
+
+    private login(challenge: string): void {
+        const challengeParts = challenge.split(":");
+        const [salt, identity, protocol, hashes, endian, algo, opt_level] =
+            challengeParts;
+        let password: string;
         try {
-          level = Number(opt_level.substring(4));
+            password = createHash(algo).update(this.password).digest("hex");
         } catch (err) {
-          this.emit(
-            "error",
-            new TypeError("Invalid handshake options level in server challenge")
-          );
-          return;
+            console.error(err);
+            this.emit("error", new TypeError(`Algorithm ${algo} not supported`));
+            return;
         }
-        // process handshake options
-        const options = [];
-        for (const opt of this.handShakeOptions) {
-          if (opt.level < level) {
-            options.push(`${opt.name}=${Number(opt.value)}`);
-            opt.sent = true;
-          }
+        let pwhash = null;
+        // try hash algorithms in the order provided by the server
+        for (const algo of hashes.split(",")) {
+            try {
+                const hash = createHash(algo);
+                pwhash = `{${algo}}` + hash.update(password + salt).digest("hex");
+                break;
+            } catch {}
         }
-        if (options) counterResponse += options.join(",") + ":";
-      }
-      this.send(Buffer.from(counterResponse))
-        .then(() => this.queue.push(new Response()))
-        .catch((err) => this.emit("error", err));
-    } else {
-      this.emit(
-        "error",
-        new TypeError(`None of the hashes ${hashes} are supported`)
-      );
-    }
-  }
-
-  /**
-   * Raise exception on server by sending bad packet
-   */
-  requestAbort(): Promise<void> {
-    return new Promise((resolve, reject) => {
-      const header = Buffer.allocUnsafe(2).fill(0);
-      // larger than allowed and not final message
-      header.writeUint16LE(((2 * MAPI_BLOCK_SIZE) << 1) | 0, 0);
-      // invalid utf8 and too small
-      const badBody = Buffer.concat([
-        Buffer.from("ERROR"),
-        Buffer.from([0x80]),
-      ]);
-      const outBuff = Buffer.concat([header, badBody]);
-      this.socket.write(outBuff, async (err?: Error) => {
-        if (err) reject(err);
-        resolve();
-      });
-    });
-  }
-
-  send(buff: Buffer): Promise<void> {
-    return new Promise((resolve, reject) => {
-      let last = 0;
-      let offset = 0;
-      while (last === 0) {
-        const seg = buff.subarray(offset, offset + MAPI_BLOCK_SIZE);
-        last = seg.length < MAPI_BLOCK_SIZE ? 1 : 0;
-        const header = Buffer.allocUnsafe(2).fill(0);
-        header.writeUint16LE((seg.length << 1) | last, 0);
-        const outBuff = Buffer.concat([header, seg]);
-        this.socket.write(outBuff, (err?: Error) => {
-          if (err) reject(err);
-          if (last) resolve();
+        if (pwhash) {
+            let counterResponse = `LIT:${this.username}:${pwhash}:${this.language}:${this.database}:`;
+            if (opt_level && opt_level.startsWith("sql=")) {
+                let level = 0;
+                counterResponse += "FILETRANS:";
+                try {
+                    level = Number(opt_level.substring(4));
+                } catch (err) {
+                    this.emit(
+                        "error",
+                        new TypeError("Invalid handshake options level in server challenge")
+                    );
+                    return;
+                }
+                // process handshake options
+                const options = [];
+                for (const opt of this.handShakeOptions) {
+                    if (opt.level < level) {
+                        options.push(`${opt.name}=${Number(opt.value)}`);
+                        opt.sent = true;
+                    }
+                }
+                if (options) counterResponse += options.join(",") + ":";
+            }
+            this.send(Buffer.from(counterResponse))
+                .then(() => this.queue.push(new Response()))
+                .catch((err) => this.emit("error", err));
+        } else {
+            this.emit(
+                "error",
+                new TypeError(`None of the hashes ${hashes} are supported`)
+            );
+        }
+    }
+
+    /**
+     * Raise exception on server by sending bad packet
+     */
+    requestAbort(): Promise<void> {
+        return new Promise((resolve, reject) => {
+            const header = Buffer.allocUnsafe(2).fill(0);
+            // larger than allowed and not final message
+            header.writeUint16LE(((2 * MAPI_BLOCK_SIZE) << 1) | 0, 0);
+            // invalid utf8 and too small
+            const badBody = Buffer.concat([
+                Buffer.from("ERROR"),
+                Buffer.from([0x80]),
+            ]);
+            const outBuff = Buffer.concat([header, badBody]);
+            this.socket.write(outBuff, async (err?: Error) => {
+                if (err) reject(err);
+                resolve();
+            });
         });
-        offset += seg.length;
-      }
-    });
-  }
-
-  private handleTimeout() {
-    this.emit("error", new Error("Timeout"));
-  }
-
-  private handleSocketError(err: Error) {
-    console.error(err);
-  }
-
-  async request(
-    sql: string,
-    stream: boolean = false
-  ): Promise<QueryResult | QueryStream> {
-    if (this.ready() === false) throw new Error("Not Connected");
-    await this.send(Buffer.from(sql));
-    return new Promise((resolve, reject) => {
-      const resp = new Response({
-        stream,
-        callbacks: { resolve, reject },
-      });
-      this.queue.push(resp);
-    });
-  }
-
-  async requestFileTransfer(buff: Buffer, fileHandler: any): Promise<void> {
-    await this.send(buff);
-    const resp = new Response({ fileHandler });
-    this.queue.push(resp);
-  }
-
-  async requestFileTransferError(err: string, fileHandler: any): Promise<void> {
-    await this.send(Buffer.from(err));
-    const resp = new Response({ fileHandler });
-    this.queue.push(resp);
-  }
-
-  private recv(data: Buffer): void {
-    let bytesLeftOver: number;
-    let resp: Response;
-    // process queue left to right, find 1st uncomplete response
-    // remove responses that are completed
-    while (this.queue.length) {
-      const next = this.queue[0];
-      if (next.complete() || next.settled) {
-        this.queue.shift();
-      } else {
-        resp = next;
-        break;
-      }
-    }
-    if (resp === undefined && this.queue.length === 0) {
-      // challenge message
-      // or direct call to send has being made
-      // e.g. request api appends Response to the queue
-      resp = new Response();
-      this.queue.push(resp);
-    }
-
-    const offset = resp.append(data);
-
-    if (resp.complete()) this.handleResponse(resp);
-    bytesLeftOver = data.length - offset;
-    if (bytesLeftOver) {
-      const msg = `some ${bytesLeftOver} bytes left over!`;
-      console.warn(msg);
-      this.recv(data.subarray(offset));
-    }
-  }
-
-  private handleResponse(resp: Response): void {
-    const err = resp.errorMessage();
-    if (this.state == MAPI_STATE.CONNECTED) {
-      if (err) {
-        this.emit("error", new Error(err));
-        return;
-      }
-      if (resp.isRedirect()) {
-        this.redirects += 1;
-        if (this.redirects > MAX_REDIRECTS)
-          this.emit(
-            "error",
-            new Error(`Exceeded max number of redirects ${MAX_REDIRECTS}`)
-          );
-        return;
-      }
-      if (resp.isPrompt()) {
-        console.log("login OK");
-        this.state = MAPI_STATE.READY;
-        this.emit("ready", this.state);
-        return;
-      }
-      return this.login(resp.toString());
-    }
-
-    if (resp.isFileTransfer()) {
-      console.log("file transfer");
-      let fhandler: any;
-      const msg = resp.toString(MSG_FILETRANS.length).trim();
-      let mode: string, offset: string, file: string;
-      if (msg.startsWith("r ")) {
-        [mode, offset, file] = msg.split(" ");
-        fhandler =
-          resp.fileHandler || new FileUploader(this, file, parseInt(offset));
-        return resp.settle(fhandler.upload());
-      } else if (msg.startsWith("rb")) {
-        [mode, file] = msg.split(" ");
-        fhandler = resp.fileHandler || new FileUploader(this, file, 0);
-        return resp.settle(fhandler.upload());
-      } else if (msg.startsWith("w")) {
-        [mode, file] = msg.split(" ");
-        fhandler = resp.fileHandler || new FileDownloader(this, file);
-        return resp.settle(fhandler.download());
-      } else {
-        // no msg end of transfer
-        const fileHandler = resp.fileHandler;
-        // we do expect a final response from server
-        this.queue.push(new Response({ fileHandler }));
-        return resp.settle(fileHandler.close());
-      }
-    }
-
-    if (resp.isMsgMore()) {
-      // console.log("server wants more");
-      if (resp.fileHandler instanceof FileUploader)
-        return resp.settle(resp.fileHandler.upload());
-    }
-
-    if (
-      resp.fileHandler instanceof FileDownloader &&
-      resp.fileHandler.ready()
-    ) {
-      // end of download
-      const fileHandler = resp.fileHandler;
-      fileHandler.writeChunk(resp.buff);
-      // we do expect a final response from server
-      this.queue.push(new Response({ fileHandler }));
-      return resp.settle(fileHandler.close());
-    }
-    resp.settle();
-  }
+    }
+
+    send(buff: Buffer): Promise<void> {
+        return new Promise((resolve, reject) => {
+            let last = 0;
+            let offset = 0;
+            while (last === 0) {
+                const seg = buff.subarray(offset, offset + MAPI_BLOCK_SIZE);
+                last = seg.length < MAPI_BLOCK_SIZE ? 1 : 0;
+                const header = Buffer.allocUnsafe(2).fill(0);
+                header.writeUint16LE((seg.length << 1) | last, 0);
+                const outBuff = Buffer.concat([header, seg]);
+                this.socket.write(outBuff, (err?: Error) => {
+                    if (err) reject(err);
+                    if (last) resolve();
+                });
+                offset += seg.length;
+            }
+        });
+    }
+
+    private handleTimeout() {
+        this.emit("error", new Error("Timeout"));
+    }
+
+    private handleSocketError(err: Error) {
+        console.error('Socket error: ', err);
+        this.destroy();
+    }
+
+    async request(
+        sql: string,
+        stream: boolean = false
+    ): Promise<QueryResult | QueryStream> {
+        if (this.ready() === false) throw new Error("Not Connected");
+        await this.send(Buffer.from(sql));
+        return new Promise((resolve, reject) => {
+            const resp = new Response({
+                stream,
+                callbacks: {resolve, reject},
+            });
+            this.queue.push(resp);
+        });
+    }
+
+    async requestFileTransfer(buff: Buffer, fileHandler: any): Promise<void> {
+        await this.send(buff);
+        const resp = new Response({fileHandler});
+        this.queue.push(resp);
+    }
+
+    async requestFileTransferError(err: string, fileHandler: any): Promise<void> {
+        await this.send(Buffer.from(err));
+        const resp = new Response({fileHandler});
+        this.queue.push(resp);
+    }
+
+    private recv(data: Buffer): void {
+        let bytesLeftOver: number;
+        let resp: Response;
+        // process queue left to right,
+        // find 1st uncomplete response
+        // remove complete responses
+        while (this.queue.length) {
+            const next = this.queue[0];
+            if (next.complete() || next.settled) {
+                this.queue.shift();
+            } else {
+                resp = next;
+                break;
+            }
+        }
+        if (resp === undefined && this.queue.length === 0) {
+            // challenge message
+            // or direct call to send has being made
+            // request api appends Response to the queue
+            resp = new Response();
+            this.queue.push(resp);
+        }
+        let offset = 0;
+        let end = data.length;
+        do {
+            offset += resp.append(data.subarray(offset, end));
+        } while ((offset < end) && !resp.complete());
+
+        if (resp.queryStream)
+            resp.streamResult();
+
+        if (resp.complete())
+            this.handleResponse(resp);
+
+        bytesLeftOver = data.length - offset;
+        if (bytesLeftOver) {
+            //const msg = `some ${bytesLeftOver} bytes left over!`;
+            //console.warn(msg);
+            this.recv(data.subarray(offset));
+        }
+    }
+
+    private handleResponse(resp: Response): void {
+        const err = resp.errorMessage();
+        if (this.state == MAPI_STATE.CONNECTED) {
+            if (err) {
+                this.emit("error", new Error(err));
+                return;
+            }
+            if (resp.isRedirect()) {
+                this.redirects += 1;
+                if (this.redirects > MAX_REDIRECTS)
+                    this.emit(
+                        "error",
+                        new Error(`Exceeded max number of redirects ${MAX_REDIRECTS}`)
+                    );
+                return;
+            }
+            if (resp.isPrompt()) {
+                //console.log("login OK");
+                this.state = MAPI_STATE.READY;
+                this.emit("ready", this.state);
+                return;
+            }
+            return this.login(resp.toString());
+        }
+
+        if (resp.isFileTransfer()) {
+            //console.log("file transfer");
+            let fhandler: any;
+            const msg = resp.toString(MSG_FILETRANS.length).trim();
+            let mode: string, offset: string, file: string;
+            if (msg.startsWith("r ")) {
+                [mode, offset, file] = msg.split(" ");
+                fhandler =
+                    resp.fileHandler || new FileUploader(this, file, parseInt(offset));
+                return resp.settle(fhandler.upload());
+            } else if (msg.startsWith("rb")) {
+                [mode, file] = msg.split(" ");
+                fhandler = resp.fileHandler || new FileUploader(this, file, 0);
+                return resp.settle(fhandler.upload());
+            } else if (msg.startsWith("w")) {
+                [mode, file] = msg.split(" ");
+                fhandler = resp.fileHandler || new FileDownloader(this, file);
+                return resp.settle(fhandler.download());
+            } else {
+                // no msg end of transfer
+                const fileHandler = resp.fileHandler;
+                // we do expect a final response from server
+                this.queue.push(new Response({fileHandler}));
+                return resp.settle(fileHandler.close());
+            }
+        }
+
+        if (resp.isMsgMore()) {
+            // console.log("server wants more");
+            if (resp.fileHandler instanceof FileUploader)
+                return resp.settle(resp.fileHandler.upload());
+        }
+
+        if (
+            resp.fileHandler instanceof FileDownloader &&
+            resp.fileHandler.ready()
+        ) {
+            // end of download
+            const fileHandler = resp.fileHandler;
+            const buff = Buffer.concat(resp.chunks);
+            fileHandler.writeChunk(buff);
+            // we do expect a final response from server
+            this.queue.push(new Response({fileHandler}));
+            return resp.settle(fileHandler.close());
+        }
+
+        if (resp.isQueryResponse()) {
+            const data = [];
+            resp.parseQueryResponse(
+                resp.toString(),
+                data
+            );
+            resp.result.data = data;
+        }
+
+        resp.settle();
+    }
 }
 
 export {
-  MapiConfig,
-  MapiConnection,
-  parseMapiUri,
-  createMapiConfig,
-  HandShakeOption,
-  QueryResult,
-  QueryStream,
+    MapiConfig,
+    MapiConnection,
+    parseMapiUri,
+    createMapiConfig,
+    HandShakeOption,
+    QueryResult,
+    QueryStream,
 };