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

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

@@ -1,177 +1,199 @@
-// Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
-// Use of this source code is governed by a Apache-2.0 license that can be
-// found in the LICENSE file.
-
-import { TurboModule } from '@rnoh/react-native-openharmony/ts';
-import web_webview from '@ohos.web.webview';
-
-export interface Cookie {
-  name: string;
-  value: string;
-  path?: string;
-  domain?: string;
-  version?: string;
-  expires?: string;
-  secure?: boolean;
-  httpOnly?: boolean;
-}
-
-export interface Cookies {
-  [key: string]: Cookie;
-}
-
-export class CookiesModule extends TurboModule {
- clearAll(useWebKit?: boolean): Promise<boolean> {
-    try {
-      if (useWebKit) {
-        web_webview.WebCookieManager.clearAllCookies();
-      } else {
-        web_webview.WebCookieManager.clearAllCookiesSync();
-      }
-      return new Promise((resolve) => {
-        resolve(true);
-      });
-    } catch (error) {
-      return new Promise((resolve) => {
-        resolve(false);
-      });
-    }
-  }
-
-  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);
-      });
-    }
-    try {
-      let result: string = '';
-      if (useWebKit) {
-        result = await web_webview.WebCookieManager.fetchCookie(url);
-      } else {
-        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);
-        }
-      });
-    } catch (error) {
-      return new Promise((resolve) => {
-        let cookies: Cookies = { 'cookie': {name: 'error', value: JSON.stringify(error)} }
-        resolve(cookies);
-      });
-    }
-  }
-
-  isEmpty(value:string) {
-    return value == null || value.length === 0;
-  }
-
-  async set(url: string, cookie: Cookie, useWebKit?: boolean): Promise<boolean>{
-    try {
-
-      let cookieBuilder:string =  cookie.name + '=' + cookie.value
-      Object.keys(cookie).forEach((key)=>{
-        if(key !== "name" && key !== "value" && key !== "domain"){
-          cookieBuilder+= `; ${key}=${cookie[key]}`
-        }
-      })
-
-      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 (useWebKit) {
-        await web_webview.WebCookieManager.configCookie(url, cookieBuilder);
-      } else {
-        web_webview.WebCookieManager.configCookieSync(url, cookieBuilder,false);
-      }
-      return new Promise((resolve) => {
-        resolve(true);
-      });
-    } catch(error) {
-      return new Promise((resolve) => {
-        resolve(false);
-      });
-    }
-  }
-
-  async clearByName(url: string, name: string, useWebKit?: boolean): Promise<boolean>{
-    if ((url === '') || (url === undefined) || (url === null)) {
-      return new Promise((resolve) => {
-        resolve(false);
-      });
-    }
-    try {
-      let cookieExist = false;
-      let cookieStr: string = '';
-      let cookies: Array<string> = [];
-      if (useWebKit) {
-         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);
-        }
-      }
-      if (!cookieExist) {
-        return new Promise((resolve) => {
-          resolve(true);
-        });
-      }
-      if (useWebKit) {
-        await web_webview.WebCookieManager.clearAllCookies();
-      } else {
-        web_webview.WebCookieManager.clearAllCookiesSync();
-      }
-      cookies.forEach((item) => {
-        web_webview.WebCookieManager.configCookie(url, item);
-      })
-      return new Promise((resolve) => {
-        resolve(true);
-      });
-    } catch(error) {
-      return new Promise((resolve) => {
-        resolve(false);
-      });
-    }
-  }
-
-  removeSessionCookies(): Promise<boolean>{
-    try {
-      web_webview.WebCookieManager.clearSessionCookieSync();
-      return new Promise((resolve) => {
-        resolve(true);
-      });
-    } catch(error) {
-      return new Promise((resolve) => {
-        resolve(false);
-      });
-    }
-  }
-}
+// Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
+
+import { TurboModule } from '@rnoh/react-native-openharmony/ts';
+import web_webview from '@ohos.web.webview';
+
+export interface Cookie {
+  name: string;
+  value: string;
+  path?: string;
+  domain?: string;
+  version?: string;
+  expires?: string;
+  secure?: boolean;
+  httpOnly?: boolean;
+}
+
+export interface Cookies {
+  [key: string]: Cookie;
+}
+
+export class CookiesModule extends TurboModule {
+ clearAll(useWebKit?: boolean): Promise<boolean> {
+    try {
+      web_webview.WebCookieManager.clearAllCookiesSync();
+      return new Promise((resolve) => {
+        resolve(true);
+      });
+    } catch (error) {
+      return new Promise((resolve) => {
+        resolve(false);
+      });
+    }
+  }
+
+  async get(url: string, useWebKit?: boolean): Promise<Cookies> {
+    if ((url === '') || (url === undefined) || (url === null)) {
+      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);
+      }
+      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 Promise.reject(error);
+    }
+  }
+
+  isEmpty(value: string | undefined): boolean {
+    return value == null || value.length === 0;
+  }
+
+  /**
+   * 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 = `${cookie.name}=${cookie.value}`;
+
+    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, cookieString);
+      } else {
+        web_webview.WebCookieManager.configCookieSync(url, cookieString, 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 (this.isEmpty(url) || this.isEmpty(name)) {
+      return Promise.resolve(false);
+    }
+    try {
+      let cookieStr = '';
+      if (useWebKit) {
+        cookieStr = await web_webview.WebCookieManager.fetchCookie(url);
+      } else {
+        cookieStr = web_webview.WebCookieManager.fetchCookieSync(url);
+      }
+
+      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 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.configCookie(url, expiredCookieString);
+      } else {
+        web_webview.WebCookieManager.configCookieSync(url, expiredCookieString, false);
+      }
+      return Promise.resolve(true);
+    } catch (error) {
+      console.warn('clearByName() failed:', error);
+      return Promise.resolve(false);
+    }
+  }
+
+  removeSessionCookies(): Promise<boolean>{
+    try {
+      web_webview.WebCookieManager.clearSessionCookieSync();
+      return new Promise((resolve) => {
+        resolve(true);
+      });
+    } catch(error) {
+      return new Promise((resolve) => {
+        resolve(false);
+      });
+    }
+  }
+}

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

@@ -1,26 +1,26 @@
-// Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
-// Use of this source code is governed by a Apache-2.0 license that can be
-// found in the LICENSE file.
-
-import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
-import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
-import { CookiesModule } from './CookiesModule';
-
-class CookiesModulesFactory extends TurboModulesFactory {
-  createTurboModule(name: string): TurboModule | null {
-    if (name === 'RTNCookies') {
-      return new CookiesModule(this.ctx)
-    }
-    return null;
-  }
-
-  hasTurboModule(name: string): boolean {
-    return name === 'RTNCookies';
-  }
-}
-
-export class CookiesPackage extends RNPackage {
-  createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
-    return new CookiesModulesFactory(ctx);
-  }
-}
+// Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+// Use of this source code is governed by a Apache-2.0 license that can be
+// found in the LICENSE file.
+
+import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
+import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
+import { CookiesModule } from './CookiesModule';
+
+class CookiesModulesFactory extends TurboModulesFactory {
+  createTurboModule(name: string): TurboModule | null {
+    if (name === 'RTNCookies') {
+      return new CookiesModule(this.ctx)
+    }
+    return null;
+  }
+
+  hasTurboModule(name: string): boolean {
+    return name === 'RTNCookies';
+  }
+}
+
+export class CookiesPackage extends RNPackage {
+  createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
+    return new CookiesModulesFactory(ctx);
+  }
+}

package/harmony/rn_cookies/src/main/ets/Logger.ets

@@ -1,64 +1,64 @@
-/**
- * MIT License
- *
- * Copyright (C) 2024 Huawei Device Co., Ltd.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import hilog from '@ohos.hilog';
-
-class Logger {
-  private domain: number;
-  private prefix: string;
-  private format: string = '%{public}s, %{public}s';
-  private isDebug: boolean;
-
-  /**
-   * constructor.
-   *
-   * @param Prefix Identifies the log tag.
-   * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF.
-   */
-  constructor(prefix: string = 'RNCookies', domain: number = 0xFF00, isDebug = false) {
-    this.prefix = prefix;
-    this.domain = domain;
-    this.isDebug = isDebug;
-  }
-
-  debug(...args: string[]): void {
-    if (this.isDebug) {
-      hilog.debug(this.domain, this.prefix, this.format, args);
-    }
-  }
-
-  info(...args: string[]): void {
-    hilog.info(this.domain, this.prefix, this.format, args);
-  }
-
-  warn(...args: string[]): void {
-    hilog.warn(this.domain, this.prefix, this.format, args);
-  }
-
-  error(...args: string[]): void {
-    hilog.error(this.domain, this.prefix, this.format, args);
-  }
-}
-
+/**
+ * MIT License
+ *
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import hilog from '@ohos.hilog';
+
+class Logger {
+  private domain: number;
+  private prefix: string;
+  private format: string = '%{public}s, %{public}s';
+  private isDebug: boolean;
+
+  /**
+   * constructor.
+   *
+   * @param Prefix Identifies the log tag.
+   * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF.
+   */
+  constructor(prefix: string = 'RNCookies', domain: number = 0xFF00, isDebug = false) {
+    this.prefix = prefix;
+    this.domain = domain;
+    this.isDebug = isDebug;
+  }
+
+  debug(...args: string[]): void {
+    if (this.isDebug) {
+      hilog.debug(this.domain, this.prefix, this.format, args);
+    }
+  }
+
+  info(...args: string[]): void {
+    hilog.info(this.domain, this.prefix, this.format, args);
+  }
+
+  warn(...args: string[]): void {
+    hilog.warn(this.domain, this.prefix, this.format, args);
+  }
+
+  error(...args: string[]): void {
+    hilog.error(this.domain, this.prefix, this.format, args);
+  }
+}
+
 export default new Logger('RNCookies', 0xFF00, false)

package/harmony/rn_cookies/src/main/ets/generated/components/ts.ts

@@ -1,5 +1,5 @@
-
-/**
- */
-
-export {}
+
+/**
+ */
+
+export {}

package/harmony/rn_cookies/src/main/ets/generated/index.ets

@@ -1,5 +1,5 @@
-/**
- * This code was generated by "react-native codegen-lib-harmony"
- */
-
-export * from "./ts"
+/**
+ * This code was generated by "react-native codegen-lib-harmony"
+ */
+
+export * from "./ts"

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

@@ -1,6 +1,6 @@
-/**
- * This code was generated by "react-native codegen-lib-harmony"
- */
-
-export * as RNC from "./components/ts"
-export * as TM from "./turboModules/ts"
+/**
+ * This code was generated by "react-native codegen-lib-harmony"
+ */
+
+export * as RNC from "./components/ts"
+export * as TM from "./turboModules/ts"

package/harmony/rn_cookies/src/main/ets/generated/turboModules/RTNCookies.ts

@@ -1,26 +1,26 @@
-/**
- * This code was generated by "react-native codegen-lib-harmony"
- */
-
-import { Tag } from "@rnoh/react-native-openharmony/ts"
-
-export namespace RTNCookies {
-  export const NAME = 'RTNCookies' as const
-
-  export type Cookie = {name: string, value: string, path?: string, domain?: string, version?: string, expires?: string, secure?: boolean, httpOnly?: boolean}
-  
-  export interface Spec {
-    clearAll(useWebKit: boolean): Promise<boolean>;
-  
-    get(url: string, useWebKit: boolean): Promise<void>;
-  
-    set(url: string, cookie: Cookie, useWebKit: boolean): Promise<boolean>;
-  
-    clearByName(url: string, name: string, useWebKit: boolean): Promise<boolean>;
-  
-    flush(): Promise<boolean>;
-  
-    removeSessionCookies(): Promise<boolean>;
-  
-  }
-}
+/**
+ * This code was generated by "react-native codegen-lib-harmony"
+ */
+
+import { Tag } from "@rnoh/react-native-openharmony/ts"
+
+export namespace RTNCookies {
+  export const NAME = 'RTNCookies' as const
+
+  export type Cookie = {name: string, value: string, path?: string, domain?: string, version?: string, expires?: string, secure?: boolean, httpOnly?: boolean}
+  
+  export interface Spec {
+    clearAll(useWebKit: boolean): Promise<boolean>;
+  
+    get(url: string, useWebKit: boolean): Promise<void>;
+  
+    set(url: string, cookie: Cookie, useWebKit: boolean): Promise<boolean>;
+  
+    clearByName(url: string, name: string, useWebKit: boolean): Promise<boolean>;
+  
+    flush(): Promise<boolean>;
+  
+    removeSessionCookies(): Promise<boolean>;
+  
+  }
+}