esoftplay 0.0.268 → 0.0.269-beta3bf30de

package/modules/lib/curl.ts

@@ -1,8 +1,9 @@
 
 
 //noPage
-import { reportApiError } from "esoftplay/error";
 import esp from 'esoftplay/esp';
+import { LibCrypt } from 'esoftplay/cache/lib/crypt/import';
+import { reportApiError } from "esoftplay/error";
 
 //api_logger_import
 
@@ -115,7 +116,6 @@ export default class m {
   protected async setHeader(): Promise<void> {
     return new Promise((r) => {
       if ((/:\/\/data.*?\/(.*)/g).test(this.url)) {
-        const LibCrypt = esp.mod("lib/crypt")
         this.header["masterkey"] = new LibCrypt().encode(this.url)
       }
       r()

package/modules/lib/focus.tsx

@@ -2,8 +2,8 @@
 // noPage
 
 import { useIsFocused } from '@react-navigation/native';
-import React, { useEffect } from 'react';
-import { InteractionManager, View, ViewStyle } from 'react-native';
+import { useEffect } from 'react';
+import { View, ViewStyle } from 'react-native';
 
 export interface LibFocusProps {
   isFocused?: boolean
@@ -21,10 +21,10 @@ export default function m(props: LibFocusProps): any {
   const isFocused = useIsFocused()
 
   useEffect(() => {
-    if (isFocused) {
-      InteractionManager.runAfterInteractions(props?.onFocus)
-    } else {
-      InteractionManager.runAfterInteractions(props?.onBlur)
+    const callback = isFocused ? props.onFocus : props.onBlur
+    if (typeof callback === "function") {
+      const task = requestIdleCallback(callback)
+      return () => cancelIdleCallback(task)
     }
   }, [isFocused]);
 

package/modules/lib/lazy.tsx

@@ -3,7 +3,6 @@
 
 import useSafeState from 'esoftplay/state';
 import { useEffect } from 'react';
-import { InteractionManager } from 'react-native';
 
 export interface LibLazyProps {
   children?: any;
@@ -32,10 +31,10 @@ export default function m(props: LibLazyProps): any {
   const [done, setDone] = useSafeState(false);
 
   useEffect(() => {
-    const int = InteractionManager.runAfterInteractions(() => {
+    const int = requestIdleCallback(() => {
       setDone(true)
     })
-    return () => int.cancel()
+    return () => cancelIdleCallback(int)
   }, [])
 
   // const [sync] = useTasks((item) => new Promise((next) => {

package/modules/lib/notify.ts

@@ -2,7 +2,7 @@
 // noPage
 import esp from 'esoftplay/esp';
 import useGlobalState from 'esoftplay/global';
-
+import { LibCrypt } from 'esoftplay/cache/lib/crypt/import';
 
 export interface LibNotifyItem {
   to: string,
@@ -27,7 +27,6 @@ export default function libnotify(res: LibNotifyProps): any {
 const curl = (data: LibNotifyItem) => {
   let dData: any = data
   if (!dData.to.includes("ExponentPushToken")) {
-    const LibCrypt = esp.mod("lib/crypt")
     dData['to'] = new LibCrypt().decode(dData.to)
   }
   fetch('https://exp.host/--/api/v2/push/send', {

package/modules/lib/updater.tsx

@@ -8,7 +8,6 @@ import { createTimeout } from 'esoftplay/timeout';
 
 import Constants from 'expo-constants';
 import * as Updates from 'expo-updates';
-import React from 'react';
 import { Alert, Pressable } from 'react-native';
 
 export interface LibUpdaterProps {
@@ -47,6 +46,7 @@ export function check(callback?: (isNew: boolean) => void): void {
     return
   }
   Updates.checkForUpdateAsync().then(({ isAvailable }) => {
+    Updates.clearLogEntriesAsync()
     if (!isAvailable) {
       callback?.(false)
       LibProgress?.hide?.()

package/modules/lib/workloop.tsx

@@ -4,7 +4,7 @@ import { LibNotification } from 'esoftplay/cache/lib/notification/import';
 import { UserClass } from 'esoftplay/cache/user/class/import';
 import esp from 'esoftplay/esp';
 import React from 'react';
-import { InteractionManager, View } from 'react-native';
+import { View } from 'react-native';
 import { WebView } from 'react-native-webview';
 
 export interface LibWorkloopProps {
@@ -58,7 +58,7 @@ export default class m extends LibComponent<LibWorkloopProps, LibWorkloopState>
 
   static onMessage(e: any): void {
     if (workloopHasTask) {
-      InteractionManager.runAfterInteractions(() => {
+      requestIdleCallback(() => {
         const ctask = workloopTasks?.[0]
         if (ctask) {
           if (ctask.length == 2) {

package/modules/sys/esp.ts

@@ -2,7 +2,6 @@
 
 import { appjson, configjson, configlivejson } from 'esoftplay/bin/files';
 import { EspAssets } from 'esoftplay/cache/assets';
-import cacheConfig from 'esoftplay/cache/config.json';
 import { LibLocale } from 'esoftplay/cache/lib/locale/import';
 import { EspRouterPropertyInterface } from 'esoftplay/cache/properties';
 import { EspRouterInterface } from 'esoftplay/cache/routers';
@@ -10,8 +9,11 @@ import * as Application from 'expo-application';
 import { LogBox, Platform } from 'react-native';
 import 'react-native-reanimated';
 import './oneplusfixfont';
+// import cacheConfig from 'esoftplay/../../config.json';
+// import idJson from 'esoftplay/../../assets/locale/id.json';
 
-type ConfigType = typeof cacheConfig
+type ConfigType = any;
+type LangIndexType = any;
 
 const ignoreWarns = [
   "Setting a timer for a long period of time",
@@ -127,7 +129,7 @@ const esp = {
       return out;
     }
   },
-  lang<T extends keyof EspRouterInterface>(moduleTask: T, langName: string, ...stringToBe: string[]): string {
+  lang<T extends keyof LangIndexType>(moduleTask: T, langName: string, ...stringToBe: string[]): string {
     let string = LibLocale.stateLang().get()?.[esp.langId()]?.[moduleTask]?.[langName]
     if (!string) {
       string = esp.assets("locale/id.json")?.[moduleTask]?.[langName]
@@ -166,7 +168,7 @@ const esp = {
     const properties = require('esoftplay/cache/properties')
     return properties(modtast.join("/"));
   },
-  _config(): typeof cacheConfig {
+  _config(): ConfigType {
     let app = esp.mergeDeep(appjson, configjson)
     var msg = ''
     if (!app.hasOwnProperty('config')) {

package/modules/sys/mmkv.ts

@@ -1,4 +1,7 @@
 // noPage
+
+import { createMMKV } from "react-native-mmkv";
+
 // withObject
 let storage: any;
 let isWeb = typeof window !== 'undefined' && typeof window.localStorage !== 'undefined';
@@ -19,8 +22,7 @@ if (isWeb) {
   }
 } else {
   // @ts-ignore
-  const MMKV = require('react-native-mmkv').MMKV;
-  storage = new MMKV();
+  storage = createMMKV()
 }
 
 /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/mmkv.md) untuk melihat dokumentasi*/
@@ -39,7 +41,7 @@ const FastStorage = {
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/mmkv.md#removeItem) untuk melihat dokumentasi*/
   removeItem(key: string) {
-    storage.delete(key)
+    storage.remove(key)
   },
   /** Klik [disini](https://github.com/dev-esoftplay/mobile-docs/blob/main/mmkv.md#clear) untuk melihat dokumentasi*/
   clear(): void {

package/modules/sys/storage.ts

@@ -1,90 +1,119 @@
 //noPage
-import * as FileSystem from 'expo-file-system';
+import { Directory, File, Paths } from "expo-file-system";
 
-const CACHE_DIR = `${FileSystem.cacheDirectory}lib-storage-cache/`;
+const CACHE_DIR = new Directory(Paths.cache, "lib-storage-cache");
 
 (async () => {
   try {
-    await FileSystem.makeDirectoryAsync(CACHE_DIR);
-  } catch (e) {
-    // do nothing
-  }
+    if (!CACHE_DIR.exists) {
+      CACHE_DIR.create();
+    }
+  } catch { }
 })();
 
 const Storage = {
-  getDBPath(key: string): string {
-    const path = `${CACHE_DIR}${key.replace(/\//g, "-")}.txt`;
-    return path;
+  getDBPath(key: string): File {
+    const name = key.replace(/\//g, "-") + ".txt";
+    return new File(CACHE_DIR, name);
   },
-  async getItem(key: string): Promise<string | null> {
-    const path = this.getDBPath(key);
+
+  async getItem(key: string): Promise<any | null> {
     try {
-      const info = await FileSystem.getInfoAsync(path);
-      const { exists } = info;
-      if (exists) {
-        const value = await FileSystem.readAsStringAsync(path, { encoding: 'utf8' });
-        return JSON.parse(value);
-      }
-    } catch (error) {
+      const file = this.getDBPath(key);
+
+      if (!file.exists) return null;
+
+      const value = await file.text();
+      return JSON.parse(value);
+    } catch {
       return null;
     }
-    return null;
   },
+
   async setItem(key: string, value: string): Promise<string> {
-    const path = this.getDBPath(key);
-    await FileSystem.writeAsStringAsync(path, value, { encoding: 'utf8' });
+    const file = this.getDBPath(key);
+
+    await file.write(value);
+
     return value;
   },
+
   async removeItem(key: string): Promise<string> {
-    const path = this.getDBPath(key);
     try {
-      await FileSystem.deleteAsync(path);
-    } catch (error) { }
+      const file = this.getDBPath(key);
+
+      if (file.exists) {
+        file.delete();
+      }
+    } catch { }
+
     return key;
   },
+
   clear(): void {
-    FileSystem.deleteAsync(CACHE_DIR);
+    try {
+      if (CACHE_DIR.exists) {
+        CACHE_DIR.delete();
+      }
+    } catch { }
   },
-  async sendTelegram(key: string, message: string, onDone?: () => void, onFailed?: (reason: string) => void, chat_id?: string, customFileName?: (originalName: string) => string,) {
 
+  async sendTelegram(
+    key: string,
+    message: string,
+    onDone?: () => void,
+    onFailed?: (reason: string) => void,
+    chat_id?: string,
+    customFileName?: (originalName: string) => string
+  ) {
     try {
-      let dbPath = Storage.getDBPath(key)
-      let fileInfo = await FileSystem.getInfoAsync(dbPath, {});
-      if (!fileInfo.exists) {
-        onFailed?.("File not found")
-        return
+      const file = this.getDBPath(key);
+
+      if (!file.exists) {
+        onFailed?.("File not found");
+        return;
       }
 
-      const fileName = fileInfo?.uri?.split('/').pop();
+      const fileName = file.name;
 
       if (fileName) {
-        var parts = fileName.split('.');
-        var fileWithoutExtension = parts.slice(0, -1).join('.');
-        var extension = parts[parts.length - 1];
+        const parts = fileName.split(".");
+        const fileWithoutExtension = parts.slice(0, -1).join(".");
+        const extension = parts[parts.length - 1];
+
         const formData = new FormData();
-        formData.append('caption', message);
-        formData.append('chat_id', chat_id ?? '-1001737180019');
-        formData.append('document', {
-          uri: dbPath,
-          name: (customFileName?.(fileWithoutExtension) || fileWithoutExtension) + "." + extension,
-          type: 'text/csv',
-        });
-        const response = await fetch(`https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendDocument`, {
-          method: 'POST',
-          body: formData,
-        });
+        formData.append("caption", message);
+        formData.append("chat_id", chat_id ?? "-1001737180019");
+
+        formData.append("document", {
+          uri: file.uri,
+          name:
+            (customFileName?.(fileWithoutExtension) || fileWithoutExtension) +
+            "." +
+            extension,
+          type: "text/csv",
+        } as any);
+
+        const response = await fetch(
+          `https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendDocument`,
+          {
+            method: "POST",
+            body: formData,
+          }
+        );
 
         const result = await response.json();
-        if (result.ok == true) {
-          onDone?.()
+
+        if (result.ok === true) {
+          onDone?.();
         } else {
-          onFailed?.(result)
+          onFailed?.(JSON.stringify(result));
         }
       }
     } catch (ex) {
-      onFailed?.(String(ex))
+      onFailed?.(String(ex));
     }
-  }
-}
+  },
+};
 
-export default Storage;
+export default Storage;

package/modules/sys/subscribe.ts

@@ -2,7 +2,6 @@
 // useLibs
 
 import React from 'react';
-import { InteractionManager } from 'react-native';
 
 export interface useGlobalSubscriberReturn<T> {
   getValue: () => any,
@@ -38,7 +37,7 @@ export default function useGlobalSubscriber<T>(defaultValue?: any): useGlobalSub
   function notify(newValue?: any) {
     value = newValue;
     subscribers.forEach((fun: Function) => {
-      InteractionManager.runAfterInteractions(() => {
+      requestIdleCallback(() => {
         fun?.(newValue)
       })
     });

package/modules/use/deeplink.ts

@@ -41,7 +41,6 @@ export default function m(defaultUrl?: string): void {
                     if (action?.scroll)
                       esp.modProp("bigbang/main").scrollToIndex(action.scroll)
                   } else {
-                    //@ts-ignore
                     esp.mod("lib/navigation").push(cmodule, { url: url, action: res.result.action })
                   }
                 }

package/modules/user/class.ts

@@ -3,6 +3,7 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { getMessaging } from '@react-native-firebase/messaging';
 import { LibObject } from 'esoftplay/cache/lib/object/import';
+import { LibCrypt } from 'esoftplay/cache/lib/crypt/import';
 import esp from 'esoftplay/esp';
 import useGlobalState, { useGlobalReturn } from 'esoftplay/global';
 import moment from "esoftplay/moment";
@@ -91,7 +92,6 @@ export default {
   async sendToken(token: string) {
     if (token) {
       const config = esp.config();
-      const LibCrypt = esp.mod("lib/crypt")
       var post: any = {
         user_id: 0,
         group_id: esp.config('group_id'),

package/package.json

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

package/publisher.js

@@ -2,14 +2,10 @@ const shell = require('child_process').execSync;
 const packJson = require("./package.json")
 const fs = require('fs');
 const version = packJson.version
-const vm = version.match(/([a-z])/g)
-const letter = vm ? vm[0] : null
-const number = version.replace(/-/g, "").replace(letter, "")
-let nextNumber = number.split(".")[2]
-let nextVersion = number.split(".")[0] + "." + number.split(".")[1] + "."
-
-nextNumber = Number(nextNumber) + 1
-nextVersion += nextNumber
+const baseVersion = version.split('-')[0]
+const parts = baseVersion.split('.')
+let nextNumber = parseInt(parts[2]) + 1
+let nextVersion = parts[0] + '.' + parts[1] + '.' + nextNumber
 const newPackJson = { ...packJson, version: nextVersion }
 fs.writeFileSync("./package.json", JSON.stringify(newPackJson, undefined, 2))
 shell("npm publish", { stdio: ['inherit', 'inherit', 'inherit'] })

package/publisher_beta.js

@@ -0,0 +1,12 @@
+const shell = require('child_process').execSync;
+const packJson = require("./package.json")
+const fs = require('fs');
+const crypto = require('crypto')
+const version = packJson.version
+const baseVersion = version.split('-')[0]
+const randomHash = crypto.randomBytes(4).toString('hex').substring(0,7)
+const nextVersion = baseVersion + '-beta' + randomHash
+const newPackJson = { ...packJson, version: nextVersion }
+fs.writeFileSync("./package.json", JSON.stringify(newPackJson, undefined, 2))
+shell("npm publish", { stdio: ['inherit', 'inherit', 'inherit'] })
+console.log("\nbun add esoftplay@" + nextVersion + " && bun install\n")