un-cli 0.0.67 → 0.0.70

package/index.mjs

@@ -4,10 +4,10 @@ import { Portal } from "./portal.mjs"
 import { UtilityNetwork } from "./utilitynetwork.node.mjs"
 import { AdminLog } from "./adminlog.mjs"
 
-import { logger } from "./logger.mjs"
+import  logger  from "./logger.mjs"
 import  fetch  from "node-fetch"
 //update version
-let version = "0.0.67";
+let version = "0.0.70";
 const GENERATE_TOKEN_TIME_MIN = 30;
 
 let rl = null;
@@ -387,15 +387,14 @@ const inputs = {
 
     "^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");
+        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=1 and isdeleted=1","domainnetworkname,tiername,subnetworkname");
         console.log(`Discovered ${subnetworks.features.length} dirty deleted subnetworks.`);
         for (let i = 0;  i < subnetworks.features.length; i++) {
             const f = subnetworks.features[i]
             console.log("Updating Subnetwork " + v(f.attributes,"subnetworkName"));
             
             const fromDate = new Date();
-             
-            
+              
             const subnetworkResult = await un.updateSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
             
             //code
@@ -409,31 +408,39 @@ const inputs = {
         }
     },
 
-    "^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.`);
+    "^update subnetworks --all" : async input => {
+ 
+        do  {
 
+            let sort = "asc";
+            if (input.indexOf("--desc") > 0) sort = "desc"
 
-        for (let i = 0;  i < subnetworks.features.length; i++) {
-            const f = subnetworks.features[i]
-            console.log("Updating Subnetwork " + v(f.attributes,"subnetworkName"));
-            
-            const fromDate = new Date();
-            
+            console.log("Querying all subnetworks that are dirty.");
+            let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=1", `domainnetworkname  ${sort},tiername ${sort},subnetworkname ${sort}`);
+            console.log(`Discovered ${subnetworks.features.length} dirty subnetworks.`);
 
-            const subnetworkResult = await un.updateSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
-            
-            const toDate = new Date();
-            const timeEnable = toDate.getTime() - fromDate.getTime();
-            subnetworkResult.duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
+            for (let i = 0;  i < subnetworks.features.length; i++) {
+                const f = subnetworks.features[i]
+                console.log("Updating Subnetwork " + v(f.attributes,"subnetworkName"));
+                
+                const fromDate = new Date();
+                 
+                const subnetworkResult = await un.updateSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
+                
+                const toDate = new Date();
+                const timeEnable = toDate.getTime() - fromDate.getTime();
+                subnetworkResult.duration =  numberWithCommas(Math.round(timeEnable)) + " ms"
+    
+                console.log(`Result ${JSON.stringify(subnetworkResult)}`)
+            }
 
-            console.log(`Result ${JSON.stringify(subnetworkResult)}`)
-        }
+        } 
+        while (subnetworks.features.length > 0)
+        
     },
     "^update subnetworks --all --async$" : async () => {
         console.log("Querying all subnetworks that are dirty.");
-        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=1");
+        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=1", "domainnetworkname,tiername,subnetworkname");
         console.log(`Discovered ${subnetworks.features.length} dirty subnetworks.`);
         for (let i = 0;  i < subnetworks.features.length; i++) {
             const f = subnetworks.features[i]
@@ -443,8 +450,7 @@ const inputs = {
         }
     },
    "^export subnetworks --all --folder .*$|^export subnetworks --all$" : async input => {
-
-        
+ 
         //create folder
         const file = input.match(/--folder .*/gm)
         let inputDir = "Exported"
@@ -452,40 +458,49 @@ const inputs = {
              inputDir = file[0].replace("--folder ", "")
         //create directory if doesn't exists
         if (!fs.existsSync(inputDir))  fs.mkdirSync(inputDir)
-
-
-        console.log("Querying all subnetworks that are clean.");
-        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=0");
-        console.log(`Discovered ${subnetworks.features.length} subnetworks that can be exported.`);
-        for (let i = 0;  i < subnetworks.features.length; i++) {
-            const f = subnetworks.features[i]
-            const subnetworkName = v(f.attributes,"subnetworkName")
-            console.log("Exporting subnetworks " + v(f.attributes,"subnetworkName"));
-            
-            const fromDate = new Date();
-            
-            const subnetworkResult = await un.exportSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
-             
-            
-            //code
-
-            const toDate = new Date();
-            const timeEnable = toDate.getTime() - fromDate.getTime();
-            subnetworkResult.duration =  numberWithCommas(timeEnable) + " ms"
-            
-
-            //fetch the json and write it to disk 
-            const subContent = await fetch(subnetworkResult.url);
-            //check if the response is 200 only then attempt to parse to json
-            //although the response is json, its easier to treat it as text (handle error cases) since we will only write it to disk.
-            // if we want to do something with the response then make it json
-            const jsonExport = await subContent.text();
-            fs.writeFileSync(`${inputDir}/${subnetworkName}.json`, jsonExport)            
-           
-
-            console.log(`Result ${JSON.stringify(subnetworkResult)} written to file ${process.cwd()}/${inputDir}/${subnetworkName}.json`)
-
+ 
+        do {
+
+            console.log("Querying all subnetworks that are clean.");
+            let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty=0","domainnetworkname,tiername,subnetworkname");
+            console.log(`Discovered ${subnetworks.features.length} subnetworks that can be exported.`);
+            for (let i = 0;  i < subnetworks.features.length; i++) {
+                const f = subnetworks.features[i]
+                const subnetworkName = v(f.attributes,"subnetworkName")
+                console.log("Exporting subnetworks " + v(f.attributes,"subnetworkName"));
+                
+                const fromDate = new Date();
+                
+                const subnetworkResult = await un.exportSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
+                 
+                
+                //code
+    
+                const toDate = new Date();
+                const timeEnable = toDate.getTime() - fromDate.getTime();
+                subnetworkResult.duration =  numberWithCommas(timeEnable) + " ms"
+                //if undefined exit
+                if (!subnetworkResult.url)
+                {
+                    console.log("Export subnetwork failed " + JSON.stringify(subnetworkResult))
+                    continue;
+                }
+    
+                //fetch the json and write it to disk 
+                const subContent = await fetch(subnetworkResult.url);
+                //check if the response is 200 only then attempt to parse to json
+                //although the response is json, its easier to treat it as text (handle error cases) since we will only write it to disk.
+                // if we want to do something with the response then make it json
+                const jsonExport = await subContent.text();
+                fs.writeFileSync(`${inputDir}/${subnetworkName}.json`, jsonExport)            
+               
+    
+                console.log(`Result ${JSON.stringify(subnetworkResult)} written to file ${process.cwd()}/${inputDir}/${subnetworkName}.json`)
+    
+            }
         }
+        while (subnetworks.features.length > 0)
+       
     },
    
 
@@ -501,7 +516,7 @@ const inputs = {
 
 
         console.log("Querying all subnetworks that are clean and not exported.");
-        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty = 0 and (LASTACKEXPORTSUBNETWORK is null or LASTACKEXPORTSUBNETWORK < LASTUPDATESUBNETWORK)");
+        let subnetworks = await un.queryDistinct(500002, "domainnetworkname,tiername,subnetworkname", "isdirty = 0 and (LASTACKEXPORTSUBNETWORK is null or LASTACKEXPORTSUBNETWORK < LASTUPDATESUBNETWORK)","domainnetworkname,tiername,subnetworkname");
         console.log(`Discovered ${subnetworks.features.length} subnetworks that can be exported.`);
         for (let i = 0;  i < subnetworks.features.length; i++) {
             const f = subnetworks.features[i]
@@ -579,6 +594,14 @@ const inputs = {
             const subnetworkName = v(f.attributes,"subnetworkName")
             console.log(`Exporting subnetwork ${subnetworkName}` );
             const subnetworkResult = await un.exportSubnetworks(v(f.attributes,"domainNetworkName"), v(f.attributes,"tierName"), v(f.attributes,"subnetworkName"),false);
+            
+            //if undefined exit
+            if (!subnetworkResult.url)
+            {
+                console.log("Export subnetwork failed " + JSON.stringify(subnetworkResult))
+                continue;
+            }
+
             //fetch the json and write it to disk 
             const subContent = await fetch(subnetworkResult.url);
             const jsonExport = await subContent.text();
@@ -755,16 +778,30 @@ const inputs = {
   
             allMessages = allMessages.concat(jsonRes.logMessages.filter(m => m.message.indexOf("------ Trace Parameters ----") > -1))
         }  
-        allMessages.forEach(m => {
+
+        allMessages = allMessages.map(m => {
             const newMessage = Object.assign({}, m);
-            delete newMessage.message
             delete newMessage.source;
             delete newMessage.machine;
             delete newMessage.type;
+            delete newMessage.code;
             delete newMessage.requestID;
+            delete newMessage.process;
             delete newMessage.thread;
-            delete newMessage.time;
+            newMessage.elapsedms = parseInt (parseFloat(newMessage.elapsed) * 1000)
+            newMessage.time = new Date(newMessage.time).toLocaleString()
+            delete newMessage.elapsed
+             return newMessage;
+        })
+        .sort( (m1,m2) => m2.elapsedms - m1.elapsedms)
+
+        const summaryMessages = allMessages.map(m => {const newM = Object.assign({}, m); delete newM.message; return newM})
+        console.table(summaryMessages)
 
+        allMessages.forEach(m => {
+            const newMessage = Object.assign({}, m);
+            delete newMessage.message
+         
             console.table([newMessage])
             console.log(m.message)  
         })
@@ -783,37 +820,76 @@ const inputs = {
         if (inputParam != null && inputParam.length > 0)
             mins = inputParam[0].replace("--age ", "")
  
-        console.log(`Querying validate logs for ${parameters.service} for the last ${mins} minutes ...`)
-        const startTime = Date.now() - mins*60*1000
-        const endTime = Date.now();
-        let result= await adminLog.query([102003], [parameters.service+ ".MapServer"], topLogCount, startTime ,endTime , "VERBOSE")
-        let jsonRes = await result.json()
-        let allMessages = [].concat(jsonRes.logMessages) 
-        allMessages = allMessages.filter(m => m.message.indexOf("-------- Environment ---") > -1 && m.message.indexOf("------ Trace Parameters ----") < 0)
-        while (jsonRes.hasMore)
-        {  
-            //start paging
-            logger.info(`Aggregating messages... total so far ${allMessages.length} entries but more left, pulling logs before ${new Date(jsonRes.endTime)}`)
-            result= await adminLog.query([102003], [parameters.service + ".MapServer"], pageSize, jsonRes.endTime, null, "VERBOSE")
-            jsonRes = await result.json()
-  
-            allMessages = allMessages.concat(jsonRes.logMessages.filter(m => m.message.indexOf("-------- Environment ---") > -1 && m.message.indexOf("------ Trace Parameters ----") == -1))
-        }  
+            
+  console.log(`Querying validate logs for ${parameters.service} for the last ${mins} minutes ...`)
+  const startTime = Date.now() - mins*60*1000
+  const endTime = Date.now();
+  let result= await adminLog.query([102003], [parameters.service+ ".MapServer"], topLogCount, startTime ,endTime , "VERBOSE")
+  let jsonRes = await result.json()
+  let allMessages = [].concat(jsonRes.logMessages) 
+  allMessages = allMessages.filter(m => m.message.indexOf("-------- Environment ---") > -1 && m.message.indexOf("The network is built.") > -1 && m.methodName == 'BuildEngineLog')
+  while (jsonRes.hasMore)
+  {  
+      //start paging
+      logger.info(`Aggregating messages... total so far ${allMessages.length} entries but more left, pulling logs before ${new Date(jsonRes.endTime)}`)
+      let services = [parameters.service + ".MapServer"]
+      result= await adminLog.query([102003], services, pageSize, jsonRes.endTime, null, "VERBOSE")
+      jsonRes = await result.json()
+
+      allMessages = allMessages.concat(jsonRes.logMessages.filter(m => m.message.indexOf("-------- Environment ---") > -1 && m.message.indexOf("------ Trace Parameters ----") == -1))
+  }  
+
+
+
+   
+  //validate logs missing elapsed populate it
+  allMessages = allMessages.map( m => {
+      try{
+          
+          //The network is built. 0.093 seconds (4.982 total) - 29 MB memory
+
+      let re = /The network is built. [-+]?([0-9]*\.[0-9]+|[0-9]+) seconds \([-+]?([0-9]*\.[0-9]+|[0-9]+) total\)/;
+      let res = re.exec(m.message)
+      if (res && res.length  > 1)
+          m.elapsed = res[2]
+      
+          return m;
+      }
+      catch(ex){
+          return m;
+      }
+  })
 
     
-        allMessages.forEach(m => {
+         
+        allMessages = allMessages.map(m => {
             const newMessage = Object.assign({}, m);
-            delete newMessage.message
             delete newMessage.source;
             delete newMessage.machine;
             delete newMessage.type;
+            delete newMessage.code;
             delete newMessage.requestID;
+            delete newMessage.process;
             delete newMessage.thread;
-            delete newMessage.time;
+            newMessage.elapsedms = parseInt (parseFloat(newMessage.elapsed) * 1000)
+            newMessage.time = new Date(newMessage.time).toLocaleString()
+            delete newMessage.elapsed
+             return newMessage;
+        })
+        .sort( (m1,m2) => m2.elapsedms - m1.elapsedms)
 
+        const summaryMessages = allMessages.map(m => {const newM = Object.assign({}, m); delete newM.message; return newM})
+        console.table(summaryMessages)
+
+        allMessages.forEach(m => {
+            const newMessage = Object.assign({}, m);
+            delete newMessage.message
+         
             console.table([newMessage])
             console.log(m.message)  
         })
+         
+
 
     },
 
@@ -845,20 +921,59 @@ const inputs = {
   
             allMessages = allMessages.concat(jsonRes.logMessages.filter(m => m.message.indexOf("---- Subnetwork Parameters ----") > -1))
         }  
-        allMessages.forEach(m => {
+        
+        
+        
+        //update subnetwork missing elapsed populate it
+        allMessages = allMessages.map( m => {
+            try{
+ 
+            let re = /Total \([-+]?([0-9]*\.[0-9]+|[0-9]+) seconds\)/;
+            let res = re.exec(m.message)
+            if (res && res.length  > 1)
+                m.elapsed = res[1]
+
+            re = /Total update subnetwork time \([-+]?([0-9]*\.[0-9]+|[0-9]+) seconds\)/;
+            res = re.exec(m.message)
+            if (res && res.length  > 1)
+                m.elapsed = res[1]
+            
+            return m;
+            }
+            catch(ex){
+                return m;
+            }
+        })
+
+
+        allMessages = allMessages.map(m => {
             const newMessage = Object.assign({}, m);
-            delete newMessage.message
             delete newMessage.source;
             delete newMessage.machine;
             delete newMessage.type;
+            delete newMessage.code;
             delete newMessage.requestID;
+            delete newMessage.process;
             delete newMessage.thread;
-            delete newMessage.time;
+            newMessage.elapsedms = parseInt (parseFloat(newMessage.elapsed) * 1000)
+            newMessage.time = new Date(newMessage.time).toLocaleString()
+            delete newMessage.elapsed
+             return newMessage;
+        })
+        .sort( (m1,m2) => m2.elapsedms - m1.elapsedms)
 
+        const summaryMessages = allMessages.map(m => {const newM = Object.assign({}, m); delete newM.message; return newM})
+        console.table(summaryMessages)
+
+        allMessages.forEach(m => {
+            const newMessage = Object.assign({}, m);
+            delete newMessage.message
+         
             console.table([newMessage])
             console.log(m.message)  
         })
          
+         
     },
 
 
@@ -893,12 +1008,12 @@ const inputs = {
       allMessages = allMessages
             .map( m=> {
                 m.dataAccessElapsed = parseFloat(m.message.split(";")[1].split(" ")[1])
-                m.ExecuteQueryElapsed = parseFloat(m.message.split(";")[2].split(" ")[1])
-                m.totalTimeElapsed = m.dataAccessElapsed +  m.ExecuteQueryElapsed 
+                m.executeQueryElapsed = parseFloat(m.message.split(";")[2].split(" ")[1])
+                m.totalExecutionElapsed = m.dataAccessElapsed +  m.executeQueryElapsed 
                 m.elapsed = parseFloat(m.elapsed); return m;
 
             })
-            .sort( (m1,m2) => m2.totalTimeElapsed - m1.totalTimeElapsed)
+            .sort( (m1,m2) => m2.totalExecutionElapsed - m1.totalExecutionElapsed)
             .slice(0, 10) ;//first 10
     
      
@@ -908,11 +1023,12 @@ const inputs = {
             {
              
                 const x = m.message.split(";")
+                x.shift()
                 console.log(`id: ${i++}`)
                 console.log(`\tAt: ${new Date(m.time)} (${m.time})`)
                 console.log(`\tUser: ${m.user}`)
-                console.log(`\tElapsed: ${m.elapsed*1000} ms`)
-                console.log(`\ttotalTimeElapsed: ${m.totalTimeElapsed} ms`)
+                console.log(`\tTotal Time: ${numberWithCommas(Math.round(m.elapsed*1000))} ms (Total time the cursor was opened)`)
+                console.log(`\tQuery Time: ${numberWithCommas(m.totalExecutionElapsed)} ms (includes search + data access nextRow)`)
                 console.log(`\tQuery:`)
                 x.forEach(a => console.log(`\t${a}`))
                 console.log(`\n`)
@@ -922,60 +1038,6 @@ const inputs = {
     },
         
 
-    
-    "^cursorlogs --age": async input => {
-        const topLogCount = 1000;
-        const pageSize = 10000
-
-        const inputParam = input.match(/--age .*/gm)
-        let mins = 30;  //query logs for the last 30 minutes
-        if (inputParam != null && inputParam.length > 0)
-            mins = inputParam[0].replace("--age ", "")
- 
-        console.log(`Querying cursor sql logs for ${parameters.service} for the last ${mins} minutes ...`)
-        const startTime = Date.now() - mins*60*1000
-        const endTime = Date.now();
-        let result= await adminLog.query([102023], [parameters.service+ ".MapServer"], topLogCount, startTime ,endTime , "DEBUG")
-        let jsonRes = await result.json()
-        let allMessages = [].concat(jsonRes.logMessages) 
-        allMessages = allMessages.filter(m => m.message.indexOf("EndCursor;") > -1)
-        while (jsonRes.hasMore)
-        {  
-            //start paging
-            logger.info(`Aggregating messages... total so far ${allMessages.length} entries but more left, pulling logs before ${new Date(jsonRes.endTime)}`)
-            result= await adminLog.query([102023], [parameters.service + ".MapServer"], pageSize, jsonRes.endTime, null, "DEBUG")
-            jsonRes = await result.json()
-  
-            allMessages = allMessages.concat(jsonRes.logMessages.filter(m => m.message.indexOf("EndCursor;") > -1))
-        }  
-
-
-     //   
-     allMessages= allMessages.map(m => {
-
-            const r= m.message.split (";")
-            delete r[0];
-            delete r[1];
-            delete r[3];
-            return r;
-            
-            const newMessage = Object.assign({}, m);
-        
-            delete newMessage.source;
-            delete newMessage.machine;
-            delete newMessage.type;
-            delete newMessage.requestID;
-            delete newMessage.methodName;
-            delete newMessage.process;
-            delete newMessage.thread;
-            delete newMessage.time;
-            delete newMessage.code;
-
-            return newMessage
- 
-        })
-        console.table(allMessages)
-    },
 
 
     "^arlogs --byrule": async input => {
@@ -990,17 +1052,29 @@ const inputs = {
         if (inputParam != null && inputParam.length > 0 && inputParam[0].indexOf("--minguid") > -1)
             showMinGuid = true
 
+            
+        const ageInputParam = input.match(/--age [0-9]*/)
+        let mins = 30;  //query logs for the last 30 minutes
+        if (ageInputParam != null && ageInputParam.length > 0)
+            mins = ageInputParam[0].replace("--age ", "")
+        
+            
+       const startTime = Date.now() - mins*60*1000
+       const endTime = Date.now();
+
         const pageSize = 10000 //maximum messages per page
-        logger.info(`Querying attribute rules logs for ${parameters.service} ...`)
-        let result= await adminLog.query([102003], [parameters.service + ".MapServer"], pageSize)
+        logger.info(`Querying attribute rules logs for ${parameters.service} in the past ${mins} minutes...`)
+        let result= await adminLog.query([102003], [parameters.service + ".MapServer"], pageSize, startTime ,endTime , "DEBUG")
         let jsonRes = await result.json()
         let allMessages = [].concat(jsonRes.logMessages)
         
-        while (jsonRes.hasMore)
+        while (jsonRes.hasMore && jsonRes.endTime > startTime)
         {  
             //start paging
             logger.info(`Aggregating messages... total so far ${allMessages.length} debug entries but more left, pulling logs before ${new Date(jsonRes.endTime)}`)
-            result= await adminLog.query([102003], [parameters.service + ".MapServer"], pageSize, jsonRes.endTime)
+      
+            
+            result= await adminLog.query([102003], [parameters.service + ".MapServer"], pageSize, jsonRes.endTime  )
             jsonRes = await result.json()
             allMessages = allMessages.concat(jsonRes.logMessages)
         }  

package/logger.mjs

@@ -1,3 +1,10 @@
+const logger = {}
+logger.info = console.log
+logger.error = console.error
+
+export default logger;
+
+/*
 import  winston  from "winston"
 
 export const logger = winston.createLogger();
@@ -5,4 +12,4 @@ export const logger = winston.createLogger();
 logger.add(
     new winston.transports.Console({"format": winston.format.json()})
   );
- 
+ */

package/makerequest.mjs

@@ -1,4 +1,5 @@
-import fetch from "node-fetch";
+ 
+
 
 export function makeRequest (opts) {
    
@@ -24,7 +25,18 @@ export function makeRequest (opts) {
            Object.keys(opts.headers).forEach(  key => headers[key] = opts.headers[key] )
 
        //console.log(opts)
-       const result = await fetch(opts.url, {
+
+        let f;
+        try {
+            const nodeFetch = await import ("node-fetch");
+            f = nodeFetch.default;
+        }
+        catch(ex) {
+            f = fetch;
+        }
+ 
+
+       const result = await f(opts.url, {
            "method" : opts.method,
             "headers":  headers,
             "body": params

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "un-cli",
-  "version": "0.0.67",
+  "version": "0.0.70",
   "description": "Command line interface for working with ArcGIS Utility Network Extension",
   "main": "index.mjs",
   "bin": {
@@ -17,8 +17,6 @@
   "author": "Hussein Nasser",
   "license": "ISC",
   "dependencies": {
-    "node-fetch": "^2.6.0",
-    "progress": "^2.0.3",
-    "winston": "^3.2.1"
+    "node-fetch": "^2.6.0"
   }
 }

package/portal.mjs

@@ -1,15 +1,16 @@
 import { makeRequest } from "./makerequest.mjs"
-import { logger } from "./logger.mjs"
+import  logger  from "./logger.mjs"
 
 export class Portal{
         
-    constructor(url, username, password, expiration = 300, serverUrl = undefined)
+    constructor(url, username, password, expiration = 300, serverUrl = undefined, referer)
     {
         this.url = url;
         this.username = username;
         this.password = password;
         this.expiration = expiration;
         this.serverUrl = serverUrl;
+        this.referer = referer
     }
 
 
@@ -25,7 +26,7 @@ export class Portal{
                     const postJson = {
                         username: self.username,
                         password: self.password,
-                        referer: "node",
+                        referer: self.referer,
                         expiration: self.expiration,
                         f: "json"
                     }
@@ -71,7 +72,7 @@ export class Portal{
                     token: self.token
                 }
         
-                const serversUrl =  self.url + "/sharing/rest/portals/self/servers"
+                const serversUrl =  self.url + `/sharing/rest/portals/self/servers?token=${self.token}`
                 logger.info( "About to query federated servers");
                     
                 //query for federated servers.