@cloudcare/browser-core 1.2.9 → 1.2.12

package/cjs/browser/fetchObservable.js

@@ -80,7 +80,7 @@ function afterSend(observable, responsePromise, startContext) {
       observable.notify(context);
     } else if ('status' in response) {
       context.response = response;
-      context.responseType = response.type;
+      context.responseType = response instanceof Response && response.type || '';
       context.status = response.status;
       context.isAborted = false;
       observable.notify(context);

package/cjs/helper/tools.js

@@ -1448,7 +1448,7 @@ var getURLSearchParams = function getURLSearchParams(queryString) {
   queryString = queryString || '';
 
   var decodeParam = function decodeParam(str) {
-    return decodeURIComponent(str);
+    return str; // return decodeURIComponent(str)
   };
 
   var args = {};
@@ -2265,7 +2265,7 @@ function escapeJsonValue(value) {
 }
 
 function escapeFieldValueStr(str) {
-  return '"' + str.replace(/[\\]*"/g, '"').replace(/"/g, '\\"').replace(/\\/g, '\\\\') + '"';
+  return '"' + str.replace(/\\/g, '\\\\').replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"';
 }
 
 function escapeRowField(value) {

package/cjs/transport/httpRequest.js

@@ -73,11 +73,13 @@ function fetchKeepAliveStrategy(endpointUrl, bytesLimit, payload, onResponse) {
     fetch(url, {
       method: 'POST',
       body: data,
-      keepalive: true
+      keepalive: true,
+      mode: 'cors'
     }).then(function (response) {
       if (typeof onResponse === 'function') {
         onResponse({
-          status: response.status
+          status: response.status,
+          type: response.type
         });
       }
     }, function () {

package/cjs/transport/sendWithRetryStrategy.js

@@ -80,7 +80,7 @@ function send(payload, state, sendStrategy, responseData) {
   sendStrategy(payload, function (response) {
     state.bandwidthMonitor.remove(payload);
 
-    if (wasRequestSuccessful(response)) {
+    if (!shouldRetryRequest(response)) {
       state.transportStatus = TransportStatus.UP;
       onSuccess();
     } else {
@@ -110,8 +110,8 @@ function retryQueuedPayloads(reason, state, sendStrategy, reportError) {
   }
 }
 
-function wasRequestSuccessful(response) {
-  return response.status !== 0 && response.status < 500;
+function shouldRetryRequest(response) {
+  return response.type !== 'opaque' && (response.status === 0 && !navigator.onLine || response.status === 408 || response.status === 429 || response.status >= 500);
 }
 
 function newRetryState() {

package/esm/browser/fetchObservable.js

@@ -66,7 +66,7 @@ function afterSend(observable, responsePromise, startContext) {
       observable.notify(context);
     } else if ('status' in response) {
       context.response = response;
-      context.responseType = response.type;
+      context.responseType = response instanceof Response && response.type || '';
       context.status = response.status;
       context.isAborted = false;
       observable.notify(context);

package/esm/helper/tools.js

@@ -1177,7 +1177,7 @@ export var getURLSearchParams = function getURLSearchParams(queryString) {
   queryString = queryString || '';
 
   var decodeParam = function decodeParam(str) {
-    return decodeURIComponent(str);
+    return str; // return decodeURIComponent(str)
   };
 
   var args = {};
@@ -1909,7 +1909,7 @@ export function escapeJsonValue(value) {
   }
 }
 export function escapeFieldValueStr(str) {
-  return '"' + str.replace(/[\\]*"/g, '"').replace(/"/g, '\\"').replace(/\\/g, '\\\\') + '"';
+  return '"' + str.replace(/\\/g, '\\\\').replace(/[\\]*"/g, '"').replace(/"/g, '\\"') + '"';
 }
 export function escapeRowField(value) {
   if (typeof value === 'object' && value) {

package/esm/transport/httpRequest.js

@@ -65,11 +65,13 @@ export function fetchKeepAliveStrategy(endpointUrl, bytesLimit, payload, onRespo
     fetch(url, {
       method: 'POST',
       body: data,
-      keepalive: true
+      keepalive: true,
+      mode: 'cors'
     }).then(function (response) {
       if (typeof onResponse === 'function') {
         onResponse({
-          status: response.status
+          status: response.status,
+          type: response.type
         });
       }
     }, function () {

package/esm/transport/sendWithRetryStrategy.js

@@ -63,7 +63,7 @@ function send(payload, state, sendStrategy, responseData) {
   sendStrategy(payload, function (response) {
     state.bandwidthMonitor.remove(payload);
 
-    if (wasRequestSuccessful(response)) {
+    if (!shouldRetryRequest(response)) {
       state.transportStatus = TransportStatus.UP;
       onSuccess();
     } else {
@@ -93,8 +93,8 @@ function retryQueuedPayloads(reason, state, sendStrategy, reportError) {
   }
 }
 
-function wasRequestSuccessful(response) {
-  return response.status !== 0 && response.status < 500;
+function shouldRetryRequest(response) {
+  return response.type !== 'opaque' && (response.status === 0 && !navigator.onLine || response.status === 408 || response.status === 429 || response.status >= 500);
 }
 
 export function newRetryState() {

package/package.json

@@ -1,24 +1,24 @@
 {
-  "name": "@cloudcare/browser-core",
-  "version": "1.2.9",
-  "main": "cjs/index.js",
-  "module": "esm/index.js",
-  "scripts": {
-    "build": "run-p build:cjs build:esm",
-    "build:cjs": "rm -rf cjs && babel --config-file ./babel.cjs.json --out-dir cjs ./src",
-    "build:esm": "rm -rf esm && babel --config-file ./babel.esm.json --out-dir esm ./src "
-  },
-  "keywords": [
-    "dataflux",
-    "logs",
-    "sdk"
-  ],
-  "repository": {
-    "url": "https://github.com/DataFlux-cn/datakit-js",
-    "type": "git"
-  },
-  "author": "dataflux",
-  "license": "MIT",
-  "description": "DataFlux RUM Web 端数据指标监控",
-  "gitHead": "9a15e3d36ff76e9bd1830516743fb8299ce6829b"
+    "name": "@cloudcare/browser-core",
+    "version": "1.2.12",
+    "main": "cjs/index.js",
+    "module": "esm/index.js",
+    "scripts": {
+        "build": "run-p build:cjs build:esm",
+        "build:cjs": "rm -rf cjs && babel --config-file ./babel.cjs.json --out-dir cjs ./src",
+        "build:esm": "rm -rf esm && babel --config-file ./babel.esm.json --out-dir esm ./src "
+    },
+    "keywords": [
+        "dataflux",
+        "logs",
+        "sdk"
+    ],
+    "repository": {
+        "url": "https://github.com/DataFlux-cn/datakit-js",
+        "type": "git"
+    },
+    "author": "dataflux",
+    "license": "MIT",
+    "description": "DataFlux RUM Web 端数据指标监控",
+    "gitHead": "35aef5d669cd504346a31a1c92381f150d8fff75"
 }

package/src/browser/fetchObservable.js

@@ -13,7 +13,7 @@ export function initFetchObservable() {
 }
 
 function createFetchObservable() {
-  var observable = new Observable(function() {
+  var observable = new Observable(function () {
     if (!window.fetch) {
       return
     }
@@ -21,19 +21,23 @@ function createFetchObservable() {
     var fetchMethod = instrumentMethod(
       window,
       'fetch',
-      function(originalFetch) {
+      function (originalFetch) {
         return function (input, init) {
           var responsePromise
           var context = beforeSend(observable, input, init)
           if (context) {
-            responsePromise = originalFetch.call(this, context.input, context.init)
+            responsePromise = originalFetch.call(
+              this,
+              context.input,
+              context.init
+            )
             afterSend(observable, responsePromise, context)
           } else {
             responsePromise = originalFetch.call(this, input, init)
           }
           return responsePromise
         }
-      }   
+      }
     )
     return fetchMethod.stop
   })
@@ -42,7 +46,10 @@ function createFetchObservable() {
 }
 
 function beforeSend(observable, input, init) {
-  var method = (init && init.method) || (typeof input === 'object' && input.method) || 'GET'
+  var method =
+    (init && init.method) ||
+    (typeof input === 'object' && input.method) ||
+    'GET'
   var url = normalizeUrl((typeof input === 'object' && input.url) || input)
   var startClocks = clocksNow()
 
@@ -52,7 +59,7 @@ function beforeSend(observable, input, init) {
     input: input,
     method: method,
     startClocks: startClocks,
-    url: url,
+    url: url
   }
 
   observable.notify(context)
@@ -60,23 +67,22 @@ function beforeSend(observable, input, init) {
   return context
 }
 
-function afterSend(
-  observable,
-  responsePromise,
-  startContext
-) {
-  var reportFetch = function(response) {
+function afterSend(observable, responsePromise, startContext) {
+  var reportFetch = function (response) {
     var context = startContext
     context.state = 'complete'
     context.duration = elapsed(context.startClocks.timeStamp, timeStampNow())
     if ('stack' in response || response instanceof Error) {
       context.status = 0
-      context.isAborted = response instanceof DOMException && response.code === DOMException.ABORT_ERR
+      context.isAborted =
+        response instanceof DOMException &&
+        response.code === DOMException.ABORT_ERR
       context.error = response
       observable.notify(context)
     } else if ('status' in response) {
       context.response = response
-      context.responseType = response.type
+      context.responseType =
+        (response instanceof Response && response.type) || ''
       context.status = response.status
       context.isAborted = false
       observable.notify(context)

package/src/helper/tools.js

@@ -1143,7 +1143,8 @@ export var getQueryParamsFromUrl = function (url) {
 export var getURLSearchParams = function (queryString) {
   queryString = queryString || ''
   var decodeParam = function (str) {
-    return decodeURIComponent(str)
+    return str
+    // return decodeURIComponent(str)
   }
   var args = {}
   var query = queryString.substring(1)
@@ -1887,9 +1888,9 @@ export function escapeFieldValueStr(str) {
   return (
     '"' +
     str
+      .replace(/\\/g, '\\\\')
       .replace(/[\\]*"/g, '"')
-      .replace(/"/g, '\\"')
-      .replace(/\\/g, '\\\\') +
+      .replace(/"/g, '\\"') +
     '"'
   )
 }

package/src/transport/httpRequest.js

@@ -12,27 +12,28 @@ function addBatchPrecision(url) {
   if (!url) return url
   return url + (url.indexOf('?') === -1 ? '?' : '&') + 'precision=ms'
 }
-export function createHttpRequest(
-  endpointUrl,
-  bytesLimit,
-  reportError
-) {
+export function createHttpRequest(endpointUrl, bytesLimit, reportError) {
   var retryState = newRetryState()
-  var sendStrategyForRetry = function(payload, onResponse) {
+  var sendStrategyForRetry = function (payload, onResponse) {
     return fetchKeepAliveStrategy(endpointUrl, bytesLimit, payload, onResponse)
   }
-    
+
   return {
-    send: function(payload) {
-      sendWithRetryStrategy(payload, retryState, sendStrategyForRetry, reportError)
+    send: function (payload) {
+      sendWithRetryStrategy(
+        payload,
+        retryState,
+        sendStrategyForRetry,
+        reportError
+      )
     },
     /**
      * Since fetch keepalive behaves like regular fetch on Firefox,
      * keep using sendBeaconStrategy on exit
      */
-    sendOnExit: function(payload) {
+    sendOnExit: function (payload) {
       sendBeaconStrategy(endpointUrl, bytesLimit, payload)
-    },
+    }
   }
 }
 
@@ -55,8 +56,6 @@ function sendBeaconStrategy(endpointUrl, bytesLimit, payload) {
   sendXHR(url, data)
 }
 
-
-
 export function fetchKeepAliveStrategy(
   endpointUrl,
   bytesLimit,
@@ -68,14 +67,18 @@ export function fetchKeepAliveStrategy(
   var url = addBatchPrecision(endpointUrl)
   var canUseKeepAlive = isKeepAliveSupported() && bytesCount < bytesLimit
   if (canUseKeepAlive) {
-    fetch(url, { method: 'POST', body: data, keepalive: true })
-    .then(
-      function(response) {
+    fetch(url, {
+      method: 'POST',
+      body: data,
+      keepalive: true,
+      mode: 'cors'
+    }).then(
+      function (response) {
         if (typeof onResponse === 'function') {
-          onResponse({ status: response.status })
+          onResponse({ status: response.status, type: response.type })
         }
       },
-      function() {
+      function () {
         // failed to queue the request
         sendXHR(url, data, onResponse)
       }
@@ -98,12 +101,9 @@ function sendXHR(url, data, onResponse) {
   const request = new XMLHttpRequest()
   request.open('POST', url, true)
   request.send(data)
-  request.addEventListener(
-    'loadend',
-    function(){
-      if (typeof onResponse === 'function') {
-        onResponse({ status: request.status })
-      }
+  request.addEventListener('loadend', function () {
+    if (typeof onResponse === 'function') {
+      onResponse({ status: request.status })
     }
-  )
+  })
 }

package/src/transport/sendWithRetryStrategy.js

@@ -92,7 +92,7 @@ function send(payload, state, sendStrategy, responseData) {
   state.bandwidthMonitor.add(payload)
   sendStrategy(payload, function (response) {
     state.bandwidthMonitor.remove(payload)
-    if (wasRequestSuccessful(response)) {
+    if (!shouldRetryRequest(response)) {
       state.transportStatus = TransportStatus.UP
       onSuccess()
     } else {
@@ -135,10 +135,15 @@ function retryQueuedPayloads(reason, state, sendStrategy, reportError) {
   }
 }
 
-function wasRequestSuccessful(response) {
-  return response.status !== 0 && response.status < 500
+function shouldRetryRequest(response) {
+  return (
+    response.type !== 'opaque' &&
+    ((response.status === 0 && !navigator.onLine) ||
+      response.status === 408 ||
+      response.status === 429 ||
+      response.status >= 500)
+  )
 }
-
 export function newRetryState() {
   return {
     transportStatus: TransportStatus.UP,