@everymatrix/lottery-program-wof 1.23.0 → 1.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everymatrix/lottery-program-wof",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "main": "dist/lottery-program-wof.js",
   "svelte": "src/index.ts",
   "scripts": {
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e1f96f1273bd4af5ca8e311c90006f51ca00a642"
+  "gitHead": "88308bab2d4819ec71d025befe5d4165e8c092ca"
 }

package/src/LotteryProgramWof.svelte

@@ -75,7 +75,9 @@
 
   const fetcher = async () => {
     bonuses = await api.lotteries(endpoint, session)
-    _postMessage({type: 'wof-private-bonuses', bonuses })
+    
+    _postMessage({ type: 'WofStatus', avaliable: bonuses.length > 0 })
+    _postMessage({ type: 'wof-private-bonuses', bonuses })
   }
 
   const loginAction = (loginevent, loginurl) => {

package/src/class.process.ts

@@ -1,15 +1,19 @@
-import { api } from "./business"
 import { _postMessage } from "./message"
-import { setMessage as setMessageBase } from './business';
-
+import { setMessage } from './business';
 
 export class Process {
 
-  id
-  halter
-  afterSuccess
-  afterSetMessage
-  fetcher
+  id: string
+  halter: Function
+  afterSuccess: Function
+  afterSetMessage: Function
+  fetcher: Function
+  
+  private guid: string
+  private isDrawn: boolean = false
+  private drawnIndex: number;
+  private retryingTimes: number = 0
+  private retryingMaxTimes: number = 4
 
   constructor(params){
     this.id = params.id
@@ -19,8 +23,8 @@ export class Process {
     this.fetcher = params.fetcher
   }
 
-  handleHaltProcess(index, message, fn = () => {}){
-      _postMessage({ id: this.id, type: 'wof-private-message-spin-before' })
+  handleHaltProcess(index, message, fn: Function = () => {}){
+    _postMessage({ id: this.id, type: 'wof-private-message-spin-before' })
 
     const cb = () => {
       setTimeout(() => {
@@ -33,31 +37,82 @@ export class Process {
     // spinner.halt(calc.getDeg(index), cb)
     this.halter(index, cb)
   }
+
+  getRetryingPeriod() {
+    if(this.retryingTimes === 1){
+      return 5 * 1000
+    }else{
+      return 10 * 1000
+    }
+  }
+
+  drawInit() {
+    this.retryingTimes = 0
+    this.guid = undefined
+    this.isDrawn = false
+  }
   
-  async drawer (guid, frequency: number = 0){
+  async drawer (guid?: string){
+    if(guid) this.guid = guid
+    if(!this.guid) throw new Error('GUID NOT FOUND')
+
+    if(this.retryingTimes >= this.retryingMaxTimes){
+
+      if(this.isDrawn){
+        this.handleHaltProcess(this.drawnIndex, 'DrawFailed')
+      }else{
+        this.handleHaltProcess(undefined, 'Timeout')
+      }
 
-    let index
+      this.drawInit()
+
+      return;
+    }
+    this.retryingTimes += 1
+
+    let isFetchSucceeded = false
+    let isTimeouted = false
+    
+    setTimeout(() => {
+      if(!isFetchSucceeded){
+        isTimeouted = true
+        this.setMessage({
+          mode: 'timeout',
+          modeValue: 'Retry'
+        })
+      }
+    }, this.getRetryingPeriod())
 
     try {
-      const { data, message, index: _index } = await this.fetcher(guid)
-      index = _index
-      
-      if(!data.success)                 throw new Error()
-      if(data.item.state === "drawn")   throw new Error()
 
-      this.handleHaltProcess(index, message, this.afterSuccess)
+      const { data, message, index: _index } = await this.fetcher(this.guid)
+      this.drawnIndex = _index
       
-    } catch (e) {
-      if(frequency < 4){
-        this.drawer(guid, frequency + 1)
-      }else{
-        this.handleHaltProcess(index, 'DrawFailed')
+      isFetchSucceeded = true
+
+      if(!data.success) throw new Error()
+      switch(data.item.state) {
+        case 'fulfilled':
+          this.isDrawn = true
+          break
+        case 'drawn':
+          this.isDrawn = true
+          throw new Error()
       }
+
+      if(isTimeouted) return;
+
+      this.handleHaltProcess(this.drawnIndex, message, this.afterSuccess)
+      this.drawInit()
+
+    } catch (e) {
+      if(isTimeouted) return;
+      this.drawer()
     }
   }
 
   setMessage(entry: string | object) {
-    setMessageBase(this.id, entry)
+    setMessage(this.id, entry)
     this.afterSetMessage()
   }
 }

package/src/private.item.svg.svelte

@@ -143,7 +143,10 @@
   $: process = new Process({
     id,
     afterSetMessage: () => messageShown = true,
-    halter: (index, cb) => spinner.halt(calc.getDeg(index), cb),
+    halter: (index, cb) => {
+      const targetIndex = index >= 0 ? index : options.length - 1
+      spinner.halt(calc.getDeg(targetIndex), cb)
+    },
     afterSuccess: () => isShowPrizeArea = true,
     fetcher: async (guid) => await api.draw(endpoint, session, id, guid, options)
   })
@@ -177,6 +180,12 @@
       setTimeout(() => updateSpinable(), 1)
       messageShown = false
     },
+    'wof-private-message-retry': (data) => {
+      if(data.id !== id) return;
+
+      messageShown = false
+      process.drawer()
+    }
   })
 
   const renderImage = (node: SVGElement, index) => {

package/src/private.message.svelte

@@ -41,8 +41,16 @@
   const _postMessageScoped = (props) => _postMessage({ ...props, id })
   
   const eventButton = () => {
-    isShown = false
-    _postMessageScoped({ type: 'wof-private-message-close' })
+    switch(mode){
+      case 'timeout':
+        isShown = false
+        _postMessageScoped({ type: 'wof-private-message-retry' })
+        break
+      default:
+        isShown = false
+        _postMessageScoped({ type: 'wof-private-message-close' })
+        break
+    }
   }
 
   const getTimeString = (_d) => {
@@ -102,7 +110,7 @@
   ].join(';')}
 >
 
-  {#if mode === 'normal' || mode === 'init-failed'}
+  {#if mode === 'normal' || mode === 'init-failed' || mode === 'timeout'}
   <p>{$_(`wof.${modeValue}`)}</p>
   {/if}
 

package/src/translations.js

@@ -9,9 +9,11 @@ export const translations = {
       ActiveTickets: `Active Tickets`,
       ImplicitTickets: `Implicit Tickets`,
       RemainingTimes: `Remaining Times`,
+      Retry: 'Network is a bit busy now, please click OK to re-spin',
       ShowNext: `The Wheel will be available on<br /> <strong>{startTime}</strong> <br />Please wait till it is open.`,
       SpinFailed: `We are sorry that you don't have any Wheels available, please <strong>check T&C</strong> here to get a chance!`,
-      DrawFailed: 'There was a problem to grant the reward. Please contact support',
+      DrawFailed: 'The prize assignment may be failed, please contact customer support for more details',
+      Timeout: 'Network is a bit busy now, please try again later.',
       Congratulation: `Congratulations! You won a {prize}!`,
       OK: `OK`,
       Rewards: `Rewards`,