refactor: waitUntilReady

frankzhaopeng · frankzhaopeng · commit 3152850eb6a7 · 2022-10-26T11:23:49.000+08:00
diff --git a/example/index.html b/example/index.html
@@ -14,8 +14,8 @@
         color: #556ee6;
       }
     </style>
-    <!-- <script type="text/javascript" src="https://unpkg.com/featureprobe-client-sdk-js@latest/dist/featureprobe-client-sdk-js.min.js"></script> -->
-    <script type="text/javascript" src="../dist/featureprobe-client-sdk-js.min.js"></script>
+    <script type="text/javascript" src="https://unpkg.com/featureprobe-client-sdk-js@latest/dist/featureprobe-client-sdk-js.min.js"></script>
+    <!-- <script type="text/javascript" src="../dist/featureprobe-client-sdk-js.min.js"></script> -->
   </head>
 
   <body>
@@ -40,10 +40,11 @@ <h3>boolean type</h3>
       user.with("userId", "1234567890");
 
       const fpClient = new featureProbe.FeatureProbe({
-        remoteUrl: "https://featureprobe.io/server",
+        remoteUrl: "https://featureprobe.io/server/bcc",
         clientSdkKey: "client-25614c7e03e9cb49c0e96357b797b1e47e7f2dff",
         user,
         refreshInterval: 5000,
+        timeoutInterval: 5000,
       });
 
       fpClient.on("cache_ready", function() {
@@ -66,6 +67,14 @@ <h3>boolean type</h3>
         console.log("error");
       });
 
+      setTimeout(() => {
+        fpClient.waitUntilReady().then(() => {
+          console.log('wait until ready');
+        }).catch(() => {
+          console.log('wait until ready catch');
+        })
+      }, 5000);
+
       fpClient.start();
     </script>
   </body>
diff --git a/setupJest.js b/setupJest.js
@@ -1,5 +1 @@
 global.fetch = require('jest-fetch-mock');
-
-process.on('unhandledRejection', (reason, promise) => {
-  console.log('unhandledRejection', reason, promise);
-});
diff --git a/src/FeatureProbe.ts b/src/FeatureProbe.ts
@@ -32,7 +32,7 @@ class FeatureProbe extends TinyEmitter {
   private toggles: { [key: string]: FPToggleDetail } | undefined;
   private timer?: any;
   private timeoutTimer?: any;
-  private readyPromise: Promise<void>;
+  private readyPromise: null | Promise<void>;
   private status: string;
   private timeoutInterval: number;
   private storage: IStorageProvider;
@@ -75,20 +75,7 @@ class FeatureProbe extends TinyEmitter {
     this.timeoutInterval = timeoutInterval;
     this.status = STATUS.PENDING;
     this.storage = new StorageProvider();
-
-    this.readyPromise = new Promise<void>((resolve, reject) => {
-      const onReadyCallback = () => {
-        this.off(EVENTS.READY, onReadyCallback);
-        resolve();
-      };
-      const onErrorCallback = (err: Error) => {
-        this.off(EVENTS.ERROR, onErrorCallback);
-        reject(err);
-      };
-
-      this.on(EVENTS.READY, onReadyCallback);
-      this.on(EVENTS.ERROR, onErrorCallback);
-    });
+    this.readyPromise = null;
   }
 
   public async start() {
@@ -120,6 +107,33 @@ class FeatureProbe extends TinyEmitter {
   }
 
   public waitUntilReady(): Promise<void> {
+    if (this.readyPromise) {
+      return this.readyPromise;
+    }
+
+    if (this.status === STATUS.READY) {
+      return Promise.resolve();
+    }
+
+    if (this.status === STATUS.ERROR) {
+      return Promise.reject();
+    }
+
+    this.readyPromise = new Promise((resolve, reject) => {
+      const onReadyCallback = () => {
+        this.off(EVENTS.READY, onReadyCallback);
+        resolve();
+      };
+
+      const onErrorCallback = () => {
+        this.off(EVENTS.ERROR, onErrorCallback);
+        reject();
+      };
+
+      this.on(EVENTS.READY, onReadyCallback);
+      this.on(EVENTS.ERROR, onErrorCallback);
+    });
+
     return this.readyPromise;
   }
 
