Merge branch 'master' into using-axios-instance

Author: nd4p90x

History.md

@@ -1,3 +1,12 @@
+v4.0.0 / 2021-2-17
+==========================
+* BREAKING: throws error when message is over 32kb #268
+* Allow passing in Axios instance in options #270
+* Fix data parameter always undefined on callback for track method #231
+* Allow to update endpoint to send batch events #246
+* Vulnerability fixes #264, #243, #263, #226, #227, #228, #247, #248, #252, #253, #257, #261
+* Fixed a typo to reflect actual code behaviour #233
+
 v3.5.0 / 2021-1-5
 ==========================
 * Update axios to fix the Server-Side Request Forgery vulnerability  (#259) 

index.js

@@ -61,15 +61,7 @@ class Analytics {
   }
 
   _validate (message, type) {
-    try {
-      looselyValidate(message, type)
-    } catch (e) {
-      if (e.message === 'Your message must be < 32kb.') {
-        console.log('Your message must be < 32kb. This is currently surfaced as a warning to allow clients to update. Versions released after August 1, 2018 will throw an error instead. Please update your code before then.', message)
-        return
-      }
-      throw e
-    }
+    looselyValidate(message, type)
   }
 
   /**
@@ -212,16 +204,16 @@ class Analytics {
 
     if (!this.flushed) {
       this.flushed = true
-      this.flush()
+      this.flush(callback)
       return
     }
 
     if (this.queue.length >= this.flushAt) {
-      this.flush()
+      this.flush(callback)
     }
 
     if (this.flushInterval && !this.timer) {
-      this.timer = setTimeout(this.flush.bind(this), this.flushInterval)
+      this.timer = setTimeout(this.flush.bind(this, callback), this.flushInterval)
     }
   }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "analytics-node",
-  "version": "3.5.0",
+  "version": "4.0.0",
   "description": "The hassle-free way to integrate analytics into any Node.js application",
   "license": "MIT",
   "repository": "segmentio/analytics-node",

test.js

@@ -561,7 +561,7 @@ test('isErrorRetryable', t => {
   t.false(client._isErrorRetryable({ response: { status: 200 } }))
 })
 
-test('allows messages > 32kb', t => {
+test('dont allow messages > 32kb', t => {
   const client = createClient()
 
   const event = {
@@ -573,7 +573,7 @@ test('allows messages > 32kb', t => {
     event.properties[i] = 'a'
   }
 
-  t.notThrows(() => {
+  t.throws(() => {
     client.track(event, noop)
   })
 })