GithubProxy/ChatGPT-Next-Web
1
0
Fork 1
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-05-24 06:30:16 +09:00
Code Issues Packages Projects Releases Wiki Activity

feat: ddg插件支持单独配置http代理

Browse Source
This commit is contained in:
Hk-Gosuto 2023-09-12 13:02:41 +08:00
parent c7ded1024a
commit 1e8068436f
4 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/api/langchain-tools/duckduckgo_search.ts
View File

@ -1,6 +1,9 @@
import { decode } from "html-entities";
import { convert as htmlToText } from "html-to-text";
import { Tool } from "langchain/tools";
import fetch from "node-fetch";
const DDG_PROXY_URL = process.env.DDG_PROXY_URL;
const SEARCH_REGEX =
/DDG\.pageLayout\.load\('d',(\[.+\])\);DDG\.duckbar\.load\('images'/;
@ -323,9 +326,15 @@ async function search(
// cdrexp: 'b'
}),
};
let proxyAgent;
if (DDG_PROXY_URL) {
const { HttpsProxyAgent } = require("https-proxy-agent");
proxyAgent = new HttpsProxyAgent(DDG_PROXY_URL);
}
const response = await fetch(
`https://links.duckduckgo.com/d.js?${queryString(queryObject)}`,
{ agent: proxyAgent },
);
const data = await response.text();
@ -455,8 +464,14 @@ function queryString(query: Record<string, string>) {
async function getVQD(query: string, ia = "web") {
try {
let proxyAgent;
if (DDG_PROXY_URL) {
const { HttpsProxyAgent } = require("https-proxy-agent");
proxyAgent = new HttpsProxyAgent(DDG_PROXY_URL);
}
const response = await fetch(
`https://duckduckgo.com/?${queryString({ q: query, ia })}`,
{ agent: proxyAgent },
);
const data = await response.text();
return VQD_REGEX.exec(data)![1];

5
app/api/langchain/tool/agent/route.ts
View File

@ -181,7 +181,8 @@ async function handle(req: NextRequest) {
description: bingSearchTool.description,
func: async (input: string) => bingSearchTool.call(input),
});
} else if (process.env.SERPAPI_API_KEY) {
}
if (process.env.SERPAPI_API_KEY) {
let serpAPITool = new langchainTools["SerpAPI"](
process.env.SERPAPI_API_KEY,
);
@ -290,4 +291,4 @@ async function handle(req: NextRequest) {
export const GET = handle;
export const POST = handle;
export const runtime = "edge";
export const runtime = process.env.DDG_PROXY_URL ? "nodejs" : "edge";

1
package.json
View File

@ -28,6 +28,7 @@
"html-entities": "^2.4.0",
"html-to-image": "^1.11.11",
"html-to-text": "^9.0.5",
"https-proxy-agent": "^7.0.2",
"langchain": "^0.0.114",
"mermaid": "^10.3.1",
"nanoid": "^4.0.2",

29
yarn.lock
View File

@ -1828,6 +1828,13 @@ acorn@^8.9.0:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
agent-base@^7.0.2:
version "7.1.0"
resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.0.tgz#536802b76bc0b34aa50195eb2442276d613e3434"
integrity sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==
dependencies:
debug "^4.3.4"
agentkeepalive@^4.2.1:
version "4.5.0"
resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
@ -2770,6 +2777,13 @@ dayjs@^1.11.7:
resolved "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2"
integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
version "4.3.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
dependencies:
ms "2.1.2"
debug@^3.2.6, debug@^3.2.7:
version "3.2.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@ -2777,13 +2791,6 @@ debug@^3.2.6, debug@^3.2.7:
dependencies:
ms "^2.1.1"
debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
version "4.3.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
dependencies:
ms "2.1.2"
decamelize@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@ -3914,6 +3921,14 @@ htmlparser2@^8.0.1, htmlparser2@^8.0.2:
domutils "^3.0.1"
entities "^4.4.0"
https-proxy-agent@^7.0.2:
version "7.0.2"
resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==
dependencies:
agent-base "^7.0.2"
debug "4"
human-signals@^4.3.0:
version "4.3.1"
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2"