esoftplay 0.0.256 → 0.0.258

package/bin/build.js

@@ -17,6 +17,17 @@ const pathJSTimer = DIR + "node_modules/react-native/Libraries/Core/Timers/JSTim
 const lowercasePrompt = 'if (/^[a-z]/.test(component.name)) {'
 const pathLowercasePrompt = DIR + 'node_modules/@react-navigation/core/src/useNavigationBuilder.tsx'
 
+// helper that always writes synchronously and logs
+function writeFileSyncWithLog(path, data, options) {
+	try {
+		fs.writeFileSync(path, data, options || { encoding: 'utf8' });
+		console.log(`${path} has been written`);
+	} catch (e) {
+		console.error(`failed to write ${path}`, e);
+		throw e;
+	}
+}
+
 if (fs.existsSync(packjson)) {
 	let txt = fs.readFileSync(packjson, 'utf8');
 	let $package
@@ -43,10 +54,7 @@ if (fs.existsSync(packjson)) {
 			"esoftplay-web",
 			"esoftplay-web-pwa"
 		]
-		fs.writeFile(packjson, JSON.stringify($package, null, 2), (err) => {
-			if (err) throw err;
-			console.log('package.json has been updated');
-		});
+		writeFileSyncWithLog(packjson, JSON.stringify($package, null, 2));
 	}
 
 	/* Update app.json */
@@ -75,15 +83,9 @@ if (fs.existsSync(packjson)) {
 				}
 			}
 		}
-		fs.writeFile(confjson, JSON.stringify($config, null, 2), (err) => {
-			if (err) throw err;
-			console.log('config.json has been created');
-		});
+		writeFileSyncWithLog(confjson, JSON.stringify($config, null, 2));
 		if (!fs.existsSync(conflivejson)) {
-			fs.writeFile(conflivejson, JSON.stringify($config, null, 2), (err) => {
-				if (err) throw err;
-				console.log('config.live.json has been created');
-			});
+			writeFileSyncWithLog(conflivejson, JSON.stringify($config, null, 2));
 		}
 
 		let $appjson = {}
@@ -149,10 +151,7 @@ if (fs.existsSync(packjson)) {
 				console.warn("Skipping copy: ./node_modules/esoftplay/assets/plugins not found");
 			}
 			// execSync("mkdir -p ./raw && cp -rf ./node_modules/esoftplay/assets/plugins ./raw/")
-			fs.writeFile(appjson, JSON.stringify($appjson, null, 2), (err) => {
-				if (err) throw err;
-				console.log('app.json has been updated');
-			});
+			writeFileSyncWithLog(appjson, JSON.stringify($appjson, null, 2));
 		}
 		/* Fix Code android timers */
 		if (fs.existsSync(pathJSTimer)) {
@@ -213,10 +212,7 @@ if (fs.existsSync(packjson)) {
 	}
 }`
 
-		fs.writeFile(easjson, easconfg, (err) => {
-			if (err) throw err;
-			console.log('eas.json has been updated');
-		})
+		writeFileSyncWithLog(easjson, easconfg);
 
 		const babelconf = `module.exports = function (api) {
 	api.cache(true);
@@ -229,10 +225,7 @@ if (fs.existsSync(packjson)) {
 };
 
 `
-		fs.writeFile(babelconfig, babelconf, (err) => {
-			if (err) throw err;
-			console.log('babel.config.js has been updated');
-		})
+		writeFileSyncWithLog(babelconfig, babelconf)
 		/* Update App.js */
 		const TSconfig = `{\n\
 	"compilerOptions": {\n\
@@ -258,10 +251,7 @@ if (fs.existsSync(packjson)) {
 		"node_modules"\n\
 	]\n\
 }`
-		fs.writeFile(tsconfig, TSconfig, (err) => {
-			if (err) throw err;
-			console.log('tsconfig has been created');
-		});
+		writeFileSyncWithLog(tsconfig, TSconfig);
 
 		const GitIgnore = `
 .expo*/
@@ -285,10 +275,7 @@ yarn.lock
 yarn-error.log
 					
 			`
-		fs.writeFile(gitignore, GitIgnore, (err) => {
-			if (err) throw err;
-			console.log('.gitignore has been created');
-		});
+		writeFileSyncWithLog(gitignore, GitIgnore);
 
 		const AppJS = `import { LibNotification } from 'esoftplay/cache/lib/notification/import';
 import { UserIndex } from 'esoftplay/cache/user/index/import';
@@ -365,78 +352,74 @@ export default function App() {
 			"typescript",
 		]
 
-		fs.writeFile(appts, AppJS, (err) => {
-			if (err) throw err;
-			fs.unlink(appjs, (err) => { })
-			let installExpoLibs = []
-			let installDevLibs = []
-			expoLib.forEach((exlib) => {
-				if (fs.existsSync("../../node_modules/" + exlib)) {
-					console.log(exlib + " is Exist, Skipped")
-					if (exlib == '@expo/vector-icons') {
-						installExpoLibs.push(exlib)
-					}
-				} else {
-					console.log("⚙⚙⚙ INSTALLING ... " + exlib)
+		writeFileSyncWithLog(appts, AppJS);
+		try { fs.unlinkSync(appjs); } catch (e) { }
+		let installExpoLibs = []
+		let installDevLibs = []
+		expoLib.forEach((exlib) => {
+			if (fs.existsSync("../../node_modules/" + exlib)) {
+				console.log(exlib + " is Exist, Skipped")
+				if (exlib == '@expo/vector-icons') {
 					installExpoLibs.push(exlib)
 				}
-			})
-			devLibs.forEach((devlib) => {
-				if (fs.existsSync("../../node_modules/" + devlib)) {
-					console.log(devlib + " is Exist, Skipped")
-				} else {
-					console.log("⚙⚙⚙ INSTALLING ... " + devlib)
-					installDevLibs.push(devlib)
-				}
-			})
-			if (!fs.existsSync(DIR + 'modules'))
-				fs.mkdirSync(DIR + 'modules')
-			let cmd = "cd ../../ "
-			if (installDevLibs.length > 0) {
-				// console.log(installDevLibs)
-				cmd += "&& bun add " + installDevLibs.join(" ") + " --dev "
-			}
-			if (installExpoLibs.length > 0) {
-				// console.log(installExpoLibs)
-				cmd += "&& npx expo install " + installExpoLibs.join(" ")
-			}
-			console.log((JSON.stringify({ cmd }, undefined, 2)))
-			execSync(cmd + "|| true")
-			// execSync("cd ../../ && bun install --verbose || true")
-			execSync("cd ../../ && bun ./node_modules/esoftplay/bin/router.js || true")
-			execSync("cd ../../ && bun ./node_modules/esoftplay/bin/locale.js || true")
-			// execSync("cd ../../ && eas update:configure || true")
-			console.log('App.js has been replace to App.tsx');
-			// if (appjson)
-			// /* bugfix AsyncStorage @firebase, remove this section if firebase has update the AsyncStorage */
-			if (fs.existsSync('../@firebase/app/dist/index.rn.cjs.js')) {
-				let firebaseText = fs.readFileSync('../@firebase/app/dist/index.rn.cjs.js', 'utf8')
-				firebaseText = firebaseText.replace("var AsyncStorage = require('react-native').AsyncStorage;", "var AsyncStorage = require('@react-native-async-storage/async-storage').default;")
-				fs.writeFileSync('../@firebase/app/dist/index.rn.cjs.js', firebaseText)
+			} else {
+				console.log("⚙⚙⚙ INSTALLING ... " + exlib)
+				installExpoLibs.push(exlib)
 			}
-			// /* end AsyncStorage @firebase section */
-			if (fs.existsSync('../@expo/vector-icons')) {
-				let esoftplayIcon = ''
-				fs.readdir('../@expo/vector-icons/build', (err, files) => {
-					const dfiles = files.filter((file) => file.includes('d.ts'))
-					dfiles.map((dfile, i) => {
-						const rdfile = fs.readFileSync('../@expo/vector-icons/build/' + dfile, { encoding: 'utf8' })
-						const names = (/import\("\.\/createIconSet"\)\.Icon<((.*))\,.*>/g).exec(rdfile);
-						if (names && names[1].includes('|')) {
-							esoftplayIcon += 'export type ' + dfile.replace('.d.ts', 'Types') + ' = ' + names[1] + '\n';
-						}
-					})
-					fs.writeFileSync('../@expo/vector-icons/build/esoftplay_icons.ts', esoftplayIcon)
-				})
+		})
+		devLibs.forEach((devlib) => {
+			if (fs.existsSync("../../node_modules/" + devlib)) {
+				console.log(devlib + " is Exist, Skipped")
 			} else {
-				console.log("@expo/vector-icons not installed")
+				console.log("⚙⚙⚙ INSTALLING ... " + devlib)
+				installDevLibs.push(devlib)
 			}
-			console.log('Please wait until processes has finished...');
-		});
+		})
+		if (!fs.existsSync(DIR + 'modules'))
+			fs.mkdirSync(DIR + 'modules')
+		let cmd = "cd ../../ "
+		if (installDevLibs.length > 0) {
+			cmd += "&& bun add " + installDevLibs.join(" ") + " --dev "
+		}
+		if (installExpoLibs.length > 0) {
+			cmd += "&& npx expo install " + installExpoLibs.join(" ")
+		}
+		console.log((JSON.stringify({ cmd }, undefined, 2)))
+		execSync(cmd + "|| true")
+		execSync("cd ../../ && bun ./node_modules/esoftplay/bin/router.js || true")
+		execSync("cd ../../ && bun ./node_modules/esoftplay/bin/locale.js || true")
+		console.log('App.js has been replace to App.tsx');
+		if (fs.existsSync('../@firebase/app/dist/index.rn.cjs.js')) {
+			let firebaseText = fs.readFileSync('../@firebase/app/dist/index.rn.cjs.js', 'utf8')
+			firebaseText = firebaseText.replace("var AsyncStorage = require('react-native').AsyncStorage;", "var AsyncStorage = require('@react-native-async-storage/async-storage').default;")
+			fs.writeFileSync('../@firebase/app/dist/index.rn.cjs.js', firebaseText)
+		}
+		if (fs.existsSync('../@expo/vector-icons')) {
+			let esoftplayIcon = ''
+			const files = fs.readdirSync('../@expo/vector-icons/build');
+			const dfiles = files.filter((file) => file.includes('d.ts'))
+			dfiles.map((dfile, i) => {
+				const rdfile = fs.readFileSync('../@expo/vector-icons/build/' + dfile, { encoding: 'utf8' })
+				const names = (/import\("\.\/createIconSet"\)\.Icon<((.*))\,.*>/g).exec(rdfile);
+				if (names && names[1].includes('|')) {
+					esoftplayIcon += 'export type ' + dfile.replace('.d.ts', 'Types') + ' = ' + names[1] + '\n';
+				}
+			})
+			fs.writeFileSync('../@expo/vector-icons/build/esoftplay_icons.ts', esoftplayIcon)
+		} else {
+			console.log("@expo/vector-icons not installed")
+		}
+		console.log('Please wait until processes has finished...');
 	}
 } else {
 	console.log(packjson + " not found!!")
 }
+
+// ensure we always exit when script finishes (particularly for postinstall hooks)
+if (require.main === module) {
+	process.exit(0);
+}
+
 // packjson scripts
 // "preuninstall": "cd ../../ && bun ./node_modules/.bin/esoftplay stop",
 // "postuninstall": "bun ./bin/build.js uninstall",

package/bin/cli.js

@@ -1220,6 +1220,7 @@ function build() {
 		}
 
 	const local = args[1] == 'local' ? ' --local' : ''
+	const prelocal = args[1] == 'local' ? "EAS_LOCAL_BUILD_WORKINGDIR=~/expo-eas " : ""
 	const Named = args[2] || ""
 	const types = isWeb
 		?
@@ -1236,7 +1237,7 @@ function build() {
 		[
 			{
 				name: "1. IOS (Development) - Simulator",
-				cmd: "eas build --platform ios --profile development --clear-cache" + local,
+				cmd: prelocal + "eas build --platform ios --profile development --clear-cache" + local,
 				pre: () => {
 					configAvailable(true)
 					devClientPre(appjson)
@@ -1245,7 +1246,7 @@ function build() {
 			},
 			{
 				name: "2. IOS (Development) - Non Simulator",
-				cmd: "eas build --platform ios --profile development_build --clear-cache" + local,
+				cmd: prelocal + "eas build --platform ios --profile development_build --clear-cache" + local,
 				pre: () => {
 					configAvailable(true)
 					devClientPre(appjson)
@@ -1254,7 +1255,7 @@ function build() {
 			},
 			{
 				name: "3. IOS (Preview) - Simulator",
-				cmd: "eas build --platform ios --profile preview --clear-cache" + local,
+				cmd: prelocal + "eas build --platform ios --profile preview --clear-cache" + local,
 				pre: () => {
 					configAvailable(true)
 					devClientPos(appjson)
@@ -1263,7 +1264,7 @@ function build() {
 			},
 			{
 				name: "4. IOS (Preview) - Non Simulator",
-				cmd: "eas build --platform ios --profile preview_build --clear-cache" + local,
+				cmd: prelocal + "eas build --platform ios --profile preview_build --clear-cache" + local,
 				pre: () => {
 					configAvailable(true)
 					devClientPos(appjson)
@@ -1272,7 +1273,7 @@ function build() {
 			},
 			{
 				name: "5. IOS (Production) - ipa",
-				cmd: "eas build --platform ios --profile production --clear-cache" + local,
+				cmd: prelocal + "eas build --platform ios --profile production --clear-cache" + local,
 				pre: () => {
 					configAvailable(true)
 					devClientPos(appjson)
@@ -1281,7 +1282,7 @@ function build() {
 			},
 			{
 				name: "6. Android (Development) - apk",
-				cmd: "eas build --platform android --profile development --clear-cache" + local,
+				cmd: prelocal + "eas build --platform android --profile development --clear-cache" + local,
 				pre: () => {
 					configAvailable(true)
 					devClientPre(appjson)
@@ -1290,7 +1291,7 @@ function build() {
 			},
 			{
 				name: "7. Android (Preview) - apk",
-				cmd: "eas build --platform android --profile preview --clear-cache" + local,
+				cmd: prelocal + "eas build --platform android --profile preview --clear-cache" + local,
 				pre: () => {
 					configAvailable(true)
 					devClientPos(appjson)
@@ -1299,7 +1300,7 @@ function build() {
 			},
 			{
 				name: "8. Android (Production) - aab",
-				cmd: "eas build --platform android --profile production --clear-cache" + local,
+				cmd: prelocal + "eas build --platform android --profile production --clear-cache" + local,
 				pre: () => {
 					configAvailable(true)
 					devClientPos(appjson)

package/package.json

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