un-cli 0.0.79 → 0.0.81

package/cmd.txt

@@ -1,2 +1,3 @@
-topology --validate --fishnet
+reconcile --version U136967.MigrateTransm
+update 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.79";
+let version = "0.0.81";
 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.")
@@ -175,7 +177,10 @@ const inputs = {
             "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 ",
-            
+            "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",
@@ -228,6 +233,100 @@ const inputs = {
 
         console.table(serviceDef)
     },
+    
+    "^versions$": async () => {
+        
+        const versions = await un.versions();
+        if (versions.versions.length === 0) {
+            logger.info("No versions found.")
+            return;
+        }
+        const subs = versions.versions.map( (a) =>  {
+                     return  {"versionName": a.versionName, "Id": a.versionId, "guid" : a.versionGuid, "created": a.creationDate, "modified": a.modifiedDate, "access": a.access};
+                     })
+
+        console.table(subs)
+        const rowCount = subs.length;
+        logger.info (`${numberWithCommas(rowCount)} rows returned.`)
+    },
+
+
+    "^reconcile --version": async (input) => {
+        
+        const inputParam = input.match(/--version .*/gm)
+        let versionName = null;
+        if (inputParam != null && inputParam.length > 0)
+            versionName = inputParam[0].replace("--version ", "")
+
+        const versions = await un.versions();
+
+        for (let v = 0; v < versions.versions.length; v++)
+        {   
+            if (versions.versions[v].versionName.toString().toUpperCase() === "SDE.DEFAULT") continue;
+            if (versions.versions[v].versionName.toString().toUpperCase() == versionName.toUpperCase())  {
+                logger.info (`Reconciling version ${versions.versions[v].versionName} ...`)
+
+                const result = await un.reconcile(versions.versions[v].versionGuid, false, false, true, false);
+                logger.info(JSON.stringify(result))
+                break;
+            }
+           
+        }   
+        logger.info (`Reconciled ${versionName}.`)
+    },
+
+    
+    "^reconcile --all$": async () => {
+        
+        const versions = await un.versions();
+
+        for (let v = 0; v < versions.versions.length; v++)
+        {   
+            if (versions.versions[v].versionName.toString().toUpperCase() === "SDE.DEFAULT") continue;
+            logger.info (`Reconciling version ${versions.versions[v].versionName} ...`)
+
+            const result = await un.reconcile(versions.versions[v].versionGuid, false, false, true, false);
+            logger.info(JSON.stringify(result))
+        }   
+        const rowCount = versions.versions.length;
+        logger.info (`Reconciled ${numberWithCommas(rowCount)} versions.`)
+    },
+
+    "^reconcile --all --async$": async () => {
+        //async
+        const versions = await un.versions();
+
+        for (let v = 0; v < versions.versions.length; v++)
+        {   
+            if (versions.versions[v].versionName.toString().toUpperCase() === "SDE.DEFAULT") continue;
+            logger.info (`Reconciling version ${versions.versions[v].versionName} ...`)
+
+            const result = await un.reconcile(versions.versions[v].versionGuid, false, false, true, true);
+            logger.info(JSON.stringify(result))
+        }   
+        const rowCount = versions.versions.length;
+        logger.info (`Reconciled ${numberWithCommas(rowCount)} versions.`)
+    },
+
+    
+    "^versions --disconnect$": async () => {
+        //disconnect all versions
+        const versions = await un.versions();
+
+        for (let v = 0; v < versions.versions.length; v++)
+        {   
+            if (versions.versions[v].versionName.toString().toUpperCase() === "SDE.DEFAULT") continue;
+            logger.info (`Stopping editing on version ${versions.versions[v].versionName} ...`)
+            const g = versions.versions[v].versionGuid
+            let result = await un.stopEditing(g,g);
+            logger.info(JSON.stringify(result))
+            logger.info (`Stopping reading on version ${versions.versions[v].versionName} ...`)
+            result = await un.stopReading(g,g);
+            logger.info(JSON.stringify(result))
+        }   
+        const rowCount = versions.versions.length;
+        logger.info (`Disconnected ${numberWithCommas(rowCount)} versions.`)
+    },
     "^subnetworks$": async () => {
         
         const subnetworks = await un.getSubnetworks();
@@ -1425,7 +1524,16 @@ 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)
 }

package/makerequest.mjs

@@ -1,6 +1,5 @@
- 
-
 
+ 
 export function makeRequest (opts) {
    
    return new Promise(async function (resolve, reject) {
@@ -23,26 +22,43 @@ 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;
         }
         catch(ex) {
             f = fetch;
+        } 
+        //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;
+                }
+               
+            }
+
+        const options =  {
+            "method" : opts.method,
+             "headers":  headers,
+             "body": params
         }
-         
-        let jsonRes
-        
-       const result = await f(opts.url, {
-           "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.79",
+  "version": "0.0.81",
   "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();

package/utilitynetwork.node.mjs

@@ -443,6 +443,13 @@ export class UtilityNetwork {
 
             
 
+            if (this.layerDefinition.systemLayers.dirtyObjectsTableId)
+                systemLayers.push({
+                    "id": this.layerDefinition.systemLayers.dirtyObjectsTableId,
+                    "name": "Dirty Objects",
+                    "type": "Feature Layer",
+                    "geometryType": "None" 
+                })
 
             if (this.layerDefinition.systemLayers.pointErrorsLayerId)
             systemLayers.push({
@@ -815,8 +822,109 @@ export class UtilityNetwork {
              
         }
 
+        startReading(versionGuid, sessionGuid){
+            let thisObj = this;    
+            let ar = thisObj.featureServiceUrl.split("/");
+            ar[ar.length-1]="VersionManagementServer";
+
+            let url = ar.join("/") + "/versions/" + versionGuid.replace("{","").replace("}", "") + "/startReading"
+              let vmsJson = {
+                 f: "json",
+                 sessionId: sessionGuid,
+                 token: this.token
+             } 
+           
+           return makeRequest({method:'POST', params: vmsJson, url: url })
+            
+        }
+
+
+        
+        stopReading(versionGuid, sessionGuid){
+            let thisObj = this;    
+            let ar = thisObj.featureServiceUrl.split("/");
+            ar[ar.length-1]="VersionManagementServer";
+
+            let url = ar.join("/") + "/versions/" + versionGuid.replace("{","").replace("}", "") + "/stopReading"
+              let vmsJson = {
+                 f: "json",
+                 sessionId: sessionGuid,
+                 token: this.token
+             } 
+           
+           return makeRequest({method:'POST', params: vmsJson, url: url })
+            
+        }
+
+
+        
+        startEditing(versionGuid, sessionGuid){
+            
+            let thisObj = this;    
+            let ar = thisObj.featureServiceUrl.split("/");
+            ar[ar.length-1]="VersionManagementServer";
+
+            let url = ar.join("/") + "/versions/" + versionGuid.replace("{","").replace("}", "") + "/startEditing"
+              let vmsJson = {
+                 f: "json",
+                 sessionId: sessionGuid,
+                 token: this.token
+             } 
+           
+           return makeRequest({method:'POST', params: vmsJson, url: url })
+            
+        }
+
+
+        
+        stopEditing(versionGuid, sessionGuid,saveEdits=true){
+            let thisObj = this;    
+            let ar = thisObj.featureServiceUrl.split("/");
+            ar[ar.length-1]="VersionManagementServer";
+
+            let url = ar.join("/") + "/versions/" + versionGuid.replace("{","").replace("}", "") + "/stopEditing"
+              let vmsJson = {
+                 f: "json",
+                 sessionId: sessionGuid,
+                 saveEdits:saveEdits,
+                 token: this.token
+             } 
+           
+           return makeRequest({method:'POST', params: vmsJson, url: url })
+            
+        }
+
         
-        versions() {
+
+        async reconcile (versionGuid, withPost = false, abortIfConflicts=false, conflictDetection=true, async = false ) {
+
+            //startReading use the version guid as a session id
+            await this.startReading(versionGuid,versionGuid );
+            await this.startEditing(versionGuid,versionGuid );
+            let thisObj = this;    
+            let ar = thisObj.featureServiceUrl.split("/");
+            ar[ar.length-1]="VersionManagementServer";
+
+            let url = ar.join("/") + "/versions/" + versionGuid.replace("{","").replace("}", "") + "/reconcile"
+              let vmsJson = {
+                 f: "json",
+                 sessionId: versionGuid,
+                 withPost: withPost, 
+                 async: async,
+                 token: this.token
+             } 
+            
+           const result = makeRequest({method:'POST', params: vmsJson, url: url })
+            
+        /*  if (async == false){
+           await this.stopEditing(versionGuid,versionGuid );
+           await this.stopReading(versionGuid,versionGuid );}*/
+
+           return result;
+
+        }
+
+         versions() {
 
             let thisObj = this;    
             let ar = thisObj.featureServiceUrl.split("/");