fix: mf-6637 reset provider after cancel connect in popup (#12165)

* fix: mf-6637 reset provider after cancel connect in popup

* fix: post has address should be replaced

* fix: adjust order of providers in checking link

Author: swkatmask

packages/mask/content-script/components/InjectedComponents/PostReplacer.tsx

@@ -12,7 +12,12 @@ import {
     makeTypedMessageText,
     isTypedMessageText,
 } from '@masknet/typed-message'
-import { MaskMessages } from '@masknet/shared-base'
+import {
+    EXIST_EVM_ADDRESS_RE,
+    EXIST_SOLANA_ADDRESS_RE,
+    EXIST_TORN_ADDRESS_RE,
+    MaskMessages,
+} from '@masknet/shared-base'
 import { TypedMessageRender, useTransformedValue } from '@masknet/typed-message-react'
 import {
     usePostInfoAuthor,
@@ -90,6 +95,7 @@ function Transformer({
         if (!isTypedMessageEqual(flatten, after)) return true
         if (hasCashOrHashTag(after)) return true
         if (shouldHiddenPostReplacer(message)) return true
+        if (hasAddresses(message)) return true
         return false
     }, [message, after])
 
@@ -118,6 +124,23 @@ function hasCashOrHashTag(message: TypedMessage): boolean {
     return result
 }
 
+function hasAddresses(message: TypedMessage): boolean {
+    let result = false
+    function visitor(node: TypedMessage): 'stop' | void {
+        if (result) return
+        if (!isTypedMessageText(node)) return
+        const content = node.content
+        const hasAddresses =
+            EXIST_EVM_ADDRESS_RE.test(content) ||
+            EXIST_SOLANA_ADDRESS_RE.test(content) ||
+            EXIST_TORN_ADDRESS_RE.test(content)
+        result = result || hasAddresses
+    }
+    visitor(message)
+    forEachTypedMessageChild(message, visitor)
+    return result
+}
+
 function shouldHiddenPostReplacer(message: TypedMessage): boolean {
     return isTypedMessageText(message) && message.content === ''
 }

packages/mask/content-script/site-adaptors/twitter.com/injection/PostReplacer.tsx

@@ -1,4 +1,5 @@
 import type { PostInfo } from '@masknet/plugin-infra/content-script'
+import { EXIST_EVM_ADDRESS_RE, EXIST_SOLANA_ADDRESS_RE, EXIST_TORN_ADDRESS_RE } from '@masknet/shared-base'
 import { injectPostReplacer } from '../../../site-adaptor-infra/defaults/inject/PostReplacer.js'
 
 function resolveLangNode(node: HTMLElement) {
@@ -8,26 +9,24 @@ function resolveLangNode(node: HTMLElement) {
         )
 }
 
-// There are different from what ScamWarning uses, they are not global
-const EVM_ADDRESS = /(^|\s)(0x[\dA-Fa-f]{40})/
-const SOLANA_ADDRESS = /(^|\s)([1-9A-HJ-NP-Za-km-z]{32,44})/
-const TORN_ADDRESS = /(^|\s)(T[1-9A-Za-z]{33})/
-
 function detectPotentialScam(postInfo: PostInfo) {
     const textContent = postInfo.rootNode?.textContent?.trim()
     if (!textContent) return false
     const hasAddresses =
-        EVM_ADDRESS.test(textContent) || SOLANA_ADDRESS.test(textContent) || TORN_ADDRESS.test(textContent)
+        EXIST_EVM_ADDRESS_RE.test(textContent) ||
+        EXIST_SOLANA_ADDRESS_RE.test(textContent) ||
+        EXIST_TORN_ADDRESS_RE.test(textContent)
     const hasLinks = postInfo.mentionedLinks.getCurrentValue().length > 0
     return hasAddresses || hasLinks
 }
 
 export async function injectPostReplacerAtTwitter(signal: AbortSignal, current: PostInfo) {
     const rootNode = current.rootNode
-    const hasPotentialScam = detectPotentialScam(current)
     if (!rootNode) return
     const isPromotionPost = !!rootNode.querySelector('svg path[d$="996V8h7v7z"]')
     if (isPromotionPost) return
+
+    const hasPotentialScam = detectPotentialScam(current)
     if (!hasPotentialScam) {
         const isCollapsedPost = !!rootNode.querySelector('[data-testid="tweet-text-show-more-link"]')
         if (isCollapsedPost) return

packages/plugins/ScamWarning/src/SiteAdaptor/hooks/useCheckLink.ts

@@ -16,19 +16,19 @@ export function useCheckLink(link: string, text: string) {
         queryFn: async () => {
             const resolvedLink = isTCO(link) ? await resolveTCOLink(link) : link
             if (!resolvedLink) return { isScam: false }
-            const result = await GoPlusLabs.checkIsPhishingSite(resolvedLink)
+            const result = await PluginScamRPC.checkUrl(resolvedLink)
             if (result)
                 return {
                     isScam: result,
-                    provider: SecurityProvider.GoPlus,
+                    provider: SecurityProvider.ScamSniffer,
                     resolvedLink,
                 }
             const isEllipsis = text.endsWith('…')
             // We assume that the link contains only one address
             const address = isEllipsis ? extractAddresses(resolvedLink, true)[0] : undefined
 
             return {
-                isScam: await PluginScamRPC.checkUrl(resolvedLink),
+                isScam: await GoPlusLabs.checkIsPhishingSite(resolvedLink),
                 provider: SecurityProvider.ScamSniffer,
                 resolvedLink,
                 address,

packages/plugins/ScamWarning/src/constants.ts

@@ -4,14 +4,6 @@ export const PLUGIN_ID = PluginID.ScamWarning
 export const PLUGIN_DESCRIPTION = ''
 export const PLUGIN_NAME = 'ScamWarning'
 
-export const EVM_ADDRESS = /(^|\s)(0x[a-fA-F0-9]{40})/gu
-export const SOLANA_ADDRESS = /(^|\s)([1-9A-HJ-NP-Za-km-z]{32,44})/gu
-export const TRON_ADDRESS = /(^|\s)(T[A-Za-z1-9]{33})/gu
-
-export const EXIST_EVM_ADDRESS = /\b(0x[a-fA-F0-9]{40})/gu
-export const EXIST_SOLANA_ADDRESS = /\b([1-9A-HJ-NP-Za-km-z]{32,44})/gu
-export const EXIST_TRON_ADDRESS = /\b(T[A-Za-z1-9]{33})/gu
-
 export enum SecurityProvider {
     ScamSniffer = 'ScamSniffer',
     GoPlus = 'GoPlus',

packages/plugins/ScamWarning/src/index.ts

@@ -1,13 +1,19 @@
-import { EVM_ADDRESS, SOLANA_ADDRESS } from '@masknet/plugin-scam-warning'
-import { EXIST_EVM_ADDRESS, EXIST_SOLANA_ADDRESS, EXIST_TRON_ADDRESS, TRON_ADDRESS } from './constants.js'
+import {
+    MATCH_EVM_ADDRESS_RE,
+    MATCH_SOLANA_ADDRESS_RE,
+    MATCH_TRON_ADDRESS_RE,
+    TRON_ADDRESS_RE,
+    SOLANA_ADDRESS_RE,
+    EVM_ADDRESS_RE,
+} from '@masknet/shared-base'
 
 export function isTronAddress(address: string) {
-    return !!address.match(TRON_ADDRESS)
+    return !!address.match(TRON_ADDRESS_RE)
 }
 
 export function extractAddresses(text: string, exist = false) {
-    const evmAddresses = text.match(exist ? EXIST_EVM_ADDRESS : EVM_ADDRESS) || []
-    const solAddresses = text.match(exist ? EXIST_SOLANA_ADDRESS : SOLANA_ADDRESS) || []
-    const tronAddresses = text.match(exist ? EXIST_TRON_ADDRESS : TRON_ADDRESS) || []
+    const evmAddresses = text.match(exist ? MATCH_EVM_ADDRESS_RE : EVM_ADDRESS_RE) || []
+    const solAddresses = text.match(exist ? MATCH_SOLANA_ADDRESS_RE : SOLANA_ADDRESS_RE) || []
+    const tronAddresses = text.match(exist ? MATCH_TRON_ADDRESS_RE : TRON_ADDRESS_RE) || []
     return [...evmAddresses, ...solAddresses, ...tronAddresses]
 }

packages/plugins/ScamWarning/src/utils.ts

@@ -40,3 +40,15 @@ export const DEFAULT_PLUGIN_PUBLISHER = { name: { fallback: 'Mask Network' }, li
 export const RedPacketMetaKey = `${PluginID.RedPacket}:1`
 export const RedPacketNftMetaKey = `${PluginID.RedPacket}_nft:1`
 export const SolanaRedPacketMetaKey = `${PluginID.RedPacket}_solana:1`
+
+export const EVM_ADDRESS_RE = /(^|\s)(0x[a-fA-F0-9]{40})/gu
+export const SOLANA_ADDRESS_RE = /(^|\s)([1-9A-HJ-NP-Za-km-z]{32,44})/gu
+export const TRON_ADDRESS_RE = /(^|\s)(T[A-Za-z1-9]{33})/gu
+
+export const MATCH_EVM_ADDRESS_RE = /\b(0x[a-fA-F0-9]{40})/gu
+export const MATCH_SOLANA_ADDRESS_RE = /\b([1-9A-HJ-NP-Za-km-z]{32,44})/gu
+export const MATCH_TRON_ADDRESS_RE = /\b(T[A-Za-z1-9]{33})/gu
+
+export const EXIST_EVM_ADDRESS_RE = /(^|\s)(2x[\dA-Fa-f]{40})/
+export const EXIST_SOLANA_ADDRESS_RE = /(^|\s)([1-9A-HJ-NP-Za-km-z]{32,44})/
+export const EXIST_TORN_ADDRESS_RE = /(^|\s)(T[1-9A-Za-z]{33})/