Reforked Project, changed SQL Code after refactoring, added descriptions, added apierror class
This commit is contained in:
merlink
parent
08024748b0
commit
c66b6036d4
662
src/class_api.py
Normal file
662
src/class_api.py
Normal file
|
|
@ -0,0 +1,662 @@
|
|||
import os
|
||||
import sys
|
||||
import time
|
||||
|
||||
class APIError(Exception):
|
||||
def __init__(self, error_number, error_message):
|
||||
self.error_number = error_number
|
||||
self.error_message = error_message
|
||||
def __str__(self):
|
||||
return "API Error: %s" % self.error_message
|
||||
|
||||
def getAPI(workingdir=None,silent=False):
|
||||
|
||||
if workingdir:
|
||||
os.environ["BITMESSAGE_HOME"] = workingdir
|
||||
|
||||
#Workaround while logging is not completed
|
||||
if silent:
|
||||
import StringIO
|
||||
fobj = StringIO.StringIO()
|
||||
sys.stdout = fobj
|
||||
|
||||
import bitmessagemain
|
||||
class MainAPI(bitmessagemain.Main):
|
||||
|
||||
def addContact(self, label, address):
|
||||
|
||||
'''Add a Conact to the Addressbook
|
||||
Usage: api.addContact(label,bmaddress)'''
|
||||
|
||||
unicode(label, 'utf-8')
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''select * from addressbook where address=?''',address)
|
||||
if queryreturn != []:
|
||||
raise APIError('AddressAlreadyInsideError')
|
||||
queryreturn = bitmessagemain.shared.sqlExecute('''INSERT INTO addressbook VALUES (?,?)''',label, address)
|
||||
|
||||
def addSubscription(self, label, address):
|
||||
|
||||
'''Add a Subscription
|
||||
Usage: api.addSubscription(label,bmaddressl)'''
|
||||
|
||||
unicode(label, 'utf-8')
|
||||
address = bitmessagemain.addBMIfNotPresent(address)
|
||||
status, addressVersionNumber, streamNumber, toRipe = bitmessagemain.decodeAddress(address)
|
||||
if status != 'success':
|
||||
raise APIError('Address Error: %s , %s'%(address,status))
|
||||
# First we must check to see if the address is already in the
|
||||
# subscriptions list.
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''select * from subscriptions where address=?''',address)
|
||||
if queryreturn != []:
|
||||
raise APIError('AlreadySubscribedError')
|
||||
bitmessagemain.shared.sqlExecute('''INSERT INTO subscriptions VALUES (?,?,?)''',label, address, True)
|
||||
bitmessagemain.shared.reloadBroadcastSendersForWhichImWatching()
|
||||
|
||||
def addToBlacklist(self, label, address, enabled=True):
|
||||
|
||||
'''Add a Bitmessage Address to the Blacklist
|
||||
Usage: api.addToBlacklist(label,bmaddress,enabled[True,False])'''
|
||||
|
||||
unicode(label, 'utf-8')
|
||||
bitmessagemain.shared.sqlExecute('''INSERT INTO blacklist VALUES (?,?,?)''',label,address,enabled)
|
||||
|
||||
def addToWhitelist(self, label, address, enabled=True):
|
||||
|
||||
'''Add a Bitmessage Address to the Whitelist
|
||||
Usage: api.addToBlacklist(label,bmaddress,enabled[True,False])'''
|
||||
|
||||
unicode(label, 'utf-8')
|
||||
bitmessagemain.shared.sqlExecute('''INSERT INTO whitelist VALUES (?,?,?)''',label,address,enabled)
|
||||
|
||||
def clientStatus(self):
|
||||
|
||||
'''Returns the Status of the Bitmessage Daemon
|
||||
Usage: status = api.clinetStatus()
|
||||
print status['externalIPAddress']
|
||||
print status['networkConnections']
|
||||
print status['numberOfMessagesProcessed']
|
||||
print status['numberOfBroadcastsProcessed']
|
||||
print status['numberOfPubkeysProcessed']
|
||||
print status['networkStatus']
|
||||
'''
|
||||
|
||||
if len(bitmessagemain.shared.connectedHostsList) == 0:
|
||||
networkStatus = 'notConnected'
|
||||
elif len(bitmessagemain.shared.connectedHostsList) > 0 and not bitmessagemain.shared.clientHasReceivedIncomingConnections:
|
||||
networkStatus = 'connectedButHaveNotReceivedIncomingConnections'
|
||||
else:
|
||||
networkStatus = 'connectedAndReceivingIncomingConnections'
|
||||
info = {}
|
||||
try:
|
||||
info['externalIPAddress'] = bitmessagemain.shared.myExternalIP
|
||||
except:
|
||||
info['externalIPAddress'] = 'Not implemented jet'
|
||||
info['networkConnections'] = len(bitmessagemain.shared.connectedHostsList)
|
||||
info['numberOfMessagesProcessed'] = bitmessagemain.shared.numberOfMessagesProcessed
|
||||
info['numberOfBroadcastsProcessed'] = bitmessagemain.shared.numberOfBroadcastsProcessed
|
||||
info['numberOfPubkeysProcessed'] = bitmessagemain.shared.numberOfPubkeysProcessed
|
||||
info['networkStatus'] = networkStatus
|
||||
return info
|
||||
|
||||
def createDeterministicAddresses(self,passphrase,label='',numberOfAddresses=1,eighteenByteRipe=False,totalDifficulty=1,smallMessageDifficulty=1):
|
||||
|
||||
'''Creates a Deterministic Bitmessage Address (an Address based on a password)
|
||||
Usage: api.createDeterministicAddresses(passphrase,label,numberOfAddresses,eighteenByteRipe,totalDifficulty,smallMessageDifficulty)'''
|
||||
|
||||
#hardcoded in correct version and stream number, because they shouldn't be changed until now
|
||||
streamNumberForAddress = 1
|
||||
addressVersionNumber = 3
|
||||
|
||||
if not label:
|
||||
label = passphrase
|
||||
|
||||
unicode(label, 'utf-8')
|
||||
nonceTrialsPerByte = int(bitmessagemain.shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty)
|
||||
payloadLengthExtraBytes = int(bitmessagemain.shared.networkDefaultPayloadLengthExtraBytes * smallMessageDifficulty)
|
||||
bitmessagemain.shared.apiAddressGeneratorReturnQueue.queue.clear()
|
||||
bitmessagemain.shared.addressGeneratorQueue.put(
|
||||
('createDeterministicAddresses', addressVersionNumber, streamNumberForAddress,
|
||||
label, numberOfAddresses, passphrase, eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes))
|
||||
queueReturn = bitmessagemain.shared.apiAddressGeneratorReturnQueue.get()
|
||||
return queueReturn
|
||||
|
||||
def createRandomAddress(self,label,eighteenByteRipe=False,totalDifficulty=1,smallMessageDifficulty=1):
|
||||
|
||||
'''Create a reandom Bitmessage Address
|
||||
Usage: api.createRandomAddress(label,eighteenByteRipe,totalDifficulty,smallMessageDifficulty)'''
|
||||
|
||||
#hardcoded in correct version and stream number, because they shouldn't be changed until now
|
||||
streamNumberForAddress = 1
|
||||
addressVersionNumber = 3
|
||||
|
||||
unicode(label, 'utf-8')
|
||||
nonceTrialsPerByte = int(bitmessagemain.shared.networkDefaultProofOfWorkNonceTrialsPerByte * totalDifficulty)
|
||||
payloadLengthExtraBytes = int(bitmessagemain.shared.networkDefaultPayloadLengthExtraBytes * smallMessageDifficulty)
|
||||
bitmessagemain.shared.apiAddressGeneratorReturnQueue.queue.clear()
|
||||
bitmessagemain.shared.addressGeneratorQueue.put((
|
||||
'createRandomAddress', addressVersionNumber, streamNumberForAddress, label, 1, "", eighteenByteRipe, nonceTrialsPerByte, payloadLengthExtraBytes))
|
||||
return bitmessagemain.shared.apiAddressGeneratorReturnQueue.get()
|
||||
|
||||
def deleteContact(self,address):
|
||||
|
||||
'''Delete a Contact from Address Book
|
||||
Usage: api.deleteContact(bmaddress)'''
|
||||
|
||||
queryreturn = bitmessagemain.shared.sqlExecute('''delete from addressbook where address=?''',address)
|
||||
|
||||
def deleteFromBlacklist(self,address):
|
||||
|
||||
'''Delete a Contact from Blacklist
|
||||
Usage: api.deleteFromBlacklist(bmaddress)'''
|
||||
|
||||
bitmessagemain.shared.sqlExecute('''delete from blacklist where address=?''',address)
|
||||
|
||||
def deleteFromWhitelist(self,address):
|
||||
|
||||
'''Delete a Contact from Whitelist
|
||||
Usage: api.deleteFromWhitelist(bmaddress)'''
|
||||
|
||||
bitmessagemain.shared.sqlExecute('''delete from whitelist where address=?''',address)
|
||||
|
||||
def deleteSubscription(self,address):
|
||||
|
||||
'''Delete a Subscription
|
||||
Usage: api.deleteSubscription(bmaddress)'''
|
||||
|
||||
address = bitmessagemain.addBMIfNotPresent(address)
|
||||
bitmessagemain.shared.sqlExecute('''DELETE FROM subscriptions WHERE address=?''',address)
|
||||
bitmessagemain.shared.reloadBroadcastSendersForWhichImWatching()
|
||||
|
||||
def getAllInboxMessageIDs(self):
|
||||
|
||||
'''Get a List of IDs of all Inbox Messages
|
||||
Usage: api.getAllInboxMessageIDs()'''
|
||||
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''SELECT msgid FROM inbox where folder='inbox' ORDER BY received''')
|
||||
data = []
|
||||
for msgid in queryreturn:
|
||||
data.append(msgid[0].encode('hex'))
|
||||
return data
|
||||
|
||||
def getAllInboxMessages(self):
|
||||
|
||||
'''Return a List of all Inbox Messages
|
||||
Usage: api.getAllInboxMessages()'''
|
||||
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''SELECT msgid, toaddress, fromaddress, subject, received, message, encodingtype, read FROM inbox where folder='inbox' ORDER BY received''')
|
||||
messages = []
|
||||
for row in queryreturn:
|
||||
msgid, toAddress, fromAddress, subject, received, message, encodingtype, read = row
|
||||
subject = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(subject)
|
||||
message = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(message)
|
||||
messages.append({'msgid': msgid.encode('hex'),'toAddress': toAddress, 'fromAddress': fromAddress, 'subject': subject, 'message': message, 'encodingType': encodingtype, 'receivedTime': received, 'read': read})
|
||||
return messages
|
||||
|
||||
def getAllSentMessageIDs(self):
|
||||
|
||||
'''Get a List of IDs of all Outbox Messages
|
||||
Usage: getAllSentMessageIDs()'''
|
||||
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''SELECT msgid FROM sent where folder='sent' ORDER BY lastactiontime''')
|
||||
data = []
|
||||
for row in queryreturn:
|
||||
msgid = row[0]
|
||||
data.append(msgid.encode('hex'))
|
||||
return data
|
||||
|
||||
def getAllSentMessages(self):
|
||||
|
||||
'''Get a List of all Outbox Messages
|
||||
Usage: api.getAllSentMessages()'''
|
||||
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''SELECT msgid, toaddress, fromaddress, subject, lastactiontime, message, encodingtype, status, ackdata FROM sent where folder='sent' ORDER BY lastactiontime''')
|
||||
data = []
|
||||
for row in queryreturn:
|
||||
msgid, toAddress, fromAddress, subject, lastactiontime, message, encodingtype, status, ackdata = row
|
||||
subject = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(subject)
|
||||
message = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(message)
|
||||
data.append({'msgid':msgid.encode('hex'), 'toAddress':toAddress, 'fromAddress':fromAddress, 'subject':subject, 'message':message, 'encodingType':encodingtype, 'lastActionTime':lastactiontime, 'status':status, 'ackData':ackdata.encode('hex')})
|
||||
return data
|
||||
|
||||
def getBlackWhitelist(self):
|
||||
|
||||
'''Returns the Black- or Whitelist Configuration
|
||||
usage: print api.getBlackWhitelist'''
|
||||
|
||||
return bitmessagemain.shared.config.get('bitmessagesettings', 'blackwhitelist')
|
||||
|
||||
def getDeterministicAddress(self,passphrase):
|
||||
|
||||
'''Returns a Deterministic Address for a give Passphrase
|
||||
Usage: api.getDeterministicAddress()'''
|
||||
|
||||
#hardcoded in correct version and stream number, because they shouldn't be changed until now
|
||||
streamNumberForAddress = 1
|
||||
addressVersionNumber = 3
|
||||
|
||||
numberOfAddresses = 1
|
||||
eighteenByteRipe = False
|
||||
bitmessagemain.shared.addressGeneratorQueue.put(
|
||||
('getDeterministicAddress', addressVersionNumber,
|
||||
streamNumber, 'unused API address', numberOfAddresses, passphrase, eighteenByteRipe))
|
||||
return bitmessagemain.shared.apiAddressGeneratorReturnQueue.get()
|
||||
|
||||
def getInboxMessageByID(self, msgid):
|
||||
|
||||
'''Return an Inbox Message by a given ID
|
||||
Usage: print api.getInboxMessageByID(MessageID)'''
|
||||
|
||||
msgid = msgid.decode('hex')
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''SELECT msgid, toaddress, fromaddress, subject, received, message, encodingtype, read FROM inbox WHERE msgid=?''',msgid)
|
||||
data = []
|
||||
for row in queryreturn:
|
||||
msgid, toAddress, fromAddress, subject, received, message, encodingtype, read = row
|
||||
subject = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(subject)
|
||||
message = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(message)
|
||||
data.append({'msgid':msgid.encode('hex'), 'toAddress':toAddress, 'fromAddress':fromAddress, 'subject':subject, 'message':message, 'encodingType':encodingtype, 'receivedTime':received, 'read': read})
|
||||
return data
|
||||
|
||||
def getInboxMessagesByReceiver(self,toAddress):
|
||||
|
||||
'''Return an Inbox Message by a given Sender Address
|
||||
Usage: print api.getInboxMessagesByReceiver(SenderAddress)'''
|
||||
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''SELECT msgid, toaddress, fromaddress, subject, received, message, encodingtype FROM inbox WHERE folder='inbox' AND toAddress=?''',toAddress)
|
||||
data = []
|
||||
for row in queryreturn:
|
||||
msgid, toAddress, fromAddress, subject, received, message, encodingtype = row
|
||||
subject = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(subject)
|
||||
message = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(message)
|
||||
data .append({'msgid':msgid.encode('hex'), 'toAddress':toAddress, 'fromAddress':fromAddress, 'subject':subject.encode('base64'), 'message':message.encode('base64'), 'encodingType':encodingtype, 'receivedTime':received})
|
||||
return data
|
||||
|
||||
def getSentMessageByAckData(self,ackData):
|
||||
|
||||
'''Return an Inbox Message by a AckData
|
||||
Usage: print api.getSentMessageByAckData(AckData)'''
|
||||
|
||||
ackData = ackData.decode('hex')
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''SELECT msgid, toaddress, fromaddress, subject, lastactiontime, message, encodingtype, status, ackdata FROM sent WHERE ackdata=?''',ackData)
|
||||
data = []
|
||||
for row in queryreturn:
|
||||
msgid, toAddress, fromAddress, subject, lastactiontime, message, encodingtype, status, ackdata = row
|
||||
subject = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(subject)
|
||||
message = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(message)
|
||||
data.append({'msgid':msgid.encode('hex'), 'toAddress':toAddress, 'fromAddress':fromAddress, 'subject':subject, 'message':message, 'encodingType':encodingtype, 'lastActionTime':lastactiontime, 'status':status, 'ackData':ackdata.encode('hex')})
|
||||
return data
|
||||
|
||||
def getSentMessageByID(self,msgid):
|
||||
|
||||
'''Return an Outbox Message by a given ID
|
||||
Usage: print api.getSentMessageByID(MessageID)'''
|
||||
|
||||
msgid = msgid.decode('hex')
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''SELECT msgid, toaddress, fromaddress, subject, lastactiontime, message, encodingtype, status, ackdata FROM sent WHERE msgid=?''',msgid)
|
||||
data = []
|
||||
for row in queryreturn:
|
||||
msgid, toAddress, fromAddress, subject, lastactiontime, message, encodingtype, status, ackdata = row
|
||||
subject = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(subject)
|
||||
message = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(message)
|
||||
data.append({'msgid':msgid.encode('hex'), 'toAddress':toAddress, 'fromAddress':fromAddress, 'subject':subject.encode('base64'), 'message':message.encode('base64'), 'encodingType':encodingtype, 'lastActionTime':lastactiontime, 'status':status, 'ackData':ackdata.encode('hex')})
|
||||
return data
|
||||
|
||||
def getSentMessageStatus(self,ackdata):
|
||||
|
||||
'''Returns the Status of an Outbox Message by AckData
|
||||
Usage: print api.getSentMessageStatus(AckData)'''
|
||||
|
||||
ackdata = ackdata.decode('hex')
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''SELECT status FROM sent where ackdata=?''',ackdata)
|
||||
if queryreturn == []:
|
||||
return 'notfound'
|
||||
for row in queryreturn:
|
||||
status, = row
|
||||
return status
|
||||
|
||||
def getSentMessagesBySender(self, fromAddress):
|
||||
|
||||
'''Return a List of Message by a given Send Address
|
||||
Usage: print api.getSentMessagesBySender(SendAddress)'''
|
||||
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''SELECT msgid, toaddress, fromaddress, subject, lastactiontime, message, encodingtype, status, ackdata FROM sent WHERE folder='sent' AND fromAddress=? ORDER BY lastactiontime''',fromAddress)
|
||||
data = []
|
||||
for row in queryreturn:
|
||||
msgid, toAddress, fromAddress, subject, lastactiontime, message, encodingtype, status, ackdata = row
|
||||
subject = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(subject)
|
||||
message = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(message)
|
||||
data.append({'msgid':msgid.encode('hex'), 'toAddress':toAddress, 'fromAddress':fromAddress, 'subject':subject, 'message':message, 'encodingType':encodingtype, 'lastActionTime':lastactiontime, 'status':status, 'ackData':ackdata.encode('hex')})
|
||||
return data
|
||||
|
||||
def joinChannel(self, label, testaddress=None):
|
||||
|
||||
'''Join a Channel by a Given Name or Password
|
||||
api.joinChannel(label,testaddress[Only for Testing if the Name is correct])'''
|
||||
|
||||
str_chan = '[chan]'
|
||||
#Add Channel to Own Addresses
|
||||
bitmessagemain.shared.apiAddressGeneratorReturnQueue.queue.clear()
|
||||
bitmessagemain.shared.addressGeneratorQueue.put(('createChan', 3, 1, str_chan + ' ' + label ,label))
|
||||
addressGeneratorReturnValue = bitmessagemain.shared.apiAddressGeneratorReturnQueue.get()
|
||||
print 'addressGeneratorReturnValue', addressGeneratorReturnValue
|
||||
if len(addressGeneratorReturnValue) == 0:
|
||||
raise APIError('AddressAlreadyInsideError')
|
||||
address = addressGeneratorReturnValue[0]
|
||||
if testaddress:
|
||||
if str(address) != str(testaddress):
|
||||
raise APIError('ChannelNameDoesntMatchAddressError')
|
||||
#Add Address to Address Book
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''select * from addressbook where address=?''',address)
|
||||
if queryreturn != []:
|
||||
raise APIError('AddressAlreadyInsideError')
|
||||
bitmessagemain.shared.sqlExecute('''INSERT INTO addressbook VALUES (?,?)''',str_chan + ' ' + label, address)
|
||||
return address
|
||||
|
||||
def listAddresses(self):
|
||||
|
||||
'''List own Addresses
|
||||
Usage: print api.listAddresses()'''
|
||||
|
||||
addresses = []
|
||||
configSections = bitmessagemain.shared.config.sections()
|
||||
for addressInKeysFile in configSections:
|
||||
if addressInKeysFile != 'bitmessagesettings':
|
||||
status, addressVersionNumber, streamNumber, hash = bitmessagemain.decodeAddress(addressInKeysFile)
|
||||
addresses.append({'label': bitmessagemain.shared.config.get(addressInKeysFile, 'label'), 'address': addressInKeysFile, 'stream':streamNumber, 'enabled': bitmessagemain.shared.config.getboolean(addressInKeysFile, 'enabled')})
|
||||
return addresses
|
||||
|
||||
def listBlacklist(self):
|
||||
|
||||
'''List all Blacklist Entries
|
||||
Usage: print api.listBlacklist()'''
|
||||
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''select * from blacklist''')
|
||||
data = []
|
||||
for row in queryreturn:
|
||||
label, address, enabled = row
|
||||
label = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(label)
|
||||
data.append({'label':label, 'address': address, 'enabled': bool(enabled)})
|
||||
return data
|
||||
|
||||
def listContacts(self):
|
||||
|
||||
'''List the Address Book
|
||||
Usage: print api.listContacts()'''
|
||||
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''select * from addressbook''')
|
||||
data = []
|
||||
for row in queryreturn:
|
||||
label, address = row
|
||||
label = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(label)
|
||||
data.append({'label':label, 'address': address})
|
||||
return data
|
||||
|
||||
def listSubscriptions(self):
|
||||
|
||||
'''List the all Subscriptions
|
||||
Usage: print api.listSubscriptions()'''
|
||||
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''SELECT label, address, enabled FROM subscriptions''')
|
||||
data = []
|
||||
for row in queryreturn:
|
||||
label, address, enabled = row
|
||||
label = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(label)
|
||||
data.append({'label':label, 'address': address, 'enabled': enabled})
|
||||
return data
|
||||
|
||||
def listWhitelist(self):
|
||||
|
||||
'''List all Whitelist Entries
|
||||
Usage: print api.listBlacklist()'''
|
||||
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''select * from whitelist''')
|
||||
data = []
|
||||
for row in queryreturn:
|
||||
label, address, enabled = row
|
||||
label = bitmessagemain.shared.fixPotentiallyInvalidUTF8Data(label)
|
||||
data.append({'label':label, 'address': address, 'enabled': bool(enabled)})
|
||||
return data
|
||||
|
||||
def markInboxMessageAsRead(self,msgid):
|
||||
|
||||
'''Mark an Inbox Message as read
|
||||
Usage: api.markInboxMessageAsRead()'''
|
||||
|
||||
msgid = msgid.decode('hex')
|
||||
bitmessagemain.shared.sqlExecute('''UPDATE inbox SET read='1' WHERE msgid=?''', msgid)
|
||||
|
||||
def markInboxMessageAsUnread(self,msgid):
|
||||
|
||||
'''Mark an Inbox Message as unread
|
||||
Usage: api.markInboxMessageAsUnread()'''
|
||||
|
||||
msgid = msgid.decode('hex')
|
||||
bitmessagemain.shared.sqlExecute('''UPDATE inbox SET read='0' WHERE msgid=?''', msgid)
|
||||
|
||||
def sendBroadcast(self,fromAddress,subject,message):
|
||||
|
||||
'''Send a Broadcast to a given Address
|
||||
Usage: api.sendBroadcast(BmAddress, Subject, Message)'''
|
||||
|
||||
#Hardcoded Encoding Type, no othe supported jet
|
||||
encodingType = 2
|
||||
|
||||
status, addressVersionNumber, streamNumber, toRipe = bitmessagemain.decodeAddress(fromAddress)
|
||||
fromAddress = bitmessagemain.addBMIfNotPresent(fromAddress)
|
||||
try:
|
||||
fromAddressEnabled = bitmessagemain.shared.config.getboolean(fromAddress, 'enabled')
|
||||
except:
|
||||
return (fromAddress,'fromAddressNotPresentError')
|
||||
if not fromAddressEnabled:
|
||||
return (fromAddress,'fromAddressDisabledError')
|
||||
ackdata = bitmessagemain.OpenSSL.rand(32)
|
||||
toAddress = '[Broadcast subscribers]'
|
||||
ripe = ''
|
||||
t = ('', toAddress, ripe, fromAddress, subject, message, ackdata, int(
|
||||
time.time()), 'broadcastqueued', 1, 1, 'sent', 2)
|
||||
bitmessagemain.helper_sent.insert(t)
|
||||
toLabel = '[Broadcast subscribers]'
|
||||
bitmessagemain.shared.workerQueue.put(('sendbroadcast', ''))
|
||||
return ackdata.encode('hex')
|
||||
|
||||
def sendMessage(self, fromAddress, toAddress, subject, message):
|
||||
|
||||
'''Send a Message to a given Address or Channel
|
||||
Usage: api.sendBroadcast(OwnAddress, TargetAddress, Subject, Message)'''
|
||||
|
||||
#Hardcoded Encoding Type, no othe supported jet
|
||||
encodingType = 2
|
||||
|
||||
status, addressVersionNumber, streamNumber, toRipe = bitmessagemain.decodeAddress(toAddress)
|
||||
if status != 'success':
|
||||
with bitmessagemain.shared.printLock:
|
||||
print 'ToAddress Error: %s , %s'%(toAddress,status)
|
||||
return (toAddress,status)
|
||||
status, addressVersionNumber, streamNumber, fromRipe = bitmessagemain.decodeAddress(fromAddress)
|
||||
if status != 'success':
|
||||
with bitmessagemain.shared.printLock:
|
||||
print 'fromAddress Error: %s , %s'%(fromAddress,status)
|
||||
return (fromAddress,status)
|
||||
toAddress = bitmessagemain.addBMIfNotPresent(toAddress)
|
||||
fromAddress = bitmessagemain.addBMIfNotPresent(fromAddress)
|
||||
try:
|
||||
fromAddressEnabled = bitmessagemain.shared.config.getboolean(fromAddress, 'enabled')
|
||||
except:
|
||||
return (fromAddress,'fromAddressNotPresentError')
|
||||
if not fromAddressEnabled:
|
||||
return (fromAddress,'fromAddressDisabledError')
|
||||
ackdata = bitmessagemain.OpenSSL.rand(32)
|
||||
t = ('', toAddress, toRipe, fromAddress, subject, message, ackdata, int(
|
||||
time.time()), 'msgqueued', 1, 1, 'sent', 2)
|
||||
bitmessagemain.helper_sent.insert(t)
|
||||
toLabel = ''
|
||||
queryreturn = bitmessagemain.shared.sqlQuery('''select label from addressbook where address=?''',toAddress)
|
||||
if queryreturn != []:
|
||||
for row in queryreturn:
|
||||
toLabel, = row
|
||||
bitmessagemain.shared.UISignalQueue.put(('displayNewSentMessage', (
|
||||
toAddress, toLabel, fromAddress, subject, message, ackdata)))
|
||||
bitmessagemain.shared.workerQueue.put(('sendmessage', toAddress))
|
||||
return ackdata.encode('hex')
|
||||
|
||||
def setBlackWhitelist(self, value):
|
||||
|
||||
'''Changes the Settings to Black- or Whitelist
|
||||
Usage: api.setBlackWhitelist('black' or 'white')'''
|
||||
|
||||
if value not in ['black','white']:
|
||||
raise APIError('WrongValueGivenError:%s'%value)
|
||||
|
||||
bitmessagemain.shared.config.set('bitmessagesettings', 'blackwhitelist', value)
|
||||
|
||||
def trashInboxMessage(self,msgid):
|
||||
|
||||
'''Trash a Message from Inbox by a given ID
|
||||
Usage: api.trashInboxMessage(MessageID)'''
|
||||
|
||||
msgid = msgid.decode('hex')
|
||||
bitmessagemain.helper_inbox.trash(msgid)
|
||||
|
||||
def trashSentMessage(self,msgid):
|
||||
|
||||
'''Trash a Message from Outbox by a given ID
|
||||
Usage: api.trashSentMessage(MessageID)'''
|
||||
|
||||
msgid = msgid.decode('hex')
|
||||
bitmessagemain.shared.sqlExecute('''UPDATE sent SET folder='trash' WHERE msgid=?''',msgid)
|
||||
|
||||
|
||||
api = MainAPI()
|
||||
api.start(daemon=True)
|
||||
time.sleep(5)
|
||||
return api
|
||||
|
||||
import unittest
|
||||
class TestFeed(unittest.TestCase):
|
||||
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
global path
|
||||
import tempfile
|
||||
path = tempfile.mkdtemp()
|
||||
|
||||
global api
|
||||
api = getAPI(workingdir=path,silent=True)
|
||||
import time
|
||||
time.sleep(5)
|
||||
|
||||
@classmethod
|
||||
def tearDownClass(cls):
|
||||
import shutil
|
||||
import time
|
||||
api.stop()
|
||||
time.sleep(20)
|
||||
shutil.rmtree(path)
|
||||
|
||||
def test_01_addresses_subscriptions_channels(self):
|
||||
|
||||
api.createRandomAddress('a')
|
||||
assert api.listAddresses()[0]['label'] == 'a',api.listAddresses()[0]
|
||||
api.createDeterministicAddresses('b')
|
||||
assert api.listAddresses()[1]['label'] == 'b',api.listAddresses()[1]
|
||||
api.joinChannel('general')
|
||||
assert api.listAddresses()[2]['label'] == '[chan] general',api.listAddresses()[2]
|
||||
assert api.listContacts()[0]['label'] == '[chan] general',api.listContacts()[0]
|
||||
api.addSubscription('d','BM-2D9vJkoGoTBhqMyZyjvELKgBWFMr6iGCQQ')
|
||||
assert api.listSubscriptions()[1]['label'] == 'd',api.listSubscriptions()[1]
|
||||
api.deleteSubscription(api.listSubscriptions()[1]['address'])
|
||||
subs = api.listSubscriptions()
|
||||
for sub in subs:
|
||||
assert sub['label'] != 'd'
|
||||
|
||||
def test_02_manage_contacts(self):
|
||||
api.addContact('a','a')
|
||||
assert api.listContacts()[1]['address'] == 'a',api.listContacts()[1]
|
||||
count = len(api.listContacts())
|
||||
api.deleteContact('a')
|
||||
assert len(api.listContacts()) == count - 1
|
||||
|
||||
def test_03_manage_blackwhitelist(self):
|
||||
assert api.getBlackWhitelist() == 'black'
|
||||
api.setBlackWhitelist('white')
|
||||
assert api.getBlackWhitelist() == 'white'
|
||||
api.setBlackWhitelist('black')
|
||||
assert api.getBlackWhitelist() == 'black'
|
||||
|
||||
api.addToBlacklist('a','a')
|
||||
assert api.listBlacklist()[0]['label'] == 'a'
|
||||
api.deleteFromBlacklist('a')
|
||||
assert api.listBlacklist() == []
|
||||
|
||||
api.addToWhitelist('a','a')
|
||||
assert api.listWhitelist()[0]['label'] == 'a'
|
||||
api.deleteFromWhitelist('a')
|
||||
assert api.listWhitelist() == []
|
||||
|
||||
def test_04_send_messages(self):
|
||||
addr = api.createRandomAddress('sendtest')
|
||||
ackdata1 = api.sendMessage(addr,'BM-2D9vJkoGoTBhqMyZyjvELKgBWFMr6iGCQQ','apitest','apitest')
|
||||
ackdata2 = api.sendBroadcast(addr,'apitest','apitest')
|
||||
while api.getSentMessageByAckData(ackdata1) == 'notfound':
|
||||
pass
|
||||
while api.getSentMessageByAckData(ackdata2) == 'notfound':
|
||||
pass
|
||||
|
||||
assert api.getSentMessageByAckData(ackdata1)[0]['status'] in ['msgqueued', 'broadcastqueued', \
|
||||
'broadcastsent', 'doingpubkeypow', 'awaitingpubkey', 'doingmsgpow', 'forcepow', 'msgsent', \
|
||||
'msgsentnoackexpected', 'ackreceived'],api.getSentMessageByAckData(ackdata1)
|
||||
assert api.getSentMessageByAckData(ackdata2)[0]['status'] in ['msgqueued', 'broadcastqueued', \
|
||||
'broadcastsent', 'doingpubkeypow', 'awaitingpubkey', 'doingmsgpow', 'forcepow', 'msgsent', \
|
||||
'msgsentnoackexpected', 'ackreceived'],api.getSentMessageByAckData(ackdata2)
|
||||
|
||||
def test_05_manage_sent_messages(self):
|
||||
|
||||
addr = api.createRandomAddress('senttest')
|
||||
ackdata = api.sendMessage(addr,addr,'last','last')
|
||||
idnum = api.getSentMessageByAckData(ackdata)[0]['msgid']
|
||||
|
||||
assert api.getAllSentMessages() != []
|
||||
assert api.getAllSentMessageIDs() != []
|
||||
assert api.getSentMessagesBySender(addr) != []
|
||||
assert api.getSentMessageByAckData(ackdata) != []
|
||||
assert api.getSentMessageByID(idnum) != []
|
||||
assert api.getSentMessageStatus(ackdata) in ['msgqueued'],api.getSentMessageStatus(ackdata)
|
||||
|
||||
api.trashSentMessage(idnum)
|
||||
messages = api.getAllSentMessages()
|
||||
for message in messages:
|
||||
assert message['msgid'] != idnum
|
||||
|
||||
def test_06_manage_inbox_messages(self):
|
||||
|
||||
assert api.clientStatus > 0, 'Not connected'
|
||||
addr = api.createRandomAddress('senttest')
|
||||
counter = 0
|
||||
while api.getAllInboxMessages() == []:
|
||||
if counter > 20:
|
||||
ackdata = api.sendMessage(addr,addr,'test','test')
|
||||
time.sleep(10)
|
||||
assert api.clientStatus > 0, 'Not connected'
|
||||
|
||||
assert api.getAllInboxMessages() != [],api.getAllInboxMessages()
|
||||
assert api.getAllInboxMessageIDs() != [],api.getAllInboxMessageIDs()
|
||||
|
||||
msgid = api.getAllInboxMessages()[0]['msgid']
|
||||
recv = api.getAllInboxMessages()[0]['toAddress']
|
||||
assert api.getInboxMessageByID(msgid) != []
|
||||
assert api.getInboxMessagesByReceiver(recv) != []
|
||||
|
||||
assert api.getInboxMessageByID(msgid)[0]['read'] == 0,api.getInboxMessageByID(msgid)[0]['read']
|
||||
api.markInboxMessageAsRead(msgid)
|
||||
assert api.getInboxMessageByID(msgid)[0]['read'] == 1,api.getInboxMessageByID(msgid)[0]['read']
|
||||
api.markInboxMessageAsUnread(msgid)
|
||||
assert api.getInboxMessageByID(msgid)[0]['read'] == 0,api.getInboxMessageByID(msgid)[0]['read']
|
||||
|
||||
api.trashInboxMessage(msgid)
|
||||
messages = api.getAllInboxMessages()
|
||||
for msg in messages:
|
||||
assert msg['msgid'] != msgid
|
||||
|
||||
api.getAllInboxMessages()
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
|
@ -1928,6 +1928,7 @@ class receiveDataThread(threading.Thread):
|
|||
return
|
||||
# print 'remoteProtocolVersion', self.remoteProtocolVersion
|
||||
self.myExternalIP = socket.inet_ntoa(data[40:44])
|
||||
shared.myExternalIP = self.myExternalIP
|
||||
# print 'myExternalIP', self.myExternalIP
|
||||
self.remoteNodeIncomingPort, = unpack('>H', data[70:72])
|
||||
# print 'remoteNodeIncomingPort', self.remoteNodeIncomingPort
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ lengthOfTimeToHoldOnToAllPubkeys = 2419200 # Equals 4 weeks. You could make thi
|
|||
maximumAgeOfObjectsThatIAdvertiseToOthers = 216000 # Equals two days and 12 hours
|
||||
maximumAgeOfNodesThatIAdvertiseToOthers = 10800 # Equals three hours
|
||||
useVeryEasyProofOfWorkForTesting = False # If you set this to True while on the normal network, you won't be able to send or sometimes receive messages.
|
||||
|
||||
myExternalIP = None
|
||||
|
||||
# Libraries.
|
||||
import collections
|
||||
|
|
|
|||
Reference in New Issue
Block a user