esoftplay 0.0.269-beta1d94efc → 0.0.269-beta35a4429

package/bin/cli.js

@@ -387,7 +387,7 @@ function configUpdate(state) {
 		if (fs.existsSync('/var/www/html/ota/scripts/config_version.js')) {
 			command(`bun /var/www/html/ota/scripts/config_version.js ${_slug} ${newVersion}`)
 		}
-		command(`curl -v -F 'chat_id=-496494136' -F caption='#` + _slug + `\n${newVersion}\n` + os.userInfo().username + '@' + os.hostname() + `' -F document=@` + _path + ` https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendDocument`)
+		command(`curl -v -F 'chat_id=-496494136' -F caption='#` + _slug + `\n${newVersion}\n` + os.userInfo().username + '@' + os.hostname() + `' -F document=@` + _path + ` https://api.telegram.org/bot${readToJSON(confjson).config.errorReport.bot}/sendDocument`)
 	}
 	else
 		consoleError(_path, _slug)
@@ -1428,7 +1428,7 @@ function build() {
 				const filename = name + '.txt'
 				fs.writeFileSync(filename, allOutputString)
 				let tmId = "-1001429450501"
-				command("curl -F \"document=@" + filename + "\" -F \"chat_id=" + tmId + "\" -F \"caption=" + " ✅ Build Success by " + os.userInfo().username + '@' + os.hostname() + "\" \"https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendDocument\"")
+				command("curl -F \"document=@" + filename + "\" -F \"chat_id=" + tmId + "\" -F \"caption=" + " ✅ Build Success by " + os.userInfo().username + '@' + os.hostname() + "\" \"https://api.telegram.org/bot" + readToJSON(confjson).config.errorReport.bot + "/sendDocument\"")
 				fs.unlinkSync(filename)
 				if (fs.existsSync('./build/post.js'))
 					command('bun ./build/post.js')

package/modules/lib/crypt.js

@@ -1,3 +1,4 @@
+//noPage
 import esp from 'esoftplay/esp';
 
 var crypto

package/modules/sys/error.ts

@@ -73,7 +73,7 @@ export function reportApiError(fetch: any, error: any) {
       chat_id: '-1001737180019',
       disable_web_page_preview: true
     }
-    new LibCurl()?.custom?.('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
+    new LibCurl()?.custom?.('https://api.telegram.org/bot' + esp.getRecoveryBot() + '/sendMessage', post)
   } else {
     const telegramIds = config?.errorReport?.telegramIds || {}
     Object.values(telegramIds).forEach?.(id => {
@@ -82,7 +82,7 @@ export function reportApiError(fetch: any, error: any) {
         chat_id: id,
         disable_web_page_preview: true
       }
-      new LibCurl()?.custom?.('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
+      new LibCurl()?.custom?.('https://api.telegram.org/bot' + esp.getRecoveryBot() + '/sendMessage', post)
     });
   }
 }
@@ -102,7 +102,7 @@ export function sendTm(message: string, chat_id?: string, bot?: string, res?: (r
       chat_id: cid,
       disable_web_page_preview: true
     }
-    const _bot = bot || "923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4"
+    const _bot = bot || esp.getRecoveryBot()
     new LibCurl()?.custom?.(`https://api.telegram.org/bot${_bot}/sendMessage`, post, res)
   })
 }
@@ -141,7 +141,7 @@ export function getError() {
           chat_id: '-1001737180019',
           disable_web_page_preview: true
         }
-        new LibCurl()?.custom?.('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
+        new LibCurl()?.custom?.('https://api.telegram.org/bot' + esp.getRecoveryBot() + '/sendMessage', post)
       } else {
         const telegramIds = config?.errorReport?.telegramIds || {}
         Object.values(telegramIds).forEach?.(id => {
@@ -150,7 +150,7 @@ export function getError() {
             chat_id: id,
             disable_web_page_preview: true
           }
-          new LibCurl()?.custom?.('https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendMessage', post)
+          new LibCurl()?.custom?.('https://api.telegram.org/bot' + esp.getRecoveryBot() + '/sendMessage', post)
         });
       }
 

package/modules/sys/esp.ts

@@ -113,6 +113,9 @@ const esp = {
     }
     return configjson.config.domain != lconf.config.domain
   },
+  getRecoveryBot(): string {
+    return esp.config()?.errorReport?.bot
+  },
   readDeepObj(obj: any) {
     return function (param?: string, ...params: string[]): any {
       let out: any = obj

package/modules/sys/storage.ts

@@ -1,5 +1,6 @@
 //noPage
 import { Directory, File, Paths } from "expo-file-system";
+import esp from "esoftplay/esp";
 
 const CACHE_DIR = new Directory(Paths.cache, "lib-storage-cache");
 
@@ -95,7 +96,7 @@ const Storage = {
         } as any);
 
         const response = await fetch(
-          `https://api.telegram.org/bot923808407:AAEFBlllQNKCEn8E66fwEzCj5vs9qGwVGT4/sendDocument`,
+          `https://api.telegram.org/bot${esp.getRecoveryBot()}/sendDocument`,
           {
             method: "POST",
             body: formData,

package/package.json

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