fix: get wanport from configService, not legacy store

Author: pujitm

api/src/store/state-parsers/nginx.ts

@@ -20,7 +20,6 @@ export type NginxIni = {
 };
 
 export const parse: StateFileToIniParserMap['nginx'] = (state) => {
-    console.log('nginxState', state);
     const fqdnKeys = Object.keys(state).filter((key) => fqdnRegex.test(key));
 
     const interfaceId = new Map<string, number>();

packages/unraid-api-plugin-connect/src/service/url-resolver.service.ts

@@ -115,7 +115,7 @@ export interface AccessUrl {
 export class UrlResolverService {
     private readonly logger = new Logger(UrlResolverService.name);
 
-    constructor(private readonly configService: ConfigService<ConfigType>) {}
+    constructor(private readonly configService: ConfigService<ConfigType, true>) {}
 
     /**
      * Constructs a URL from the given field parameters.
@@ -259,11 +259,7 @@ export class UrlResolverService {
         }
 
         const { nginx } = store.emhttp;
-        const {
-            config: {
-                remote: { wanport },
-            },
-        } = store;
+        const wanport = this.configService.getOrThrow('connect.config.wanport', { infer: true });
 
         if (!nginx || Object.keys(nginx).length === 0) {
             return { urls: [], errors: [new Error('Nginx Not Loaded')] };
@@ -359,17 +355,18 @@ export class UrlResolverService {
                 const urlType = this.getUrlTypeFromFqdn(fqdnUrl.interface);
                 const fqdnUrlToUse = this.getUrlForField({
                     url: fqdnUrl.fqdn,
-                    portSsl: urlType === URL_TYPE.WAN ? Number(wanport) : nginx.httpsPort,
+                    portSsl: Number(wanport ?? nginx.httpsPort),
                 });
 
                 urls.push({
                     name: `FQDN ${fqdnUrl.interface}${fqdnUrl.id !== null ? ` ${fqdnUrl.id}` : ''}`,
-                    type: this.getUrlTypeFromFqdn(fqdnUrl.interface),
+                    type: urlType   ,
                     ipv4: fqdnUrlToUse,
                 });
             } catch (error: unknown) {
                 if (error instanceof Error) {
                     errors.push(error);
+                    this.logger.warn(error);
                 } else {
                     this.logger.warn('Uncaught error in network resolver', error);
                 }

packages/unraid-api-plugin-connect/src/test/url-resolver.service.test.ts

@@ -14,12 +14,12 @@ interface PortTestParams {
 
 describe('UrlResolverService', () => {
     let service: UrlResolverService;
-    let mockConfigService: ConfigService<ConfigType>;
+    let mockConfigService: ConfigService<ConfigType, true>;
 
     beforeEach(() => {
         mockConfigService = {
             get: vi.fn(),
-        } as unknown as ConfigService<ConfigType>;
+        } as unknown as ConfigService<ConfigType, true>;
 
         service = new UrlResolverService(mockConfigService);
     });