tedious 6.4.0 → 6.6.2

package/lib/metadata-parser.js

@@ -1,174 +1,297 @@
 "use strict";
 
-const codepageBySortId = require('./collation').codepageBySortId;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.readCollation = readCollation;
+exports.default = void 0;
 
-const codepageByLcid = require('./collation').codepageByLcid;
+var _collation = require("./collation");
 
-const TYPE = require('./data-type').TYPE;
+var _dataType = require("./data-type");
 
-const sprintf = require('sprintf-js').sprintf;
+var _sprintfJs = require("sprintf-js");
 
-module.exports = metadataParse;
-module.exports.readPrecision = readPrecision;
-module.exports.readScale = readScale;
-module.exports.readCollation = readCollation;
-
-function readDataLength(parser, type, callback) {
-  if ((type.id & 0x30) === 0x20) {
-    // xx10xxxx - s2.2.4.2.1.3
-    // Variable length
-    if (type.dataLengthFromScale) {
-      return callback(0); // dataLength is resolved from scale
-    } else if (type.fixedDataLength) {
-      return callback(type.fixedDataLength);
-    }
-
-    switch (type.dataLengthLength) {
-      case 0:
-        return callback(undefined);
-
-      case 1:
-        return parser.readUInt8(callback);
-
-      case 2:
-        return parser.readUInt16LE(callback);
-
-      case 4:
-        return parser.readUInt32LE(callback);
-
-      default:
-        return parser.emit(new Error('Unsupported dataLengthLength ' + type.dataLengthLength + ' for data type ' + type.name));
-    }
-  } else {
-    callback(undefined);
-  }
-}
+function readCollation(parser, callback) {
+  // s2.2.5.1.2
+  parser.readBuffer(5, collationData => {
+    let lcid = (collationData[2] & 0x0F) << 16;
+    lcid |= collationData[1] << 8;
+    lcid |= collationData[0]; // This may not be extracting the correct nibbles in the correct order.
 
-function readPrecision(parser, type, callback) {
-  if (type.hasPrecision) {
-    parser.readUInt8(callback);
-  } else {
-    callback(undefined);
-  }
-}
-
-function readScale(parser, type, callback) {
-  if (type.hasScale) {
-    parser.readUInt8(callback);
-  } else {
-    callback(undefined);
-  }
-}
+    let flags = collationData[3] >> 4;
+    flags |= collationData[2] & 0xF0; // This may not be extracting the correct nibble.
 
-function readCollation(parser, type, callback) {
-  if (type.hasCollation) {
-    // s2.2.5.1.2
-    parser.readBuffer(5, collationData => {
-      const collation = {};
-      collation.lcid = (collationData[2] & 0x0F) << 16;
-      collation.lcid |= collationData[1] << 8;
-      collation.lcid |= collationData[0]; // This may not be extracting the correct nibbles in the correct order.
-
-      collation.flags = collationData[3] >> 4;
-      collation.flags |= collationData[2] & 0xF0; // This may not be extracting the correct nibble.
-
-      collation.version = collationData[3] & 0x0F;
-      collation.sortId = collationData[4];
-      collation.codepage = codepageBySortId[collation.sortId] || codepageByLcid[collation.lcid] || 'CP1252';
-      callback(collation);
+    const version = collationData[3] & 0x0F;
+    const sortId = collationData[4];
+    const codepage = _collation.codepageBySortId[sortId] || _collation.codepageByLcid[lcid] || 'CP1252';
+    callback({
+      lcid,
+      flags,
+      version,
+      sortId,
+      codepage
     });
-  } else {
-    callback(undefined);
-  }
+  });
 }
 
-function readSchema(parser, type, callback) {
-  if (type.hasSchemaPresent) {
-    // s2.2.5.5.3
-    parser.readUInt8(schemaPresent => {
-      if (schemaPresent === 0x01) {
-        parser.readBVarChar(dbname => {
-          parser.readBVarChar(owningSchema => {
-            parser.readUsVarChar(xmlSchemaCollection => {
-              callback({
-                dbname: dbname,
-                owningSchema: owningSchema,
-                xmlSchemaCollection: xmlSchemaCollection
-              });
+function readSchema(parser, callback) {
+  // s2.2.5.5.3
+  parser.readUInt8(schemaPresent => {
+    if (schemaPresent === 0x01) {
+      parser.readBVarChar(dbname => {
+        parser.readBVarChar(owningSchema => {
+          parser.readUsVarChar(xmlSchemaCollection => {
+            callback({
+              dbname: dbname,
+              owningSchema: owningSchema,
+              xmlSchemaCollection: xmlSchemaCollection
             });
           });
         });
-      } else {
-        callback(undefined);
-      }
-    });
-  } else {
-    callback(undefined);
-  }
+      });
+    } else {
+      callback(undefined);
+    }
+  });
 }
 
-function readUDTInfo(parser, type, callback) {
-  if (type.hasUDTInfo) {
-    parser.readUInt16LE(maxByteSize => {
-      parser.readBVarChar(dbname => {
-        parser.readBVarChar(owningSchema => {
-          parser.readBVarChar(typeName => {
-            parser.readUsVarChar(assemblyName => {
-              callback({
-                maxByteSize: maxByteSize,
-                dbname: dbname,
-                owningSchema: owningSchema,
-                typeName: typeName,
-                assemblyName: assemblyName
-              });
+function readUDTInfo(parser, callback) {
+  parser.readUInt16LE(maxByteSize => {
+    parser.readBVarChar(dbname => {
+      parser.readBVarChar(owningSchema => {
+        parser.readBVarChar(typeName => {
+          parser.readUsVarChar(assemblyName => {
+            callback({
+              maxByteSize: maxByteSize,
+              dbname: dbname,
+              owningSchema: owningSchema,
+              typeName: typeName,
+              assemblyName: assemblyName
             });
           });
         });
       });
     });
-  } else {
-    return callback();
-  }
+  });
 }
 
 function metadataParse(parser, options, callback) {
   (options.tdsVersion < '7_2' ? parser.readUInt16LE : parser.readUInt32LE).call(parser, userType => {
     parser.readUInt16LE(flags => {
       parser.readUInt8(typeNumber => {
-        const type = TYPE[typeNumber];
+        const type = _dataType.TYPE[typeNumber];
 
         if (!type) {
-          return parser.emit(new Error(sprintf('Unrecognised data type 0x%02X', typeNumber)));
+          return parser.emit('error', new Error((0, _sprintfJs.sprintf)('Unrecognised data type 0x%02X', typeNumber)));
         }
 
-        readDataLength(parser, type, dataLength => {
-          readPrecision(parser, type, precision => {
-            readScale(parser, type, scale => {
-              if (scale && type.dataLengthFromScale) {
-                dataLength = type.dataLengthFromScale(scale);
-              }
-
-              readCollation(parser, type, collation => {
-                readSchema(parser, type, schema => {
-                  readUDTInfo(parser, type, udtInfo => {
-                    callback({
-                      userType: userType,
-                      flags: flags,
-                      type: type,
-                      collation: collation,
-                      precision: precision,
-                      scale: scale,
-                      dataLength: dataLength,
-                      schema: schema,
-                      udtInfo: udtInfo
-                    });
+        switch (type.name) {
+          case 'Null':
+          case 'TinyInt':
+          case 'SmallInt':
+          case 'Int':
+          case 'BigInt':
+          case 'Real':
+          case 'Float':
+          case 'SmallMoney':
+          case 'Money':
+          case 'Bit':
+          case 'SmallDateTime':
+          case 'DateTime':
+          case 'Date':
+            return callback({
+              userType: userType,
+              flags: flags,
+              type: type,
+              collation: undefined,
+              precision: undefined,
+              scale: undefined,
+              dataLength: undefined,
+              schema: undefined,
+              udtInfo: undefined
+            });
+
+          case 'IntN':
+          case 'FloatN':
+          case 'MoneyN':
+          case 'BitN':
+          case 'UniqueIdentifier':
+          case 'DateTimeN':
+            return parser.readUInt8(dataLength => {
+              callback({
+                userType: userType,
+                flags: flags,
+                type: type,
+                collation: undefined,
+                precision: undefined,
+                scale: undefined,
+                dataLength: dataLength,
+                schema: undefined,
+                udtInfo: undefined
+              });
+            });
+
+          case 'Variant':
+            return parser.readUInt32LE(dataLength => {
+              callback({
+                userType: userType,
+                flags: flags,
+                type: type,
+                collation: undefined,
+                precision: undefined,
+                scale: undefined,
+                dataLength: dataLength,
+                schema: undefined,
+                udtInfo: undefined
+              });
+            });
+
+          case 'VarChar':
+          case 'Char':
+          case 'NVarChar':
+          case 'NChar':
+            return parser.readUInt16LE(dataLength => {
+              readCollation(parser, collation => {
+                callback({
+                  userType: userType,
+                  flags: flags,
+                  type: type,
+                  collation: collation,
+                  precision: undefined,
+                  scale: undefined,
+                  dataLength: dataLength,
+                  schema: undefined,
+                  udtInfo: undefined
+                });
+              });
+            });
+
+          case 'Text':
+          case 'NText':
+            return parser.readUInt32LE(dataLength => {
+              readCollation(parser, collation => {
+                callback({
+                  userType: userType,
+                  flags: flags,
+                  type: type,
+                  collation: collation,
+                  precision: undefined,
+                  scale: undefined,
+                  dataLength: dataLength,
+                  schema: undefined,
+                  udtInfo: undefined
+                });
+              });
+            });
+
+          case 'VarBinary':
+          case 'Binary':
+            return parser.readUInt16LE(dataLength => {
+              callback({
+                userType: userType,
+                flags: flags,
+                type: type,
+                collation: undefined,
+                precision: undefined,
+                scale: undefined,
+                dataLength: dataLength,
+                schema: undefined,
+                udtInfo: undefined
+              });
+            });
+
+          case 'Image':
+            return parser.readUInt32LE(dataLength => {
+              callback({
+                userType: userType,
+                flags: flags,
+                type: type,
+                collation: undefined,
+                precision: undefined,
+                scale: undefined,
+                dataLength: dataLength,
+                schema: undefined,
+                udtInfo: undefined
+              });
+            });
+
+          case 'Xml':
+            return readSchema(parser, schema => {
+              callback({
+                userType: userType,
+                flags: flags,
+                type: type,
+                collation: undefined,
+                precision: undefined,
+                scale: undefined,
+                dataLength: undefined,
+                schema: schema,
+                udtInfo: undefined
+              });
+            });
+
+          case 'Time':
+          case 'DateTime2':
+          case 'DateTimeOffset':
+            return parser.readUInt8(scale => {
+              callback({
+                userType: userType,
+                flags: flags,
+                type: type,
+                collation: undefined,
+                precision: undefined,
+                scale: scale,
+                dataLength: undefined,
+                schema: undefined,
+                udtInfo: undefined
+              });
+            });
+
+          case 'NumericN':
+          case 'DecimalN':
+            return parser.readUInt8(dataLength => {
+              parser.readUInt8(precision => {
+                parser.readUInt8(scale => {
+                  callback({
+                    userType: userType,
+                    flags: flags,
+                    type: type,
+                    collation: undefined,
+                    precision: precision,
+                    scale: scale,
+                    dataLength: dataLength,
+                    schema: undefined,
+                    udtInfo: undefined
                   });
                 });
               });
             });
-          });
-        });
+
+          case 'UDT':
+            return readUDTInfo(parser, udtInfo => {
+              callback({
+                userType: userType,
+                flags: flags,
+                type: type,
+                collation: undefined,
+                precision: undefined,
+                scale: undefined,
+                dataLength: undefined,
+                schema: undefined,
+                udtInfo: udtInfo
+              });
+            });
+
+          default:
+            return parser.emit('error', new Error((0, _sprintfJs.sprintf)('Unrecognised type %s', type.name)));
+        }
       });
     });
   });
-}
+}
+
+var _default = metadataParse;
+exports.default = _default;
+module.exports = metadataParse;
+module.exports.readCollation = readCollation;

package/lib/ntlm-payload.js

@@ -9,13 +9,13 @@ var _writableTrackingBuffer = _interopRequireDefault(require("./tracking-buffer/
 
 var crypto = _interopRequireWildcard(require("crypto"));
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+var _jsbi = _interopRequireDefault(require("jsbi"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
-const BigInteger = require('big-number');
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; if (obj != null) { var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-const hex = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class NTLMResponsePayload {
   constructor(loginData) {
@@ -113,25 +113,16 @@ class NTLMResponsePayload {
   }
 
   createTimestamp(time) {
-    const tenthsOfAMicrosecond = BigInteger(time).plus(11644473600).multiply(10000000);
-    const hexArray = [];
-    let pair = [];
-
-    while (tenthsOfAMicrosecond.val() !== '0') {
-      const idx = tenthsOfAMicrosecond.mod(16);
-      pair.unshift(hex[idx]);
-
-      if (pair.length === 2) {
-        hexArray.push(pair.join(''));
-        pair = [];
-      }
-    }
+    const tenthsOfAMicrosecond = _jsbi.default.multiply(_jsbi.default.add(_jsbi.default.BigInt(time), _jsbi.default.BigInt(11644473600)), _jsbi.default.BigInt(10000000));
 
-    if (pair.length > 0) {
-      hexArray.push(pair[0] + '0');
-    }
+    const lo = _jsbi.default.toNumber(_jsbi.default.bitwiseAnd(tenthsOfAMicrosecond, _jsbi.default.BigInt(0xffffffff)));
+
+    const hi = _jsbi.default.toNumber(_jsbi.default.bitwiseAnd(_jsbi.default.signedRightShift(tenthsOfAMicrosecond, _jsbi.default.BigInt(32)), _jsbi.default.BigInt(0xffffffff)));
 
-    return Buffer.from(hexArray.join(''), 'hex');
+    const result = Buffer.alloc(8);
+    result.writeUInt32LE(lo, 0);
+    result.writeUInt32LE(hi, 4);
+    return result;
   }
 
   lmv2Response(domain, user, password, serverNonce, clientNonce) {

package/lib/outgoing-message-stream.js

@@ -5,14 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _packet = require("./packet");
+var _bl = _interopRequireDefault(require("bl"));
+
+var _readableStream = require("readable-stream");
 
-const BufferList = require('bl');
+var _packet = require("./packet");
 
-const _require = require('readable-stream'),
-      Duplex = _require.Duplex;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-class OutgoingMessageStream extends Duplex {
+class OutgoingMessageStream extends _readableStream.Duplex {
   constructor(debug, {
     packetSize
   }) {
@@ -21,7 +22,7 @@ class OutgoingMessageStream extends Duplex {
     });
     this.packetSize = packetSize;
     this.debug = debug;
-    this.bl = new BufferList(); // When the writable side is ended, push `null`
+    this.bl = new _bl.default(); // When the writable side is ended, push `null`
     // to also end the readable side.
 
     this.on('finish', () => {

package/lib/packet.js

@@ -7,8 +7,7 @@ exports.isPacketComplete = isPacketComplete;
 exports.packetLength = packetLength;
 exports.Packet = exports.OFFSET = exports.TYPE = exports.HEADER_LENGTH = void 0;
 
-const _require = require('sprintf-js'),
-      sprintf = _require.sprintf;
+var _sprintfJs = require("sprintf-js");
 
 const HEADER_LENGTH = 8;
 exports.HEADER_LENGTH = HEADER_LENGTH;
@@ -160,7 +159,7 @@ class Packet {
   }
 
   headerToString(indent = '') {
-    const text = sprintf('type:0x%02X(%s), status:0x%02X(%s), length:0x%04X, spid:0x%04X, packetId:0x%02X, window:0x%02X', this.buffer.readUInt8(OFFSET.Type), typeByValue[this.buffer.readUInt8(OFFSET.Type)], this.buffer.readUInt8(OFFSET.Status), this.statusAsString(), this.buffer.readUInt16BE(OFFSET.Length), this.buffer.readUInt16BE(OFFSET.SPID), this.buffer.readUInt8(OFFSET.PacketID), this.buffer.readUInt8(OFFSET.Window));
+    const text = (0, _sprintfJs.sprintf)('type:0x%02X(%s), status:0x%02X(%s), length:0x%04X, spid:0x%04X, packetId:0x%02X, window:0x%02X', this.buffer.readUInt8(OFFSET.Type), typeByValue[this.buffer.readUInt8(OFFSET.Type)], this.buffer.readUInt8(OFFSET.Status), this.statusAsString(), this.buffer.readUInt16BE(OFFSET.Length), this.buffer.readUInt16BE(OFFSET.SPID), this.buffer.readUInt8(OFFSET.PacketID), this.buffer.readUInt8(OFFSET.Window));
     return indent + text;
   }
 
@@ -175,7 +174,7 @@ class Packet {
     for (let offset = 0; offset < data.length; offset++) {
       if (offset % BYTES_PER_LINE === 0) {
         dataDump += indent;
-        dataDump += sprintf('%04X  ', offset);
+        dataDump += (0, _sprintfJs.sprintf)('%04X  ', offset);
       }
 
       if (data[offset] < 0x20 || data[offset] > 0x7E) {
@@ -189,7 +188,7 @@ class Packet {
       }
 
       if (data[offset] != null) {
-        dataDump += sprintf('%02X', data[offset]);
+        dataDump += (0, _sprintfJs.sprintf)('%02X', data[offset]);
       }
 
       if ((offset + 1) % BYTES_PER_GROUP === 0 && !((offset + 1) % BYTES_PER_LINE === 0)) {

package/lib/prelogin-payload.js

@@ -5,13 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _sprintfJs = require("sprintf-js");
+
 var _writableTrackingBuffer = _interopRequireDefault(require("./tracking-buffer/writable-tracking-buffer"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const _require = require('sprintf-js'),
-      sprintf = _require.sprintf;
-
 const optionBufferSize = 20;
 const VERSION = 0x000000001;
 const SUBBUILD = 0x0001;
@@ -231,7 +230,7 @@ class PreloginPayload {
   }
 
   toString(indent = '') {
-    return indent + 'PreLogin - ' + sprintf('version:%d.%d.%d.%d %d, encryption:0x%02X(%s), instopt:0x%02X, threadId:0x%08X, mars:0x%02X(%s)', this.version.major, this.version.minor, this.version.patch, this.version.trivial, this.version.subbuild, this.encryption ? this.encryption : 0, this.encryptionString ? this.encryptionString : '', this.instance ? this.instance : 0, this.threadId ? this.threadId : 0, this.mars ? this.mars : 0, this.marsString ? this.marsString : '');
+    return indent + 'PreLogin - ' + (0, _sprintfJs.sprintf)('version:%d.%d.%d.%d %d, encryption:0x%02X(%s), instopt:0x%02X, threadId:0x%08X, mars:0x%02X(%s)', this.version.major, this.version.minor, this.version.patch, this.version.trivial, this.version.subbuild, this.encryption ? this.encryption : 0, this.encryptionString ? this.encryptionString : '', this.instance ? this.instance : 0, this.threadId ? this.threadId : 0, this.mars ? this.mars : 0, this.marsString ? this.marsString : '');
   }
 
 }

package/lib/request.js

@@ -7,9 +7,9 @@ exports.default = void 0;
 
 var _events = require("events");
 
-const TYPES = require('./data-type').typeByName;
+var _dataType = require("./data-type");
 
-const RequestError = require('./errors').RequestError;
+var _errors = require("./errors");
 
 class Request extends _events.EventEmitter {
   constructor(sqlTextOrProcedure, callback) {
@@ -106,10 +106,10 @@ class Request extends _events.EventEmitter {
 
     this.originalParameters = this.parameters;
     this.parameters = [];
-    this.addParameter('statement', TYPES.NVarChar, this.sqlTextOrProcedure);
+    this.addParameter('statement', _dataType.typeByName.NVarChar, this.sqlTextOrProcedure);
 
     if (this.originalParameters.length) {
-      this.addParameter('params', TYPES.NVarChar, this.makeParamsParameter(this.originalParameters));
+      this.addParameter('params', _dataType.typeByName.NVarChar, this.makeParamsParameter(this.originalParameters));
     }
 
     for (let i = 0, len = this.originalParameters.length; i < len; i++) {
@@ -123,29 +123,29 @@ class Request extends _events.EventEmitter {
   transformIntoPrepareRpc() {
     this.originalParameters = this.parameters;
     this.parameters = [];
-    this.addOutputParameter('handle', TYPES.Int, undefined);
-    this.addParameter('params', TYPES.NVarChar, this.makeParamsParameter(this.originalParameters));
-    this.addParameter('stmt', TYPES.NVarChar, this.sqlTextOrProcedure);
+    this.addOutputParameter('handle', _dataType.typeByName.Int, undefined);
+    this.addParameter('params', _dataType.typeByName.NVarChar, this.makeParamsParameter(this.originalParameters));
+    this.addParameter('stmt', _dataType.typeByName.NVarChar, this.sqlTextOrProcedure);
     this.sqlTextOrProcedure = 'sp_prepare';
     this.preparing = true;
     this.on('returnValue', (name, value) => {
       if (name === 'handle') {
         this.handle = value;
       } else {
-        this.error = RequestError(`Tedious > Unexpected output parameter ${name} from sp_prepare`);
+        this.error = (0, _errors.RequestError)(`Tedious > Unexpected output parameter ${name} from sp_prepare`);
       }
     });
   }
 
   transformIntoUnprepareRpc() {
     this.parameters = [];
-    this.addParameter('handle', TYPES.Int, this.handle);
+    this.addParameter('handle', _dataType.typeByName.Int, this.handle);
     this.sqlTextOrProcedure = 'sp_unprepare';
   }
 
   transformIntoExecuteRpc(parameters) {
     this.parameters = [];
-    this.addParameter('handle', TYPES.Int, this.handle);
+    this.addParameter('handle', _dataType.typeByName.Int, this.handle);
 
     for (let i = 0, len = this.originalParameters.length; i < len; i++) {
       const parameter = this.originalParameters[i];
@@ -166,7 +166,7 @@ class Request extends _events.EventEmitter {
       const value = parameter.type.validate(parameter.value);
 
       if (value instanceof TypeError) {
-        return this.error = new RequestError('Validation failed for parameter \'' + parameter.name + '\'. ' + value.message, 'EPARAM');
+        return this.error = new _errors.RequestError('Validation failed for parameter \'' + parameter.name + '\'. ' + value.message, 'EPARAM');
       }
 
       parameter.value = value;