@revolugo/common 7.4.2-alpha.2 → 7.4.2-alpha.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revolugo/common",
-  "version": "7.4.2-alpha.2",
+  "version": "7.4.2-alpha.21",
   "private": false,
   "description": "Revolugo common",
   "author": "Revolugo",

package/src/schemas/booking.ts

@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import z from 'zod'
+import { z } from 'zod'
 
 import { PayLaterStatusEnum } from '../types/booking.ts'
 import { BookingStatusEnum } from '../types/index.ts'

package/src/schemas/contact-person.ts

@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import z from 'zod'
+import { z } from 'zod'
 
 import { CountryIso2Code } from '../countries/constants.ts'
 import { ContactPersonSalutationEnum } from '../types/index.ts'

package/src/schemas/event.ts

@@ -1,4 +1,4 @@
-import z from 'zod'
+import { z } from 'zod'
 
 export const EVENT_SCHEMA = z
   .object({

package/src/schemas/hotel-rooming-list.ts

@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import z from 'zod'
+import { z } from 'zod'
 
 import { HOTEL_ROOM_SCHEMA } from './hotel-room.ts'
 

package/src/schemas/invoice.ts

@@ -1,4 +1,4 @@
-import z from 'zod'
+import { z } from 'zod'
 
 import { InvoiceApiTypeEnum } from '../types/index.ts'
 

package/src/schemas/payment-methods.ts

@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import z from 'zod'
+import { z } from 'zod'
 
 import {
   BookingStatusEnum,

package/src/types/elements/hotel-offer-request.ts

@@ -166,5 +166,4 @@ export interface HotelOfferRequestCreate {
   latitude?: HotelOfferRequest['latitude']
   longitude?: HotelOfferRequest['longitude']
   roomCount: HotelOfferRequest['roomCount']
-  sourceMarket: HotelOfferRequest['sourceMarket']
 }

package/src/types/elements/hotel-room-offer-request.ts

@@ -135,7 +135,6 @@ export interface HotelRoomOfferRequestCreate {
   eventMetadata?: HotelRoomOfferRequest['eventMetadata']
   hotelId: HotelRoomOfferRequest['hotelId']
   roomCount: HotelRoomOfferRequest['roomCount']
-  sourceMarket: HotelRoomOfferRequest['sourceMarket']
 }
 export interface HotelRoomOfferRequestsCreatePayload {
   hotelRoomOfferRequestCreateApi?: HotelRoomOfferRequestCreate

package/src/utils/dayjs.ts

@@ -13,12 +13,12 @@ import timezone from 'dayjs/plugin/timezone.js'
 import utc from 'dayjs/plugin/utc.js'
 /* eslint-enable no-restricted-imports, no-restricted-syntax */
 
-/* eslint-disable no-restricted-syntax, import/no-unassigned-import */
+/* eslint-disable no-restricted-syntax, import-x/no-unassigned-import */
 import 'dayjs/locale/fr.js'
 import 'dayjs/locale/en.js'
-/* eslint-enable no-restricted-syntax, import/no-unassigned-import */
+/* eslint-enable no-restricted-syntax, import-x/no-unassigned-import */
 
-/* eslint-disable import/no-named-as-default-member */
+/* eslint-disable import-x/no-named-as-default-member */
 dayjs.extend(advancedFormat)
 dayjs.extend(customParseFormat)
 dayjs.extend(isBetween)
@@ -30,7 +30,7 @@ dayjs.extend(minMax)
 dayjs.extend(relativeTime)
 dayjs.extend(timezone)
 dayjs.extend(utc)
-/* eslint-enable import/no-named-as-default-member */
+/* eslint-enable import-x/no-named-as-default-member */
 
 export { dayjs }
 

package/src/utils/get-user-ip-address.test.ts

@@ -0,0 +1,62 @@
+import { describe, expect, test } from 'vitest'
+
+import { getUserIpAddress } from './get-user-ip-address.ts'
+
+describe('getUserIpAddress', () => {
+  test('UT-1a: extracts first IP from x-forwarded-for (comma-separated)', () => {
+    const headers = new Headers({
+      'x-forwarded-for': '203.0.113.1, 70.41.3.18, 150.172.238.178',
+    })
+    expect(getUserIpAddress(headers)).toBe('203.0.113.1')
+  })
+
+  test('UT-1a: extracts single IP from x-forwarded-for', () => {
+    const headers = new Headers({ 'x-forwarded-for': '203.0.113.1' })
+    expect(getUserIpAddress(headers)).toBe('203.0.113.1')
+  })
+
+  test('UT-1b: extracts IP from cf-connecting-ip', () => {
+    const headers = new Headers({ 'cf-connecting-ip': '198.51.100.1' })
+    expect(getUserIpAddress(headers)).toBe('198.51.100.1')
+  })
+
+  test('UT-1c: extracts IP from x-real-ip', () => {
+    const headers = new Headers({ 'x-real-ip': '198.51.100.2' })
+    expect(getUserIpAddress(headers)).toBe('198.51.100.2')
+  })
+
+  test('UT-1c: extracts IP from true-client-ip', () => {
+    const headers = new Headers({ 'true-client-ip': '198.51.100.3' })
+    expect(getUserIpAddress(headers)).toBe('198.51.100.3')
+  })
+
+  test('UT-1c: extracts IP from x-client-ip', () => {
+    const headers = new Headers({ 'x-client-ip': '198.51.100.4' })
+    expect(getUserIpAddress(headers)).toBe('198.51.100.4')
+  })
+
+  test('UT-1a: x-forwarded-for takes priority over other headers', () => {
+    const headers = new Headers({
+      'cf-connecting-ip': '198.51.100.1',
+      'x-forwarded-for': '203.0.113.1',
+    })
+    expect(getUserIpAddress(headers)).toBe('203.0.113.1')
+  })
+
+  test('UT-1d: returns null when no IP headers present', () => {
+    const headers = new Headers({ 'content-type': 'application/json' })
+    expect(getUserIpAddress(headers)).toBeNull()
+  })
+
+  test('UT-1e: extracts IP from Forwarded header (RFC 7239)', () => {
+    const headers = new Headers({
+      forwarded: 'for=192.0.2.60;proto=http;by=203.0.113.43',
+    })
+    expect(getUserIpAddress(headers)).toBe('192.0.2.60')
+  })
+
+  test('UT-1e: extracts quoted IP from Forwarded header', () => {
+    const headers = new Headers({ forwarded: 'for="192.0.2.60"' })
+    expect(getUserIpAddress(headers)).toBe('192.0.2.60')
+  })
+})

package/src/utils/get-user-ip-address.ts

@@ -0,0 +1,28 @@
+const IP_HEADERS = [
+  'x-forwarded-for',
+  'cf-connecting-ip',
+  'x-real-ip',
+  'true-client-ip',
+  'x-client-ip',
+] as const
+
+export function getUserIpAddress(headers: Headers): string | null {
+  for (const header of IP_HEADERS) {
+    const value = headers.get(header)
+    if (value) {
+      return header === 'x-forwarded-for'
+        ? (value.split(',')[0]?.trim() ?? null)
+        : value
+    }
+  }
+
+  const forwarded = headers.get('forwarded')
+  if (forwarded) {
+    const match = /for=["']?([^;"',\s]+)/u.exec(forwarded)
+    if (match?.[1]) {
+      return match[1]
+    }
+  }
+
+  return null
+}

package/src/utils/index.ts

@@ -26,6 +26,7 @@ export * from './get-random-element-from-array.ts'
 export * from './get-random-hex-color.ts'
 export * from './get-random-int.ts'
 export * from './get-sanitized-room-count.ts'
+export * from './get-user-ip-address.ts'
 export * from './group-by.ts'
 export * from './images.ts'
 export * from './is-empty.ts'