rewrite cookie endpoints: deleteCookies & clearCookies and fix clearCookies

README.md

@@ -167,8 +167,8 @@ const chromeless = new Chromeless({
 - [`cookiesSet(name: string, value: string)`](docs/api.md#api-cookiesset)
 - [`cookiesSet(cookie: Cookie)`](docs/api.md#api-cookiesset-one)
 - [`cookiesSet(cookies: Cookie[])`](docs/api.md#api-cookiesset-many)
-- [`cookiesClear(name: string)`](docs/api.md#api-cookiesclear)
-- [`cookiesClearAll()`](docs/api.md#api-cookiesclearall)
+- [`deleteCookies(name: string)`](docs/api.md#api-deletecookies)
+- [`clearCookies()`](docs/api.md#api-clearcookies)
 - [`clearInput(selector: string)`](docs/api.md#api-clearInput)
 
 ## Configuring Development Environment

docs/api.md

@@ -36,8 +36,8 @@ Chromeless provides TypeScript typings.
 - [`cookiesSet(name: string, value: string)`](#api-cookiesset)
 - [`cookiesSet(cookie: Cookie)`](#api-cookiesset-one)
 - [`cookiesSet(cookies: Cookie[])`](#api-cookiesset-many)
-- [`cookiesClear(name: string)`](#api-cookiesclear)
-- [`cookiesClearAll()`](#api-cookiesclearall)
+- [`deleteCookies(name: string)`](#api-deletecookies)
+- [`clearCookies()`](#api-clearcookies)
 
 
 ---------------------------------------
@@ -589,25 +589,33 @@ await chromeless.cookiesSet([
 
 ---------------------------------------
 
-<a name="api-cookiesclear" />
+<a name="api-deletecookies" />
 
-### cookiesClear(name: string) - Not implemented yet
+### deleteCookies(name: string) - Not implemented yet
 
-Not implemented yet
+Delete a specific cookie.
 
----------------------------------------
+__Arguments__
+- `name` - name of the cookie
+
+__Example__
 
-<a name="api-cookiesclearall" />
+```js
+await chromeless.deleteCookies('cookieName')
+```
+
+---------------------------------------
 
-### cookiesClearAll(): Chromeless<T>
+<a name="api-clearcookies" />
 
-Clears browser cookies.
+### clearCookies(): Chromeless<T>
 
+Clears all browser cookies.
 
 __Example__
 
 ```js
-await chromeless.cookiesClearAll()
+await chromeless.clearCookies()
 ```
 ---------------------------------------
 

src/api.ts

@@ -266,12 +266,20 @@ export default class Chromeless<T extends any> implements Promise<T> {
     return this
   }
 
-  cookiesClear(name: string): Chromeless<T> {
-    throw new Error('Not implemented yet')
+  deleteCookies(name: string, url: string): Chromeless<T> {
+    if (typeof name === 'undefined') {
+      throw new Error('Cookie name should be defined.')
+    }
+    if (typeof url === 'undefined') {
+      throw new Error('Cookie url should be defined.')
+    }
+    this.queue.enqueue({type: 'deleteCookies', name, url})
+
+    return this
   }
 
-  cookiesClearAll(): Chromeless<T> {
-    this.queue.enqueue({ type: 'cookiesClearAll' })
+  clearCookies(): Chromeless<T> {
+    this.queue.enqueue({type: 'clearCookies'})
 
     return this
   }

src/chrome/local-runtime.ts

@@ -25,6 +25,7 @@ import {
   press,
   setViewport,
   clearCookies,
+  deleteCookie,
   getCookies,
   setCookies,
   getAllCookies,
@@ -82,10 +83,12 @@ export default class LocalRuntime {
         return this.press(command.keyCode, command.count, command.modifiers)
       case 'scrollTo':
         return this.scrollTo(command.x, command.y)
+      case 'deleteCookies':
+        return this.deleteCookies(command.name, command.url)
+      case 'clearCookies':
+        return this.clearCookies()
       case 'setHtml':
         return this.setHtml(command.html)
-      case 'cookiesClearAll':
-        return this.cookiesClearAll()
       case 'cookiesGet':
         return this.cookiesGet(command.nameOrQuery)
       case 'cookiesGetAll':
@@ -277,9 +280,26 @@ export default class LocalRuntime {
     throw new Error(`cookiesSet(): Invalid input ${nameOrCookies}, ${value}`)
   }
 
-  async cookiesClearAll(): Promise<void> {
-    await clearCookies(this.client)
-    this.log('Cookies cleared')
+  async deleteCookies(name: string, url: string): Promise<void> {
+    const { Network } = this.client
+    const canClearCookies = await Network.canClearBrowserCookies()
+    if (canClearCookies) {
+      await deleteCookie(this.client, name, url)
+      this.log(`Cookie ${name} cleared`)
+    } else {
+      this.log(`Cookie ${name} could not be cleared`)
+    }
+  }
+
+  async clearCookies(): Promise<void> {
+    const { Network } = this.client
+    const canClearCookies = await Network.canClearBrowserCookies()
+    if (canClearCookies) {
+      await clearCookies(this.client)
+      this.log('Cookies cleared')
+    } else {
+      this.log('Cookies could not be cleared')
+    }
   }
 
   async press(keyCode: number, count?: number, modifiers?: any): Promise<void> {

src/types.ts

@@ -128,7 +128,12 @@ export type Command =
       selector?: string
     }
   | {
-      type: 'cookiesClearAll'
+      type: 'clearCookies'
+    }
+  | {
+      type: 'deleteCookies'
+      name: string
+      url: string
     }
   | {
       type: 'cookiesSet'

src/util.ts

@@ -389,6 +389,12 @@ function getUrlFromCookie(cookie: Cookie) {
   return `https://${domain}`
 }
 
+export async function deleteCookie(client: Client, name: string, url: string): Promise<void> {
+  const {Network} = client
+
+  await Network.deleteCookie({cookieName: name, url})
+}
+
 export async function clearCookies(client: Client): Promise<void> {
   const { Network } = client