1 files changed, 18 insertions, 26 deletions
diff --git a/src/main/java/com/it_jaros/jscanner/Scanner.java b/src/main/java/com/it_jaros/jscanner/Scanner.java
index 5fd2d4b..d44a4b0 100644
--- a/src/main/java/com/it_jaros/jscanner/Scanner.java
+++ b/src/main/java/com/it_jaros/jscanner/Scanner.java
@@ -14,7 +14,6 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.LockSupport;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class Scanner implements AutoCloseable {
@@ -56,50 +55,48 @@ public class Scanner implements AutoCloseable {
         this(options.openSocketLimit(), options.timeoutInMillis(), options.delayInMillis(), options.maxWorkersPerHost(), options.maxHostsLimit(), options.disableHostCheck(), options.quiet(), options.bannerRecognition());
     }
 
-    public List<ScanResult> scan(ScanOptions options) {
+    public Scan createScan(ScanOptions options) {
         if (options.hostsFile() != null) {
-            return scanHosts(options.hostsFile(), options.ports());
+            return createScan(options.hostsFile(), options.ports());
         }
-        return scanHosts(options.hostsArgv(), options.ports());
+        return createScan(options.hostsArgv(), options.ports());
     }
 
-    public List<ScanResult> scanHosts(String sourceFile, String ports) {
+    public Scan createScan(String sourceFile, String ports) {
         try (BufferedReader reader = Files.newBufferedReader(Path.of(sourceFile))) {
-            return scanHosts(reader.lines(), ports);
+            return createScan(reader.lines(), ports);
         } catch (FileNotFoundException | NoSuchFileException e) {
             System.out.printf("Could not open file %s%n", sourceFile);
         } catch (IOException e) {
             System.out.printf("Error while trying to read hosts: %s -> %s %n", e.getClass().getSimpleName(), e.getMessage());
         }
 
-        return List.of();
+        return null;
     }
 
-    public List<ScanResult> scanHosts(List<String> hostsArgv, String ports) {
-        try (Stream<String> stream = hostsArgv.stream()) {
-            return scanHosts(stream, ports);
-        } catch (IOException e) {
-            System.out.printf("Error while trying to read hosts: %s -> %s %n", e.getClass().getSimpleName(), e.getMessage());
-        }
+    public Scan createScan(Stream<String> hosts, String ports) {
+        return new Scan(hosts.toList(), ports, new ScanState(new Counter(), new ProgressBar(quiet)));
+    }
 
-        return List.of();
+    public Scan createScan(List<String> hostsArgv, String ports) {
+        return new Scan(hostsArgv, ports, new ScanState(new Counter(), new ProgressBar(quiet)));
     }
 
-    public List<ScanResult> scanHosts(Stream<String> hosts, String ports) throws IOException {
-        ScanState scanState = new ScanState(new Counter(), new ProgressBar(quiet));
+    public List<ScanResult> runScan(Scan scan) {
+        ScanState scanState = scan.state();
         scanState.getProgressBar().start();
         try (ExecutorService executor = Executors.newVirtualThreadPerTaskExecutor()) {
             CompletionService<ScanResult> completionService = new ExecutorCompletionService<>(executor);
-            Queue<String> hostsInQueue = hosts.collect(Collectors.toCollection(ArrayDeque::new));
+            Queue<String> hostsInQueue = new ArrayDeque<>(scan.hosts());
 
             int hostsToProcess = hostsInQueue.size();
             int activeHostWorkers = 0;
             while (hostsToProcess > 0 && !cancelled) {
                 // process queue
-                while (!hostsInQueue.isEmpty() && activeHostWorkers <= maxHostsLimit && !cancelled) {
+                while (!hostsInQueue.isEmpty() && activeHostWorkers < maxHostsLimit && !cancelled) {
                     activeHostWorkers++;
                     final String host = hostsInQueue.poll();
-                    completionService.submit(() -> scanHost(host, ports, scanState));
+                    completionService.submit(() -> scanHostPorts(host, scan.ports(), scanState));
                 }
 
                 try {
@@ -123,15 +120,10 @@ public class Scanner implements AutoCloseable {
         }
 
         scanState.getProgressBar().stop();
-        System.out.println("--------------------");
-        System.out.println("Finished scan!");
-        System.out.println("Stats:");
-        System.out.println("Peak concurrent connects: " + scanState.getCounter().max());
-        System.out.println("--------------------");
         return scanState.getSnapshotOfScanResults();
     }
 
-    private ScanResult scanHost(String host, String ports, ScanState scanState) {
+    private ScanResult scanHostPorts(String host, String ports, ScanState scanState) {
         PortRange portRange = new PortRange(ports);
         AtomicLong portSlotFactory = new AtomicLong(System.nanoTime());
         BitSet openPorts = new BitSet(PortRange.MAX_PORT);
@@ -154,7 +146,7 @@ public class Scanner implements AutoCloseable {
             int activePerHostWorkers = 0;
             int portsToProcess = portRange.getTotal();
             while (portsToProcess > 0 && !cancelled) {
-                while (!cancelled && portRange.hasNext() && activePerHostWorkers <= maxWorkersPerHost) {
+                while (!cancelled && portRange.hasNext() && activePerHostWorkers < maxWorkersPerHost) {
                     activePerHostWorkers++;
                     final int currentPort = portRange.next();
                     completionService.submit(() -> {