Added new command 'ztm attach'

Author: pajama-coder

agent/api.js

@@ -104,6 +104,15 @@ function allHubs(mesh) {
   return m.discoverHubs()
 }
 
+function setHub(mesh, id, hub) {
+  var m = meshes[mesh]
+  if (m && hub.connected === true) {
+    return m.attachHub(id)
+  } else {
+    return Promise.resolve()
+  }
+}
+
 function getHub(mesh, id) {
   var m = meshes[mesh]
   if (!m) return Promise.resolve(null)
@@ -306,6 +315,7 @@ export default {
   delMesh,
   getPermit,
   allHubs,
+  setHub,
   getHub,
   getHubLog,
   allEndpoints,

agent/main.js

@@ -245,6 +245,13 @@ function main(listen) {
           ret => ret ? response(200, ret) : response(404)
         )
       },
+
+      'POST': function ({ mesh, id }, req) {
+        mesh = URL.decodeComponent(mesh)
+        return api.setHub(mesh, id, JSON.decode(req.body)).then(
+          () => response(201)
+        )
+      }
     },
 
     '/api/meshes/{mesh}/hubs/{id}/log': {

agent/mesh.js

@@ -1285,6 +1285,22 @@ export default function (rootDir, listen, config, onConfigUpdate) {
     }
   }
 
+  function attachHub(id) {
+    if (id === hubActive[0]?.id) {
+      return Promise.resolve()
+    } else {
+      return findHub(id).then(
+        hub => {
+          if (hub) {
+            var port = hub.ports.reduce((a, b) => a.ping < b ? a : b)
+            hubActive.forEach(h => h.leave())
+            hubActive[0] = Hub(hub.id, hub.zone, port.name)
+          }
+        }
+      )
+    }
+  }
+
   function discoverHubs() {
     return listAllHubs(config.bootstraps).then(
       all => {
@@ -2180,6 +2196,7 @@ export default function (rootDir, listen, config, onConfigUpdate) {
     findEndpoint,
     findFile,
     findApp,
+    attachHub,
     discoverHubs,
     discoverEndpoints,
     discoverUsers,

cli/main.js

@@ -321,6 +321,16 @@ function doCommand(meshName, epName, argv, program) {
         }
       },
 
+      {
+        title: `Attach to a specified hub`,
+        usage: 'attach <hub name>',
+        notes: `
+          Only hubs in the current mesh can be attached.
+          Type 'ztm get hub' to see the list of available hubs.
+        `,
+        action: (args) => selectMesh(meshName).then(mesh => attachHub(args['<hub name>'], mesh))
+      },
+
       {
         title: `List objects of a certain type`,
         usage: 'get <object type> [object name]',
@@ -1111,6 +1121,19 @@ function disableApp(name, mesh, ep) {
   })
 }
 
+//
+// Command: attach
+//
+
+function attachHub(name, mesh) {
+  return selectHub(name, mesh).then(
+    id => client.post(
+      `/api/meshes/${uri(mesh.name)}/hubs/${id}`,
+      JSON.encode({ connected: true })
+    )
+  )
+}
+
 //
 // Command: get
 //