webApp not working

Author: MadhuNimmo

.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+node_modules
+*_jalangi_*

DCG.js

@@ -172,13 +172,13 @@
                         //Identifying Non-native -> Native Calls
                         if ((f.toString().indexOf('[native code]') > -1 || f.toString().indexOf('[object ') === 0)) {
                                 callerIid = getLoc(giid);
-                                if (["apply","call"].includes(funName) || funName.startsWith("bound ")){   
-                                        applyStack.push(giid)
+                                //if (["apply","call"].includes(funName) || funName.startsWith("bound ")){   
+                                        //applyStack.push(giid)
                                         calleeIid = iidToFunName[giid] + " (Native)" + " [" + getLoc(giid)+"]"
-                                }
-                                else{
-                                        calleeIid = iidToFunName[giid] + " (Native)"
-                                }
+                                //}
+                                //else{
+                                        //calleeIid = iidToFunName[giid] + " (Native)"
+                                //}
 
                                 //Adding the caller and the callee to the call edge list
                                 if (!(callerIid in callerToCallee)) {
@@ -190,7 +190,7 @@
                                         calleeIids.push(calleeIid);
                                 }
 
-                                callStack.push(giid);
+                                callStack.push(giid); //what if we move this out and use this for both native and non-native calls
                         }
                 },
 
@@ -224,13 +224,19 @@
                                 }
                                 else{
                                         //Identifying Native -> Non-native Calls
-                                        if ((["apply","call"].includes(callerName) || callerName.startsWith("bound ")) && applyStack.length>0){  
-                                                var apcal_loc= applyStack[applyStack.length - 1];   
-                                                callerIid = callerName + " (Native)" + " [" + getLoc(apcal_loc) +"]" ;
-                                        }
-                                        else{
-                                                callerIid = callerName + " (Native)"
-                                        }
+                                        //if ((["apply","call"].includes(callerName) || callerName.startsWith("bound ")) && applyStack.length>0){  
+                                                //var apcal_loc= applyStack[applyStack.length - 1];   
+                                                //callerIid = callerName + " (Native)" + " [" + getLoc(apcal_loc) +"]" ;
+                                                if(callStack.length>0){
+                                                        callerIid = callerName + " (Native)" + " [" + getLoc(callStack[callStack.length - 1]) +"]" ;
+                                                }else{
+                                                        callerIid = callerName + " (Native)" 
+                                                }
+
+                                        //}
+                                        //else{
+                                                //callerIid = callerName + " (Native)"
+                                        //}
 
                                 }
                         }
@@ -316,9 +322,9 @@
                         if (callStack[callStack.length - 1] == giid) {
                                 callStack.pop();
                         }
-                        if (applyStack[applyStack.length - 1] == giid) {
+                        /*if (applyStack[applyStack.length - 1] == giid) {
                                 applyStack.pop();
-                        }
+                        }*/
 
                 },
                 /**
@@ -356,15 +362,16 @@
                                         }
                         }
                         //Writing the output to a file
-                        if (!isBrowser) {
+                        /*if (!isBrowser) {
                                 var jsonString = JSON.stringify(jsonCallList,null,4)
                                 origName = process.argv[1];
                                 instname = origName.replace(/.js$/, "_dynCalls.json");
                                 fs.writeFileSync(instname, jsonString, function(err) {
                                         if(err) console.log('error', err);
                                       });
-                        }
+                        }*/
                         J$.callList=jsonCallList
+                        //console.log(jsonCallList)
                         return J$.callList
                 }
 

WebAppEval.js

@@ -1,15 +1,15 @@
 const puppeteer = require('puppeteer');
 const fs = require('fs');
 const process = require('process');
-var jalangi = require('/Users/madhurimachakraborty/Documents/jalangi2/src/js/utils/api');
+var jalangi = require('../node_modules/jalangi2/src/js/utils/api');
 var inputDir =[]
 inputDir.push(process.argv[2])
 var options = {
         instrumentInline: true,
         inlineIID: true,
         inlineSource: true,
         inlineJalangi: true,
-        analysis: ['src/js/sample_analyses/ChainedAnalyses.js', 'src/js/sample_analyses/dlint/Utils.js', 'experiments/metrics/DynNative.js'],
+        analysis: ['../node_modules/jalangi2/src/js/sample_analyses/ChainedAnalyses.js', '../node_modules/jalangi2/src/js/sample_analyses/dlint/Utils.js', './DCG.js'],
         outputDir: '/tmp',
         inputFiles: inputDir
 };

package.json

@@ -13,6 +13,10 @@
     "type": "git",
     "url": "git+https://github.com/ucr-riple/DynCallGraphJS.git"
   },
+  "dependencies": {
+    "jalangi2": "0.2.6",
+    "puppeteer": "5.5.0"
+  },
   "author": "",
   "license": "ISC",
   "bugs": {