un-cli 0.0.74 → 0.0.75

package/cmd.txt

@@ -1,2 +1,2 @@
-export subnetworks --all
+updateisconnected
 exit

package/index.html

@@ -451,8 +451,6 @@ async function loadSQLLogs () {
         let i =0;
         
         const header = document.createElement("tr");
-        const thead = docuemnt.createElement("thead")
-        thead.appendChild(header)
         const cService = document.createElement("th");
         cService.textContent = "Source"
         const cTime = document.createElement("th");
@@ -693,21 +691,7 @@ function numberWithCommas(x) {
     }
 
 
-    
-    function sortTable(table, col, reverse) {
-    var tb = table.tBodies[0], // use `<tbody>` to ignore `<thead>` and `<tfoot>` rows
-        tr = Array.prototype.slice.call(tb.rows, 0), // put rows into array
-        i;
-    reverse = -((+reverse) || -1);
-    tr = tr.sort(function (a, b) { // sort rows
-        return reverse // `-1 *` if want opposite order
-            * (a.cells[col].textContent.trim() // using `.textContent.trim()` for test
-                .localeCompare(b.cells[col].textContent.trim())
-               );
-    });
-    for(i = 0; i < tr.length; ++i) tb.appendChild(tr[i]); // append each row in order
-}
- 
+     
 
     </script>
 </body>

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.74";
+let version = "0.0.75";
 const GENERATE_TOKEN_TIME_MIN = 30;
 
 let rl = null;
@@ -175,6 +175,8 @@ const inputs = {
             "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 ",
+            "updateisconnected": "Run update is connected ",
+            
             "count": "Lists the number of rows in all feature layers.",
             "count --system": "Lists the number of rows in system layers.",
             "connect --service": "Connects to the another service",
@@ -277,6 +279,16 @@ const inputs = {
         result.duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
         console.table(result) 
     },
+    
+    "^updateisconnected$": async () => {
+        const fromDate = new Date();
+        logger.info("Updating is connected ...");
+        const result = await un.updateIsConnected()
+        const toDate = new Date();
+        const timeEnable = toDate.getTime() - fromDate.getTime();
+        result.duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
+        console.table(result) 
+    },
     "^evaluate$": async () => {
         const fromDate = new Date();
         logger.info("Building Evaluation Blocks ...");
@@ -464,6 +476,8 @@ const inputs = {
    "^export subnetworks --all --folder .*$|^export subnetworks --all$" : async input => {
  
         let subnetworks 
+        let sort = "asc";
+        if (input.indexOf("--desc") > 0) sort = "desc"
         //create folder
         const file = input.match(/--folder .*/gm)
         let inputDir = "Exported"
@@ -481,7 +495,7 @@ const inputs = {
                 exportedSubnetworksWhereClause = " AND SUBNETWORKNAME NOT IN (" + exportedSubnetworks.join(",") + ")"
  
             logger.info("Querying all subnetworks that are clean.");
-            subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=0 " + exportedSubnetworksWhereClause,"domainnetworkname,tiername,subnetworkname");
+            subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=0 " + exportedSubnetworksWhereClause,`domainnetworkname  ${sort},tiername ${sort},subnetworkname ${sort}`);
             logger.info(`Discovered ${subnetworks.features.length} subnetworks that can be exported.`);
             for (let i = 0;  i < subnetworks.features.length; i++) {
                 const f = subnetworks.features[i]
@@ -572,9 +586,13 @@ const inputs = {
     },
     "^trace --subnetwork": async input => {
         //get subnetwork name
+        try {
 
+             
         const fromDate = new Date();
-       
+        const inputDir= "Exported"
+        let full = true;
+      //  if (input.indexOf("--full") > 0) full = true
 
         const inputParam = input.match(/--subnetwork .*/gm)
         let subnetworkName = null;
@@ -592,8 +610,44 @@ const inputs = {
         const newResult = {}
         newResult.duration =  numberWithCommas(Math.round(timeRun)) + " ms"
         newResult.elementsCount = result.traceResults.elements.length;
-        console.table(newResult) 
+        const traceRes = {}
+        logger.info("Grouping trace results...")
+         result.traceResults.elements.forEach(e => {
+            const layerid = un.getLayerIdfromSourceId(e.networkSourceId).layerId
+            if (!traceRes["l" + layerid])
+                traceRes["l" + layerid] = []
+            traceRes["l" + layerid].push(e.objectId)
+          
+        })
+        console.table(newResult)
+
+        //if the trace is full turn around the pull all features
+        if (full){
+
+            //loop through all layers and query
+            logger.info("Removing duplicates")
+                
+            console.log(traceRes)
+             
+            //send all queries async 
+            const allQueries = []
+            Object.keys(traceRes).forEach (k => {
+                traceRes[k] = [...new Set(traceRes[k])]
+                allQueries.push(un.query(k.replace("l",""), "", k, traceRes[k]))
+            })
+            logger.info(`${Object.keys(traceRes)} queries sent, waiting for response..`)
+            const result = await Promise.all(allQueries)
+            logger.info("All queries returned.")
+            fs.writeFileSync(`${inputDir}/traceout${subnetworkName}.json`, JSON.stringify(result))
+            logger.info(`Result written to file ${inputDir}/traceout${subnetworkName}.json`)
 
+            //logger.info(JSON.stringify(result))
+            
+        }
+    }
+        catch(ex){
+            logger.error(JSON.stringify(ex))
+        }
     },
     "^export subnetworks --deleted$" : async input => {
 

package/makerequest.mjs

@@ -28,25 +28,28 @@ export function makeRequest (opts) {
 
         let f;
         try {
+ 
             const nodeFetch = await import ("node-fetch");
             f = nodeFetch.default;
         }
         catch(ex) {
             f = fetch;
         }
- 
-
+         
+        let jsonRes
+        
        const result = await f(opts.url, {
            "method" : opts.method,
             "headers":  headers,
             "body": params
        });
 
-       const jsonRes  = await result.json();
-      
+        jsonRes  = await result.json();
+        
         if (typeof jsonRes !== "object") 
             jsonRes = JSON.parse(jsonRes);
 
+ 
         resolve(jsonRes);
     
         }

package/package.json

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

package/utilitynetwork.node.mjs

@@ -21,12 +21,14 @@ export class UtilityNetwork {
             this.featureServiceUrl = featureServiceUrl;
             this.token = token;         
             this.gdbVersion = gdbVersion;
+            this.sourceMapping = {}
         }
 
       ///first function one should call after creating an instance of a utility network
        load ()
         {
             let thisObj = this;
+            
             return new Promise (function (resolve, reject)
             {
                 //run async mode
@@ -68,7 +70,30 @@ export class UtilityNetwork {
             
                     thisObj.dataElement = undataElement.layerDataElements[0].dataElement;
                     thisObj.layerDefinition = unLayerDef
-                    thisObj.subnetLineLayerId = thisObj.getSubnetLineLayerId();                    
+                    thisObj.subnetLineLayerId = thisObj.getSubnetLineLayerId();     
+                    
+                    //build out source mapping hash
+                    let domainNetworks = thisObj.dataElement.domainNetworks;
+                    let layerObj = undefined;
+
+                    for (let i = 0; i < domainNetworks.length; i ++)
+                    {
+                        let domainNetwork = domainNetworks[i];
+                        for (let j = 0; j < domainNetwork.junctionSources.length; j ++)
+                            {  
+                                layerObj =  {type: domainNetwork.junctionSources[j].shapeType, layerId: domainNetwork.junctionSources[j].layerId}
+                                layerObj.type = layerObj.type.replace("esriGeometry", "").toLowerCase();
+                                thisObj.sourceMapping["s" + domainNetwork.junctionSources[j].sourceId] = layerObj
+                            }
+
+                        for (let j = 0; j < domainNetwork.edgeSources.length; j ++)
+                             { 
+                                layerObj = {type: domainNetwork.edgeSources[j].shapeType, layerId: domainNetwork.edgeSources[j].layerId} 
+                                layerObj.type = layerObj.type.replace("esriGeometry", "").toLowerCase();
+                                thisObj.sourceMapping["s" + domainNetwork.edgeSources[j].sourceId] = layerObj
+                            }
+                    }
+  
                     resolve(thisObj);
                 }
                 else
@@ -333,16 +358,49 @@ export class UtilityNetwork {
             if (objectids != undefined) 
             queryJson.objectIds = objectids;
             queryJson.layerId = layerId
-            return new Promise((resolve, reject) => {
+            return new Promise(async(resolve, reject) => {
+
+
+                
+                let rowsJson;
+                let allRowsJson;
+                let recordOffset = 0;
+
+                try {
+
+                    do {
+                        queryJson.resultOffset = recordOffset;
+                        rowsJson  = await makeRequest({method: 'POST', params: queryJson, url: this.featureServiceUrl + "/" + layerId + "/query"}) ;                
+                        recordOffset = recordOffset + resultRecordCount + 1;
+                        rowsJson.obj = obj;
+
+                        if (!allRowsJson)
+                          allRowsJson = rowsJson
+                        else
+                          allRowsJson?.features.push(...rowsJson?.features)
+                        //page the result until done
+                    }
+                    while(rowsJson?.exceededTransferLimit == true)
+
+                    resolve(allRowsJson);
+                }
+                catch(ex){
+                    reject("failed to query" + JSON.stringify(ex))
+                }
 
-                makeRequest({method: 'POST', params: queryJson, url: this.featureServiceUrl + "/" + layerId + "/query"}).then(rowsJson=> {                  
-                    rowsJson.obj = obj;
-                    resolve(rowsJson);
-                }).catch(rej => reject("failed to query"));
                 
+           
+
             });
                 
-              
+
+            
+       // }
+       // while(jsonRes?.exceededTransferLimit == true)
+      // if (!allJsonRes)
+     //  allJsonRes = jsonRes
+ // else
+      // allJsonRes?.features.push(...jsonRes?.features)
         }
         //get the terminal configuration using the id
         getTerminalConfiguration(terminalConfigurationId)
@@ -538,8 +596,10 @@ export class UtilityNetwork {
         //get layer id from Source Id used to map sourceid to layer id
         getLayerIdfromSourceId(sourceId)
         { 
+ 
+            return this.sourceMapping["s" + sourceId]
+            /*
             let domainNetworks = this.dataElement.domainNetworks;
-            let layerObj = undefined;
 
             for (let i = 0; i < domainNetworks.length; i ++)
             {
@@ -561,6 +621,7 @@ export class UtilityNetwork {
 
             if (layerObj != undefined)
                 layerObj.type = layerObj.type.replace("esriGeometry", "").toLowerCase();
+            */
 
             return layerObj;
         }
@@ -958,6 +1019,27 @@ export class UtilityNetwork {
 
  
 
+        updateIsConnected(async=false) {
+
+            let thisObj = this;  
+            let ar = thisObj.featureServiceUrl.split("/");
+             ar[ar.length-1]="UtilityNetworkServer";
+             let updateisconnectedURL = ar.join("/") + "/updateIsConnected"
+     
+               let payload = {
+                  f: "json",  
+                  token: this.token,  
+                  async: async
+                }
+              let un = this;
+            
+            return makeRequest({method:'POST', params: payload, url: updateisconnectedURL })
+        
+ 
+
+        }
+
+
         updateSubnetworks(domainNetworkName, tierName, subnetworkName, async=false) {
 
             let thisObj = this;