From 0afa5b864bd65a10205ce13beb5918cf22b45471 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Mon, 25 Jun 2018 14:57:13 +0800 Subject: [PATCH] add list command --- suanzi-support | 47 ++++++++++++++++++++++++++++------------------- sztool | 51 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 65 insertions(+), 33 deletions(-) diff --git a/suanzi-support b/suanzi-support index 367f379..eca6e9b 100755 --- a/suanzi-support +++ b/suanzi-support @@ -5,6 +5,8 @@ import paho.mqtt.client as mqtt import shlex import random from uuid import getnode as get_mac +import ast +import sys MQTT_SERVER = 'mqtt.suanzi.ai' MQTT_PORT = 1883 @@ -31,6 +33,10 @@ def getAvailablePort(host, ports): else: print pout +def get_mac_str(): + mac = hex(get_mac()) + return '{:0>12}'.format(mac[2:-1]) + def exec_ssh(port): if port == None: raise Exception('Port not avaliable') @@ -40,30 +46,33 @@ def exec_ssh(port): def on_connect(client, userdata, flags, rc): - client.subscribe(client.id + '-request') + client.subscribe(userdata['id']) + client.subscribe('all') print("Connected with result code "+str(rc)) def on_message(client, userdata, msg): - print(msg.topic+" "+str(msg.payload)) - if msg.topic == client.id + '-request': - print str(msg.payload) - port = getAvailablePort(SSH_SERVER, PORT_RANGE) - if exec_ssh(port) == 0: - client.publish(client.id + '-response', port) - else: - raise Exception ('run ssh failed') + print('Receive topic:' + msg.topic + ' payload: ' +str(msg.payload)) + payload = ast.literal_eval(str(msg.payload)) + from_id = payload['from'] + if payload['type'] == 'request': + if payload['command'] == 'ssh': + port = getAvailablePort(SSH_SERVER, PORT_RANGE) + if exec_ssh(port) == 0: + response = {'from': userdata['id'], 'type':'response', 'command':payload['command'], 'data':port} + client.publish(payload['from'], str(response)) + else: + raise Exception ('run ssh failed') + if payload['command'] == 'list': + response = {'from': userdata['id'], 'type':'response', 'command':payload['command'], 'data':'OK'} + client.publish(payload['from'], str(response)) + -class MyClient(mqtt.Client): - def __init__(self, id): - mqtt.Client.__init__(self) - self.id = id - self.on_connect = on_connect - self.on_message = on_message if __name__ == '__main__': - mac = hex(get_mac()) - id = '{:0>12}'.format(mac[2:-1]) - print 'id is: ' , id - client = MyClient(id) + id = get_mac_str() + print 'Mac: ', id + client = mqtt.Client(userdata={'id':id}) + client.on_connect = on_connect + client.on_message = on_message client.connect(MQTT_SERVER, MQTT_PORT, 60) client.loop_forever() diff --git a/sztool b/sztool index 6ff1a9e..dc9157a 100755 --- a/sztool +++ b/sztool @@ -4,35 +4,58 @@ from subprocess import call, Popen, PIPE, STDOUT import paho.mqtt.client as mqtt import argparse import sys +from uuid import getnode as get_mac +import ast MQTT_SERVER = 'mqtt.suanzi.ai' MQTT_PORT = 1883 URI = 'debug@autossh.suanzi.ai' def on_connect(client, userdata, flags, rc): - id = client.id - client.subscribe(id + "-response") - print("Connected with result code "+str(rc)) - client.publish(id + '-request', 0) + client.subscribe(userdata['id']) + print "Connected with result code " + str(rc) + if userdata['action'] == 'connect': + payload = {'from':userdata['id'], 'type':'request', 'command':'ssh'} + client.publish(userdata['to'], str(payload)) + elif userdata['action'] == 'list': + payload = {'from':userdata['id'], 'type':'request', 'command':'list'} + client.publish(userdata['to'], str(payload)) def on_message(client, userdata, msg): - id = client.id - print(msg.topic+" "+str(msg.payload)) - if msg.topic == id + '-response': - port = msg.payload - print 'run "ssh ' + URI + ' -p ' + str(port) + '" to connect to device (%s)' % id + print('Receive topic:' + msg.topic + ' payload: ' +str(msg.payload)) + payload = ast.literal_eval(str(msg.payload)) + from_id = payload['from'] + if payload['type'] == 'response': + if payload['command'] == 'ssh': + port = payload['data'] + print 'run "ssh ' + URI + ' -p ' + str(port) + '" to connect to device (%s)' % from_id + elif payload['command'] == 'list': + print payload['from'], payload['data'] + client.disconnect() sys.exit(0) + + +def get_mac_str(): + mac = hex(get_mac()) + return '{:0>12}'.format(mac[2:-1]) + + if __name__ == '__main__': parser = argparse.ArgumentParser(description='Choose an avaiable port and run ssh.') - parser.add_argument('-i', '--id', dest='id', help='the unique id of remote machine, such as rpdzkj-080027a6f8dc, where the rpdzkj is the user, and 080027a6f8dc is the mac addres', required=True) - #parser.add_argument('connect', help='list all connected devices') - #parser.add_argument('list', help='list all connected devices') + subparsers = parser.add_subparsers(title='subcommands', dest='action', help='xxx') + parser_conn = subparsers.add_parser('connect', help='Connect to the specific device') + parser_conn.add_argument('device', help='the MAC address of remote device, in the form of 080027a6f8dc') + parser_lsit = subparsers.add_parser('list', help='list all connected devices') args = parser.parse_args() + id = get_mac_str() + print 'Mac: ', id + + device = args.device if args.action == 'connect' else 'all' - client = mqtt.Client() - client.id = args.id + client = mqtt.Client(userdata={'id':id, 'action':args.action, 'to': device}) client.on_connect = on_connect client.on_message = on_message client.connect(MQTT_SERVER, MQTT_PORT, 60) client.loop_forever() + -- 2.11.0