-
Notifications
You must be signed in to change notification settings - Fork 1.2k
feat(tool): browser search bing engine & app updater #253
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
96f8177
feat(tool): browser search bing engine
ycjcl868 2beaf40
feat(agent-tars): app updater
ycjcl868 ff39293
chore: alpha 3
ycjcl868 456bf4d
fix: build bug
ycjcl868 2c2325f
chore: log
ycjcl868 c097cab
fix: default engine
ycjcl868 fce1443
chore: browser search
ycjcl868 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -69,6 +69,7 @@ export class BrowserSearch { | |
visitedUrls, | ||
excludeDomains, | ||
truncate: options.truncate, | ||
needVisitedUrls: options.needVisitedUrls, | ||
engine, | ||
}), | ||
), | ||
|
@@ -102,6 +103,7 @@ export class BrowserSearch { | |
options: { | ||
query: string; | ||
count?: number; | ||
needVisitedUrls?: boolean; | ||
excludeDomains: string[]; | ||
queue: PromiseQueue; | ||
visitedUrls: Set<string>; | ||
|
@@ -119,11 +121,17 @@ export class BrowserSearch { | |
|
||
let links = await browser.evaluateOnNewPage({ | ||
url, | ||
waitForOptions: { | ||
waitUntil: 'networkidle0', | ||
}, | ||
pageFunction: searchEngine.extractSearchResults, | ||
pageFunctionParams: [], | ||
beforePageLoad: async (page) => { | ||
await interceptRequest(page); | ||
}, | ||
afterPageLoad: async (page) => { | ||
await page.waitForSelector('.b_pag'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 这个是不是会导致 local browser search 只能在 bing 下面工作?baidu 现在现在不 work 了 |
||
}, | ||
}); | ||
|
||
this.logger.info('Fetched links:', links); | ||
|
@@ -143,9 +151,11 @@ export class BrowserSearch { | |
|
||
// Visit each link and extract content | ||
const results = await Promise.allSettled( | ||
links.map((item) => | ||
options.queue.add(() => this.visitLink(this.browser, item)), | ||
), | ||
options.needVisitedUrls | ||
? links.map((item) => | ||
options.queue.add(() => this.visitLink(this.browser, item)), | ||
) | ||
: links, | ||
); | ||
|
||
return results | ||
|
23 changes: 23 additions & 0 deletions
23
packages/agent-infra/search/browser-search/src/engines/get-search-engine.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import { GoogleSearchEngine } from './google-engine'; | ||
import { BingSearchEngine } from './bing-engine'; | ||
import { BaiduSearchEngine } from './baidu-engine'; | ||
import type { SearchEngine, SearchEngineAdapter } from '../types'; | ||
|
||
/** | ||
* Factory function to get the appropriate search engine adapter instance. | ||
* | ||
* @param engine - The search engine identifier ('google', 'bing', or 'baidu') | ||
* @returns An instance of the requested search engine adapter | ||
*/ | ||
export function getSearchEngine(engine: SearchEngine): SearchEngineAdapter { | ||
switch (engine) { | ||
case 'google': | ||
return new GoogleSearchEngine(); | ||
case 'bing': | ||
return new BingSearchEngine(); | ||
case 'baidu': | ||
return new BaiduSearchEngine(); | ||
default: | ||
return new GoogleSearchEngine(); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里还有个 Breaking Change,之前 Browser Search 是采用默认值 networkidle2,现在是 networkidle0,Browser Search 这种场景 networkidle2 应该够用了
Refs:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
试了下 networkidle2 拿不到数据,失败概率比较高