Skip to content

Commit

Permalink
Added som additional logs
Browse files Browse the repository at this point in the history
  • Loading branch information
@f-r00t
f-r00t committed Mar 17, 2024
1 parent dc73e12 commit cd2d1f2
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 31 deletions.
18 changes: 7 additions & 11 deletions src/Globals.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,8 @@ class globals {

this.lastSyncEvent = Date.now();

this.navigation = undefined;

}

reset() {
Expand Down Expand Up @@ -342,22 +344,17 @@ function updateConnection(connection) {

export async function startWebsocket() {

console.log('websockets online', Globals.websockets)

if (Globals.websockets || Globals.preferences.websocketEnabled != 'true') return;


console.log('CacheNabled:', Globals.preferences.cacheEnabled)
console.log(Globals.preferences.cache);
if (Globals.preferences.cacheEnabled != "true") return;
const socketURL = Globals.preferences.cache.replace(/^http:\/\//, 'ws://').replace(/^https:\/\//, 'wss://')+'/ws';
console.log(socketURL);
Globals.socket = new WebSocket(socketURL);

// Open connection wit Cache
Globals.socket.onopen = () => {
Globals.websockets++;
console.log(`Connected πŸ€–`)
Globals.logger.addLogMessage('Connected to WebSocket πŸ€–');
Globals.webSocketStatus = 'online';

}
Expand All @@ -366,19 +363,20 @@ function updateConnection(connection) {
if (Globals.websockets > 0) Globals.websockets--;

Globals.webSocketStatus = 'offline';
console.log('Connection closed')
Globals.logger.addLogMessage('Disconnected from WebSocket πŸ€–');
startWebsocket();
}

// Listen for messages
Globals.socket.onmessage = async (e) => {
Globals.logger.addLogMessage('Received WebSocket Message!');
let data = e.data
Globals.logger.addLogMessage(data);

try {

let json = JSON.parse(data)
console.log(json);
await getMessage(json);
await getMessage(json, json.hash, Globals.navigation);
sendNotifications();

} catch (err) {
Expand All @@ -390,8 +388,6 @@ function updateConnection(connection) {

export async function initGlobals() {

console.log('Initing globals..');

const payees = await loadPayeeDataFromDatabase();

if (payees !== undefined) {
Expand Down
24 changes: 16 additions & 8 deletions src/HuginUtilities.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -493,17 +493,19 @@ export async function sendMessageWithHuginAPI(payload_hex) {

export async function cacheSync(first=true, page=1) {

return new Promise(async (resolve, reject) => {
Globals.logger.addLogMessage('Syncing group message with API.. πŸ’Œ');

console.log('Global timestamp', Globals.lastMessageTimestamp);
return new Promise(async (resolve, reject) => {


if(first) {
latest_board_message_timestamp = parseInt(await getLatestGroupMessage()) + 1;
}

if (Globals.lastMessageTimestamp > latest_board_message_timestamp) latest_board_message_timestamp = Globals.lastMessageTimestamp;
console.log('Last message was:', new Date(latest_board_message_timestamp).toISOString().replace('T', ' ').replace(/\.\d+Z$/, ''))

if (Globals.lastMessageTimestamp > latest_board_message_timestamp) latest_board_message_timestamp = Globals.lastMessageTimestamp;
Globals.logger.addLogMessage(`Syncing group messages from ${new Date(latest_board_message_timestamp).toISOString().replace('T', ' ').replace(/\.\d+Z$/, '')} to ${new Date(Date.now()).toISOString().replace('T', ' ').replace(/\.\d+Z$/, '')}.. πŸ’Œ`);
let cacheURL = Globals.preferences.cache ? Globals.preferences.cache : Config.defaultCache;
console.log(`${cacheURL}/api/v1/posts-encrypted-group?from=${parseInt(latest_board_message_timestamp/1000)}&to=${parseInt(Date.now()/1000)}&size=50&page=` + page);
fetch(`${cacheURL}/api/v1/posts-encrypted-group?from=${parseInt(latest_board_message_timestamp/1000)}&to=${parseInt(Date.now()/1000)}&size=50&page=` + page)
Expand All @@ -517,6 +519,8 @@ export async function cacheSync(first=true, page=1) {
}
for (item in items) {

Globals.logger.addLogMessage(`Found ${Globals.notificationQueue.length} messages.. πŸ’Œ`);

Globals.lastSyncEvent = Date.now();

if (await groupMessageExists(items[item].tx_timestamp)) continue;
Expand Down Expand Up @@ -581,7 +585,7 @@ export async function cacheSyncDMs(first=true, page=1) {
hash: items[item].tx_hash
};
console.log('Getting message')
let message = await getMessage(this_json);
let message = await getMessage(this_json, this_json.tx_hash, Globals.navigation);
console.log('Message gotten')
}
if (json.total_pages == 0) resolve(true);
Expand Down Expand Up @@ -677,8 +681,6 @@ export async function sendGroupsMessage(message, group, temp_timestamp, reply=fa

export async function sendMessage(message, receiver, messageKey, temp_timestamp) {

console.log(Globals.wallet);

if (message.length == 0) {
return;
}
Expand Down Expand Up @@ -751,17 +753,21 @@ export async function sendMessage(message, receiver, messageKey, temp_timestamp)
Buffer.from(payload_hex, 'hex')
);

Globals.logger.addLogMessage('Trying to send DM..');

if (!result.success) {
Globals.logger.addLogMessage('Failed to send DM..');
optimizeMessages(10, true);
console.log(result);
try {
Globals.logger.addLogMessage('Trying to send DM with API..');
result = await sendMessageWithHuginAPI(payload_hex);
} catch (err) {
console.log('Failed to send with Hugin API..')
Globals.logger.addLogMessage('Trying to send DM with API..');
}
} else optimizeMessages(10);

if (result.success) {
Globals.logger.addLogMessage('Succeeded sending DM!');
if (message.substring(0,1) == 'Ξ”' || message.substring(0,1) == 'Ξ›') {
message = 'Call started';
}
Expand Down Expand Up @@ -1066,8 +1072,10 @@ export async function getMessage(extra, hash, navigation, fromBackground=false){
Date.now() - payload_json.t < 180000 ? missed = false : missed = true;

console.log('Call is missed? ', missed);
console.log('What is navigation', navigation)

if (navigation && !missed) {
console.log('Navigating to dis bichh');
navigation.navigate(
'CallScreen', {
payee: {nickname: from_payee.name, address: from_payee.address, paymentID: from_payee.paymentID},
Expand Down
23 changes: 11 additions & 12 deletions src/MainScreen.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,9 @@ export class MainScreen extends React.PureComponent {

init(this.props.navigation);

Globals.navigation = this.props.navigation;
console.log('Navigation set to', Globals.navigation)

Globals.wallet.on('transaction', () => {
this.updateBalance();
});
Expand Down Expand Up @@ -1023,10 +1026,6 @@ async function backgroundSyncMessages(navigation) {

const syncingHasStalled = (Date.now() - Globals.lastSyncEvent > 1000 * 60 );

console.log('Has syncing stalled?', syncingHasStalled);
console.log(Date.now() - Globals.lastSyncEvent);
console.log(Globals.lastSyncEvent);

if (syncingHasStalled ) Globals.syncingMessages = false;

// Add check if websocket // cache is working
Expand Down Expand Up @@ -1079,7 +1078,7 @@ async function backgroundSyncMessages(navigation) {

await cacheSync();
await cacheSyncDMs();
console.log('Returned with', Globals.notificationQueue)
Globals.logger.addLogMessage(`Found ${Globals.notificationQueue.length} messages.. πŸ’Œ`);
sendNotifications();
Globals.syncingMessages = false;
Globals.knownTXs = await getKnownTransactions();
Expand All @@ -1091,7 +1090,7 @@ async function backgroundSyncMessages(navigation) {

try {

console.log('Syncing from node..');
Globals.logger.addLogMessage('Syncing messages from node.. πŸ’Œ');

const daemonInfo = Globals.wallet.getDaemonConnectionInfo();
let knownTXs = await getKnownTransactions();
Expand All @@ -1111,23 +1110,22 @@ async function backgroundSyncMessages(navigation) {
}
let addedTxs = json.addedTxs;

let transactions = addedTxs;
Globals.logger.addLogMessage(`Found ${addedTxs.length} new messages.. πŸ’Œ`);

console.log(`Found ${addedTxs.length} new transactions.`);
let transactions = addedTxs;

for (transaction in transactions) {

try {

Globals.logger.addLogMessage(`Trying to decrypt message ${transaction}/${addedTxs.length}.. πŸ’Œ`);

Globals.lastSyncEvent = Date.now();

let thisExtra = transactions[transaction]["transactionPrefixInfo.txPrefix"].extra;

let thisHash = transactions[transaction]["transactionPrefixInfo.txHash"];

console.log(`Checking tx with hash ${thisHash}`);


if (Globals.knownTXs.indexOf(thisHash) != -1) continue;


Expand All @@ -1154,7 +1152,8 @@ async function backgroundSyncMessages(navigation) {
}

}
console.log('Syncing complete!', Globals.notificationQueue);
Globals.logger.addLogMessage(`Found ${Globals.notificationQueue.length} messages.. πŸ’Œ`);

sendNotifications();
Globals.syncingMessages = false;
Globals.knownTXs = await getKnownTransactions();
Expand Down

0 comments on commit cd2d1f2

Please sign in to comment.