From 06a431c3c8e0901936051a7721f937583fd7d729 Mon Sep 17 00:00:00 2001
From: anjiaqi <anjiaqi4@huawei.com>
Date: Tue, 22 Jul 2025 17:46:05 +0800
Subject: [PATCH] Overload in communication_netstack on 0702

Issue:
https://gitee.com/openharmony/interface_sdk-js/issues/ICNPRN

Signed-off-by: anjiaqi <anjiaqi4@huawei.com>
Change-Id: I5bef205de85d304d6bf4535bc0a4d4b5f8d46b5f
---
 .../ets/ani/http/ets/@ohos.net.http.ets       | 27 ++++++++++++-------
 .../web_socket/ets/@ohos.net.webSocket.d.ets  | 24 ++++++++++-------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/frameworks/ets/ani/http/ets/@ohos.net.http.ets b/frameworks/ets/ani/http/ets/@ohos.net.http.ets
index 6ec5aac9b..c31f78d6b 100644
--- a/frameworks/ets/ani/http/ets/@ohos.net.http.ets
+++ b/frameworks/ets/ani/http/ets/@ohos.net.http.ets
@@ -184,11 +184,16 @@ export default namespace http {
 
     request(url: string, options?: HttpRequestOptions): Promise<HttpResponse>;
 
-    requestInStream(url: string, callback: AsyncCallback<int>): void;
+    requestInStreamWithCallback(url: string, callback: AsyncCallback<int>): void;
 
-    requestInStream(url: string, options: HttpRequestOptions, callback: AsyncCallback<int>): void;
+    requestInStreamWithOptionCallback(url: string, options: HttpRequestOptions, callback: AsyncCallback<int>): void;
 
-    requestInStream(url: string, options?: HttpRequestOptions): Promise<int>;
+    requestInStreamWithOptionsReturnsPromise(url: string, options?: HttpRequestOptions): Promise<int>;
+
+    overload requestInStream {
+      requestInStreamWithCallback,
+      requestInStreamWithOptionCallback,
+      requestInStreamWithOptionsReturnsPromise };
 
     destroy(): void;
 
@@ -242,15 +247,15 @@ export default namespace http {
 
     native requestInStreamInner(url: string, callback: AsyncCallback<int>, options?: HttpRequestOptions): void;
 
-    requestInStream(url: string, callback: AsyncCallback<int>): void {
+    requestInStreamWithCallback(url: string, callback: AsyncCallback<int>): void {
       this.requestInStreamInner(url, callback);
     }
 
-    requestInStream(url: string, options: HttpRequestOptions, callback: AsyncCallback<int>): void {
+    requestInStreamWithOptionCallback(url: string, options: HttpRequestOptions, callback: AsyncCallback<int>): void {
       this.requestInStreamInner(url, callback, options);
     }
 
-    requestInStream(url: string, options?: HttpRequestOptions): Promise<int> {
+    requestInStreamWithOptionsReturnsPromise(url: string, options?: HttpRequestOptions): Promise<int> {
       return new Promise<int>((resolve, reject) => {
         this.requestInStreamInner(url, (err: BusinessError | null, data: int | undefined) => {
           if (err) {
@@ -535,9 +540,11 @@ export default namespace http {
 
     flush(): Promise<void>;
 
-    delete(callback: AsyncCallback<void>): void;
+    deleteWithCallback(callback: AsyncCallback<void>): void;
 
-    delete(): Promise<void>;
+    deleteReturnsPromise(): Promise<void>;
+    
+    overload delete { deleteWithCallback, deleteReturnsPromise };
   }
 
   export class HttpResponseCacheInner implements HttpResponseCache {
@@ -585,7 +592,7 @@ export default namespace http {
 
     native deleteSync():void;
 
-    delete(callback: AsyncCallback<void>): void {
+    deleteWithCallback(callback: AsyncCallback<void>): void {
       let p1 = taskpool.execute((): undefined => {
          return this.deleteSync();
       })
@@ -596,7 +603,7 @@ export default namespace http {
       });
     }
 
-    delete(): Promise<void> {
+    deleteReturnsPromise(): Promise<void> {
       return new Promise<void>((resolve, reject) => {
         taskpool.execute((): undefined => {
           return this.deleteSync();
diff --git a/frameworks/ets/ani/web_socket/ets/@ohos.net.webSocket.d.ets b/frameworks/ets/ani/web_socket/ets/@ohos.net.webSocket.d.ets
index 3a7492186..c4c595c18 100644
--- a/frameworks/ets/ani/web_socket/ets/@ohos.net.webSocket.d.ets
+++ b/frameworks/ets/ani/web_socket/ets/@ohos.net.webSocket.d.ets
@@ -73,15 +73,19 @@ export default namespace webSocket {
   // }
 
   export interface WebSocket {
-    connect(url: string, callback: AsyncCallback<boolean>): void;
+    connectWithCallback(url: string, callback: AsyncCallback<boolean>): void;
 
-    connect(url: string, options: WebSocketRequestOptions, callback: AsyncCallback<boolean>): void;
+    connectWithOptionsCallback(url: string, options: WebSocketRequestOptions, callback: AsyncCallback<boolean>): void;
 
-    connect(url: string, options?: WebSocketRequestOptions): Promise<boolean>;
+    connectWithOptionsReturnsPromise(url: string, options?: WebSocketRequestOptions): Promise<boolean>;
 
-    send(data: string | ArrayBuffer, callback: AsyncCallback<boolean>): void;
+    overload connect { connectWithCallback, connectWithOptionsCallback, connectWithOptionsReturnsPromise };
 
-    send(data: string | ArrayBuffer): Promise<boolean>;
+    sendWithCallback(data: string | ArrayBuffer, callback: AsyncCallback<boolean>): void;
+
+    sendReturnsPromise(data: string | ArrayBuffer): Promise<boolean>;
+
+    overload send { sendWithCallback, sendReturnsPromise };
 
     close(callback: AsyncCallback<boolean>): void;
 
@@ -135,7 +139,7 @@ export default namespace webSocket {
 
     native connectSync(url: string, options?: WebSocketRequestOptions): boolean;
 
-    connect(url: string, callback: AsyncCallback<boolean>): void {
+    connectWithCallback(url: string, callback: AsyncCallback<boolean>): void {
       let p1 = taskpool.execute((): boolean => {
         return this.connectSync(url);
       })
@@ -146,7 +150,7 @@ export default namespace webSocket {
       });
     }
 
-    connect(url: string, options: WebSocketRequestOptions, callback: AsyncCallback<boolean>): void {
+    connectWithOptionsCallback(url: string, options: WebSocketRequestOptions, callback: AsyncCallback<boolean>): void {
       let p1 = taskpool.execute((): boolean => {
         return this.connectSync(url, options);
       })
@@ -157,7 +161,7 @@ export default namespace webSocket {
       });
     }
 
-    connect(url: string, options?: WebSocketRequestOptions): Promise<boolean> {
+    connectWithOptionsReturnsPromise(url: string, options?: WebSocketRequestOptions): Promise<boolean> {
       return new Promise<boolean>((resolve, reject) => {
       taskpool.execute((): boolean => {
           return this.connectSync(url, options);
@@ -171,7 +175,7 @@ export default namespace webSocket {
 
     native sendSync(data: string | ArrayBuffer): boolean;
 
-    send(data: string | ArrayBuffer, callback: AsyncCallback<boolean>): void {
+    sendWithCallback(data: string | ArrayBuffer, callback: AsyncCallback<boolean>): void {
       let p1 = taskpool.execute((): boolean => {
         return this.sendSync(data);
       })
@@ -182,7 +186,7 @@ export default namespace webSocket {
       });
     }
 
-    send(data: string | ArrayBuffer): Promise<boolean> {
+    sendReturnsPromise(data: string | ArrayBuffer): Promise<boolean> {
       return new Promise<boolean>((resolve, reject) => {
       taskpool.execute((): boolean => {
           return this.sendSync(data);
-- 
Gitee