Merge tag 'decrypt-fail'

1.0.1

Author: Jack-Works

Diff for: src/extension/background-script/CryptoService.ts

@@ -115,10 +115,16 @@ async function decryptFrom(
                 return { signatureVerifyResult: false, content }
             }
         } else {
+            const aesKeyEncrypted = await queryPostAESKey(salt, whoAmI)
+            if (aesKeyEncrypted === undefined) {
+                throw new Error(
+                    'Maskbook does not find key that you can used to decrypt this post. Maybe this post is not send to you?',
+                )
+            }
             const content = decodeText(
                 await Alpha41.decryptMessage1ToNByOther({
                     version: -41,
-                    AESKeyEncrypted: await queryPostAESKey(salt, whoAmI),
+                    AESKeyEncrypted: aesKeyEncrypted,
                     authorsPublicKeyECDH: byKey.key.publicKey,
                     encryptedContent: encryptedText,
                     privateKeyECDH: mine.key.privateKey,

Diff for: src/extension/content-script/tasks.ts

@@ -1,26 +1,22 @@
-import { AutomatedTabTask, LiveSelector, MutationObserverWatcher } from '@holoflows/kit'
-import { BackgroundService } from './rpc'
+import { AutomatedTabTask, LiveSelector } from '@holoflows/kit'
+import { sleep } from '../../utils/utils'
 export default AutomatedTabTask({
     /**
      * Access: https://www.facebook.com/${username}/posts/${postId}
      * Or: https://www.facebook.com/permalink.php?story_fbid=${postId}&id=${userId}
      */
-    getPostContent() {
-        const post = new LiveSelector().querySelector<HTMLParagraphElement>('#contentArea p').map(x => x.innerText)
-        return new Promise(resolve => {
-            new MutationObserverWatcher(post).addListener('onAdd', event => resolve(event.data[0].node)).startWatch()
-        })
+    async getPostContent() {
+        const post = new LiveSelector().querySelector<HTMLParagraphElement>('#contentArea p')
+        while (!post.evaluateOnce()[0]) await sleep(200)
+        return post.evaluateOnce()[0].innerText
     },
     /**
      * Access: https://www.facebook.com/profile.php?id=${userId}
      * Or: https://www.facebook.com/${username}?fref=pymk
      */
-    getBioContent() {
-        const bio = new LiveSelector()
-            .querySelector<HTMLDivElement>('#profile_timeline_intro_card')
-            .map(x => x.innerText)
-        return new Promise(resolve =>
-            new MutationObserverWatcher(bio).addListener('onAdd', event => resolve(event.data[0].node)).startWatch(),
-        )
+    async getBioContent() {
+        const bio = new LiveSelector().querySelector<HTMLDivElement>('#profile_timeline_intro_card')
+        while (!bio.evaluateOnce()[0]) await sleep(200)
+        return bio.evaluateOnce()[0].innerText
     },
 })!

Diff for: src/key-management/people-gun.ts

@@ -2,6 +2,7 @@ import { queryPersonCryptoKey, PersonCryptoKey } from './keystore-db'
 import { gun } from './gun'
 import tasks from '../extension/content-script/tasks'
 import { verifyOthersProve } from '../extension/background-script/CryptoService'
+import { sleep } from '../utils/utils'
 
 export async function queryPerson(username: string) {
     return gun
@@ -46,12 +47,14 @@ export async function addPersonPublicKey(username: string): Promise<PersonCrypto
         errors.push(e)
         proveRejected = true
     }
-    if (bioRejected && proveRejected) {
-        debugger
+    // HACK
+    await sleep(1000)
+    const key = await queryPersonCryptoKey(username)
+    if ((bioRejected && proveRejected) || !key) {
         console.error(...errors)
         throw new Error('Cannot find public key of ' + username)
     }
-    return (await queryPersonCryptoKey(username))!
+    return key
 }
 
 export async function uploadProvePostUrl(username: string, postId: string) {