@lyxa.ai/core 1.4.162 → 1.4.164

package/dist/libraries/notification/lyxa-fcm-sender.js

@@ -0,0 +1,104 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var LyxaFcmSender_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LyxaFcmSender = void 0;
+const typedi_1 = require("typedi");
+const firebase_fcm_service_1 = require("./firebase-fcm.service");
+const firebase_message_builder_1 = require("./firebase-message.builder");
+const __1 = require("../..");
+let LyxaFcmSender = class LyxaFcmSender {
+    static { LyxaFcmSender_1 = this; }
+    fcmService;
+    builder;
+    static MAX_BATCH = 500;
+    constructor(fcmService, builder) {
+        this.fcmService = fcmService;
+        this.builder = builder;
+    }
+    async sendMessages(project, type, tokens, payload) {
+        if (!tokens.length)
+            return [];
+        const messages = this.buildMultiCastMessages(type, tokens, payload);
+        return await this.sendToAllTokens(project, type, payload, messages);
+    }
+    buildMultiCastMessages(type, tokens, payload) {
+        const tokenChunks = this.chunkArray(tokens, LyxaFcmSender_1.MAX_BATCH);
+        return tokenChunks.map(chunk => this.builder.buildMessage(type, payload, chunk));
+    }
+    chunkArray(arr, size) {
+        const chunks = [];
+        for (let i = 0; i < arr.length; i += size) {
+            chunks.push(arr.slice(i, i + size));
+        }
+        return chunks;
+    }
+    async sendToAllTokens(project, type, payload, messages) {
+        const logger = (0, __1.getLibraries)().getLoggerKit();
+        const failedTokens = [];
+        await Promise.all(messages.map(async (message) => {
+            let logData;
+            try {
+                const result = await this.fcmService.sendMessage(project, message);
+                result.responses.forEach((r, i) => {
+                    if (!r.success)
+                        failedTokens.push(message.tokens[i]);
+                });
+                logData = {
+                    timestamp: new Date().toISOString(),
+                    project,
+                    type,
+                    consoleNotification: type === firebase_message_builder_1.MultiMessageType.CONSOLE,
+                    groupTokens: message.tokens,
+                    groupPayload: payload,
+                    message,
+                    response: {
+                        successCount: result.successCount,
+                        failureCount: result.failureCount,
+                        responses: result.responses.map((r, i) => ({
+                            token: message.tokens[i],
+                            success: r.success,
+                            ...(r.error && { errorCode: r.error.code, errorMessage: r.error.message }),
+                        })),
+                    },
+                };
+                logger.info('Called Firebase function sendEachForMulticast', {
+                    tag: 'notification.attempted.new',
+                    data: logData,
+                });
+            }
+            catch (err) {
+                failedTokens.push(...message.tokens);
+                logData = {
+                    timestamp: new Date().toISOString(),
+                    project,
+                    type,
+                    consoleNotification: type === firebase_message_builder_1.MultiMessageType.CONSOLE,
+                    groupTokens: message.tokens,
+                    groupPayload: payload,
+                    message,
+                };
+                logger.error('Called Firebase function sendEachForMulticast', err, {
+                    tag: 'notification.attempted.new',
+                    data: logData,
+                });
+            }
+        }));
+        return failedTokens;
+    }
+};
+exports.LyxaFcmSender = LyxaFcmSender;
+exports.LyxaFcmSender = LyxaFcmSender = LyxaFcmSender_1 = __decorate([
+    (0, typedi_1.Service)(),
+    __metadata("design:paramtypes", [firebase_fcm_service_1.FirebaseFcmService,
+        firebase_message_builder_1.FirebaseMessageBuilderFactory])
+], LyxaFcmSender);
+//# sourceMappingURL=lyxa-fcm-sender.js.map

package/dist/libraries/notification/lyxa-fcm-sender.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lyxa-fcm-sender.js","sourceRoot":"/","sources":["libraries/notification/lyxa-fcm-sender.ts"],"names":[],"mappings":"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","sourcesContent":["import { Service } from 'typedi';\nimport { FirebaseFcmService } from './firebase-fcm.service';\nimport { FirebaseMessageBuilderFactory, MultiMessageType } from './firebase-message.builder';\nimport { messaging } from 'firebase-admin';\nimport { FCMNotificationPayload, FcmProject } from './lyxa-fcm.service';\nimport { getLibraries } from '../..';\n\n@Service()\nexport class LyxaFcmSender {\n\tpublic static readonly MAX_BATCH = 500;\n\n\tconstructor(\n\t\tprivate readonly fcmService: FirebaseFcmService,\n\t\tprivate readonly builder: FirebaseMessageBuilderFactory\n\t) {}\n\n\tpublic async sendMessages(\n\t\tproject: FcmProject,\n\t\ttype: MultiMessageType,\n\t\ttokens: string[],\n\t\tpayload: FCMNotificationPayload\n\t): Promise<string[]> {\n\t\tif (!tokens.length) return [];\n\t\tconst messages = this.buildMultiCastMessages(type, tokens, payload);\n\t\treturn await this.sendToAllTokens(project, type, payload, messages);\n\t}\n\n\tprivate buildMultiCastMessages(\n\t\ttype: MultiMessageType,\n\t\ttokens: string[],\n\t\tpayload: FCMNotificationPayload\n\t): messaging.MulticastMessage[] {\n\t\tconst tokenChunks = this.chunkArray(tokens, LyxaFcmSender.MAX_BATCH);\n\t\treturn tokenChunks.map(chunk => this.builder.buildMessage(type, payload, chunk));\n\t}\n\n\tprivate chunkArray<T>(arr: T[], size: number): T[][] {\n\t\tconst chunks: T[][] = [];\n\t\tfor (let i = 0; i < arr.length; i += size) {\n\t\t\tchunks.push(arr.slice(i, i + size));\n\t\t}\n\t\treturn chunks;\n\t}\n\n\tprivate async sendToAllTokens(\n\t\tproject: FcmProject,\n\t\ttype: MultiMessageType,\n\t\tpayload: FCMNotificationPayload,\n\t\tmessages: messaging.MulticastMessage[]\n\t): Promise<string[]> {\n\t\tconst logger = getLibraries().getLoggerKit();\n\t\tconst failedTokens: string[] = [];\n\n\t\tawait Promise.all(\n\t\t\tmessages.map(async message => {\n\t\t\t\tlet logData: Record<string, unknown>;\n\n\t\t\t\ttry {\n\t\t\t\t\tconst result = await this.fcmService.sendMessage(project, message);\n\t\t\t\t\tresult.responses.forEach((r, i) => {\n\t\t\t\t\t\tif (!r.success) failedTokens.push(message.tokens[i]);\n\t\t\t\t\t});\n\n\t\t\t\t\tlogData = {\n\t\t\t\t\t\ttimestamp: new Date().toISOString(),\n\t\t\t\t\t\tproject,\n\t\t\t\t\t\ttype,\n\t\t\t\t\t\tconsoleNotification: type === MultiMessageType.CONSOLE,\n\t\t\t\t\t\tgroupTokens: message.tokens,\n\t\t\t\t\t\tgroupPayload: payload,\n\t\t\t\t\t\tmessage,\n\t\t\t\t\t\tresponse: {\n\t\t\t\t\t\t\tsuccessCount: result.successCount,\n\t\t\t\t\t\t\tfailureCount: result.failureCount,\n\t\t\t\t\t\t\tresponses: result.responses.map((r, i) => ({\n\t\t\t\t\t\t\t\ttoken: message.tokens[i],\n\t\t\t\t\t\t\t\tsuccess: r.success,\n\t\t\t\t\t\t\t\t...(r.error && { errorCode: r.error.code, errorMessage: r.error.message }),\n\t\t\t\t\t\t\t})),\n\t\t\t\t\t\t},\n\t\t\t\t\t};\n\t\t\t\t\tlogger.info('Called Firebase function sendEachForMulticast', {\n\t\t\t\t\t\ttag: 'notification.attempted.new',\n\t\t\t\t\t\tdata: logData,\n\t\t\t\t\t});\n\t\t\t\t} catch (err) {\n\t\t\t\t\tfailedTokens.push(...message.tokens);\n\n\t\t\t\t\tlogData = {\n\t\t\t\t\t\ttimestamp: new Date().toISOString(),\n\t\t\t\t\t\tproject,\n\t\t\t\t\t\ttype,\n\t\t\t\t\t\tconsoleNotification: type === MultiMessageType.CONSOLE,\n\t\t\t\t\t\tgroupTokens: message.tokens,\n\t\t\t\t\t\tgroupPayload: payload,\n\t\t\t\t\t\tmessage,\n\t\t\t\t\t};\n\t\t\t\t\tlogger.error('Called Firebase function sendEachForMulticast', err, {\n\t\t\t\t\t\ttag: 'notification.attempted.new',\n\t\t\t\t\t\tdata: logData,\n\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t})\n\t\t);\n\n\t\treturn failedTokens;\n\t}\n}\n"]}

package/dist/libraries/notification/lyxa-fcm.service.d.ts

@@ -0,0 +1,42 @@
+import { AppPlatform, NotificationAccountType } from '../../utilities/enum';
+import { LyxaFcmSender } from './lyxa-fcm-sender';
+export declare enum FcmProject {
+    USER = "fcm.service.user",
+    RIDER = "fcm.service.rider",
+    SHOP = "fcm.service.shop",
+    CPANEL = "fcm.service.cpanel"
+}
+export interface FCMNotificationPayload {
+    title?: string;
+    body?: string;
+    data?: Record<string, string>;
+    sound?: string;
+    invisible?: boolean;
+}
+export interface NotificationTokenTarget {
+    token: string;
+    entityType: NotificationAccountType;
+    deviceId?: string;
+    entityId?: string;
+    platform?: AppPlatform;
+    appVersion?: string;
+}
+export type LyxaTokens = {
+    oldTokens: string[];
+    newTokens: string[];
+    consoleTokens: string[];
+};
+export declare class LyxaFcmService {
+    private readonly lyxaFcmSender;
+    constructor(lyxaFcmSender: LyxaFcmSender);
+    private deduplicateTargets;
+    private separateTokens;
+    static getProjectForAccountType(accountType: NotificationAccountType): FcmProject;
+    sendToTokens(project: FcmProject, payload: FCMNotificationPayload, targets: NotificationTokenTarget[]): Promise<{
+        failedTokens: string[];
+    }>;
+    private isNotifiableEntityType;
+    private isConsoleEntityType;
+    private compareVersions;
+    private shouldUseNewStructure;
+}

package/dist/libraries/notification/lyxa-fcm.service.js

@@ -0,0 +1,174 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LyxaFcmService = exports.FcmProject = void 0;
+const typedi_1 = require("typedi");
+const firebase_message_builder_1 = require("./firebase-message.builder");
+const enum_1 = require("../../utilities/enum");
+const lyxa_fcm_sender_1 = require("./lyxa-fcm-sender");
+const __1 = require("../..");
+var FcmProject;
+(function (FcmProject) {
+    FcmProject["USER"] = "fcm.service.user";
+    FcmProject["RIDER"] = "fcm.service.rider";
+    FcmProject["SHOP"] = "fcm.service.shop";
+    FcmProject["CPANEL"] = "fcm.service.cpanel";
+})(FcmProject || (exports.FcmProject = FcmProject = {}));
+const NotificationVersionRules = {
+    [enum_1.NotificationAccountType.RIDER]: {
+        [enum_1.AppPlatform.IOS]: '2.0.3',
+        [enum_1.AppPlatform.ANDROID]: '2.0.4',
+    },
+    [enum_1.NotificationAccountType.USER]: {
+        [enum_1.AppPlatform.IOS]: '2.0.3',
+        [enum_1.AppPlatform.ANDROID]: '2.0.3',
+    },
+    [enum_1.NotificationAccountType.SHOP]: {
+        [enum_1.AppPlatform.IOS]: '2.0.3',
+        [enum_1.AppPlatform.ANDROID]: '2.0.3',
+    },
+    [enum_1.NotificationAccountType.PROFESSIONAL]: {
+        [enum_1.AppPlatform.IOS]: '2.0.3',
+        [enum_1.AppPlatform.ANDROID]: '2.0.3',
+    },
+};
+let LyxaFcmService = class LyxaFcmService {
+    lyxaFcmSender;
+    constructor(lyxaFcmSender) {
+        this.lyxaFcmSender = lyxaFcmSender;
+    }
+    deduplicateTargets(targets) {
+        const sorted = targets.slice().sort((a, b) => {
+            if (a.token !== b.token)
+                return a.token < b.token ? -1 : 1;
+            if (!a.appVersion && !b.appVersion)
+                return 0;
+            if (!a.appVersion)
+                return 1;
+            if (!b.appVersion)
+                return -1;
+            return this.compareVersions(b.appVersion, a.appVersion);
+        });
+        return sorted.filter((t, i) => i === 0 || t.token !== sorted[i - 1].token);
+    }
+    separateTokens(targets) {
+        const oldTokens = [];
+        const newTokens = [];
+        const consoleTokens = [];
+        for (const t of targets) {
+            if (this.isConsoleEntityType(t.entityType)) {
+                consoleTokens.push(t.token);
+                continue;
+            }
+            const useNew = this.shouldUseNewStructure(t.entityType, t.platform, t.appVersion);
+            if (useNew)
+                newTokens.push(t.token);
+            else
+                oldTokens.push(t.token);
+        }
+        if (true) {
+            (0, __1.getLibraries)()
+                .getLoggerKit()
+                .debug('FCM token separation', {
+                tag: 'notification.token.separated',
+                data: {
+                    totalTargets: targets.length,
+                    buckets: {
+                        old: oldTokens.length,
+                        new: newTokens.length,
+                        console: consoleTokens.length,
+                    },
+                    targets: targets.map(t => ({
+                        entityId: t.entityId,
+                        entityType: t.entityType,
+                        platform: t.platform,
+                        appVersion: t.appVersion,
+                        bucket: this.isConsoleEntityType(t.entityType)
+                            ? 'console'
+                            : this.shouldUseNewStructure(t.entityType, t.platform, t.appVersion)
+                                ? 'new'
+                                : 'old',
+                    })),
+                },
+            });
+        }
+        return {
+            oldTokens,
+            newTokens,
+            consoleTokens,
+        };
+    }
+    static getProjectForAccountType(accountType) {
+        switch (accountType) {
+            case enum_1.NotificationAccountType.USER:
+                return FcmProject.USER;
+            case enum_1.NotificationAccountType.SHOP:
+            case enum_1.NotificationAccountType.PROFESSIONAL:
+                return FcmProject.SHOP;
+            case enum_1.NotificationAccountType.RIDER:
+                return FcmProject.RIDER;
+            default:
+                return FcmProject.USER;
+        }
+    }
+    async sendToTokens(project, payload, targets) {
+        if (!targets.length)
+            return { failedTokens: [] };
+        console.log('targets', targets);
+        const cleanedTargets = this.deduplicateTargets(targets);
+        console.log('cleanedTargets', cleanedTargets);
+        const tokens = this.separateTokens(cleanedTargets);
+        const results = await Promise.all([
+            this.lyxaFcmSender.sendMessages(project, firebase_message_builder_1.MultiMessageType.OLD, tokens.oldTokens, payload),
+            this.lyxaFcmSender.sendMessages(project, firebase_message_builder_1.MultiMessageType.DEFAULT, tokens.newTokens, payload),
+            this.lyxaFcmSender.sendMessages(FcmProject.CPANEL, firebase_message_builder_1.MultiMessageType.CONSOLE, tokens.consoleTokens, payload),
+        ]);
+        return { failedTokens: results.flat() };
+    }
+    isNotifiableEntityType(type) {
+        return (type === enum_1.NotificationAccountType.USER ||
+            type === enum_1.NotificationAccountType.RIDER ||
+            type === enum_1.NotificationAccountType.SHOP ||
+            type === enum_1.NotificationAccountType.PROFESSIONAL);
+    }
+    isConsoleEntityType(type) {
+        return (type === enum_1.NotificationAccountType.SHOP_CONSOLE ||
+            type === enum_1.NotificationAccountType.PARENT ||
+            type === enum_1.NotificationAccountType.VENDOR ||
+            type === enum_1.NotificationAccountType.VENDOR_PARENT);
+    }
+    compareVersions(v1, v2) {
+        const a = v1.split('.').map(Number);
+        const b = v2.split('.').map(Number);
+        for (let i = 0; i < Math.max(a.length, b.length); i++) {
+            const diff = (a[i] || 0) - (b[i] || 0);
+            if (diff !== 0)
+                return diff;
+        }
+        return 0;
+    }
+    shouldUseNewStructure(entityType, platform, version) {
+        if (!this.isNotifiableEntityType(entityType))
+            return false;
+        if (!platform || !version)
+            return false;
+        const minVersion = NotificationVersionRules?.[entityType]?.[platform];
+        if (!minVersion)
+            return false;
+        return this.compareVersions(version, minVersion) >= 0;
+    }
+};
+exports.LyxaFcmService = LyxaFcmService;
+exports.LyxaFcmService = LyxaFcmService = __decorate([
+    (0, typedi_1.Service)(),
+    __metadata("design:paramtypes", [lyxa_fcm_sender_1.LyxaFcmSender])
+], LyxaFcmService);
+//# sourceMappingURL=lyxa-fcm.service.js.map

package/dist/libraries/notification/lyxa-fcm.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lyxa-fcm.service.js","sourceRoot":"/","sources":["libraries/notification/lyxa-fcm.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Service } from 'typedi';\nimport { MultiMessageType } from './firebase-message.builder';\nimport { AppPlatform, NotificationAccountType } from '../../utilities/enum';\nimport { LyxaFcmSender } from './lyxa-fcm-sender';\nimport { getLibraries } from '../..';\n\nexport enum FcmProject {\n\tUSER = 'fcm.service.user',\n\tRIDER = 'fcm.service.rider',\n\tSHOP = 'fcm.service.shop',\n\tCPANEL = 'fcm.service.cpanel',\n}\n\nexport interface FCMNotificationPayload {\n\ttitle?: string;\n\tbody?: string;\n\tdata?: Record<string, string>;\n\tsound?: string;\n\tinvisible?: boolean;\n}\n\nexport interface NotificationTokenTarget {\n\ttoken: string;\n\tentityType: NotificationAccountType;\n\tdeviceId?: string;\n\tentityId?: string;\n\tplatform?: AppPlatform;\n\tappVersion?: string;\n}\n\ntype NotifiableEntityType =\n\t| NotificationAccountType.USER\n\t| NotificationAccountType.SHOP\n\t| NotificationAccountType.RIDER\n\t| NotificationAccountType.PROFESSIONAL;\n\nconst NotificationVersionRules: Record<NotifiableEntityType, Partial<Record<AppPlatform, string>>> = {\n\t[NotificationAccountType.RIDER]: {\n\t\t[AppPlatform.IOS]: '2.0.3',\n\t\t[AppPlatform.ANDROID]: '2.0.4',\n\t},\n\n\t[NotificationAccountType.USER]: {\n\t\t[AppPlatform.IOS]: '2.0.3',\n\t\t[AppPlatform.ANDROID]: '2.0.3',\n\t},\n\n\t[NotificationAccountType.SHOP]: {\n\t\t[AppPlatform.IOS]: '2.0.3',\n\t\t[AppPlatform.ANDROID]: '2.0.3',\n\t},\n\n\t[NotificationAccountType.PROFESSIONAL]: {\n\t\t[AppPlatform.IOS]: '2.0.3',\n\t\t[AppPlatform.ANDROID]: '2.0.3',\n\t},\n};\n\nexport type LyxaTokens = {\n\toldTokens: string[];\n\tnewTokens: string[];\n\tconsoleTokens: string[];\n};\n\n@Service()\nexport class LyxaFcmService {\n\tconstructor(private readonly lyxaFcmSender: LyxaFcmSender) {}\n\n\tprivate deduplicateTargets(targets: NotificationTokenTarget[]): NotificationTokenTarget[] {\n\t\tconst sorted = targets.slice().sort((a, b) => {\n\t\t\tif (a.token !== b.token) return a.token < b.token ? -1 : 1;\n\t\t\tif (!a.appVersion && !b.appVersion) return 0;\n\t\t\tif (!a.appVersion) return 1;\n\t\t\tif (!b.appVersion) return -1;\n\t\t\treturn this.compareVersions(b.appVersion, a.appVersion);\n\t\t});\n\t\treturn sorted.filter((t, i) => i === 0 || t.token !== sorted[i - 1].token);\n\t}\n\n\tprivate separateTokens(targets: NotificationTokenTarget[]): LyxaTokens {\n\t\tconst oldTokens: string[] = [];\n\t\tconst newTokens: string[] = [];\n\t\tconst consoleTokens: string[] = [];\n\n\t\tfor (const t of targets) {\n\t\t\tif (this.isConsoleEntityType(t.entityType)) {\n\t\t\t\tconsoleTokens.push(t.token);\n\t\t\t\tcontinue;\n\t\t\t}\n\n\t\t\tconst useNew = this.shouldUseNewStructure(t.entityType, t.platform, t.appVersion);\n\n\t\t\tif (useNew) newTokens.push(t.token);\n\t\t\telse oldTokens.push(t.token);\n\t\t}\n\n\t\tif (true) {\n\t\t\tgetLibraries()\n\t\t\t\t.getLoggerKit()\n\t\t\t\t.debug('FCM token separation', {\n\t\t\t\t\ttag: 'notification.token.separated',\n\t\t\t\t\tdata: {\n\t\t\t\t\t\ttotalTargets: targets.length,\n\t\t\t\t\t\tbuckets: {\n\t\t\t\t\t\t\told: oldTokens.length,\n\t\t\t\t\t\t\tnew: newTokens.length,\n\t\t\t\t\t\t\tconsole: consoleTokens.length,\n\t\t\t\t\t\t},\n\t\t\t\t\t\ttargets: targets.map(t => ({\n\t\t\t\t\t\t\tentityId: t.entityId,\n\t\t\t\t\t\t\tentityType: t.entityType,\n\t\t\t\t\t\t\tplatform: t.platform,\n\t\t\t\t\t\t\tappVersion: t.appVersion,\n\t\t\t\t\t\t\tbucket: this.isConsoleEntityType(t.entityType)\n\t\t\t\t\t\t\t\t? 'console'\n\t\t\t\t\t\t\t\t: this.shouldUseNewStructure(t.entityType, t.platform, t.appVersion)\n\t\t\t\t\t\t\t\t\t? 'new'\n\t\t\t\t\t\t\t\t\t: 'old',\n\t\t\t\t\t\t})),\n\t\t\t\t\t},\n\t\t\t\t});\n\t\t}\n\n\t\treturn {\n\t\t\toldTokens,\n\t\t\tnewTokens,\n\t\t\tconsoleTokens,\n\t\t};\n\t}\n\n\tpublic static getProjectForAccountType(accountType: NotificationAccountType): FcmProject {\n\t\tswitch (accountType) {\n\t\t\tcase NotificationAccountType.USER:\n\t\t\t\treturn FcmProject.USER;\n\t\t\tcase NotificationAccountType.SHOP:\n\t\t\tcase NotificationAccountType.PROFESSIONAL:\n\t\t\t\treturn FcmProject.SHOP;\n\t\t\tcase NotificationAccountType.RIDER:\n\t\t\t\treturn FcmProject.RIDER;\n\t\t\tdefault:\n\t\t\t\treturn FcmProject.USER;\n\t\t}\n\t}\n\n\tpublic async sendToTokens(\n\t\tproject: FcmProject,\n\t\tpayload: FCMNotificationPayload,\n\t\ttargets: NotificationTokenTarget[]\n\t): Promise<{ failedTokens: string[] }> {\n\t\tif (!targets.length) return { failedTokens: [] };\n\t\tconsole.log('targets', targets);\n\t\tconst cleanedTargets = this.deduplicateTargets(targets);\n\t\tconsole.log('cleanedTargets', cleanedTargets);\n\t\tconst tokens = this.separateTokens(cleanedTargets);\n\n\t\tconst results = await Promise.all([\n\t\t\tthis.lyxaFcmSender.sendMessages(project, MultiMessageType.OLD, tokens.oldTokens, payload),\n\t\t\tthis.lyxaFcmSender.sendMessages(project, MultiMessageType.DEFAULT, tokens.newTokens, payload),\n\t\t\tthis.lyxaFcmSender.sendMessages(\n\t\t\t\tFcmProject.CPANEL,\n\t\t\t\tMultiMessageType.CONSOLE,\n\t\t\t\ttokens.consoleTokens,\n\t\t\t\tpayload\n\t\t\t),\n\t\t]);\n\n\t\treturn { failedTokens: results.flat() };\n\t}\n\n\tprivate isNotifiableEntityType(type: NotificationAccountType): type is NotifiableEntityType {\n\t\treturn (\n\t\t\ttype === NotificationAccountType.USER ||\n\t\t\ttype === NotificationAccountType.RIDER ||\n\t\t\ttype === NotificationAccountType.SHOP ||\n\t\t\ttype === NotificationAccountType.PROFESSIONAL\n\t\t);\n\t}\n\n\tprivate isConsoleEntityType(type: NotificationAccountType): type is NotifiableEntityType {\n\t\treturn (\n\t\t\ttype === NotificationAccountType.SHOP_CONSOLE ||\n\t\t\ttype === NotificationAccountType.PARENT ||\n\t\t\ttype === NotificationAccountType.VENDOR ||\n\t\t\ttype === NotificationAccountType.VENDOR_PARENT\n\t\t);\n\t}\n\n\tprivate compareVersions(v1: string, v2: string): number {\n\t\tconst a = v1.split('.').map(Number);\n\t\tconst b = v2.split('.').map(Number);\n\n\t\tfor (let i = 0; i < Math.max(a.length, b.length); i++) {\n\t\t\tconst diff = (a[i] || 0) - (b[i] || 0);\n\t\t\tif (diff !== 0) return diff;\n\t\t}\n\n\t\treturn 0;\n\t}\n\n\tprivate shouldUseNewStructure(\n\t\tentityType: NotificationAccountType,\n\t\tplatform?: AppPlatform,\n\t\tversion?: string\n\t): boolean {\n\t\tif (!this.isNotifiableEntityType(entityType)) return false;\n\n\t\tif (!platform || !version) return false;\n\n\t\tconst minVersion = NotificationVersionRules?.[entityType]?.[platform];\n\n\t\tif (!minVersion) return false;\n\n\t\treturn this.compareVersions(version, minVersion) >= 0;\n\t}\n}\n"]}

package/dist/libraries/trpc/middlewares/auth.d.ts

@@ -5,9 +5,9 @@ interface AuthOptions {
     autoRefresh?: boolean;
 }
 export declare function createAuthenticatedProcedure(options: AuthOptions): import("@trpc/server").TRPCProcedureBuilder<import("../context").LyxaHTTPContext, object, {
-    req: import("http").IncomingMessage;
     res: import("http").ServerResponse<import("http").IncomingMessage>;
     tokenType: TokenType | undefined;
+    req: import("http").IncomingMessage;
     requestId: string | undefined;
     entity: import("../context").EntityContext | undefined;
     usedRefreshToken: boolean | undefined;

package/dist/libraries/trpc/middlewares/createRoleProtectedProcedure.d.ts

@@ -4,9 +4,9 @@ interface RoleProtectedOptions {
     allowedRoles: string[];
 }
 export declare function createRoleProtectedProcedure(options: RoleProtectedOptions): import("@trpc/server").TRPCProcedureBuilder<import("../context").LyxaHTTPContext, object, {
-    req: import("http").IncomingMessage;
     res: import("http").ServerResponse<import("http").IncomingMessage>;
     tokenType: import("../../auth").TokenType | undefined;
+    req: import("http").IncomingMessage;
     requestId: string | undefined;
     entity: import("../context").EntityContext | undefined;
     usedRefreshToken: boolean | undefined;

package/dist/libraries/trpc/middlewares/phone-verified.d.ts

@@ -3,9 +3,9 @@ interface PhoneVerifiedOptions {
     entityTypes: AuthEntityType[];
 }
 export declare function createPhoneVerifiedProcedure(options: PhoneVerifiedOptions): import("@trpc/server").TRPCProcedureBuilder<import("../context").LyxaHTTPContext, object, {
-    req: import("http").IncomingMessage;
     res: import("http").ServerResponse<import("http").IncomingMessage>;
     tokenType: import("../../auth").TokenType | undefined;
+    req: import("http").IncomingMessage;
     requestId: string | undefined;
     entity: import("../context").EntityContext | undefined;
     usedRefreshToken: boolean | undefined;

package/dist/libraries/trpc/middlewares/publicUserDecoder.d.ts

@@ -5,9 +5,9 @@ interface AuthOptions {
     autoRefresh?: boolean;
 }
 export declare function publicUserDecoder(options: AuthOptions): import("@trpc/server").TRPCProcedureBuilder<import("../context").LyxaHTTPContext, object, {
-    req: import("http").IncomingMessage;
     res: import("http").ServerResponse<import("http").IncomingMessage>;
     tokenType: TokenType | undefined;
+    req: import("http").IncomingMessage;
     requestId: string | undefined;
     entity: import("../context").EntityContext | undefined;
     usedRefreshToken: boolean | undefined;

package/dist/types/README.md

@@ -22,7 +22,7 @@ Perfect for sharing types between frontend and backend applications.
 
 ## Version
 
-Version: 1.4.162
+Version: 1.4.164
 
 ## Dependencies
 

package/dist/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lyxa.ai/types",
-  "version": "1.4.162",
+  "version": "1.4.164",
   "description": "Lyxa type definitions and validation schemas for both frontend and backend",
   "author": "elie <42282499+Internalizable@users.noreply.github.com>",
   "license": "MIT",

package/dist/types/utilities/validation/common-validation.d.ts

@@ -26,8 +26,8 @@ export declare const FilterSchema: z.ZodOptional<z.ZodObject<{
         searchFields?: string[] | undefined;
     } | undefined;
     sort?: Record<string, 1 | -1> | undefined;
-    populate?: any;
     select?: Record<string, 0 | 1> | undefined;
+    populate?: any;
     query?: Record<string, any> | undefined;
 }, {
     search?: {
@@ -36,8 +36,8 @@ export declare const FilterSchema: z.ZodOptional<z.ZodObject<{
     } | undefined;
     sort?: Record<string, 1 | -1> | undefined;
     size?: number | undefined;
-    populate?: any;
     select?: Record<string, 0 | 1> | undefined;
+    populate?: any;
     query?: Record<string, any> | undefined;
     page?: number | undefined;
 }>>;
@@ -736,12 +736,12 @@ export declare const GetByIdInputSchema: z.ZodObject<{
     populate: z.ZodOptional<z.ZodUnion<[z.ZodType<any, z.ZodTypeDef, any>, z.ZodArray<z.ZodType<any, z.ZodTypeDef, any>, "many">]>>;
 }, "strip", z.ZodTypeAny, {
     _id: import("mongoose").Types.ObjectId;
-    populate?: any;
     select?: Record<string, 0 | 1> | undefined;
+    populate?: any;
 }, {
     _id: string | import("mongoose").Types.ObjectId;
-    populate?: any;
     select?: Record<string, 0 | 1> | undefined;
+    populate?: any;
 }>;
 export type GetByIdInputDTO = DTO<typeof GetByIdInputSchema>;
 export declare const GetProductByIdInputSchema: z.ZodObject<{
@@ -754,12 +754,12 @@ export declare const GetProductByIdInputSchema: z.ZodObject<{
     _id: import("mongoose").Types.ObjectId;
     withAttributeHiddenItems: boolean;
     withAddonsHiddenItems: boolean;
-    populate?: any;
     select?: Record<string, 0 | 1> | undefined;
+    populate?: any;
 }, {
     _id: string | import("mongoose").Types.ObjectId;
-    populate?: any;
     select?: Record<string, 0 | 1> | undefined;
+    populate?: any;
     withAttributeHiddenItems?: boolean | undefined;
     withAddonsHiddenItems?: boolean | undefined;
 }>;
@@ -773,15 +773,15 @@ export declare const GetOrderByIdInputSchema: z.ZodObject<{
     userOrderCompletionScope: z.ZodOptional<z.ZodNativeEnum<typeof UserOrderCompletionScope>>;
 }, "strip", z.ZodTypeAny, {
     _id: import("mongoose").Types.ObjectId;
-    populate?: any;
     select?: Record<string, 0 | 1> | undefined;
+    populate?: any;
     groupByCategories?: boolean | undefined;
     getParentCategory?: boolean | undefined;
     userOrderCompletionScope?: UserOrderCompletionScope | undefined;
 }, {
     _id: string | import("mongoose").Types.ObjectId;
-    populate?: any;
     select?: Record<string, 0 | 1> | undefined;
+    populate?: any;
     groupByCategories?: boolean | undefined;
     getParentCategory?: boolean | undefined;
     userOrderCompletionScope?: UserOrderCompletionScope | undefined;
@@ -791,11 +791,11 @@ export declare const GetByTokenInputSchema: z.ZodOptional<z.ZodObject<{
     select: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodLiteral<0>, z.ZodLiteral<1>]>>>;
     populate: z.ZodOptional<z.ZodUnion<[z.ZodType<any, z.ZodTypeDef, any>, z.ZodArray<z.ZodType<any, z.ZodTypeDef, any>, "many">]>>;
 }, "strip", z.ZodTypeAny, {
-    populate?: any;
     select?: Record<string, 0 | 1> | undefined;
-}, {
     populate?: any;
+}, {
     select?: Record<string, 0 | 1> | undefined;
+    populate?: any;
 }>>;
 export type GetByTokenInputDTO = DTO<typeof GetByTokenInputSchema>;
 export declare const GetOneQuerySchema: z.ZodObject<{
@@ -803,12 +803,12 @@ export declare const GetOneQuerySchema: z.ZodObject<{
     select: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodLiteral<0>, z.ZodLiteral<1>]>>>;
     populate: z.ZodOptional<z.ZodUnion<[z.ZodType<any, z.ZodTypeDef, any>, z.ZodArray<z.ZodType<any, z.ZodTypeDef, any>, "many">]>>;
 }, "strip", z.ZodTypeAny, {
-    populate?: any;
     select?: Record<string, 0 | 1> | undefined;
+    populate?: any;
     query?: Record<string, any> | undefined;
 }, {
-    populate?: any;
     select?: Record<string, 0 | 1> | undefined;
+    populate?: any;
     query?: Record<string, any> | undefined;
 }>;
 export type GetOneQueryDTO = DTO<typeof GetOneQuerySchema>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lyxa.ai/core",
-	"version": "1.4.162",
+	"version": "1.4.164",
 	"description": "The Core system of the Lyxa services.",
 	"author": "elie <42282499+Internalizable@users.noreply.github.com>",
 	"license": "MIT",

package/dist/libraries/firebase/fcmService.d.ts

@@ -1,38 +0,0 @@
-import { App } from 'firebase-admin/app';
-import { AppPlatform, NotificationAccountType } from '../../utilities/enum';
-export interface FCMNotificationPayload {
-    title?: string;
-    body?: string;
-    data?: Record<string, string>;
-    sound?: string;
-    invisible?: boolean;
-}
-export interface NotificationTokenTarget {
-    token: string;
-    entityType: NotificationAccountType;
-    deviceId?: string;
-    entityId?: string;
-    platform?: AppPlatform;
-    appVersion?: string;
-}
-export declare const FCMServiceForUser = "fcm.service.user";
-export declare const FCMServiceForRider = "fcm.service.rider";
-export declare const FCMServiceForShop = "fcm.service.shop";
-export declare const FCMServiceForCpanel = "fcm.service.cpanel";
-export declare class FCMService {
-    private messaging;
-    private static readonly MAX_BATCH;
-    constructor(app?: App);
-    private chunkArray;
-    private compareVersions;
-    private isNotifiableEntityType;
-    private isConsoleEntityType;
-    private shouldUseNewStructure;
-    private buildConsoleMessage;
-    private buildMessage;
-    private buildOldMessage;
-    sendNotification(payload: FCMNotificationPayload, targets: NotificationTokenTarget[]): Promise<{
-        successTokens: string[];
-        failedTokens: string[];
-    }>;
-}