Allow UAParser and CountryLookup to load in case of timeout (#207)

client.go

@@ -75,7 +75,7 @@ func NewClientWithOptions(sdkKey string, options *Options) *Client {
 }
 
 func (c *Client) init() {
-	c.evaluator.initialize(c.options)
+	c.evaluator.initialize()
 }
 
 func (c *Client) initInBackground() {

country_lookup.go

@@ -19,6 +19,7 @@ func newCountryLookup(options IPCountryOptions) *countryLookup {
 		wg:      sync.WaitGroup{},
 		options: options,
 	}
+	countryLookup.delayedSetup()
 	return countryLookup
 }
 
@@ -28,7 +29,7 @@ func (c *countryLookup) isReady() bool {
 	return c.lookup != nil
 }
 
-func (c *countryLookup) init(lazyLoadOverride bool) {
+func (c *countryLookup) delayedSetup() {
 	if c.options.Disabled {
 		return
 	}
@@ -39,15 +40,19 @@ func (c *countryLookup) init(lazyLoadOverride bool) {
 		c.lookup = countrylookup.New()
 		c.mu.Unlock()
 	}()
-	c.mu.Lock()
-	lazyLoad := c.options.LazyLoad
-	if lazyLoadOverride {
-		lazyLoad = lazyLoadOverride
+}
+
+func (c *countryLookup) init() {
+	if !c.options.LazyLoad {
+		c.ensureLoaded()
 	}
-	c.mu.Unlock()
-	if !lazyLoad {
-		c.wg.Wait()
+}
+
+func (c *countryLookup) ensureLoaded() {
+	if c.options.Disabled {
+		return
 	}
+	c.wg.Wait()
 }
 
 func (c *countryLookup) lookupIp(ip string) (string, bool) {

evaluator.go

@@ -104,9 +104,7 @@ func newEvaluator(
 	}()
 	persistentStorageUtils := newUserPersistentStorageUtils(options)
 	countryLookup := newCountryLookup(options.IPCountryOptions)
-	countryLookup.init(true)
 	uaParser := newUAParser(options.UAParserOptions)
-	uaParser.init(true)
 
 	return &evaluator{
 		store:                  store,
@@ -119,16 +117,10 @@ func newEvaluator(
 	}
 }
 
-func (e *evaluator) initialize(options *Options) {
+func (e *evaluator) initialize() {
 	e.store.initialize()
-	e.initializeHeavyEvaluatorFields(options)
-}
-
-func (e *evaluator) initializeHeavyEvaluatorFields(options *Options) {
-	e.mu.Lock()
-	defer e.mu.Unlock()
-	e.uaParser.init(false)
-	e.countryLookup.init(false)
+	e.uaParser.init()
+	e.countryLookup.init()
 }
 
 func (e *evaluator) shutdown() {

ua_parser.go

@@ -19,6 +19,7 @@ func newUAParser(options UAParserOptions) *uaParser {
 		wg:      sync.WaitGroup{},
 		options: options,
 	}
+	uaParser.delayedSetup()
 	return uaParser
 }
 
@@ -28,7 +29,7 @@ func (u *uaParser) isReady() bool {
 	return u.parser != nil
 }
 
-func (u *uaParser) init(lazyLoadOverride bool) {
+func (u *uaParser) delayedSetup() {
 	if u.options.Disabled {
 		return
 	}
@@ -39,23 +40,27 @@ func (u *uaParser) init(lazyLoadOverride bool) {
 		u.parser = uaparser.NewFromSaved()
 		u.mu.Unlock()
 	}()
-	u.mu.Lock()
-	lazyLoad := u.options.LazyLoad
-	if lazyLoadOverride {
-		lazyLoad = lazyLoadOverride
+}
+
+func (u *uaParser) init() {
+	if !u.options.LazyLoad {
+		u.ensureLoaded()
 	}
-	u.mu.Unlock()
-	if !lazyLoad {
-		u.wg.Wait()
+}
+
+func (u *uaParser) ensureLoaded() {
+	if u.options.Disabled {
+		return
 	}
+	u.wg.Wait()
 }
 
 func (u *uaParser) parse(ua string) *uaparser.Client {
 	if u.options.Disabled {
 		return nil
 	}
 	if u.options.EnsureLoaded {
-		u.wg.Wait()
+		u.ensureLoaded()
 	}
 	if u.isReady() {
 		return u.parser.Parse(ua)