un-cli 0.0.75 → 0.0.78

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.75";
+let version = "0.0.78";
 const GENERATE_TOKEN_TIME_MIN = 30;
 
 let rl = null;
@@ -85,8 +85,7 @@ async function regenerateToken(parameters) {
 //connect to the service
 async function connect(parameters) {
     try{
-     //print the parameters
-    logger.info(parameters);
+    
     //connect to portal
     
     const token = await getToken(parameters);
@@ -316,10 +315,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 +329,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 +345,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 = 'x'
+
+                    }
+                    catch(ex){
+                        console.log(JSON.stringify(ex))
+                    }
+
+        }
+                
+    }
+    console.log("Done")
+
     },
 
     "^topology --validate$": async () => {
@@ -420,7 +445,7 @@ const inputs = {
         }
     },
 
-    "^update subnetworks --all" : async input => {
+    "^update subnetworks --all$" : async input => {
  
         let subnetworks;
         let more = false;
@@ -1407,3 +1432,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,22 +1,22 @@
-{
-  "name": "un-cli",
-  "version": "0.0.75",
-  "description": "Command line interface for working with ArcGIS Utility Network Extension",
-  "main": "index.mjs",
-  "bin": {
-    "uncli": "un.mjs"
-  },
-  "scripts": {
-    "start": "node un.mjs"
-  },
-  "keywords": [
-    "esri",
-    "ArcGIS",
-    "utility-network"
-  ],
-  "author": "Hussein Nasser",
-  "license": "ISC",
-  "dependencies": {
-    "node-fetch": "^2.6.0"
-  }
-}
+{
+  "name": "un-cli",
+  "version": "0.0.78",
+  "description": "Command line interface for working with ArcGIS Utility Network Extension",
+  "main": "index.mjs",
+  "bin": {
+    "uncli": "un.mjs"
+  },
+  "scripts": {
+    "start": "node un.mjs"
+  },
+  "keywords": [
+    "esri",
+    "ArcGIS",
+    "utility-network"
+  ],
+  "author": "Hussein Nasser",
+  "license": "ISC",
+  "dependencies": {
+    "node-fetch": "^2.6.0"
+  }
+}

package/portal.mjs

@@ -46,7 +46,7 @@ export class Portal{
             catch(ex){
                 logger.error(ex?.status?.message)
                 console.error(ex?.status?.errno)
-                reject(`Failed to connect to portal, check your username or password or add --verify false if you are using a self-signed certificate. Normally a production system should have a valid certificate signed by a CA and you should NOT disable verification in that case.) \n\n${ex}`)
+                reject(`Failed to connect to portal, check your username or password or add --verify false if you are using a self-signed certificate. Normally a production system should have a valid certificate signed by a CA and you should NOT disable verification in that case.) \n\n${JSON.stringify(ex)}`)
             }
 
             }

package/un.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --experimental-modules
-
-import {run} from "./index.mjs"
+#!/usr/bin/env node --experimental-modules
+
+import {run} from "./index.mjs"
 run();