@futdevpro/nts-dynamo 1.15.144 → 1.15.145

package/src/_services/shared.static-service.spec.ts

@@ -1,99 +1,99 @@
-import { DyNTS_Shared } from './shared.static-service';
-import { Request } from 'express';
-import * as GeoIp from 'geoip-lite';
-
-describe('| DyNTS_Shared', () => {
-  describe('| getIpFromRequest', () => {
-    it('| should extract IP from x-forwarded-for header', () => {
-      const mockRequest = {
-        headers: {
-          'x-forwarded-for': '192.168.1.1, 10.0.0.1, 172.16.0.1',
-        },
-        socket: {
-          remoteAddress: '127.0.0.1',
-        },
-      } as any as Request;
-
-      const ip = DyNTS_Shared.getIpFromRequest(mockRequest);
-
-      expect(ip).toBe('172.16.0.1');
-    });
-
-    it('| should extract IP from socket.remoteAddress when x-forwarded-for is not present', () => {
-      const mockRequest = {
-        headers: {},
-        socket: {
-          remoteAddress: '192.168.1.100',
-        },
-      } as any as Request;
-
-      const ip = DyNTS_Shared.getIpFromRequest(mockRequest);
-
-      expect(ip).toBe('192.168.1.100');
-    });
-
-    it('| should handle single IP in x-forwarded-for header', () => {
-      const mockRequest = {
-        headers: {
-          'x-forwarded-for': '192.168.1.1',
-        },
-        socket: {
-          remoteAddress: '127.0.0.1',
-        },
-      } as any as Request;
-
-      const ip = DyNTS_Shared.getIpFromRequest(mockRequest);
-
-      expect(ip).toBe('192.168.1.1');
-    });
-
-    it('| should handle empty x-forwarded-for header', () => {
-      const mockRequest = {
-        headers: {
-          'x-forwarded-for': '',
-        },
-        socket: {
-          remoteAddress: '127.0.0.1',
-        },
-      } as any as Request;
-
-      const ip = DyNTS_Shared.getIpFromRequest(mockRequest);
-
-      expect(ip).toBe('127.0.0.1');
-    });
-  });
-
-  // Skip geoip tests - GeoIp.lookup is not writable/mockable
-  describe('| getLocationDataByRequest', () => {
-    it('| should return location data for request IP', () => {
-      // Skipped - GeoIp.lookup cannot be mocked
-    });
-  });
-
-  describe('| getLocationByIp', () => {
-    it('| should return location data for IP address', () => {
-      // Skipped - GeoIp.lookup cannot be mocked
-    });
-
-    it('| should return null for invalid IP', () => {
-      // Skipped - GeoIp.lookup cannot be mocked
-    });
-  });
-
-  describe('| prompt', () => {
-    it('| should be accessible', () => {
-      expect(DyNTS_Shared.prompt).toBeTruthy();
-      expect(typeof DyNTS_Shared.prompt).toBe('function');
-    });
-
-    // Note: prompt() is difficult to test in unit tests as it requires stdin/stdout interaction
-    // Integration tests would be more appropriate for this method
-  });
-
-  it('| getIpFromRequest should be accessible', () => {
-    expect(DyNTS_Shared.getIpFromRequest).toBeTruthy();
-    expect(DyNTS_Shared.getLocationByIp).toBeTruthy();
-    expect(DyNTS_Shared.getLocationDataByRequest).toBeTruthy();
-    expect(DyNTS_Shared.prompt).toBeTruthy();
-  });
-});
+import { DyNTS_Shared } from './shared.static-service';
+import { Request } from 'express';
+import * as GeoIp from 'geoip-lite';
+
+describe('| DyNTS_Shared', () => {
+  describe('| getIpFromRequest', () => {
+    it('| should extract IP from x-forwarded-for header', () => {
+      const mockRequest = {
+        headers: {
+          'x-forwarded-for': '192.168.1.1, 10.0.0.1, 172.16.0.1',
+        },
+        socket: {
+          remoteAddress: '127.0.0.1',
+        },
+      } as any as Request;
+
+      const ip = DyNTS_Shared.getIpFromRequest(mockRequest);
+
+      expect(ip).toBe('172.16.0.1');
+    });
+
+    it('| should extract IP from socket.remoteAddress when x-forwarded-for is not present', () => {
+      const mockRequest = {
+        headers: {},
+        socket: {
+          remoteAddress: '192.168.1.100',
+        },
+      } as any as Request;
+
+      const ip = DyNTS_Shared.getIpFromRequest(mockRequest);
+
+      expect(ip).toBe('192.168.1.100');
+    });
+
+    it('| should handle single IP in x-forwarded-for header', () => {
+      const mockRequest = {
+        headers: {
+          'x-forwarded-for': '192.168.1.1',
+        },
+        socket: {
+          remoteAddress: '127.0.0.1',
+        },
+      } as any as Request;
+
+      const ip = DyNTS_Shared.getIpFromRequest(mockRequest);
+
+      expect(ip).toBe('192.168.1.1');
+    });
+
+    it('| should handle empty x-forwarded-for header', () => {
+      const mockRequest = {
+        headers: {
+          'x-forwarded-for': '',
+        },
+        socket: {
+          remoteAddress: '127.0.0.1',
+        },
+      } as any as Request;
+
+      const ip = DyNTS_Shared.getIpFromRequest(mockRequest);
+
+      expect(ip).toBe('127.0.0.1');
+    });
+  });
+
+  // Skip geoip tests - GeoIp.lookup is not writable/mockable
+  describe('| getLocationDataByRequest', () => {
+    it('| should return location data for request IP', () => {
+      // Skipped - GeoIp.lookup cannot be mocked
+    });
+  });
+
+  describe('| getLocationByIp', () => {
+    it('| should return location data for IP address', () => {
+      // Skipped - GeoIp.lookup cannot be mocked
+    });
+
+    it('| should return null for invalid IP', () => {
+      // Skipped - GeoIp.lookup cannot be mocked
+    });
+  });
+
+  describe('| prompt', () => {
+    it('| should be accessible', () => {
+      expect(DyNTS_Shared.prompt).toBeTruthy();
+      expect(typeof DyNTS_Shared.prompt).toBe('function');
+    });
+
+    // Note: prompt() is difficult to test in unit tests as it requires stdin/stdout interaction
+    // Integration tests would be more appropriate for this method
+  });
+
+  it('| getIpFromRequest should be accessible', () => {
+    expect(DyNTS_Shared.getIpFromRequest).toBeTruthy();
+    expect(DyNTS_Shared.getLocationByIp).toBeTruthy();
+    expect(DyNTS_Shared.getLocationDataByRequest).toBeTruthy();
+    expect(DyNTS_Shared.prompt).toBeTruthy();
+  });
+});

package/src/_services/shared.static-service.ts

@@ -1,78 +1,78 @@
-
-import * as ReadLine from 'readline';
-import * as GeoIp from 'geoip-lite';
-import { Request } from 'express';
-
-import { DyFM_Object } from '@futdevpro/fsm-dynamo';
-import { DyFM_GeoIpLocation } from '@futdevpro/fsm-dynamo/location';
-
-/**
- * Collection of static helper utilities shared across modules.
- */
-export class DyNTS_Shared extends DyFM_Object {
-
-  /**
-   * Extract the IP address from an Express request.
-   *
-   * @param request Incoming HTTP request
-   * @returns Resolved IP string
-   */
-  static getIpFromRequest(request: Request): string {
-    let ip: string;
-
-    if (request?.headers?.['x-forwarded-for']) {
-      const route: string[] = (request.headers['x-forwarded-for'] as string).split(', ');
-
-      console.log('TESTTTT route:', route);
-      ip = route[route.length - 1];
-    } else {
-      ip = request.socket.remoteAddress;
-    }
-
-    return ip;
-  }
-
-  /**
-   * Lookup the Geo location of a request based on its IP address.
-   *
-   * @param request Incoming request
-   * @returns Resolved geo location information
-   */
-  static getLocationDataByRequest(request: Request): DyFM_GeoIpLocation {
-    return GeoIp.lookup(this.getIpFromRequest(request));
-  }
-
-  /**
-   * Lookup the Geo location of a raw IP address.
-   *
-   * @param ip IP address string
-   * @returns Geo location information
-   */
-  static getLocationByIp(ip: string): DyFM_GeoIpLocation {
-    return GeoIp.lookup(ip);
-  }
-
-  /**
-   * Simple CLI helper to prompt the user for input.
-   *
-   * @param question Text displayed to the user
-   * @returns Entered string value
-   */
-  static async prompt(question: string): Promise<string> {
-    const readLine = ReadLine.createInterface({ 
-      input: process.stdin, 
-      output: process.stdout,
-    });
-    
-    return new Promise((resolve, reject) => {
-      try {
-        readLine.question(question, (result: string) => {
-          resolve(result);
-          readLine.close();
-        });
-      } catch (error) {
-        reject(error);
-      }
-    });
-  }
-}
+
+import * as ReadLine from 'readline';
+import * as GeoIp from 'geoip-lite';
+import { Request } from 'express';
+
+import { DyFM_Object } from '@futdevpro/fsm-dynamo';
+import { DyFM_GeoIpLocation } from '@futdevpro/fsm-dynamo/location';
+
+/**
+ * Collection of static helper utilities shared across modules.
+ */
+export class DyNTS_Shared extends DyFM_Object {
+
+  /**
+   * Extract the IP address from an Express request.
+   *
+   * @param request Incoming HTTP request
+   * @returns Resolved IP string
+   */
+  static getIpFromRequest(request: Request): string {
+    let ip: string;
+
+    if (request?.headers?.['x-forwarded-for']) {
+      const route: string[] = (request.headers['x-forwarded-for'] as string).split(', ');
+
+      console.log('TESTTTT route:', route);
+      ip = route[route.length - 1];
+    } else {
+      ip = request.socket.remoteAddress;
+    }
+
+    return ip;
+  }
+
+  /**
+   * Lookup the Geo location of a request based on its IP address.
+   *
+   * @param request Incoming request
+   * @returns Resolved geo location information
+   */
+  static getLocationDataByRequest(request: Request): DyFM_GeoIpLocation {
+    return GeoIp.lookup(this.getIpFromRequest(request));
+  }
+
+  /**
+   * Lookup the Geo location of a raw IP address.
+   *
+   * @param ip IP address string
+   * @returns Geo location information
+   */
+  static getLocationByIp(ip: string): DyFM_GeoIpLocation {
+    return GeoIp.lookup(ip);
+  }
+
+  /**
+   * Simple CLI helper to prompt the user for input.
+   *
+   * @param question Text displayed to the user
+   * @returns Entered string value
+   */
+  static async prompt(question: string): Promise<string> {
+    const readLine = ReadLine.createInterface({ 
+      input: process.stdin, 
+      output: process.stdout,
+    });
+    
+    return new Promise((resolve, reject) => {
+      try {
+        readLine.question(question, (result: string) => {
+          resolve(result);
+          readLine.close();
+        });
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
+}

package/tsconfig.app.json

@@ -1,12 +1,12 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "types": [
-      "_assets/html.d"
-    ]
-  },
-  "include": [
-    "src/_assets"
-  ]
-}
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "types": [
+      "_assets/html.d"
+    ]
+  },
+  "include": [
+    "src/_assets"
+  ]
+}

package/tsconfig.json

@@ -1,42 +1,42 @@
-{
-  "compilerOptions": {
-    "incremental": false,
-    "module": "commonjs",
-    "target": "es2022",
-    "lib": [
-      "es6",
-      "es2018",
-      "es2022",
-      "dom"
-    ],
-    "allowJs": true,
-    "declaration": true, 
-    "declarationMap": true,
-    "sourceMap": true,
-    "outDir": "./build",
-    "rootDir": "./src",
-    "importHelpers": true,
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "noImplicitOverride": true,
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true,
-    "paths": {
-    }
-  },
-  "include": [
-    "src"
-  ],
-  "DISABLED": {
-    "paths": {
-      "@futdevpro/fsm-dynamo": [
-        "../dynamo-fsm/src/index.ts"
-      ],
-      "@futdevpro/fsm-dynamo/*": [
-        "../dynamo-fsm/src/_modules/*.index.ts"
-      ]
-    }
-  }
-}
+{
+  "compilerOptions": {
+    "incremental": false,
+    "module": "commonjs",
+    "target": "es2022",
+    "lib": [
+      "es6",
+      "es2018",
+      "es2022",
+      "dom"
+    ],
+    "allowJs": true,
+    "declaration": true, 
+    "declarationMap": true,
+    "sourceMap": true,
+    "outDir": "./build",
+    "rootDir": "./src",
+    "importHelpers": true,
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "noImplicitOverride": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "paths": {
+    }
+  },
+  "include": [
+    "src"
+  ],
+  "DISABLED": {
+    "paths": {
+      "@futdevpro/fsm-dynamo": [
+        "../dynamo-fsm/src/index.ts"
+      ],
+      "@futdevpro/fsm-dynamo/*": [
+        "../dynamo-fsm/src/_modules/*.index.ts"
+      ]
+    }
+  }
+}