un-cli 0.0.60 → 0.0.61

package/cmd.txt

@@ -1,3 +1,4 @@
+subnetworks
 arlogs --byrule --maxguid
 arlogs --byrule --minguid
 arlogs --byrule

package/index.mjs

@@ -6,15 +6,11 @@ import { AdminLog } from "./adminlog.mjs"
 
 import { logger } from "./logger.mjs"
 import  fetch  from "node-fetch"
-import { DH_NOT_SUITABLE_GENERATOR } from "constants";
 //update version
-let version = "0.0.60";
+let version = "0.0.61";
 const GENERATE_TOKEN_TIME_MIN = 30;
 
 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;
@@ -30,9 +26,11 @@ function parseInput(){
           "--command",
           "--gdbversion",
           "--file",
-          "--verify"
+          "--verify",
+          "--server"
            ]     
-
+        
+      //null marked parmaters are required
       const params = {
           "portal": null,
           "service": null,
@@ -41,7 +39,8 @@ function parseInput(){
           "command": "",
           "gdbversion": "SDE.DEFAULT",
           "file": "",
-          "verify": "true"
+          "verify": "true",
+          "server": undefined
       }
 
       for (let i = 0; i < process.argv.length ; i++){
@@ -54,9 +53,10 @@ function parseInput(){
 
       if (Object.values(params).includes(null))
       {
-        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 ("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]")    
         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.")
+        console.log("--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.")
         process.exit();
       }
      
@@ -65,7 +65,7 @@ function parseInput(){
 
 //
 async function getToken(parameters) {
-    portal = new Portal(parameters.portal, parameters.user, parameters.password)
+    portal = new Portal(parameters.portal, parameters.user, parameters.password,300, parameters.server)
     logger.info("About to connect..")
     const token = await portal.connect()
     logger.info(`Token generanted successfully.`)
@@ -812,7 +812,7 @@ const inputs = {
     "^version$": () => console.log(version),
     "^clear$|^cls$": () => console.clear(),
     "^quit$": () => {
-        rl.close();
+        if (rl) rl.close();
         process.exit();
     },
     "^exit$|^quit$|^bye$": () => {

package/package.json

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

package/portal.mjs

@@ -3,13 +3,13 @@ import { logger } from "./logger.mjs"
 
 export class Portal{
         
-    constructor(url, username, password, expiration = 300)
+    constructor(url, username, password, expiration = 300, serverUrl = undefined)
     {
         this.url = url;
         this.username = username;
         this.password = password;
         this.expiration = expiration;
-        this.serverUrl = "bad";
+        this.serverUrl = serverUrl;
     }
 
 
@@ -20,7 +20,6 @@ export class Portal{
         
                 try { 
 
-                    //https://utilitynetwork.esri.com/portal/sharing/rest/portals/self/servers?f=json
                     const tokenUrl = self.url + "/sharing/rest/generateToken";
                    
                     const postJson = {
@@ -44,9 +43,9 @@ 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.)`)
+                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}`)
             }
 
             }
@@ -55,32 +54,54 @@ export class Portal{
     }
  
     async updateServices () {
+        const self = this;
+        return new Promise( async (resolve, reject) => {
+            //if the user specified a serverUrl no need to do anything
+            if (self.serverUrl !== undefined) {
+                logger.info(`Using server ${self.serverUrl} supplied in the --server parameter`)
+                resolve(self.serverUrl);
+                return;
+            }
 
-        try {
+            //else we need to calculate it
+            try {
 
-            const postJsonServers= {
-                f: "json",
-                token: this.token
+                const postJsonServers= {
+                    f: "json",
+                    token: self.token
+                }
+        
+                const serversUrl =  self.url + "/sharing/rest/portals/self/servers"
+                logger.info( "About to query federated servers");
+                    
+                //query for federated servers.
+                const servers = await makeRequest({method: 'POST', url: serversUrl, params: postJsonServers });
+                
+                //if we don't have any federated servers quit.
+                if (servers.servers.length === 0) 
+                    {
+                        reject( "No federeated servers");
+                    return
+                }
+                
+                //if we have more than one then we let the user pick.
+                if (servers.servers.length > 1){
+                    let serverUrls = "";
+                    servers.servers.forEach(s => serverUrls += '\n  * ' + s.url + '\n' ) 
+                    reject("more than one federated server found, run the command with --server and specify one of the servers below\n" + serverUrls)
+                }
+                this.serverUrl = servers.servers[0].url;
+                resolve(self.serverUrl)
+                logger.info(`Found one federate server, using server url ${self.serverUrl} by default`)
             }
-    
-            const serversUrl =  this.url + "/sharing/rest/portals/self/servers"
-            logger.info( "About to query federated servers");
-                  
-            //query for federated servers.
-            const servers = await makeRequest({method: 'POST', url: serversUrl, params: postJsonServers });
-            
-            //get the first one
-            if (servers.servers.length === 0) 
-                reject( "No federeated servers");
-    
-            this.serverUrl = servers.servers[0].url;
-            logger.info(`Found server url ${this.serverUrl}`)
-        }
-       catch(ex){
-           logger.error(ex)
-       }
+        catch(ex){
+            logger.error(ex)
+            reject(ex)
+            }       
+         });
+
+    } 
 
-    }
     //get the feature service definition 
     async serviceDef(serviceName) {
         this.token = this.token;