feat(billmanager): гео Waicore из datacentername

Страна и город VPS из `[DE] Город | …` и `Страна, Город` через enrichVds.

Co-authored-by: Cursor <[email protected]>

apps/api/src/services/billmanager/profiles.test.ts

@@ -38,6 +38,22 @@ const WAICORE_VDS_FIXTURE = {
       item_status_orig: '2',
       item_status: 'Активен',
     },
+    {
+      id: '50642',
+      ip: '193.233.134.103',
+      domain: 'denode.ivx.su',
+      expiredate: '2027-05-01',
+      real_expiredate: '2027-05-01',
+      ostempl: 'Ubuntu 24.04',
+      datacentername: 'Германия, Франкфурт-на-Майне',
+      pricelist: '[DE] RX-VPN',
+      cost: '0.80 € / Месяц',
+      item_cost: '9.6000',
+      currency_str: '€',
+      createdate: '2025-04-25',
+      item_status_orig: '2',
+      item_status: 'Активен',
+    },
   ],
 }
 
@@ -127,18 +143,37 @@ describe('billmanager profiles', () => {
     })
   })
 
-  it('Waicore fixture elem → MappedVps fields', () => {
+  it('Waicore fixture elem → MappedVps fields + geo from datacentername', () => {
     const profile = resolveBillmanagerProfile('https://my.waicore.com/')
     const elems = extractList(WAICORE_VDS_FIXTURE, profile.extract.listVdsKey)
-    expect(elems).toHaveLength(1)
-    const item = elemToObject(elems[0]!)
-    const vps = mapVdsWithProfile(profile, item, 'prov-1', 'acc-1')
-    expect(vps.externalId).toBe('87173')
-    expect(vps.ip).toBe('212.192.246.214')
-    expect(vps.dns).toBe('instance87173.waicore.network')
-    expect(vps.paidUntil).toBe('2027-01-21')
-    expect(vps.os).toBe('Ubuntu 24.04')
-    expect(vps.status).toBe('active')
+    expect(elems).toHaveLength(2)
+
+    const promo = mapVdsWithProfile(
+      profile,
+      elemToObject(elems[0]!),
+      'prov-1',
+      'acc-1',
+    )
+    expect(promo.externalId).toBe('87173')
+    expect(promo.ip).toBe('212.192.246.214')
+    expect(promo.dns).toBe('instance87173.waicore.network')
+    expect(promo.paidUntil).toBe('2027-01-21')
+    expect(promo.os).toBe('Ubuntu 24.04')
+    expect(promo.status).toBe('active')
+    expect(promo.country).toBe('Германия')
+    expect(promo.city).toBe('Франкфурт')
+    expect(promo.datacenter).toBe('[DE] Франкфурт | Промо')
+
+    const fullName = mapVdsWithProfile(
+      profile,
+      elemToObject(elems[1]!),
+      'prov-1',
+      'acc-1',
+    )
+    expect(fullName.externalId).toBe('50642')
+    expect(fullName.country).toBe('Германия')
+    expect(fullName.city).toBe('Франкфурт-на-Майне')
+    expect(fullName.datacenter).toBe('Германия, Франкфурт-на-Майне')
   })
 
   it('FirstByte: country/city + paidUntil for monthly and daily', () => {
@@ -287,8 +322,9 @@ describe('billmanager profiles', () => {
     const items = await fetchVds('https://my.waicore.com/', 'user:pass')
     expect(calls).toHaveLength(1)
     expect(calls[0]).toContain('func=vds.vps')
-    expect(items).toHaveLength(1)
+    expect(items).toHaveLength(2)
     expect(items[0]?.id).toBe('87173')
+    expect(items[1]?.id).toBe('50642')
   })
 
   it('fetchVds for default URL uses func=vds', async () => {

apps/api/src/services/billmanager/profiles/README.md

@@ -49,5 +49,5 @@ Sync и operations **не** содержат `if (hoster)` — только пр
 
 | id | Match | Что переопределяет |
 |----|-------|-------------------|
-| `waicore` | `waicore.com` / keyword | `funcs.listVds = vds.vps` |
+| `waicore` | `waicore.com` / keyword | `funcs.listVds = vds.vps`; geo из `datacentername` (`[DE] Город \| …` / `Страна, Город`) |
 | `firstbyte` | `firstbyte.ru`, `firstbyte.club`, `1byte.ru` | `enrichVds`: страна/город, daily из `billdaily`/`Ежедневное списание`, `dailyRate=cost/30`; `enrichVdsBatch`: общий баланс ÷ сумма daily → один `paidUntil`; specs из `vds.order` / `vds.edit` |

apps/api/src/services/billmanager/profiles/waicore.ts

@@ -1,8 +1,39 @@
-import type { BillmanagerProfileOverrides } from './types.js'
+import { parseDatacenterName } from '../parsers.js'
+import type { MappedVps } from '../mappers.js'
+import type {
+  BillmanagerMapOverrides,
+  BillmanagerProfileOverrides,
+} from './types.js'
+
+/**
+ * Geo from Waicore `datacentername`, e.g.:
+ * - `[DE] Франкфурт | Промо` → Германия / Франкфурт
+ * - `Германия, Франкфурт-на-Майне` → Германия / Франкфурт-на-Майне
+ */
+export function enrichWaicoreVds(
+  item: Record<string, string>,
+  mapped: MappedVps,
+): MappedVps {
+  const dcRaw = (item.datacentername || item.datacenter || mapped.datacenter || '').trim()
+  if (!dcRaw) return mapped
+
+  const { country, location } = parseDatacenterName(dcRaw)
+  return {
+    ...mapped,
+    country: country || mapped.country,
+    city: location || mapped.city,
+    datacenter: dcRaw || mapped.datacenter,
+  }
+}
+
+const waicoreMap: BillmanagerMapOverrides = {
+  enrichVds: enrichWaicoreVds,
+}
 
 /**
  * Waicore (my.waicore.com) — list VPS via func=vds.vps instead of vds.
- * Response uses top-level elem[] (covered by extractList).
+ * Response uses top-level elem[] (bjson; covered by extractList).
+ * Geo from datacentername via enrichVds.
  */
 export const waicoreOverrides: BillmanagerProfileOverrides = {
   id: 'waicore',
@@ -13,4 +44,5 @@ export const waicoreOverrides: BillmanagerProfileOverrides = {
   funcs: {
     listVds: 'vds.vps',
   },
+  map: waicoreMap,
 }