webfast 0.1.69 → 0.1.71

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/example.js

@@ -0,0 +1,68 @@
+const path = require(`path`);
+const contentPath = path.join(__dirname,`example`,`content`)
+let setArray = {
+    wget : '/usr/local/bin/wget',
+    process : {
+        ts : Date.now(),
+        socket : {
+            api : {
+                list : function(program,ws,json,data,path) {
+                    // Example to create process for websocket path action and process data
+                    console.log(`Example of list process`);
+
+                    function generateRandomText(length) {
+                        const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+                        let result = '';
+                      
+                        for (let i = 0; i < length; i++) {
+                          result += characters.charAt(Math.floor(Math.random() * characters.length));
+                        }
+                      
+                        return result;
+                      }
+
+                      
+                    // Loop for example through 
+                    let exampleData = {
+                        list : [],
+                        ell : data.ell,
+                        action : data.action
+                    }
+
+                    const pushData = {};
+                    for (let i in data.other.items) {
+                        const item = data.other.items[i];
+                        // We have itme
+                        const id = item.id;
+                        const key = item.name;
+
+                        pushData[key] = {
+                            id : id,
+                            text : generateRandomText(10)
+                        }
+                    }
+
+                    pushData.uuid = program.uuid.v4();
+                    exampleData.list.push(pushData);
+
+                    // Send websocket message create standard
+                    const sendObject = {
+                        func : data.function,
+                        data : exampleData,
+                        js : `console.log("RUN FROM BACKEND")`
+                    }
+
+                    // Sedn back to front-end 
+                    //ws.send();
+                    
+                    return sendObject;
+                }
+            }
+        }
+    },
+    contentPath : contentPath
+};
+
+
+let program = require(path.join(__dirname,`index.js`))(setArray);
+console.log(`Required`);

package/modules/data/mongo/findOrCreate.js

@@ -1,6 +1,6 @@
 const { MongoClient } = require('mongodb');
 
-module.exports = async function(db, collection, condition, dataToCreate) {
+module.exports = async function(db, collection, condition, dataToCreate,options = {}) {
     // Ensure the MongoDB connection string is provided
     if (!process.env.mongo) {
         console.error('MongoDB connection string not provided. Set process.env.mongo.');
@@ -30,7 +30,7 @@ module.exports = async function(db, collection, condition, dataToCreate) {
             const collection = database.collection(collectionName);
 
             // Check if a document exists based on the condition
-            const existingDocument = await collection.findOne(condition);
+            const existingDocument = await collection.findOne(condition,options);
 
             if (existingDocument) {
                 // If a document exists, return it
@@ -43,7 +43,7 @@ module.exports = async function(db, collection, condition, dataToCreate) {
 
                 if (result.acknowledged === true) {
                     console.log('New document created:', result.insertedId);
-                    const existingDocument = await collection.findOne(condition);
+                    const existingDocument = await collection.findOne(condition,options);
                     return dataToCreate;
                 } else {
                     console.error('Failed to create a new document.');

package/modules/data/mongo/updateOrCreate.js

@@ -1,6 +1,6 @@
 const { MongoClient } = require('mongodb');
 
-module.exports = async function (db, collection, condition, dataToUpdate) {
+module.exports = async function (db, collection, condition, dataToUpdate,options = { upsert: true }) {
     // Ensure the MongoDB connection string is provided
     if (!process.env.mongo) {
         console.error('MongoDB connection string not provided. Set process.env.mongo.');
@@ -30,7 +30,7 @@ module.exports = async function (db, collection, condition, dataToUpdate) {
             const collection = database.collection(collectionName);
 
             // Perform the update or create operation
-            const result = await collection.updateOne(condition, { $set: dataToUpdate }, { upsert: true });
+            const result = await collection.updateOne(condition, { $set: dataToUpdate }, options);
 
             // If a document was upserted, retrieve the upserted document
             const upsertedDocument = result.upsertedId

package/modules/express/init.js

@@ -176,7 +176,7 @@ module.exports = async function (program) {
         // Now read the dir
         // Create app.get
         try {
-            const theRoute = `/inc/${dirItem}/*`;
+            const theRoute = `git pu${dirItem}/*`;
             app.get(theRoute, async (req, res) => {
                 const params = req.params;
 

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/modules/request/functions/post.js

@@ -1,11 +1,13 @@
-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 = {
-          accept: 'application/json',
-          'content-type': 'application/json'
-      };
+    if (headers == undefined) {
+        headers = {
+            accept: 'application/json',
+            'content-type': 'application/json'
+        };
+    }
 
       let theOptions = {
           method: 'POST',

package/package.json

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