esoftplay 0.0.121-b → 0.0.121-e

package/bin/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 const fs = require('fs');
 const exec = require('child_process').execSync;
+const execAsync = require('child_process').exec;
 const path = require('path');
 const os = require('os')
 const readline = require('readline');
@@ -63,6 +64,13 @@ switch (args[0]) {
 	case "build":
 		build()
 		break;
+	case "bc":
+	case "build-cancel":
+		if (fs.existsSync('./node_modules/esoftplaymodules'))
+			command('rm -rf modules && mv ./node_modules/esoftplaymodules modules')
+		else
+			consoleError("build cancel sudah dilakukan sebelumnya")
+		break;
 	case "vn":
 	case "version-new":
 		incrementVersion()
@@ -644,56 +652,28 @@ function devClientPos(file) {
 }
 
 function cacheBuild(include = true) {
-	// if (include) {
-	// 	if (fs.existsSync('./esoftplay')) {
-	// 		command('rm -rf ./esoftplay')
-	// 	}
-	// 	if (!fs.existsSync('./modules_ori')) {
-	// 		command('cp -r ./modules ./modules_ori')
-	// 	}
-	// 	command('cp -r ./node_modules/esoftplay ./')
-
-	
-	// 	if (fs.existsSync('./esoftplay/modules')) {
-	// 		fs.readdirSync('./esoftplay/modules').forEach((module) => {
-	// 			if (!module.startsWith('.'))
-	// 				fs.readdirSync('./esoftplay/modules/' + module).forEach((task) => {
-	// 					let file = fs.readFileSync(`./esoftplay/modules/${module}/${task}`, { encoding: 'utf8' }).replace(/esoftplay\/cache/g, "../../cache")
-	// 					fs.writeFileSync(`./esoftplay/modules/${module}/${task}`, file, { encoding: 'utf8' })
-	// 				})
-	// 		})
-	// 	}
-
-	// 	if (fs.existsSync('./modules')) {
-	// 		fs.readdirSync('./modules').forEach((module) => {
-	// 			if (!module.startsWith('.'))
-	// 				fs.readdirSync('./modules/' + module).forEach((task) => {
-	// 					let file = fs.readFileSync(`./modules/${module}/${task}`, { encoding: 'utf8' }).replace(/esoftplay\/cache/g, "../../esoftplay/cache")
-	// 					fs.writeFileSync(`./modules/${module}/${task}`, file, { encoding: 'utf8' })
-	// 				})
-	// 		})
-	// 	}
-	// 	if (fs.existsSync('./esoftplay/cache')) {
-	// 		fs.readdirSync('./esoftplay/cache').forEach((module) => {
-	// 			if (!module.startsWith('.'))
-	// 				if (fs.lstatSync('./esoftplay/cache/' + module).isDirectory()) {
-	// 					fs.readdirSync('./esoftplay/cache/' + module).forEach((task) => {
-	// 						fs.readdirSync(`./esoftplay/cache/${module}/${task}`).forEach((imprt) => {
-	// 							console.log(`./esoftplay/cache/${module}/${task}/import.js`)
-	// 							let file = fs.readFileSync(`./esoftplay/cache/${module}/${task}/import.js`, { encoding: 'utf8' }).replace(/\.\.\/\.\.\/\.\.\/\.\.\/\.\.\//g, "../../../../")
-	// 							file = file.replace(/\.\.\/\.\.\/\.\.\/\.\.\/node_modules\/esoftplay\//g, "../../../")
-	// 							fs.writeFileSync(`./esoftplay/cache/${module}/${task}/import.js`, file, { encoding: 'utf8' })
-	// 						})
-	// 					})
-	// 				}
-	// 		})
-	// 	}
-
-	// } else {
-	// 	command('rm -rf ./esoftplay')
-	// 	command('rm -rf ./modules')
-	// 	command('mv ./modules_ori ./modules')
-	// }
+	if (include) {
+		if (!fs.existsSync('./node_modules/esoftplaymodules')) {
+			fs.mkdirSync('./node_modules/esoftplaymodules')
+			command('cp -r ./modules/* ./node_modules/esoftplaymodules')
+		}
+
+		if (fs.existsSync('./node_modules/esoftplay/modules')) {
+			let comm = []
+			fs.readdirSync('./node_modules/esoftplay/modules').forEach((module) => {
+				if (!module.startsWith('.')) {
+					if (!fs.existsSync(`./modules/${module}`)) {
+						fs.mkdirSync(`./modules/${module}`)
+					}
+					comm.push(`cp -n ./node_modules/esoftplay/modules/${module}/* ./modules/${module}`)
+				}
+			});
+			(async () => await execAsync(comm.join(" && ")))();
+		}
+	} else {
+		if (fs.existsSync('./node_modules/esoftplaymodules'))
+			command('rm -rf modules && mv ./node_modules/esoftplaymodules modules')
+	}
 }
 
 function configAvailable(enabled) {
@@ -961,6 +941,7 @@ function help() {
 		"\n - u|update all                : untuk update semua esp module ke versi terakhir",
 		"\n - start                       : start esoftplay framework",
 		"\n - b|build                     : untuk build app .ipa .apk .aab",
+		"\n - bc|build-cancel             : untuk build app .ipa .apk .aab",
 		"\n - f|file                      : untuk check status file",
 		"\n - c|check                     : untuk check status",
 		"\n - create-master [moduleName]  : untuk create master module terpisah",

package/libs/worker.tsx

@@ -1,8 +1,8 @@
 import { esp } from "esoftplay";
+import _global from "esoftplay/_global";
 import React from "react";
 import { Platform, View } from 'react-native';
 import WebView from "react-native-webview";
-const _global = require('../_global').default
 
 _global.WorkerBase = React.createRef()
 _global.WorkerTasks = new Map()

package/modules/lib/picture.tsx

@@ -38,7 +38,7 @@ const getCacheEntry = async (uri: string, toSize: number): Promise<{ exists: boo
   return { exists, path };
 };
 
-const fetchPicture = Worker.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/package.json

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

package/storage.ts

@@ -27,7 +27,7 @@ export default class Storage {
   }
 
   private getDBPath(key: string): string {
-    const path = `${CACHE_DIR}${key.replace(/\//g, "_")}.txt`;
+    const path = `${CACHE_DIR}${key.replace(/\//g, "-")}.txt`;
     return path
   }