shufflecom-calculations 3.3.9 → 3.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shufflecom-calculations",
-  "version": "3.3.9",
+  "version": "3.3.10",
   "description": "",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
@@ -14,5 +14,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "55c15194f5b26382e3793140c4a843196c3d82cf"
+  "gitHead": "7d9ea4668009e9c62e2f8a5abb00be87cf1ec11d"
 }

package/src/regex/index.ts

@@ -17,5 +17,9 @@ export const TIMEZONE_OFFSET_REGEX = /^(?:Z|[+-](?:2[0-3]|[01][0-9]):[0-5][0-9])
 export const TXN_URL_REGEX = /^https:\/\/.*\{txId\}.*$/;
 
 export const ADDRESS_URL_REGEX = /^https:\/\/.*\{address\}.*$/;
-export const VALID_NAME_REGEX = /^[^0-9!@#$%^&*`~()+=[{\]};:"\\|<>\/?\u3164]*$/;
+export const VALID_NAME_REGEX = /^[^0-9!@#$%^&*`~()+=[{\]};:"\\|<>\/?]*$/;
+// Rejects invisible/blank Unicode chars commonly used to spoof empty or hidden names:
+// U+2800 Braille Blank, U+FFA0 Halfwidth Hangul Filler, U+115F Hangul Choseong Filler,
+// U+1160 Hangul Jungseong Filler, U+3164 Hangul Filler
+export const NO_INVISIBLE_CHAR_REGEX = /^[^\u2800\uFFA0\u115F\u1160\u3164]*$/;
 export const US_PHONE_NUMBER_REGEX = /^\+1\d{10}$/;

package/src/regex/regex.spec.ts

@@ -7,6 +7,7 @@ import {
   ADDRESS_URL_REGEX,
   VALID_NAME_REGEX,
   US_PHONE_NUMBER_REGEX,
+  NO_INVISIBLE_CHAR_REGEX,
 } from '.';
 
 describe('regex', () => {
@@ -21,10 +22,9 @@ describe('regex', () => {
     });
 
     it('should allow passwords between 8-24 characters', () => {
-      expect(PWD_REGEX.test('12345678')).toBe(true);      
-      expect(PWD_REGEX.test('abcdefgh')).toBe(true);   
-      expect(PWD_REGEX.test('Password123!')).toBe(true);  
-
+      expect(PWD_REGEX.test('12345678')).toBe(true);
+      expect(PWD_REGEX.test('abcdefgh')).toBe(true);
+      expect(PWD_REGEX.test('Password123!')).toBe(true);
     });
   });
 
@@ -139,9 +139,44 @@ describe('regex', () => {
     it('should allow for empty string', () => {
       expect(VALID_NAME_REGEX.test('')).toBe(true);
     });
+  });
+
+  describe('NO_INVISIBLE_CHAR_REGEX', () => {
+    const BRAILLE_BLANK = String.fromCodePoint(0x2800);
+    const HALFWIDTH_HANGUL_FILLER = String.fromCodePoint(0xffa0);
+    const HANGUL_CHOSEONG_FILLER = String.fromCodePoint(0x115f);
+    const HANGUL_JUNGSEONG_FILLER = String.fromCodePoint(0x1160);
+    const HANGUL_FILLER = String.fromCodePoint(0x3164);
+
+    it('should not allow for U+2800 (Braille Blank) unicode character', () => {
+      expect(NO_INVISIBLE_CHAR_REGEX.test(BRAILLE_BLANK)).toBe(false);
+    });
+
+    it('should not allow for U+FFA0 (Halfwidth Hangul Filler) unicode character', () => {
+      expect(NO_INVISIBLE_CHAR_REGEX.test(HALFWIDTH_HANGUL_FILLER)).toBe(false);
+    });
+
+    it('should not allow for U+115F (Hangul Choseong Filler) unicode character', () => {
+      expect(NO_INVISIBLE_CHAR_REGEX.test(HANGUL_CHOSEONG_FILLER)).toBe(false);
+    });
+
+    it('should not allow for U+1160 (Hangul Jungseong Filler) unicode character', () => {
+      expect(NO_INVISIBLE_CHAR_REGEX.test(HANGUL_JUNGSEONG_FILLER)).toBe(false);
+    });
+
+    it('should not allow for U+3164 (Hangul Filler) unicode character', () => {
+      expect(NO_INVISIBLE_CHAR_REGEX.test(HANGUL_FILLER)).toBe(false);
+    });
+
+    it('should not allow strings with multiple invisible chars', () => {
+      expect(NO_INVISIBLE_CHAR_REGEX.test(`${BRAILLE_BLANK}${HANGUL_FILLER}${HALFWIDTH_HANGUL_FILLER}`)).toBe(false);
+    });
 
-    it('should not allow for U+3164(Hangul Filler) unicode character', () => {
-      expect(VALID_NAME_REGEX.test('ㅤ')).toBe(false); // there is an invisible unicode character in here
+    it('should allow clean strings without invisible chars', () => {
+      expect(NO_INVISIBLE_CHAR_REGEX.test('superman')).toBe(true);
+      expect(NO_INVISIBLE_CHAR_REGEX.test('SuPERman 123!')).toBe(true);
+      expect(NO_INVISIBLE_CHAR_REGEX.test('我喜欢bingchiling')).toBe(true);
+      expect(NO_INVISIBLE_CHAR_REGEX.test("m_r's don-nut.")).toBe(true);
     });
   });
 

package/src/sports/calculate-sports-payout-odds.ts

@@ -1,6 +1,14 @@
 import BigNumber from 'bignumber.js';
 import { limitTotalOddsDecimalPlaces, oddsFractionToDecimal } from './odds';
-import { OutcomeResult, SportsBetSelectionInterface, SportsBetSelectionStatus, SportsMarketSelectionInterface } from './sports.types';
+import {
+  OutcomeResult,
+  SportsBetLegInterface,
+  SportsBetLegType,
+  SportsBetSelectionInterface,
+  SportsBetSelectionStatus,
+  SportsBetType,
+  SportsMarketSelectionInterface,
+} from './sports.types';
 import { SportsSystemBetType, SportsSystemBetTypeCombinations, SportsSystemBetTypeSelectionCountsToBetCounts } from './system-bet.types';
 
 export const MARGIN_MIN_BPS = 100; // hard limit min 1% for cashout
@@ -273,3 +281,20 @@ function calculateSelectionCashoutOdds(
     .multipliedBy(selectionOddsDecimal)
     .dividedBy(oddsFractionToDecimal(marketSelection.oddsNumerator, marketSelection.oddsDenominator));
 }
+
+// Structural mapping from (bet type, selections) → legs. The placement writer and the backfill
+// service both consume this so that the leg-shape rule for each bet type lives in one place.
+export function deriveLegsFromSelections(
+  sportsBetType: SportsBetType,
+  selections: SportsBetSelectionInterface[],
+  customBetTotalOddsDecimal: BigNumber,
+): SportsBetLegInterface[] {
+  if (sportsBetType === SportsBetType.CUSTOM_BET) {
+    return [{ type: SportsBetLegType.CUSTOM, oddsDecimal: customBetTotalOddsDecimal, selections }];
+  }
+  return selections.map(selection => ({
+    type: SportsBetLegType.REGULAR,
+    oddsDecimal: oddsFractionToDecimal(selection.oddsNumerator, selection.oddsDenominator),
+    selections: [selection],
+  }));
+}

package/src/sports/sports.types.ts

@@ -46,8 +46,8 @@ export enum SportsFixtureStatus {
 export enum SportsMarketStatus {
   OPEN = 'OPEN',
   CLOSED = 'CLOSED', // gets reverted back to OPEN very often with the radar line market cases
-  RESULTED = 'RESULTED', // aka, finalized, no longer used in any query + index, updated by update-market-status job
   SUSPENDED = 'SUSPENDED',
+  RESULTED = 'RESULTED', // aka, finalized, no longer used in any query + index, updated by update-market-status job
   /**
    * @deprecated
    */
@@ -135,6 +135,17 @@ export interface SportsBetSelectionInterface {
   oddsDenominator: BigNumber;
 }
 
+export enum SportsBetLegType {
+  REGULAR = 'REGULAR',
+  CUSTOM = 'CUSTOM',
+}
+
+export interface SportsBetLegInterface {
+  type: SportsBetLegType;
+  oddsDecimal: BigNumber;
+  selections: SportsBetSelectionInterface[];
+}
+
 export interface SportsFixtureInterface {
   id: string;
   status: SportsFixtureStatus;
@@ -539,6 +550,8 @@ export enum SportsMarketGroup {
   LAST_TO_MARKETS = 'LAST_TO_MARKETS',
   OTHER_MARKETS = 'OTHER_MARKETS', // this doesnt really exist in db, for query purpose only
   SAME_GAME_MULTI_MARKETS = 'SAME_GAME_MULTI_MARKETS',
+  QUICK_COMBOS = 'QUICK_COMBOS', // for managing tab visibility only — no SportsMarketGrouping rows. queries for tab content happen through quickCombos query, not sportsMarketInfo
+
   KILL_MARKETS = 'KILL_MARKETS',
   ROSHAN_MARKETS = 'ROSHAN_MARKETS',
   TURRET_MARKETS = 'TURRET_MARKETS',