webfast 0.1.82 → 0.1.84

package/README.md

@@ -112,6 +112,25 @@ routes
 Within these folders, you can establish a dynamic setup, as exemplified in the module itself.
 
 ```
+## program.modules.dependOn
+example : 
+```
+module.exports = {
+    dependOn: ['express.app','modules.data'],
+    name: '{UNIQUE_NAME}',
+    run: async function (program, name,functions) {
+    },
+    functions : {
+    }
+}
+```
+To add an dependOn function
+```
+program.modules.dependOn({REQUIRE},program,`{UNIQUE_NAME}-sync`,function(){
+            console.log(`Depend On CallBack`);
+});
+```
+
 ## License
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.

package/app/content/js/webfast.js

@@ -127,6 +127,16 @@ web.fast.connectWebSocket = function(socketURL,maxRetries = 40, retries = 0) {
             web.fast.que.state = true;
 
             //alert(web.fast.tools.isMobile);
+            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;
+            };
+
             function arraySend() {
                 try {
                     if (web.fast.user != undefined && web.fast.inial == undefined || window.Telegram.WebApp.initData == `` && web.fast.inial == undefined) {
@@ -134,16 +144,8 @@ web.fast.connectWebSocket = function(socketURL,maxRetries = 40, retries = 0) {
                         jQuery(`[webfast-get]`).each(async function(){
                             const type =  jQuery(this).attr(`webfast-get`);
                             let  id = jQuery(this).attr(`id`);
+                            console.log(`THE GET`);
                             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({
@@ -183,6 +185,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 +227,13 @@ 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
+            jQuery(document).ready(function(){
+                try {
+                    web.fast.tools.on.connect();
+                } catch (err) {
+                    console.error(`error getting connect data`);
+                }
+            })
             } catch (err) {
                 console.error(`Error Receiving`);
                 console.error(event);

package/index.js

@@ -112,7 +112,7 @@ module.exports = async function (array) {
 
                 // Now include this thing then
                 try {
-                    program.modules[reqFunc.name] = await reqFunc.run(program,reqFunc.name);
+                    program.modules[reqFunc.name] = await reqFunc.run(program,reqFunc.name,reqFunc.functions);
                     if (callback != undefined) {
                         return callback(program,name)
                     } else {

package/modules/data/mongo/aggregate.js

@@ -1,52 +1,52 @@
 const { MongoClient } = require('mongodb');
-module.exports = async function(program,db,collection,query,callback) {
-    // Ensure the MongoDB connection string is provided
-    // 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 find query
-        let result = await collection.find(query).toArray();
-
-        if (one) {
-            result = result[0];
-        }
-
-        // Process the result
-        console.log('Query result:', result);
-        } catch (error) {
-        console.error('Error executing MongoDB query:', error);
-        } finally {
-        // Close the MongoDB connection
-        await client.close();
-        }
+module.exports = async function (program, db, collection, pipeline, one = false) {
+  // 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 aggregation query
+      let result = await collection.aggregate(pipeline).toArray();
+
+      if (one) {
+        result = result[0];
+      }
+
+      // Process the result
+      console.log('Aggregation result:', result);
+      return result;
+    } catch (error) {
+      console.error('Error executing MongoDB aggregation:', error);
+    } finally {
+      // Close the MongoDB connection
+      await client.close();
     }
+  }
 
-    // Execute the main function
-    return await main().catch(console.error);
-
-}
+  // Execute the main function
+  return await main().catch(console.error);
+};

package/package.json

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