Merge pull request #64 from Unleash/fix/emit-ready-on-bootstrap

fix: emit ready event on bootstrap
Unleash · Jan 25, 2022 · 4d84934 · 4d84934
2 parents 8185a89 + ba4e3fd
commit 4d84934
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 8 deletions.
diff --git a/src/index.test.ts b/src/index.test.ts
@@ -394,6 +394,41 @@ test('Should not bootstrap data when bootstrap is []', async () => {
     expect(localStorage.getItem(storeKey)).toBe(JSON.stringify(initialData));
 });
 
+test('Should publish ready event when bootstrap is provided, before client is started', async () => {
+    localStorage.clear();
+    const storeKey = 'unleash:repository:repo';
+    const bootstrap = [
+        {
+            name: 'toggles',
+            enabled: true,
+            variant: {
+                name: 'disabled',
+                enabled: false,
+            },
+        },
+        {
+            name: 'algo',
+            enabled: true,
+            variant: {
+                name: 'disabled',
+                enabled: false,
+            },
+        },
+    ];
+
+    const config: IConfig = {
+        url: 'http://localhost/test',
+        clientKey: '12',
+        appName: 'web',
+        bootstrap,
+    };
+    const client = new UnleashClient(config);
+    expect(client.getAllToggles()).toStrictEqual(bootstrap);
+    client.on(EVENTS.READY, () => {
+        expect(client.isEnabled('algo')).toBe(true);
+    });
+});
+
 test('Should publish ready when initial fetch completed', (done) => {
     fetchMock.mockResponseOnce(JSON.stringify(data));
     const config: IConfig = {
@@ -846,17 +881,19 @@ test('Should pass under custom header clientKey', async () => {
         url: 'http://localhost/test',
         clientKey: '12',
         appName: 'web',
-        headerName: 'NotAuthorization'
+        headerName: 'NotAuthorization',
     };
     const client = new UnleashClient(config);
 
     client.on(EVENTS.UPDATE, () => {
         expect(fetchMock.mock.calls.length).toEqual(1);
-        expect(fetchMock.mock.calls[0][1].headers).toMatchObject({ 'NotAuthorization': '12' });
+        expect(fetchMock.mock.calls[0][1].headers).toMatchObject({
+            NotAuthorization: '12',
+        });
         client.stop();
     });
 
     await client.start();
 
     jest.advanceTimersByTime(999);
-});
+});
diff --git a/src/index.ts b/src/index.ts
@@ -34,7 +34,7 @@ interface IConfig extends IStaticContext {
     fetch?: any;
     bootstrap?: IToggle[];
     bootstrapOverride?: boolean;
-    headerName?: string
+    headerName?: string;
 }
 
 interface IVariant {
@@ -105,7 +105,7 @@ export class UnleashClient extends TinyEmitter {
         fetch = resolveFetch(),
         bootstrap,
         bootstrapOverride = true,
-        headerName = 'Authorization'
+        headerName = 'Authorization',
     }: IConfig) {
         super();
         // Validations
@@ -155,7 +155,7 @@ export class UnleashClient extends TinyEmitter {
             url,
             clientKey,
             fetch,
-            headerName
+            headerName,
         });
     }
 
@@ -228,8 +228,8 @@ export class UnleashClient extends TinyEmitter {
         ) {
             await this.storage.save(storeKey, this.bootstrap);
             this.toggles = this.bootstrap;
+            this.emit(EVENTS.READY);
         }
-
         this.emit(EVENTS.INIT);
     }
 
@@ -244,7 +244,11 @@ export class UnleashClient extends TinyEmitter {
         this.metrics.start();
         const interval = this.refreshInterval;
         await this.fetchToggles();
-        this.emit(EVENTS.READY);
+
+        if (!this.bootstrap) {
+            this.emit(EVENTS.READY);
+        }
+
         if (interval > 0) {
             this.timerRef = setInterval(() => this.fetchToggles(), interval);
         }