fix(transport): add skipBeforeEmit emit options

unadlib · Nov 6, 2023 · daa0d2c · daa0d2c
1 parent 2c809e3
commit daa0d2c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/examples/iframe/src/iframe.ts b/examples/iframe/src/iframe.ts
@@ -44,4 +44,11 @@ const init = () => {
   });
 };
 
+window.addEventListener('beforeunload', function (e) {
+  const confirmationMessage = 'something';
+  e.preventDefault(); //
+  e.returnValue = confirmationMessage; // Gecko or Trident
+  return confirmationMessage; // WebKit
+});
+
 init();
diff --git a/examples/iframe/webpack.config.js b/examples/iframe/webpack.config.js
@@ -24,4 +24,7 @@ module.exports = {
     filename: '[name].bundle.js',
     path: path.resolve(__dirname, 'dist'),
   },
+  devServer: {
+    host: '0.0.0.0',
+  },
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "data-transport",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "description": "A simple and responsible transport",
   "main": "lib/index.js",
   "unpkg": "dist/index.umd.js",

diff --git a/src/interface.ts b/src/interface.ts
@@ -55,6 +55,10 @@ export interface EmitParameter<T> {
    * silent for timeout error, false by default.
    */
   silent?: boolean;
+  /**
+   * skip before emit, false by default.
+   */
+  skipBeforeEmit?: boolean;
 }
 
 export type EmitOptions<T> = T | EmitParameter<T>;

diff --git a/src/transport.ts b/src/transport.ts
@@ -56,7 +56,7 @@ export abstract class Transport<T extends BaseInteraction = any> {
   private [logKey]?: (listenOptions: ListenerOptions<any>) => void;
   private [verboseKey]: boolean;
   protected [beforeEmitKey]?: Promise<void>;
-  protected  [beforeEmitResolveKey]?: () => void;
+  protected [beforeEmitResolveKey]?: () => void;
   /**
    * dispose transport
    */
@@ -278,9 +278,6 @@ export abstract class Transport<T extends BaseInteraction = any> {
       [transportKey]: transportId,
       requestId: this.id,
     };
-    if (this[beforeEmitKey]) {
-      await this[beforeEmitKey];
-    }
     if (this[verboseKey]) {
       if (typeof this[logKey] === 'function') {
         this[logKey]!(rawRequestData);
@@ -289,12 +286,18 @@ export abstract class Transport<T extends BaseInteraction = any> {
       }
     }
     if (!hasRespond) {
+      if (this[beforeEmitKey] && !params.skipBeforeEmit) {
+        await this[beforeEmitKey];
+      }
       this[senderKey](rawRequestData);
       return Promise.resolve(undefined as Response<T['emit'][K]>);
     }
     let timeoutId: NodeJS.Timeout | number;
     const promise = Promise.race<any>([
-      new Promise((resolve) => {
+      new Promise(async (resolve) => {
+        if (this[beforeEmitKey] && !params.skipBeforeEmit) {
+          await this[beforeEmitKey];
+        }
         this[requestsMapKey].set(transportId, resolve);
         this[senderKey](rawRequestData);
       }),