@streamlayer/feature-gamification 1.16.9 → 1.16.11

package/lib/background.js

@@ -4,7 +4,6 @@ import { QuestionStatus, QuestionType } from '@streamlayer/sdk-web-types';
 import '@streamlayer/sdk-web-core/store';
 import * as queries from './queries';
 import { detail } from './detail';
-import { advertisement } from './advertisement';
 import { GamificationStorage } from './storage';
 export var InteractiveAllowed;
 (function (InteractiveAllowed) {
@@ -61,39 +60,56 @@ export class GamificationBackground {
         this.notifications = instance.notifications;
         this.moderation = new ApiStore(queries.$moderation(this.slStreamId, instance.transport), 'gamification:moderation');
         const onlyBetPack = !!instance.sdk.options.get().betPack;
-        this.feedList = new ApiStore(queries.$feedList(this.slStreamId, this.interactiveAllowed, onlyBetPack, instance.transport), 'gamification:feedList');
+        this.feedList = new ApiStore(queries.$feedList(this.slStreamId, this.interactiveAllowed, this.userId, this.organizationId, this.storage, onlyBetPack, instance.transport), 'gamification:feedList');
         this.betPack = new ApiStore(queries.$betPack(this.slStreamId, this.userId, this.organizationId, this.storage, instance.transport), 'gamification:betPack');
         this.activeQuestionId = queries.$activeQuestion(this.slStreamId, onlyBetPack, instance.transport);
         this.openedQuestion = detail(instance.transport, this.openedQuestionId, this.feedList.getStore());
         this.cancels.add(this.openedQuestionId.listen((item) => {
             this.log.debug({ item }, 'received question');
             if (item?.questionId) {
+                this.log.info('cleanup on close question');
+                if (this.questionSubscription !== undefined) {
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    instance.transport.removeSubscription(this.questionSubscription);
+                    this.questionSubscription = undefined;
+                }
                 this.questionSubscription = queries.questionSubscription(item.questionId, instance.transport);
-                this.questionSubscription.addListener('feed-subscription-opened-question', async (response) => {
+                this.questionSubscription.addListener('feed-subscription-opened-question', (response) => {
                     const question = response.data?.attributes?.question;
                     this.openedQuestion.updateExtendedQuestion(question);
                     if (question?.type === QuestionType.PREDICTION &&
                         (question.status === QuestionStatus.ACTIVE || question.status === QuestionStatus.RESOLVED)) {
                         const betPackData = this.betPack.getValues().data?.data || {};
                         const betPackItem = betPackData?.[question.id];
-                        if (betPackItem || Object.keys(betPackData).length < 5) {
-                            const data = queries.$questionByUser(question.id, this.transport);
-                            const cancel = data.subscribe(() => { });
-                            await data.get().promise;
-                            // if question is not in the feed list, get extended question data from the server
-                            let extendedQuestion = data.get().data;
-                            if (!extendedQuestion) {
-                                extendedQuestion = await queries.questionByUser(question.id, this.transport);
-                            }
-                            cancel();
-                            window.requestAnimationFrame(() => {
-                                data.invalidate();
+                        if (betPackItem) {
+                            const answers = [];
+                            const sortedPrev = betPackItem.answers.sort((a, b) => {
+                                return a.id > b.id ? 1 : -1;
                             });
+                            const sortedNew = question.answers.sort((a, b) => {
+                                return a.id > b.id ? 1 : -1;
+                            });
+                            for (let i = 0; i < sortedPrev.length; i++) {
+                                answers.push({
+                                    ...sortedPrev[i],
+                                    ...sortedNew[i],
+                                    correct: sortedPrev[i].correct,
+                                    youVoted: sortedPrev[i].youVoted,
+                                    pointsEarned: sortedPrev[i].pointsEarned,
+                                });
+                            }
                             this.betPack.getStore().mutate({
                                 timestamp: Date.now(),
                                 data: {
                                     ...betPackData,
-                                    [question.id]: extendedQuestion,
+                                    [question.id]: {
+                                        ...betPackItem,
+                                        status: question.status,
+                                        marketClosed: question.marketClosed,
+                                        activatedAt: question.activatedAt,
+                                        answerSetAt: question.answerSetAt,
+                                        answers,
+                                    },
                                 },
                             });
                         }
@@ -117,21 +133,23 @@ export class GamificationBackground {
                 (question.status === QuestionStatus.ACTIVE || question.status === QuestionStatus.RESOLVED)) {
                 const betPackData = this.betPack.getValues().data?.data || {};
                 const betPackItem = betPackData?.[question.id];
-                if (betPackItem || Object.keys(betPackData).length < 5) {
-                    const data = queries.$questionByUser(question.id, this.transport);
-                    // order of operations is important here
-                    const cancel = data.subscribe(() => { });
-                    await data.get().promise;
-                    // if question is not in the feed list, get extended question data from the server
-                    let extendedQuestion = data.get().data;
-                    if (!extendedQuestion) {
-                        extendedQuestion = await queries.questionByUser(question.id, this.transport);
-                    }
-                    cancel();
-                    window.requestAnimationFrame(() => {
-                        data.invalidate();
+                if (betPackItem) {
+                    this.betPack.getStore().mutate({
+                        timestamp: Date.now(),
+                        data: {
+                            ...betPackData,
+                            [question.id]: {
+                                ...betPackItem,
+                                status: question.status,
+                                marketClosed: question.marketClosed,
+                                activatedAt: question.activatedAt,
+                                answerSetAt: question.answerSetAt,
+                            },
+                        },
                     });
-                    // get extended question data and mark as dirty
+                }
+                else if (!betPackItem && Object.keys(betPackData).length < 5) {
+                    const extendedQuestion = await queries.questionByUser(question.id, this.transport);
                     this.betPack.getStore().mutate({
                         timestamp: Date.now(),
                         data: {
@@ -215,7 +233,7 @@ export class GamificationBackground {
             };
         });
         if (!onlyBetPack) {
-            this.advertisement = advertisement(this.slStreamId, this.feedSubscription, instance);
+            // this.advertisement = advertisement(this.slStreamId, this.feedSubscription, instance)
         }
     }
     /**

package/lib/detail.js

@@ -22,16 +22,24 @@ export const detail = (transport, $openedQuestionId, $feedList) => {
         const currentQuestion = $extendedStore.get().data;
         const mergeQuestionAnswers = (currentAnswers, newAnswers) => {
             if (!currentAnswers || !newAnswers) {
-                return currentAnswers || newAnswers || [];
+                return (currentAnswers || newAnswers || []).sort((a, b) => {
+                    return a.id > b.id ? 1 : -1;
+                });
             }
+            const sortedPrev = currentAnswers.sort((a, b) => {
+                return a.id > b.id ? 1 : -1;
+            });
+            const sortedNew = newAnswers.sort((a, b) => {
+                return a.id > b.id ? 1 : -1;
+            });
             const answers = [];
-            for (let i = 0; i < currentAnswers.length; i++) {
+            for (let i = 0; i < sortedPrev.length; i++) {
                 answers.push({
-                    ...currentAnswers[i],
-                    ...newAnswers[i],
-                    correct: currentAnswers[i].correct,
-                    youVoted: currentAnswers[i].youVoted,
-                    pointsEarned: currentAnswers[i].pointsEarned,
+                    ...sortedPrev[i],
+                    ...sortedNew[i],
+                    correct: sortedPrev[i].correct,
+                    youVoted: sortedPrev[i].youVoted,
+                    pointsEarned: sortedPrev[i].pointsEarned,
                 });
             }
             return answers;

package/lib/gamification.js

@@ -190,6 +190,7 @@ export class Gamification extends AbstractFeature {
                 let extendedQuestion = data.get().data;
                 if (!extendedQuestion) {
                     extendedQuestion = await questionByUser(id, this.transport);
+                    data.mutate(extendedQuestion);
                 }
                 cancel();
                 window.requestAnimationFrame(() => {
@@ -301,7 +302,12 @@ export class Gamification extends AbstractFeature {
                                         status: prev.attributes.attributes.value.status,
                                         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                                         // @ts-ignore
-                                        openForVoting: prev.attributes.attributes.value.openForVoting,
+                                        openForVoting: 
+                                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                                        // @ts-ignore
+                                        prev.attributes.attributes.value.openForVoting === false
+                                            ? false
+                                            : feedItem.attributes.attributes.value.openForVoting,
                                     },
                                 },
                             },

package/lib/queries/deepLink.js

@@ -21,7 +21,7 @@ export const $deepLink = (transport, params) => {
             }
         },
         dedupeTime: 1000 * 60 * 60 * 24, // 24 hours
-        refetchInterval: 0,
+        refetchInterval: Infinity,
     });
 };
 export const generateShortLink = (transport, { web, mobile }) => {

package/lib/queries/index.d.ts

@@ -400,7 +400,7 @@ export declare const getPromotionDetail: (promoId: string, transport: Transport)
     notification: import("@streamlayer/sl-eslib/interactive/interactive.common_pb").QuestionNotification | undefined;
 } | undefined>;
 export declare const $pickHistory: (slStreamId: ReadableAtom<string | undefined>, transport: Transport) => import("@nanostores/query").FetcherStore<(import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").PickHistory | undefined)[], any>;
-export declare const $feedList: ($slStreamId: ReadableAtom<string | undefined>, $interactiveAllowed: ReadableAtom<InteractiveAllowed>, onlyBetPack: boolean, transport: Transport) => import("@nanostores/query").FetcherStore<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedItem[], any>;
+export declare const $feedList: ($slStreamId: ReadableAtom<string | undefined>, $interactiveAllowed: ReadableAtom<InteractiveAllowed>, $slUserId: ReadableAtom<string | undefined>, $slOrganizationId: ReadableAtom<string | undefined>, storage: GamificationStorage, onlyBetPack: boolean, transport: Transport) => import("@nanostores/query").FetcherStore<import("@streamlayer/sl-eslib/interactive/feed/interactive.feed_pb").FeedItem[], any>;
 export declare const $activePromotionId: ($slStreamId: ReadableAtom<string | undefined>, transport: Transport) => import("@nanostores/query").FetcherStore<{
     id: string;
     question: {

package/lib/queries/index.js

@@ -24,7 +24,7 @@ export const $activeQuestion = (slStreamId, onlyBetPack, transport) => {
             return res.data?.attributes;
         },
         dedupeTime: 1000 * 60 * 10, // 10 minutes
-        refetchInterval: 0,
+        refetchInterval: Infinity,
     });
 };
 export const getFeedItem = async (questionId, transport) => {
@@ -67,17 +67,29 @@ export const questionByUser = async ($questionId, transport) => {
     });
     return res.data?.attributes?.question;
 };
+const storeCache = new Map();
 export const $questionByUser = ($questionId, transport) => {
-    const { client, queryKey } = transport.createPromiseClient(Feed, { method: 'questionByUser', params: [$questionId] });
-    return transport.nanoquery.createFetcherStore(queryKey, {
-        fetcher: async (_, __, questionId) => {
-            const res = await client.questionByUser({
-                questionId: questionId,
-            });
-            return res.data?.attributes?.question;
-        },
-        dedupeTime: 1000 * 60 * 5,
+    const { client, queryKey, queryKeyStr } = transport.createPromiseClient(Feed, {
+        method: 'questionByUser',
+        params: [$questionId],
     });
+    if (storeCache.has(queryKeyStr)) {
+        return storeCache.get(queryKeyStr);
+    }
+    else {
+        const store = transport.nanoquery.createFetcherStore(queryKey, {
+            fetcher: async (_, __, questionId) => {
+                const res = await client.questionByUser({
+                    questionId: questionId,
+                });
+                return res.data?.attributes?.question;
+            },
+            dedupeTime: Infinity,
+            refetchInterval: Infinity,
+        });
+        storeCache.set(queryKeyStr, store);
+        return store;
+    }
 };
 export const getPromotionDetail = async (promoId, transport) => {
     if (!promoId) {
@@ -108,7 +120,7 @@ export const $pickHistory = (slStreamId, transport) => {
         },
     });
 };
-export const $feedList = ($slStreamId, $interactiveAllowed, onlyBetPack, transport) => {
+export const $feedList = ($slStreamId, $interactiveAllowed, $slUserId, $slOrganizationId, storage, onlyBetPack, transport) => {
     const { client, queryKey } = transport.createPromiseClient(Feed, {
         method: 'list',
         params: [$slStreamId, $interactiveAllowed, onlyBetPack ? 'true' : ''],
@@ -127,10 +139,27 @@ export const $feedList = ($slStreamId, $interactiveAllowed, onlyBetPack, transpo
                     statuses: [QuestionStatus.ACTIVE, QuestionStatus.RESOLVED],
                 },
             });
+            const flags = {
+                eventId: slStreamId,
+                userId: $slUserId.get(),
+                organizationId: $slOrganizationId.get(),
+            };
+            for (const question of res.data) {
+                if (!storage.isQuestionReceived(flags, question.id)) {
+                    eventBus.emit('poll', {
+                        action: 'received',
+                        payload: {
+                            questionId: question.id,
+                            questionType: question.attributes?.type,
+                        },
+                    });
+                    storage.saveQuestionReceived(flags, question.id);
+                }
+            }
             return res.data;
         },
-        dedupeTime: 0,
-        refetchInterval: 0,
+        dedupeTime: Infinity,
+        refetchInterval: Infinity,
     });
 };
 export const $activePromotionId = ($slStreamId, transport) => {
@@ -160,8 +189,8 @@ export const $activePromotionId = ($slStreamId, transport) => {
             }
             return undefined;
         },
-        dedupeTime: 0,
-        refetchInterval: 0,
+        dedupeTime: Infinity,
+        refetchInterval: Infinity,
     });
 };
 export { $userSummary, $leaderboardList } from './leaderboard';
@@ -208,7 +237,7 @@ export const $betPack = ($slStreamId, $slUserId, $slOrganizationId, storage, tra
                         userId: userId,
                         organizationId: organizationId,
                     };
-                    if (!storage.isBetPackQuestionReceived(flags, question.id)) {
+                    if (!storage.isQuestionReceived(flags, question.id)) {
                         eventBus.emit('poll', {
                             action: 'received',
                             payload: {
@@ -216,13 +245,16 @@ export const $betPack = ($slStreamId, $slUserId, $slOrganizationId, storage, tra
                                 questionType: question.type,
                             },
                         });
-                        storage.saveBetPackQuestionReceived(flags, question.id);
+                        storage.saveQuestionReceived(flags, question.id);
                     }
+                    question.answers = question.answers.sort((a, b) => {
+                        return a.id > b.id ? 1 : -1;
+                    });
                     return { ...acc, [question.id]: question };
                 }, {}),
             };
         },
-        dedupeTime: 0,
-        refetchInterval: 0,
+        dedupeTime: Infinity,
+        refetchInterval: Infinity,
     });
 };

package/lib/queries/moderation.js

@@ -8,7 +8,7 @@ export const $moderation = (slStreamId, transport) => {
             });
             return res.data?.attributes;
         },
-        refetchInterval: 0,
+        refetchInterval: Infinity,
         dedupeTime: 1000 * 60 * 60,
     });
 };

package/lib/storage.d.ts

@@ -8,8 +8,8 @@ type UserProps = {
 export declare class GamificationStorage extends Storage {
     private sessionStorage;
     constructor();
-    saveBetPackQuestionReceived: ({ userId, eventId, organizationId }: UserProps, questionId: string) => void;
-    isBetPackQuestionReceived: ({ userId, eventId, organizationId }: UserProps, questionId: string) => boolean;
+    saveQuestionReceived: ({ userId, eventId, organizationId }: UserProps, questionId: string) => void;
+    isQuestionReceived: ({ userId, eventId, organizationId }: UserProps, questionId: string) => boolean;
     saveQuestionOpened: ({ userId, eventId, organizationId }: UserProps, questionId: string) => void;
     isQuestionOpened: ({ userId, eventId, organizationId }: UserProps, questionId: string) => boolean;
     saveOnboardingStatus: ({ userId, eventId, organizationId }: UserProps, status: OnboardingStatus) => void;

package/lib/storage.js

@@ -3,7 +3,7 @@ var KEY_PREFIX;
 (function (KEY_PREFIX) {
     KEY_PREFIX["ONBOARDING"] = "onboarding";
     KEY_PREFIX["ONBOARDING_IO"] = "onboarding_io";
-    KEY_PREFIX["BET_PACK_ITEM_RECEIVED"] = "bp-item-received";
+    KEY_PREFIX["QUESTION_RECEIVED"] = "q-received";
     KEY_PREFIX["QUESTION_OPENED"] = "q-opened";
 })(KEY_PREFIX || (KEY_PREFIX = {}));
 class GamificationSessionStorage extends Storage {
@@ -23,11 +23,11 @@ export class GamificationStorage extends Storage {
         super('gamification');
         this.sessionStorage = new GamificationSessionStorage();
     }
-    saveBetPackQuestionReceived = ({ userId, eventId, organizationId }, questionId) => {
-        this.write(KEY_PREFIX.BET_PACK_ITEM_RECEIVED, organizationId, userId, eventId, questionId, '1');
+    saveQuestionReceived = ({ userId, eventId, organizationId }, questionId) => {
+        this.write(KEY_PREFIX.QUESTION_RECEIVED, organizationId, userId, eventId, questionId, '1');
     };
-    isBetPackQuestionReceived = ({ userId, eventId, organizationId }, questionId) => {
-        return !!this.read(KEY_PREFIX.BET_PACK_ITEM_RECEIVED, organizationId, userId, eventId, questionId);
+    isQuestionReceived = ({ userId, eventId, organizationId }, questionId) => {
+        return !!this.read(KEY_PREFIX.QUESTION_RECEIVED, organizationId, userId, eventId, questionId);
     };
     saveQuestionOpened = ({ userId, eventId, organizationId }, questionId) => {
         this.write(KEY_PREFIX.QUESTION_OPENED, organizationId, userId, eventId, questionId, '1');

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@streamlayer/feature-gamification",
-  "version": "1.16.9",
+  "version": "1.16.11",
   "peerDependencies": {
     "@bufbuild/protobuf": "^1.10.0",
     "@fastify/deepmerge": "^2.0.0",
     "@streamlayer/sl-eslib": "^5.149.1",
     "uuid": "^11.1.0",
     "nanostores": "^0.11.4",
-    "@streamlayer/sdk-web-api": "^1.8.9",
-    "@streamlayer/sdk-web-core": "^1.11.11",
-    "@streamlayer/sdk-web-interfaces": "^1.5.0",
-    "@streamlayer/sdk-web-logger": "^1.0.56",
-    "@streamlayer/sdk-web-notifications": "^1.3.18",
-    "@streamlayer/sdk-web-storage": "^1.0.56",
-    "@streamlayer/sdk-web-types": "^1.10.13"
+    "@streamlayer/sdk-web-api": "^1.8.11",
+    "@streamlayer/sdk-web-core": "^1.11.13",
+    "@streamlayer/sdk-web-interfaces": "^1.5.2",
+    "@streamlayer/sdk-web-logger": "^1.0.58",
+    "@streamlayer/sdk-web-notifications": "^1.3.20",
+    "@streamlayer/sdk-web-storage": "^1.0.58",
+    "@streamlayer/sdk-web-types": "^1.10.15"
   },
   "devDependencies": {
     "tslib": "^2.7.0"