esoftplay 0.0.110 → 0.0.111

package/modules/lib/curl.ts

@@ -1,8 +1,10 @@
 // noPage
-import { esp, LibCrypt, LibNet_status, LibProgress, LibUtils } from 'esoftplay';
+import { esp, LibCrypt, LibNet_status, LibObject, LibProgress, LibUtils, LogStateProperty } from 'esoftplay';
 import { reportApiError } from "esoftplay/error";
 import moment from "esoftplay/moment";
+import Constants from 'expo-constants';
 const axios = require('axios');
+const { manifest } = Constants;
 
 export default class ecurl {
   timeout = 55000;
@@ -28,22 +30,23 @@ export default class ecurl {
     this.header = {}
     this.setUri = this.setUri.bind(this);
     this.setUrl = this.setUrl.bind(this);
-    this.onFetched = this.onFetched.bind(this)
+    this.buildUri = this.buildUri.bind(this);
+    this.onFetched = this.onFetched.bind(this);
     this.setHeader = this.setHeader.bind(this);
-    this.signatureBuild = this.signatureBuild.bind(this)
-    this.encodeGetValue = this.encodeGetValue.bind(this)
-    this.urlEncode = this.urlEncode.bind(this)
-    this.closeConnection = this.closeConnection.bind(this)
-    this.onStatusCode = this.onStatusCode.bind(this)
-    this.onFetchFailed = this.onFetchFailed.bind(this)
-    this.onError = this.onError.bind(this)
-    this.setApiKey = this.setApiKey.bind(this)
-    this.secure = this.secure.bind(this)
-    this.withHeader = this.withHeader.bind(this)
-    this.initTimeout = this.initTimeout.bind(this)
-    this.cancelTimeout = this.cancelTimeout.bind(this)
+    this.signatureBuild = this.signatureBuild.bind(this);
+    this.encodeGetValue = this.encodeGetValue.bind(this);
+    this.urlEncode = this.urlEncode.bind(this);
+    this.closeConnection = this.closeConnection.bind(this);
+    this.onStatusCode = this.onStatusCode.bind(this);
+    this.onFetchFailed = this.onFetchFailed.bind(this);
+    this.onError = this.onError.bind(this);
+    this.setApiKey = this.setApiKey.bind(this);
+    this.secure = this.secure.bind(this);
+    this.withHeader = this.withHeader.bind(this);
+    this.initTimeout = this.initTimeout.bind(this);
+    this.cancelTimeout = this.cancelTimeout.bind(this);
     // this.createApiTesterUris = this.createApiTesterUris.bind(this)
-    const str: any = LibNet_status.state().get()
+    const str: any = LibNet_status.state().get();
     if (uri && str.isOnline) {
       this.init(uri, post, onDone, onFailed, debug);
     } else if (!str.isOnline && onFailed) {
@@ -71,6 +74,11 @@ export default class ecurl {
 
   }
 
+  protected buildUri(uri: string): string {
+    this.uri = uri
+    return this.uri
+  }
+
   protected setUrl(url: string): void {
     this.url = url
   }
@@ -270,11 +278,12 @@ export default class ecurl {
         }).join('&');
         this.post = ps
       }
-      this.setUri(uri)
+      uri = this.buildUri(uri);
       if ((/^[A-z]+:\/\//g).test(uri)) {
         this.setUrl(uri)
         this.setUri("")
       } else {
+        this.setUri(uri)
         this.setUrl(esp.config("url"))
       }
       await this.setHeader()
@@ -286,7 +295,7 @@ export default class ecurl {
           ...this.header,
           ["Content-Type"]: "application/x-www-form-urlencoded;charset=UTF-8"
         },
-        data: this.post,
+        data: !this.post ? undefined : this.post,
         Cache: "no-store",
         Pragma: "no-cache",
         ['Cache-Control']: "no-store",
@@ -331,11 +340,12 @@ export default class ecurl {
         this.post = ps
       }
     }
-    this.setUri(uri)
+    uri = this.buildUri(uri);
     if ((/^[A-z]+:\/\//g).test(uri)) {
       this.setUrl(uri)
       this.setUri("")
     } else {
+      this.setUri(uri)
       this.setUrl(esp.config("url"))
     }
     await this.setHeader();
@@ -345,7 +355,7 @@ export default class ecurl {
       url: this.url + this.uri,
       method: !this.post ? "GET" : "POST",
       headers: this.header,
-      data: this.post,
+      data: !this.post ? undefined : this.post,
       cancelToken: this.abort.token,
       cache: "no-store",
       Pragma: "no-cache",
@@ -354,9 +364,40 @@ export default class ecurl {
       mode: "cors",
       _post: post
     }
-    if (debug == 1) {
-      esp.log(this.url + this.uri, { ...options, cancelToken: undefined })
+    // if (debug == 1) {
+    // console.log(this.url + this.uri, { ...options, cancelToken: undefined })
+    // }
+
+    if (esp.isDebug('apitest') && manifest?.packagerOpts?.dev && LogStateProperty) {
+      const allData = LogStateProperty.state().get() || []
+      const logEnable = LogStateProperty.enableLog().get()
+
+      const complete_uri = this.uri;
+      const _uri = complete_uri.includes('?') ? complete_uri.split('?')[0] : complete_uri
+      const _get = complete_uri.includes('?') ? complete_uri.split('?')[1].split('&').map((x: any) => x.split('=')).map((t: any) => {
+        return ({ [t[0]]: [t[1]] })
+      }) : []
+      const get = Object.assign({}, ..._get)
+      const _post = post && Object.keys(post).map((key) => {
+        return ({ [key]: [post[key]] })
+      }) || []
+      const postNew = Object.assign({}, ..._post)
+
+      if (_uri != '') {
+        const data = {
+          [_uri]: {
+            secure: this.isSecure,
+            get: get,
+            post: postNew
+          }
+        }
+        let dt = LibObject.push(allData, data)()
+        if (logEnable) {
+          LogStateProperty.state().set(dt)
+        }
+      }
     }
+
     this.fetchConf = { url: this.url + this.uri, options: options }
     this.initTimeout(upload ? 120000 : undefined)
     axios(options).then(async (res: any) => {
@@ -391,9 +432,17 @@ export default class ecurl {
   private refineErrorMessage(resText: string): string {
     let out = resText
     if (!esp.isDebug('')) {
-      if (resText.toLowerCase().includes('failed') || resText.toLowerCase().includes('code')) {
-        reportApiError(this.fetchConf.options, resText)
-        out = 'Terjadi kesalahan, biar ' + esp.appjson()?.expo?.name + ' bereskan, silahkan coba beberapa saat lagi.'
+      const ltext = resText.toLowerCase()
+      if (
+        ltext.includes('failed') ||
+        ltext.includes('code') ||
+        ltext.includes('error')
+      ) {
+        // reportApiError(this.fetchConf.options, resText)
+        out = 'Terjadi kesalahan, biar ' + esp.appjson()?.expo?.name + ' bereskan, silahkan coba beberapa saat lagi atau kembali ke halaman utama'
+      }
+      if (ltext.includes('timeout exceeded')) {
+        out = 'Koneksi internet anda tidak stabil, silahkan coba beberapa saat lagi'
       }
     }
     return out

package/modules/lib/datepicker.tsx

@@ -130,7 +130,7 @@ export default function m(props: LibDatepickerProps): any {
   function itemRenderer(data: any, index: number, isSelected: boolean) {
     return (
       <View>
-        <Text style={{ fontWeight: isSelected ? 'bold' : 'normal' }} >{data}</Text>
+        <Text style={{ fontSize: 20, fontWeight: isSelected ? 'bold' : 'normal' }} >{data}</Text>
       </View>
     )
   }

package/modules/lib/image.tsx

@@ -7,7 +7,7 @@ import { SaveFormat } from 'expo-image-manipulator';
 import * as ImagePicker from 'expo-image-picker';
 import React from 'react';
 import {
-  ActivityIndicator, Alert, Image, TouchableOpacity, View
+    ActivityIndicator, Alert, Image, TouchableOpacity, View
 } from 'react-native';
 const { height, width } = LibStyle;
 

package/modules/lib/picture.tsx

@@ -51,12 +51,17 @@ const fetchPicture = LibWorker.registerJobAsync('lib_picture_fetch', (url: strin
             let wantedheight = 0
             let wantedwidth = 0
             let ratio = rawwidth / rawheight
-            if (rawheight > rawwidth) {
-              wantedwidth = wantedMaxSize * ratio;
-              wantedheight = wantedMaxSize;
+            if (Math.max(rawheight, rawwidth) > wantedMaxSize) {
+              if (rawheight > rawwidth) {
+                wantedwidth = wantedMaxSize * ratio;
+                wantedheight = wantedMaxSize;
+              } else {
+                wantedwidth = wantedMaxSize;
+                wantedheight = wantedMaxSize / ratio;
+              }
             } else {
-              wantedwidth = wantedMaxSize;
-              wantedheight = wantedMaxSize / ratio;
+              wantedwidth = rawwidth
+              wantedheight = rawheight
             }
             let canvas = document.createElement('canvas');
             let ctx = canvas.getContext('2d');

package/modules/lib/timepicker.tsx

@@ -0,0 +1,131 @@
+// withHooks 
+// noPage
+
+import { LibStyle, useSafeState } from 'esoftplay';
+import { LinearGradient } from 'expo-linear-gradient';
+import React, { useEffect, useRef } from 'react';
+import { Text, TouchableOpacity, View } from 'react-native';
+import ScrollPicker from 'react-native-picker-scrollview';
+
+export interface LibTimepickerProps {
+  /* hh:mm:ss */
+  selectedTime: string,
+  onTimeChange: (second: string) => void,
+  /* hh:mm:ss */
+  minTime?: string,
+  /* hh:mm:ss */
+  maxTime?: string,
+  mode?: 24 | 12,
+  /* hh:mm:ss */
+  type?: "hour" | "hourMinute" | "hourMinuteSecond"
+}
+
+export default function m(props: LibTimepickerProps): any {
+
+  const _mode = props.mode || 24
+  const refHour = useRef<any>(null)
+  const refMinute = useRef<any>(null)
+  const refSecond = useRef<any>(null)
+  const t24 = _mode == 12 ? ["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11"] : ["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23"]
+  const t60 = ["00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59"]
+  const time = { hours: t24, minutes: t60, seconds: t60 }
+  const minTime = props.minTime
+  const maxTime = props.maxTime
+  const type = props.type || "hourMinuteSecond"
+  const [selectedTime, setSelectedTime] = useSafeState(props.selectedTime || minTime)
+  let sHour = selectedTime.split(':')[0]
+  let sMinute = selectedTime.split(':')[1]
+  let sSecond = selectedTime.split(':')[2]
+  let showHour = (type == 'hour') || (type == 'hourMinute') || (type == 'hourMinuteSecond');
+  let showHourMinute = (type == 'hourMinuteSecond') || (type == 'hourMinute');
+  let showHourMinuteSecond = type == 'hourMinuteSecond';
+
+  function scrollTo(time: string) {
+    refHour?.current?.scrollToIndex(t24.indexOf(time.split(':')[0]))
+    refMinute?.current?.scrollToIndex(t60.indexOf(time.split(':')[1]))
+    refSecond?.current?.scrollToIndex(t60.indexOf(time.split(':')[2]))
+  }
+
+  useEffect(() => {
+    if (selectedTime) {
+      let toTime = null
+      if (maxTime && selectedTime > maxTime) {
+        toTime = maxTime;
+      } else if (minTime && selectedTime < minTime) {
+        toTime = minTime;
+      }
+      if (toTime != null){
+        scrollTo(toTime);
+        setSelectedTime(toTime);
+      }
+    }
+  }, [selectedTime])
+
+  function itemRenderer(data: any, index: number, isSelected: boolean) {
+    return (
+      <View>
+        <Text style={{ fontSize: 20, fontWeight: isSelected ? 'bold' : 'normal' }} >{data}</Text>
+      </View>
+    )
+  }
+
+  return (
+    <View style={{ flex: 1, backgroundColor: 'white' }} >
+      <View style={{ height: 44, alignItems: 'flex-end', backgroundColor: '#fafafa' }} >
+        <TouchableOpacity onPress={() => { props.onTimeChange(selectedTime) }} >
+          <Text style={{ fontSize: 15, fontWeight: "500", paddingHorizontal: 9, paddingVertical: 13, fontStyle: "normal", letterSpacing: 0, color: LibStyle.colorPrimary }} >Done</Text>
+        </TouchableOpacity>
+      </View>
+      <View style={{ width: 180, flex: 1, height: 175, alignSelf: 'center' }} >
+        <View style={{ height: 175, flexDirection: 'row', alignItems: 'center' }} >
+          <View style={{ width: showHour ? undefined : 0, flex: showHour ? 1 : 0, }} >
+            <ScrollPicker
+              ref={refHour}
+              dataSource={time.hours}
+              selectedIndex={time.hours.indexOf(sHour)}
+              itemHeight={35}
+              wrapperHeight={175}
+              wrapperColor={'#ffffff'}
+              highlightColor={'#c8c7cc'}
+              renderItem={itemRenderer}
+              onValueChange={(value: any) => setSelectedTime(value + ':' + sMinute + ":" + sSecond)}
+            />
+          </View>
+          <Text style={{ width: showHourMinute ? undefined : 0, fontSize: 30, marginBottom: 5 }} >:</Text>
+          <View style={{ width: showHourMinute ? undefined : 0, flex: showHourMinute ? 1 : 0 }} >
+            <ScrollPicker
+              ref={refMinute}
+              dataSource={time.minutes}
+              selectedIndex={time.minutes.indexOf(sMinute)}
+              itemHeight={35}
+              wrapperHeight={175}
+              wrapperColor={'#ffffff'}
+              highlightColor={'#c8c7cc'}
+              renderItem={itemRenderer}
+              onValueChange={(value: any) => setSelectedTime(sHour + ':' + value + ":" + sSecond)}
+            />
+          </View>
+          <Text style={{ width: showHourMinuteSecond ? undefined : 0, fontSize: 30, marginBottom: 5 }} >:</Text>
+          <View style={{ width: showHourMinuteSecond ? undefined : 0, flex: showHourMinuteSecond ? 1 : 0, }} >
+            <ScrollPicker
+              ref={refSecond}
+              dataSource={time.seconds}
+              selectedIndex={time.seconds.indexOf(sSecond)}
+              itemHeight={35}
+              wrapperHeight={175}
+              wrapperColor={'#ffffff'}
+              highlightColor={'#c8c7cc'}
+              renderItem={itemRenderer}
+              onValueChange={(value: any) => setSelectedTime(sHour + ':' + sMinute + ":" + value)}
+            />
+          </View>
+        </View>
+      </View>
+      <LinearGradient
+        start={{ x: 1, y: 0 }}
+        end={{ x: 1, y: 1 }}
+        colors={['rgba(255,255,255,1)', 'rgba(255,255,255,0.8)', 'rgba(255,255,255,0)', 'rgba(255,255,255,0.8)', 'rgba(255,255,255,1)']}
+        pointerEvents='none' style={{ height: 175, position: 'absolute', top: 44, bottom: 0, left: 0, right: 0 }} />
+    </View>
+  )
+}

package/modules/user/index.tsx

@@ -3,12 +3,11 @@
 
 import { esp, LibDialog, LibImage, LibNet_status, LibProgress, LibStyle, LibToast, LibUpdaterProperty, LibVersion, LibWorker, LibWorkloop, LibWorkview, UseDeeplink, UserClass, UserLoading, UserMain, UserRoutes, useSafeState, _global } from 'esoftplay';
 import * as Font from "expo-font";
-import firebase from 'firebase';
 import React, { useEffect, useMemo } from "react";
 import { Alert, View } from "react-native";
-//@ts-ignore
 import Navs from "../../cache/navs";
 
+
 export interface UserIndexProps {
 
 }
@@ -56,9 +55,12 @@ export default function m(props: UserIndexProps): any {
       ], { cancelable: false })
     }, 30 * 1000);
     if (esp.config('firebase').hasOwnProperty('apiKey')) {
-      if (!firebase.apps.length) {
-        firebase.initializeApp(esp.config('firebase'));
-        firebase.auth().signInAnonymously()
+      try {
+        const chatFirebase = require('../chatting/firebase')?.default
+        if (chatFirebase)
+          chatFirebase?.signInAnonymously?.();
+      } catch (error) {
+
       }
     }
     UserClass.isLogin(async () => {

package/modules/user/login.tsx

@@ -31,7 +31,7 @@ export interface UserLoginState {
   isLoading: boolean
 }
 
-export default class euserLogin extends LibComponent<UserLoginProps, UserLoginState> {
+export default class m extends LibComponent<UserLoginProps, UserLoginState> {
 
   inputUsername: any;
   inputPassword: any;

package/modules/user/notification.tsx

@@ -1,9 +1,9 @@
 //
 
 import {
-  esp, LibComponent, LibCrypt,
-  LibCurl, LibIcon, LibList, LibNotification, LibObject, LibStatusbar, LibStyle, LibUtils, useGlobalReturn, useGlobalState,
-  UserClass, UserNotification_item
+    esp, LibComponent, LibCrypt,
+    LibCurl, LibIcon, LibList, LibNotification, LibObject, LibStatusbar, LibStyle, LibUtils, useGlobalReturn, useGlobalState,
+    UserClass, UserNotification_item
 } from "esoftplay";
 import * as Notifications from 'expo-notifications';
 import React from "react";

package/package.json

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