diff --git a/src/libcurl.ts b/src/libcurl.ts index 33717a7..9dc26a0 100644 --- a/src/libcurl.ts +++ b/src/libcurl.ts @@ -626,16 +626,16 @@ export class LibCurl { ); } - /** - * 设置h2 stream_id - * @param stream_id - */ - public setHttp2NextStreamId(stream_id: number): void { - if (stream_id < 1 || stream_id % 2 == 0) { - throw new LibCurlError("stream_id error"); - } - this.m_libCurl_impl_.setHttp2NextStreamId(stream_id); - } + // /** + // * 设置h2 stream_id + // * @param stream_id + // */ + // public setHttp2NextStreamId(stream_id: number): void { + // if (stream_id < 1 || stream_id % 2 == 0) { + // throw new LibCurlError("stream_id error"); + // } + // this.m_libCurl_impl_.setHttp2NextStreamId(stream_id); + // } /** * 设置h2 weight diff --git a/src/libcurl/bao_curl.cpp b/src/libcurl/bao_curl.cpp index fa9596b..4c28c5a 100644 --- a/src/libcurl/bao_curl.cpp +++ b/src/libcurl/bao_curl.cpp @@ -58,7 +58,7 @@ void BaoCurl::init() CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1)); CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_COOKIEFILE, NULL)); CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_PRIVATE, this)); - setHttp2NextStreamId(1); + // setHttp2NextStreamId(1); this->setTimeout(15, 15); } @@ -374,10 +374,10 @@ void BaoCurl::setOnPublishCallback(BaoCurlOnPublishCallback callback) this->m_publishCallback = callback; } -void BaoCurl::setHttp2NextStreamId(int stream_id) -{ - CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_HTTP2_STREAM_ID, stream_id)); -} +// void BaoCurl::setHttp2NextStreamId(int stream_id) +// { +// CHECK_CURLOK(curl_easy_setopt(this->m_pCURL, CURLOPT_HTTP2_STREAM_ID, stream_id)); +// } void BaoCurl::setHttp2StreamWeight(int weight) { diff --git a/src/libcurl/bao_curl_node_addon.cpp b/src/libcurl/bao_curl_node_addon.cpp index 9e6df76..9a52168 100644 --- a/src/libcurl/bao_curl_node_addon.cpp +++ b/src/libcurl/bao_curl_node_addon.cpp @@ -35,7 +35,7 @@ class BaoLibCurlWarp : public Napi::ObjectWrap Napi::Value setInterface(const Napi::CallbackInfo &info); Napi::Value setJA3Fingerprint(const Napi::CallbackInfo &info); Napi::Value setAkamaiFingerprint(const Napi::CallbackInfo &info); - Napi::Value setHttp2NextStreamId(const Napi::CallbackInfo &info); + // Napi::Value setHttp2NextStreamId(const Napi::CallbackInfo &info); Napi::Value setHttp2StreamWeight(const Napi::CallbackInfo &info); Napi::Value sendAsync(const Napi::CallbackInfo &info); Napi::Value getResponseBody(const Napi::CallbackInfo &info); @@ -284,7 +284,7 @@ Napi::Object BaoLibCurlWarp::Init(Napi::Env env, Napi::Object exports) InstanceMethod<&BaoLibCurlWarp::setInterface>("setInterface", static_cast(napi_writable | napi_configurable)), InstanceMethod<&BaoLibCurlWarp::setJA3Fingerprint>("setJA3Fingerprint", static_cast(napi_writable | napi_configurable)), InstanceMethod<&BaoLibCurlWarp::setAkamaiFingerprint>("setAkamaiFingerprint", static_cast(napi_writable | napi_configurable)), - InstanceMethod<&BaoLibCurlWarp::setHttp2NextStreamId>("setHttp2NextStreamId", static_cast(napi_writable | napi_configurable)), + // InstanceMethod<&BaoLibCurlWarp::setHttp2NextStreamId>("setHttp2NextStreamId", static_cast(napi_writable | napi_configurable)), InstanceMethod<&BaoLibCurlWarp::setHttp2StreamWeight>("setHttp2StreamWeight", static_cast(napi_writable | napi_configurable)), StaticMethod<&BaoLibCurlWarp::globalInit>("globalInit", static_cast(napi_writable | napi_configurable)), StaticMethod<&BaoLibCurlWarp::globalCleanup>("globalCleanup", static_cast(napi_writable | napi_configurable)), @@ -758,19 +758,19 @@ Napi::Value BaoLibCurlWarp::getResponseString(const Napi::CallbackInfo &info) return Napi::String::New(env, this->m_curl.getResponseBody()); } -/* - setHttp2NextStreamId(number) -*/ -Napi::Value BaoLibCurlWarp::setHttp2NextStreamId(const Napi::CallbackInfo &info) -{ - Napi::Env env = info.Env(); - size_t argsLen = info.Length(); - REQUEST_TLS_METHOD_ARGS_CHECK(env, "BaoCurl", "setHttp2NextStreamId", 1, argsLen); - REQUEST_TLS_METHOD_CHECK(env, info[0].IsNumber(), "argument 0 is not a number") - int stream_id = info[0].As().Int32Value(); - this->m_curl.setHttp2NextStreamId(stream_id); - return env.Undefined(); -} +// /* +// setHttp2NextStreamId(number) +// */ +// Napi::Value BaoLibCurlWarp::setHttp2NextStreamId(const Napi::CallbackInfo &info) +// { +// Napi::Env env = info.Env(); +// size_t argsLen = info.Length(); +// REQUEST_TLS_METHOD_ARGS_CHECK(env, "BaoCurl", "setHttp2NextStreamId", 1, argsLen); +// REQUEST_TLS_METHOD_CHECK(env, info[0].IsNumber(), "argument 0 is not a number") +// int stream_id = info[0].As().Int32Value(); +// this->m_curl.setHttp2NextStreamId(stream_id); +// return env.Undefined(); +// } /* setHttp2StreamWeight(number) diff --git a/src/requests.ts b/src/requests.ts index 72a77f3..bffdf9a 100644 --- a/src/requests.ts +++ b/src/requests.ts @@ -142,7 +142,7 @@ interface requestsOption { httpVersion?: requestsHttpVersionInfo; h2config?: { weight: number; - streamId: number; + // streamId: number; } } @@ -371,7 +371,7 @@ export class requests { } if (h2config) { - curl.setHttp2NextStreamId(h2config.streamId); + // curl.setHttp2NextStreamId(h2config.streamId); curl.setHttp2StreamWeight(h2config.weight); }