dgc-core 2.0.5 → 2.0.8

package/dist/revenuecat.js

@@ -0,0 +1,206 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RevenueCatLookupError = void 0;
+exports.createRevenueCatClient = createRevenueCatClient;
+exports.verifyCreditGiveawayEntitlement = verifyCreditGiveawayEntitlement;
+const axios_1 = __importDefault(require("axios"));
+const revenuecat_1 = require("./constants/revenuecat");
+const user_1 = require("./enums/user");
+const http_error_1 = require("./http-error");
+/** Deliberately excludes the original HTTP error, which can contain the API key. */
+class RevenueCatLookupError extends http_error_1.HttpError {
+    constructor() {
+        super('Unable to verify RevenueCat entitlement access. Please try again.', 503);
+        this.name = 'RevenueCatLookupError';
+    }
+}
+exports.RevenueCatLookupError = RevenueCatLookupError;
+function positiveInteger(value, maximum) {
+    return Number.isInteger(value) && value > 0 && value <= maximum;
+}
+function validUserId(value) {
+    return (typeof value === 'string' &&
+        value.length > 0 &&
+        value.length <= 128 &&
+        value.trim() === value &&
+        !/[.#$[\]/]/.test(value) &&
+        !Array.from(value).some(character => {
+            const code = character.charCodeAt(0);
+            return code < 32 || code === 127;
+        }));
+}
+function parsePage(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        throw new RevenueCatLookupError();
+    const page = value;
+    if (!Array.isArray(page.items) ||
+        (page.next_page != null && (typeof page.next_page !== 'string' || !page.next_page)))
+        throw new RevenueCatLookupError();
+    const items = page.items.map((raw) => {
+        if (!raw || typeof raw !== 'object' || Array.isArray(raw))
+            throw new RevenueCatLookupError();
+        const entitlement = raw;
+        if (typeof entitlement.entitlement_id !== 'string' ||
+            !/^entl[a-zA-Z0-9]+$/.test(entitlement.entitlement_id) ||
+            (entitlement.expires_at !== null &&
+                (typeof entitlement.expires_at !== 'number' ||
+                    !Number.isSafeInteger(entitlement.expires_at) ||
+                    entitlement.expires_at < 0)))
+            throw new RevenueCatLookupError();
+        return {
+            entitlementId: entitlement.entitlement_id,
+            expiresAt: entitlement.expires_at
+        };
+    });
+    return { items, nextPage: page.next_page ?? null };
+}
+function retryAfterMs(value) {
+    if (typeof value === 'number')
+        return Number.isFinite(value) && value >= 0 ? value * 1000 : null;
+    if (typeof value !== 'string' || !value.trim())
+        return null;
+    const text = value.trim();
+    if (/^\d+$/.test(text)) {
+        const seconds = Number(text);
+        return Number.isFinite(seconds) ? seconds * 1000 : null;
+    }
+    const date = Date.parse(text);
+    return Number.isFinite(date) ? Math.max(0, date - Date.now()) : null;
+}
+/** Inspect only retry metadata; never retain or log the original transport error. */
+function requestRetryDelay(error, attempt) {
+    if (!error || typeof error !== 'object')
+        return null;
+    const failure = error;
+    const response = failure.response && typeof failure.response === 'object'
+        ? failure.response
+        : undefined;
+    if (response) {
+        if (typeof response.status !== 'number' || ![429, 500, 502, 503, 504].includes(response.status))
+            return null;
+    }
+    else if (typeof failure.code !== 'string' ||
+        ![
+            'ECONNRESET',
+            'ETIMEDOUT',
+            'ECONNABORTED',
+            'EAI_AGAIN',
+            'ENOTFOUND',
+            'ERR_NETWORK',
+            'EPIPE',
+            'ECONNREFUSED'
+        ].includes(failure.code))
+        return null;
+    let headerDelay = null;
+    if (response?.headers && typeof response.headers === 'object') {
+        const headers = response.headers;
+        headerDelay = retryAfterMs(typeof headers.get === 'function'
+            ? headers.get('retry-after')
+            : (headers['retry-after'] ?? headers['Retry-After']));
+    }
+    const body = response?.data && typeof response.data === 'object'
+        ? response.data
+        : undefined;
+    const bodyDelay = typeof body?.backoff_ms === 'number' && Number.isFinite(body.backoff_ms) && body.backoff_ms >= 0
+        ? body.backoff_ms
+        : 0;
+    return Math.max(100 * 2 ** attempt, headerDelay ?? 0, bodyDelay);
+}
+async function requestPage(url, apiKey, timeoutMs, deadline) {
+    for (let attempt = 0; attempt < 3; attempt++) {
+        const remainingMs = deadline - Date.now();
+        if (remainingMs <= 0)
+            throw new RevenueCatLookupError();
+        try {
+            return await axios_1.default.get(url.href, {
+                headers: { Authorization: `Bearer ${apiKey}` },
+                timeout: Math.min(timeoutMs, remainingMs),
+                signal: AbortSignal.timeout(remainingMs),
+                maxRedirects: 0,
+                maxContentLength: 1024 * 1024
+            });
+        }
+        catch (error) {
+            const delay = attempt < 2 ? requestRetryDelay(error, attempt) : null;
+            if (delay === null || delay >= deadline - Date.now())
+                throw new RevenueCatLookupError();
+            await new Promise(resolve => setTimeout(resolve, delay));
+        }
+    }
+    throw new RevenueCatLookupError();
+}
+function createRevenueCatClient(options) {
+    const apiKey = options.apiKey?.trim();
+    const projectId = options.projectId?.trim();
+    const timeoutMs = options.timeoutMs ?? 15000;
+    const totalTimeoutMs = options.totalTimeoutMs ?? 15000;
+    const maxPages = options.maxPages ?? 20;
+    if (!apiKey || /[\r\n]/.test(apiKey))
+        throw new Error('Configure the RevenueCat API key');
+    if (!projectId || projectId.length > 255 || !/^[a-zA-Z0-9_-]+$/.test(projectId))
+        throw new Error('Configure a valid RevenueCat project ID');
+    if (!positiveInteger(timeoutMs, 60000) ||
+        !positiveInteger(totalTimeoutMs, 120000) ||
+        !positiveInteger(maxPages, 100))
+        throw new Error('Configure valid RevenueCat request limits');
+    return {
+        async getActiveEntitlements(userId) {
+            if (!validUserId(userId))
+                throw new http_error_1.HttpError('Invalid DGC user ID', 400);
+            const endpoint = new URL(`${revenuecat_1.REVENUECAT_API_V2}/projects/${encodeURIComponent(projectId)}/customers/${encodeURIComponent(userId)}/active_entitlements`);
+            endpoint.searchParams.set('limit', '100');
+            const deadline = Date.now() + totalTimeoutMs;
+            const visited = new Set();
+            const entitlements = [];
+            let url = endpoint;
+            try {
+                while (url) {
+                    const remainingMs = deadline - Date.now();
+                    if (remainingMs <= 0 ||
+                        visited.size >= maxPages ||
+                        url.origin !== endpoint.origin ||
+                        url.pathname !== endpoint.pathname ||
+                        url.username ||
+                        url.password ||
+                        url.hash ||
+                        visited.has(url.href))
+                        throw new RevenueCatLookupError();
+                    visited.add(url.href);
+                    const response = await requestPage(url, apiKey, timeoutMs, deadline);
+                    const page = parsePage(response.data);
+                    entitlements.push(...page.items);
+                    url = page.nextPage ? new URL(page.nextPage, endpoint) : null;
+                }
+                const now = Date.now();
+                if (now >= deadline)
+                    throw new RevenueCatLookupError();
+                return entitlements.filter(item => item.expiresAt === null || item.expiresAt > now);
+            }
+            catch {
+                // Do not attach request/config/cause or log the customer payload.
+                throw new RevenueCatLookupError();
+            }
+        }
+    };
+}
+/** Resolve any eligible entitlement from one customer lookup; never infer Free from API failures. */
+async function verifyCreditGiveawayEntitlement(userId, client, entitlementIds) {
+    const ids = (0, revenuecat_1.createRevenueCatEntitlementIds)(entitlementIds);
+    const active = await client.getActiveEntitlements(userId);
+    const checkedAt = new Date().toISOString();
+    const now = Date.parse(checkedAt);
+    const tiers = [
+        [user_1.UserCollectorType.Elite, ids.elite],
+        [user_1.UserCollectorType.Collector, ids.collector],
+        [user_1.UserCollectorType.Rookie, ids.rookie]
+    ];
+    for (const [collectorType, entitlementId] of tiers) {
+        const match = active.find(item => item.entitlementId === entitlementId && (item.expiresAt === null || item.expiresAt > now));
+        if (match)
+            return { userId, checkedAt, collectorType, ...match };
+    }
+    return null;
+}

package/dist/task.js

@@ -4,6 +4,7 @@ exports.isRetryableCloudTasks = isRetryableCloudTasks;
 exports.createTask = createTask;
 // src/cloud-tasks.ts
 const tasks_1 = require("@google-cloud/tasks");
+const logger_1 = require("./logger");
 const retry_1 = require("./retry");
 const tasksClient = new tasks_1.CloudTasksClient();
 // cloud-tasks errors can be gRPC-style (numeric code) or an Error with code string.
@@ -67,7 +68,11 @@ async function createTask(projectId, region, queueId, data, serviceAccount, audi
         timeoutMs: 15000,
         isRetryable: isRetryableCloudTasks,
         onRetry: (err, attempt, delay) => {
-            console.warn(`createTask retry #${attempt} in ${delay}ms — ${String(err?.message ?? err)}`);
+            (0, logger_1.log)(logger_1.LogLevel.WARNING, 'createTask retry', {
+                attempt,
+                delayMs: delay,
+                error: String(err?.message ?? err)
+            });
         },
         ...opts.retryOptions // allow overrides
     };
@@ -93,11 +98,13 @@ async function createTask(projectId, region, queueId, data, serviceAccount, audi
             if (err?.original?.code === 6 ||
                 err?.code === 6 ||
                 String(err?.original?.code).toUpperCase().includes('ALREADY_EXISTS')) {
-                console.warn('createTask — task already exists, returning existing name', expectedName);
+                (0, logger_1.log)(logger_1.LogLevel.WARNING, 'createTask — task already exists, returning existing name', {
+                    taskName: expectedName
+                });
                 return expectedName;
             }
         }
-        console.error('createTask — final failure after retries', { error: err?.message ?? err });
+        (0, logger_1.log)(logger_1.LogLevel.ERROR, 'createTask — final failure after retries', { error: err?.message ?? err });
         throw err; // rethrow (or return null if you prefer)
     }
 }

package/dist/types/giveaway.d.ts

@@ -1,6 +1,7 @@
 import type { GiveawayStatus, GiveawayCategory, GiveawaySelectionMethod, GiveawayWinnerStatus, GiveawayNotificationKind, GiveawayNotificationAudience, GiveawayNotificationStatus, GiveawayTicketResult, GiveawayAction, GiveawayNotificationChannel } from '../enums/giveaway';
 import type { FbUser } from './user';
 import type { UserCollectorType } from '../enums/user';
+import type { GiveawayCreditEligibilityEvidence } from './revenuecat';
 /** API identities are strings. MongoDB ObjectIds serialize as 24 lowercase hexadecimal characters. */
 export type GiveawayObjectId = string;
 /** New tickets use DGC- followed by twelve uppercase letters or digits. Existing numeric IDs remain readable. */
@@ -16,6 +17,7 @@ export type GiveawaySelection = {
     reason: string;
     selectedBy: string;
     selectedAt: string;
+    creditEligibility?: GiveawayCreditEligibilityEvidence;
 };
 export type GiveawayPrize = {
     _id: GiveawayObjectId;
@@ -78,7 +80,7 @@ export type GiveawayEntry = {
     contactNumber?: string;
     /** Retained only for historical entry records; new entries collect country at claim. */
     country?: string;
-    /** Null only for legacy entries whose exact collector tier was not recorded. */
+    /** Null when the account tier is missing or unsupported; product entries remain eligible. */
     _collectorType: UserCollectorType | null;
     enteredAt: string;
     rulesAcceptedAt: string;
@@ -96,6 +98,7 @@ export type GiveawayWinner = {
     status: GiveawayWinnerStatus;
     userId?: string;
     selection?: GiveawaySelection;
+    creditEligibility?: GiveawayCreditEligibilityEvidence;
     category: GiveawayCategory;
     creditAmount?: number;
     claimDeadline?: string;
@@ -127,6 +130,14 @@ export type GiveawayNotificationJob = {
     /** Stable event key supports replacements without resending a prior event. */
     eventKey?: string;
     audience?: GiveawayNotificationAudience;
+    /** Snapshots keep targeting and expiry stable throughout a broadcast. */
+    category?: GiveawayCategory;
+    expiresAt?: string;
+    dispatchAfter?: string;
+    dispatchGeneration?: number;
+    recipientsQueued?: number;
+    recipientsSkipped?: number;
+    dispatchCompletedAt?: string;
     status: GiveawayNotificationStatus;
     attempts: number;
     error?: string;
@@ -173,6 +184,12 @@ export type GiveawayWinnerRecord = GiveawayWinner & {
 };
 export type GiveawayNotificationRecord = Omit<GiveawayNotificationJob, 'claimToken'> & {
     giveawayTitle: string;
+    /** Queue acceptance counts, not confirmation of device delivery. */
+    deliveryCounts?: {
+        queued: number;
+        skipped: number;
+        pending: number;
+    };
 };
 export type GiveawayOverviewData = {
     days: {
@@ -182,8 +199,9 @@ export type GiveawayOverviewData = {
     liveGiveaways: GiveawaySummary[];
     needsSelection: Giveaway[];
 };
-export type GiveawayUserProfile = Pick<FbUser, 'email' | 'firstName' | 'lastName' | '_collectorType'> & {
+export type GiveawayUserProfile = Pick<FbUser, 'email' | 'firstName' | 'lastName'> & {
     userId: string;
+    _collectorType?: UserCollectorType | null;
 };
 export type GiveawayPhysicalClaim = {
     fullName: string;
@@ -279,6 +297,8 @@ export type GiveawayWinnerPreview = {
 };
 /** Public app response; excludes admin settings, prize values and personal data. */
 export type GiveawayPublic = Pick<Giveaway, '_id' | 'title' | 'description' | 'image' | 'status' | 'startsAt' | 'closesAt' | 'countries' | 'rules' | 'category' | 'creditAmount' | 'deliveryInformation'> & {
+    /** Null permits all authenticated accounts regardless of their stored tier. */
+    eligibleCollectorTypes: UserCollectorType[] | null;
     entryCount: number;
     images: string[];
     prizes: Pick<GiveawayPrize, 'name' | 'quantity'>[];

package/dist/types/index.d.ts

@@ -19,3 +19,5 @@ export * from './user';
 export * from './x-credit';
 export * from './giveaway';
 export * from '../enums/giveaway';
+export * from './revenuecat';
+export * from '../constants/revenuecat';

package/dist/types/index.js

@@ -35,3 +35,5 @@ __exportStar(require("./user"), exports);
 __exportStar(require("./x-credit"), exports);
 __exportStar(require("./giveaway"), exports);
 __exportStar(require("../enums/giveaway"), exports);
+__exportStar(require("./revenuecat"), exports);
+__exportStar(require("../constants/revenuecat"), exports);

package/dist/types/revenuecat.d.ts

@@ -0,0 +1,19 @@
+import type { UserCollectorType } from '../enums/user';
+export type RevenueCatActiveEntitlement = {
+    entitlementId: string;
+    /** RevenueCat uses milliseconds since epoch; null is non-expiring access. */
+    expiresAt: number | null;
+};
+export type RevenueCatEntitlementIds = Readonly<{
+    rookie: string;
+    collector: string;
+    elite: string;
+}>;
+export type RevenueCatClient = {
+    getActiveEntitlements(userId: string): Promise<RevenueCatActiveEntitlement[]>;
+};
+export type GiveawayCreditEligibilityEvidence = RevenueCatActiveEntitlement & {
+    userId: string;
+    checkedAt: string;
+    collectorType: UserCollectorType.Rookie | UserCollectorType.Collector | UserCollectorType.Elite;
+};

package/dist/types/revenuecat.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dgc-core",
-  "version": "2.0.5",
+  "version": "2.0.8",
   "description": "Shared DGC contracts, business rules and server utilities",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/tw/utils.d.ts

@@ -1 +0,0 @@
-export declare function isValidWebhookSignature(secret: string, body: string, signature: string): boolean;

package/dist/tw/utils.js

@@ -1,19 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidWebhookSignature = isValidWebhookSignature;
-const crypto_1 = __importDefault(require("crypto"));
-const generateSignature = (body, secret) => {
-    return crypto_1.default.createHmac('sha256', secret).update(body).digest('hex');
-};
-function isValidWebhookSignature(secret, body, signature) {
-    const expectedSignature = generateSignature(body, secret);
-    const expectedBuffer = Buffer.from(expectedSignature);
-    const signatureBuffer = Buffer.from(signature);
-    if (expectedBuffer.length !== signatureBuffer.length) {
-        return false;
-    }
-    return crypto_1.default.timingSafeEqual(expectedBuffer, signatureBuffer);
-}

package/dist/tw/wallet.d.ts

@@ -1 +0,0 @@
-export declare function pregenerateInAppWallet(twClientId: string, twSecretKey: string, email: string): Promise<string | null>;

package/dist/tw/wallet.js

@@ -1,57 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pregenerateInAppWallet = pregenerateInAppWallet;
-// src/tw/wallet.ts
-const axios_1 = __importDefault(require("axios"));
-const retry_1 = require("../retry");
-async function pregenerateInAppWallet(twClientId, twSecretKey, email) {
-    if (!twClientId || !twSecretKey || !email) {
-        console.error('Missing client id or secret or email');
-        return null;
-    }
-    const doRequest = async () => {
-        const res = await axios_1.default.post('https://in-app-wallet.thirdweb.com/api/v1/pregenerate', { strategy: 'email', email }, {
-            headers: {
-                'Content-Type': 'application/json',
-                'x-client-id': twClientId,
-                'x-secret-key': twSecretKey
-            },
-            timeout: 10000
-        });
-        const wallet = res.data?.wallet;
-        if (!wallet || !wallet.address) {
-            // server returned 2xx but unexpected shape — don't retry, treat as final failure
-            console.error('Invalid wallet response shape', { status: res.status, data: res.data });
-            throw new Error('Invalid wallet response');
-        }
-        return wallet.address;
-    };
-    const opts = {
-        retries: 3,
-        baseDelayMs: 300,
-        maxDelayMs: 2000,
-        timeoutMs: 15000,
-        isRetryable: retry_1.isRetryableAxios,
-        onRetry: (err, attempt, delay) => {
-            console.warn(`pregenerateInAppWallet: retry #${attempt} in ${delay}ms — ${String(err?.message)}`);
-        }
-    };
-    try {
-        const address = await (0, retry_1.retry)(() => doRequest(), opts);
-        return address;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    }
-    catch (err) {
-        // final failure after retries
-        console.error('pregenerateInAppWallet: final failure', {
-            message: err?.message,
-            // include axios response data when possible
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            responseData: err?.response?.data ?? err?.cause ?? err.original ?? null
-        });
-        return null;
-    }
-}