webfast 0.1.68 → 0.1.70

package/app/content/js/webfast.js

@@ -125,34 +125,13 @@ web.fast.connectWebSocket = function(socketURL,maxRetries = 40, retries = 0) {
             console.log('WebSocket connected');
             // Start other things (e.g., send initial data)
             web.fast.que.state = true;
-
             //alert(web.fast.tools.isMobile);
-            function arraySend() {
+            function arraySendFunction() {
                 try {
-                    if (web.fast.user != undefined || window.Telegram.WebApp.initData == ``) {
+                    if (web.fast.que.state == false || window.Telegram.WebApp.initData == ``) {
                         let arraySend = [];
-                        jQuery(`[webfast-get]`).each(async function(){
-                            const type =  jQuery(this).attr(`webfast-get`);
-                            let  id = jQuery(this).attr(`id`);
-                            if (id == undefined) {
-                                var generateRandomId = async function(length) {
-                                    var result = '';
-                                    var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-                                    var charactersLength = characters.length;
-                                    for (var i = 0; i < length; i++) {
-                                        result += characters.charAt(Math.floor(Math.random() * charactersLength));
-                                    }
-                                    return result;
-                                };
-                                id = await generateRandomId(8); // Generate a random ID of length 8
-                            }
-                            arraySend.push({
-                                id : id,
-                                type : type
-                            })
-                        })
-                        console.log(`Send Array`,arraySend);
-                        web.fast.tools.on.connect(arraySend);
+                        //alert(`Connected`);
+                      
                         } else {
                             if (countedError < 3) {
                                 console.error(`Tried 10 times`);
@@ -163,13 +142,14 @@ web.fast.connectWebSocket = function(socketURL,maxRetries = 40, retries = 0) {
                             
                         }
                 } catch (err) {
+                    alert(`err`);
                     setTimeout(function(){
-                        arraySend();
+                        arraySendFunction();
                     },200);
                 }
             }
             // send array
-            arraySend();
+            arraySendFunction();
             
         };
 
@@ -183,6 +163,7 @@ web.fast.connectWebSocket = function(socketURL,maxRetries = 40, retries = 0) {
                 // We have user data
                 console.log(`Set User Data`);
                 web.fast.user = json;
+
                 // Now go Through to set all data
                 // Get all webfast client
                 jQuery(`[webfast-client]`).each(function(){
@@ -224,6 +205,32 @@ web.fast.connectWebSocket = function(socketURL,maxRetries = 40, retries = 0) {
 
             web.fast.que.state = Date.now();
             web.fast.receive(`socket`,event.data); // Placeholder for processing response
+
+            let arraySend = [];
+            jQuery(`[webfast-get]`).each(async function(){
+                    const type =  jQuery(this).attr(`webfast-get`);
+                    let  id = jQuery(this).attr(`id`);
+                    if (id == undefined) {
+                        var generateRandomId = async function(length) {
+                            var result = '';
+                            var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+                            var charactersLength = characters.length;
+                            for (var i = 0; i < length; i++) {
+                                result += characters.charAt(Math.floor(Math.random() * charactersLength));
+                            }
+                            return result;
+                        };
+                        id = await generateRandomId(8); // Generate a random ID of length 8
+                    }
+                    arraySend.push({
+                        id : id,
+                        type : type
+                    })
+                })
+                console.log(`Send Array`,arraySend);
+                web.fast.tools.on.connect(arraySend);
+            web.fast.que.state = true;
+
             } catch (err) {
                 console.error(`Error Receiving`);
                 console.error(event);

package/modules/data/mongo/find.js

@@ -11,15 +11,6 @@ module.exports = async function(db,collection,query,one = false,array) {
         process.exit(1);
     }
 
-    function routeExists(path) {
-        return program.express.app._router.stack.some(layer => {
-            if (layer.route) {
-                return layer.route.path === path;
-            }
-            return false;
-        });
-    }
-
     // Define the MongoDB URI
     const uri = process.env.mongo;
 
@@ -53,6 +44,16 @@ module.exports = async function(db,collection,query,one = false,array) {
         // Process the result
         console.log('Query result:', result);
 
+
+        async function routeExists(path) {
+            return program.express.app._router.stack.some(layer => {
+                if (layer.route) {
+                    return layer.route.path === path;
+                }
+                return false;
+            });
+        }
+
         // Check if profile image to get it from db
         if (result.profileImage != undefined && array.image == true) {
             const profileImage = await program.modules.data.file.downloadBuffer(result.profileImage,process.env.dbName);
@@ -129,6 +130,6 @@ module.exports = async function(db,collection,query,one = false,array) {
     }
 
     // Execute the main function
-    await main().catch(console.error);
+    return await main().catch(console.error);
 
 }

package/modules/request/functions/get.js

@@ -1,10 +1,12 @@
-module.exports = async function(program, url, body) {
+module.exports = async function(program, url, body,headers) {
   console.log(`Fetch Post`);
   // Register websocket url
   try {
-      const headers = {
+      if (headers == undefined) {
+        headers = {
           accept: 'application/json',
           'content-type': 'application/json'
+          }
       };
 
       let theOptions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webfast",
-  "version": "0.1.68",
+  "version": "0.1.70",
   "description": "WebFast! Bot Application, including TON mini-apps for makign it easy and fast to build ini-apps",
   "main": "index.js",
   "repository": {