From 6da890e36365241dcec9c21e6a349e92c60cebf8 Mon Sep 17 00:00:00 2001 From: Hk-Gosuto Date: Fri, 15 Sep 2023 00:01:01 +0800 Subject: [PATCH] =?UTF-8?q?revert:=20=E7=A7=BB=E9=99=A4ddg=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BB=A3=E7=90=86=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/langchain-tools/duckduckgo_search.ts | 15 --------------- app/api/langchain/tool/agent/route.ts | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/app/api/langchain-tools/duckduckgo_search.ts b/app/api/langchain-tools/duckduckgo_search.ts index 95e4eaf11..58437d97e 100644 --- a/app/api/langchain-tools/duckduckgo_search.ts +++ b/app/api/langchain-tools/duckduckgo_search.ts @@ -1,9 +1,6 @@ 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'/; @@ -326,15 +323,9 @@ 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(); @@ -464,14 +455,8 @@ function queryString(query: Record) { 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]; diff --git a/app/api/langchain/tool/agent/route.ts b/app/api/langchain/tool/agent/route.ts index 5e8f9a665..0e638ff55 100644 --- a/app/api/langchain/tool/agent/route.ts +++ b/app/api/langchain/tool/agent/route.ts @@ -291,4 +291,4 @@ async function handle(req: NextRequest) { export const GET = handle; export const POST = handle; -export const runtime = process.env.DDG_PROXY_URL ? "nodejs" : "edge"; +export const runtime = "edge";