@apify/actors-mcp-server 0.9.20-beta.0 → 0.9.20-beta.10

package/dist/utils/userid_cache.d.ts

@@ -1,8 +1,16 @@
 import type { ApifyClient } from '../apify_client.js';
+import { type PricingTier } from './pricing_info.js';
+export type CachedUserInfo = {
+    userId: string | null;
+    userPlanTier: PricingTier;
+};
 /**
- * Gets user ID from token, using cache to avoid repeated API calls
- * Token is hashed before caching to avoid storing raw tokens
- * Returns userId or null if not found
+ * Gets user info (id + plan tier) from token, using cache to avoid repeated API calls.
+ * Token is hashed before caching to avoid storing raw tokens.
+ *
+ * Defensive defaults: returns `{ userId: null, userPlanTier: 'FREE' }` when the token is
+ * missing/empty, the API call fails, or the plan is unrecognized. Failed lookups are NOT
+ * cached so the next call retries.
  */
-export declare function getUserIdFromTokenCached(token: string, apifyClient: ApifyClient): Promise<string | null>;
+export declare function getUserInfoCached(token: string | undefined, apifyClient: ApifyClient): Promise<CachedUserInfo>;
 //# sourceMappingURL=userid_cache.d.ts.map

package/dist/utils/userid_cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userid_cache.d.ts","sourceRoot":"","sources":["../../src/utils/userid_cache.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAOtD;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC1C,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAexB"}
+{"version":3,"file":"userid_cache.d.ts","sourceRoot":"","sources":["../../src/utils/userid_cache.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGpE,MAAM,MAAM,cAAc,GAAG;IACzB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,YAAY,EAAE,WAAW,CAAC;CAC7B,CAAC;AAiBF;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CACnC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,WAAW,EAAE,WAAW,GACzB,OAAO,CAAC,cAAc,CAAC,CAuBzB"}

package/dist/utils/userid_cache.js

@@ -1,28 +1,55 @@
 import { createHash } from 'node:crypto';
+import log from '@apify/log';
 import { USER_CACHE_MAX_SIZE, USER_CACHE_TTL_SECS } from '../const.js';
+import { PRICING_TIERS } from './pricing_info.js';
 import { TTLLRUCache } from './ttl_lru.js';
-// LRU cache with TTL for user info - stores the raw User object from API
-const userIdCache = new TTLLRUCache(USER_CACHE_MAX_SIZE, USER_CACHE_TTL_SECS);
+const ANONYMOUS_USER_INFO = { userId: null, userPlanTier: 'FREE' };
+// LRU cache with TTL for user info - keyed by hashed token
+const userInfoCache = new TTLLRUCache(USER_CACHE_MAX_SIZE, USER_CACHE_TTL_SECS);
+function normalizePlanTier(tier) {
+    if (!tier)
+        return 'FREE';
+    const upper = tier.toUpperCase();
+    const match = PRICING_TIERS.find((t) => t === upper);
+    if (match)
+        return match;
+    // Enterprise / custom plan names fall through to FREE; log so we can spot them in the wild.
+    log.info(`Unrecognized plan tier "${tier}", defaulting to FREE`);
+    return 'FREE';
+}
 /**
- * Gets user ID from token, using cache to avoid repeated API calls
- * Token is hashed before caching to avoid storing raw tokens
- * Returns userId or null if not found
+ * Gets user info (id + plan tier) from token, using cache to avoid repeated API calls.
+ * Token is hashed before caching to avoid storing raw tokens.
+ *
+ * Defensive defaults: returns `{ userId: null, userPlanTier: 'FREE' }` when the token is
+ * missing/empty, the API call fails, or the plan is unrecognized. Failed lookups are NOT
+ * cached so the next call retries.
  */
-export async function getUserIdFromTokenCached(token, apifyClient) {
+export async function getUserInfoCached(token, apifyClient) {
+    var _a;
+    if (!token)
+        return ANONYMOUS_USER_INFO;
     const tokenHash = createHash('sha256').update(token).digest('hex');
-    const cachedId = userIdCache.get(tokenHash);
-    if (cachedId)
-        return cachedId;
+    const cached = userInfoCache.get(tokenHash);
+    if (cached)
+        return cached;
     try {
         const user = await apifyClient.user('me').get();
-        if (!user || !user.id) {
-            return null;
+        if (!(user === null || user === void 0 ? void 0 : user.id)) {
+            return { ...ANONYMOUS_USER_INFO };
         }
-        userIdCache.set(tokenHash, user.id);
-        return user.id;
+        // `tier` is present on /v2/users/me `plan` response (FREE/BRONZE/SILVER/GOLD/PLATINUM/DIAMOND)
+        // but missing from apify-client's type declaration — hence the cast.
+        const planTier = (_a = user.plan) === null || _a === void 0 ? void 0 : _a.tier;
+        const info = {
+            userId: user.id,
+            userPlanTier: normalizePlanTier(planTier),
+        };
+        userInfoCache.set(tokenHash, info);
+        return info;
     }
     catch {
-        return null;
+        return { ...ANONYMOUS_USER_INFO };
     }
 }
 //# sourceMappingURL=userid_cache.js.map

package/dist/utils/userid_cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"userid_cache.js","sourceRoot":"","sources":["../../src/utils/userid_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,yEAAyE;AACzE,MAAM,WAAW,GAAG,IAAI,WAAW,CAAS,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;AAEtF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC1C,KAAa,EACb,WAAwB;IAExB,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC5C,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAE9B,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;QAChD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACpC,OAAO,IAAI,CAAC,EAAE,CAAC;IACnB,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;AACL,CAAC"}
+{"version":3,"file":"userid_cache.js","sourceRoot":"","sources":["../../src/utils/userid_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,GAAG,MAAM,YAAY,CAAC;AAG7B,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAE,aAAa,EAAoB,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAO3C,MAAM,mBAAmB,GAAmB,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;AAEnF,2DAA2D;AAC3D,MAAM,aAAa,GAAG,IAAI,WAAW,CAAiB,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;AAEhG,SAAS,iBAAiB,CAAC,IAAwB;IAC/C,IAAI,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC;IACzB,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC;IACrD,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IACxB,4FAA4F;IAC5F,GAAG,CAAC,IAAI,CAAC,2BAA2B,IAAI,uBAAuB,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACnC,KAAyB,EACzB,WAAwB;;IAExB,IAAI,CAAC,KAAK;QAAE,OAAO,mBAAmB,CAAC;IACvC,MAAM,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC5C,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC;QAChD,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,CAAA,EAAE,CAAC;YACZ,OAAO,EAAE,GAAG,mBAAmB,EAAE,CAAC;QACtC,CAAC;QACD,+FAA+F;QAC/F,qEAAqE;QACrE,MAAM,QAAQ,GAAG,MAAC,IAAI,CAAC,IAAsC,0CAAE,IAAI,CAAC;QACpE,MAAM,IAAI,GAAmB;YACzB,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,YAAY,EAAE,iBAAiB,CAAC,QAAQ,CAAC;SAC5C,CAAC;QACF,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,EAAE,GAAG,mBAAmB,EAAE,CAAC;IACtC,CAAC;AACL,CAAC"}