webfast 0.1.37 → 0.1.41

package/app/content/js/webfast.js

@@ -6,8 +6,71 @@ web.fast = {
         console.log(`Action Function`,data,ell);
     },
     functions : {
+        isURL : function(str) {
+            // Regular expression to check if a string is a URL
+            var pattern = new RegExp('^(https?:\\/\\/)?'+ // protocol
+                '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|'+ // domain name
+                '((\\d{1,3}\\.){3}\\d{1,3}))'+ // OR ip (v4) address
+                '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*'+ // port and path
+                '(\\?[;&a-z\\d%_.~+=-]*)?'+ // query string
+                '(\\#[-a-z\\d_]*)?$','i'); // fragment locator
+            return pattern.test(str);
+        },
         form : function(data,ell) {
             console.log(`Handle Form Function`);
+        },
+        list : function(data) {
+            console.log(`When we have a list function run`);
+            console.log(data);
+            // Get ellement data
+            const ellData = web.fast.tmp.list[data.ell];
+
+            // So we have the html
+            const ell = ellData.ell;
+            
+            // Now loop through list item
+            for (let listI in data.list) {
+                const listItem = data.list[listI];
+                const uuid = `${listItem.uuid}`;
+                delete listItem.uuid;
+                console.log(uuid,`The List Item`,listItem);
+                const div = jQuery(ellData.html).clone();
+                jQuery(div).attr(`id`,uuid);
+
+                // Now check for listitem
+                for (let key in listItem) {
+                    // Now we have listitems
+                    let itemList = listItem[key];
+
+                    // Get item
+                    console.log(`The Item List`);
+                    console.log(itemList);
+                    const setText = itemList.text;
+                    jQuery(div).find(`[webfast-ell="${key}"]`).each(function() {
+                        var elementType = $(this).prop('tagName').toLowerCase();
+                        console.log(`Set Element`, elementType);
+                        switch (elementType) {
+                            case 'img':
+                                if (isURL(setText)) {
+                                    $(this).attr('src', setText); 
+                                } else {
+                                    console.error(`List missing URL for image`);
+                                }
+
+                                break;
+                            case 'input':
+                                $(this).val(setText);
+                                break;
+                            default:
+                                $(this).html(setText);
+                                break;
+                        }
+                    });
+                    
+                }
+
+                jQuery(ell).append(div);
+            }
         }
     },
     que : {
@@ -26,9 +89,15 @@ web.fast = {
         }
     },
     tmp : {
-        int : {}
+        int : {},
+        list: {}
     },
-    socket : undefined
+    socket : undefined,
+    process : {
+        list : function(data) {
+            console.log(`Processing List`);
+        }
+    }
 }
 // Connect to the Socket.IO server
 const telegram = window.Telegram.WebApp;
@@ -58,7 +127,7 @@ web.fast.connectWebSocket = function(socketURL,maxRetries = 40, retries = 0) {
         };
 
         ws.onmessage = (event) => {
-            console.log('Received:', event.data);
+            //console.log('Received:', event.data);
             // Handle received data
             web.fast.que.state = Date.now();
             web.fast.receive(`socket`,event.data); // Placeholder for processing response
@@ -96,10 +165,36 @@ web.fast.connectWebSocket = function(socketURL,maxRetries = 40, retries = 0) {
 
 // Call the function to start the WebSocket connection
 web.fast.connectWebSocket(socketURL);
-web.fast.receive = function(data) {
+web.fast.receive = function(data,message) {
     // Placeholder for processing the received data
     // Implement your logic here (e.g., update UI, handle specific messages)
-    console.log('Processing received data:', data);
+    //console.log('Processing received data:', data,message);
+    const json = JSON.parse(message);
+    switch (data) {
+        case `socket`:
+            // Socket Data response
+            // Check if js
+            if (json.js) {
+                try {
+                    eval(json.js);
+                } catch (err){
+                    console.error(`Error Running Message js`);
+                }
+            }
+
+            // Check if there is any func or something
+            if (json.func != undefined) {
+                // Run this func with the data
+                console.log(`Run Function`,`web.fast.${json.func}`);
+                try {
+                    eval(`web.fast.${json.func}`)(json.data)
+                } catch (err) {
+                    console.error(`Error with running dynamic function`);
+                    console.error(err);
+                }
+            }
+        break;
+    }
 }
 
 // On Ready desable all forms with jquery
@@ -134,6 +229,8 @@ jQuery(document).ready(function() {
             console.log(`Set UUID: ${randomValue}`);
             jQuery(this).attr(`id`,randomValue);
         }
+
+        const id = jQuery(this).attr(`id`);
         
         switch (elementType) {
             case "FORM":
@@ -151,16 +248,51 @@ jQuery(document).ready(function() {
                 // Make request to server with websocket thingy
                 // Set in QUE
                 let other;
-                if (action == `list`) {
+                console.log(`The Action`,action);
+                if (action.split(`.`)[1] == `list`) {
                     other = {
-                        type : action,
-                        html : jQuery(this).html()
+                        type : action
                     }
+
+                    // Create empty list 
+                    const html = jQuery(this).html();
+                    jQuery(this).html(``);
+                    // Set List Event data
+                    web.fast.tmp.list[id] = {
+                        html : html, 
+                        ell : this,
+                        items : []
+                    };
+
+                    // Now scan all 
+                    jQuery(html).find(`[webfast-ell]`).each(function(){
+                        if (jQuery(this).attr(`id`) == undefined) {
+                            const newArray = new Uint32Array(1);
+                            window.crypto.getRandomValues(newArray);
+                            const newRandom = newArray[0];
+
+                            const name = jQuery(this).attr(`webfast-ell`);
+                            console.log(`Set UUID: ${newRandom}`);
+                            jQuery(this).attr(`id`,newRandom);
+                            web.fast.tmp.list[id].items.push({
+                                id : newRandom,
+                                name : name
+                            });
+                        }
+                    });
+
+                    other.items = web.fast.tmp.list[id].items;
+                    console.log(`We found some`);
                 }
+
+                const webFastFunc = jQuery(this).attr(`webfast-func`);
                 web.fast.sendMessage(`socket.api.${webAction}`,{
                     ts : Date.now(),
                     ell : jQuery(this).attr(`id`),
-                    other : other
+                    other : other,
+                    action : action,
+                    webAction : webAction,
+                    function : webFastFunc
                 })
             break;
             case "BUTTON":

package/example/content/js/test.js

@@ -0,0 +1,2 @@
+console.log(`Test`);
+console.log(web.fast);

package/example.js

@@ -1,8 +1,68 @@
 const path = require(`path`);
-let program = require(path.join(__dirname,`index.js`))({
+const contentPath = path.join(__dirname,`example`,`content`)
+let setArray = {
     wget : '/usr/local/bin/wget',
     process : {
-        ts : Date.now()
-    }
-});
+        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/express/init.js

@@ -139,12 +139,18 @@ module.exports = async function (program) {
 
           // Check if minify at the end
           const fileName = req.params.file;
-          const isMinified = /-min\.js$/.test(fileName);
+          const isExtend = /-extend\.js$/.test(fileName);
 
-          if (isMinified) {
-              console.log(`${fileName} ends with -min.js`);
-              const toRequestFile = req.params.file.replace(`-min.js`, `.js`);
+          // Check if extending
+          if (isExtend) {
+              console.log(`${fileName} ends with -extend.js`);
+              // IS extended file include loading in
+
+              const toRequestFile = req.params.file.replace(`-extend.js`, `.js`);
               contentFolder = program.path.join(__dirname, `..`, `..`, `app`, `content`, req.params.type, toRequestFile);
+              // check if file exists in process, if not make it before giving out
+              // Check i
+              console.log(`Content Folder`);
           } else {
               console.log(`${fileName} does not end with -min.js`);
           }
@@ -156,6 +162,42 @@ module.exports = async function (program) {
       }
   })
 
+  // Walkt through for paths to be open 
+  if (program.set.contentPath != undefined) {
+    // Loop Through
+    const readDir = program.fs.readdirSync(program.set.contentPath);
+    
+    // Create request app path for it
+    //loop through
+    for (let rdi in readDir) {
+        // Loop
+        const dirItem = readDir[rdi];
+        const dirPath = program.path.join(program.set.contentPath,dirItem);
+        // Now read the dir
+        // Create app.get
+        try {
+            const theRoute = `/inc/${dirItem}/*`;
+            app.get(theRoute, async (req, res) => {
+                const params = req.params;
+
+                try {
+                    const fullPath = program.path.join(dirPath,req.params[0]);
+                    res.sendFile(fullPath);
+                } catch (err) {
+                    console.error(`Error Responding with route`);
+                    console.error(err);
+                    res.status(500);
+                }
+                console.log(`The Route is there`, theRoute);
+            });
+
+        } catch (err) {
+            console.error(`Errro for path read dir including something`, diritem);
+        }
+    }
+    console.log(`We have directory`);
+  }
+
   app.listen(port, () => {
       console.log(`Server Listening`, port, basePath);
   });

package/package.json

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