diff --git a/apps/ssb.json b/apps/ssb.json index 5adc0c28..9f24025e 100644 --- a/apps/ssb.json +++ b/apps/ssb.json @@ -1,5 +1,5 @@ { "type": "tildefriends-app", "emoji": "🦀", - "previous": "&Gic1e3jOZ7z5131jSCclbFXRpjyu8JlWJrjE7Fvn5dc=.sha256" + "previous": "&6mBMHVKDgkYigy+PnHmii8AJW68ezgCtk5vuQ+HwN7s=.sha256" } diff --git a/apps/ssb/app.js b/apps/ssb/app.js index b9db0543..163903b4 100644 --- a/apps/ssb/app.js +++ b/apps/ssb/app.js @@ -52,10 +52,13 @@ tfrpc.register(async function closeConnection(id) { await ssb.closeConnection(id); }); tfrpc.register(async function query(sql, args) { + let start = new Date(); let result = []; await ssb.sqlAsync(sql, args, function callback(row) { result.push(row); }); + let end = new Date(); + print((end - start) / 1000, sql.replaceAll(/\s+/g, ' ').trim()); return result; }); tfrpc.register(async function appendMessage(id, message) { diff --git a/apps/ssb/tf-app.js b/apps/ssb/tf-app.js index df27d467..0603f9fc 100644 --- a/apps/ssb/tf-app.js +++ b/apps/ssb/tf-app.js @@ -403,14 +403,6 @@ class TfElement extends LitElement { return [cache.latest, cache.messages]; } - async query_timed(sql, args) { - let start = new Date(); - let result = await tfrpc.rpc.query(sql, args); - let end = new Date(); - console.log((end - start) / 1000, sql.replaceAll(/\s+/g, ' ').trim()); - return result; - } - async group_private_messages(messages) { let groups = {}; let result = await this.decrypt( @@ -452,7 +444,7 @@ class TfElement extends LitElement { ]; let channels = ( await Promise.all([ - this.query_timed( + tfrpc.rpc.query( ` SELECT channels.value AS channel, MAX(messages.rowid) AS rowid FROM messages JOIN json_each(?1) AS channels ON messages.content ->> 'channel' = channels.value @@ -465,7 +457,7 @@ class TfElement extends LitElement { `, k_args ), - this.query_timed( + tfrpc.rpc.query( ` SELECT channels.value AS channel, MAX(messages.rowid) AS rowid FROM messages JOIN messages_refs ON messages.id = messages_refs.message @@ -479,7 +471,7 @@ class TfElement extends LitElement { `, k_args ), - this.query_timed( + tfrpc.rpc.query( ` SELECT '' AS channel, MAX(messages.rowid) AS rowid FROM messages JOIN json_each(?2) AS following ON messages.author = following.value @@ -490,7 +482,7 @@ class TfElement extends LitElement { `, k_args ), - this.query_timed( + tfrpc.rpc.query( ` SELECT '@' AS channel, MAX(messages.rowid) AS rowid FROM messages_fts(?3) JOIN messages ON messages.rowid = messages_fts.rowid