mtg-playerinfo 1.0.3 → 1.1.0

package/.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: CI/CD Pipeline
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [20, 22, 24]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+
+    - name: Install dependencies
+      run: npm install
+
+    - name: Run tests
+      run: npm test

package/.github/workflows/pull-player-data.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   run-tool:

package/cli.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 const { program } = require('commander');
 const PlayerInfoManager = require('./src/index');
 

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "mtg-playerinfo",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "description": "A simple NPM module and CLI tool to pull Magic: The Gathering player data from various sources",
   "main": "src/index.js",
   "bin": {
     "mtg-playerinfo": "./cli.js"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "node --test"
   },
   "keywords": [],
   "author": "Björn Kimminich",

package/src/fetchers/melee.js

@@ -16,6 +16,8 @@ class MeleeFetcher {
   parseHtml(html, url, username) {
     const $ = cheerio.load(html);
     const name = $('span[style*="font-size: xx-large"]').first().text().trim() || username;
+    const pronouns = $('.profile-details span.text-muted.mr-2').filter((i, el) => $(el).text().includes('/')).first().text().trim();
+    const bio = $('.profile-details div[style*="max-width: 75%"]').first().text().trim();
     // FIXME Photos cannot be loaded with unauthenticated requests from Melee.gg
     // const photo = $('.profile-button-column img').first().attr('src') || $('img.m-auto').attr('src');
 
@@ -23,10 +25,38 @@ class MeleeFetcher {
       source: 'Melee',
       url,
       name,
-      // photo: photo ? (photo.startsWith('http') ? photo : `https://melee.gg${photo}`) : null,
-      details: { }
+      pronouns: pronouns || null,
+      bio: bio || null,
+      // photo: photo ? (photo.startsWith('http') ? photo : `https://melee.gg${photo}`) : null
     };
 
+    $('.social-link').each((i, el) => {
+      const href = $(el).attr('href');
+      if (href) {
+        try {
+          const urlObj = new URL(href);
+          const platform = urlObj.hostname.replace('www.', '').split('.')[0];
+          let handle = urlObj.pathname.split('/').filter(Boolean).pop();
+          if (handle) {
+            handle = decodeURIComponent(handle);
+          }
+          if (platform === 'youtube' && handle.startsWith('@')) {
+            // keep @ for youtube
+          } else if (platform === 'facebook') {
+            // handle is correct
+          } else if (platform === 'twitch') {
+            // handle is correct
+          }
+          if (handle) {
+            const label = platform.charAt(0).toLowerCase() + platform.slice(1);
+            data[label] = handle;
+          }
+        } catch (e) {
+          // ignore invalid URLs
+        }
+      }
+    });
+
     return data;
   }
 }

package/src/fetchers/mtgElo.js

@@ -8,75 +8,77 @@ class MtgEloFetcher {
         maxRedirects: 10
       });
 
-      const cheerio = require('cheerio');
-      const $ = cheerio.load(html);
+      return this.parseHtml(html, url, id);
+    } catch (error) {
+      console.error(`Error fetching MTG Elo Project profile ${id}:`, error.message);
+      return null;
+    }
+  }
 
-      let name = '';
-      let currentRating = '';
-      let record = '';
+  parseHtml(html, url, id) {
+    const cheerio = require('cheerio');
+    const $ = cheerio.load(html);
 
-      const astroIsland = $('astro-island[component-url*="Profile"]');
-      if (astroIsland.length > 0) {
-        try {
-          const props = JSON.parse(astroIsland.attr('props'));
-          const info = props.info[1];
-          name = `${info.first_name[1]} ${info.last_name[1]}`;
-          currentRating = Math.round(info.current_rating[1]).toString();
-          const r = info.record[1];
-          record = `${r[0][1]}-${r[1][1]}-${r[2][1]}`;
-        } catch (e) {
-          console.error('Error parsing MTG Elo props:', e.message);
-        }
-      }
+    let name = '';
+    let currentRating = '';
+    let record = '';
 
-      if (!name) {
-        name = $('.text-\\[22pt\\]').text().trim();
-        if (name.includes(',')) {
-          const parts = name.split(',').map(s => s.trim());
-          name = `${parts[1]} ${parts[0]}`;
-        }
+    const astroIsland = $('astro-island[component-url*="Profile"]');
+    if (astroIsland.length > 0) {
+      try {
+        const props = JSON.parse(astroIsland.attr('props'));
+        const info = props.info[1];
+        name = `${info.first_name[1]} ${info.last_name[1]}`;
+        currentRating = Math.round(info.current_rating[1]).toString();
+        const r = info.record[1];
+        record = `${r[0][1]}-${r[1][1]}-${r[2][1]}`;
+      } catch (e) {
+        console.error('Error parsing MTG Elo props:', e.message);
       }
+    }
 
-      if (!currentRating) {
-        currentRating = $('.text-\\[18pt\\]:contains("Current rating")').find('.font-bold').text().trim();
+    if (!name) {
+      name = $('.text-\\[22pt\\]').text().trim();
+      if (name.includes(',')) {
+        const parts = name.split(',').map(s => s.trim());
+        name = `${parts[1]} ${parts[0]}`;
       }
+    }
 
-      if (!record) {
-        const recordText = $('.text-\\[18pt\\]:contains("Record")').text();
-        record = recordText.replace('Record:', '').trim();
-      }
+    if (!currentRating) {
+      currentRating = $('.text-\\[18pt\\]:contains("Current rating")').find('.font-bold').text().trim();
+    }
 
-      if (!name) return null;
+    if (!record) {
+      const recordText = $('.text-\\[18pt\\]:contains("Record")').text();
+      record = recordText.replace('Record:', '').trim();
+    }
 
-      const details = {
-        player_id: id,
-        current_rating: currentRating,
-        record: record
-      };
+    if (!name) return null;
 
-      if (record && record.includes('-')) {
-        const [w, l, d] = record.split('-').map(Number);
-        if (!isNaN(w) && !isNaN(l)) {
-          const wins = w;
-          const losses = l;
-          const draws = isNaN(d) ? 0 : d;
-          const total = wins + losses + draws;
-          if (total > 0) {
-            details['Win Rate'] = ((wins / total) * 100).toFixed(2) + '%';
-          }
+    const data = {
+      source: 'MTG Elo Project',
+      url: url,
+      name: name,
+      player_id: id,
+      current_rating: currentRating,
+      record: record
+    };
+
+    if (record && record.includes('-')) {
+      const [w, l, d] = record.split('-').map(Number);
+      if (!isNaN(w) && !isNaN(l)) {
+        const wins = w;
+        const losses = l;
+        const draws = isNaN(d) ? 0 : d;
+        const total = wins + losses + draws;
+        if (total > 0) {
+          data['win rate'] = ((wins / total) * 100).toFixed(2) + '%';
         }
       }
-
-      return {
-        source: 'MTG Elo Project',
-        url: url,
-        name: name,
-        details: details
-      };
-    } catch (error) {
-      console.error(`Error fetching MTG Elo Project profile ${id}:`, error.message);
-      return null;
     }
+
+    return data;
   }
 }
 

package/src/fetchers/topdeck.js

@@ -37,15 +37,15 @@ class TopdeckFetcher {
               });
 
               if (totalTournaments > 0) {
-                playerInfo.details['Tournaments'] = totalTournaments.toString();
-                playerInfo.details['Record'] = `${wins}-${losses}-${draws}`;
-                playerInfo.details['Win Rate'] = ((wins / (wins + losses + draws)) * 100).toFixed(2) + '%';
+                playerInfo['tournaments'] = totalTournaments.toString();
+                playerInfo['record'] = `${wins}-${losses}-${draws}`;
+                playerInfo['win rate'] = ((wins / (wins + losses + draws)) * 100).toFixed(2) + '%';
               }
             } else {
-              playerInfo.details['Tournaments'] = stats.totalTournaments || playerInfo.details['Tournaments'] || '0';
-              playerInfo.details['Record'] = stats.overallRecord || playerInfo.details['Record'] || '0-0-0';
-              playerInfo.details['Win Rate'] = stats.overallWinRate || playerInfo.details['Win Rate'] || '0.00%';
-              playerInfo.details['Conversion'] = stats.conversionRate || playerInfo.details['Conversion'] || '0.00%';
+              playerInfo['tournaments'] = stats.totalTournaments || playerInfo['tournaments'] || '0';
+              playerInfo['record'] = stats.overallRecord || playerInfo['record'] || '0-0-0';
+              playerInfo['win rate'] = stats.overallWinRate || playerInfo['win rate'] || '0.00%';
+              playerInfo['conversion'] = stats.conversionRate || playerInfo['conversion'] || '0.00%';
             }
           }
         } catch (statsError) {
@@ -69,31 +69,31 @@ class TopdeckFetcher {
       source: 'Topdeck',
       url,
       name,
-      photo: photo ? (photo.startsWith('http') ? photo : `https://topdeck.gg${photo}`) : null,
-      details: { }
+      photo: photo ? (photo.startsWith('http') ? photo : `https://topdeck.gg${photo}`) : null
     };
 
     const statsMap = {
-      'totalTournaments': 'Tournaments',
-      'overallRecord': 'Record',
-      'overallWinRate': 'Win Rate',
-      'conversionRate': 'Conversion'
+      'totalTournaments': 'tournaments',
+      'overallRecord': 'record',
+      'overallWinRate': 'win rate',
+      'conversionRate': 'conversion'
     };
 
     Object.entries(statsMap).forEach(([id, label]) => {
       const val = $(`#${id}`).text().trim();
       if (val) {
-        data.details[label] = val;
+        data[label] = val;
       }
     });
 
-    if (Object.keys(data.details).length === 1) {
+    const currentStats = Object.keys(data).filter(k => Object.values(statsMap).includes(k));
+    if (currentStats.length <= 1) {
       $('.stats-container, .player-stats').each((i, el) => {
         $(el).find('.stat').each((j, statEl) => {
-          const label = $(statEl).find('.label').text().trim();
+          const label = $(statEl).find('.label').text().trim().toLowerCase();
           const value = $(statEl).find('.value').text().trim();
           if (label && value) {
-            data.details[label] = value;
+            data[label] = value;
           }
         });
       });

package/src/fetchers/unityLeague.js

@@ -25,8 +25,7 @@ class UnityLeagueFetcher {
       source: 'Unity League',
       url,
       name,
-      photo: photo ? (photo.startsWith('http') ? photo : `https://unityleague.gg${photo}`) : null,
-      details: {}
+      photo: photo ? (photo.startsWith('http') ? photo : `https://unityleague.gg${photo}`) : null
     };
 
     const headerFlag = $('.card-body i.fi').first();
@@ -34,16 +33,16 @@ class UnityLeagueFetcher {
       const classes = headerFlag.attr('class').split(' ');
       const countryClass = classes.find(c => c.startsWith('fi-'));
       if (countryClass) {
-        data.details.Country = countryClass.replace('fi-', '');
+        data.country = countryClass.replace('fi-', '');
       }
     }
 
     $('dt.small.text-muted').each((i, el) => {
-      const key = $(el).text().trim().replace(/:$/, '');
+      const key = $(el).text().trim().replace(/:$/, '').toLowerCase();
       const dd = $(el).next('dd');
       let value = dd.text().trim();
 
-      if (key === 'Country') {
+      if (key === 'country') {
         const flagIcon = dd.find('i.fi');
         if (flagIcon.length > 0) {
           const classes = flagIcon.attr('class').split(' ');
@@ -54,12 +53,12 @@ class UnityLeagueFetcher {
         }
       }
 
-      data.details[key] = value;
+      data[key] = value;
     });
 
     const bioElement = $('.card-body > small.mt-2').first();
     if (bioElement.length > 0) {
-      data.details.Bio = bioElement.text().trim();
+      data.bio = bioElement.text().trim();
     }
 
     const rankingTable = $('table.table-sm').first();
@@ -70,10 +69,10 @@ class UnityLeagueFetcher {
       headers.forEach((header, i) => {
         if (header && values[i]) {
           let val = values[i];
-          if (val.startsWith('#')) {
-            val = val.substring(1);
+          val = val.replace(/\D/g, ''); // remove non-numeric characters to support #23->23, 1st->1, and 42nd->42 etc.
+          if (val) {
+            data[`rank ${header.toLowerCase()}`] = val;
           }
-          data.details[`Rank ${header}`] = val;
         }
       });
     }
@@ -88,8 +87,8 @@ class UnityLeagueFetcher {
       if (cells.length >= 3) {
         const record = $(cells[1]).text().trim().replace(/\s+/g, '');
         const winRate = $(cells[2]).text().trim();
-        data.details.Record = record;
-        data.details['Win Rate'] = winRate;
+        data.record = record;
+        data['win rate'] = winRate;
       }
     }
 

package/src/index.js

@@ -27,8 +27,6 @@ class PlayerInfoManager {
 
   mergeData(results) {
     const player = {
-      name: null,
-      photo: null,
       general: {},
       sources: {}
     };
@@ -41,33 +39,24 @@ class PlayerInfoManager {
       if (seenUrls.has(res.url)) return;
       seenUrls.add(res.url);
 
-      if (!player.name && res.name) player.name = res.name;
-      if (!player.photo && res.photo) player.photo = res.photo;
-
-      if (res.details) {
-        if (res.details.Age && !player.general.Age) player.general.Age = res.details.Age;
-        if (res.details.Bio && !player.general.Bio) player.general.Bio = res.details.Bio;
-        if (res.details.Team && !player.general.Team) player.general.Team = res.details.Team;
-        if (res.details.Country && !player.general.Country) player.general.Country = res.details.Country;
-        if (res.details.Hometown && !player.general.Hometown) player.general.Hometown = res.details.Hometown;
+      const generalProps = ['name', 'photo', 'age', 'bio', 'team', 'country', 'hometown', 'pronouns', 'facebook', 'twitch', 'youtube'];
+      generalProps.forEach(prop => {
+        if (res[prop] && !player.general[prop]) {
+          player.general[prop] = res[prop];
+        }
+      });
 
-        const winRateStr = res.details['Win Rate'] || res.details.winRate;
-        if (winRateStr && typeof winRateStr === 'string') {
-          const winRate = parseFloat(winRateStr.replace('%', ''));
-          if (!isNaN(winRate)) {
-            winRates.push(winRate);
-          }
+      const winRateStr = res['win rate'] || res.winRate;
+      if (winRateStr && typeof winRateStr === 'string') {
+        const winRate = parseFloat(winRateStr.replace('%', ''));
+        if (!isNaN(winRate)) {
+          winRates.push(winRate);
         }
       }
 
-      const sourceData = { ...res.details };
-      if (res.source === 'Unity League') {
-        delete sourceData.Age;
-        delete sourceData.Bio;
-        delete sourceData.Hometown;
-        delete sourceData.Team;
-        delete sourceData.Country;
-      }
+      const sourceData = { ...res };
+      delete sourceData.source;
+      delete sourceData.url;
 
       player.sources[res.source] = {
         url: res.url,
@@ -77,7 +66,7 @@ class PlayerInfoManager {
 
     if (winRates.length > 0) {
       const avgWinRate = winRates.reduce((a, b) => a + b, 0) / winRates.length;
-      player.general['Win Rate'] = avgWinRate.toFixed(2) + '%';
+      player.general['win rate'] = avgWinRate.toFixed(2) + '%';
     }
 
     return player;