esoftplay 0.0.119-b → 0.0.119-c

package/global.ts

@@ -4,8 +4,6 @@ import { fastFilter, fastLoop } from './fast';
 const _global = require('./_global')
 const isEqual = require('react-fast-compare');
 
-
-
 export interface useGlobalReturn<T> {
   useState: () => [T, (newState: T) => void, () => void],
   get: () => T,

package/{modules/lib → libs}/worker.tsx

@@ -1,47 +1,30 @@
-// noPage
-
-import { _global } from 'esoftplay';
-import React, { Component } from "react";
-import { Platform } from 'react-native';
-
-
-export interface LibWorkerInit {
-  task: string,
-  taskId: string,
-  result: (res: string) => void
-}
-
-export interface LibWorkerProps {
-  tasks?: LibWorkerInit[],
-}
-export interface LibWorkerState {
-
-}
-_global.LibWorkerBase = React.createRef()
-_global.LibWorkerTasks = new Map()
+import React from "react";
+import { Platform, View } from 'react-native';
+import WebView from "react-native-webview";
+const _global = require('../_global').default
+const esp = require('../esp').default
+
+_global.WorkerBase = React.createRef()
+_global.WorkerTasks = new Map()
 _global.injectedJavaScripts = []
-_global.LibWorkerReady = 0
-_global.LibWorkerCount = 0
-
-export default class m extends Component<LibWorkerProps, LibWorkerState> {
-  constructor(props: LibWorkerProps) {
-    super(props)
-  }
-  static delete(taskId: string): void {
-    _global.LibWorkerTasks.delete(taskId)
-  }
-
-  static registerJob(name: string, func: Function): (params: any[], res: (data: any) => void) => void {
+_global.WorkerReady = 0
+_global.WorkerCount = 0
+
+const Worker = {
+  delete(taskId: string) {
+    _global.WorkerTasks.delete(taskId)
+  },
+  registerJob(name: string, func: Function): (params: any[], res: (data: any) => void) => void {
     'show source';
     const x = func.toString().replace('function', 'function ' + name)
     _global.injectedJavaScripts.push(x)
-    m.dispatch(() => x, '', () => { })
+    Worker.dispatch(() => x, '', () => { })
     return (params: (string | number | boolean)[], res: (data: string) => void) => {
       if (Platform.OS == 'android')
         if (Platform.Version <= 22) {
           return res(func(...params))
         }
-      m.dispatch(
+      Worker.dispatch(
         (id: number) => {
           let _params = params.map((param) => {
             if (typeof param == 'string')
@@ -52,13 +35,12 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
         }
         , '', res)
     }
-  }
-
-  static registerJobAsync(name: string, func: (...fparams: any[]) => Promise<any>): (params: any[], res: (data: any) => void) => void {
+  },
+  registerJobAsync(name: string, func: (...fparams: any[]) => Promise<any>): (params: any[], res: (data: any) => void) => void {
     'show source';
     const x = func.toString().replace('function', 'function ' + name)
     _global.injectedJavaScripts.push(x)
-    m.dispatch(() => x, '', () => { })
+    Worker.dispatch(() => x, '', () => { })
     return (params: (string | number | boolean)[], res: (data: string) => void) => {
       if (Platform.OS == 'android')
         if (Platform.Version <= 22) {
@@ -66,7 +48,7 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
           return
         }
 
-      m.dispatch(
+      Worker.dispatch(
         (id: number) => {
           let _params = params.map((param) => {
             if (typeof param == 'string')
@@ -77,24 +59,22 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
         }
         , '', res)
     }
-  }
-
-  static objToString(data: any): string {
+  },
+  objToString(data: any): string {
     if (Platform.OS == 'android')
       if (Platform.Version <= 22) {
         return JSON.stringify(data)
       }
     return JSON.stringify(JSON.stringify(data)).slice(1, -1);
-  }
-
-  static jobAsync(func: (...fparams: any[]) => Promise<any>, params: (string | number | boolean)[], res: (data: any) => void): void {
+  },
+  jobAsync(func: (...fparams: any[]) => Promise<any>, params: (string | number | boolean)[], res: (data: any) => void): void {
     'show source';
     if (Platform.OS == 'android')
       if (Platform.Version <= 22) {
         (async () => res(await func(...params)))()
         return
       }
-    m.dispatch(
+    Worker.dispatch(
       (id: number) => {
         const nameFunction = func.toString().replace('function', 'function tempFunction')
         let _params = params.map((param) => {
@@ -105,15 +85,14 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
         return (`(async () => window.ReactNativeWebView.postMessage(JSON.stringify({ data: await ` + nameFunction + `(` + _params.join(", ") + `), id: ` + id + ` })))();true;`)
       }
       , '', res)
-  }
-
-  static job(func: Function, params: (string | number | boolean)[], res: (data: any) => void): void {
+  },
+  job(func: Function, params: (string | number | boolean)[], res: (data: any) => void): void {
     'show source';
     if (Platform.OS == 'android')
       if (Platform.Version <= 22) {
         return res(func(...params))
       }
-    m.dispatch(
+    Worker.dispatch(
       (id: number) => {
         const nameFunction = func.toString().replace('function', 'function tempFunction')
         let _params = params.map((param) => {
@@ -126,46 +105,55 @@ export default class m extends Component<LibWorkerProps, LibWorkerState> {
         return out
       }
       , '', res)
-  }
-
-  // static image(url: string, toSize: number, result: (r: string) => void): void {
-  //   m.dispatch((id) => `imageCompress("` + id + `", "` + url + `", ` + PixelRatio.getPixelSizeForLayoutSize(toSize) + `)`, url, result)
-  // }
-
-  static dispatch(task: (id: number) => string, url: string, result: (r: string) => void): void {
-    if (_global.LibWorkerReady > 0 && typeof _global.LibWorkerBase?.current?.injectJavaScript == 'function') {
-      _global.LibWorkerCount++
-      var _task = task(_global.LibWorkerCount)
-      _global.LibWorkerTasks.set(String(_global.LibWorkerCount), {
+  },
+  dispatch(task: (id: number) => string, url: string, result: (r: string) => void): void {
+    if (_global.WorkerReady > 0 && typeof _global.WorkerBase?.current?.injectJavaScript == 'function') {
+      _global.WorkerCount++
+      var _task = task(_global.WorkerCount)
+      _global.WorkerTasks.set(String(_global.WorkerCount), {
         task: _task,
         result: result
       })
-      _global.LibWorkerBase?.current?.injectJavaScript?.(_task)
+      _global.WorkerBase?.current?.injectJavaScript?.(_task)
     } else {
       setTimeout(() => {
-        m.dispatch(task, url, result)
+        Worker.dispatch(task, url, result)
       }, 1000);
     }
-  }
-
-  static onMessage(withRefName: string): any {
+  },
+  onMessage(withRefName: string): any {
     return (e: any) => {
       if (e.nativeEvent.data == withRefName) {
-        _global.LibWorkerReady += 1
+        _global.WorkerReady += 1
         return
       }
       const dt = e.nativeEvent.data
       const x = JSON.parse(dt)
-      const itemTask = _global.LibWorkerTasks.get(String(x.id))
+      const itemTask = _global.WorkerTasks.get(String(x.id))
       if (itemTask) {
         itemTask.result(x.data)
-        m.delete(x.id)
+        Worker.delete(x.id)
       }
     }
-  }
-
-  render(): any {
-    return null
+  },
+  View(): any {
+    if (Platform.OS == 'android')
+      if (Platform.Version <= 22) {
+        return null
+      }
+    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>
+    )
   }
 }
-
+export default Worker

package/modules/lib/picture.tsx

@@ -1,11 +1,12 @@
 // withHooks
 // noPage
 
-import { esp, LibStyle, LibWorker, LibWorkloop, useSafeState } from 'esoftplay';
+import { esp, LibStyle, LibWorkloop, useSafeState } from 'esoftplay';
 import * as FileSystem from 'expo-file-system';
 import { useLayoutEffect } from 'react';
 import { PixelRatio, Platform, View } from 'react-native';
 import FastImage from 'react-native-fast-image';
+import Worker from '../../libs/worker';
 const sh = require("shorthash")
 
 export interface LibPictureSource {
@@ -36,7 +37,7 @@ const getCacheEntry = async (uri: string, toSize: number): Promise<{ exists: boo
   return { exists, path };
 };
 
-const fetchPicture = LibWorker?.registerJobAsync?.('lib_picture_fetch', (url: string, toSize: number) => {
+const fetchPicture = Worker.registerJobAsync?.('lib_picture_fetch', (url: string, toSize: number) => {
   'show source';
   return new Promise((resolve, reject) => {
     fetch(url, { mode: 'cors' })

package/modules/lib/updater.tsx

@@ -28,18 +28,18 @@ export function checkAlertInstall(): void {
   check((isNew) => { if (isNew) alertInstall() })
 }
 
-export function check(callback: (isNew: boolean) => void): void {
+export function check(callback?: (isNew: boolean) => void): void {
   if (__DEV__) {
-    callback(false)
+    callback?.(false)
     return
   }
   Updates.checkForUpdateAsync().then(({ isAvailable }) => {
     if (!isAvailable) {
-      callback(false)
+      callback?.(false)
       LibProgress.hide()
     } else {
       Updates.fetchUpdateAsync().then(({ isNew }) => {
-        callback(isNew)
+        callback?.(isNew)
       }).catch((e) => {
         LibProgress.hide()
       })

package/modules/user/index.tsx

@@ -1,7 +1,8 @@
 // withHooks
 // noPage
 
-import { esp, LibDialog, LibImage, LibNet_status, LibProgress, LibStyle, LibToast, LibUpdaterProperty, LibVersion, LibWorker, LibWorkloop, LibWorkview, UseDeeplink, UserClass, UserHook, UserLoading, UserRoutes, useSafeState, _global } from 'esoftplay';
+import { esp, LibDialog, LibImage, LibNet_status, LibProgress, LibStyle, LibToast, LibUpdaterProperty, LibVersion, LibWorkloop, UseDeeplink, UserClass, UserHook, UserLoading, UserRoutes, useSafeState, _global } from 'esoftplay';
+import Worker from 'esoftplay/libs/worker';
 import * as Font from "expo-font";
 import React, { useEffect, useLayoutEffect } from "react";
 import { Platform, View } from "react-native";
@@ -31,7 +32,7 @@ function setFonts(): Promise<void> {
 
 
 function isWorkerReady(onReady: () => void): void {
-  if (_global.LibWorkerReady < 1) {
+  if (_global.WorkerReady < 1) {
     setTimeout(() => isWorkerReady(onReady), 10)
   } else {
     onReady()
@@ -103,8 +104,6 @@ export default function m(props: UserIndexProps): any {
 
       }
     }
-
-
     LibUpdaterProperty.check((isNew) => { })
   }, [])
 
@@ -119,8 +118,7 @@ export default function m(props: UserIndexProps): any {
   return (
     <GestureHandlerRootView style={{ flex: 1 }}>
       <View style={{ flex: 1 }}>
-        <LibWorker />
-        <LibWorkview />
+        <Worker.View />
         {
           loading ?
             <UserLoading />

package/package.json

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

package/modules/lib/workview.tsx

@@ -1,33 +0,0 @@
-// withHooks
-// noPage
-
-import { esp, LibWorker, _global } from 'esoftplay';
-import React from 'react';
-import { Platform, View } from 'react-native';
-import WebView from 'react-native-webview';
-
-export interface LibWorkviewArgs {
-
-}
-export interface LibWorkviewProps {
-
-}
-export default function m(props: LibWorkviewProps): any {
-  if (Platform.OS == 'android')
-    if (Platform.Version <= 22) {
-      return null
-    }
-  return (
-    <View style={{ height: 0, width: 0 }} >
-      <WebView
-        ref={_global.LibWorkerBase}
-        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={LibWorker.onMessage('BaseWorkerIsReady')}
-      />
-    </View>
-  )
-}