webfast 0.1.58 → 0.1.63

package/app/content/js/webfast.js

@@ -124,13 +124,45 @@ 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() {
+                try {
+                    if (web.fast.user != undefined || 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) {
+                                id = await web.fast.tools.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);
+                    } else {
+                        throw new Error(`error some send`);
+                    }
+                } catch (err) {
+                    console.error(`Try again`);
+                    setTimeout(function(){
+                        arraySend();
+                    },200);
+                }
+            }
+            // send array
+            arraySend();
             
         };
 
         ws.onmessage = (event) => {
-            console.log('Received:', event.data);
+            //console.log('Received:', event.data);
             // Handle received data
             // Check if type user then we will walk through the data to set the data for the user
+            try {
             const json = JSON.parse(event.data);
             if (json.type == `user`) {
                 // We have user data
@@ -177,6 +209,10 @@ 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
+            } catch (err) {
+                console.error(`Error Receiving`);
+                console.error(event);
+            }
         };
 
         ws.onclose = (event) => {

package/modules/bots/applications/telegram.js

@@ -51,6 +51,13 @@ module.exports = async function(program,folder) {
                             id : middleValue.from.id
                         },middleValue.chat);
                         let typeOFF = typeof user;
+                        if (user._id != undefined && middleValue.new_chat_member != undefined) {
+                            if (middleValue.new_chat_member.id == user.id) {
+                                res.send(`OK`);
+                                return res.status(200);
+                            }
+                        }
+
                         if (middleValue.chat.uuid == user.uuid || user.profileImage == undefined) {
                             user.new = true;
 
@@ -73,6 +80,60 @@ module.exports = async function(program,folder) {
                         
 
                         console.log(`We have received message`,received);
+                        // Check if left or not
+                        if (received.message != undefined){
+                            if (received.message.left_chat_member != undefined  || received.message.left_chat_participant != undefined) {
+                                console.log(`Someone left so update the databate that they left `);
+                                const member = received.message.left_chat_participant;
+
+                                // return
+                                return true;
+                            }
+
+                            // When signup
+                            if (received.message.new_chat_members != undefined) {
+                                // Return because we don't need to do anything
+                                // Loop THrough
+                                for (let chatI in received.message.new_chat_members) {
+                                    const member = received.message.new_chat_members[chatI];
+                                    const id = member.id;
+                                    console.log(`Something with member`);
+                                    
+                                    const updated =await program.modules.data.update(`eventgo`,`telegram`,{
+                                        id : id
+                                    },{
+                                        $set: {
+                                            group : Date.now()
+                                        }
+                                    });
+                                    console.log(`Updated`);
+
+                                    // Send notification to 
+                                    if (updated.acknowledged) {
+                                        // Send Message That is subscribed to person and welcome in group
+                                        // Say hey all welcome to 
+                                        if (member.first_name != undefined) {
+                                            // Send here message to group
+                                            const message = `Hey <b>${member.first_name}</b> 🎉\nWelcome to the <b>EventGO! Community</b>, here you will receive updates about new events and you are able to chat with others, enjoy and feel free to ask anything.`;
+                                            const send = await program.modules.telegram.functions.send(program,message,middleValue.chat.id);
+                                        }
+
+                                        // Send here message to member that he joined and if he want to continue his 
+                                    }
+                                }
+
+                                // Send message to user that they can continue with their setup
+                                res.status(`OK`);
+                                res.status(200);
+                            }
+
+                            // Else when group
+                            if (received.message.chat.username == `eventgocommunity` || received.message.chat.type == `supergroup`) {
+                                // This is when community or supergroup
+                                console.error(`Super Group Handler Need TODO`);
+                                return true;
+                            }
+                        }
 
                         try {
                             // Or check if single word

package/modules/data/mongo/update.js

@@ -0,0 +1,48 @@
+const { MongoClient } = require('mongodb');
+
+module.exports = async function(db, collection, filter, update, options = {}) {
+    // Ensure the MongoDB connection string is provided
+    if (!process.env.mongo) {
+        console.error('MongoDB connection string not provided. Set process.env.mongo.');
+        process.exit(1);
+    }
+
+    // Define the MongoDB URI
+    const uri = process.env.mongo;
+
+    // Define the database and collection name
+    const dbName = db;
+    const collectionName = collection;
+
+    async function main() {
+        // Create a new MongoClient
+        const client = new MongoClient(uri);
+
+        try {
+            // Connect to the MongoDB server
+            await client.connect();
+            console.log('Connected to the MongoDB server');
+
+            // Select the database
+            const database = client.db(dbName);
+
+            // Select the collection
+            const collection = database.collection(collectionName);
+
+            // Perform the update operation
+            const result = await collection.updateOne(filter, update, options);
+
+            // Process the result
+            console.log('Update result:', result);
+
+            return result;
+        } finally {
+            // Close the MongoClient
+            await client.close();
+            console.log('Connection closed.');
+        }
+    }
+
+    // Execute the main function
+    return main().catch(console.error);
+};

package/modules/express/init.js

@@ -377,7 +377,7 @@ module.exports = async function (program) {
 
     // WebSocket on message event
     ws.on('message', async (message) => {
-        console.log(`Received message from ${clientId}: ${message}`);
+        //console.log(`Received message from ${clientId}: ${message}`);
 
         try {
             // Check for function
@@ -389,7 +389,7 @@ module.exports = async function (program) {
             // Check if function is running in program modules that you can add in the init scirpt when using remote
             if (program.express.process != undefined) {
                 try {
-                    let resp = await program.express.process[split[0]][split[1]][split[2]](program,ws,json,data,path);
+                    let resp = await program.express.process[split[0]][split[1]][split[2]](program,ws,json,data,path,clientId);
                     if (resp != false) {
                         ws.send(JSON.stringify(resp));
                     }

package/package.json

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