esoftplay 0.0.114-u → 0.0.114-x

package/bin/build.js

@@ -229,6 +229,7 @@ import * as ErrorReport from 'esoftplay/error';
 import * as Notifications from 'expo-notifications';
 import React, { useEffect, useRef } from 'react';
 import { enableFreeze, enableScreens } from 'react-native-screens';
+const { globalIdx } = require('esoftplay/global');
 enableScreens();
 enableFreeze();
 
@@ -236,7 +237,6 @@ Notifications.addNotificationResponseReceivedListener(x => LibNotification.onAct
 
 export default function App() {
 	const Home = useRef(esp.home()).current
-	const { globalIdx } = require('esoftplay/global');
 
 	useEffect(() => {
 		globalIdx.reset()

package/modules/lib/notification.ts

@@ -1,6 +1,8 @@
+import { useGlobalReturn } from 'esoftplay';
 // noPage
 
-import { esp, LibCrypt, LibCurl, LibNavigation, UserClass, UserNotification, _global } from "esoftplay";
+import { esp, LibCrypt, LibCurl, LibNavigation, LibObject, useGlobalState, UserClass, UserNotification, _global } from "esoftplay";
+import { fastFilter } from "esoftplay/fast";
 import Constants from 'expo-constants';
 import * as Notifications from 'expo-notifications';
 import { Alert, Linking, Platform } from "react-native";
@@ -28,7 +30,6 @@ import moment from '../../moment';
 
 Notifications.setNotificationHandler({
   handleNotification: async (notif) => {
-    UserNotification.user_notification_loadData();
     return ({
       shouldShowAlert: true,
       shouldPlaySound: true,
@@ -38,10 +39,151 @@ Notifications.setNotificationHandler({
   },
 });
 
+const lastUrlState = useGlobalState<any>(undefined)
+
+function mainUrl(): string {
+  const { protocol, domain, uri } = esp.config()
+  return protocol + "://" + domain + uri;
+}
+
+function readAll(ids: (string | number)[]) {
+  let url = mainUrl() + "user/push-read";
+  const { salt } = esp.config()
+  let post: any = {
+    notif_id: ids.join(','),
+    user_id: "",
+    secretkey: new LibCrypt().encode(salt + "|" + moment().format("YYYY-MM-DD hh:mm:ss"))
+  }
+  new LibCurl(url, post)
+}
+
+function splitArray(array: any[], maxLength: number): any[] {
+  const parts = maxLength // items per chunk    
+  const splitedArray = array.reduce((resultArray: any, item, index) => {
+    const chunkIndex = Math.floor(index / parts)
+    if (!resultArray[chunkIndex]) {
+      resultArray[chunkIndex] = [] // start a new chunk
+    }
+    resultArray[chunkIndex].push(item)
+    return resultArray
+  }, [])
+  return splitedArray
+}
+
 export default class m {
 
+  static state(): useGlobalReturn<any> {
+    return lastUrlState
+  }
+
+  static loadData(isFirst?: boolean): void {
+    // console.log('LOADDATA', isFirst)
+    let _uri = mainUrl() + "user/push-notif/desc"
+    const lastUrl = lastUrlState.get()
+    if (lastUrl == -1) {
+      return
+    }
+    if (lastUrl && !isFirst) {
+      _uri = lastUrl
+    }
+    const user = UserClass.state().get()
+    if (!user?.id) {
+      Notifications.setBadgeCountAsync(0)
+    }
+    const { salt } = esp.config()
+    let post: any = {
+      user_id: "",
+      secretkey: new LibCrypt().encode(salt + "|" + moment().format("YYYY-MM-DD hh:mm:ss"))
+    }
+    if (user) {
+      post["user_id"] = user.id || user.user_id
+      post["group_id"] = user.group_id || esp.config('group_id')
+    }
+
+    // console.log(esp.logColor.cyan, 'curl: ' + _uri, esp.logColor.reset)
+    new LibCurl(_uri, post,
+      (res: any) => {
+        // console.log(esp.logColor.green, 'next: ' + res.next, '\n length: ' + res?.list?.length, res.list[0].message, esp.logColor.reset)
+        if (res?.list?.length > 0) {
+          const urls: string[] = UserNotification.state().get().urls
+          // console.log(urls)
+          if (urls && urls.indexOf(_uri) < 0) {
+            let { data, unread } = UserNotification.state().get()
+            // console.log(nUnread+" => nUnread")
+            let nUnread
+            if (isFirst) {
+              nUnread = fastFilter(res.list, (row) => row.status != 2).length
+              UserNotification.state().set({
+                data: res.list,
+                urls: [],
+                unread: nUnread
+              })
+            } else {
+              nUnread = unread + fastFilter(res.list, (row) => row.status != 2).length
+              data.push(...res.list)
+              UserNotification.state().set({
+                data: data,
+                urls: [_uri, ...urls],
+                unread: nUnread
+              })
+            }
+            Notifications.setBadgeCountAsync(nUnread)
+          }
+        }
+        if (res.next) {
+          lastUrlState.set(res.next)
+        } else {
+          lastUrlState.set(-1)
+        }
+      }, (msg) => {
+
+      }
+    )
+  }
+
+  static add(id: number, user_id: number, group_id: number, title: string, message: string, params: string, status: 0 | 1 | 2, created?: string, updated?: string): void {
+    const item = { id, user_id, group_id, title, message, params, status, created, updated }
+    let data = UserNotification.state().get().data
+    data.unshift(item)
+    UserNotification.state().set({
+      ...UserNotification.state().get(),
+      data: data
+    })
+  }
+
+  static drop(): void {
+    UserNotification.state().reset()
+  }
+
+  static markRead(id?: string | number, ..._ids: (string | number)[]): void {
+    // console.log("markRead")
+    let { data, unread, urls } = UserNotification.state().get()
+    let nUnread = unread > 0 ? unread - 1 : 0
+    let ids = [id, ..._ids]
+    // console.log(ids)
+    ids.forEach((id) => {
+      const index = data.findIndex((row) => String(row.id) == String(id))
+      if (index > -1) {
+        data = LibObject.set(data, 2)(index, 'status')
+        nUnread = unread > 0 ? unread - 1 : 0
+      }
+    })
+    // console.log(JSON.stringify(data))
+    UserNotification.state().set({
+      urls,
+      data: data,
+      unread: nUnread
+    })
+    Notifications.setBadgeCountAsync(nUnread)
+    const idsToPush = splitArray(ids, 200)
+    idsToPush.forEach((ids) => {
+      readAll(ids)
+    })
+  }
+
+
   static onAction(notification: any): void {
-    UserNotification.user_notification_loadData()
+    m.loadData(true)
     const data = m.getData(notification)
     function doOpen(data: any) {
       if (!_global.NavsIsReady) {
@@ -62,7 +204,7 @@ export default class m {
     return x?.notification?.request?.content?.data
   }
 
-  static listen(dataRef: any): () => void {
+  static listen(dataRef: any): void {
     if (esp.config('notification') == 1) {
       if (Platform.OS == 'android')
         Notifications.setNotificationChannelAsync(
@@ -70,7 +212,7 @@ export default class m {
           {
             sound: 'default',
             enableLights: true,
-            description: "this is description",
+            description: "Please enable notifications permissions",
             name: esp.appjson().expo.name,
             importance: Notifications.AndroidImportance.MAX,
             showBadge: true,
@@ -79,11 +221,8 @@ export default class m {
           }
         )
       UserClass.pushToken();
-      dataRef.receive = Notifications.addNotificationReceivedListener((x) => {
-        UserNotification.user_notification_loadData()
-      })
+      dataRef.receive = Notifications.addNotificationReceivedListener(() => { })
     }
-    else return () => { }
   }
 
   static requestPermission(callback?: (token: any) => void): Promise<any> {
@@ -130,18 +269,7 @@ export default class m {
     if (!data) return
     if (typeof data == 'string')
       data = JSON.parse(data)
-    const crypt = new LibCrypt();
-    const salt = esp.config("salt");
-    const config = esp.config();
-    let uri = config.protocol + "://" + config.domain + config.uri + "user/push-read"
-    new LibCurl(uri, {
-      notif_id: data.id,
-      secretkey: crypt.encode(salt + "|" + moment().format("YYYY-MM-DD hh:mm:ss"))
-    }, () => {
-      UserNotification.user_notification_loadData();
-    }, () => {
-
-    })
+    m.markRead(data.id)
     let param = data;
     if (param.action)
       switch (param.action) {
@@ -175,17 +303,7 @@ export default class m {
   }
 
   static openNotif(data: any): void {
-    const salt = esp.config("salt");
-    const config = esp.config();
-    let uri = config.protocol + "://" + config.domain + config.uri + "user/push-read"
-    new LibCurl(uri, {
-      notif_id: data.id,
-      secretkey: new LibCrypt().encode(salt + "|" + moment().format("YYYY-MM-DD hh:mm:ss"))
-    }, () => {
-      UserNotification.user_notification_setRead(data.id)
-    }, () => {
-      // esp.log(msg)
-    })
+    m.markRead(data.id)
     let param = JSON.parse(data.params)
     switch (param.action) {
       case "alert":

package/modules/lib/workloop.tsx

@@ -1,6 +1,6 @@
 // noPage
 
-import { esp, LibComponent, UserClass, UserNotification } from 'esoftplay';
+import { esp, LibComponent, LibNotification, UserClass } from 'esoftplay';
 import React from 'react';
 import { InteractionManager, View } from 'react-native';
 import { WebView } from 'react-native-webview';
@@ -73,13 +73,12 @@ export default (() => {
         })
       }
     }
-
     componentDidMount(): void {
       super.componentDidMount(); 
       const user = UserClass.state().get()
       if (user){
         if(esp.config().notification == 1){
-          UserNotification.user_notification_loadData()
+          LibNotification.loadData(true)
         }
       }
     }

package/modules/user/notifbadge.tsx

@@ -1,8 +1,7 @@
 // noPage
 
 
-import { LibComponent, LibStyle, UserNotification } from "esoftplay";
-import React from "react";
+import { LibComponent, LibStyle } from "esoftplay";
 import { Text, TouchableOpacity, View } from "react-native";
 
 export interface UserNotifbadgeProps {
@@ -25,7 +24,6 @@ export default class Enotifbadge extends LibComponent<UserNotifbadgeProps, UserN
 
   componentDidMount(): void {
     super.componentDidMount()
-    UserNotification.user_notification_loadData()
   }
 
   render(): any {

package/modules/user/notification.tsx

@@ -1,15 +1,8 @@
 //
 
-import {
-  esp, LibComponent, LibCrypt,
-  LibCurl, LibIcon, LibList, LibNotification, LibObject, LibStatusbar, LibStyle, LibUtils, LibWorkloop, useGlobalReturn, useGlobalState,
-  UserClass, UserNotification_item
-} from "esoftplay";
-import * as Notifications from 'expo-notifications';
+import { LibComponent, LibIcon, LibList, LibNotification, LibStatusbar, LibStyle, useGlobalReturn, useGlobalState, UserNotification_item } from "esoftplay";
 import { Pressable, Text, TouchableOpacity, View } from "react-native";
-import { fastFilter } from "../../fast";
 //@ts-ignore
-import moment from "../../moment";
 export interface UserNotificationProps {
   navigation: any,
   data: any[]
@@ -25,109 +18,13 @@ const initState = {
   unread: 0
 };
 
-const state = useGlobalState(initState, { persistKey: 'user_notification', isUserData: true })
-
+const state = useGlobalState<any>(initState, { persistKey: "user_notification_data", isUserData: true })
 class m extends LibComponent<UserNotificationProps, UserNotificationState> {
 
   static state(): useGlobalReturn<any> {
     return state
   }
 
-  static add(id: number, user_id: number, group_id: number, title: string, message: string, params: string, status: 0 | 1 | 2, created?: string, updated?: string): void {
-    const item = { id, user_id, group_id, title, message, params, status, created, updated }
-    let data = state.get().data
-    data.unshift(item)
-    state.set({
-      ...state.get(),
-      data: data
-    })
-  }
-
-  static drop(): void {
-    state.set(initState)
-  }
-
-  static user_notification_loadData(): void {
-    const { protocol, domain, uri, salt } = esp.config()
-    let _uri = protocol + "://" + domain + uri + "user/push-notif"
-    let data = state.get().data
-    const user = UserClass.state().get()
-    if (!user?.id) {
-      Notifications.setBadgeCountAsync(0)
-    }
-    /* hapus yang lebih lama dari 3 bulan */
-    const d = new Date();
-    d.setMonth(d.getMonth() - 3);
-    const created = LibUtils.moment(String(d.getDate())).format('YYYY-MM-DD HH:mm:ss')
-    let cdata = fastFilter(data, (row) => row.created > created)
-    if (cdata.length != data.length) {
-      /* jika data tidak sama artinya ada yang expired > 3 bulan */
-      state.set(LibObject.set(state.get(), cdata)('data'))
-    }
-    if (data && data.length > 0) {
-      const lastData = data[0]
-      if (lastData.id)
-        _uri += "?last_id=" + lastData.id || 0
-    }
-    let post: any = {
-      user_id: "",
-      secretkey: new LibCrypt().encode(salt + "|" + moment().format("YYYY-MM-DD hh:mm:ss"))
-    }
-    if (user) {
-      post["user_id"] = user.id || user.user_id
-      post["group_id"] = user.group_id || esp.config('group_id')
-    }
-    m.user_notification_fetchData(_uri, post);
-  }
-
-  static user_notification_fetchData(uri: string, post: any): void {
-    new LibCurl(uri, post,
-      (res: any) => {
-        m.user_notification_parseData(res.list, uri)
-        if (res.next != "") {
-          LibWorkloop.execNextTix(m.user_notification_fetchData, [res.next, post])
-        }
-      }, (msg) => {
-      }
-    )
-  }
-
-  static user_notification_parseData(res: any[], uri: string): void {
-    if (res.length > 0) {
-      const urls = state.get().urls
-      if (urls && urls.indexOf(uri) < 0) {
-        let { data, urls, unread } = state.get()
-        const nUnread = unread + fastFilter(res, (row) => row.status != 2).length
-        state.set({
-          data: [...res.reverse(), ...data],
-          urls: [uri, ...urls],
-          unread: nUnread
-        })
-        Notifications.setBadgeCountAsync(nUnread)
-      }
-    }
-  }
-
-  static user_notification_setRead(id: string | number): void {
-    let { data, unread, urls } = state.get()
-    const index = data.findIndex((row) => row.id == String(id))
-    if (index > -1) {
-      const nUnread = unread > 0 ? unread - 1 : 0
-      state.set({
-        urls,
-        data: LibObject.set(data, 2)(index, 'status'),
-        unread: nUnread
-      })
-      Notifications.setBadgeCountAsync(nUnread)
-    }
-  }
-
-  componentDidMount(): void {
-    super.componentDidMount()
-    moment().locale(esp.langId());
-    m.user_notification_loadData()
-  }
-
   render(): any {
     const { colorPrimary, colorAccent, STATUSBAR_HEIGHT } = LibStyle;
     const { goBack } = this.props.navigation
@@ -151,7 +48,7 @@ class m extends LibComponent<UserNotificationProps, UserNotificationState> {
               </View>
               <LibList
                 data={data}
-                onRefresh={() => m.user_notification_loadData()}
+                onRefresh={() => LibNotification.loadData(true)}
                 renderItem={(item: any) => (
                   <TouchableOpacity onPress={() => LibNotification.openNotif(item)} >
                     <UserNotification_item {...item} />

package/modules/user/notification_item.tsx

@@ -1,11 +1,10 @@
 // noPage
 
 import { LibStyle, LibUtils } from 'esoftplay';
-import React from 'react';
 import { Text, View } from 'react-native';
 
 
-export interface UserNotificationProps {
+export interface UserNotification_itemProps {
   created: string,
   id: number,
   message: string,
@@ -17,7 +16,7 @@ export interface UserNotificationProps {
   updated: string,
   user_id: number,
 }
-export default function m(props: UserNotificationProps): any {
+export default function m(props: UserNotification_itemProps): any {
   return (
     <View style={[{ padding: 16, flexDirection: "row", backgroundColor: "white", marginBottom: 3, marginHorizontal: 0, width: LibStyle.width }, LibStyle.elevation(1.5)]} >
       <View style={{}} >

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay",
-  "version": "0.0.114-u",
+  "version": "0.0.114-x",
   "description": "embedding data from esoftplay framework (web based) into mobile app",
   "main": "cache/index.js",
   "types": "../../index.d.ts",

package/persist.ts

@@ -16,7 +16,7 @@ export default (() => {
         if (value != undefined)
           AsyncStorage.setItem(key, JSON.stringify(value));
         else
-          d()
+          del()
         fastLoop(setter[key], (cc) => cc(value))
       }
     }
@@ -51,7 +51,7 @@ export default (() => {
       updater()
       return () => {
         r.current = false
-        setter[key] = fastFilter(setter[key], (x) => x !== b);
+        setter[key] = fastFilter(setter[key], (x) => x !== setState);
       }
     }, [])