mtg-playerinfo 1.4.1 → 1.4.2

package/README.md

@@ -53,8 +53,11 @@ General meta-data fields like `name`, `photo`, `age`, `country`, and `hometown`
     "facebook": "bjoern.kimminich",
     "twitch": "koshiii",
     "youtube": "@BjörnKimminich",
-    "mtga_rank": "Platinum 4",
-    "win rate": "47.37%"
+    "mtga_rank": {
+      "constructed": "Platinum 3",
+      "limited": "Bronze 4"
+    },
+    "win rate": "47.45%"
   },
   "sources": {
     "Unity League": {
@@ -69,10 +72,10 @@ General meta-data fields like `name`, `photo`, `age`, `country`, and `hometown`
         "team": "Mull to Five",
         "bio": "Smugly held back on an Untimely Malfunction against a Storm player going off, being totally sure that you can redirect the summed-up damage of their Grapeshots back to their face with its \"Change the target of target spell or ability with a single target\" mode.",
         "rank germany": "62",
-        "rank europe": "503",
-        "rank points": "325",
-        "record": "50-45-5",
-        "win rate": "51.7%"
+        "rank europe": "506",
+        "rank points": "334",
+        "record": "52-47-5",
+        "win rate": "51.6%"
       }
     },
     "MTG Elo Project": {
@@ -101,6 +104,9 @@ General meta-data fields like `name`, `photo`, `age`, `country`, and `hometown`
       "data": {
         "name": "Björn Kimminich",
         "photo": "https://imagedelivery.net/kN_u_RUfFF6xsGMKYWhO1g/2a7b8d12-5924-4a58-5f9c-c0bf55766800/square",
+        "pronouns": "He/Him",
+        "twitter": "bkimminich",
+        "youtube": "@BjörnKimminich",
         "tournaments": "2",
         "record": "4-6-1",
         "win rate": "36.36%",
@@ -110,7 +116,10 @@ General meta-data fields like `name`, `photo`, `age`, `country`, and `hometown`
     "Untapped.gg": {
       "url": "https://mtga.untapped.gg/profile/7de50700-c3f6-48e4-a38d-2add5b0d9b71/76DCDWCZS5FX5PIEEMUVY6GV74",
       "data": {
-        "mtga_rank": "Platinum 4"
+        "mtga_rank": {
+          "constructed": "Platinum 3",
+          "limited": "Bronze 4"
+        }
       }
     }
   }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "mtg-playerinfo",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "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": "node --test",
-    "test:coverage": "nyc --reporter=lcov --produce-source-map node --test",
+    "test": "node --test \"**/*.test.js\"",
+    "test:coverage": "nyc --reporter=lcov --produce-source-map node --test \"**/*.test.js\"",
     "lint": "standard",
     "lint:fix": "standard --fix"
   },
@@ -16,10 +16,9 @@
     "extension": [
       ".js"
     ],
-    "include": [
-      "src/fetchers/*.js",
-      "src/index.js",
-      "cli.js"
+    "exclude": [
+      "src/utils/httpClient.js",
+      "test/"
     ],
     "sourceMap": true,
     "instrument": true

package/src/fetchers/melee.js

@@ -1,4 +1,4 @@
-const { request } = require('../utils/httpClient')
+const httpClient = require('../utils/httpClient')
 const cheerio = require('cheerio')
 const { extractHandle, getPlatformName } = require('../utils/socialMediaExtractor')
 
@@ -6,7 +6,7 @@ class MeleeFetcher {
   async fetchById (username) {
     const url = `https://melee.gg/Profile/Index/${username}`
     try {
-      const { data } = await request(url)
+      const { data } = await httpClient.request(url)
       return this.parseHtml(data, url, username)
     } catch (error) {
       console.error(`Error fetching Melee profile ${username}:`, error.message)

package/src/fetchers/mtgElo.js

@@ -1,10 +1,10 @@
-const { request } = require('../utils/httpClient')
+const httpClient = require('../utils/httpClient')
 
 class MtgEloFetcher {
   async fetchById (id) {
     const url = `https://mtgeloproject.net/profile/${id}`
     try {
-      const { data: html } = await request(url, {
+      const { data: html } = await httpClient.request(url, {
         maxRedirects: 10
       })
 

package/src/fetchers/unityLeague.js

@@ -1,11 +1,11 @@
-const { request } = require('../utils/httpClient')
+const httpClient = require('../utils/httpClient')
 const cheerio = require('cheerio')
 
 class UnityLeagueFetcher {
   async fetchById (id) {
     const url = `https://unityleague.gg/player/${id}/`
     try {
-      const { data } = await request(url)
+      const { data } = await httpClient.request(url)
       return this.parseHtml(data, url)
     } catch (error) {
       console.error(`Error fetching Unity League player ${id}:`, error.message)

package/src/fetchers/untapped.js

@@ -1,4 +1,4 @@
-const { request } = require('../utils/httpClient')
+const httpClient = require('../utils/httpClient')
 
 class UntappedFetcher {
   async fetchById (id) {
@@ -14,7 +14,7 @@ class UntappedFetcher {
     const apiUrl = `https://api.mtga.untapped.gg/api/v1/games/users/${userId}/players/${playerCode}/?card_set=ECL`
 
     try {
-      const { data } = await request(apiUrl)
+      const { data } = await httpClient.request(apiUrl)
       const matches = typeof data === 'string' ? JSON.parse(data) : data
 
       if (!Array.isArray(matches) || matches.length === 0) {

package/src/utils/socialMediaExtractor.js

@@ -47,4 +47,3 @@ module.exports = {
   extractHandle,
   getPlatformName
 }
-

package/test/helpers.js

@@ -0,0 +1,32 @@
+const fs = require('node:fs')
+const path = require('node:path')
+
+/**
+ * Reads a fixture file from the test/data directory
+ * @param {string} name - The name of the fixture file
+ * @returns {string} - The content of the fixture file
+ */
+function readFixture (name) {
+  return fs.readFileSync(path.join(__dirname, '..', 'test', 'data', name), 'utf8')
+}
+
+/**
+ * Executes a function with console methods muted to avoid cluttering test output
+ * @param {Function} fn - The function to execute
+ * @returns {Promise<any>|any} - The result of the function
+ */
+async function withMutedConsole (fn) {
+  const orig = { error: console.error, warn: console.warn, log: console.log }
+  try {
+    console.error = () => {}
+    console.warn = () => {}
+    console.log = () => {}
+    return await fn()
+  } finally {
+    console.error = orig.error
+    console.warn = orig.warn
+    console.log = orig.log
+  }
+}
+
+module.exports = { readFixture, withMutedConsole }

package/test/melee.test.js

@@ -1,15 +1,10 @@
 const test = require('node:test')
 const assert = require('node:assert/strict')
-const fs = require('node:fs')
-const path = require('node:path')
-
 const MeleeFetcher = require('../src/fetchers/melee')
+const httpClient = require('../src/utils/httpClient')
+const { readFixture, withMutedConsole } = require('./helpers')
 
-function readFixture (name) {
-  return fs.readFileSync(path.join(__dirname, 'data', name), 'utf8')
-}
-
-test('MeleeFetcher: parseHtml extracts basic profile info', () => {
+test('MeleeFetcher: parseHtml extracts info from fixture', () => {
   const html = readFixture('melee.html')
   const url = 'https://melee.gg/Profile/Index/k0shiii'
   const username = 'k0shiii'
@@ -17,13 +12,55 @@ test('MeleeFetcher: parseHtml extracts basic profile info', () => {
 
   const result = fetcher.parseHtml(html, url, username)
 
-  assert.ok(result, 'Should return a result object')
-  assert.equal(result.source, 'Melee')
-  assert.equal(result.url, url)
-  assert.equal(result.name, 'Björn Kimminich')
-  assert.equal(result.pronouns, 'He/Him')
-  assert.equal(result.bio, 'Smugly held back on an Untimely Malfunction against a Storm player going off, being totally sure that you can redirect the summed-up damage of their Grapeshots back to their face.')
-  assert.equal(result.facebook, 'bjoern.kimminich')
-  assert.equal(result.twitch, 'koshiii')
-  assert.equal(result.youtube, '@BjörnKimminich')
+  assert.strictEqual(result.source, 'Melee')
+  assert.strictEqual(result.url, url)
+  assert.strictEqual(result.name, 'Björn Kimminich')
+  assert.strictEqual(result.pronouns, 'He/Him')
+  assert.ok(result.bio.includes('Smugly held back'))
+  assert.strictEqual(result.facebook, 'bjoern.kimminich')
+  assert.strictEqual(result.twitch, 'koshiii')
+  assert.strictEqual(result.youtube, '@BjörnKimminich')
+})
+
+test('MeleeFetcher: parseHtml handles minimal/missing data', () => {
+  const fetcher = new MeleeFetcher()
+
+  const result = fetcher.parseHtml('<html><body></body></html>', 'url', 'fallback')
+  assert.strictEqual(result.name, 'fallback')
+  assert.strictEqual(result.pronouns, null)
+  assert.strictEqual(result.bio, null)
+})
+
+test('MeleeFetcher: parseHtml extracts social links correctly', () => {
+  const fetcher = new MeleeFetcher()
+  const html = `
+    <a class="social-link" href="https://twitter.com/testuser">Twitter</a>
+    <a class="social-link" href="not-a-url">Invalid</a>
+  `
+  const result = fetcher.parseHtml(html, 'url', 'user')
+  assert.strictEqual(result.twitter, 'testuser')
+  assert.ok(!result.facebook)
+})
+
+test('MeleeFetcher: fetchById handles success and error scenarios', async (t) => {
+  const fetcher = new MeleeFetcher()
+
+  await t.test('successful fetch', async () => {
+    const mockRequest = t.mock.method(httpClient, 'request', async () => ({
+      data: '<html><span style="font-size: xx-large">Fetched Name</span></html>',
+      status: 200
+    }))
+    const result = await fetcher.fetchById('user')
+    assert.strictEqual(result.name, 'Fetched Name')
+    mockRequest.mock.restore()
+  })
+
+  await t.test('network error', async () => {
+    const mockRequest = t.mock.method(httpClient, 'request', () => { throw new Error('Network Error') })
+    await withMutedConsole(async () => {
+      const result = await fetcher.fetchById('user')
+      assert.strictEqual(result, null)
+    })
+    mockRequest.mock.restore()
+  })
 })

package/test/mtgElo.test.js

@@ -1,31 +1,70 @@
 const test = require('node:test')
 const assert = require('node:assert/strict')
-const fs = require('node:fs')
-const path = require('node:path')
-
 const MtgEloFetcher = require('../src/fetchers/mtgElo')
+const httpClient = require('../src/utils/httpClient')
+const { readFixture, withMutedConsole } = require('./helpers')
 
-function readFixture (name) {
-  return fs.readFileSync(path.join(__dirname, 'data', name), 'utf8')
-}
-
-test('MtgEloFetcher: parseHtml extracts name and details including computed Win Rate', () => {
+test('MtgEloFetcher: parseHtml extracts info from fixture', () => {
   const html = readFixture('mtgElo.html')
-  const id = 'bjoern-kimminich'
-  const url = `https://mtgeloproject.net/profile/${id}`
+  const url = 'https://mtgeloproject.net/profile/7de50700'
+  const fetcher = new MtgEloFetcher()
+
+  const result = fetcher.parseHtml(html, url, '7de50700')
+
+  assert.strictEqual(result.source, 'MTG Elo Project')
+  assert.strictEqual(result.name, 'Bjoern Kimminich')
+  assert.match(result.current_rating, /^\d+$/)
+  assert.match(result.record, /^\d+-\d+-\d+$/)
+  assert.match(result['win rate'], /^\d+(\.\d+)?%$/)
+})
+
+test('MtgEloFetcher: parseHtml handles missing astro-island and uses fallback selectors', () => {
   const fetcher = new MtgEloFetcher()
+  const html = `
+    <html>
+      <body>
+        <div class="text-[22pt]">Kimminich, Björn</div>
+        <div class="text-[18pt]">Current rating: <span class="font-bold">1200</span></div>
+        <div class="text-[18pt]">Record: 10-5</div>
+      </body>
+    </html>
+  `
+  const result = fetcher.parseHtml(html, 'url', 'id')
+  assert.strictEqual(result.name, 'Björn Kimminich')
+  assert.strictEqual(result.current_rating, '1200')
+  assert.strictEqual(result.record, '10-5')
+  assert.strictEqual(result['win rate'], '66.67%')
+})
+
+test('MtgEloFetcher: parseHtml handles malformed astro-island JSON', async () => {
+  const fetcher = new MtgEloFetcher()
+  const html = '<astro-island component-url="Profile" props="invalid-json"></astro-island>'
+
+  await withMutedConsole(() => {
+    const result = fetcher.parseHtml(html, 'url', 'id')
+    assert.strictEqual(result, null)
+  })
+})
+
+test('MtgEloFetcher: fetchById handles success and error scenarios', async (t) => {
+  const fetcher = new MtgEloFetcher()
+
+  await t.test('successful fetch', async () => {
+    const mockRequest = t.mock.method(httpClient, 'request', async () => ({
+      data: '<html><div class="text-[22pt]">Test User</div></html>',
+      status: 200
+    }))
+    const result = await fetcher.fetchById('123')
+    assert.strictEqual(result.name, 'Test User')
+    mockRequest.mock.restore()
+  })
 
-  const result = fetcher.parseHtml(html, url, id)
-
-  assert.ok(result, 'Should return a result object')
-  assert.equal(result.source, 'MTG Elo Project')
-  assert.equal(result.url, url)
-  assert.equal(result.name, 'Bjoern Kimminich')
-  assert.equal(result.player_id, id)
-  if (result.record) {
-    assert.match(result.record, /^\d+-\d+(-\d+)?$/)
-  }
-  if (result['win rate']) {
-    assert.match(result['win rate'], /^\d+(\.\d+)?%$/)
-  }
+  await t.test('network error', async () => {
+    const mockRequest = t.mock.method(httpClient, 'request', () => { throw new Error('Network Error') })
+    await withMutedConsole(async () => {
+      const result = await fetcher.fetchById('123')
+      assert.strictEqual(result, null)
+    })
+    mockRequest.mock.restore()
+  })
 })