/*
 * (C) Copyright 2021 Boni Garcia (http://bonigarcia.github.io/)
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */
package io.github.bonigarcia.wdm.webdriver;

import static java.lang.System.currentTimeMillis;
import static java.lang.Thread.currentThread;
import static java.lang.Thread.sleep;
import static java.lang.invoke.MethodHandles.lookup;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.slf4j.LoggerFactory.getLogger;

import java.lang.reflect.InvocationTargetException;
import java.net.URL;

import org.openqa.selenium.Capabilities;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.remote.RemoteWebDriver;
import org.slf4j.Logger;

import io.github.bonigarcia.wdm.config.Config;
import io.github.bonigarcia.wdm.config.WebDriverManagerException;

/**
 * Builder for WebDriver objects.
 *
 * @author Boni Garcia
 * @since 5.0.0
 */
public class WebDriverCreator {

    final Logger log = getLogger(lookup().lookupClass());

    static final int POLL_TIME_SEC = 1;

    Config config;

    public WebDriverCreator(Config config) {
        this.config = config;
    }

    public WebDriverBrowser createLocalWebDriver(Class<?> browserClass,
            Capabilities capabilities)
            throws InstantiationException, IllegalAccessException,
            InvocationTargetException, NoSuchMethodException {
        WebDriver driver;
        if (capabilities != null) {
            driver = (WebDriver) browserClass
                    .getDeclaredConstructor(Capabilities.class)
                    .newInstance(capabilities);
        } else {
            driver = (WebDriver) browserClass.getDeclaredConstructor()
                    .newInstance();
        }
        return createWebDriverBrowser(driver);
    }

    public WebDriverBrowser createRemoteWebDriver(String remoteUrl,
            Capabilities capabilities) {
        WebDriver webdriver = null;
        int waitTimeoutSec = config.getTimeout();
        long timeoutMs = currentTimeMillis() + SECONDS.toMillis(waitTimeoutSec);

        String browserName = capabilities.getBrowserName();
        log.debug("Creating WebDriver object for {} at {} with {}", browserName,
                remoteUrl, capabilities);
        do {
            if (currentTimeMillis() > timeoutMs) {
                throw new WebDriverManagerException(
                        "Timeout of " + waitTimeoutSec
                                + "  seconds creating WebDriver object");
            }
            try {
                webdriver = new RemoteWebDriver(new URL(remoteUrl),
                        capabilities);
            } catch (Exception e1) {
                try {
                    log.trace("{} creating WebDriver object ({})",
                            e1.getClass().getSimpleName(), e1.getMessage());
                    sleep(SECONDS.toMillis(POLL_TIME_SEC));
                } catch (InterruptedException e2) {
                    log.warn("Interrupted exception creating WebDriver object",
                            e2);
                    currentThread().interrupt();
                }
            }

        } while (webdriver == null);

        log.trace("Created WebDriver object (session id {})",
                ((RemoteWebDriver) webdriver).getSessionId());

        return createWebDriverBrowser(webdriver);
    }

    public WebDriverBrowser createWebDriverBrowser(WebDriver driver) {
        return new WebDriverBrowser(driver);
    }

}

@@ -2748,255 +2748,8 @@
 o %7B%0A
-            if (currentTimeMillis() %3E timeoutMs) %7B%0A                throw new WebDriverManagerException(%0A                        %22Timeout of %22 + waitTimeoutSec%0A                                + %22  seconds creating WebDriver object%22);%0A            %7D%0A
     
@@ -3068,24 +3068,310 @@
 Message());%0A
+                    if (currentTimeMillis() %3E timeoutMs) %7B%0A                        throw new WebDriverManagerException(%0A                                %22Timeout of %22 + waitTimeoutSec%0A                                        + %22 seconds creating WebDriver object%22);%0A                    %7D%0A
             

Change order of timeout exception in WebDriver creator