From d84d15620ff0ed60c0f88eb7672136245e30af48 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Wed, 13 Oct 2021 14:08:09 -0700 Subject: [PATCH] working tiny page --- data_gateway.py | 23 +++++++++++++++++++++++ web/app.py | 17 +++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/data_gateway.py b/data_gateway.py index 7f0ac8e..d3896c9 100644 --- a/data_gateway.py +++ b/data_gateway.py @@ -251,6 +251,26 @@ def send_sms_que_req(CONFIG): except requests.ConnectionError: logger.error('Config server unreachable') +def send_sms_cmd(CONFIG, _rf_id, _cmd): + print('ssnd rmt cmd') + user_man_url = CONFIG['WEB_SERVICE']['URL'] + shared_secret = str(sha256(CONFIG['WEB_SERVICE']['SHARED_SECRET'].encode()).hexdigest()) + sms_cmd_data = { + 'sms_cmd': CONFIG['WEB_SERVICE']['THIS_SERVER_NAME'], + 'secret':shared_secret, + 'rf_id': _rf_id, + 'cmd': _cmd + } + json_object = json.dumps(sms_cmd_data, indent = 4) + + try: + req = requests.post(user_man_url, data=json_object, headers={'Content-Type': 'application/json'}) +## resp = json.loads(req.text) +## print(resp) +## return resp['que'] + except requests.ConnectionError: + logger.error('Config server unreachable') + @@ -584,6 +604,9 @@ def process_sms(_rf_src, sms, call_type, system_name): user_setting_write(int_id(_rf_src), 'APRS OFF', False, call_type) elif '@BB' in sms: dashboard_bb_write(get_alias(int_id(_rf_src), subscriber_ids), int_id(_rf_src), time(), re.sub('@BB|@BB ','',sms), system_name) + + elif '?' in parse_sms[0]: + send_sms_cmd(CONFIG, int_id(_rf_src), sms) elif '@' in parse_sms[0][1:] and '.' in parse_sms[0]: # and ' E-' in sms: s = ' ' email_message = s.join(parse_sms[1:])#str(re.sub('.*@|.* E-', '', sms)) diff --git a/web/app.py b/web/app.py index 2c26414..8d43533 100644 --- a/web/app.py +++ b/web/app.py @@ -6825,6 +6825,23 @@ Name: ''' + p.name + '''  -  Port: ''' + str( ) sms_que_purge('DATA') + elif 'sms_cmd' in hblink_req: + if hblink_req['sms_cmd']: + print(hblink_req['cmd'][:1]) + if hblink_req['cmd'][:1] == '?': + split_cmd = str(hblink_req['cmd']).split(' ') + tp = TinyPage.query.filter_by(query_term=str(split_cmd[0])[1:]).first() + print(tp.content) + + sms_que_add('', '', 0, hblink_req['rf_id'], 'motorola', 'unit', hblink_req['sms_cmd'], '', tp.content) + + + + response = jsonify( + out='yes' + ## OBP=get_OBP(hblink_req['get_config']) + + ) elif 'get_rules' in hblink_req: if hblink_req['get_rules']: # == 'burn_list':