un-cli 0.0.53 → 0.0.57

package/README.md

@@ -51,5 +51,5 @@ export subnetworks -new
 ```
 
 
-> uncli --portal https://utilitynetwork.esri.com/portal --service NapervilleElectric_SQLServer --user tester --password tester.108 --file commands.txt 
+> uncli --portal https://utilitynetwork.esri.com/portal --service NapervilleElectric_SQLServer --user tester --password tester.108 --file commands.txt --verify true
 

package/adminlog.mjs

@@ -0,0 +1,33 @@
+'use strict';
+//Author : Hussein Nasser
+//Date   : Oct-13-2021
+//Twitter: @hnasr
+import fetch from "node-fetch";
+import { logger } from "./logger.mjs"
+
+export class AdminLog {
+
+    constructor(token, serverUrl)
+    {   
+        this.adminServerUrl =   serverUrl + "/admin";
+        this.token = token;         
+    }
+
+    query (codes, serviceName ="*", pageSize = 10000) 
+    {
+        const url =  this.adminServerUrl  + "/logs/query?f=pjson"
+        const level = "DEBUG"
+        const filterType="json"
+        const token = this.token
+        const filter = {
+            "codes": codes,
+            "services": serviceName
+        }
+      
+        const queryLogUrl = url + `&token=${token}&level=${level}&filterType=${filterType}&filter=${encodeURIComponent(JSON.stringify(filter))}&pageSize=${pageSize}`
+        logger.info(queryLogUrl);
+        return fetch(queryLogUrl);
+    }
+
+
+}

package/cmd.txt

@@ -1 +1 @@
-evaluate
+arlogs --byrule

package/index.mjs

@@ -2,11 +2,13 @@ import readline from "readline"
 import  fs from "fs";
 import { Portal } from "./portal.mjs"
 import { UtilityNetwork } from "./utilitynetwork.node.mjs"
+import { AdminLog } from "./adminlog.mjs"
+
 import { logger } from "./logger.mjs"
 import  fetch  from "node-fetch"
 //update version
-let version = "0.0.53";
-const GENERATE_TOKEN_TIME_MIN = 10;
+let version = "0.0.57";
+const GENERATE_TOKEN_TIME_MIN = 30;
 
 let rl = null;
 
@@ -14,7 +16,7 @@ let rl = null;
 //uncli --portal https://utilitynetwork.esri.com/portal --service AllStar_oracle --user unadmin --password unadmin.108
 let portal = null;
 let un  = null;
-
+let adminLog = null;
 
 //parse input for parameters 
 function parseInput(){
@@ -25,8 +27,9 @@ function parseInput(){
           "--user" ,
           "--password",
           "--command",
-          "--version",
-          "--file"
+          "--gdbversion",
+          "--file",
+          "--verify"
            ]     
 
       const params = {
@@ -35,8 +38,9 @@ function parseInput(){
           "user": null,
           "password": null,
           "command": "",
-          "version": "SDE.DEFAULT",
-          "file": ""
+          "gdbversion": "SDE.DEFAULT",
+          "file": "",
+          "verify": "true"
       }
 
       for (let i = 0; i < process.argv.length ; i++){
@@ -49,8 +53,9 @@ function parseInput(){
 
       if (Object.values(params).includes(null))
       {
-        console.log ("HELP: uncli --portal https://unportal.domain.com/portal --service servicename --user username --password password --file commandfile*")    
+        console.log ("HELP: uncli --portal https://unportal.domain.com/portal --service servicename --user username --password password [--gdbversion* user.version --file commandfile* --verify true|false]")    
         console.log("--file commandfile is optional and you can pass a path to a file with a list of command to execute. ")
+        console.log("--gdbversion is optional and allows the UN to be opened in that version. When not specified sde.DEFAULT is used.")
         process.exit();
       }
      
@@ -62,7 +67,7 @@ async function getToken(parameters) {
     portal = new Portal(parameters.portal, parameters.user, parameters.password)
     logger.info("About to connect..")
     const token = await portal.connect()
-    logger.info(`Token ${token}`)
+    logger.info(`Token generanted successfully.`)
     return token;
 }
 
@@ -94,7 +99,9 @@ async function connect(parameters) {
     }
 
     const serviceUrl =  portal.serverUrl + `/rest/services/${parameters.service}/FeatureServer`
-    un = new UtilityNetwork(token, serviceUrl)
+    un = new UtilityNetwork(token, serviceUrl, parameters.gdbversion)
+    //create a new admin object (user might not be admin we won't use it until the user call log )
+    adminLog = new AdminLog(token, portal.serverUrl)
     console.log("Loading utility network...")
     await un.load();
     console.log("Connected.")
@@ -118,15 +125,15 @@ async function connect(parameters) {
             console.error(`Cannot open specified file ${file}.`)
       
     } 
-    //execute one off command
-    if ( command != "")          
-        executeInput(command);
+        //execute one off command
+        if ( command != "")          
+            executeInput(command);
          
 
 
-    askInput();
+        askInput();
 
-    setTimeout( async ()=> await regenerateToken(parameters) , 1000*60*GENERATE_TOKEN_TIME_MIN)
+        setTimeout( async ()=> await regenerateToken(parameters) , 1000*60*GENERATE_TOKEN_TIME_MIN)
     }
     catch(ex){
         console.error(ex)
@@ -151,24 +158,27 @@ const inputs = {
             "version": "Displays the version of uncli",
             "ls": "List all services",
             "def": "Show the feature service definition",
-            "def -layers" : "List all layers in this service",
+            "def --layers" : "List all layers in this service",
             "subnetworks" : "Lists all subnetworks",
-            "subnetworks -d" : "Lists only dirty subnetworks",
-            "subnetworks -dd" : "Lists dirty and deleted subnetworks",
+            "subnetworks --dirty" : "Lists only dirty subnetworks",
+            "subnetworks --deleted" : "Lists dirty and deleted subnetworks",
             "evaluate" : "Evaluate in parallel",
-            "trace -s <subnetwork>": "Traces input subnetwork and returns the time and number of elements returned .",
+            "trace --subnetwork <subnetwork>": "Traces input subnetwork and returns the time and number of elements returned .",
             "topology" : "Displays the topology status",
-            "topology -disable" : "Disable topology",
-            "topology -enable" : "Enable topology",
-            "topology -validate" : "Validate topology (full extent)",
-            "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 -deleted": "Export all subnetworks with ACK that are deleted ",
+            "topology --disable" : "Disable topology",
+            "topology --enable" : "Enable topology",
+            "topology --validate" : "Validate topology (full extent)",
+            "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 --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.",
+            "count --system": "Lists the number of rows in system layers.",
+            "connect --service": "Connects to the another service",
+            "arlogs": "Lists attribute rules execution logs (requires admin)",
+            "arlogs --byrule": "Lists attribute rules execution summary by rule (requires admin)",
             "whoami": "Lists the current login info",
             "clear": "Clears this screen",
             "quit": "Exit this program"
@@ -177,10 +187,10 @@ const inputs = {
     },
     "^whoami$": async () => {
  
-        console.log(`${parameters.user}@${parameters.service}@${parameters.version}`)
+        console.log(`${parameters.user}@${parameters.service}@${parameters.gdbversion}`)
 
     },
-    "^def -layers$|^layers$": async () => {
+    "^def --layers$|^layers$": async () => {
         const layerProperties = [
             "id",
             "name",
@@ -243,7 +253,7 @@ const inputs = {
         }) 
         console.table(topoMoments) 
     },
-    "^topology -enable$": async () => {
+    "^topology --enable$": async () => {
         console.log("Enabling topology ...");
         const fromDate = new Date();
         const result = await un.enableTopology()
@@ -252,7 +262,7 @@ const inputs = {
         result.duration =  numberWithCommas(Math.round(timeEnable/1000)) + " s"
         console.table(result) 
     },
-    "^topology -disable$": async () => {
+    "^topology --disable$": async () => {
         const fromDate = new Date();
         console.log("Disabling topology ...");
         const result = await un.disableTopology()
@@ -288,7 +298,7 @@ const inputs = {
     //progress
     //timeouts
     //in case failure you don't lose everything
-    "^topology -validate -fn$": async () => {
+    "^topology --validate -fn$": async () => {
         console.log("Validating Network topology ...");
 
         const fullExtent = un.featureServiceJson.fullExtent;
@@ -335,7 +345,7 @@ const inputs = {
         
     },
 
-    "^topology -validate$": async () => {
+    "^topology --validate$": async () => {
         console.log("Validating Network topology ...");
         const fromDate = new Date();
         const result = await un.validateNetworkTopology()
@@ -344,7 +354,7 @@ const inputs = {
         result.duration =  numberWithCommas(Math.round(timeEnable/1000)) + " s"
         console.table(result) 
     },
-    "^subnetworks -d$": async () => {        
+    "^subnetworks --dirty$": async () => {        
         const subnetworks = await un.getSubnetworks("isdirty=1");
         if (subnetworks.features.length === 0) {
             console.log("No dirty subnetworks found.")
@@ -356,7 +366,7 @@ const inputs = {
         const rowCount = subs.length;
         console.log (`${numberWithCommas(rowCount)} rows returned.`)
     },
-    "^subnetworks -dd$": async () => {        
+    "^subnetworks --deleted$": async () => {        
         const subnetworks = await un.getSubnetworks("isdirty=1 and isdeleted=1");
         if (subnetworks.features.length === 0) {
             console.log("No dirty and deleted subnetworks found.")
@@ -369,7 +379,7 @@ const inputs = {
         console.log (`${numberWithCommas(rowCount)} rows returned.`)
     },
 
-    "^update subnetworks -deleted$" : async () => {
+    "^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");
         console.log(`Discovered ${subnetworks.features.length} dirty deleted subnetworks.`);
@@ -393,7 +403,7 @@ const inputs = {
         }
     },
 
-    "^update subnetworks -all$" : async () => {
+    "^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.`);
@@ -415,7 +425,7 @@ const inputs = {
             console.log(`Result ${JSON.stringify(subnetworkResult)}`)
         }
     },
-    "^update subnetworks -all -async$" : async () => {
+    "^update subnetworks --all --async$" : 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.`);
@@ -426,7 +436,7 @@ const inputs = {
             console.log(`Result from submitting job ${JSON.stringify(subnetworkResult)}`)
         }
     },
-    "^export subnetworks -all$" : async input => {
+    "^export subnetworks --all$" : async input => {
 
         
         //create folder
@@ -473,13 +483,13 @@ const inputs = {
     },
    
 
-    "^export subnetworks -new -f .*$|^export subnetworks -new$" : async input => {
+    "^export subnetworks --new --folder .*$|^export subnetworks --new$" : async input => {
 
         //create folder
-        const file = input.match(/-f .*/gm)
+        const file = input.match(/--folder .*/gm)
         let inputDir = "Exported"
         if (file != null && file.length > 0)
-             inputDir = file[0].replace("-f ", "")
+             inputDir = file[0].replace("--folder ", "")
         //create directory if doesn't exists
         if (!fs.existsSync(inputDir))  fs.mkdirSync(inputDir)
 
@@ -509,17 +519,26 @@ const inputs = {
         const result = await un.returnInvalidAssociations();
         console.log("Invalid Associations " + JSON.stringify(result))
     },
+    "^connect --service": async input =>{
 
-    "^trace -s": async input => {
+        const inputParam = input.match(/--service .*/gm)
+        let serviceName = null;
+        if (inputParam != null && inputParam.length > 0)
+            serviceName = inputParam[0].replace("--service ", "")
+        
+        parameters.service = serviceName
+        connect(parameters)
+    },
+    "^trace --subnetwork": async input => {
         //get subnetwork name
 
         const fromDate = new Date();
        
 
-        const inputParam = input.match(/-s .*/gm)
+        const inputParam = input.match(/--subnetwork .*/gm)
         let subnetworkName = null;
         if (inputParam != null && inputParam.length > 0)
-            subnetworkName = inputParam[0].replace("-s ", "")
+            subnetworkName = inputParam[0].replace("--subnetwork ", "")
 
         console.log(`Tracing subnetwork ${subnetworkName}`);
         const result = await un.subnetworkTraceSimple(subnetworkName)
@@ -535,7 +554,7 @@ const inputs = {
         console.table(newResult) 
 
     },
-    "^export subnetworks -deleted$" : async input => {
+    "^export subnetworks --deleted$" : async input => {
 
         //create folder
         const file = input.match(/-f .*/gm)
@@ -572,11 +591,11 @@ const inputs = {
  
      },
  
-     "^write -f.*$": async input => {
+     "^write --folder.*$": async input => {
            
   
-         const file = input.match(/-f .*/gm)
-         const inputDir = file[0].replace("-f ", "")
+         const file = input.match(/--folder .*/gm)
+         const inputDir = file[0].replace("--folder ", "")
          //create directory if doesn't exists
          if (!fs.existsSync(inputDir))  fs.mkdirSync(inputDir)
          fs.writeFileSync(`${inputDir}/${Math.random()}`, Math.random())
@@ -625,12 +644,11 @@ const inputs = {
     },
 
     
-    "^count -system$": async () => {
+    "^count --system$": async () => {
         console.log("Querying all system layers....")
         
         const systemLayers = un.getSystemLayers();
-       
-
+        let totalRows = 0;
  
         const layerCount = []
         for (let i = 0; i < systemLayers.length; i++ )      
@@ -640,6 +658,7 @@ const inputs = {
 
             const result = await un.queryCount(l.id);
             
+            totalRows+=result.count;
             layerCount.push( {
                 "layerId": l.id,
                 "name": l.name    ,
@@ -648,9 +667,87 @@ const inputs = {
     
         } 
         
-        console.table(layerCount) 
+        console.table(layerCount)
+        console.log(`Total number of rows in all system layers : ${numberWithCommas(totalRows)} .`)
+
     },
 
+    "^arlogs$": async () => {
+        console.log(`Querying attribute rules logs for ${parameters.service} ...`)
+        const result= await adminLog.query([102003], parameters.service)
+        const jsonRes = await result.json()
+        const arMessages = jsonRes.logMessages
+            .filter(m => m.message.indexOf("Attribute rule execution complete:") > -1)
+            .map (m =>  JSON.parse(m.message.replace("Attribute rule execution complete:", "")))
+            .map( m => {
+                m["Elapsed Time (ms)"] =  Math.round(m["Elapsed Time"]*1000000)/1000
+               // m["Arcade Evaluation Time:"] = Math.round(m["Arcade Evaluation Time:"]*1000,6)
+                //m.ArcadeTime = m["Arcade Evaluation Time:"]
+                
+                delete  m["Arcade Evaluation Time:"];
+                delete  m["Elapsed Time"];
+                //delete m ['GlobalID'];
+                return m
+            })
+            .sort( (m1, m2) => m2["Elapsed Time (ms)"]- m1["Elapsed Time (ms)"])
+        console.table(arMessages)
+        /*
+        code:102003
+        elapsed:''
+        machine:'DEV0015932.ESRI.COM'
+        message:'requestProperties = {"token":"HfauSFGoSwTMA5KLvsL-I8EORea_KEvz1GcAMNCsvTuzeJ1QuYbQm0EGI7eC2zr1lOm8857U18oZOjG0BeuEwKj7fvCk-_DuWKFvClU5p06SRLE8RjEzPB0gjMTFQnjVnTRmQzZFWXCj1VRssMECQg..","referer":null,"privilege":"ADMINISTER","privileges":["features:user:edit","features:user:fullEdit","features:user:manageVersions","portal:user:viewTracks","premium:user:geocode:stored","premium:user:geocode:temporary","premium:user:networkanalysis:closestfacility","premium:user:networkanalysis:locationallocation","premium:user:networkanalysis:optimizedrouting","premium:user:networkanalysis:origindestinationcostmatrix","premium:user:networkanalysis:routing","premium:user:networkanalysis:servicearea","premium:user:networkanalysis:vehiclerouting","traceNetwork","utilityNetwork","parcelFabric"],"securityProvider":"portal"}'
+        methodName:'GetServerEnvironmentRequestProperties'
+        process:'30940'
+        requestID:'fccb7fba-cba9-4ebb-84b2-cb3645979d8e'
+        source:'RedTrolley_Postgres.MapServer'
+        thread:'29408'
+        time:1634165691074
+        type:'DEBUG'
+        user:'unadmin'
+        */
+         
+    },
+
+
+    "^arlogs --byrule$": async () => {
+        console.log(`Querying attribute rules logs for ${parameters.service} ...`)
+        const result= await adminLog.query([102003], parameters.service)
+        const jsonRes = await result.json()
+        const arMessages = jsonRes.logMessages
+            .filter(m => m.message.indexOf("Attribute rule execution complete:") > -1)
+            .map (m =>  JSON.parse(m.message.replace("Attribute rule execution complete:", "")))
+            .map( m => {
+                m["Elapsed Time (ms)"] =  Math.round(m["Elapsed Time"]*1000000)/1000
+               // m["Arcade Evaluation Time:"] = Math.round(m["Arcade Evaluation Time:"]*1000,6)
+                //m.ArcadeTime = m["Arcade Evaluation Time:"]
+                
+                delete  m["Arcade Evaluation Time:"];
+                delete  m["Elapsed Time"];
+                //delete m ['GlobalID'];
+                return m
+            })
+            .sort( (m1, m2) => m2["Elapsed Time (ms)"]- m1["Elapsed Time (ms)"])
+            .reduce( ( prev, cur ) => {
+                if (prev [cur["Rule name"]] === undefined)
+                    prev [cur["Rule name"]] = 0;
+
+                prev [cur["Rule name"]] = cur["Elapsed Time (ms)"]
+                return prev
+            }, {})
+
+        const rules = Object.keys(arMessages)
+        .map(a => {
+
+                const rule = {}
+                rule["Attribute Rule"] = a;
+                rule["Total Cost (ms)"] = arMessages[a];
+                return rule;
+        })
+        .sort( (m1, m2) => m2["Total Cost (ms)"] -m1["Total Cost (ms)"])
+        console.table(rules)
+       
+         
+    },
 
     "^version$": () => console.log(version),
     "^clear$|^cls$": () => console.clear(),
@@ -829,6 +926,9 @@ export async function run (){
     }
     console.log(`uncli ${version} is experimental command line utility for basic utility network services. Use as is.`)
     parameters = await parseInput( )
+    //set certificate verification 
+    const verifyCert = parameters["verify"] === 'true' ? 1 : 0;
+    process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = verifyCert;
     setTimeout( async ()=> await regenerateToken(parameters) , 1000*60*GENERATE_TOKEN_TIME_MIN)
     await connect(parameters)
 }

package/makerequest.mjs

@@ -1,9 +1,4 @@
 import fetch from "node-fetch";
-import { logger } from "./logger.mjs";
-
-
-//UNCOMMENT THIS LINE IF YOU DON'T HAVE SECURE CERTIFICATE
-process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = 0
 
 export function makeRequest (opts) {
    
@@ -28,7 +23,7 @@ export function makeRequest (opts) {
        if (opts.headers) 
            Object.keys(opts.headers).forEach(  key => headers[key] = opts.headers[key] )
 
-       logger.info(  opts )
+       //console.log(opts)
        const result = await fetch(opts.url, {
            "method" : opts.method,
             "headers":  headers,

package/package.json

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

package/portal.mjs

@@ -1,7 +1,6 @@
 import { makeRequest } from "./makerequest.mjs"
 import { logger } from "./logger.mjs"
 
-process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = 0
 export class Portal{
         
     constructor(url, username, password, expiration = 300)
@@ -33,9 +32,9 @@ export class Portal{
                     }
     
                     //query for token 
-                    logger.info("About to make a POST request..")
+                    logger.info("Generating Token Sending POST request..")
                     const result = await makeRequest({method: 'POST', url: tokenUrl, params: postJson });
-                    logger.info("got result " + JSON.stringify(result))
+                    logger.info("Got result.")
                     if (result.error) reject(JSON.stringify(result.error))
                     self.token = result.token;
              
@@ -45,8 +44,9 @@ export class Portal{
                   
             }
             catch(ex){
-                console.error(ex)
-                reject(`Failed to connect to portal ${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.)`)
             }
 
             }

package/utilitynetwork.node.mjs

@@ -4,32 +4,23 @@
 //Mod    : May-18-2020
 //Twitter: @hnasr
 
- 
-//import('node-fetch').then(f => fetch = f ).catch(e => console.error("can't load , not node"))
-//import("./logger.mjs").then(l => logger = l ).catch(e => console.error("can't load , not node"))
 
 /*
 import fetch from "node-fetch"
 */
 import { logger } from "./logger.mjs"
 import ProgressBar from "progress"
-
-
  
-
-
- 
-//UNCOMMENT THIS LINE IF YOU DON'T HAVE SECURE CERTIFICATE
-process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = 0
   
 
 export class UtilityNetwork {
 
-        constructor(token, featureServiceUrl)
+        constructor(token, featureServiceUrl, gdbVersion="sde.DEFAULT")
         {   
 
             this.featureServiceUrl = featureServiceUrl;
-            this.token = token;          
+            this.token = token;         
+            this.gdbVersion = gdbVersion;
         }
 
       ///first function one should call after creating an instance of a utility network
@@ -197,6 +188,7 @@ export class UtilityNetwork {
             const momentsToReturn = JSON.stringify(moment)
             let postJson = {    
                 token: this.token,
+                gdbVersion:this.gdbVersion,
                 momentsToReturn: momentsToReturn,
                 f: "json"
             }
@@ -211,8 +203,7 @@ export class UtilityNetwork {
 
        }
      
-        
-       getAll
+    
         //return the domainNetwork object.     
         getDomainNetwork(domainNetworkName)
         {
@@ -233,7 +224,7 @@ export class UtilityNetwork {
                return tier;
         }
         //query the subnetwokrs table 
-        getSubnetworks(domainNetworkName, tierName, gdbVersion="sde.DEFAULT")
+        getSubnetworks(domainNetworkName, tierName)
         {
             let subnetworkTableUrl = this.featureServiceUrl + "/" + this.layerDefinition.systemLayers.subnetworksTableId + "/query";
             
@@ -242,7 +233,8 @@ export class UtilityNetwork {
                 where: "DOMAINNETWORKNAME = '" + domainNetworkName + "' AND TIERNAME = '" + tierName + "'",
                 outFields: "SUBNETWORKNAME",
                 orderByFields: "SUBNETWORKNAME",
-                gdbVersion: gdbVersion,
+                gdbVersion:this.gdbVersion,
+
                 returnDistinctValues: true,
                 f: "json"
             }
@@ -251,7 +243,7 @@ export class UtilityNetwork {
 
         }
 
-        getSubnetworks(whereclause = "1=1", gdbVersion="sde.DEFAULT") {
+        getSubnetworks(whereclause = "1=1") {
 
             let subnetworkTableUrl = this.featureServiceUrl + "/" + this.layerDefinition.systemLayers.subnetworksTableId + "/query";
             
@@ -260,21 +252,21 @@ export class UtilityNetwork {
                 where: whereclause,
                 outFields: "DOMAINNETWORKNAME, TIERNAME, SUBNETWORKNAME",
                 orderByFields: "DOMAINNETWORKNAME, TIERNAME, SUBNETWORKNAME",
-                gdbVersion: gdbVersion,
+                gdbVersion:this.gdbVersion,
                 returnDistinctValues: true,
                 f: "json"
             }
             
             return makeRequest({method: 'POST', url: subnetworkTableUrl, params: postJson});
         }
-        queryCount(layerId, where ="1=1", gdbVersion="sde.DEFAULT") {
+        queryCount(layerId, where ="1=1") {
 
             let queryJson = {
                 f: "json",
                 token: this.token,
                 returnCountOnly: true,            
                 where: where,
-                gdbVersion: gdbVersion
+                gdbVersion:this.gdbVersion,
             }
  
             queryJson.layerId = layerId 
@@ -283,14 +275,14 @@ export class UtilityNetwork {
              
         }
         
-        queryDistinct(layerId, field, where, gdbVersion = "sde.DEFAULT") {
+        queryDistinct(layerId, field, where) {
            
             let queryJson = {
                 f: "json",
                 token: this.token,
                 outFields: field,
                 where: where,
-                gdbVersion: gdbVersion,
+                gdbVersion:this.gdbVersion,
                 returnDistinctValues: true
             }
  
@@ -307,7 +299,7 @@ export class UtilityNetwork {
 
         }
         //query that projects to webmercator. 
-        query(layerId, where, obj, objectids, outFields = "*", gdbVersion = "sde.DEFAULT", resultOffset = 0, resultRecordCount=2000)
+        query(layerId, where, obj, objectids, outFields = "*", resultOffset = 0, resultRecordCount=2000)
         {   
             let webMercSpatialReference = {
                 "wkid": 102100,
@@ -329,7 +321,7 @@ export class UtilityNetwork {
                 token: this.token,
                 outFields: outFields,
                 where: where,
-                gdbVersion: gdbVersion,
+                gdbVersion:this.gdbVersion,
                 outSR: JSON.stringify(webMercSpatialReference),
                 resultOffset: resultOffset,
                 resultRecordCount: resultRecordCount
@@ -391,7 +383,7 @@ export class UtilityNetwork {
             
 
 
-            
+            if (this.layerDefinition.systemLayers.pointErrorsLayerId)
             systemLayers.push({
                 "id": this.layerDefinition.systemLayers.pointErrorsLayerId,
                 "name": "Point Errors",
@@ -399,7 +391,7 @@ export class UtilityNetwork {
                 "geometryType": "Point" 
             })
 
-            
+            if (this.layerDefinition.systemLayers.lineErrorsLayerId)
             systemLayers.push({
                 "id": this.layerDefinition.systemLayers.lineErrorsLayerId,
                 "name": "Line Errors",
@@ -407,7 +399,7 @@ export class UtilityNetwork {
                 "geometryType": "Line" 
             })
             
-            
+            if (this.layerDefinition.systemLayers.polygonErrorsLayerId)
             systemLayers.push({
                 "id": this.layerDefinition.systemLayers.polygonErrorsLayerId,
                 "name": "Polygon Errors",
@@ -648,6 +640,7 @@ export class UtilityNetwork {
                     f: "json",
                     token: this.token,
                     traceType : traceType,
+                    gdbVersion:this.gdbVersion,
                     traceLocations: JSON.stringify(traceLocations),
                     traceConfiguration: JSON.stringify(traceConfiguration)
                 }
@@ -812,7 +805,7 @@ export class UtilityNetwork {
 
         }
 
-        applyEdits(layerId, adds, updates, deletes, returnServiceEdits=false, gdbVersion="SDE.DEFAULT") {
+        applyEdits(layerId, adds, updates, deletes, returnServiceEdits=false) {
 
             // "updates": [{ 
             //    "attributes": {"GLOBALID": deviceGlobalId,"DEVICESTATUS":0},
@@ -846,7 +839,7 @@ export class UtilityNetwork {
                 token: this.token,
                 useGlobalIds: true,
                 returnEditMoment: false,
-                gdbVersion: gdbVersion,          
+                gdbVersion:this.gdbVersion,
                 edits: JSON.stringify(c)
             }
             
@@ -871,7 +864,8 @@ export class UtilityNetwork {
                 token: this.token, 
                 useGlobalIds: true,
                 returnEditMoment: false,
-    
+                gdbVersion:this.gdbVersion,
+
                 edits: JSON.stringify(c)
             }
             
@@ -881,7 +875,7 @@ export class UtilityNetwork {
 
         }
 
-        evaluate (extent, selectionSet, evaluationTypes, async = false, gdbVersion = "sde.DEFAULT")  {
+        evaluate (extent, selectionSet, evaluationTypes, async = false)  {
 
             console.log("Evaluating... ")
             /*
@@ -912,7 +906,7 @@ export class UtilityNetwork {
                   evaluationType: JSON.stringify(evaluationTypes),
                   selection: selectionJson,     
                   evaluationArea: extentJson,     
-                  gdbVersion: gdbVersion,  
+                  gdbVersion:this.gdbVersion,
                   async: async
               } 
             
@@ -940,7 +934,7 @@ export class UtilityNetwork {
           
         }
 
-        disableTopology(gdbVersion="sde.DEFAULT") {
+        disableTopology() {
 
             let thisObj = this;   
 
@@ -950,8 +944,8 @@ export class UtilityNetwork {
                let jsonPayload = {
                   f: "json",
                   token: this.token,
-                  gdbVersion: gdbVersion
-              } 
+                  gdbVersion:this.gdbVersion,
+                } 
             
             return makeRequest({method:'POST', params: jsonPayload, url: url })
          
@@ -982,8 +976,8 @@ export class UtilityNetwork {
                   allSubnetworksInTier: false,
                   continueOnFailure: false,               
                   async: async,
-                  gdbVersion: "sde.DEFAULT"
-              }
+                  gdbVersion:this.gdbVersion,
+                }
               let un = this;
             
             return makeRequest({method:'POST', params: updatesubnetworkJson, url: updatesubnetworkUrl })
@@ -1015,8 +1009,8 @@ export class UtilityNetwork {
                   continueOnFailure: false,
                   traceConfiguration: subnetworkDef,               
                   async: async,
-                  gdbVersion: "sde.DEFAULT"
-              }
+                  gdbVersion:this.gdbVersion,
+                }
               let un = this;
             
             return makeRequest({method:'POST', params: exportsubnetworkJson, url: exportsubnetworkUrl })
@@ -1025,7 +1019,7 @@ export class UtilityNetwork {
 
         }
 
-        validateNetworkTopology (gdbVersion="sde.DEFAULT", extentArea = null) {
+        validateNetworkTopology (extentArea = null) {
 
             const t = {"includeContainers":false,"includeContent":false,"includeStructures":true,"includeBarriers":true,"validateConsistency":true,"includeIsolated":false,"ignoreBarriersAtStartingPoints":false,"domainNetworkName":"","tierName":"","targetTierName":"","subnetworkName":"","diagramTemplateName":"","shortestPathNetworkAttributeName":"","filterBitsetNetworkAttributeName":"","traversabilityScope":"junctionsAndEdges","conditionBarriers":[{"name":"Operational Device Status","type":"networkAttribute","operator":"equal","value":1,"combineUsingOr":false,"isSpecificValue":true}],"functionBarriers":[],"arcadeExpressionBarrier":"","filterBarriers":[],"filterFunctionBarriers":[],"filterScope":"junctionsAndEdges","functions":[],"nearestNeighbor":{"count":-1,"costNetworkAttributeName":"","nearestCategories":[],"nearestAssets":[]},"outputFilters":[],"outputConditions":[],"propagators":[]}
             
@@ -1045,8 +1039,8 @@ export class UtilityNetwork {
                   token: this.token,
                   validateArea: JSON.stringify(extent), 
                   async: false,
-                  gdbVersion: gdbVersion
-              }
+                  gdbVersion:this.gdbVersion,
+                }
            
              return  makeRequest({method:'POST', params: validateJson, url: validateUrl })
           
@@ -1079,6 +1073,7 @@ export class UtilityNetwork {
             if (opts.headers) 
                 Object.keys(opts.headers).forEach(  key => headers[key] = opts.headers[key] )
             
+           // console.log(params)
             import("node-fetch")
             .then( fetch => {
                 

package/test.txt

@@ -1,6 +0,0 @@
-echo topology -disable>cmd.txt
-node un.mjs --portal https://utilitynetwork.esri.com/portal --user unadmin --password unadmin.108 --service GettingToKnow_Postgres --file cmd.txt
-echo topology -enable>cmd.txt
-node un.mjs --portal https://utilitynetwork.esri.com/portal --user unadmin --password unadmin.108 --service GettingToKnow_Postgres --file cmd.txt
-echo update subnetworks -all>cmd.txt
-node un.mjs --portal https://utilitynetwork.esri.com/portal --user unadmin --password unadmin.108 --service GettingToKnow_Postgres --file cmd.txt