Merge pull request #1469 from manuc66/feature/fix-ip-configuration

Fix incorrect IP check condition in getDeviceIp function #1468 #1464

Author: manuc66

src/PathHelper.ts

@@ -101,7 +101,7 @@ export default class PathHelper {
       await fd.close();
       return true;
     } catch (err: unknown) {
-      if (err instanceof Error && 'code' in err && err.code === 'EEXIST') {
+      if (err instanceof Error && "code" in err && err.code === "EEXIST") {
         return false;
       }
       throw err;

src/program.ts

@@ -171,9 +171,12 @@ function setupScanParameters(commandName: string) {
     );
 }
 
-async function getDeviceIp(options: ProgramOption, configFile: FileConfig) {
+async function getDeviceIp(
+  options: ProgramOption,
+  configFile: FileConfig,
+): Promise<string> {
   let ip = getOptConfiguredValue(options.address, configFile.ip);
-  if (ip !== undefined) {
+  if (ip === undefined) {
     const name = getConfiguredValue(
       options.name,
       configFile.name,
@@ -465,9 +468,7 @@ function createListenCliCmd(configFile: FileConfig) {
     .action(async (_, cmd) => {
       const options = cmd.optsWithGlobals();
       const ip = await getDeviceIp(options, configFile);
-      if (ip !== undefined) {
-        HPApi.setDeviceIP(ip);
-      }
+      HPApi.setDeviceIP(ip);
 
       const isDebug = getIsDebug(options, configFile);
       HPApi.setDebug(isDebug);
@@ -566,9 +567,7 @@ function createAdfAutoscanCliCmd(fileConfig: FileConfig) {
       const options = cmd.optsWithGlobals();
 
       const ip = await getDeviceIp(options, fileConfig);
-      if (ip !== undefined) {
-        HPApi.setDeviceIP(ip);
-      }
+      HPApi.setDeviceIP(ip);
 
       const isDebug = getIsDebug(options, fileConfig);
       HPApi.setDebug(isDebug);
@@ -643,9 +642,7 @@ function createSingleScanCliCmd(fileConfig: FileConfig) {
       const options = cmd.optsWithGlobals();
 
       const ip = await getDeviceIp(options, fileConfig);
-      if (ip !== undefined) {
-        HPApi.setDeviceIP(ip);
-      }
+      HPApi.setDeviceIP(ip);
 
       const isDebug = getIsDebug(options, fileConfig);
       HPApi.setDebug(isDebug);
@@ -692,9 +689,7 @@ function createClearRegistrationsCliCmd(fileConfig: FileConfig) {
       const options: ProgramOption = cmd.optsWithGlobals();
 
       const ip = await getDeviceIp(options, fileConfig);
-      if (ip !== undefined) {
-        HPApi.setDeviceIP(ip);
-      }
+      HPApi.setDeviceIP(ip);
 
       const isDebug = getIsDebug(options, fileConfig);
       HPApi.setDebug(isDebug);

src/scanJobHandlers.ts

@@ -81,7 +81,6 @@ async function handleScanProcessingState(
     job.binaryURL !== null &&
     job.currentPageNumber !== null
   ) {
-
     const destinationFilePath = await PathHelper.getFileForPage(
       folder,
       scanCount,