un-cli 0.0.66 → 0.0.69

package/cmd.txt

@@ -1,2 +1,2 @@
-export subnetworks --all --folder c:\temp
+export subnetworks --all
 exit

package/index.mjs

@@ -7,7 +7,7 @@ import { AdminLog } from "./adminlog.mjs"
 import { logger } from "./logger.mjs"
 import  fetch  from "node-fetch"
 //update version
-let version = "0.0.66";
+let version = "0.0.69";
 const GENERATE_TOKEN_TIME_MIN = 30;
 
 let rl = null;
@@ -172,8 +172,8 @@ const inputs = {
             "update subnetworks --all": "Update all dirty subnetworks synchronously",
             "update subnetworks --deleted": "Update all deleted dirty subnetworks synchronously",
             "update subnetworks --all --async": "Update all dirty subnetworks asynchronously",          
-            "export subnetworks --all": "Export all subnetworks with ACK ",
-            "export subnetworks --new": "Export all subnetworks with ACK that haven't been exported ",
+            "export subnetworks --all [--folder]": "Export all subnetworks with ACK --folder where exported files are saved",
+            "export subnetworks --new [--folder]": "Export all subnetworks with ACK that haven't been exported --folder where exported files are saved",
             "export subnetworks --deleted": "Export all subnetworks with ACK that are deleted ",
             "count": "Lists the number of rows in all feature layers.",
             "count --system": "Lists the number of rows in system layers.",
@@ -247,7 +247,7 @@ const inputs = {
       //  console.log('\x1b[36m%s\x1b[0m', 'I am cyan');  //cyan
         const topoMoments = networkMoments.networkMoments.map(m => {
             const t = m.time === 0 ? "N/A": new Date(m.time*1000)
-            const d = m.duration === 0 ? "N/A" : numberWithCommas(Math.round(m.duration/1000)) + " s"
+            const d = m.duration === 0 ? "N/A" : numberWithCommas(Math.round(m.duration)) + " ms"
             m.time = t.toString()
             m.duration = d;
             return m;
@@ -265,7 +265,7 @@ const inputs = {
         const result = await un.enableTopology()
         const toDate = new Date();
         const timeEnable = toDate.getTime() - fromDate.getTime();
-        result.duration =  numberWithCommas(Math.round(timeEnable/1000)) + " s"
+        result.duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
         console.table(result) 
     },
     "^topology --disable$": async () => {
@@ -274,7 +274,7 @@ const inputs = {
         const result = await un.disableTopology()
         const toDate = new Date();
         const timeEnable = toDate.getTime() - fromDate.getTime();
-        result.duration =  numberWithCommas(Math.round(timeEnable/1000)) + " s"
+        result.duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
         console.table(result) 
     },
     "^evaluate$": async () => {
@@ -296,7 +296,7 @@ const inputs = {
         const result = {}
         const toDate = new Date();
         const timeEnable = toDate.getTime() - fromDate.getTime();
-        result.duration =  numberWithCommas(Math.round(timeEnable/1000)) + " s"
+        result.duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
         console.log(result)
     },
 
@@ -341,7 +341,7 @@ const inputs = {
             const result = await un.validateNetworkTopology("sde.DEFAULT", e)
             const toDate = new Date();
             const timeEnable = toDate.getTime() - fromDate.getTime();
-            const duration =  numberWithCommas(Math.round(timeEnable/1000)) + " s"
+            const duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
             console.clear()
             console.log("Validating extent " + e.xmin)
             console.table({duration}) 
@@ -357,7 +357,7 @@ const inputs = {
         const result = await un.validateNetworkTopology()
         const toDate = new Date();
         const timeEnable = toDate.getTime() - fromDate.getTime();
-        result.duration =  numberWithCommas(Math.round(timeEnable/1000)) + " s"
+        result.duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
         console.table(result) 
     },
     "^subnetworks --dirty$": async () => {        
@@ -387,22 +387,21 @@ const inputs = {
 
     "^update subnetworks --deleted$" : async () => {
         console.log("Querying all subnetworks that are dirty and deleted.");
-        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=1 and isdeleted=1");
+        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=1 and isdeleted=1","domainnetworkname,tiername,subnetworkname");
         console.log(`Discovered ${subnetworks.features.length} dirty deleted subnetworks.`);
         for (let i = 0;  i < subnetworks.features.length; i++) {
             const f = subnetworks.features[i]
             console.log("Updating Subnetwork " + v(f.attributes,"subnetworkName"));
             
             const fromDate = new Date();
-             
-            
+              
             const subnetworkResult = await un.updateSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
             
             //code
 
             const toDate = new Date();
             const timeEnable = toDate.getTime() - fromDate.getTime();
-            subnetworkResult.duration =  numberWithCommas(Math.round(timeEnable/1000)) + " s"
+            subnetworkResult.duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
             
 
             console.log(`Result ${JSON.stringify(subnetworkResult)}`)
@@ -410,30 +409,34 @@ const inputs = {
     },
 
     "^update subnetworks --all$" : async () => {
-        console.log("Querying all subnetworks that are dirty.");
-        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=1");
-        console.log(`Discovered ${subnetworks.features.length} dirty subnetworks.`);
-
-
-        for (let i = 0;  i < subnetworks.features.length; i++) {
-            const f = subnetworks.features[i]
-            console.log("Updating Subnetwork " + v(f.attributes,"subnetworkName"));
-            
-            const fromDate = new Date();
-            
-
-            const subnetworkResult = await un.updateSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
-            
-            const toDate = new Date();
-            const timeEnable = toDate.getTime() - fromDate.getTime();
-            subnetworkResult.duration =  numberWithCommas(Math.round(timeEnable/1000)) + " s"
+ 
+        do  {
+            console.log("Querying all subnetworks that are dirty.");
+            let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=1", "domainnetworkname,tiername,subnetworkname");
+            console.log(`Discovered ${subnetworks.features.length} dirty subnetworks.`);
+
+            for (let i = 0;  i < subnetworks.features.length; i++) {
+                const f = subnetworks.features[i]
+                console.log("Updating Subnetwork " + v(f.attributes,"subnetworkName"));
+                
+                const fromDate = new Date();
+                 
+                const subnetworkResult = await un.updateSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
+                
+                const toDate = new Date();
+                const timeEnable = toDate.getTime() - fromDate.getTime();
+                subnetworkResult.duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
+    
+                console.log(`Result ${JSON.stringify(subnetworkResult)}`)
+            }
 
-            console.log(`Result ${JSON.stringify(subnetworkResult)}`)
-        }
+        } 
+        while (subnetworks.features.length > 0)
+        
     },
     "^update subnetworks --all --async$" : async () => {
         console.log("Querying all subnetworks that are dirty.");
-        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=1");
+        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=1", "domainnetworkname,tiername,subnetworkname");
         console.log(`Discovered ${subnetworks.features.length} dirty subnetworks.`);
         for (let i = 0;  i < subnetworks.features.length; i++) {
             const f = subnetworks.features[i]
@@ -443,8 +446,7 @@ const inputs = {
         }
     },
    "^export subnetworks --all --folder .*$|^export subnetworks --all$" : async input => {
-
-        
+ 
         //create folder
         const file = input.match(/--folder .*/gm)
         let inputDir = "Exported"
@@ -452,40 +454,49 @@ const inputs = {
              inputDir = file[0].replace("--folder ", "")
         //create directory if doesn't exists
         if (!fs.existsSync(inputDir))  fs.mkdirSync(inputDir)
-
-
-        console.log("Querying all subnetworks that are clean.");
-        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=0");
-        console.log(`Discovered ${subnetworks.features.length} subnetworks that can be exported.`);
-        for (let i = 0;  i < subnetworks.features.length; i++) {
-            const f = subnetworks.features[i]
-            const subnetworkName = v(f.attributes,"subnetworkName")
-            console.log("Exporting subnetworks " + v(f.attributes,"subnetworkName"));
-            
-            const fromDate = new Date();
-            
-            const subnetworkResult = await un.exportSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
-             
-            
-            //code
-
-            const toDate = new Date();
-            const timeEnable = toDate.getTime() - fromDate.getTime();
-            subnetworkResult.duration =  numberWithCommas(timeEnable) + " ms"
-            
-
-            //fetch the json and write it to disk 
-            const subContent = await fetch(subnetworkResult.url);
-            //check if the response is 200 only then attempt to parse to json
-            //although the response is json, its easier to treat it as text (handle error cases) since we will only write it to disk.
-            // if we want to do something with the response then make it json
-            const jsonExport = await subContent.text();
-            fs.writeFileSync(`${inputDir}/${subnetworkName}.json`, jsonExport)            
-           
-
-            console.log(`Result ${JSON.stringify(subnetworkResult)} written to file ${process.cwd()}/${inputDir}/${subnetworkName}.json`)
-
+ 
+        do {
+
+            console.log("Querying all subnetworks that are clean.");
+            let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=0","domainnetworkname,tiername,subnetworkname");
+            console.log(`Discovered ${subnetworks.features.length} subnetworks that can be exported.`);
+            for (let i = 0;  i < subnetworks.features.length; i++) {
+                const f = subnetworks.features[i]
+                const subnetworkName = v(f.attributes,"subnetworkName")
+                console.log("Exporting subnetworks " + v(f.attributes,"subnetworkName"));
+                
+                const fromDate = new Date();
+                
+                const subnetworkResult = await un.exportSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
+                 
+                
+                //code
+    
+                const toDate = new Date();
+                const timeEnable = toDate.getTime() - fromDate.getTime();
+                subnetworkResult.duration =  numberWithCommas(timeEnable) + " ms"
+                //if undefined exit
+                if (!subnetworkResult.url)
+                {
+                    console.log("Export subnetwork failed " + JSON.stringify(subnetworkResult))
+                    continue;
+                }
+    
+                //fetch the json and write it to disk 
+                const subContent = await fetch(subnetworkResult.url);
+                //check if the response is 200 only then attempt to parse to json
+                //although the response is json, its easier to treat it as text (handle error cases) since we will only write it to disk.
+                // if we want to do something with the response then make it json
+                const jsonExport = await subContent.text();
+                fs.writeFileSync(`${inputDir}/${subnetworkName}.json`, jsonExport)            
+               
+    
+                console.log(`Result ${JSON.stringify(subnetworkResult)} written to file ${process.cwd()}/${inputDir}/${subnetworkName}.json`)
+    
+            }
         }
+        while (subnetworks.features.length > 0)
+       
     },
    
 
@@ -501,7 +512,7 @@ const inputs = {
 
 
         console.log("Querying all subnetworks that are clean and not exported.");
-        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty = 0 and (LASTACKEXPORTSUBNETWORK is null or LASTACKEXPORTSUBNETWORK < LASTUPDATESUBNETWORK)");
+        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty = 0 and (LASTACKEXPORTSUBNETWORK is null or LASTACKEXPORTSUBNETWORK < LASTUPDATESUBNETWORK)","domainnetworkname,tiername,subnetworkname");
         console.log(`Discovered ${subnetworks.features.length} subnetworks that can be exported.`);
         for (let i = 0;  i < subnetworks.features.length; i++) {
             const f = subnetworks.features[i]
@@ -555,7 +566,7 @@ const inputs = {
         const toDate = new Date();
         const timeRun = toDate.getTime() - fromDate.getTime();
         const newResult = {}
-        newResult.duration =  numberWithCommas(Math.round(timeRun/1000)) + " s"
+        newResult.duration =  numberWithCommas(Math.round(timeRun)) + " ms"
         newResult.elementsCount = result.traceResults.elements.length;
         console.table(newResult) 
 
@@ -579,6 +590,14 @@ const inputs = {
             const subnetworkName = v(f.attributes,"subnetworkName")
             console.log(`Exporting subnetwork ${subnetworkName}` );
             const subnetworkResult = await un.exportSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
+            
+            //if undefined exit
+            if (!subnetworkResult.url)
+            {
+                console.log("Export subnetwork failed " + JSON.stringify(subnetworkResult))
+                continue;
+            }
+
             //fetch the json and write it to disk 
             const subContent = await fetch(subnetworkResult.url);
             const jsonExport = await subContent.text();
@@ -889,15 +908,16 @@ const inputs = {
             allMessages = allMessages.concat(jsonRes.logMessages.filter(m => m.message.indexOf("EndCursor;") > -1))
         }
       console.log ("Filtering messages...")
+      
       allMessages = allMessages
             .map( m=> {
                 m.dataAccessElapsed = parseFloat(m.message.split(";")[1].split(" ")[1])
-                m.ExecuteQueryElapsed = parseFloat(m.message.split(";")[2].split(" ")[1])
-                m.totalTimeElapsed = m.dataAccessElapsed +  m.ExecuteQueryElapsed 
+                m.executeQueryElapsed = parseFloat(m.message.split(";")[2].split(" ")[1])
+                m.totalExecutionElapsed = m.dataAccessElapsed +  m.executeQueryElapsed 
                 m.elapsed = parseFloat(m.elapsed); return m;
 
             })
-            .sort( (m1,m2) => m2.totalTimeElapsed - m1.totalTimeElapsed)
+            .sort( (m1,m2) => m2.totalExecutionElapsed - m1.totalExecutionElapsed)
             .slice(0, 10) ;//first 10
     
      
@@ -907,11 +927,12 @@ const inputs = {
             {
              
                 const x = m.message.split(";")
+                x.shift()
                 console.log(`id: ${i++}`)
                 console.log(`\tAt: ${new Date(m.time)} (${m.time})`)
                 console.log(`\tUser: ${m.user}`)
-                console.log(`\tElapsed: ${m.elapsed*1000} ms`)
-                console.log(`\ttotalTimeElapsed: ${m.totalTimeElapsed} ms`)
+                console.log(`\tTotal Time: ${numberWithCommas(Math.round(m.elapsed*1000))} ms (Total time the cursor was opened)`)
+                console.log(`\tQuery Time: ${numberWithCommas(m.totalExecutionElapsed)} ms (includes search + data access nextRow)`)
                 console.log(`\tQuery:`)
                 x.forEach(a => console.log(`\t${a}`))
                 console.log(`\n`)

package/package.json

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

package/utilitynetwork.node.mjs

@@ -275,7 +275,7 @@ export class UtilityNetwork {
              
         }
         
-        queryDistinct(layerId, field, where) {
+        queryDistinct(layerId, field, where, orderby) {
            
             let queryJson = {
                 f: "json",
@@ -283,7 +283,9 @@ export class UtilityNetwork {
                 outFields: field,
                 where: where,
                 gdbVersion:this.gdbVersion,
-                returnDistinctValues: true
+                returnDistinctValues: true,
+                orderByFields: orderby,
+
             }
  
             queryJson.layerId = layerId