esoftplay 0.0.123 → 0.0.124

package/assets/cancel.mjs

@@ -0,0 +1,8 @@
+import fs from 'fs'
+fs.readdirSync("./modules", { encoding: 'utf8' }).forEach((module) => {
+  fs.readdirSync("./modules/" + module, { encoding: 'utf8' }).forEach((task) => {
+    const path = "./modules/" + module + "/" + task
+    let file = fs.readFileSync(path, { encoding: 'utf8' })
+    fs.writeFileSync(path, file.replace("../../assets/worker", "esoftplay/libs/worker"), { encoding: 'utf8' })
+  })
+})

package/assets/prepare.mjs

@@ -0,0 +1,9 @@
+import fs from 'fs'
+fs.readdirSync("./modules", { encoding: 'utf8' }).forEach((module) => {
+  fs.readdirSync("./modules/" + module, { encoding: 'utf8' }).forEach((task) => {
+    console.log(task)
+    const path = "./modules/" + module + "/" + task
+    let file = fs.readFileSync(path, { encoding: 'utf8' })
+    fs.writeFileSync(path, file.replace(/esoftplay\/libs\/worker/g, "../../assets/worker"), { encoding: 'utf8' })
+  })
+})

package/assets/withAndroidVerifiedLinksWorkaround.js

@@ -0,0 +1,71 @@
+const { createRunOncePlugin, withAndroidManifest } = require('@expo/config-plugins');
+
+/**
+ * @typedef {import('@expo/config-plugins').ConfigPlugin} ConfigPlugin
+ * @typedef {import('@expo/config-plugins').AndroidManifest} AndroidManifest
+ */
+
+/**
+ * Remove the custom Expo dev client scheme from intent filters, which are set to `autoVerify=true`.
+ * The custom scheme `<data android:scheme="exp+<slug>"/>` seems to block verification for these intent filters.
+ * This plugin makes sure there is no scheme in the autoVerify intent filters, that starts with `exp+`.
+ *
+ * @type {ConfigPlugin}
+ */
+const withAndroidVerifiedLinksWorkaround = config =>
+  withAndroidManifest(config, config => {
+    config.modResults = removeExpoSchemaFromVerifiedIntentFilters(config.modResults);
+    return config;
+  });
+
+/**
+ * Iterate over all `autoVerify=true` intent filters, and pull out schemes starting with `exp+`.
+ *
+ * @param {AndroidManifest} androidManifest
+ */
+function removeExpoSchemaFromVerifiedIntentFilters(androidManifest) {
+  for (const application of androidManifest.manifest.application || []) {
+    for (const activity of application.activity || []) {
+      if (activityHasSingleTaskLaunchMode(activity)) {
+        for (const intentFilter of activity['intent-filter'] || []) {
+          if (intentFilterHasAutoVerification(intentFilter) && intentFilter?.data) {
+            intentFilter.data = intentFilterRemoveSchemeFromData(intentFilter, scheme =>
+              scheme?.startsWith('exp+')
+            );
+          }
+        }
+        break;
+      }
+    }
+  }
+
+  return androidManifest;
+}
+
+/**
+ * Determine if the activity should contain the intent filters to clean.
+ *
+ */
+function activityHasSingleTaskLaunchMode(activity) {
+  return activity?.$?.['android:launchMode'] === 'singleTask';
+}
+
+/**
+ * Determine if the intent filter has `autoVerify=true`.
+ */
+function intentFilterHasAutoVerification(intentFilter) {
+  return intentFilter?.$?.['android:autoVerify'] === 'true';
+}
+
+/**
+ * Remove schemes from the intent filter that matches the function.
+ */
+function intentFilterRemoveSchemeFromData(intentFilter, schemeMatcher) {
+  return intentFilter?.data?.filter(entry => !schemeMatcher(entry?.$['android:scheme'] || ''));
+}
+
+module.exports = createRunOncePlugin(
+  withAndroidVerifiedLinksWorkaround,
+  'withAndroidVerifiedLinksWorkaround',
+  '1.0.0'
+);

package/bin/build.js

@@ -151,13 +151,15 @@ if (fs.existsSync(packjson)) {
 		"developmentClient": true,
 		"distribution": "internal",
 		"ios": {
-			"simulator": true
+			"simulator": true,
+			"resourceClass": "m1-medium"
 		}
 	},
 	"preview": {
 		"distribution": "internal",
 		"ios": {
-			"simulator": true
+			"simulator": true,
+			"resourceClass": "m1-medium"
 		}
 	},
 	"preview_build": {
@@ -246,19 +248,21 @@ yarn-error.log\n\
 		});
 
 		const AppJS = `
+
 import { LibNotification } from 'esoftplay/cache/lib/notification/import';
 import { UserIndex } from 'esoftplay/cache/user/index/import';
 import * as ErrorReport from 'esoftplay/error';
 import { globalIdx } from 'esoftplay/global';
+import Worker from 'esoftplay/libs/worker';
 import * as Notifications from 'expo-notifications';
 import React, { useEffect } from 'react';
-import { enableFreeze, enableScreens } from 'react-native-screens';
-		
-enableFreeze()
+import { /* enableFreeze, */ enableScreens } from 'react-native-screens';
+
+/* enableFreeze() */
 enableScreens()
-		
 
 Notifications.addNotificationResponseReceivedListener(x => LibNotification.onAction(x));
+Notifications.addNotificationReceivedListener(x => LibNotification.onAction(x));
 
 export default function App() {
 	useEffect(() => {
@@ -266,7 +270,11 @@ export default function App() {
 		ErrorReport.getError()
 	}, [])
 
-	return (<UserIndex />)
+	return (
+		<Worker.Provider>
+			<UserIndex />
+		</Worker.Provider>
+	)
 }`;
 		let expoLib = [
 			'@expo/vector-icons',
@@ -276,6 +284,7 @@ export default function App() {
 			'@react-navigation/native-stack',
 			'@react-navigation/native',
 			'@react-navigation/stack',
+			'@shopify/flash-list',
 			'buffer',
 			'expo-application',
 			'expo-camera',

package/bin/cli.js

@@ -24,7 +24,7 @@ var args = process.argv.slice(2);
 
 // console.log(modpath, "sdofsjdofjsd")
 function execution() {
-	const cmd = `watchman -j <<< '["trigger","./",{"name":"esp","expression":["allof",["not",["dirname","node_modules"]],["not",["name","index.d.ts"]]],"command":["node","./node_modules/esoftplay/bin/router.js"],"append_files":true}]' && node ./node_modules/esoftplay/bin/router.js`
+	const cmd = `watchman watch-del ./ && watchman watch ./ && watchman -j <<< '["trigger","./",{"name":"esp","expression":["allof",["not",["dirname","node_modules"]],["not",["name","index.d.ts"]]],"command":["node","./node_modules/esoftplay/bin/router.js"],"append_files":true}]' && node ./node_modules/esoftplay/bin/router.js`
 	command(cmd)
 }
 
@@ -423,7 +423,7 @@ function consoleError(msg) {
 }
 
 function consoleSucces(msg) {
-	console.log("\x1b[32m", msg + " ✓", "\x1b[0m")
+	console.log("\x1b[32m", msg + " ✔", "\x1b[0m")
 }
 
 function checkApp() {
@@ -669,11 +669,13 @@ function buildPrepare(include = true) {
 					comm.push(`cp -n ./node_modules/esoftplay/modules/${module}/* ./modules/${module}`)
 				}
 			});
+			comm.push('cp ./node_modules/esoftplay/libs/worker.tsx ./assets/')
+			comm.push('node ./node_modules/esoftplay/assets/prepare.mjs')
 			consoleSucces("\n\nPLEASE COPY AND EXECUTE THE FOLLOWING COMMAND\n\n" + comm.join('\n') + "\n")
 		}
 	} else {
 		if (fs.existsSync('./assets/esoftplaymodules'))
-			command('rm -rf modules && mv ./assets/esoftplaymodules modules')
+			command('rm -rf modules && mv ./assets/esoftplaymodules modules && rm -f ./assets/worker.tsx && node ./node_modules/esoftplay/assets/cancel.mjs')
 		else
 			consoleError('')
 	}
@@ -716,7 +718,9 @@ function build() {
 			{
 				name: "1. Web (for Hosting)",
 				cmd: "npx expo export:web",
-				pre: () => { }
+				pre: () => {
+
+				}
 			},
 		]
 		:
@@ -826,6 +830,8 @@ function build() {
 				if (pre) pre()
 				consoleSucces("⚙⚙⚙ ... \n" + cmd)
 				command(cmd)
+				if (fs.existsSync('./build/post.js'))
+					command('node ./build/post.js')
 				configAvailable(false)
 				devClientPos(appjson)
 			} else if (d === false) {

package/esp.ts

@@ -17,7 +17,7 @@ const ignoreWarns = [
 const err = console.error;
 console.error = (...arg) => {
   for (let i = 0; i < ignoreWarns.length; i++) {
-    if (arg[0].startsWith(ignoreWarns[i])) return;
+    if (arg?.[0]?.startsWith?.(ignoreWarns[i])) return;
   }
   err(...arg);
 };
@@ -25,7 +25,7 @@ console.error = (...arg) => {
 const warn = console.warn;
 console.warn = (...arg) => {
   for (let i = 0; i < ignoreWarns.length; i++) {
-    if (arg[0].startsWith(ignoreWarns[i])) return;
+    if (arg?.[0]?.startsWith?.(ignoreWarns[i])) return;
   }
   warn(...arg);
 };

package/import_translator.mjs

@@ -6,10 +6,8 @@ if (fs.existsSync('./modules')) {
     if (!module.startsWith('.')) {
       fs.readdirSync('./modules/' + module).forEach((task) => {
         var dFile = fs.readFileSync('./modules/' + module + '/' + task, { encoding: 'utf8' })
-        // if (module == 'artist' && task == 'detail.tsx') {
         dFile = dFile.replace(/esoftplay\/cache\/([a-z0-9_]+\/[a-z0-9_]+).import/g, "esoftplay/cache/$1/import")
         console.log(module + '/' + task)
-        // }
         fs.writeFileSync('./modules/' + module + '/' + task, dFile, { encoding: 'utf8' })
       })
     }

package/libs/worker.tsx

@@ -140,22 +140,25 @@ const Worker = {
       }
     }
   },
-  View(): any {
+  Provider(props: any): any {
     if (Platform.OS == 'android')
       if (Platform.Version <= 22) {
-        return null
+        return props.children
       }
     return (
-      <View style={{ height: 0, width: 0 }} >
-        <WebView
-          ref={_global.WorkerBase}
-          style={{ width: 0, height: 0 }}
-          javaScriptEnabled={true}
-          injectedJavaScript={`\nwindow.ReactNativeWebView.postMessage("BaseWorkerIsReady")\n` + _global.injectedJavaScripts.join('\n') + '\ntrue;'}
-          originWhitelist={["*"]}
-          source={{ uri: esp.config("protocol") + "://" + esp.config("domain") + esp.config("uri") + "dummyPageToBypassCORS" }}
-          onMessage={Worker.onMessage('BaseWorkerIsReady')}
-        />
+      <View style={{ flex: 1 }} >
+        <View style={{ height: 0, width: 0 }} >
+          <WebView
+            ref={_global.WorkerBase}
+            style={{ width: 0, height: 0 }}
+            javaScriptEnabled={true}
+            injectedJavaScript={`\nwindow.ReactNativeWebView.postMessage("BaseWorkerIsReady")\n` + _global.injectedJavaScripts.join('\n') + '\ntrue;'}
+            originWhitelist={["*"]}
+            source={{ uri: esp.config("protocol") + "://" + esp.config("domain") + esp.config("uri") + "dummyPageToBypassCORS" }}
+            onMessage={Worker.onMessage('BaseWorkerIsReady')}
+          />
+        </View>
+        {props.children}
       </View>
     )
   }

package/modules/lib/curl.ts

@@ -7,7 +7,6 @@ import { LibProgress } from 'esoftplay/cache/lib/progress/import';
 import { LibToastProperty } from 'esoftplay/cache/lib/toast/import';
 import { LibUtils } from 'esoftplay/cache/lib/utils/import';
 import esp from 'esoftplay/esp';
-
 import { reportApiError } from "esoftplay/error";
 import Constants from 'expo-constants';
 
@@ -352,7 +351,7 @@ export default class m {
       mode: "cors",
     }
 
-    
+
     this.initTimeout(upload ? 120000 : this.timeout)
     if (debug == 1) esp.log(this.url + this.uri, options)
     this.fetchConf = { url: this.url + this.uri, options: options }
@@ -375,7 +374,10 @@ export default class m {
       //   }, 100);
       // } else {
       // }
-      LibToastProperty.show("Koneksi internet kamu tidak stabil, silahkan coba lagi")
+      if (__DEV__) {
+        console.warn(r)
+      } else
+        LibToastProperty.show("Koneksi internet kamu tidak stabil, silahkan coba lagi")
       this.onFetchFailed(r)
       LibProgress.hide()
     })

package/modules/lib/keyboard_avoid.tsx

@@ -10,7 +10,7 @@ export interface LibKeyboard_avoidProps {
 }
 export default function m(props: LibKeyboard_avoidProps): any {
   return (
-    <KeyboardAvoidingView behavior={Platform.OS == 'android' ? 'height' : 'padding'} style={props.style} >
+    <KeyboardAvoidingView behavior={Platform.OS == 'android' ? 'height' : 'padding'} style={[{ flex: 1 }, props.style]} >
       {props.children}
     </KeyboardAvoidingView>
   )

package/modules/lib/webview.tsx

@@ -6,7 +6,6 @@ import React from "react";
 import { Animated, Dimensions, Linking, Platform } from "react-native";
 import { WebView } from 'react-native-webview';
 let { width } = Dimensions.get("window");
-const config = esp.config();
 
 //modify webview error:  https://github.com/facebook/react-native/issues/10865
 
@@ -44,17 +43,18 @@ class ewebview extends LibComponent<LibWebviewProps, LibWebviewState> {
   _animatedValue: any;
   webview: any;
   heightMessage: any;
-
+  
   static defaultProps = {
     needAnimate: true,
     AnimationDuration: 500,
     defaultHeight: 100,
     needAutoResetHeight: true
   };
-
+  
   constructor(props: LibWebviewProps) {
     super(props);
     this.props = props
+    const config = esp.config();
     this.state = {
       height: props.defaultHeight,
       isFinish: false,
@@ -67,8 +67,9 @@ class ewebview extends LibComponent<LibWebviewProps, LibWebviewState> {
     this.resetHeight = this.resetHeight.bind(this)
     this.resetSmallHeight = this.resetSmallHeight.bind(this)
   }
-
+  
   static getDerivedStateFromProps(nextProps, prevState) {
+    const config = esp.config();
     return { source: nextProps.source && nextProps.source.hasOwnProperty("html") ? { html: config.webviewOpen + nextProps.source.html + config.webviewClose } : nextProps.source }
   }
 

package/modules/user/index.tsx

@@ -14,13 +14,14 @@ import Navs from 'esoftplay/cache/navs';
 import { UseDeeplink } from 'esoftplay/cache/use/deeplink/import';
 import { UserClass } from 'esoftplay/cache/user/class/import';
 import { UserHook } from 'esoftplay/cache/user/hook/import';
+import { LibIcon } from 'esoftplay/cache/lib/icon/import';
 import { UserLoading } from 'esoftplay/cache/user/loading/import';
 import { UserRoutes } from 'esoftplay/cache/user/routes/import';
-import Worker from 'esoftplay/libs/worker';
+import useGlobalState from 'esoftplay/global';
 import _global from 'esoftplay/_global';
 import * as Font from "expo-font";
 import React, { useEffect, useLayoutEffect } from 'react';
-import { Platform, View } from "react-native";
+import { Platform, Pressable, Text, View } from "react-native";
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
 
 export interface UserIndexProps {
@@ -49,7 +50,7 @@ function setFonts(): Promise<void> {
 function isWorkerReady(onReady: () => void): void {
   // @ts-ignore
   if (_global.WorkerReady < 1) {
-    
+
     setTimeout(() => isWorkerReady(onReady), 10)
   } else {
     onReady()
@@ -57,20 +58,20 @@ function isWorkerReady(onReady: () => void): void {
 }
 
 
-
+const route = useGlobalState<any>(undefined, { persistKey: 'user_index_routes_initial' })
 export default function m(props: UserIndexProps): any {
   const [loading, setLoading] = useSafeState(true)
   const user = UserClass.state().useSelector(s => s)
   const ready = React.useRef(0)
   UseDeeplink()
   //@ts-ignore
-  const initialState = __DEV__ ? _global.nav__state : undefined
+  const initialState = __DEV__ ? route.get() : undefined
 
   function handler(currentState: any): void {
     //@ts-ignore
     if (__DEV__) {
       //@ts-ignore
-      _global.nav__state = currentState
+      route.set(currentState)
     }
     UserRoutes.set(currentState)
   }
@@ -89,7 +90,7 @@ export default function m(props: UserIndexProps): any {
     }
 
     if (limitReady == 3) {
-      
+
       isWorkerReady(() => {
         ready.current += 1
         if (ready.current >= limitReady) {
@@ -128,7 +129,6 @@ export default function m(props: UserIndexProps): any {
   return (
     <GestureHandlerRootView style={{ flex: 1 }}>
       <View style={{ flex: 1 }}>
-        <Worker.View />
         {
           loading ?
             <UserLoading />
@@ -142,6 +142,12 @@ export default function m(props: UserIndexProps): any {
               <LibProgress />
               <LibToast />
               <UserHook />
+              {
+                __DEV__ &&
+                <Pressable onPress={() => route.reset()} style={{ position: 'absolute', right: 10, top: LibStyle.height * 0.5, padding: 10, backgroundColor: 'indigo', alignItems: 'center', justifyContent: 'center', borderRadius: 50 }} >
+                  <LibIcon name='delete-variant' color='white' />
+                </Pressable>
+              }
             </>
         }
       </View>

package/package.json

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