un-cli 0.0.80 → 0.0.82

package/README.md

@@ -14,12 +14,14 @@ npm install -g un-cli
 ## Once installed here is how you connect 
 
 ```bash
-> uncli --portal https://utilitynetwork.esri.com/portal --service NapervilleElectric_SQLServer --user tester --password tester.108 
+> uncli --portal https://utilitynetwork.esri.com/portal --service NapervilleElectric_SQLServer --user tester --password tester.108 --verify true
 ```
+If this fails with a verification error it means you are using a self-signed certificate you can use use --verify false to disable verification but don't use this in production.
 
 ```bash
 
 uncli> help
+
 ┌───────────────────────────────────────┬──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
 │                (index)                │                                                          Values                                                          │
 ├───────────────────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
@@ -40,10 +42,15 @@ uncli> help
 │       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.'                                     │
+│           updateisconnected           │                                                'Run update is connected '                                                │
+│               versions                │                               'List all versions available to the current logged in user.'                               │
+│  reconcile --version <version name>   │                                       'Reconcile the input version synchronously'                                        │
+│            reconcile --all            │                           'Reconcile all versions available to the current user synchronously'                           │
+│        reconcile --all --async        │                          'Reconcile all versions available to the current user asynchronously'                           │
+│                 count                 │                               'Lists the number of rows in all feature layers and tables.'                               │
 │            count --system             │                                       'Lists the number of rows in system layers.'                                       │
 │           connect --service           │                                            'Connects to the another service'                                             │
 │       tracelogs --age <minutes>       │                    'Lists utility network trace summary logs for the last x minutes (requires admin)'                    │

package/adminlog.mjs

@@ -20,6 +20,8 @@ export class AdminLog {
             return fetch;
         }
     }
+ 
+
     async query (codes, serviceName ="*", pageSize = 100000, startTime = null, endTime = null, logLevel = "DEBUG") 
     {   
         const url =  this.adminServerUrl  + "/logs/query?f=pjson"

package/cmd.txt

@@ -1,2 +1,2 @@
-reconcile --version U136967.MigrateTransm
+arlogs --age 10
 exit

package/index.html

@@ -2144,6 +2144,11 @@ function numberWithCommas(x) {
         })
     }
 
+    function decodeHTMLEntities (x) {
+        const decodedString = document.createElement('div');
+        decodedString.innerHTML = x;
+        return decodedString.innerHTML;
+    }
 
     //paging works from newer message walking to the oldest message
     //start time must be less than end time 
@@ -2190,7 +2195,11 @@ function numberWithCommas(x) {
         let jsonRes = await result.json()
         let allMessages = [].concat(jsonRes.logMessages) 
         allMessages = allMessages.filter(m => m.message.indexOf(messageFilter) > -1 && m.methodName.indexOf(methodFilter) > -1)
-     
+        //add decode html 
+        allMessages = allMessages.map(m=> {  
+            m.message = decodeHTMLEntities(m.message)
+            return m
+        })
         let oldStart = undefined;
         let newStartTime = undefined;
         while (jsonRes.hasMore && !stop)

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.80";
+let version = "0.0.82";
 const GENERATE_TOKEN_TIME_MIN = 30;
 
 let rl = null;
@@ -27,7 +27,8 @@ function parseInput(){
           "--gdbversion",
           "--file",
           "--verify",
-          "--server"
+          "--server",
+          "--proxy"
            ]     
         
       //null marked parmaters are required
@@ -40,7 +41,8 @@ function parseInput(){
           "gdbversion": "SDE.DEFAULT",
           "file": "",
           "verify": "true",
-          "server": undefined
+          "server": undefined,
+          "proxy": undefined
       }
 
       for (let i = 0; i < process.argv.length ; i++){
@@ -53,7 +55,7 @@ function parseInput(){
 
       if (Object.values(params).includes(null))
       {
-        logger.info ("HELP: uncli --portal https://unportal.domain.com/portal --service servicename --user username --password password [--gdbversion* user.version --server  https://federatedserver.domain.com/server --file commandfile* --verify true|false]")    
+        logger.info ("HELP: uncli --portal https://unportal.domain.com/portal --service servicename --user username --password password [--gdbversion* user.version --server  https://federatedserver.domain.com/server --file commandfile* --verify true|false] --proxy http://proxyurl:port")    
         logger.info("--file commandfile is optional and you can pass a path to a file with a list of command to execute. ")
         logger.info("--gdbversion is optional and allows the UN to be opened in that version. When not specified sde.DEFAULT is used.")
         logger.info("--server is optional except when there are more than one federated server sites to the portal. If the portal only has one server it will be selected.")
@@ -176,6 +178,9 @@ const inputs = {
             "export subnetworks --deleted": "Export all subnetworks with ACK that are deleted ",
             "updateisconnected": "Run update is connected ",
             "versions": "List all versions available to the current logged in user.",
+            "reconcile --version <version name>": "Reconcile the input version synchronously",
+            "reconcile --all": "Reconcile all versions available to the current user synchronously",
+            "reconcile --all --async": "Reconcile all versions available to the current user asynchronously",
             "count": "Lists the number of rows in all feature layers and tables.",
             "count --system": "Lists the number of rows in system layers.",
             "connect --service": "Connects to the another service",
@@ -926,7 +931,7 @@ const inputs = {
 
         const arMessages = allMessages
             .filter(m => m.message.indexOf("Attribute rule execution complete:") > -1)
-            .map (m =>  JSON.parse(m.message.replace("Attribute rule execution complete:", "")))
+            .map (m =>  JSON.parse(decodeHTMLEntities(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)
@@ -1274,7 +1279,7 @@ const inputs = {
 
         const arMessages = allMessages
             .filter(m => m.message.indexOf("Attribute rule execution complete:") > -1)
-            .map (m =>  JSON.parse(m.message.replace("Attribute rule execution complete:", "")))
+            .map (m =>  JSON.parse(decodeHTMLEntities(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)
@@ -1519,12 +1524,34 @@ export async function run (){
     parameters = await parseInput( )
     //set certificate verification 
     const verifyCert = parameters["verify"] === 'true' ? 1 : 0;
+    const proxy = parameters["proxy"]
     process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = verifyCert;
+
+    if (proxy){
+        logger.info(`Using proxy ${proxy}`);
+        process.env['HTTPS_PROXY'] = proxy;
+    }
+
+        
+
     setTimeout( async ()=> await regenerateToken(parameters) , 1000*60*GENERATE_TOKEN_TIME_MIN)
     await connect(parameters)
 }
 
 
+function decodeHTMLEntities (x) {
+    const entities = { 
+        '&lt;': '<', 
+        '&gt;': '>', 
+        '&amp;': '&', 
+        '&quot;': '"', 
+        '&apos;': "'" 
+    }; 
+     
+    const y =  x.replace(/&[a-zA-Z0-9#]+;/g, (match) => entities[match] || match); 
+   return y
+}
+
 
 function printFishnet(fishnet) {
 

package/makerequest.mjs

@@ -1,6 +1,5 @@
- 
-
 
+ 
 export function makeRequest (opts) {
    
    return new Promise(async function (resolve, reject) {
@@ -23,26 +22,44 @@ export function makeRequest (opts) {
            
        if (opts.headers) 
            Object.keys(opts.headers).forEach(  key => headers[key] = opts.headers[key] )
-
-       //console.log(opts)
-
+ 
+        let jsonRes
+        let agent;
         let f;
+        
         try {
- 
+            
             let nodeFetch = await import ("node-fetch");
             f = nodeFetch.default;
+     
+        //set a proxy if one exists 
+          
+        if (process?.env['HTTPS_PROXY'])
+            {
+                try {
+                    const HttpsProxyAgent = await import ('https-proxy-agent')
+                    agent = new HttpsProxyAgent.HttpsProxyAgent(process.env['HTTPS_PROXY'])
+                }
+                catch (ex){
+                    agent = undefined;
+                }
+               
+            }
         }
         catch(ex) {
             f = fetch;
-        }
-         
-        let jsonRes
+        } 
         
-       const result = await f(opts.url, {
-           "method" : opts.method,
-            "headers":  headers,
-            "body": params
-       });
+        const options =  {
+            "method" : opts.method,
+             "headers":  headers,
+             "body": params
+        }
+
+        if (agent)
+            options.agent = agent;
+
+        const result = await f(opts.url,options);
 
         jsonRes  = await result.json();
         

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "un-cli",
-  "version": "0.0.80",
+  "version": "0.0.82",
   "description": "Command line interface for working with ArcGIS Utility Network Extension",
   "main": "index.mjs",
   "bin": {
@@ -17,6 +17,7 @@
   "author": "Hussein Nasser",
   "license": "ISC",
   "dependencies": {
+    "https-proxy-agent": "^7.0.6",
     "node-fetch": "^2.6.0"
   }
 }

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();