@smartico/public-api 0.0.402 → 0.0.403

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@smartico/public-api",
-	"version": "0.0.402",
+	"version": "0.0.403",
 	"description": "Smartico public API",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/src/NodeCache.ts

@@ -39,6 +39,14 @@ class NodeCache {
 		}
 	}
 
+	public removeByPrefix(prefix: string) {
+		for (const key in this.cache) {
+			if (this.cache.hasOwnProperty(key) && key.indexOf(prefix) === 0) {
+				delete this.cache[key];
+			}
+		}
+	}
+
 	public flushAll() {
 		this.cache = {};
 		if (this.ttlChecker) {

package/src/OCache.ts

@@ -56,6 +56,23 @@ export class OCache {
 		}
 	}
 
+	/**
+	 * Remove every entry whose string key starts with `oKeyBase` — the bare key
+	 * AND all per-parameter composite variants (`${oKeyBase}:…` / `${oKeyBase}<id>`).
+	 * Use when a cache is keyed per parameter (paginated, per-template, per-window):
+	 * an exact-key `clear(oKeyBase)` would miss every variant. `oKeyBase` must be a string.
+	 */
+	public static async clearByPrefix(cacheContext: ECacheContext, oKeyBase: string) {
+		// `set`/`get` build keys as `<context>_<JSON.stringify(oKey)>`; JSON.stringify
+		// wraps a string in quotes, so dropping the trailing quote yields a prefix that
+		// matches both the bare `"base"` key and every `"base…"` composite key.
+		const prefix = cacheContext.toString() + '_' + JSON.stringify(oKeyBase).slice(0, -1);
+
+		if (this.cache[cacheContext]) {
+			this.cache[cacheContext].removeByPrefix(prefix);
+		}
+	}
+
 	public static async clearContext(cacheContext: ECacheContext) {
 		if (this.cache[cacheContext]) {
 			this.cache[cacheContext].flushAll();

package/src/WSAPI/WSAPI.ts

@@ -34,11 +34,11 @@ export class WSAPI extends WSAPIInbox {
 			on(ClassId.SAW_SHOW_SPIN_PUSH, () => this.reloadMiniGameTemplate());
 			on(ClassId.SAW_AKNOWLEDGE_RESPONSE, () => {
 				this.reloadMiniGameTemplate();
-				OCache.clear(ECacheContext.WSAPI, onUpdateContextKey.SAWHistory);
+				OCache.clearByPrefix(ECacheContext.WSAPI, onUpdateContextKey.SAWHistory);
 			});
 			on(ClassId.SAW_DO_SPIN_RESPONSE, () => {
 				this.reloadMiniGameTemplate();
-				OCache.clear(ECacheContext.WSAPI, onUpdateContextKey.SAWHistory);
+				OCache.clearByPrefix(ECacheContext.WSAPI, onUpdateContextKey.SAWHistory);
 			});
 			on(ClassId.MISSION_OPTIN_RESPONSE, () => this.updateMissions());
 			on(ClassId.ACHIEVEMENT_CLAIM_PRIZE_RESPONSE, () => this.updateMissions());
@@ -57,7 +57,7 @@ export class WSAPI extends WSAPIInbox {
 			on(ClassId.CLAIM_BONUS_RESPONSE, () => this.updateBonuses());
 			on(ClassId.SAW_DO_SPIN_BATCH_RESPONSE, () => {
 				this.reloadMiniGameTemplate();
-				OCache.clear(ECacheContext.WSAPI, onUpdateContextKey.SAWHistory);
+				OCache.clearByPrefix(ECacheContext.WSAPI, onUpdateContextKey.SAWHistory);
 			});
 			on(ClassId.RAF_CLAIM_PRIZE_RESPONSE, () => this.updateRaffles());
 			on(ClassId.GET_INBOX_MESSAGES_RESPONSE, (res) => {

package/src/WSAPI/WSAPIJackpots.ts

@@ -25,7 +25,10 @@ export class WSAPIJackpots extends WSAPIClans {
 	protected async jackpotClearCache() {
 		OCache.clear(ECacheContext.WSAPI, onUpdateContextKey.Jackpots);
 		OCache.clear(ECacheContext.WSAPI, onUpdateContextKey.Pots);
-		OCache.clear(ECacheContext.WSAPI, onUpdateContextKey.JackpotWinners);
+		// Winners + eligible-games are cached per jp_template_id (composite keys),
+		// so a bare clear misses every variant — clear by prefix.
+		OCache.clearByPrefix(ECacheContext.WSAPI, onUpdateContextKey.JackpotWinners);
+		OCache.clearByPrefix(ECacheContext.WSAPI, onUpdateContextKey.JackpotEligibleGames);
 	}
 
 	/**

package/src/WSAPI/WSAPIMiniGames.ts

@@ -198,7 +198,7 @@ export class WSAPIMiniGames extends WSAPIRaffles {
 		saw_template_id?: number;
 	}): Promise<TSawHistory[]> {
 		return OCache.use(
-			onUpdateContextKey.SAWHistory,
+			`${onUpdateContextKey.SAWHistory}:${saw_template_id ?? ''}:${limit ?? ''}:${offset ?? ''}`,
 			ECacheContext.WSAPI,
 			() => this.api.getSawWinningHistoryT(this.userExtId, limit, offset, saw_template_id),
 			CACHE_DATA_SEC,

package/src/WSAPI/WSAPIUser.ts

@@ -595,23 +595,48 @@ export class WSAPIUser extends WSAPIBase {
 		onUpdate?: (data: TActivityLog[]) => void;
 	}): Promise<TActivityLog[]> {
 
+		const cacheKey = `${onUpdateContextKey.ActivityLog}:${startTimeSeconds}:${endTimeSeconds}:${from}:${to}`;
+
 		if (typeof onUpdate === 'function') {
 			this.onUpdateCallback.set(onUpdateContextKey.ActivityLog, onUpdate);
+			// Remember the requested window so a push refresh re-fetches THIS window
+			// and writes the matching composite cache key (see notifyActivityLogUpdate).
+			this.activityLogOnUpdateParams = { startTimeSeconds, endTimeSeconds, from, to };
 		}
 
 		return await OCache.use(
-			onUpdateContextKey.ActivityLog,
+			cacheKey,
 			ECacheContext.WSAPI,
 			() => this.api.getActivityLogT(this.userExtId, startTimeSeconds, endTimeSeconds, from, to),
 			CACHE_DATA_SEC,
 		);
 	}
 
+	/** @hidden Last window passed to `getActivityLog` with an `onUpdate`, so a push
+	 * refresh re-fetches the same window and updates its matching composite cache key. */
+	private activityLogOnUpdateParams: { startTimeSeconds: number; endTimeSeconds: number; from: number; to: number } | undefined;
+
 	protected async notifyActivityLogUpdate() {
-		const startSeconds = Date.now() / 1000 - 600;
-		const endSeconds = Date.now() / 1000;
-		const payload = await this.api.getActivityLogT(this.userExtId, startSeconds, endSeconds, 0, 50);
+		const params = this.activityLogOnUpdateParams;
+		// No consumer has subscribed to a specific window yet — nothing to refresh.
+		if (!params) {
+			return;
+		}
+
+		const payload = await this.api.getActivityLogT(
+			this.userExtId,
+			params.startTimeSeconds,
+			params.endTimeSeconds,
+			params.from,
+			params.to,
+		);
+		const cacheKey = `${onUpdateContextKey.ActivityLog}:${params.startTimeSeconds}:${params.endTimeSeconds}:${params.from}:${params.to}`;
+
+		OCache.set(cacheKey, payload, ECacheContext.WSAPI);
 
-		this.updateEntity(onUpdateContextKey.ActivityLog, payload);
+		const onUpdate = this.onUpdateCallback.get(onUpdateContextKey.ActivityLog);
+		if (typeof onUpdate === 'function') {
+			onUpdate(payload);
+		}
 	}
 }