@odynn/awayz-flights 0.1.17 → 0.1.19

package/dist/hooks/useFlightSearch/useFlightSearch.js

@@ -263,7 +263,9 @@ const U = 1, W = J.ECONOMY, z = new AbortController(), ue = 3 * 60 * 1e3, B = (o
       paymentType: l
     });
     let i = [];
-    await ae(Z() + f, {
+    a.current = setTimeout(() => {
+      I();
+    }, ue), await ae(Z() + f, {
       headers: {
         "Content-Type": "application/json",
         Authorization: o || "",
@@ -296,9 +298,7 @@ const U = 1, W = J.ECONOMY, z = new AbortController(), ue = 3 * 60 * 1e3, B = (o
         console.log("EventSource closed"), u(!1);
       },
       keepalive: !1
-    }), a.current = setTimeout(() => {
-      I();
-    }, ue);
+    });
   }, I = () => {
     c && (z.abort(), a.current && (clearTimeout(a.current), a.current = null), u(!1));
   };

package/dist/lib/hooks/useFlightSearch/useFlightSearch.types.d.ts

@@ -87,6 +87,10 @@ export interface IFlightPaymentOption {
         refundBeforeDeparture?: boolean;
         changeBeforeDeparture?: boolean;
     };
+    carrier: {
+        iataCode: string;
+        name: string;
+    };
 }
 export interface IFlightResult {
     id: string;

package/dist/utils/flightUtils.js

@@ -1,18 +1,18 @@
-import { h as N } from "../arrayExtensions-DWKenJCh.js";
+import { h as D } from "../arrayExtensions-DWKenJCh.js";
 import { c as z } from "../dateUtils-DeNLG5hw.js";
 import "react";
-import { awayzClient as v } from "@odynn/awayz-auth";
+import { awayzClient as O } from "@odynn/awayz-auth";
 import { WalletService as G } from "../services/wallet/WalletService.js";
-import { ERewardProgramCategories as O } from "../services/wallet/WalletService.types.js";
+import { ERewardProgramCategories as _ } from "../services/wallet/WalletService.types.js";
 const T = (r) => r == null ? void 0 : r.map((e) => {
-  var n, s, t, c, i, a, l, h, u, L, A, M, D, F, w, d, p, o, y, C, b, m, g, f;
+  var n, a, i, l, t, s, o, h, u, L, M, A, N, F, w, d, p, c, y, C, b, m, g, f;
   return {
     id: e.id,
     points: (e == null ? void 0 : e.points) >= 0 ? e.points : -1,
     partial: e.partial,
     origin: {
-      city: e.slices[0].segments[0].origin.cityName || ((s = (n = e.slices[0].segments[0].origin) == null ? void 0 : n.city) == null ? void 0 : s.name),
-      country: e.slices[0].segments[0].origin.iataCountryCode || ((t = e.slices[0].segments[0].origin) == null ? void 0 : t.city.iataCountryCode),
+      city: e.slices[0].segments[0].origin.cityName || ((a = (n = e.slices[0].segments[0].origin) == null ? void 0 : n.city) == null ? void 0 : a.name),
+      country: e.slices[0].segments[0].origin.iataCountryCode || ((i = e.slices[0].segments[0].origin) == null ? void 0 : i.city.iataCountryCode),
       airportCode: e.slices[0].segments[0].origin.iataCityCode || e.slices[0].segments[0].origin.city.iataCode,
       coordinates: {
         latitude: e.slices[0].segments[0].origin.city.latitude,
@@ -20,9 +20,9 @@ const T = (r) => r == null ? void 0 : r.map((e) => {
       }
     },
     destination: {
-      city: ((i = (c = e.slices[0].segments.getLast()) == null ? void 0 : c.destination) == null ? void 0 : i.cityName) || ((h = (l = (a = e.slices[0].segments.getLast()) == null ? void 0 : a.destination) == null ? void 0 : l.city) == null ? void 0 : h.name),
-      country: ((L = (u = e.slices[0].segments.getLast()) == null ? void 0 : u.destination) == null ? void 0 : L.iataCountryCode) || ((D = (M = (A = e.slices[0].segments.getLast()) == null ? void 0 : A.destination) == null ? void 0 : M.city) == null ? void 0 : D.iataCountryCode),
-      airportCode: ((w = (F = e.slices[0].segments.getLast()) == null ? void 0 : F.destination) == null ? void 0 : w.iataCityCode) || ((o = (p = (d = e.slices[0].segments.getLast()) == null ? void 0 : d.destination) == null ? void 0 : p.city) == null ? void 0 : o.iataCode),
+      city: ((t = (l = e.slices[0].segments.getLast()) == null ? void 0 : l.destination) == null ? void 0 : t.cityName) || ((h = (o = (s = e.slices[0].segments.getLast()) == null ? void 0 : s.destination) == null ? void 0 : o.city) == null ? void 0 : h.name),
+      country: ((L = (u = e.slices[0].segments.getLast()) == null ? void 0 : u.destination) == null ? void 0 : L.iataCountryCode) || ((N = (A = (M = e.slices[0].segments.getLast()) == null ? void 0 : M.destination) == null ? void 0 : A.city) == null ? void 0 : N.iataCountryCode),
+      airportCode: ((w = (F = e.slices[0].segments.getLast()) == null ? void 0 : F.destination) == null ? void 0 : w.iataCityCode) || ((c = (p = (d = e.slices[0].segments.getLast()) == null ? void 0 : d.destination) == null ? void 0 : p.city) == null ? void 0 : c.iataCode),
       coordinates: {
         latitude: (b = (C = (y = e.slices[0].segments.getLast()) == null ? void 0 : y.destination) == null ? void 0 : C.city) == null ? void 0 : b.latitude,
         longitude: (f = (g = (m = e.slices[0].segments.getLast()) == null ? void 0 : m.destination) == null ? void 0 : g.city) == null ? void 0 : f.longitude
@@ -30,10 +30,10 @@ const T = (r) => r == null ? void 0 : r.map((e) => {
     },
     airline: e.owner.name,
     cash: parseFloat(e.totalAmount),
-    flightNumber: $(e.slices[0].segments[0]),
+    flightNumber: v(e.slices[0].segments[0]),
     awayzGroupId: e.slices[0].comparisonKey || e.awayzRouteId || e.awayzGroupId || e.id,
-    departureTime: N(e.slices[0].segments[0].departingAt).toDate(),
-    arrivalTime: N(
+    departureTime: D(e.slices[0].segments[0].departingAt).toDate(),
+    arrivalTime: D(
       e.slices[0].segments[e.slices[0].segments.length - 1].arrivingAt
     ).toDate(),
     numberOfStops: e.slices[0].segments.length - 1,
@@ -42,8 +42,8 @@ const T = (r) => r == null ? void 0 : r.map((e) => {
     airlineProgram: e.airlineProgram,
     paymentOptions: [],
     durationMinutes: z({
-      departureTime: N(e.slices[0].segments[0].departingAt),
-      arrivalTime: N(e.slices[0].segments.getLast().arrivingAt),
+      departureTime: D(e.slices[0].segments[0].departingAt),
+      arrivalTime: D(e.slices[0].segments.getLast().arrivingAt),
       originTimeZone: e.slices[0].segments[0].origin.timeZone,
       destinationTimeZone: e.slices[0].segments.getLast().destination.timeZone,
       duration: e.slices[0].duration
@@ -53,179 +53,191 @@ const T = (r) => r == null ? void 0 : r.map((e) => {
   if (!(e != null && e.length))
     return T(r);
   const n = [...e];
-  let s = [];
-  const t = {};
-  for (const i of r) {
-    const a = i.slices[0].segments, l = a[0], h = {
-      iataCode: l.operatingCarrier.iataCode,
+  let a = [];
+  const i = {};
+  for (const t of r) {
+    const s = t.slices[0].segments, o = s[0], h = {
+      iataCode: o.operatingCarrier.iataCode,
       flightNumber: I(
-        l.operatingCarrierFlightNumber
+        o.operatingCarrierFlightNumber
       )
     }, u = {
-      iataCode: l.marketingCarrier.iataCode,
+      iataCode: o.marketingCarrier.iataCode,
       flightNumber: I(
-        l.marketingCarrierFlightNumber
+        o.marketingCarrierFlightNumber
       )
-    }, L = i.awayzMatchId, A = `${h.iataCode}_${u.iataCode}-${u.flightNumber}`, M = i.awayzMarketerMatchId, D = !!h.flightNumber && h.flightNumber != "", F = !!u.flightNumber && u.flightNumber != "", w = n.filter((d, p) => {
-      const o = d.flightDetails, y = d.flightDetails.slices[0].segments[0].operatingCarrierFlightNumber, C = o.id && // TODO: Maybe expand on this - Id check ensures it is a duffel flight
+    }, L = t.awayzMatchId, M = `${h.iataCode}_${u.iataCode}-${u.flightNumber}`, A = t.awayzMarketerMatchId, N = !!h.flightNumber && h.flightNumber != "", F = !!u.flightNumber && u.flightNumber != "", w = n.filter((d, p) => {
+      const c = d.flightDetails, y = d.flightDetails.slices[0].segments[0].operatingCarrierFlightNumber, C = c.id && // TODO: Maybe expand on this - Id check ensures it is a duffel flight
       !!y && y !== "";
-      if (!(o.slices[0].segments.length === (a == null ? void 0 : a.length) && !o.slices[0].segments.find(
-        (g, f) => g.departingAt !== a[f].departingAt || g.arrivingAt !== a[f].arrivingAt || g.duration !== a[f].duration
+      if (!(c.slices[0].segments.length === (s == null ? void 0 : s.length) && !c.slices[0].segments.find(
+        (g, f) => g.departingAt !== s[f].departingAt || g.arrivingAt !== s[f].arrivingAt || g.duration !== s[f].duration
       )))
         return !1;
       let m = !1;
-      return (F && D && o.awayzMatchId === L || !C && o.awayzMatchId === A || D && !F && o.awayzMarketerMatchId === M) && (m = !0), m && (t[o.id] = p), m;
+      return (F && N && c.awayzMatchId === L || !C && c.awayzMatchId === M || N && !F && c.awayzMarketerMatchId === A) && (m = !0), m && (i[c.id] = p), m;
     });
     if (w.length) {
-      i.slices[0].comparisonKey = w[0].awayzGroupId;
+      t.slices[0].comparisonKey = w[0].awayzGroupId;
       const d = w.find((p) => {
         var C, b, m, g;
-        const o = (C = p.flightDetails.slices[0].fareBrandName) == null ? void 0 : C.toLowerCase(), y = (b = i.slices[0].fareBrandName) == null ? void 0 : b.toLowerCase();
-        return y === o || // Special Case for AC Only match on first word
+        const c = (C = p.flightDetails.slices[0].fareBrandName) == null ? void 0 : C.toLowerCase(), y = (b = t.slices[0].fareBrandName) == null ? void 0 : b.toLowerCase();
+        return y === c || // Special Case for AC Only match on first word
         // Due to differences in scraped points data and Duffel format
-        u.iataCode === "AC" && ((m = y.split(" ")) == null ? void 0 : m[0]) === ((g = o.split(" ")) == null ? void 0 : g[0]);
+        u.iataCode === "AC" && ((m = y.split(" ")) == null ? void 0 : m[0]) === ((g = c.split(" ")) == null ? void 0 : g[0]);
       });
       if (d) {
-        const p = t[d.id], o = {
-          ...i,
+        const p = i[d.id], c = {
+          ...t,
           ...d,
-          points: i.points,
-          airlineProgram: i.airlineProgram,
+          points: t.points,
+          airlineProgram: t.airlineProgram,
           flightDetails: {
-            ...i,
+            ...t,
             ...d.flightDetails,
-            points: i.points,
-            airlineProgram: i.airlineProgram
+            points: t.points,
+            airlineProgram: t.airlineProgram
           }
         };
-        n[p] = o;
+        n[p] = c;
       } else
-        s.push(i);
+        a.push(t);
     } else
-      s.push(i);
+      a.push(t);
   }
   return [
     ...n,
-    ...T(s) ?? []
+    ...T(a) ?? []
   ];
-}, $ = (r) => {
+}, v = (r) => {
   const e = r.operatingCarrierFlightNumber ? r.operatingCarrier : r.marketingCarrier, n = r.operatingCarrierFlightNumber ?? r.marketingCarrierFlightNumber;
   return e.iataCode + " " + I(n);
 }, K = ({
   originCode: r,
   destinationCode: e,
   departureDate: n,
-  cabinClass: s,
-  passengerCount: t,
-  paymentType: c
+  cabinClass: a,
+  passengerCount: i,
+  paymentType: l
 }) => {
-  let i = "/flights/search/one-way/points-cash?";
-  return i += `origin=${r}`, i += `&destination=${e}`, i += `&departure_date=${n}`, i += `&cabin_class=${s}`, i += `&adults=${t}`, i += `&cash_or_points=[${c}]`, i;
-}, q = (r) => {
-  const e = r.reduce((s, t) => {
-    const c = t.awayzGroupId;
-    return s[c] || (s[c] = []), s[c].push(t), s;
+  let t = "/flights/search/one-way/points-cash?";
+  return t += `origin=${r}`, t += `&destination=${e}`, t += `&departure_date=${n}`, t += `&cabin_class=${a}`, t += `&adults=${i}`, t += `&cash_or_points=[${l}]`, t;
+}, j = (r) => {
+  const e = r.reduce((a, i) => {
+    const l = i.flightDetails.slices[0].segments.map((t) => I(v(t))).join("_");
+    return a[l] || (a[l] = []), a[l].push(i), a;
   }, {});
   return Object.values(e).map(
-    (s) => {
-      const t = s[0], { origin: c, destination: i } = t;
+    (a) => {
+      const i = a[0], { origin: l, destination: t } = i;
       return {
-        id: t.awayzGroupId,
-        partial: t.partial,
+        id: i.awayzGroupId,
+        partial: i.partial,
         origin: {
-          city: c.city,
-          country: c.country,
-          airportCode: c.airportCode,
-          coordinates: c.coordinates
+          city: l.city,
+          country: l.country,
+          airportCode: l.airportCode,
+          coordinates: l.coordinates
         },
         destination: {
-          city: i.city,
-          country: i.country,
-          airportCode: i.airportCode,
-          coordinates: i.coordinates
+          city: t.city,
+          country: t.country,
+          airportCode: t.airportCode,
+          coordinates: t.coordinates
         },
-        airline: t.airline,
-        flightNumber: t.flightNumber,
-        lowestCash: s.reduce(
-          (a, l) => Math.min(a, l.cash),
+        airline: i.airline,
+        flightNumber: i.flightNumber,
+        lowestCash: a.reduce(
+          (s, o) => Math.min(s, o.cash),
           1 / 0
         ),
-        lowestPoints: s.reduce(
-          (a, l) => Math.min(a, l.points),
+        lowestPoints: a.reduce(
+          (s, o) => Math.min(s, o.points),
           1 / 0
         ),
-        paymentOptions: s.map((a) => ({
-          id: a.id,
-          cash: a.cash,
-          points: a.points,
-          cashFeeCurrency: a.flightDetails.baseCurrency,
+        paymentOptions: a.map((s) => ({
+          id: s.id,
+          cash: s.cash,
+          points: s.points,
+          cashFeeCurrency: s.flightDetails.baseCurrency,
+          //TODO: Add Cash Fee Amount
           cashFeeAmount: 0,
-          baseCurrency: a.flightDetails.baseCurrency,
-          fareBrandName: a.flightDetails.slices[0].fareBrandName,
+          baseCurrency: s.flightDetails.baseCurrency,
+          fareBrandName: s.flightDetails.slices[0].fareBrandName,
           conditions: {
+            //TODO: Add Refund and Change Conditions
             refundBeforeDeparture: !0,
             changeBeforeDeparture: !0
+          },
+          carrier: {
+            iataCode: s.flightDetails.slices[0].segments[0].marketingCarrier.iataCode,
+            name: s.flightDetails.slices[0].segments[0].marketingCarrier.name
           }
         })),
-        numberOfStops: t.numberOfStops,
-        departureTime: t.departureTime,
-        arrivalTime: t.arrivalTime,
-        awayzGroupId: t.awayzGroupId,
-        duration: t.duration,
-        airlineProgram: t.airlineProgram,
+        numberOfStops: i.numberOfStops,
+        departureTime: i.departureTime,
+        arrivalTime: i.arrivalTime,
+        awayzGroupId: i.awayzGroupId,
+        duration: i.duration,
+        airlineProgram: i.airlineProgram,
         durationMinutes: z({
-          departureTime: N(
-            t.flightDetails.slices[0].segments[0].departingAt
+          departureTime: D(
+            i.flightDetails.slices[0].segments[0].departingAt
           ),
-          arrivalTime: N(
-            t.flightDetails.slices[0].segments.getLast().arrivingAt
+          arrivalTime: D(
+            i.flightDetails.slices[0].segments.getLast().arrivingAt
           ),
-          originTimeZone: t.flightDetails.slices[0].segments[0].origin.timeZone,
-          destinationTimeZone: t.flightDetails.slices[0].segments.getLast().destination.timeZone,
-          duration: t.flightDetails.slices[0].duration
+          originTimeZone: i.flightDetails.slices[0].segments[0].origin.timeZone,
+          destinationTimeZone: i.flightDetails.slices[0].segments.getLast().destination.timeZone,
+          duration: i.flightDetails.slices[0].duration
         }),
-        cash: t.cash,
-        points: t.points,
-        flightDetails: t.flightDetails
+        cash: a.reduce(
+          (s, o) => Math.min(s, o.cash),
+          1 / 0
+        ),
+        points: a.reduce(
+          (s, o) => Math.min(s, o.points),
+          1 / 0
+        ),
+        flightDetails: i.flightDetails
       };
     }
   );
-}, I = (r) => r.replace(/^0+/, ""), Q = (r) => `https://assets.duffel.com/img/airlines/for-light-background/full-color-logo/${r}.svg`, P = "/img/logo/odynn-eye.svg", k = {
-  categoryLogo: P,
-  programLogo: P,
+}, I = (r) => r.replace(/^0+/, ""), q = (r) => `https://assets.duffel.com/img/airlines/for-light-background/full-color-logo/${r}.svg`, k = "/img/logo/odynn-eye.svg", P = {
+  categoryLogo: k,
+  programLogo: k,
   awayzActive: [],
   mainProgram: "Unknown",
   displayProgram: "Unknown",
   id: "Unknown",
   totalAccumulatedPoints: 0,
-  category: O.Airline,
+  category: _.Airline,
   colour: "#fff",
   // Using App Foreground Colour
   url: "https://www.odynn.com"
-}, Y = async (r) => {
-  const { airlines: e } = await v.ensureQueryData({
+}, Q = async (r) => {
+  const { airlines: e } = await O.ensureQueryData({
     queryKey: ["walletAwards"],
     queryFn: G.getAwards,
     staleTime: 864e5
     // 24 hours
   });
   let n = e.find(
-    (s) => s.mainProgram.toLowerCase().includes(r.toLowerCase()) || s.displayProgram.toLowerCase().includes(r.toLowerCase())
-  ) ?? k;
+    (a) => a.mainProgram.toLowerCase().includes(r.toLowerCase()) || a.displayProgram.toLowerCase().includes(r.toLowerCase())
+  ) ?? P;
   return n || (n = {
-    ...k,
+    ...P,
     mainProgram: r,
     displayProgram: r,
     id: r
   }), n;
 };
 export {
-  k as DEFAULT_AIRLINE_PROGRAM,
+  P as DEFAULT_AIRLINE_PROGRAM,
   K as buildFlightSearchQuery,
-  Y as getAirlineProgram,
-  $ as getFlightNumber,
-  Q as getLogoPath,
-  q as groupFlightResults,
+  Q as getAirlineProgram,
+  v as getFlightNumber,
+  q as getLogoPath,
+  j as groupFlightResults,
   T as mapFlightDetailsToResults,
   U as parseFlightDetails,
   I as removeLeadingZeros

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@odynn/awayz-flights",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "type": "module",
   "files": [
     "dist"