un-cli 0.0.75 → 0.0.76

package/cmd.txt

@@ -1,2 +1,2 @@
-updateisconnected
+topology --validate --fishnet
 exit

package/index.html

@@ -44,6 +44,8 @@
         <td><button id = 'btnSQLLogs'>SQL Logs</button></td>
         <td>Message<input id = 'txtFilter' type = 'text'></td>
         <td>User<input id = 'txtUser' type = 'text'></td>
+        <td>Start Time<input id = 'txtStartTime' type = 'text'></td>
+        <td>End Time<input id = 'txtEndTime' type = 'text'></td>
     </tr>
 
     </table>
@@ -129,7 +131,7 @@
 
 
     async function loadTraceLogs () {
-  
+   
         //build table
         const tblResult = document.getElementById("tblResult");
         //clear
@@ -143,9 +145,110 @@
         console.log(`Querying trace logs for ${parameters.service} for the last ${mins} minutes ...`)
             
          //page query the admin log
-         let allMessages = await adminLogQueryWithPaging(mins, parameters.service, [102002], "------ Trace Parameters ----", "VERBOSE")
+       let allTheMessages = await adminLogQueryWithPaging(mins, parameters.service, [102002], "------ Trace Parameters ----", "VERBOSE")
+            
+       let allMessages = filterMessages (allTheMessages).map(m => {
+            const newMessage = Object.assign({}, m);
+            delete newMessage.machine;
+            delete newMessage.type;
+            delete newMessage.code;
+            delete newMessage.requestID;
+            delete newMessage.process;
+            delete newMessage.thread;
+            newMessage.elapsedms = parseInt (parseFloat(newMessage.elapsed) * 1000)
+            newMessage.time = new Date(newMessage.time).toLocaleString()
+            delete newMessage.elapsed
+
+            try{
+                
+                //Total Trace Time (4.745 seconds)
+    
+                let re = /Total Trace Time \([-+]?([0-9]*\.[0-9]+|[0-9]+) seconds\)/;
+                let res = re.exec(m.message)
+                if (res && res.length  > 1)
+                    newMessage.traceTime = parseFloat(res[1])*1000
+        
+                let re1 = /Trace Type: .\w.*/;
+                let res1 = re1.exec(m.message)
+                if (res1 && res1.length  > 0)
+                    newMessage.traceType = res1[0].replace("Trace Type: ","")
  
-         await populateMessages(allMessages)
+            }
+            catch(ex){
+               console.error(ex)
+            }
+ 
+
+            return newMessage;
+        })
+        .sort( (m1,m2) => m2.elapsedms - m1.elapsedms)
+        
+        //clear
+        while(tblResult.firstChild) tblResult.removeChild(tblResult.firstChild)
+
+        const header = document.createElement("tr");
+        const cService = document.createElement("th");
+        cService.textContent = "Source"
+        const cTime = document.createElement("th");
+        cTime.textContent = "Time"
+        const cUser = document.createElement("th");
+        cUser.textContent = "User"
+        const cMethod = document.createElement("th");
+        cMethod.textContent = "Method"
+        const cElapsedMS = document.createElement("th");
+        cElapsedMS.textContent = "Elapsed (ms)"
+        const cTraceType = document.createElement("th");
+        cTraceType.textContent = "Trace Type"
+        const cTraceTime = document.createElement("th");
+        cTraceTime.textContent = "Trace Time"
+        const cLog = document.createElement("th");
+        cLog.textContent = "Full Log"
+        header.appendChild (cService)
+        header.appendChild (cTime)
+        header.appendChild (cUser)
+        header.appendChild (cMethod)
+        header.appendChild (cTraceType)
+        header.appendChild (cTraceTime)
+        header.appendChild (cElapsedMS)
+
+        header.appendChild (cLog) 
+        tblResult.appendChild(header)
+        allMessages.forEach(m => {
+            const logRow = document.createElement("tr");
+            const cService = document.createElement("td");
+            cService.textContent = m.source.replace(".MapServer", "")
+            const cTime = document.createElement("td");
+            cTime.textContent = m.time
+            const cUser = document.createElement("td");
+            cUser.textContent = m.user
+            const cMethod = document.createElement("td");
+            cMethod.textContent = m.methodName
+            const cElapsedMS = document.createElement("td");
+            cElapsedMS.textContent = m.elapsedms
+            const cTraceType = document.createElement("td");
+            cTraceType.textContent = m.traceType
+            const cTraceTime = document.createElement("td");
+            cTraceTime.textContent = m.traceTime
+
+            const cLog = document.createElement("td");
+            cLog.textContent = "..."
+            cLog.fullLog = m.message;
+            cLog.addEventListener("click", e=> {navigator.clipboard.writeText(e.target.fullLog); alert("Copied to clipboard")})
+            logRow.appendChild (cService)
+            logRow.appendChild (cTime)
+            logRow.appendChild (cUser)
+            logRow.appendChild (cMethod)
+            logRow.appendChild (cTraceType)
+            logRow.appendChild (cTraceTime)
+            logRow.appendChild (cElapsedMS)
+
+            logRow.appendChild (cLog) 
+            tblResult.appendChild(logRow)
+        })
+
+
+
+         //await populateMessages(allMessages)
  
          
     }
@@ -208,31 +311,114 @@ async function loadUpdateSubnetworkLogs () {
 
         
         console.log(`Querying subnetwork logs for ${parameters.service} for the last ${mins} minutes ...`)
-        let allMessages = await adminLogQueryWithPaging(mins, parameters.service, [102003], "---- Subnetwork Parameters ----", "VERBOSE")
+        let allTheMessages = await adminLogQueryWithPaging(mins, parameters.service, [102003], "---- Subnetwork Parameters ----", "VERBOSE")
 
+          
         
-        //update subnetwork missing elapsed populate it
-        allMessages = allMessages.map( m => {
-            try{
+       let allMessages = filterMessages (allTheMessages).map(m => {
+           
+        const newMessage = Object.assign({}, m);
+        try{
+          
+            delete newMessage.machine;
+            delete newMessage.type;
+            delete newMessage.code;
+            delete newMessage.requestID;
+            delete newMessage.process;
+            delete newMessage.thread;
+         
+                
+                let re = /Total \([-+]?([0-9]*\.[0-9]+|[0-9]+) seconds\)/;
+                let res = re.exec(m.message)
+                if (res && res.length  > 0)
+                    newMessage.elapsed = res[1]
+
+                re = /Total update subnetwork time \([-+]?([0-9]*\.[0-9]+|[0-9]+) seconds\)/;
+                res = re.exec(m.message)
+                if (res && res.length  > 0)
+                    newMessage.elapsed = res[1]
  
-            let re = /Total \([-+]?([0-9]*\.[0-9]+|[0-9]+) seconds\)/;
-            let res = re.exec(m.message)
-            if (res && res.length  > 1)
-                m.elapsed = res[1]
-
-            re = /Total update subnetwork time \([-+]?([0-9]*\.[0-9]+|[0-9]+) seconds\)/;
-            res = re.exec(m.message)
-            if (res && res.length  > 1)
-                m.elapsed = res[1]
-            
-            return m;
+                    
+                let re1 = /Subnetwork name: .*/;
+                let res1 = re1.exec(m.message)
+                if (res1 && res1.length  > 0)
+                    newMessage.subnetworkName = res1[0].replace("Subnetwork name: ","")
+                    
+         
+                newMessage.elapsedms = parseInt (parseFloat(newMessage.elapsed) * 1000)
+                newMessage.time = new Date(newMessage.time).toLocaleString()
+                delete newMessage.elapsed
+                
+  
             }
             catch(ex){
-                return m;
+                console.error(ex)
+            }
+            finally {
+                return newMessage;
             }
+
+        })
+        .sort( (m1,m2) => m2.elapsedms - m1.elapsedms)
+        
+        //clear
+        while(tblResult.firstChild) tblResult.removeChild(tblResult.firstChild)
+
+        const header = document.createElement("tr");
+        const cService = document.createElement("th");
+        cService.textContent = "Source"
+        const cTime = document.createElement("th");
+        cTime.textContent = "Time"
+        const cUser = document.createElement("th");
+        cUser.textContent = "User"
+        const cMethod = document.createElement("th");
+        cMethod.textContent = "Method"
+        const cElapsedMS = document.createElement("th");
+        cElapsedMS.textContent = "Elapsed (ms)"
+        const cSubnetworkName = document.createElement("th");
+        cSubnetworkName.textContent = "Subnetwork Name"
+        const cLog = document.createElement("th");
+        cLog.textContent = "Full Log"
+        header.appendChild (cService)
+        header.appendChild (cTime)
+        header.appendChild (cUser)
+        header.appendChild (cMethod)
+        header.appendChild (cSubnetworkName)
+        header.appendChild (cElapsedMS)
+
+        header.appendChild (cLog) 
+        tblResult.appendChild(header)
+        allMessages.forEach(m => {
+            const logRow = document.createElement("tr");
+            const cService = document.createElement("td");
+            cService.textContent = m.source.replace(".MapServer", "")
+            const cTime = document.createElement("td");
+            cTime.textContent = m.time
+            const cUser = document.createElement("td");
+            cUser.textContent = m.user
+            const cMethod = document.createElement("td");
+            cMethod.textContent = m.methodName
+            const cElapsedMS = document.createElement("td");
+            cElapsedMS.textContent = m.elapsedms
+            const cSubnetworkName = document.createElement("td");
+            cSubnetworkName.textContent = m.subnetworkName
+
+            const cLog = document.createElement("td");
+            cLog.textContent = "..."
+            cLog.fullLog = m.message;
+            cLog.addEventListener("click", e=> {navigator.clipboard.writeText(e.target.fullLog); alert("Copied to clipboard")})
+            logRow.appendChild (cService)
+            logRow.appendChild (cTime)
+            logRow.appendChild (cUser)
+            logRow.appendChild (cMethod)
+            logRow.appendChild (cSubnetworkName)
+            logRow.appendChild (cElapsedMS)
+
+            logRow.appendChild (cLog) 
+            tblResult.appendChild(logRow)
         })
-        await populateMessages(allMessages)
 
+  
    
 }
 
@@ -666,8 +852,16 @@ function numberWithCommas(x) {
         let adminLog = new AdminLog(token, portal.serverUrl)
         tblResult.appendChild(prg);
         tblResult.appendChild(btn)
-        const startTime = Date.now()
-        const endTime = Date.now() - mins*60*1000
+        let startTime = Date.now()
+        const txtStartTime = document.getElementById("txtStartTime")
+        if (txtStartTime.value != "")
+            startTime = new Date(txtStartTime.value).getTime()
+
+        let endTime = startTime - mins*60*1000
+        const txtEndTime = document.getElementById("txtEndTime")
+        if (txtEndTime.value != "")
+            endTime = new Date(txtEndTime.value).getTime()
+
         let services = [theService + ".MapServer"] 
         if (theService == "(All Services)")
             services = "*"

package/index.mjs

@@ -86,7 +86,7 @@ async function regenerateToken(parameters) {
 async function connect(parameters) {
     try{
      //print the parameters
-    logger.info(parameters);
+    logger.info(JSON.stringify(parameters));
     //connect to portal
     
     const token = await getToken(parameters);
@@ -316,10 +316,12 @@ const inputs = {
     //progress
     //timeouts
     //in case failure you don't lose everything
-    "^topology --validate -fn$": async () => {
+    "^topology --validate --fishnet$": async () => {
         logger.info("Validating Network topology ...");
 
-        const fullExtent = un.featureServiceJson.fullExtent;
+        const fullExtent = un.layerDefinition.extent;
+        //console.log(`add_env(${ JSON.stringify(fullExtent)})`)
+
         /*
         fullExtent.xmin = 0;
         fullExtent.xmax = 100;
@@ -328,13 +330,14 @@ const inputs = {
         https://desktop.arcgis.com/en/arcmap/10.3/tools/cartography-toolbox/create-cartographic-partitions.htm
         */
         //fish net
-        const grids = 4;
+        const grids = 5; //divide the grid 5 x 5
         const dx = (fullExtent.xmax - fullExtent.xmin) / grids;
         const dy = (fullExtent.ymax - fullExtent.ymin) / grids;
-        
-        const extents = [];
+         
+        const fishnet = [];
         for (let i =0; i < grids; i ++) {
-            
+            const row = [];
+
             for (let j = 0; j < grids; j++) {
                 const extent = {
                     "xmin": fullExtent.xmin + j*dx,
@@ -343,24 +346,47 @@ const inputs = {
                     "ymax": fullExtent.ymin + i*dy + dy,
                     "spatialReference": fullExtent.spatialReference
                 }
-                extents.push(extent);
+                row.push({"content": " ", "extent": extent});
+ 
             }
+            fishnet.push(row);
         }
          
-        extents.forEach(async e => {
-            const fromDate = new Date(); 
 
-            const result = await un.validateNetworkTopology("sde.DEFAULT", e)
-            const toDate = new Date();
-            const timeEnable = toDate.getTime() - fromDate.getTime();
-            const duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
-            console.clear()
-            logger.info("Validating extent " + e.xmin)
-            console.table({duration}) 
 
-        })
-        
-        
+        for (let i = 0; i < fishnet.length; i ++) {
+
+            for (let j = 0 ; j < fishnet[i].length; j++) {
+                
+                fishnet[i][j].content = '⚙️'
+                const e =  fishnet[i][j].extent
+            
+                    try {
+
+                
+                    const fromDate = new Date(); 
+                    console.log("Validating Extent " + JSON.stringify(e));
+                    printFishnet(fishnet)
+
+                    const result = await un.validateNetworkTopology(  e)
+                    const toDate = new Date();
+                    const timeEnable = toDate.getTime() - fromDate.getTime();
+                    const duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
+                    result.duration = duration
+                    console.table(result) 
+                    //console.log(`add_env(${ JSON.stringify(e)})`)
+                    fishnet[i][j].content = '✔️'
+
+                    }
+                    catch(ex){
+                        console.log(JSON.stringify(ex))
+                    }
+
+        }
+                
+    }
+    console.log("Done")
+
     },
 
     "^topology --validate$": async () => {
@@ -1407,3 +1433,27 @@ export async function run (){
 
 
 
+function printFishnet(fishnet) {
+
+    //y is flipped x is ok
+    //i = 0 that is i = fishnet.length -1
+    for (let i =0; i < fishnet.length ; i++){
+        
+        for (let j = 0; j < fishnet[i].length;j++) 
+            process.stdout.write("+------");
+
+        process.stdout.write("+\n")
+
+        for (let j = 0; j < fishnet[i].length;j++)
+            process.stdout.write(`|   ${fishnet[fishnet.length - 1 - i][j].content}  `);
+ 
+        process.stdout.write("|\n")
+    }
+
+
+    for (let j = 0; j < fishnet.length;j++) 
+        process.stdout.write("+------");
+    
+    process.stdout.write("+\n\n")
+
+}

package/makerequest.mjs

@@ -29,7 +29,7 @@ export function makeRequest (opts) {
         let f;
         try {
  
-            const nodeFetch = await import ("node-fetch");
+            let nodeFetch = await import ("node-fetch");
             f = nodeFetch.default;
         }
         catch(ex) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "un-cli",
-  "version": "0.0.75",
+  "version": "0.0.76",
   "description": "Command line interface for working with ArcGIS Utility Network Extension",
   "main": "index.mjs",
   "bin": {