Merge branch 'JsMqtt-7-Client' into JsMqtt-8-311

Author: Bret Ambrose

lib/browser/mqtt_internal/client.ts

@@ -233,30 +233,6 @@ function buildClientConfigLogString(prefix: string, config: ClientConfig) : stri
     return result;
 }
 
-function validateUnsignedInteger(value: number, fieldName: string) {
-    if (!Number.isInteger(value) || value < 0) {
-        throw new CrtError(`Field "${fieldName}" with value "${value}" is not a valid unsigned integer`);
-    }
-}
-
-function validateOptionalUnsignedInteger(value: number | undefined, fieldName: string) {
-    if (value === undefined) {
-        return;
-    }
-
-    validateUnsignedInteger(value, fieldName);
-}
-
-function validateOptionalPositiveU32(value: number | undefined, fieldName: string) {
-    if (value === undefined) {
-        return;
-    }
-
-    if (!Number.isInteger(value) || value <= 0 || value > (256 * 256 * 256 * 256 - 1)) {
-        throw new CrtError(`Field "${fieldName}" with value "${value}" is not a valid positive 32 bit integer`);
-    }
-}
-
 function validateConnectOptions(options : ConnectOptions, mode : ProtocolMode) {
     if (options.connectPacketTransformer && (typeof options.connectPacketTransformer !== "function")) {
         throw new CrtError("connectPacketTransformer must be a function");
@@ -278,7 +254,7 @@ function validateConnectOptions(options : ConnectOptions, mode : ProtocolMode) {
         validate.validateU16(options.receiveMaximum, "receiveMaximum");
     }
 
-    validateOptionalPositiveU32(options.maximumPacketSizeBytes, "maximumPacketSizeBytes");
+    validate.validateOptionalPositiveU32(options.maximumPacketSizeBytes, "maximumPacketSizeBytes");
     validate.validateOptionalU32(options.willDelayIntervalSeconds, "willDelayIntervalSeconds");
 
     if (options.will !== undefined) {
@@ -299,21 +275,21 @@ function validateConfig(config: ClientConfig) {
 
     validateConnectOptions(config.connectOptions, config.protocolVersion);
 
-    validateOptionalUnsignedInteger(config.pingTimeoutMillis, "pingTimeoutMillis");
+    validate.validateOptionalUnsignedInteger(config.pingTimeoutMillis, "pingTimeoutMillis");
 
     if (!config.connectionFactory || (typeof config.connectionFactory !== "function")) {
         throw new CrtError("connectionFactory must be a valid function");
     }
 
-    validateUnsignedInteger(config.connectTimeoutMillis, "connectTimeoutMillis");
+    validate.validateUnsignedInteger(config.connectTimeoutMillis, "connectTimeoutMillis");
 
     if (config.retryJitterMode !== undefined && mqtt5.RetryJitterType[config.retryJitterMode] == undefined) {
         throw new CrtError("Invalid value for retryJitterMode");
     }
 
-    validateOptionalUnsignedInteger(config.minReconnectDelayMs, "minReconnectDelayMs");
-    validateOptionalUnsignedInteger(config.maxReconnectDelayMs, "maxReconnectDelayMs");
-    validateOptionalUnsignedInteger(config.resetConnectionFailureCountMillis, "resetConnectionFailureCountMillis");
+    validate.validateOptionalUnsignedInteger(config.minReconnectDelayMs, "minReconnectDelayMs");
+    validate.validateOptionalUnsignedInteger(config.maxReconnectDelayMs, "maxReconnectDelayMs");
+    validate.validateOptionalUnsignedInteger(config.resetConnectionFailureCountMillis, "resetConnectionFailureCountMillis");
 
     if (config.resubscribeMode !== undefined && ResubscribeModeType[config.resubscribeMode] == undefined) {
         throw new CrtError("Invalid value for resubscribeMode");

lib/browser/mqtt_internal/validate.ts

@@ -170,6 +170,30 @@ function validateOptionalVli(value: number | undefined, fieldName: string) {
     }
 }
 
+export function validateUnsignedInteger(value: number, fieldName: string) {
+    if (!Number.isInteger(value) || value < 0) {
+        throw new CrtError(`Field "${fieldName}" with value "${value}" is not a valid unsigned integer`);
+    }
+}
+
+export function validateOptionalUnsignedInteger(value: number | undefined, fieldName: string) {
+    if (value === undefined) {
+        return;
+    }
+
+    validateUnsignedInteger(value, fieldName);
+}
+
+export function validateOptionalPositiveU32(value: number | undefined, fieldName: string) {
+    if (value === undefined) {
+        return;
+    }
+
+    if (!Number.isInteger(value) || value <= 0 || value > (256 * 256 * 256 * 256 - 1)) {
+        throw new CrtError(`Field "${fieldName}" with value "${value}" is not a valid positive 32 bit integer`);
+    }
+}
+
 // we don't validate length here because we don't know encoding length without doing a utf-8 conversion.
 // This means we validate string length in the internal validators which checks ArrayBuffer lengths.
 function validateString(value: any, fieldName: string) {