@opexa/portal-sdk 0.59.83 → 0.59.85

package/dist/index.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var objectId = require('@opexa/object-id');
+var app = require('@capacitor/app');
 var core = require('@capacitor/core');
 var thumbmarkjs = require('@thumbmarkjs/thumbmarkjs');
 var cookies = require('js-cookie');
@@ -7216,8 +7217,8 @@ function pollable(func, config) {
   };
 }
 
-// src/sdk/session-manager-cookie.ts
-var SessionManagerCookie = class {
+// src/sdk/session-manager.ts
+var SessionManager = class {
   logger;
   storageKey = "session";
   platformStorageKey = "session/platform";
@@ -7231,10 +7232,15 @@ var SessionManagerCookie = class {
    */
   v4AccessToken = null;
   v4AccessTokenExpiresAt = null;
+  v4RefreshPromise = null;
   constructor(config) {
     this.authService = config.authService;
     this.walletService = config.walletService;
     this.logger = config.logger;
+    if (config.sessionPrefix) {
+      this.storageKey = `${config.sessionPrefix}/${this.storageKey}`;
+      this.platformStorageKey = `${config.sessionPrefix}/${this.platformStorageKey}`;
+    }
   }
   get refreshing() {
     return this._refreshing;
@@ -7245,27 +7251,51 @@ var SessionManagerCookie = class {
   persist(data, version) {
     const now = /* @__PURE__ */ new Date();
     if (version === 4) {
-      this.v4AccessToken = data.accessToken ?? null;
+      if (!data.session || !data.accessToken) {
+        this.logger.error(
+          "Malformed session response: expected 'session' and 'accessToken'."
+        );
+        return false;
+      }
+      this.v4AccessToken = data.accessToken;
       this.v4AccessTokenExpiresAt = addMinutes(now, 5).getTime();
-      cookies__default.default.set(
+      localStorage.setItem(
         this.storageKey,
-        JSON.stringify({ version, session: data.session }),
-        { expires: subMinutes(addDays(now, 15), 2).getTime() }
+        JSON.stringify({ version, session: data.session })
       );
-      return;
+      return true;
     }
-    cookies__default.default.set(
+    localStorage.setItem(
       this.storageKey,
       JSON.stringify({
         version,
         ...data,
         accessTokenExpiresAt: addMinutes(now, 8).getTime(),
         refreshTokenExpiresAt: subMinutes(addDays(now, 30), 2).getTime()
-      }),
-      { expires: subMinutes(addDays(now, 30), 2).getTime() }
+      })
     );
+    return true;
+  }
+  malformedResponseError() {
+    return {
+      ok: false,
+      error: {
+        name: "UnknownError",
+        message: "Something went wrong."
+      }
+    };
   }
   async create(input, version = 1) {
+    if (this.isServer) {
+      this.logger.warn("'localStorage' is not available on the server.");
+      return {
+        ok: false,
+        error: {
+          name: "UnknownError",
+          message: "Server sign in is not supported."
+        }
+      };
+    }
     if (input.type === "MAYA") {
       localStorage.setItem(this.platformStorageKey, "MAYA");
       const f0 = () => this.walletService.mayaSession({ id: input.sessionId });
@@ -7291,7 +7321,7 @@ var SessionManagerCookie = class {
         maxAttempt: 5
       })();
       if (!r1.ok) return r1;
-      this.persist(r1.data, version);
+      if (!this.persist(r1.data, version)) return this.malformedResponseError();
       return {
         ok: true,
         data: null
@@ -7300,7 +7330,7 @@ var SessionManagerCookie = class {
     if (input.type === "MOBILE_NUMBER") {
       const res2 = await this.authService.createSession(input, version);
       if (res2.ok) {
-        this.persist(res2.data, version);
+        if (!this.persist(res2.data, version)) return this.malformedResponseError();
         return {
           ok: true,
           data: null
@@ -7312,12 +7342,13 @@ var SessionManagerCookie = class {
       const res2 = await this.authService.createSession(
         {
           type: "SOCIALS",
-          token: input.token
+          token: input.token,
+          channel: input.channel
         },
         version
       );
       if (res2.ok) {
-        this.persist(res2.data, version);
+        if (!this.persist(res2.data, version)) return this.malformedResponseError();
         return {
           ok: true,
           data: null
@@ -7329,7 +7360,7 @@ var SessionManagerCookie = class {
       localStorage.setItem(this.platformStorageKey, "CABINET");
       const res2 = await this.authService.createSession(input, version);
       if (res2.ok) {
-        this.persist(res2.data, version);
+        if (!this.persist(res2.data, version)) return this.malformedResponseError();
         return {
           ok: true,
           data: null
@@ -7347,7 +7378,7 @@ var SessionManagerCookie = class {
         }
       };
     }
-    this.persist(res.data, version);
+    if (!this.persist(res.data, version)) return this.malformedResponseError();
     return {
       ok: true,
       data: null
@@ -7357,9 +7388,9 @@ var SessionManagerCookie = class {
     const res = await this.authService.authenticate(input);
     if (res.ok) {
       if (this.isServer) {
-        this.logger.warn("'client cookies' is not available on the server.");
-      } else {
-        this.persist(res.data, 1);
+        this.logger.warn("'localStorage' is not available on the server.");
+      } else if (!this.persist(res.data, 1)) {
+        return this.malformedResponseError();
       }
       return { ok: true };
     } else {
@@ -7368,7 +7399,7 @@ var SessionManagerCookie = class {
   }
   async get() {
     if (this.isServer) {
-      this.logger.warn("'client cookies' is not available on the server.");
+      this.logger.warn("'localStorage' is not available on the server.");
       return {
         ok: true,
         data: null
@@ -7378,7 +7409,7 @@ var SessionManagerCookie = class {
       await sleep(1e3);
       return await this.get();
     }
-    const val = cookies__default.default.get(this.storageKey);
+    const val = localStorage.getItem(this.storageKey);
     if (!val) {
       return {
         ok: true,
@@ -7396,7 +7427,7 @@ var SessionManagerCookie = class {
       const refreshTokenExpiresAt = new Date(obj.refreshTokenExpiresAt);
       if (isAfter(now, refreshTokenExpiresAt)) {
         this.logger.warn("Session expired. Logging out..");
-        cookies__default.default.remove(this.storageKey);
+        localStorage.removeItem(this.storageKey);
         return {
           ok: false,
           error: {
@@ -7416,7 +7447,7 @@ var SessionManagerCookie = class {
         if (!res.ok) {
           this.logger.error(`Failed to refresh session: ${res.error.message}`);
           if (res.error.name === "InvalidTokenError" || res.error.name === "AccountBlacklistedError" || res.error.name === "VerificationLockedError") {
-            cookies__default.default.remove(this.storageKey);
+            localStorage.removeItem(this.storageKey);
             return {
               ok: false,
               error: res.error
@@ -7438,9 +7469,7 @@ var SessionManagerCookie = class {
           accessTokenExpiresAt: addMinutes(now, 8).getTime(),
           refreshTokenExpiresAt: subMinutes(addDays(now, 30), 2).getTime()
         };
-        cookies__default.default.set(this.storageKey, JSON.stringify(obj), {
-          expires: subMinutes(addDays(now, 30), 2).getTime()
-        });
+        localStorage.setItem(this.storageKey, JSON.stringify(obj));
       }
       return {
         ok: true,
@@ -7458,13 +7487,13 @@ var SessionManagerCookie = class {
   }
   async refresh() {
     if (this.isServer) {
-      this.logger.warn("'client cookies' is not available on the server.");
+      this.logger.warn("'localStorage' is not available on the server.");
       return {
         ok: true,
         data: null
       };
     }
-    const val = cookies__default.default.get(this.storageKey);
+    const val = localStorage.getItem(this.storageKey);
     if (!val) {
       return {
         ok: true,
@@ -7488,7 +7517,7 @@ var SessionManagerCookie = class {
       if (!res.ok) {
         this.logger.error(`Failed to refresh session: ${res.error.message}`);
         if (res.error.name === "InvalidTokenError" || res.error.name === "AccountBlacklistedError" || res.error.name === "VerificationLockedError") {
-          cookies__default.default.remove(this.storageKey);
+          localStorage.removeItem(this.storageKey);
           return {
             ok: false,
             error: res.error
@@ -7510,9 +7539,7 @@ var SessionManagerCookie = class {
         accessTokenExpiresAt: addMinutes(now, 8).getTime(),
         refreshTokenExpiresAt: subMinutes(addDays(now, 30), 2).getTime()
       };
-      cookies__default.default.set(this.storageKey, JSON.stringify(obj), {
-        expires: subMinutes(addDays(now, 30), 2).getTime()
-      });
+      localStorage.setItem(this.storageKey, JSON.stringify(obj));
       return {
         ok: true,
         data: obj
@@ -7542,6 +7569,15 @@ var SessionManagerCookie = class {
     return await this.refreshV4(session);
   }
   async refreshV4(session) {
+    if (this.v4RefreshPromise) return await this.v4RefreshPromise;
+    this.v4RefreshPromise = this.requestV4Refresh(session);
+    try {
+      return await this.v4RefreshPromise;
+    } finally {
+      this.v4RefreshPromise = null;
+    }
+  }
+  async requestV4Refresh(session) {
     this.logger.info("Refreshing session...");
     this.refreshing = true;
     const res = await this.authService.refreshSession(void 0, 4);
@@ -7549,7 +7585,7 @@ var SessionManagerCookie = class {
     if (!res.ok) {
       this.logger.error(`Failed to refresh session: ${res.error.message}`);
       if (res.error.name === "InvalidTokenError" || res.error.name === "AccountBlacklistedError" || res.error.name === "VerificationLockedError") {
-        cookies__default.default.remove(this.storageKey);
+        localStorage.removeItem(this.storageKey);
         this.v4AccessToken = null;
         this.v4AccessTokenExpiresAt = null;
       }
@@ -7573,11 +7609,11 @@ var SessionManagerCookie = class {
   }
   async destroy() {
     if (this.isServer) {
-      this.logger.warn("'client cookies' is not available on the server.");
+      this.logger.warn("'localStorage' is not available on the server.");
       return;
     }
     let version = 1;
-    const val = cookies__default.default.get(this.storageKey);
+    const val = localStorage.getItem(this.storageKey);
     if (val) {
       try {
         const stored = JSON.parse(val);
@@ -7591,18 +7627,18 @@ var SessionManagerCookie = class {
     }
     this.v4AccessToken = null;
     this.v4AccessTokenExpiresAt = null;
-    cookies__default.default.remove(this.storageKey);
+    localStorage.removeItem(this.storageKey);
   }
   async verify() {
     if (this.isServer) {
-      this.logger.warn("'client cookies' is not available on the server.");
+      this.logger.warn("'localStorage' is not available on the server.");
       return true;
     }
-    const val = cookies__default.default.get(this.storageKey);
+    const val = localStorage.getItem(this.storageKey);
     if (val) {
       try {
         const stored = JSON.parse(val);
-        if (stored.version === 4) return await this.verifyV4();
+        if (stored.version === 4) return await this.verifyV4(stored.session);
       } catch {
       }
     }
@@ -7613,17 +7649,18 @@ var SessionManagerCookie = class {
     if (!s.data) return true;
     const v = await this.authService.verifySession(s.data.accessToken);
     if (!v) {
-      cookies__default.default.remove(this.storageKey);
+      localStorage.removeItem(this.storageKey);
     }
     return v;
   }
-  async verifyV4() {
+  async verifyV4(session) {
     if (!this.v4AccessToken || !this.v4AccessTokenExpiresAt || isAfter(/* @__PURE__ */ new Date(), new Date(this.v4AccessTokenExpiresAt))) {
-      return true;
+      const res = await this.refreshV4(session);
+      return res.ok;
     }
     const v = await this.authService.verifySession(this.v4AccessToken);
     if (!v) {
-      cookies__default.default.remove(this.storageKey);
+      localStorage.removeItem(this.storageKey);
       this.v4AccessToken = null;
       this.v4AccessTokenExpiresAt = null;
     }
@@ -7631,7 +7668,7 @@ var SessionManagerCookie = class {
   }
   get onMaya() {
     if (this.isServer) {
-      this.logger.warn("'client cookies' is not available on the server.");
+      this.logger.warn("'localStorage' is not available on the server.");
       return false;
     }
     return localStorage.getItem(this.platformStorageKey) === "MAYA";
@@ -7647,9 +7684,7 @@ var SessionManagerCookie = class {
     return typeof window === "undefined";
   }
 };
-
-// src/sdk/session-manager.ts
-var SessionManager = class {
+var SessionManagerCookie = class {
   logger;
   storageKey = "session";
   platformStorageKey = "session/platform";
@@ -7663,15 +7698,10 @@ var SessionManager = class {
    */
   v4AccessToken = null;
   v4AccessTokenExpiresAt = null;
-  v4RefreshPromise = null;
   constructor(config) {
     this.authService = config.authService;
     this.walletService = config.walletService;
     this.logger = config.logger;
-    if (config.sessionPrefix) {
-      this.storageKey = `${config.sessionPrefix}/${this.storageKey}`;
-      this.platformStorageKey = `${config.sessionPrefix}/${this.platformStorageKey}`;
-    }
   }
   get refreshing() {
     return this._refreshing;
@@ -7682,51 +7712,27 @@ var SessionManager = class {
   persist(data, version) {
     const now = /* @__PURE__ */ new Date();
     if (version === 4) {
-      if (!data.session || !data.accessToken) {
-        this.logger.error(
-          "Malformed session response: expected 'session' and 'accessToken'."
-        );
-        return false;
-      }
-      this.v4AccessToken = data.accessToken;
+      this.v4AccessToken = data.accessToken ?? null;
       this.v4AccessTokenExpiresAt = addMinutes(now, 5).getTime();
-      localStorage.setItem(
+      cookies__default.default.set(
         this.storageKey,
-        JSON.stringify({ version, session: data.session })
+        JSON.stringify({ version, session: data.session }),
+        { expires: subMinutes(addDays(now, 15), 2).getTime() }
       );
-      return true;
+      return;
     }
-    localStorage.setItem(
+    cookies__default.default.set(
       this.storageKey,
       JSON.stringify({
         version,
         ...data,
         accessTokenExpiresAt: addMinutes(now, 8).getTime(),
         refreshTokenExpiresAt: subMinutes(addDays(now, 30), 2).getTime()
-      })
+      }),
+      { expires: subMinutes(addDays(now, 30), 2).getTime() }
     );
-    return true;
-  }
-  malformedResponseError() {
-    return {
-      ok: false,
-      error: {
-        name: "UnknownError",
-        message: "Something went wrong."
-      }
-    };
   }
   async create(input, version = 1) {
-    if (this.isServer) {
-      this.logger.warn("'localStorage' is not available on the server.");
-      return {
-        ok: false,
-        error: {
-          name: "UnknownError",
-          message: "Server sign in is not supported."
-        }
-      };
-    }
     if (input.type === "MAYA") {
       localStorage.setItem(this.platformStorageKey, "MAYA");
       const f0 = () => this.walletService.mayaSession({ id: input.sessionId });
@@ -7752,7 +7758,7 @@ var SessionManager = class {
         maxAttempt: 5
       })();
       if (!r1.ok) return r1;
-      if (!this.persist(r1.data, version)) return this.malformedResponseError();
+      this.persist(r1.data, version);
       return {
         ok: true,
         data: null
@@ -7761,7 +7767,7 @@ var SessionManager = class {
     if (input.type === "MOBILE_NUMBER") {
       const res2 = await this.authService.createSession(input, version);
       if (res2.ok) {
-        if (!this.persist(res2.data, version)) return this.malformedResponseError();
+        this.persist(res2.data, version);
         return {
           ok: true,
           data: null
@@ -7773,13 +7779,12 @@ var SessionManager = class {
       const res2 = await this.authService.createSession(
         {
           type: "SOCIALS",
-          token: input.token,
-          channel: input.channel
+          token: input.token
         },
         version
       );
       if (res2.ok) {
-        if (!this.persist(res2.data, version)) return this.malformedResponseError();
+        this.persist(res2.data, version);
         return {
           ok: true,
           data: null
@@ -7791,7 +7796,7 @@ var SessionManager = class {
       localStorage.setItem(this.platformStorageKey, "CABINET");
       const res2 = await this.authService.createSession(input, version);
       if (res2.ok) {
-        if (!this.persist(res2.data, version)) return this.malformedResponseError();
+        this.persist(res2.data, version);
         return {
           ok: true,
           data: null
@@ -7809,7 +7814,7 @@ var SessionManager = class {
         }
       };
     }
-    if (!this.persist(res.data, version)) return this.malformedResponseError();
+    this.persist(res.data, version);
     return {
       ok: true,
       data: null
@@ -7819,9 +7824,9 @@ var SessionManager = class {
     const res = await this.authService.authenticate(input);
     if (res.ok) {
       if (this.isServer) {
-        this.logger.warn("'localStorage' is not available on the server.");
-      } else if (!this.persist(res.data, 1)) {
-        return this.malformedResponseError();
+        this.logger.warn("'client cookies' is not available on the server.");
+      } else {
+        this.persist(res.data, 1);
       }
       return { ok: true };
     } else {
@@ -7830,7 +7835,7 @@ var SessionManager = class {
   }
   async get() {
     if (this.isServer) {
-      this.logger.warn("'localStorage' is not available on the server.");
+      this.logger.warn("'client cookies' is not available on the server.");
       return {
         ok: true,
         data: null
@@ -7840,7 +7845,7 @@ var SessionManager = class {
       await sleep(1e3);
       return await this.get();
     }
-    const val = localStorage.getItem(this.storageKey);
+    const val = cookies__default.default.get(this.storageKey);
     if (!val) {
       return {
         ok: true,
@@ -7858,7 +7863,7 @@ var SessionManager = class {
       const refreshTokenExpiresAt = new Date(obj.refreshTokenExpiresAt);
       if (isAfter(now, refreshTokenExpiresAt)) {
         this.logger.warn("Session expired. Logging out..");
-        localStorage.removeItem(this.storageKey);
+        cookies__default.default.remove(this.storageKey);
         return {
           ok: false,
           error: {
@@ -7878,7 +7883,7 @@ var SessionManager = class {
         if (!res.ok) {
           this.logger.error(`Failed to refresh session: ${res.error.message}`);
           if (res.error.name === "InvalidTokenError" || res.error.name === "AccountBlacklistedError" || res.error.name === "VerificationLockedError") {
-            localStorage.removeItem(this.storageKey);
+            cookies__default.default.remove(this.storageKey);
             return {
               ok: false,
               error: res.error
@@ -7900,7 +7905,9 @@ var SessionManager = class {
           accessTokenExpiresAt: addMinutes(now, 8).getTime(),
           refreshTokenExpiresAt: subMinutes(addDays(now, 30), 2).getTime()
         };
-        localStorage.setItem(this.storageKey, JSON.stringify(obj));
+        cookies__default.default.set(this.storageKey, JSON.stringify(obj), {
+          expires: subMinutes(addDays(now, 30), 2).getTime()
+        });
       }
       return {
         ok: true,
@@ -7918,13 +7925,13 @@ var SessionManager = class {
   }
   async refresh() {
     if (this.isServer) {
-      this.logger.warn("'localStorage' is not available on the server.");
+      this.logger.warn("'client cookies' is not available on the server.");
       return {
         ok: true,
         data: null
       };
     }
-    const val = localStorage.getItem(this.storageKey);
+    const val = cookies__default.default.get(this.storageKey);
     if (!val) {
       return {
         ok: true,
@@ -7948,7 +7955,7 @@ var SessionManager = class {
       if (!res.ok) {
         this.logger.error(`Failed to refresh session: ${res.error.message}`);
         if (res.error.name === "InvalidTokenError" || res.error.name === "AccountBlacklistedError" || res.error.name === "VerificationLockedError") {
-          localStorage.removeItem(this.storageKey);
+          cookies__default.default.remove(this.storageKey);
           return {
             ok: false,
             error: res.error
@@ -7970,7 +7977,9 @@ var SessionManager = class {
         accessTokenExpiresAt: addMinutes(now, 8).getTime(),
         refreshTokenExpiresAt: subMinutes(addDays(now, 30), 2).getTime()
       };
-      localStorage.setItem(this.storageKey, JSON.stringify(obj));
+      cookies__default.default.set(this.storageKey, JSON.stringify(obj), {
+        expires: subMinutes(addDays(now, 30), 2).getTime()
+      });
       return {
         ok: true,
         data: obj
@@ -8000,15 +8009,6 @@ var SessionManager = class {
     return await this.refreshV4(session);
   }
   async refreshV4(session) {
-    if (this.v4RefreshPromise) return await this.v4RefreshPromise;
-    this.v4RefreshPromise = this.requestV4Refresh(session);
-    try {
-      return await this.v4RefreshPromise;
-    } finally {
-      this.v4RefreshPromise = null;
-    }
-  }
-  async requestV4Refresh(session) {
     this.logger.info("Refreshing session...");
     this.refreshing = true;
     const res = await this.authService.refreshSession(void 0, 4);
@@ -8016,7 +8016,7 @@ var SessionManager = class {
     if (!res.ok) {
       this.logger.error(`Failed to refresh session: ${res.error.message}`);
       if (res.error.name === "InvalidTokenError" || res.error.name === "AccountBlacklistedError" || res.error.name === "VerificationLockedError") {
-        localStorage.removeItem(this.storageKey);
+        cookies__default.default.remove(this.storageKey);
         this.v4AccessToken = null;
         this.v4AccessTokenExpiresAt = null;
       }
@@ -8040,11 +8040,11 @@ var SessionManager = class {
   }
   async destroy() {
     if (this.isServer) {
-      this.logger.warn("'localStorage' is not available on the server.");
+      this.logger.warn("'client cookies' is not available on the server.");
       return;
     }
     let version = 1;
-    const val = localStorage.getItem(this.storageKey);
+    const val = cookies__default.default.get(this.storageKey);
     if (val) {
       try {
         const stored = JSON.parse(val);
@@ -8058,18 +8058,18 @@ var SessionManager = class {
     }
     this.v4AccessToken = null;
     this.v4AccessTokenExpiresAt = null;
-    localStorage.removeItem(this.storageKey);
+    cookies__default.default.remove(this.storageKey);
   }
   async verify() {
     if (this.isServer) {
-      this.logger.warn("'localStorage' is not available on the server.");
+      this.logger.warn("'client cookies' is not available on the server.");
       return true;
     }
-    const val = localStorage.getItem(this.storageKey);
+    const val = cookies__default.default.get(this.storageKey);
     if (val) {
       try {
         const stored = JSON.parse(val);
-        if (stored.version === 4) return await this.verifyV4();
+        if (stored.version === 4) return await this.verifyV4(stored.session);
       } catch {
       }
     }
@@ -8080,17 +8080,18 @@ var SessionManager = class {
     if (!s.data) return true;
     const v = await this.authService.verifySession(s.data.accessToken);
     if (!v) {
-      localStorage.removeItem(this.storageKey);
+      cookies__default.default.remove(this.storageKey);
     }
     return v;
   }
-  async verifyV4() {
+  async verifyV4(session) {
     if (!this.v4AccessToken || !this.v4AccessTokenExpiresAt || isAfter(/* @__PURE__ */ new Date(), new Date(this.v4AccessTokenExpiresAt))) {
-      return true;
+      const res = await this.refreshV4(session);
+      return res.ok;
     }
     const v = await this.authService.verifySession(this.v4AccessToken);
     if (!v) {
-      localStorage.removeItem(this.storageKey);
+      cookies__default.default.remove(this.storageKey);
       this.v4AccessToken = null;
       this.v4AccessTokenExpiresAt = null;
     }
@@ -8098,7 +8099,7 @@ var SessionManager = class {
   }
   get onMaya() {
     if (this.isServer) {
-      this.logger.warn("'localStorage' is not available on the server.");
+      this.logger.warn("'client cookies' is not available on the server.");
       return false;
     }
     return localStorage.getItem(this.platformStorageKey) === "MAYA";
@@ -10392,13 +10393,19 @@ var Sdk = class {
     await this.sessionManager.destroy();
   }
   watchSession(input) {
-    const interval = clamp(input.interval ?? 3e4, 3e4, 6e4);
+    const interval = clamp(input.interval ?? 3e4, 5e3, 6e4);
     let timeout = null;
+    let isForeground = true;
+    const listener = app.App.addListener("appStateChange", ({ isActive }) => {
+      isForeground = isActive;
+    });
     const assignTimeout = () => {
       return setTimeout(async () => {
-        const v = await this.sessionManager.verify();
-        if (!v) {
-          await input.onInvalid();
+        if (isForeground) {
+          const v = await this.sessionManager.verify();
+          if (!v) {
+            await input.onInvalid();
+          }
         }
         timeout = assignTimeout();
       }, interval);
@@ -10408,6 +10415,7 @@ var Sdk = class {
       if (timeout) {
         clearTimeout(timeout);
       }
+      listener.then((handle) => handle.remove());
     };
   }
   async session() {