@sonatel-os/strapi-plugin-tcg 0.3.0 → 0.3.2

package/README.md

@@ -16,6 +16,7 @@ It was built to move **Jambaar** (the Dakar 2026 Youth Olympics card game) off i
 | **Live**          | **Boosts**: multiply the odds of any rarity for a time window, season-wide or on one pack; presets like "Golden hour". Open/sold-out drops, rewards running low.                                                                                                                  | `GET /live`                                                                                                                |
 | **Pulls**         | Dashboard rarity split vs target, audit log with seed, roll, **odds snapshot**, **pity** flag and **mint number**.                                                                                                                                                                | `POST /pulls/scan`, `GET /pulls/history`, `GET /pulls/cooldowns`                                                           |
 | **Collection**    | Per-player view with completion, rank, sets, badges, mint numbers.                                                                                                                                                                                                                | `GET /collection`, `GET /collection/stats`                                                                                 |
+| **Score & rank**  | Rarity-weighted, not a card count: every distinct card is worth its own `score` (admin, inside its rarity's band) or the midpoint of the band (defaults: common 20 · rare 45 · epic 70 · legendary 92); every completed set adds `limits.setCompletionBonus` (50). Standings sort by score, then distinct cards, then total cards. `GET /collection/stats` returns `globalRank`, `score`, `scoreBreakdown`; cards carry `points`. | `GET /collection/stats`, admin `GET /seasons/:season/leaderboard` |
 | **Trades**        | A handshake both players confirm: the initiator's offer (QR) → a receiver joins → proposes cards → the initiator confirms (atomic swap) or declines. Both screens poll `GET /trades/offer/:id` (`status`, `role`, both sides' cards). Counts on the dashboard.                                                                                                                                                                                                                                                          | `POST /trades/offer`, `POST /trades/scan`, `GET …/offer/:id`, `…/join`, `…/propose`, `…/confirm`, `…/decline`, `…/reject`, `…/cancel`, `GET /trades/active`, `GET /trades/history` |
 | **Rewards**       | **Catalog** with tiers, stock, per-player limit, booth, availability window and a **cost builder**: N cards of a rarity (or at least a rarity), a specific card, a complete set (owned or handed in).                                                                             | `GET /rewards`, `GET /rewards/eligibility`                                                                                 |
 | **Booth**         | Type or scan a redemption code, see the cards and the reward, hand it over or cancel and give the cards back (stock released).                                                                                                                                                    | `POST /redemptions`, `GET /redemptions/:id`, `GET /redemptions/history`                                                    |

package/dist/_chunks/{App-B-WZGNkc.js → App-C3L5FTNZ.js}

@@ -7,9 +7,9 @@ const admin = require("@strapi/strapi/admin");
 const reactRouterDom = require("react-router-dom");
 const reactIntl = require("react-intl");
 const styledComponents = require("styled-components");
-const api = require("./api-hTExOv_J.js");
+const api = require("./api-BqmNHByN.js");
 const react = require("react");
-const index = require("./index-CRbzJppw.js");
+const index = require("./index-DQmN1LMy.js");
 const QR = require("qrcode");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const QR__default = /* @__PURE__ */ _interopDefault(QR);
@@ -422,10 +422,17 @@ const Dashboard = () => {
                   /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral600", children: e.player.code })
                 ] }),
                 /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Typography, { variant: "pi", children: [
+                  /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Typography, { fontWeight: "bold", children: [
+                    e.score,
+                    " pts"
+                  ] }),
+                  " · ",
                   e.uniqueCards,
-                  " unique · ",
+                  " ",
+                  "unique · ",
                   e.totalCards,
-                  " total"
+                  " total",
+                  e.setsCompleted ? ` · ${e.setsCompleted} set${e.setsCompleted > 1 ? "s" : ""}` : ""
                 ] })
               ] }, e.player.id)) })
             }
@@ -2533,7 +2540,7 @@ const PlayerDetailPage = () => {
             {
               label: "Cards",
               value: stats?.totalCards ?? player.totalCards,
-              hint: stats ? `${stats.uniqueCards} unique of ${stats.catalogTotal}` : void 0
+              hint: stats ? `${stats.uniqueCards} unique of ${stats.catalogTotal} · ${stats.score ?? 0} pts` : void 0
             }
           ) }),
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.Grid.Item, { col: 3, s: 6, alignItems: "stretch", children: /* @__PURE__ */ jsxRuntime.jsx(

package/dist/_chunks/{App-CS_cVYEI.mjs → App-DvkOruFZ.mjs}

@@ -5,9 +5,9 @@ import { Page, useRBAC, useNotification } from "@strapi/strapi/admin";
 import { useNavigate, useParams, Routes, Route, NavLink } from "react-router-dom";
 import { useIntl } from "react-intl";
 import { styled } from "styled-components";
-import { u as useGetSeasonsQuery, E as Eyebrow, I as Intro, S as SPRING$1, a as useGetDashboardQuery, b as useGetLeaderboardQuery, c as useGetRewardsQuery, d as useGetSetsQuery, e as useGetBadgesQuery, f as Empty, g as Section, h as SetupSteps, i as StatTile, j as Sparkline, k as fmtNumber, R as RarityBadge, B as Bar, t as timeAgo, C as Card, P as Pill, l as StatusBadge, m as fmtDate, n as useGetSeasonDefaultsQuery, o as useGetSeasonQuery, p as useCreateSeasonMutation, q as useUpdateSeasonMutation, r as useDeleteSeasonMutation, s as errorMessage, v as useGetCardsQuery, w as useCreateCardMutation, x as useUpdateCardMutation, y as useDeleteCardMutation, z as rarityOf, A as useGetPacksQuery, D as useCreatePackMutation, F as useGetPackQuery, G as useUpdatePackMutation, H as useSetPackCardsMutation, J as useDeletePackMutation, K as useCreateDropMutation, L as useLazySimulatePackQuery, M as useGetPlayersQuery, N as fmtDateTime, O as useGetPlayerQuery, Q as useSetPlayerActiveMutation, T as useGrantCardMutation, U as useLazyGetRedemptionQuery, V as useFulfillRedemptionMutation, W as useCancelRedemptionMutation, X as useGetRedemptionsQuery, Y as Mono, Z as useGetPullsQuery, _ as useGetDropQuery, $ as useUpdateDropMutation, a0 as useSetDropCardsMutation, a1 as useDeleteDropMutation, a2 as useRotateDropSecretMutation, a3 as useDropQRMutation, a4 as useGetBoostsQuery, a5 as useCreateBoostMutation, a6 as useUpdateBoostMutation, a7 as useDeleteBoostMutation, a8 as useCreateRewardMutation, a9 as useUpdateRewardMutation, aa as useDeleteRewardMutation, ab as useCreateSetMutation, ac as useUpdateSetMutation, ad as useDeleteSetMutation, ae as useCreateBadgeMutation, af as useUpdateBadgeMutation, ag as useDeleteBadgeMutation, ah as useSeedBadgesMutation } from "./api-BgR-fpDp.mjs";
+import { u as useGetSeasonsQuery, E as Eyebrow, I as Intro, S as SPRING$1, a as useGetDashboardQuery, b as useGetLeaderboardQuery, c as useGetRewardsQuery, d as useGetSetsQuery, e as useGetBadgesQuery, f as Empty, g as Section, h as SetupSteps, i as StatTile, j as Sparkline, k as fmtNumber, R as RarityBadge, B as Bar, t as timeAgo, C as Card, P as Pill, l as StatusBadge, m as fmtDate, n as useGetSeasonDefaultsQuery, o as useGetSeasonQuery, p as useCreateSeasonMutation, q as useUpdateSeasonMutation, r as useDeleteSeasonMutation, s as errorMessage, v as useGetCardsQuery, w as useCreateCardMutation, x as useUpdateCardMutation, y as useDeleteCardMutation, z as rarityOf, A as useGetPacksQuery, D as useCreatePackMutation, F as useGetPackQuery, G as useUpdatePackMutation, H as useSetPackCardsMutation, J as useDeletePackMutation, K as useCreateDropMutation, L as useLazySimulatePackQuery, M as useGetPlayersQuery, N as fmtDateTime, O as useGetPlayerQuery, Q as useSetPlayerActiveMutation, T as useGrantCardMutation, U as useLazyGetRedemptionQuery, V as useFulfillRedemptionMutation, W as useCancelRedemptionMutation, X as useGetRedemptionsQuery, Y as Mono, Z as useGetPullsQuery, _ as useGetDropQuery, $ as useUpdateDropMutation, a0 as useSetDropCardsMutation, a1 as useDeleteDropMutation, a2 as useRotateDropSecretMutation, a3 as useDropQRMutation, a4 as useGetBoostsQuery, a5 as useCreateBoostMutation, a6 as useUpdateBoostMutation, a7 as useDeleteBoostMutation, a8 as useCreateRewardMutation, a9 as useUpdateRewardMutation, aa as useDeleteRewardMutation, ab as useCreateSetMutation, ac as useUpdateSetMutation, ad as useDeleteSetMutation, ae as useCreateBadgeMutation, af as useUpdateBadgeMutation, ag as useDeleteBadgeMutation, ah as useSeedBadgesMutation } from "./api-Clm2RMWV.mjs";
 import { useState, useEffect, useMemo, createContext, useContext, useRef } from "react";
-import { P as PLUGIN_ID, a as PERMISSIONS } from "./index-ClDgxnnH.mjs";
+import { P as PLUGIN_ID, a as PERMISSIONS } from "./index-CwyVbzVg.mjs";
 import QR from "qrcode";
 const KEY = "tcg.season";
 const SeasonContext = createContext({
@@ -418,10 +418,17 @@ const Dashboard = () => {
                   /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral600", children: e.player.code })
                 ] }),
                 /* @__PURE__ */ jsxs(Typography, { variant: "pi", children: [
+                  /* @__PURE__ */ jsxs(Typography, { fontWeight: "bold", children: [
+                    e.score,
+                    " pts"
+                  ] }),
+                  " · ",
                   e.uniqueCards,
-                  " unique · ",
+                  " ",
+                  "unique · ",
                   e.totalCards,
-                  " total"
+                  " total",
+                  e.setsCompleted ? ` · ${e.setsCompleted} set${e.setsCompleted > 1 ? "s" : ""}` : ""
                 ] })
               ] }, e.player.id)) })
             }
@@ -2529,7 +2536,7 @@ const PlayerDetailPage = () => {
             {
               label: "Cards",
               value: stats?.totalCards ?? player.totalCards,
-              hint: stats ? `${stats.uniqueCards} unique of ${stats.catalogTotal}` : void 0
+              hint: stats ? `${stats.uniqueCards} unique of ${stats.catalogTotal} · ${stats.score ?? 0} pts` : void 0
             }
           ) }),
           /* @__PURE__ */ jsx(Grid.Item, { col: 3, s: 6, alignItems: "stretch", children: /* @__PURE__ */ jsx(

package/dist/_chunks/{SettingsPage-DNWXuY8j.js → SettingsPage-BxmcGJ5s.js}

@@ -3,8 +3,8 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const designSystem = require("@strapi/design-system");
 const admin = require("@strapi/strapi/admin");
-const api = require("./api-hTExOv_J.js");
-const index = require("./index-CRbzJppw.js");
+const api = require("./api-BqmNHByN.js");
+const index = require("./index-DQmN1LMy.js");
 const Row = ({ k, v, hint, tone }) => /* @__PURE__ */ jsxRuntime.jsxs(
   designSystem.Flex,
   {

package/dist/_chunks/{SettingsPage-fGiEcX6l.mjs → SettingsPage-SjgoOH4S.mjs}

@@ -1,8 +1,8 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Grid, Box, Flex, Typography, Badge } from "@strapi/design-system";
 import { Page, Layouts } from "@strapi/strapi/admin";
-import { ai as useGetSettingsQuery, I as Intro, g as Section, Y as Mono } from "./api-BgR-fpDp.mjs";
-import { a as PERMISSIONS } from "./index-ClDgxnnH.mjs";
+import { ai as useGetSettingsQuery, I as Intro, g as Section, Y as Mono } from "./api-Clm2RMWV.mjs";
+import { a as PERMISSIONS } from "./index-CwyVbzVg.mjs";
 const Row = ({ k, v, hint, tone }) => /* @__PURE__ */ jsxs(
   Flex,
   {

package/dist/_chunks/{api-hTExOv_J.js → api-BqmNHByN.js}

@@ -7,7 +7,7 @@ const symbols = require("@strapi/icons/symbols");
 const reactRouterDom = require("react-router-dom");
 const styledComponents = require("styled-components");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-CRbzJppw.js");
+const index = require("./index-DQmN1LMy.js");
 const fmtDateTime = (value, locale) => {
   if (!value) return "—";
   try {

package/dist/_chunks/{api-BgR-fpDp.mjs → api-Clm2RMWV.mjs}

@@ -6,7 +6,7 @@ import { EmptyDocuments } from "@strapi/icons/symbols";
 import { useNavigate } from "react-router-dom";
 import { styled, css, keyframes } from "styled-components";
 import { adminApi } from "@strapi/strapi/admin";
-import { P as PLUGIN_ID } from "./index-ClDgxnnH.mjs";
+import { P as PLUGIN_ID } from "./index-CwyVbzVg.mjs";
 const fmtDateTime = (value, locale) => {
   if (!value) return "—";
   try {

package/dist/_chunks/{index-ClDgxnnH.mjs → index-CwyVbzVg.mjs}

@@ -62,7 +62,7 @@ const index = {
       intlLabel: { id: `${PLUGIN_ID}.menu.label`, defaultMessage: "TCG" },
       permissions: PERMISSIONS.access,
       Component: async () => {
-        const { App } = await import("./App-CS_cVYEI.mjs");
+        const { App } = await import("./App-DvkOruFZ.mjs");
         return App;
       }
     });
@@ -75,7 +75,7 @@ const index = {
           intlLabel: { id: `${PLUGIN_ID}.settings.link`, defaultMessage: "Configuration" },
           permissions: PERMISSIONS.settingsRead,
           Component: async () => {
-            const { SettingsPage } = await import("./SettingsPage-fGiEcX6l.mjs");
+            const { SettingsPage } = await import("./SettingsPage-SjgoOH4S.mjs");
             return SettingsPage;
           }
         }

package/dist/_chunks/{index-CRbzJppw.js → index-DQmN1LMy.js}

@@ -63,7 +63,7 @@ const index = {
       intlLabel: { id: `${PLUGIN_ID}.menu.label`, defaultMessage: "TCG" },
       permissions: PERMISSIONS.access,
       Component: async () => {
-        const { App } = await Promise.resolve().then(() => require("./App-B-WZGNkc.js"));
+        const { App } = await Promise.resolve().then(() => require("./App-C3L5FTNZ.js"));
         return App;
       }
     });
@@ -76,7 +76,7 @@ const index = {
           intlLabel: { id: `${PLUGIN_ID}.settings.link`, defaultMessage: "Configuration" },
           permissions: PERMISSIONS.settingsRead,
           Component: async () => {
-            const { SettingsPage } = await Promise.resolve().then(() => require("./SettingsPage-DNWXuY8j.js"));
+            const { SettingsPage } = await Promise.resolve().then(() => require("./SettingsPage-BxmcGJ5s.js"));
             return SettingsPage;
           }
         }

package/dist/admin/index.js

@@ -1,3 +1,3 @@
 "use strict";
-const index = require("../_chunks/index-CRbzJppw.js");
+const index = require("../_chunks/index-DQmN1LMy.js");
 module.exports = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "../_chunks/index-ClDgxnnH.mjs";
+import { i } from "../_chunks/index-CwyVbzVg.mjs";
 export {
   i as default
 };

package/dist/server/index.js

@@ -158,7 +158,9 @@ const DEFAULT_LIMITS = Object.freeze({
   qrTokenTtlMs: 5 * 60 * 1e3,
   staticScanCooldownMs: 24 * 60 * 60 * 1e3,
   pityRareAfter: 0,
-  pityLegendaryAfter: 0
+  pityLegendaryAfter: 0,
+  /** Points a completed set adds to the collector's score (utils/score.js). */
+  setCompletionBonus: 50
 });
 const DEFAULT_RANK_TIERS = Object.freeze([
   { key: "legend", label: "Legend", minPercent: 100 },
@@ -233,14 +235,28 @@ const ACTIONS = [
   { section: "plugins", uid: RBAC.PLAYERS_READ, displayName: "Read players" },
   { section: "plugins", uid: RBAC.PLAYERS_WRITE, displayName: "Deactivate players, grant cards" },
   { section: "plugins", uid: RBAC.REDEMPTIONS_READ, displayName: "Read redemptions" },
-  { section: "plugins", uid: RBAC.REDEMPTIONS_FULFILL, displayName: "Fulfill or cancel redemptions (booth)" },
+  {
+    section: "plugins",
+    uid: RBAC.REDEMPTIONS_FULFILL,
+    displayName: "Fulfill or cancel redemptions (booth)"
+  },
   { section: "plugins", uid: RBAC.AUDIT_READ, displayName: "Read the pull audit log" },
   { section: "plugins", uid: RBAC.REWARDS_READ, displayName: "Read the reward catalog" },
   { section: "plugins", uid: RBAC.REWARDS_WRITE, displayName: "Edit the reward catalog" },
   { section: "plugins", uid: RBAC.LIVE_READ, displayName: "Read live boosts" },
   { section: "plugins", uid: RBAC.LIVE_WRITE, displayName: "Create and edit live boosts" },
-  { section: "settings", category: CATEGORY, uid: RBAC.SETTINGS_READ, displayName: "Read settings" },
-  { section: "settings", category: CATEGORY, uid: RBAC.SETTINGS_WRITE, displayName: "Edit settings" }
+  {
+    section: "settings",
+    category: CATEGORY,
+    uid: RBAC.SETTINGS_READ,
+    displayName: "Read settings"
+  },
+  {
+    section: "settings",
+    category: CATEGORY,
+    uid: RBAC.SETTINGS_WRITE,
+    displayName: "Edit settings"
+  }
 ].map((a) => ({ ...a, pluginName: PLUGIN_ID }));
 const timers = [];
 const UNIQUE_COLUMNS = [
@@ -248,21 +264,46 @@ const UNIQUE_COLUMNS = [
   ["plugin::tcg.player", "code"],
   ["plugin::tcg.redemption", "code"]
 ];
+const hasIndex = async (knex, table, name) => {
+  const client = String(knex.client?.config?.client ?? "");
+  if (/mysql/.test(client)) {
+    const rows2 = await knex.raw("SHOW INDEX FROM ?? WHERE Key_name = ?", [table, name]);
+    return (rows2?.[0] ?? []).length > 0;
+  }
+  if (/pg|postgres/.test(client)) {
+    const rows2 = await knex.raw("SELECT 1 FROM pg_indexes WHERE tablename = ? AND indexname = ?", [
+      table,
+      name
+    ]);
+    return (rows2?.rows ?? []).length > 0;
+  }
+  const rows = await knex.raw("PRAGMA index_list(??)", [table]);
+  return (rows ?? []).some((r) => r.name === name);
+};
 const ensureUniqueIndexes = async (strapi) => {
+  const knex = strapi.db.connection;
   for (const [uid, column] of UNIQUE_COLUMNS) {
     const table = strapi.db.metadata.get(uid)?.tableName;
     if (!table) continue;
     const name = `${table}_${column}_tcg_uq`;
     try {
-      await strapi.db.connection.schema.alterTable(table, (t) => t.unique([column], { indexName: name }));
+      if (await hasIndex(knex, table, name)) continue;
+      await knex.schema.alterTable(table, (t) => t.unique([column], { indexName: name }));
+      strapi.log.info(`${LOG_PREFIX} unique index ${name} created`);
     } catch (err) {
-      if (!/exist|duplicate/i.test(err.message)) strapi.log.warn(`${LOG_PREFIX} unique index ${name}: ${err.message}`);
+      if (!/exist|duplicate/i.test(err.message))
+        strapi.log.warn(`${LOG_PREFIX} unique index ${name}: ${err.message}`);
     }
   }
 };
 const bootstrap = async ({ strapi }) => {
   await strapi.service("admin::permission").actionProvider.registerMany(ACTIONS);
-  await ensureUniqueIndexes(strapi);
+  setTimeout(
+    () => ensureUniqueIndexes(strapi).catch(
+      (err) => strapi.log.warn(`${LOG_PREFIX} unique indexes: ${err.message}`)
+    ),
+    5e3
+  );
   const plugin = strapi.plugin(PLUGIN_ID);
   if (plugin.service("settings").sweepsEnabled()) {
     const safe = (label, fn) => async () => {
@@ -273,13 +314,21 @@ const bootstrap = async ({ strapi }) => {
         strapi.log.warn(`${LOG_PREFIX} sweep ${label} failed: ${err.message}`);
       }
     };
-    const nonceTimer = setInterval(safe("nonces", () => plugin.service("qr").sweep()), NONCE_SWEEP_INTERVAL_MS);
-    const tradeTimer = setInterval(safe("expired offers", () => plugin.service("trade").sweep()), TRADE_SWEEP_INTERVAL_MS);
+    const nonceTimer = setInterval(
+      safe("nonces", () => plugin.service("qr").sweep()),
+      NONCE_SWEEP_INTERVAL_MS
+    );
+    const tradeTimer = setInterval(
+      safe("expired offers", () => plugin.service("trade").sweep()),
+      TRADE_SWEEP_INTERVAL_MS
+    );
     nonceTimer.unref();
     tradeTimer.unref();
     timers.push(nonceTimer, tradeTimer);
   }
-  strapi.log.info(`${LOG_PREFIX} ready — ${ACTIONS.length} RBAC actions, content API at /api/${PLUGIN_ID}`);
+  strapi.log.info(
+    `${LOG_PREFIX} ready — ${ACTIONS.length} RBAC actions, content API at /api/${PLUGIN_ID}`
+  );
 };
 const stopTimers = () => {
   while (timers.length) clearInterval(timers.pop());
@@ -2703,6 +2752,39 @@ const qr = ({ strapi }) => ({
     return count ?? 0;
   }
 });
+const rarityPoints = (season2, rarityKey) => {
+  const table = season2?.rarities?.length ? season2.rarities : DEFAULT_RARITIES;
+  const idx = table.findIndex((r) => r.key === rarityKey);
+  const meta = table[idx] ?? DEFAULT_RARITIES.find((r) => r.key === rarityKey) ?? null;
+  const min = Number(meta?.scoreMin);
+  const max = Number(meta?.scoreMax);
+  if (Number.isFinite(min) && Number.isFinite(max) && max >= min)
+    return Math.round((min + max) / 2);
+  return 10 + Math.max(0, idx) * 20;
+};
+const cardPoints = (card2, season2) => {
+  const own = Number(card2?.score);
+  if (Number.isFinite(own) && own > 0) return Math.round(own);
+  return rarityPoints(season2, card2?.rarity);
+};
+const standingOf = (distinctCards, totalCards, sets, season2, limits = {}) => {
+  const ownedIds = new Set(distinctCards.map((c) => String(c.id)));
+  const cardScore = distinctCards.reduce((sum, c) => sum + cardPoints(c, season2), 0);
+  const setsCompleted = (sets ?? []).filter(
+    (s) => (s.cards ?? []).length > 0 && s.cards.every((c) => ownedIds.has(String(c.id)))
+  ).length;
+  const bonus = Math.max(0, Number(limits.setCompletionBonus) || 0);
+  return {
+    uniqueCards: distinctCards.length,
+    totalCards,
+    cardScore,
+    setsCompleted,
+    setBonus: setsCompleted * bonus,
+    score: cardScore + setsCompleted * bonus
+  };
+};
+const compareStandings = (a, b) => b.score - a.score || b.uniqueCards - a.uniqueCards || b.totalCards - a.totalCards;
+const rankAmong = (mine, all) => 1 + all.filter((s) => compareStandings(s, mine) < 0).length;
 const mediaUrl = (media) => media && typeof media === "object" ? media.url ?? null : null;
 const format = () => ({
   rarityMeta(season2, key) {
@@ -2721,6 +2803,7 @@ const format = () => ({
       rarityColor: rarity.color,
       edition: card2.edition ?? "standard",
       score: card2.score ?? 0,
+      points: cardPoints(card2, season2),
       imageUrl: mediaUrl(card2.image),
       attributes: card2.attributes ?? {},
       lore: card2.lore ?? null,
@@ -2782,7 +2865,13 @@ const format = () => ({
   },
   /** Admin-only view: includes msisdn. */
   playerAdmin(player2) {
-    return player2 ? { ...this.player(player2), externalId: player2.externalId ?? null, msisdn: player2.msisdn ?? null, isActive: player2.isActive, meta: player2.meta ?? {} } : null;
+    return player2 ? {
+      ...this.player(player2),
+      externalId: player2.externalId ?? null,
+      msisdn: player2.msisdn ?? null,
+      isActive: player2.isActive,
+      meta: player2.meta ?? {}
+    } : null;
   },
   playerCard(pc, season2) {
     if (!pc) return null;
@@ -2810,7 +2899,16 @@ const format = () => ({
       note: r.note ?? null,
       player: r.player ? this.player(r.player) : void 0,
       season: r.season ? { id: r.season.documentId, name: r.season.name, slug: r.season.slug } : void 0,
-      reward: r.reward ? { id: r.reward.documentId, name: r.reward.name, slug: r.reward.slug, tier: r.reward.tier ?? null, booth: r.reward.booth ?? null, imageUrl: mediaUrl(r.reward.image), stock: r.reward.stock ?? null, claimed: r.reward.claimed ?? 0 } : r.rewardName ? { name: r.rewardName } : null
+      reward: r.reward ? {
+        id: r.reward.documentId,
+        name: r.reward.name,
+        slug: r.reward.slug,
+        tier: r.reward.tier ?? null,
+        booth: r.reward.booth ?? null,
+        imageUrl: mediaUrl(r.reward.image),
+        stock: r.reward.stock ?? null,
+        claimed: r.reward.claimed ?? 0
+      } : r.rewardName ? { name: r.rewardName } : null
     };
   }
 });
@@ -3522,22 +3620,11 @@ const collection = ({ strapi }) => ({
     return [...new Set(rows.map((r) => r.card?.id).filter(Boolean))];
   },
   /**
-   * Global rank = 1 + number of players owning more distinct season cards. Uses the link tables
-   * Strapi 5 creates for relations, resolved from metadata so table names never get hardcoded.
+   * Global rank = 1 + the number of collectors with a better standing: rarity-weighted score, then distinct
+   * cards, then total cards (utils/score.js). Null before the first card.
    */
-  async rank(player2, season2, myUnique) {
-    if (myUnique === 0) return null;
-    const knex = strapi.db.connection;
-    const md = strapi.db.metadata.get(UID.PLAYER_CARD);
-    const pcTable = md.tableName;
-    const playerLnk = md.attributes.player.joinTable;
-    const cardLnk = md.attributes.card.joinTable;
-    const cardMd = strapi.db.metadata.get(UID.CARD);
-    const seasonLnk = cardMd.attributes.season.joinTable;
-    const seasonId = season2.id;
-    const sub = knex(`${pcTable} as pc`).join(`${playerLnk.name} as pl`, "pl." + playerLnk.joinColumn.name, "pc.id").join(`${cardLnk.name} as cl`, "cl." + cardLnk.joinColumn.name, "pc.id").join(`${seasonLnk.name} as sl`, "sl." + seasonLnk.joinColumn.name, "cl." + cardLnk.inverseJoinColumn.name).where("sl." + seasonLnk.inverseJoinColumn.name, seasonId).groupBy("pl." + playerLnk.inverseJoinColumn.name).select("pl." + playerLnk.inverseJoinColumn.name + " as player_id").countDistinct("cl." + cardLnk.inverseJoinColumn.name + " as unique_cards");
-    const row = await knex.from(sub.as("ranked")).where("ranked.unique_cards", ">", myUnique).count("* as better").first();
-    return Number(row?.better ?? 0) + 1;
+  async rank(player2, season2) {
+    return (await strapi.plugin("tcg").service("stats").standingFor(player2, season2)).rank;
   },
   async stats(player2, season2) {
     const plugin = strapi.plugin("tcg");
@@ -3573,16 +3660,26 @@ const collection = ({ strapi }) => ({
       populate: { pack: { select: ["id"] }, card: { select: ["id"] } }
     });
     const byPack = packs.map((p) => {
-      const cardIds = [...new Set(packRows.filter((r) => r.pack?.id === p.id).map((r) => r.card?.id).filter(Boolean))];
+      const cardIds = [
+        ...new Set(
+          packRows.filter((r) => r.pack?.id === p.id).map((r) => r.card?.id).filter(Boolean)
+        )
+      ];
       const collected = cardIds.filter((id) => ownedIds.has(id)).length;
-      return { pack: format2.pack(p), collected, total: cardIds.length, isComplete: cardIds.length > 0 && collected === cardIds.length };
+      return {
+        pack: format2.pack(p),
+        collected,
+        total: cardIds.length,
+        isComplete: cardIds.length > 0 && collected === cardIds.length
+      };
     });
     const tier = plugin.service("season").tierFor(season2, completion);
-    const [sets, badges, metrics, live] = await Promise.all([
+    const [sets, badges, metrics, live, standing] = await Promise.all([
       plugin.service("set").list(season2, { includeInactive: false }),
       plugin.service("badge").forPlayer(player2, season2),
       plugin.service("badge").metrics(player2, season2),
-      plugin.service("boost").liveNow(season2)
+      plugin.service("boost").liveNow(season2),
+      plugin.service("stats").standingFor(player2, season2)
     ]);
     return {
       sets: plugin.service("set").progress(sets, ownedIds, season2),
@@ -3593,7 +3690,13 @@ const collection = ({ strapi }) => ({
       uniqueCards: ownedIds.size,
       catalogTotal,
       completionPercentage: completion,
-      globalRank: await this.rank(player2, season2, ownedIds.size),
+      globalRank: standing.rank,
+      score: standing.score,
+      scoreBreakdown: {
+        cards: standing.cardScore,
+        setBonus: standing.setBonus,
+        setsCompleted: standing.setsCompleted
+      },
       rankTier: { key: tier.key, label: tier.label },
       season: format2.season(season2),
       byRarity,
@@ -3607,7 +3710,14 @@ const collection = ({ strapi }) => ({
     const mintNumber = await strapi.plugin("tcg").service("pull").claimSlot(UID.CARD, card2.id, "minted", null);
     const pc = await strapi.db.transaction(async () => {
       const row = await strapi.db.query(UID.PLAYER_CARD).create({
-        data: { player: player2.id, card: card2.id, pack: pack2?.id ?? null, acquiredFrom: "grant", acquiredAt: now, mintNumber }
+        data: {
+          player: player2.id,
+          card: card2.id,
+          pack: pack2?.id ?? null,
+          acquiredFrom: "grant",
+          acquiredAt: now,
+          mintNumber
+        }
       });
       await strapi.db.query(UID.PLAYER).update({ where: { id: player2.id }, data: { totalCards: (player2.totalCards ?? 0) + 1 } });
       return row;
@@ -4122,6 +4232,8 @@ const redemption = ({ strapi }) => ({
     return { items: items.map((r) => format2.redemption(r)), total };
   }
 });
+const STANDINGS_TTL_MS = 10 * 1e3;
+const STANDINGS_CACHE = /* @__PURE__ */ new Map();
 const startOfToday = () => {
   const d = /* @__PURE__ */ new Date();
   d.setHours(0, 0, 0, 0);
@@ -4156,15 +4268,31 @@ const stats = ({ strapi }) => ({
       strapi.db.query(UID.PULL).count({ where: { ...seasonWhere, pulledAt: { $gte: since } } }),
       strapi.db.query(UID.PULL).count({ where: seasonWhere }),
       strapi.db.query(UID.TRADE).count({ where: { ...seasonWhere, completedAt: { $gte: since } } }),
-      strapi.db.query(UID.TRADE_OFFER).count({ where: { ...seasonWhere, status: TRADE_STATUS.PENDING, expiresAt: { $gt: /* @__PURE__ */ new Date() } } }),
+      strapi.db.query(UID.TRADE_OFFER).count({
+        where: { ...seasonWhere, status: TRADE_STATUS.PENDING, expiresAt: { $gt: /* @__PURE__ */ new Date() } }
+      }),
       strapi.db.query(UID.REDEMPTION).count({ where: { ...seasonWhere, status: REDEMPTION_STATUS.PENDING } }),
-      strapi.db.query(UID.REDEMPTION).count({ where: { ...seasonWhere, status: REDEMPTION_STATUS.FULFILLED, fulfilledAt: { $gte: since } } }),
+      strapi.db.query(UID.REDEMPTION).count({
+        where: {
+          ...seasonWhere,
+          status: REDEMPTION_STATUS.FULFILLED,
+          fulfilledAt: { $gte: since }
+        }
+      }),
       season2 ? strapi.db.query(UID.CARD).count({ where: { season: season2.id, isActive: true } }) : Promise.resolve(0),
       season2 ? strapi.db.query(UID.PACK).count({ where: { season: season2.id, isActive: true } }) : Promise.resolve(0),
-      strapi.db.query(UID.PULL).findMany({ where: { ...seasonWhere, pulledAt: { $gte: week } }, select: ["pulledAt", "rarity"] }),
+      strapi.db.query(UID.PULL).findMany({
+        where: { ...seasonWhere, pulledAt: { $gte: week } },
+        select: ["pulledAt", "rarity"]
+      }),
       strapi.db.query(UID.PULL).findMany({
         where: seasonWhere,
-        populate: { player: { select: ["code", "displayName"] }, card: { select: ["name", "rarity"] }, pack: { select: ["name"] }, drop: { select: ["name"] } },
+        populate: {
+          player: { select: ["code", "displayName"] },
+          card: { select: ["name", "rarity"] },
+          pack: { select: ["name"] },
+          drop: { select: ["name"] }
+        },
         orderBy: { pulledAt: "desc" },
         limit: 8
       })
@@ -4173,24 +4301,47 @@ const stats = ({ strapi }) => ({
       const day = daysAgo(6 - i);
       const next = new Date(day);
       next.setDate(day.getDate() + 1);
-      return { day: day.toISOString().slice(0, 10), pulls: weekPulls.filter((p) => new Date(p.pulledAt) >= day && new Date(p.pulledAt) < next).length };
+      return {
+        day: day.toISOString().slice(0, 10),
+        pulls: weekPulls.filter((p) => new Date(p.pulledAt) >= day && new Date(p.pulledAt) < next).length
+      };
     });
     const rarities = season2?.rarities ?? [];
     const plugin = strapi.plugin("tcg");
     const [liveBoosts, rewards, drops] = season2 ? await Promise.all([
       plugin.service("boost").liveNow(season2),
       plugin.service("reward").list(season2, { includeInactive: false }),
-      strapi.db.query(UID.DROP).findMany({ where: { pack: { season: season2.id }, isActive: true }, populate: { pack: { select: ["name"] } } })
+      strapi.db.query(UID.DROP).findMany({
+        where: { pack: { season: season2.id }, isActive: true },
+        populate: { pack: { select: ["name"] } }
+      })
     ]) : [[], [], []];
-    const lowStock = rewards.filter((r) => r.stock != null).map((r) => ({ id: r.documentId, name: r.name, remaining: Math.max(0, r.stock - (r.claimed ?? 0)), stock: r.stock })).filter((r) => r.remaining <= Math.max(3, Math.ceil(r.stock * 0.1))).sort((a, b) => a.remaining - b.remaining);
-    const dropStates = drops.map((d) => ({ id: d.documentId, name: `${d.pack?.name ?? ""} · ${d.name}`, mode: d.mode, scans: d.scanCount ?? 0, cap: d.maxScansTotal ?? null, isOpen: plugin.service("drop").isOpen(d) }));
+    const lowStock = rewards.filter((r) => r.stock != null).map((r) => ({
+      id: r.documentId,
+      name: r.name,
+      remaining: Math.max(0, r.stock - (r.claimed ?? 0)),
+      stock: r.stock
+    })).filter((r) => r.remaining <= Math.max(3, Math.ceil(r.stock * 0.1))).sort((a, b) => a.remaining - b.remaining);
+    const dropStates = drops.map((d) => ({
+      id: d.documentId,
+      name: `${d.pack?.name ?? ""} · ${d.name}`,
+      mode: d.mode,
+      scans: d.scanCount ?? 0,
+      cap: d.maxScansTotal ?? null,
+      isOpen: plugin.service("drop").isOpen(d)
+    }));
     return {
       liveBoosts,
       lowStock,
       drops: dropStates,
       season: season2 ? { id: season2.documentId, name: season2.name, slug: season2.slug, status: season2.status } : null,
       players: { total: players, today: playersToday },
-      pulls: { today: pullsToday, total: pullsTotal, sparkline, distribution: distribution(weekPulls, rarities) },
+      pulls: {
+        today: pullsToday,
+        total: pullsTotal,
+        sparkline,
+        distribution: distribution(weekPulls, rarities)
+      },
       trades: { today: tradesToday, pendingOffers },
       redemptions: { pending: pendingRedemptions, fulfilledToday },
       catalog: { cards, packs },
@@ -4207,21 +4358,75 @@ const stats = ({ strapi }) => ({
       }))
     };
   },
-  /** Top collectors by distinct cards owned in a season (admin leaderboard). */
-  async leaderboard(season2, limit = 10) {
-    const rows = await strapi.db.query(UID.PLAYER_CARD).findMany({
-      where: { card: { season: season2.id } },
-      populate: { player: { select: ["id", "documentId", "code", "displayName"] }, card: { select: ["id"] } }
-    });
+  /**
+   * Every collector's standing in a season (utils/score.js), sorted. Computed from every player card of
+   * the season and cached a few seconds: the rank is asked on every stats screen.
+   * @returns {Promise<Array<{player: Object, uniqueCards: number, totalCards: number, cardScore: number, setsCompleted: number, setBonus: number, score: number}>>}
+   */
+  async standings(season2) {
+    const cached = STANDINGS_CACHE.get(season2.id);
+    if (cached && Date.now() - cached.at < STANDINGS_TTL_MS) return cached.value;
+    const plugin = strapi.plugin("tcg");
+    const [rows, sets] = await Promise.all([
+      strapi.db.query(UID.PLAYER_CARD).findMany({
+        where: { card: { season: season2.id } },
+        populate: {
+          player: { select: ["id", "documentId", "code", "displayName"] },
+          card: { select: ["id", "rarity", "score"] }
+        }
+      }),
+      plugin.service("set").list(season2, { includeInactive: false })
+    ]);
+    const limits = plugin.service("season").limitsOf(season2);
     const byPlayer = /* @__PURE__ */ new Map();
     for (const r of rows) {
       if (!r.player || !r.card) continue;
-      const entry = byPlayer.get(r.player.id) ?? { player: r.player, unique: /* @__PURE__ */ new Set(), total: 0 };
-      entry.unique.add(r.card.id);
+      const entry = byPlayer.get(r.player.id) ?? { player: r.player, cards: /* @__PURE__ */ new Map(), total: 0 };
+      entry.cards.set(r.card.id, r.card);
       entry.total += 1;
       byPlayer.set(r.player.id, entry);
     }
-    return [...byPlayer.values()].map((e) => ({ player: { id: e.player.documentId, code: e.player.code, displayName: e.player.displayName }, uniqueCards: e.unique.size, totalCards: e.total })).sort((a, b) => b.uniqueCards - a.uniqueCards || b.totalCards - a.totalCards).slice(0, limit).map((e, i) => ({ rank: i + 1, ...e }));
+    const value = [...byPlayer.values()].map((e) => ({
+      player: e.player,
+      ...standingOf([...e.cards.values()], e.total, sets, season2, limits)
+    })).sort(compareStandings);
+    STANDINGS_CACHE.set(season2.id, { at: Date.now(), value });
+    return value;
+  },
+  /** Forget the cached standings (after a grant, a trade…); they rebuild on the next read. */
+  invalidateStandings(season2) {
+    if (season2) STANDINGS_CACHE.delete(season2.id);
+    else STANDINGS_CACHE.clear();
+  },
+  /** Where one player stands: rank among every collector, and the score's parts. Null rank with no card. */
+  async standingFor(player2, season2) {
+    const all = await this.standings(season2);
+    const mine = all.find((s) => s.player.id === player2.id);
+    if (!mine)
+      return {
+        rank: null,
+        uniqueCards: 0,
+        totalCards: 0,
+        cardScore: 0,
+        setsCompleted: 0,
+        setBonus: 0,
+        score: 0
+      };
+    return { rank: rankAmong(mine, all), ...mine, player: void 0 };
+  },
+  /** Top collectors by score (admin leaderboard). */
+  async leaderboard(season2, limit = 10) {
+    const all = await this.standings(season2);
+    return all.slice(0, limit).map((e, i) => ({
+      rank: i + 1,
+      player: { id: e.player.documentId, code: e.player.code, displayName: e.player.displayName },
+      score: e.score,
+      cardScore: e.cardScore,
+      setBonus: e.setBonus,
+      setsCompleted: e.setsCompleted,
+      uniqueCards: e.uniqueCards,
+      totalCards: e.totalCards
+    }));
   },
   /** Recent pulls for the audit screen. */
   async pulls(season2, { playerCode, rarity }, page) {
@@ -4231,7 +4436,12 @@ const stats = ({ strapi }) => ({
     const [items, total] = await Promise.all([
       strapi.db.query(UID.PULL).findMany({
         where,
-        populate: { player: { select: ["code", "displayName"] }, card: { select: ["name", "rarity", "number"] }, pack: { select: ["name", "slug"] }, drop: { select: ["name", "slug"] } },
+        populate: {
+          player: { select: ["code", "displayName"] },
+          card: { select: ["name", "rarity", "number"] },
+          pack: { select: ["name", "slug"] },
+          drop: { select: ["name", "slug"] }
+        },
         orderBy: { pulledAt: "desc" },
         offset: page.offset,
         limit: page.limit

package/dist/server/index.mjs

@@ -157,7 +157,9 @@ const DEFAULT_LIMITS = Object.freeze({
   qrTokenTtlMs: 5 * 60 * 1e3,
   staticScanCooldownMs: 24 * 60 * 60 * 1e3,
   pityRareAfter: 0,
-  pityLegendaryAfter: 0
+  pityLegendaryAfter: 0,
+  /** Points a completed set adds to the collector's score (utils/score.js). */
+  setCompletionBonus: 50
 });
 const DEFAULT_RANK_TIERS = Object.freeze([
   { key: "legend", label: "Legend", minPercent: 100 },
@@ -232,14 +234,28 @@ const ACTIONS = [
   { section: "plugins", uid: RBAC.PLAYERS_READ, displayName: "Read players" },
   { section: "plugins", uid: RBAC.PLAYERS_WRITE, displayName: "Deactivate players, grant cards" },
   { section: "plugins", uid: RBAC.REDEMPTIONS_READ, displayName: "Read redemptions" },
-  { section: "plugins", uid: RBAC.REDEMPTIONS_FULFILL, displayName: "Fulfill or cancel redemptions (booth)" },
+  {
+    section: "plugins",
+    uid: RBAC.REDEMPTIONS_FULFILL,
+    displayName: "Fulfill or cancel redemptions (booth)"
+  },
   { section: "plugins", uid: RBAC.AUDIT_READ, displayName: "Read the pull audit log" },
   { section: "plugins", uid: RBAC.REWARDS_READ, displayName: "Read the reward catalog" },
   { section: "plugins", uid: RBAC.REWARDS_WRITE, displayName: "Edit the reward catalog" },
   { section: "plugins", uid: RBAC.LIVE_READ, displayName: "Read live boosts" },
   { section: "plugins", uid: RBAC.LIVE_WRITE, displayName: "Create and edit live boosts" },
-  { section: "settings", category: CATEGORY, uid: RBAC.SETTINGS_READ, displayName: "Read settings" },
-  { section: "settings", category: CATEGORY, uid: RBAC.SETTINGS_WRITE, displayName: "Edit settings" }
+  {
+    section: "settings",
+    category: CATEGORY,
+    uid: RBAC.SETTINGS_READ,
+    displayName: "Read settings"
+  },
+  {
+    section: "settings",
+    category: CATEGORY,
+    uid: RBAC.SETTINGS_WRITE,
+    displayName: "Edit settings"
+  }
 ].map((a) => ({ ...a, pluginName: PLUGIN_ID }));
 const timers = [];
 const UNIQUE_COLUMNS = [
@@ -247,21 +263,46 @@ const UNIQUE_COLUMNS = [
   ["plugin::tcg.player", "code"],
   ["plugin::tcg.redemption", "code"]
 ];
+const hasIndex = async (knex, table, name) => {
+  const client = String(knex.client?.config?.client ?? "");
+  if (/mysql/.test(client)) {
+    const rows2 = await knex.raw("SHOW INDEX FROM ?? WHERE Key_name = ?", [table, name]);
+    return (rows2?.[0] ?? []).length > 0;
+  }
+  if (/pg|postgres/.test(client)) {
+    const rows2 = await knex.raw("SELECT 1 FROM pg_indexes WHERE tablename = ? AND indexname = ?", [
+      table,
+      name
+    ]);
+    return (rows2?.rows ?? []).length > 0;
+  }
+  const rows = await knex.raw("PRAGMA index_list(??)", [table]);
+  return (rows ?? []).some((r) => r.name === name);
+};
 const ensureUniqueIndexes = async (strapi) => {
+  const knex = strapi.db.connection;
   for (const [uid, column] of UNIQUE_COLUMNS) {
     const table = strapi.db.metadata.get(uid)?.tableName;
     if (!table) continue;
     const name = `${table}_${column}_tcg_uq`;
     try {
-      await strapi.db.connection.schema.alterTable(table, (t) => t.unique([column], { indexName: name }));
+      if (await hasIndex(knex, table, name)) continue;
+      await knex.schema.alterTable(table, (t) => t.unique([column], { indexName: name }));
+      strapi.log.info(`${LOG_PREFIX} unique index ${name} created`);
     } catch (err) {
-      if (!/exist|duplicate/i.test(err.message)) strapi.log.warn(`${LOG_PREFIX} unique index ${name}: ${err.message}`);
+      if (!/exist|duplicate/i.test(err.message))
+        strapi.log.warn(`${LOG_PREFIX} unique index ${name}: ${err.message}`);
     }
   }
 };
 const bootstrap = async ({ strapi }) => {
   await strapi.service("admin::permission").actionProvider.registerMany(ACTIONS);
-  await ensureUniqueIndexes(strapi);
+  setTimeout(
+    () => ensureUniqueIndexes(strapi).catch(
+      (err) => strapi.log.warn(`${LOG_PREFIX} unique indexes: ${err.message}`)
+    ),
+    5e3
+  );
   const plugin = strapi.plugin(PLUGIN_ID);
   if (plugin.service("settings").sweepsEnabled()) {
     const safe = (label, fn) => async () => {
@@ -272,13 +313,21 @@ const bootstrap = async ({ strapi }) => {
         strapi.log.warn(`${LOG_PREFIX} sweep ${label} failed: ${err.message}`);
       }
     };
-    const nonceTimer = setInterval(safe("nonces", () => plugin.service("qr").sweep()), NONCE_SWEEP_INTERVAL_MS);
-    const tradeTimer = setInterval(safe("expired offers", () => plugin.service("trade").sweep()), TRADE_SWEEP_INTERVAL_MS);
+    const nonceTimer = setInterval(
+      safe("nonces", () => plugin.service("qr").sweep()),
+      NONCE_SWEEP_INTERVAL_MS
+    );
+    const tradeTimer = setInterval(
+      safe("expired offers", () => plugin.service("trade").sweep()),
+      TRADE_SWEEP_INTERVAL_MS
+    );
     nonceTimer.unref();
     tradeTimer.unref();
     timers.push(nonceTimer, tradeTimer);
   }
-  strapi.log.info(`${LOG_PREFIX} ready — ${ACTIONS.length} RBAC actions, content API at /api/${PLUGIN_ID}`);
+  strapi.log.info(
+    `${LOG_PREFIX} ready — ${ACTIONS.length} RBAC actions, content API at /api/${PLUGIN_ID}`
+  );
 };
 const stopTimers = () => {
   while (timers.length) clearInterval(timers.pop());
@@ -2702,6 +2751,39 @@ const qr = ({ strapi }) => ({
     return count ?? 0;
   }
 });
+const rarityPoints = (season2, rarityKey) => {
+  const table = season2?.rarities?.length ? season2.rarities : DEFAULT_RARITIES;
+  const idx = table.findIndex((r) => r.key === rarityKey);
+  const meta = table[idx] ?? DEFAULT_RARITIES.find((r) => r.key === rarityKey) ?? null;
+  const min = Number(meta?.scoreMin);
+  const max = Number(meta?.scoreMax);
+  if (Number.isFinite(min) && Number.isFinite(max) && max >= min)
+    return Math.round((min + max) / 2);
+  return 10 + Math.max(0, idx) * 20;
+};
+const cardPoints = (card2, season2) => {
+  const own = Number(card2?.score);
+  if (Number.isFinite(own) && own > 0) return Math.round(own);
+  return rarityPoints(season2, card2?.rarity);
+};
+const standingOf = (distinctCards, totalCards, sets, season2, limits = {}) => {
+  const ownedIds = new Set(distinctCards.map((c) => String(c.id)));
+  const cardScore = distinctCards.reduce((sum, c) => sum + cardPoints(c, season2), 0);
+  const setsCompleted = (sets ?? []).filter(
+    (s) => (s.cards ?? []).length > 0 && s.cards.every((c) => ownedIds.has(String(c.id)))
+  ).length;
+  const bonus = Math.max(0, Number(limits.setCompletionBonus) || 0);
+  return {
+    uniqueCards: distinctCards.length,
+    totalCards,
+    cardScore,
+    setsCompleted,
+    setBonus: setsCompleted * bonus,
+    score: cardScore + setsCompleted * bonus
+  };
+};
+const compareStandings = (a, b) => b.score - a.score || b.uniqueCards - a.uniqueCards || b.totalCards - a.totalCards;
+const rankAmong = (mine, all) => 1 + all.filter((s) => compareStandings(s, mine) < 0).length;
 const mediaUrl = (media) => media && typeof media === "object" ? media.url ?? null : null;
 const format = () => ({
   rarityMeta(season2, key) {
@@ -2720,6 +2802,7 @@ const format = () => ({
       rarityColor: rarity.color,
       edition: card2.edition ?? "standard",
       score: card2.score ?? 0,
+      points: cardPoints(card2, season2),
       imageUrl: mediaUrl(card2.image),
       attributes: card2.attributes ?? {},
       lore: card2.lore ?? null,
@@ -2781,7 +2864,13 @@ const format = () => ({
   },
   /** Admin-only view: includes msisdn. */
   playerAdmin(player2) {
-    return player2 ? { ...this.player(player2), externalId: player2.externalId ?? null, msisdn: player2.msisdn ?? null, isActive: player2.isActive, meta: player2.meta ?? {} } : null;
+    return player2 ? {
+      ...this.player(player2),
+      externalId: player2.externalId ?? null,
+      msisdn: player2.msisdn ?? null,
+      isActive: player2.isActive,
+      meta: player2.meta ?? {}
+    } : null;
   },
   playerCard(pc, season2) {
     if (!pc) return null;
@@ -2809,7 +2898,16 @@ const format = () => ({
       note: r.note ?? null,
       player: r.player ? this.player(r.player) : void 0,
       season: r.season ? { id: r.season.documentId, name: r.season.name, slug: r.season.slug } : void 0,
-      reward: r.reward ? { id: r.reward.documentId, name: r.reward.name, slug: r.reward.slug, tier: r.reward.tier ?? null, booth: r.reward.booth ?? null, imageUrl: mediaUrl(r.reward.image), stock: r.reward.stock ?? null, claimed: r.reward.claimed ?? 0 } : r.rewardName ? { name: r.rewardName } : null
+      reward: r.reward ? {
+        id: r.reward.documentId,
+        name: r.reward.name,
+        slug: r.reward.slug,
+        tier: r.reward.tier ?? null,
+        booth: r.reward.booth ?? null,
+        imageUrl: mediaUrl(r.reward.image),
+        stock: r.reward.stock ?? null,
+        claimed: r.reward.claimed ?? 0
+      } : r.rewardName ? { name: r.rewardName } : null
     };
   }
 });
@@ -3521,22 +3619,11 @@ const collection = ({ strapi }) => ({
     return [...new Set(rows.map((r) => r.card?.id).filter(Boolean))];
   },
   /**
-   * Global rank = 1 + number of players owning more distinct season cards. Uses the link tables
-   * Strapi 5 creates for relations, resolved from metadata so table names never get hardcoded.
+   * Global rank = 1 + the number of collectors with a better standing: rarity-weighted score, then distinct
+   * cards, then total cards (utils/score.js). Null before the first card.
    */
-  async rank(player2, season2, myUnique) {
-    if (myUnique === 0) return null;
-    const knex = strapi.db.connection;
-    const md = strapi.db.metadata.get(UID.PLAYER_CARD);
-    const pcTable = md.tableName;
-    const playerLnk = md.attributes.player.joinTable;
-    const cardLnk = md.attributes.card.joinTable;
-    const cardMd = strapi.db.metadata.get(UID.CARD);
-    const seasonLnk = cardMd.attributes.season.joinTable;
-    const seasonId = season2.id;
-    const sub = knex(`${pcTable} as pc`).join(`${playerLnk.name} as pl`, "pl." + playerLnk.joinColumn.name, "pc.id").join(`${cardLnk.name} as cl`, "cl." + cardLnk.joinColumn.name, "pc.id").join(`${seasonLnk.name} as sl`, "sl." + seasonLnk.joinColumn.name, "cl." + cardLnk.inverseJoinColumn.name).where("sl." + seasonLnk.inverseJoinColumn.name, seasonId).groupBy("pl." + playerLnk.inverseJoinColumn.name).select("pl." + playerLnk.inverseJoinColumn.name + " as player_id").countDistinct("cl." + cardLnk.inverseJoinColumn.name + " as unique_cards");
-    const row = await knex.from(sub.as("ranked")).where("ranked.unique_cards", ">", myUnique).count("* as better").first();
-    return Number(row?.better ?? 0) + 1;
+  async rank(player2, season2) {
+    return (await strapi.plugin("tcg").service("stats").standingFor(player2, season2)).rank;
   },
   async stats(player2, season2) {
     const plugin = strapi.plugin("tcg");
@@ -3572,16 +3659,26 @@ const collection = ({ strapi }) => ({
       populate: { pack: { select: ["id"] }, card: { select: ["id"] } }
     });
     const byPack = packs.map((p) => {
-      const cardIds = [...new Set(packRows.filter((r) => r.pack?.id === p.id).map((r) => r.card?.id).filter(Boolean))];
+      const cardIds = [
+        ...new Set(
+          packRows.filter((r) => r.pack?.id === p.id).map((r) => r.card?.id).filter(Boolean)
+        )
+      ];
       const collected = cardIds.filter((id) => ownedIds.has(id)).length;
-      return { pack: format2.pack(p), collected, total: cardIds.length, isComplete: cardIds.length > 0 && collected === cardIds.length };
+      return {
+        pack: format2.pack(p),
+        collected,
+        total: cardIds.length,
+        isComplete: cardIds.length > 0 && collected === cardIds.length
+      };
     });
     const tier = plugin.service("season").tierFor(season2, completion);
-    const [sets, badges, metrics, live] = await Promise.all([
+    const [sets, badges, metrics, live, standing] = await Promise.all([
       plugin.service("set").list(season2, { includeInactive: false }),
       plugin.service("badge").forPlayer(player2, season2),
       plugin.service("badge").metrics(player2, season2),
-      plugin.service("boost").liveNow(season2)
+      plugin.service("boost").liveNow(season2),
+      plugin.service("stats").standingFor(player2, season2)
     ]);
     return {
       sets: plugin.service("set").progress(sets, ownedIds, season2),
@@ -3592,7 +3689,13 @@ const collection = ({ strapi }) => ({
       uniqueCards: ownedIds.size,
       catalogTotal,
       completionPercentage: completion,
-      globalRank: await this.rank(player2, season2, ownedIds.size),
+      globalRank: standing.rank,
+      score: standing.score,
+      scoreBreakdown: {
+        cards: standing.cardScore,
+        setBonus: standing.setBonus,
+        setsCompleted: standing.setsCompleted
+      },
       rankTier: { key: tier.key, label: tier.label },
       season: format2.season(season2),
       byRarity,
@@ -3606,7 +3709,14 @@ const collection = ({ strapi }) => ({
     const mintNumber = await strapi.plugin("tcg").service("pull").claimSlot(UID.CARD, card2.id, "minted", null);
     const pc = await strapi.db.transaction(async () => {
       const row = await strapi.db.query(UID.PLAYER_CARD).create({
-        data: { player: player2.id, card: card2.id, pack: pack2?.id ?? null, acquiredFrom: "grant", acquiredAt: now, mintNumber }
+        data: {
+          player: player2.id,
+          card: card2.id,
+          pack: pack2?.id ?? null,
+          acquiredFrom: "grant",
+          acquiredAt: now,
+          mintNumber
+        }
       });
       await strapi.db.query(UID.PLAYER).update({ where: { id: player2.id }, data: { totalCards: (player2.totalCards ?? 0) + 1 } });
       return row;
@@ -4121,6 +4231,8 @@ const redemption = ({ strapi }) => ({
     return { items: items.map((r) => format2.redemption(r)), total };
   }
 });
+const STANDINGS_TTL_MS = 10 * 1e3;
+const STANDINGS_CACHE = /* @__PURE__ */ new Map();
 const startOfToday = () => {
   const d = /* @__PURE__ */ new Date();
   d.setHours(0, 0, 0, 0);
@@ -4155,15 +4267,31 @@ const stats = ({ strapi }) => ({
       strapi.db.query(UID.PULL).count({ where: { ...seasonWhere, pulledAt: { $gte: since } } }),
       strapi.db.query(UID.PULL).count({ where: seasonWhere }),
       strapi.db.query(UID.TRADE).count({ where: { ...seasonWhere, completedAt: { $gte: since } } }),
-      strapi.db.query(UID.TRADE_OFFER).count({ where: { ...seasonWhere, status: TRADE_STATUS.PENDING, expiresAt: { $gt: /* @__PURE__ */ new Date() } } }),
+      strapi.db.query(UID.TRADE_OFFER).count({
+        where: { ...seasonWhere, status: TRADE_STATUS.PENDING, expiresAt: { $gt: /* @__PURE__ */ new Date() } }
+      }),
       strapi.db.query(UID.REDEMPTION).count({ where: { ...seasonWhere, status: REDEMPTION_STATUS.PENDING } }),
-      strapi.db.query(UID.REDEMPTION).count({ where: { ...seasonWhere, status: REDEMPTION_STATUS.FULFILLED, fulfilledAt: { $gte: since } } }),
+      strapi.db.query(UID.REDEMPTION).count({
+        where: {
+          ...seasonWhere,
+          status: REDEMPTION_STATUS.FULFILLED,
+          fulfilledAt: { $gte: since }
+        }
+      }),
       season2 ? strapi.db.query(UID.CARD).count({ where: { season: season2.id, isActive: true } }) : Promise.resolve(0),
       season2 ? strapi.db.query(UID.PACK).count({ where: { season: season2.id, isActive: true } }) : Promise.resolve(0),
-      strapi.db.query(UID.PULL).findMany({ where: { ...seasonWhere, pulledAt: { $gte: week } }, select: ["pulledAt", "rarity"] }),
+      strapi.db.query(UID.PULL).findMany({
+        where: { ...seasonWhere, pulledAt: { $gte: week } },
+        select: ["pulledAt", "rarity"]
+      }),
       strapi.db.query(UID.PULL).findMany({
         where: seasonWhere,
-        populate: { player: { select: ["code", "displayName"] }, card: { select: ["name", "rarity"] }, pack: { select: ["name"] }, drop: { select: ["name"] } },
+        populate: {
+          player: { select: ["code", "displayName"] },
+          card: { select: ["name", "rarity"] },
+          pack: { select: ["name"] },
+          drop: { select: ["name"] }
+        },
         orderBy: { pulledAt: "desc" },
         limit: 8
       })
@@ -4172,24 +4300,47 @@ const stats = ({ strapi }) => ({
       const day = daysAgo(6 - i);
       const next = new Date(day);
       next.setDate(day.getDate() + 1);
-      return { day: day.toISOString().slice(0, 10), pulls: weekPulls.filter((p) => new Date(p.pulledAt) >= day && new Date(p.pulledAt) < next).length };
+      return {
+        day: day.toISOString().slice(0, 10),
+        pulls: weekPulls.filter((p) => new Date(p.pulledAt) >= day && new Date(p.pulledAt) < next).length
+      };
     });
     const rarities = season2?.rarities ?? [];
     const plugin = strapi.plugin("tcg");
     const [liveBoosts, rewards, drops] = season2 ? await Promise.all([
       plugin.service("boost").liveNow(season2),
       plugin.service("reward").list(season2, { includeInactive: false }),
-      strapi.db.query(UID.DROP).findMany({ where: { pack: { season: season2.id }, isActive: true }, populate: { pack: { select: ["name"] } } })
+      strapi.db.query(UID.DROP).findMany({
+        where: { pack: { season: season2.id }, isActive: true },
+        populate: { pack: { select: ["name"] } }
+      })
     ]) : [[], [], []];
-    const lowStock = rewards.filter((r) => r.stock != null).map((r) => ({ id: r.documentId, name: r.name, remaining: Math.max(0, r.stock - (r.claimed ?? 0)), stock: r.stock })).filter((r) => r.remaining <= Math.max(3, Math.ceil(r.stock * 0.1))).sort((a, b) => a.remaining - b.remaining);
-    const dropStates = drops.map((d) => ({ id: d.documentId, name: `${d.pack?.name ?? ""} · ${d.name}`, mode: d.mode, scans: d.scanCount ?? 0, cap: d.maxScansTotal ?? null, isOpen: plugin.service("drop").isOpen(d) }));
+    const lowStock = rewards.filter((r) => r.stock != null).map((r) => ({
+      id: r.documentId,
+      name: r.name,
+      remaining: Math.max(0, r.stock - (r.claimed ?? 0)),
+      stock: r.stock
+    })).filter((r) => r.remaining <= Math.max(3, Math.ceil(r.stock * 0.1))).sort((a, b) => a.remaining - b.remaining);
+    const dropStates = drops.map((d) => ({
+      id: d.documentId,
+      name: `${d.pack?.name ?? ""} · ${d.name}`,
+      mode: d.mode,
+      scans: d.scanCount ?? 0,
+      cap: d.maxScansTotal ?? null,
+      isOpen: plugin.service("drop").isOpen(d)
+    }));
     return {
       liveBoosts,
       lowStock,
       drops: dropStates,
       season: season2 ? { id: season2.documentId, name: season2.name, slug: season2.slug, status: season2.status } : null,
       players: { total: players, today: playersToday },
-      pulls: { today: pullsToday, total: pullsTotal, sparkline, distribution: distribution(weekPulls, rarities) },
+      pulls: {
+        today: pullsToday,
+        total: pullsTotal,
+        sparkline,
+        distribution: distribution(weekPulls, rarities)
+      },
       trades: { today: tradesToday, pendingOffers },
       redemptions: { pending: pendingRedemptions, fulfilledToday },
       catalog: { cards, packs },
@@ -4206,21 +4357,75 @@ const stats = ({ strapi }) => ({
       }))
     };
   },
-  /** Top collectors by distinct cards owned in a season (admin leaderboard). */
-  async leaderboard(season2, limit = 10) {
-    const rows = await strapi.db.query(UID.PLAYER_CARD).findMany({
-      where: { card: { season: season2.id } },
-      populate: { player: { select: ["id", "documentId", "code", "displayName"] }, card: { select: ["id"] } }
-    });
+  /**
+   * Every collector's standing in a season (utils/score.js), sorted. Computed from every player card of
+   * the season and cached a few seconds: the rank is asked on every stats screen.
+   * @returns {Promise<Array<{player: Object, uniqueCards: number, totalCards: number, cardScore: number, setsCompleted: number, setBonus: number, score: number}>>}
+   */
+  async standings(season2) {
+    const cached = STANDINGS_CACHE.get(season2.id);
+    if (cached && Date.now() - cached.at < STANDINGS_TTL_MS) return cached.value;
+    const plugin = strapi.plugin("tcg");
+    const [rows, sets] = await Promise.all([
+      strapi.db.query(UID.PLAYER_CARD).findMany({
+        where: { card: { season: season2.id } },
+        populate: {
+          player: { select: ["id", "documentId", "code", "displayName"] },
+          card: { select: ["id", "rarity", "score"] }
+        }
+      }),
+      plugin.service("set").list(season2, { includeInactive: false })
+    ]);
+    const limits = plugin.service("season").limitsOf(season2);
     const byPlayer = /* @__PURE__ */ new Map();
     for (const r of rows) {
       if (!r.player || !r.card) continue;
-      const entry = byPlayer.get(r.player.id) ?? { player: r.player, unique: /* @__PURE__ */ new Set(), total: 0 };
-      entry.unique.add(r.card.id);
+      const entry = byPlayer.get(r.player.id) ?? { player: r.player, cards: /* @__PURE__ */ new Map(), total: 0 };
+      entry.cards.set(r.card.id, r.card);
       entry.total += 1;
       byPlayer.set(r.player.id, entry);
     }
-    return [...byPlayer.values()].map((e) => ({ player: { id: e.player.documentId, code: e.player.code, displayName: e.player.displayName }, uniqueCards: e.unique.size, totalCards: e.total })).sort((a, b) => b.uniqueCards - a.uniqueCards || b.totalCards - a.totalCards).slice(0, limit).map((e, i) => ({ rank: i + 1, ...e }));
+    const value = [...byPlayer.values()].map((e) => ({
+      player: e.player,
+      ...standingOf([...e.cards.values()], e.total, sets, season2, limits)
+    })).sort(compareStandings);
+    STANDINGS_CACHE.set(season2.id, { at: Date.now(), value });
+    return value;
+  },
+  /** Forget the cached standings (after a grant, a trade…); they rebuild on the next read. */
+  invalidateStandings(season2) {
+    if (season2) STANDINGS_CACHE.delete(season2.id);
+    else STANDINGS_CACHE.clear();
+  },
+  /** Where one player stands: rank among every collector, and the score's parts. Null rank with no card. */
+  async standingFor(player2, season2) {
+    const all = await this.standings(season2);
+    const mine = all.find((s) => s.player.id === player2.id);
+    if (!mine)
+      return {
+        rank: null,
+        uniqueCards: 0,
+        totalCards: 0,
+        cardScore: 0,
+        setsCompleted: 0,
+        setBonus: 0,
+        score: 0
+      };
+    return { rank: rankAmong(mine, all), ...mine, player: void 0 };
+  },
+  /** Top collectors by score (admin leaderboard). */
+  async leaderboard(season2, limit = 10) {
+    const all = await this.standings(season2);
+    return all.slice(0, limit).map((e, i) => ({
+      rank: i + 1,
+      player: { id: e.player.documentId, code: e.player.code, displayName: e.player.displayName },
+      score: e.score,
+      cardScore: e.cardScore,
+      setBonus: e.setBonus,
+      setsCompleted: e.setsCompleted,
+      uniqueCards: e.uniqueCards,
+      totalCards: e.totalCards
+    }));
   },
   /** Recent pulls for the audit screen. */
   async pulls(season2, { playerCode, rarity }, page) {
@@ -4230,7 +4435,12 @@ const stats = ({ strapi }) => ({
     const [items, total] = await Promise.all([
       strapi.db.query(UID.PULL).findMany({
         where,
-        populate: { player: { select: ["code", "displayName"] }, card: { select: ["name", "rarity", "number"] }, pack: { select: ["name", "slug"] }, drop: { select: ["name", "slug"] } },
+        populate: {
+          player: { select: ["code", "displayName"] },
+          card: { select: ["name", "rarity", "number"] },
+          pack: { select: ["name", "slug"] },
+          drop: { select: ["name", "slug"] }
+        },
         orderBy: { pulledAt: "desc" },
         offset: page.offset,
         limit: page.limit

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonatel-os/strapi-plugin-tcg",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "A full trading-card-game module for Strapi v5: seasons, packs, cards, pulls, trades, redemptions — with admin screens and RBAC.",
   "license": "MIT",
   "author": "LPIX-11 <mohamed.johnson@orange-sonatel.com>",