@react-native-ohos/cookies 6.3.0-rc.2 → 6.3.1-beta.1

package/harmony/rn_cookies/BuildProfile.ets

@@ -1,7 +1,7 @@
 /**
  * Use these variables when you tailor your ArkTS code. They must be of the const type.
  */
-export const HAR_VERSION = '6.3.0-rc.2';
+export const HAR_VERSION = '6.3.1-bate.1';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';
@@ -9,9 +9,9 @@ export const TARGET_NAME = 'default';
 /**
  * BuildProfile Class is used only for compatibility purposes.
  */
-export default class BuildProfile { 
+export default class BuildProfile {
 	static readonly HAR_VERSION = HAR_VERSION;
 	static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
 	static readonly DEBUG = DEBUG;
 	static readonly TARGET_NAME = TARGET_NAME;
-}
+}

package/harmony/rn_cookies/oh-package.json5

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/cookies",
-  "version": "6.3.0-rc.2",
+  "version": "6.3.1-bate.1",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "author": "",

package/harmony/rn_cookies/src/main/ets/CookiesModule.ts

@@ -23,11 +23,7 @@ export interface Cookies {
 export class CookiesModule extends TurboModule {
  clearAll(useWebKit?: boolean): Promise<boolean> {
     try {
-      if (useWebKit) {
-        web_webview.WebCookieManager.clearAllCookies();
-      } else {
-        web_webview.WebCookieManager.clearAllCookiesSync();
-      }
+      web_webview.WebCookieManager.clearAllCookiesSync();
       return new Promise((resolve) => {
         resolve(true);
       });
@@ -40,125 +36,151 @@ export class CookiesModule extends TurboModule {
 
   async get(url: string, useWebKit?: boolean): Promise<Cookies> {
     if ((url === '') || (url === undefined) || (url === null)) {
-      return new Promise((resolve) => {
-        let cookies: Cookies = { 'cookies': {name: 'error', value: 'url有误'} };
-        resolve(cookies);
-      });
+      return Promise.reject(new Error('url is invalid'));
     }
     try {
       let result: string = '';
       if (useWebKit) {
         result = await web_webview.WebCookieManager.fetchCookie(url);
       } else {
-        result =  web_webview.WebCookieManager.fetchCookieSync(url);
+        result = web_webview.WebCookieManager.fetchCookieSync(url);
       }
-      return new Promise((resolve) => {
-        if (result === '') {
-          let cookies: Cookies = { 'cookies': {name: 'error', value: '未查询到cookie'} };
-          resolve(cookies);
-        } else {
-          let queryCookieArray: Array<string> = result.split(';');
-          let cookies: Cookies = {};
-          for (let i = 0 ; i < queryCookieArray.length; i++) {
-            let name = queryCookieArray[i].split('=')[0];
-            let value = queryCookieArray[i].split('=')[1];
-            cookies[name] = { name: name, value: value } as Cookie;
-          }
-          resolve(cookies);
+      if (result === '') {
+        console.warn('未查询到cookie');
+        return {}
+      }
+      const cookies: Cookies = {};
+      const pairs = result.split(';');
+      for (let i = 0; i < pairs.length; i++) {
+        const trimmed = pairs[i].trim();
+        const eqIndex = trimmed.indexOf('=');
+        if (eqIndex <= 0) {
+          continue;
         }
-      });
+        const name = trimmed.substring(0, eqIndex).trim();
+        const value = trimmed.substring(eqIndex + 1);
+        if (name.length === 0) {
+          continue;
+        }
+        cookies[name] = { name: name, value: value } as Cookie;
+      }
+      return cookies;
     } catch (error) {
-      return new Promise((resolve) => {
-        let cookies: Cookies = { 'cookie': {name: 'error', value: JSON.stringify(error)} }
-        resolve(cookies);
-      });
+      return Promise.reject(error);
     }
   }
 
-  isEmpty(value:string) {
+  isEmpty(value: string | undefined): boolean {
     return value == null || value.length === 0;
   }
 
-  async set(url: string, cookie: Cookie, useWebKit?: boolean): Promise<boolean>{
-    try {
+  /**
+   * Build a Set-Cookie value string per RFC 6265 (aligned with Android toRFC6265string):
+   * name=value; expires=...; domain=...; path=...; secure; httponly
+   */
+  buildRFC6265CookieString(url: string, cookie: Cookie): string {
+    const urlMatch = url.match(/^https?:\/\/([^/?#]+)(?:[/?#]|$)/i);
+    if (!urlMatch) {
+      throw new Error('Invalid URL: It may be missing a protocol (ex. http:// or https://).');
+    }
+    const topLevelDomain = urlMatch[1];
+    if (this.isEmpty(topLevelDomain)) {
+      throw new Error('Invalid URL: It may be missing a protocol (ex. http:// or https://).');
+    }
 
-      let cookieBuilder:string =  cookie.name + '=' + cookie.value
-      Object.keys(cookie).forEach((key)=>{
-        if(key !== "name" && key !== "value" && key !== "domain"){
-          cookieBuilder+= `; ${key}=${cookie[key]}`
-        }
-      })
+    let cookieBuilder = `${cookie.name}=${cookie.value}`;
 
-      const topLevelDomain = url.match(/^https?:\/\/([^/?#]+)(?:[/?#]|$)/i)[1];
-      if (cookie.hasOwnProperty("domain") && !this.isEmpty(cookie.domain)) {
-        let domain = cookie.domain;
-        if (domain.startsWith(".")) {
-          domain = domain.substring(1);
-        }
-        if (topLevelDomain !==domain ) {
-          throw new Error(`Cookie URL host ${topLevelDomain} and domain ${domain} mismatched. The cookie won't set correctly.`);
-        }
-        cookieBuilder+=`; domain=${domain}`
-      } else {
-        cookieBuilder +=`; domain=${topLevelDomain}`
+    if (!this.isEmpty(cookie.expires)) {
+      cookieBuilder += `; expires=${cookie.expires}`;
+    }
+
+    let domain: string;
+    if (!this.isEmpty(cookie.domain)) {
+      domain = cookie.domain!;
+      if (domain.startsWith('.')) {
+        domain = domain.substring(1);
+      }
+
+      const isDomainMatch = topLevelDomain === domain || topLevelDomain.endsWith('.' + domain);
+      if (!isDomainMatch) {
+        throw new Error(`Cookie URL host ${topLevelDomain} and domain ${domain} mismatched. The cookie won't set correctly.`);
       }
+    } else {
+      domain = topLevelDomain;
+    }
+    cookieBuilder += `; domain=${domain}`;
+
+    if (!this.isEmpty(cookie.path)) {
+      cookieBuilder += `; path=${cookie.path}`;
+    }
+
+    if (cookie.secure === true) {
+      cookieBuilder += '; secure';
+    }
+
+    if (cookie.httpOnly === true) {
+      cookieBuilder += '; httponly';
+    }
+
+    return cookieBuilder;
+  }
+
+  async set(url: string, cookie: Cookie, useWebKit?: boolean): Promise<boolean> {
+    try {
+      const cookieString = this.buildRFC6265CookieString(url, cookie);
       if (useWebKit) {
-        await web_webview.WebCookieManager.configCookie(url, cookieBuilder);
+        await web_webview.WebCookieManager.configCookie(url, cookieString);
       } else {
-        web_webview.WebCookieManager.configCookieSync(url, cookieBuilder,false);
+        web_webview.WebCookieManager.configCookieSync(url, cookieString, false);
       }
-      return new Promise((resolve) => {
-        resolve(true);
-      });
-    } catch(error) {
-      return new Promise((resolve) => {
-        resolve(false);
-      });
+      return Promise.resolve(true);
+    } catch (error) {
+      console.warn('set() failed:', error);
+      return Promise.resolve(false);
     }
   }
 
-  async clearByName(url: string, name: string, useWebKit?: boolean): Promise<boolean>{
-    if ((url === '') || (url === undefined) || (url === null)) {
-      return new Promise((resolve) => {
-        resolve(false);
-      });
+  async clearByName(url: string, name: string, useWebKit?: boolean): Promise<boolean> {
+    if (this.isEmpty(url) || this.isEmpty(name)) {
+      return Promise.resolve(false);
     }
     try {
-      let cookieExist = false;
-      let cookieStr: string = '';
-      let cookies: Array<string> = [];
+      let cookieStr = '';
       if (useWebKit) {
-         cookieStr = await web_webview.WebCookieManager.fetchCookie(url);
+        cookieStr = await web_webview.WebCookieManager.fetchCookie(url);
       } else {
         cookieStr = web_webview.WebCookieManager.fetchCookieSync(url);
       }
-      cookies = cookieStr.split(';');
-      for (let i = 0 ; i < cookies.length; i++) {
-        if (cookies[i].split('=')[0].trim() === name) {
-          cookieExist = true;
-          cookies.splice(i, 1);
+
+      const cookieExist = cookieStr.split(';').some((pair) => {
+        const trimmed = pair.trim();
+        const eqIndex = trimmed.indexOf('=');
+        if (eqIndex <= 0) {
+          return false;
         }
-      }
+        return trimmed.substring(0, eqIndex).trim() === name;
+      });
+
       if (!cookieExist) {
-        return new Promise((resolve) => {
-          resolve(true);
-        });
+        return Promise.resolve(true);
       }
+
+      // Delete by overwriting with an expired cookie (RFC 6265). Omit path so the platform derives it from the URL.
+      const expiredCookieString = this.buildRFC6265CookieString(url, {
+        name: name,
+        value: '',
+        expires: 'Thu, 01 Jan 1970 00:00:00 GMT',
+      });
+
       if (useWebKit) {
-        await web_webview.WebCookieManager.clearAllCookies();
+        await web_webview.WebCookieManager.configCookie(url, expiredCookieString);
       } else {
-        web_webview.WebCookieManager.clearAllCookiesSync();
+        web_webview.WebCookieManager.configCookieSync(url, expiredCookieString, false);
       }
-      cookies.forEach((item) => {
-        web_webview.WebCookieManager.configCookie(url, item);
-      })
-      return new Promise((resolve) => {
-        resolve(true);
-      });
-    } catch(error) {
-      return new Promise((resolve) => {
-        resolve(false);
-      });
+      return Promise.resolve(true);
+    } catch (error) {
+      console.warn('clearByName() failed:', error);
+      return Promise.resolve(false);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/cookies",
-  "version": "6.3.0-rc.2",
+  "version": "6.3.1-beta.1",
   "description": "Cookie Manager for React Native",
   "repository": {
     "type": "git",
@@ -52,4 +52,4 @@
   "harmony": {
     "alias": "@react-native-cookies/cookies"
   }
-}
+}