@cloudcare/browser-core 3.1.23 → 3.2.0

package/esm/transport/startBatchWithReplica.js

@@ -1,20 +1,36 @@
-import { Batch } from './batch';
+import { createBatch } from './batch';
 import { createHttpRequest } from './httpRequest';
 import { createFlushController } from './flushController';
-export function startBatchWithReplica(configuration, endpointUrl, reportError, pageExitObservable, sessionExpireObservable) {
-  var primaryBatch = createBatch(endpointUrl);
-  function createBatch(endpointUrl) {
-    return new Batch(createHttpRequest(endpointUrl, configuration.batchBytesLimit, configuration.sendContentTypeByJson, reportError), createFlushController({
-      messagesLimit: configuration.batchMessagesLimit,
-      bytesLimit: configuration.batchBytesLimit,
-      durationLimit: configuration.flushTimeout,
-      pageExitObservable: pageExitObservable,
-      sessionExpireObservable: sessionExpireObservable
-    }), configuration.messageBytesLimit, configuration.sendContentTypeByJson);
+export function startBatchWithReplica(configuration, primary, reportError, pageExitObservable, sessionExpireObservable, batchFactoryImp) {
+  if (batchFactoryImp === undefined) {
+    batchFactoryImp = createBatch;
+  }
+  var primaryBatch = createBatchFromConfig(configuration, primary);
+  function createBatchFromConfig(configuration, batchConfiguration) {
+    return batchFactoryImp({
+      encoder: batchConfiguration.encoder,
+      request: createHttpRequest(batchConfiguration.endpoint, configuration.batchBytesLimit, reportError),
+      flushController: createFlushController({
+        messagesLimit: configuration.batchMessagesLimit,
+        bytesLimit: configuration.batchBytesLimit,
+        durationLimit: configuration.flushTimeout,
+        pageExitObservable: pageExitObservable,
+        sessionExpireObservable: sessionExpireObservable
+      }),
+      messageBytesLimit: configuration.messageBytesLimit,
+      sendContentTypeByJson: configuration.sendContentTypeByJson
+    });
   }
   return {
+    flushObservable: primaryBatch.flushController.flushObservable,
     add: function add(message) {
       primaryBatch.add(message);
+    },
+    upsert: function upsert(message, key) {
+      primaryBatch.upsert(message, key);
+    },
+    stop: function stop() {
+      primaryBatch.stop();
     }
   };
 }

package/esm/transport/startBatchWithReplica.js.map

@@ -1 +1 @@
-{"version":3,"file":"startBatchWithReplica.js","names":["Batch","createHttpRequest","createFlushController","startBatchWithReplica","configuration","endpointUrl","reportError","pageExitObservable","sessionExpireObservable","primaryBatch","createBatch","batchBytesLimit","sendContentTypeByJson","messagesLimit","batchMessagesLimit","bytesLimit","durationLimit","flushTimeout","messageBytesLimit","add","message"],"sources":["../../src/transport/startBatchWithReplica.js"],"sourcesContent":["import { Batch } from './batch'\nimport { createHttpRequest } from './httpRequest'\nimport { createFlushController } from './flushController'\nexport function startBatchWithReplica(\n  configuration,\n  endpointUrl,\n  reportError,\n  pageExitObservable,\n  sessionExpireObservable\n) {\n  var primaryBatch = createBatch(endpointUrl)\n\n  function createBatch(endpointUrl) {\n    return new Batch(\n      createHttpRequest(\n        endpointUrl,\n        configuration.batchBytesLimit,\n        configuration.sendContentTypeByJson,\n        reportError\n      ),\n      createFlushController({\n        messagesLimit: configuration.batchMessagesLimit,\n        bytesLimit: configuration.batchBytesLimit,\n        durationLimit: configuration.flushTimeout,\n        pageExitObservable: pageExitObservable,\n        sessionExpireObservable: sessionExpireObservable\n      }),\n      configuration.messageBytesLimit,\n      configuration.sendContentTypeByJson\n    )\n  }\n\n  return {\n    add: function (message) {\n      primaryBatch.add(message)\n    }\n  }\n}\n"],"mappings":"AAAA,SAASA,KAAK,QAAQ,SAAS;AAC/B,SAASC,iBAAiB,QAAQ,eAAe;AACjD,SAASC,qBAAqB,QAAQ,mBAAmB;AACzD,OAAO,SAASC,qBAAqBA,CACnCC,aAAa,EACbC,WAAW,EACXC,WAAW,EACXC,kBAAkB,EAClBC,uBAAuB,EACvB;EACA,IAAIC,YAAY,GAAGC,WAAW,CAACL,WAAW,CAAC;EAE3C,SAASK,WAAWA,CAACL,WAAW,EAAE;IAChC,OAAO,IAAIL,KAAK,CACdC,iBAAiB,CACfI,WAAW,EACXD,aAAa,CAACO,eAAe,EAC7BP,aAAa,CAACQ,qBAAqB,EACnCN,WACF,CAAC,EACDJ,qBAAqB,CAAC;MACpBW,aAAa,EAAET,aAAa,CAACU,kBAAkB;MAC/CC,UAAU,EAAEX,aAAa,CAACO,eAAe;MACzCK,aAAa,EAAEZ,aAAa,CAACa,YAAY;MACzCV,kBAAkB,EAAEA,kBAAkB;MACtCC,uBAAuB,EAAEA;IAC3B,CAAC,CAAC,EACFJ,aAAa,CAACc,iBAAiB,EAC/Bd,aAAa,CAACQ,qBAChB,CAAC;EACH;EAEA,OAAO;IACLO,GAAG,EAAE,SAAAA,IAAUC,OAAO,EAAE;MACtBX,YAAY,CAACU,GAAG,CAACC,OAAO,CAAC;IAC3B;EACF,CAAC;AACH","ignoreList":[]}
+{"version":3,"file":"startBatchWithReplica.js","names":["createBatch","createHttpRequest","createFlushController","startBatchWithReplica","configuration","primary","reportError","pageExitObservable","sessionExpireObservable","batchFactoryImp","undefined","primaryBatch","createBatchFromConfig","batchConfiguration","encoder","request","endpoint","batchBytesLimit","flushController","messagesLimit","batchMessagesLimit","bytesLimit","durationLimit","flushTimeout","messageBytesLimit","sendContentTypeByJson","flushObservable","add","message","upsert","key","stop"],"sources":["../../src/transport/startBatchWithReplica.js"],"sourcesContent":["import { createBatch } from './batch'\nimport { createHttpRequest } from './httpRequest'\nimport { createFlushController } from './flushController'\nexport function startBatchWithReplica(\n  configuration,\n  primary,\n  reportError,\n  pageExitObservable,\n  sessionExpireObservable,\n  batchFactoryImp\n) {\n  if (batchFactoryImp === undefined) {\n    batchFactoryImp = createBatch\n  }\n  var primaryBatch = createBatchFromConfig(configuration, primary)\n\n  function createBatchFromConfig(configuration, batchConfiguration) {\n    return batchFactoryImp({\n      encoder: batchConfiguration.encoder,\n      request: createHttpRequest(\n        batchConfiguration.endpoint,\n        configuration.batchBytesLimit,\n        reportError\n      ),\n      flushController: createFlushController({\n        messagesLimit: configuration.batchMessagesLimit,\n        bytesLimit: configuration.batchBytesLimit,\n        durationLimit: configuration.flushTimeout,\n        pageExitObservable: pageExitObservable,\n        sessionExpireObservable: sessionExpireObservable\n      }),\n      messageBytesLimit: configuration.messageBytesLimit,\n      sendContentTypeByJson: configuration.sendContentTypeByJson\n    })\n  }\n  return {\n    flushObservable: primaryBatch.flushController.flushObservable,\n    add: function (message) {\n      primaryBatch.add(message)\n    },\n    upsert: function (message, key) {\n      primaryBatch.upsert(message, key)\n    },\n\n    stop: function () {\n      primaryBatch.stop()\n    }\n  }\n}\n"],"mappings":"AAAA,SAASA,WAAW,QAAQ,SAAS;AACrC,SAASC,iBAAiB,QAAQ,eAAe;AACjD,SAASC,qBAAqB,QAAQ,mBAAmB;AACzD,OAAO,SAASC,qBAAqBA,CACnCC,aAAa,EACbC,OAAO,EACPC,WAAW,EACXC,kBAAkB,EAClBC,uBAAuB,EACvBC,eAAe,EACf;EACA,IAAIA,eAAe,KAAKC,SAAS,EAAE;IACjCD,eAAe,GAAGT,WAAW;EAC/B;EACA,IAAIW,YAAY,GAAGC,qBAAqB,CAACR,aAAa,EAAEC,OAAO,CAAC;EAEhE,SAASO,qBAAqBA,CAACR,aAAa,EAAES,kBAAkB,EAAE;IAChE,OAAOJ,eAAe,CAAC;MACrBK,OAAO,EAAED,kBAAkB,CAACC,OAAO;MACnCC,OAAO,EAAEd,iBAAiB,CACxBY,kBAAkB,CAACG,QAAQ,EAC3BZ,aAAa,CAACa,eAAe,EAC7BX,WACF,CAAC;MACDY,eAAe,EAAEhB,qBAAqB,CAAC;QACrCiB,aAAa,EAAEf,aAAa,CAACgB,kBAAkB;QAC/CC,UAAU,EAAEjB,aAAa,CAACa,eAAe;QACzCK,aAAa,EAAElB,aAAa,CAACmB,YAAY;QACzChB,kBAAkB,EAAEA,kBAAkB;QACtCC,uBAAuB,EAAEA;MAC3B,CAAC,CAAC;MACFgB,iBAAiB,EAAEpB,aAAa,CAACoB,iBAAiB;MAClDC,qBAAqB,EAAErB,aAAa,CAACqB;IACvC,CAAC,CAAC;EACJ;EACA,OAAO;IACLC,eAAe,EAAEf,YAAY,CAACO,eAAe,CAACQ,eAAe;IAC7DC,GAAG,EAAE,SAAAA,IAAUC,OAAO,EAAE;MACtBjB,YAAY,CAACgB,GAAG,CAACC,OAAO,CAAC;IAC3B,CAAC;IACDC,MAAM,EAAE,SAAAA,OAAUD,OAAO,EAAEE,GAAG,EAAE;MAC9BnB,YAAY,CAACkB,MAAM,CAACD,OAAO,EAAEE,GAAG,CAAC;IACnC,CAAC;IAEDC,IAAI,EAAE,SAAAA,KAAA,EAAY;MAChBpB,YAAY,CAACoB,IAAI,CAAC,CAAC;IACrB;EACF,CAAC;AACH","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudcare/browser-core",
-    "version": "3.1.23",
+    "version": "3.2.0",
     "main": "cjs/index.js",
     "module": "esm/index.js",
     "types": "types/index.d.ts",
@@ -22,5 +22,5 @@
     "author": "dataflux",
     "license": "MIT",
     "description": "DataFlux RUM Web 端数据指标监控",
-    "gitHead": "a69b3c11e9f5754160747bb80bafe857c0d095ca"
+    "gitHead": "81a7f878553edc3a3fe9eb57779cad505c55d4de"
 }

package/src/browser/pageExitObservable.js

@@ -19,8 +19,8 @@ export function createPageExitObservable() {
      * (e.g. when user switches to a different application, goes to homescreen, etc), or is being unloaded.
      */
     var visibilityChangeListener = addEventListeners(
-      document,
-      [DOM_EVENT.VISIBILITY_CHANGE, DOM_EVENT.FREEZE, DOM_EVENT.PAGE_HIDE],
+      window,
+      [DOM_EVENT.VISIBILITY_CHANGE, DOM_EVENT.FREEZE],
       function (event) {
         if (
           event.type === DOM_EVENT.VISIBILITY_CHANGE &&

package/src/browser/runOnReadyState.js

@@ -1,16 +1,18 @@
 import { addEventListener } from './addEventListener'
 import { DOM_EVENT } from '../helper/enums'
+import { noop } from '../helper/tools'
 export function runOnReadyState(expectedReadyState, callback) {
   if (
     document.readyState === expectedReadyState ||
     document.readyState === 'complete'
   ) {
     callback()
+    return { stop: noop }
   } else {
     var eventName =
       expectedReadyState === 'complete'
         ? DOM_EVENT.LOAD
         : DOM_EVENT.DOM_CONTENT_LOADED
-    addEventListener(window, eventName, callback, { once: true })
+    return addEventListener(window, eventName, callback, { once: true })
   }
 }

package/src/console/consoleObservable.js

@@ -6,10 +6,12 @@ import {
   flattenErrorCauses
 } from '../helper/errorTools'
 import { mergeObservables, Observable } from '../helper/observable'
-import { find, map } from '../helper/tools'
+import { find, map, clocksNow } from '../helper/tools'
 import { jsonStringify } from '../helper/serialisation/jsonStringify'
 import { ConsoleApiName } from '../helper/display'
 import { callMonitored } from '../helper/monitor'
+import { ErrorHandling } from '../helper/enums'
+import { ErrorSource } from '../helper/errorTools'
 var consoleObservablesByApi = {}
 
 export function initConsoleObservable(apis) {
@@ -22,7 +24,9 @@ export function initConsoleObservable(apis) {
 
   return mergeObservables.apply(this, consoleObservables)
 }
-
+export function resetConsoleObservable() {
+  consoleObservablesByApi = {}
+}
 /* eslint-disable no-console */
 function createConsoleObservable(api) {
   return new Observable(function (observable) {
@@ -45,27 +49,31 @@ function buildConsoleLog(params, api, handlingStack) {
   var message = map(params, function (param) {
     return formatConsoleParameters(param)
   }).join(' ')
-  var stack
-  var causes
+  var error
   if (api === ConsoleApiName.error) {
     var firstErrorParam = find(params, function (param) {
       return param instanceof Error
     })
-    stack = firstErrorParam
-      ? toStackTraceString(computeStackTrace(firstErrorParam))
-      : undefined
-    message = 'console error: ' + message
-    causes = firstErrorParam
-      ? flattenErrorCauses(firstErrorParam, 'console')
-      : undefined
+    error = {
+      stack: firstErrorParam
+        ? toStackTraceString(computeStackTrace(firstErrorParam))
+        : undefined,
+      causes: firstErrorParam
+        ? flattenErrorCauses(firstErrorParam, 'console')
+        : undefined,
+      startClocks: clocksNow(),
+      message: message,
+      source: ErrorSource.CONSOLE,
+      handling: ErrorHandling.HANDLED,
+      handlingStack: handlingStack
+    }
   }
 
   return {
     api: api,
     message: message,
-    stack: stack,
-    handlingStack: handlingStack,
-    causes: causes
+    error: error,
+    handlingStack: handlingStack
   }
 }
 

package/src/dataMap.js

@@ -97,6 +97,7 @@ export var dataMap = {
     tags: {
       trace_id: '_gc.trace_id',
       span_id: '_gc.span_id',
+      resource_id: 'resource.id',
       resource_url: 'resource.url',
       resource_url_host: 'resource.url_host',
       resource_url_path: 'resource.url_path',
@@ -159,7 +160,13 @@ export var dataMap = {
       long_task_id: 'long_task.id'
     },
     fields: {
-      duration: 'long_task.duration'
+      duration: 'long_task.duration',
+      blocking_duration: 'long_task.blocking_duration',
+      first_ui_event_timestamp: 'long_task.first_ui_event_timestamp',
+      render_start: 'long_task.render_start',
+      style_and_layout_start: 'long_task.style_and_layout_start',
+      long_task_start_time: 'long_task.start_time',
+      scripts: ['string', 'long_task.scripts']
     }
   },
   action: {
@@ -205,7 +212,9 @@ export var dataMap = {
       status: 'status'
     },
     fields: {
-      message: ['string', 'message']
+      message: ['string', 'message'],
+      error_message: ['string', 'error.message'],
+      error_stack: ['string', 'error.stack']
     }
   }
 }

package/src/helper/boundedBuffer.js

@@ -1,22 +1,29 @@
-import { each } from './tools'
+import { removeItem } from './tools'
 var BUFFER_LIMIT = 500
+export function createBoundedBuffer() {
+  var buffer = []
 
-var _BoundedBuffer = function () {
-  this.buffer = []
-}
-_BoundedBuffer.prototype = {
-  add: function (callback) {
-    var length = this.buffer.push(callback)
+  var add = function (callback) {
+    var length = buffer.push(callback)
     if (length > BUFFER_LIMIT) {
-      this.buffer.splice(0, 1)
+      buffer.splice(0, 1)
     }
-  },
+  }
+
+  var remove = function (callback) {
+    removeItem(buffer, callback)
+  }
 
-  drain: function () {
-    each(this.buffer, function (callback) {
-      callback()
+  const drain = function (arg) {
+    buffer.forEach(function (callback) {
+      callback(arg)
     })
-    this.buffer.length = 0
+    buffer.length = 0
+  }
+
+  return {
+    add: add,
+    remove: add,
+    drain: drain
   }
 }
-export var BoundedBuffer = _BoundedBuffer

package/src/helper/connectivity.js

@@ -0,0 +1,11 @@
+export function getConnectivity() {
+  var navigator = window.navigator
+  return {
+    status: navigator.onLine ? 'connected' : 'not_connected',
+    interfaces:
+      navigator.connection && navigator.connection.type
+        ? [navigator.connection.type]
+        : undefined,
+    effective_type: navigator.connection?.effectiveType
+  }
+}

package/src/helper/display.js

@@ -1,21 +1,23 @@
-
 export var ConsoleApiName = {
   log: 'log',
   debug: 'debug',
   info: 'info',
   warn: 'warn',
-  error: 'error',
-}
-export var display = function(api) {
-  var args = [].slice.call(arguments, 1)
-  if (!Object.prototype.hasOwnProperty.call(ConsoleApiName, api)) {
-    api = ConsoleApiName.log
-  }
-  display[api].apply(display,args)
+  error: 'error'
 }
+export var globalConsole = console
+
+export var originalConsoleMethods = {}
+Object.keys(ConsoleApiName).forEach(function (name) {
+  originalConsoleMethods[name] = globalConsole[name]
+})
 
-display.debug = console.debug.bind(console)
-display.log = console.log.bind(console)
-display.info = console.info.bind(console)
-display.warn = console.warn.bind(console)
-display.error = console.error.bind(console)
+var PREFIX = 'GUANCE Browser SDK:'
+
+export var display = {
+  debug: originalConsoleMethods.debug.bind(globalConsole, PREFIX),
+  log: originalConsoleMethods.log.bind(globalConsole, PREFIX),
+  info: originalConsoleMethods.info.bind(globalConsole, PREFIX),
+  warn: originalConsoleMethods.warn.bind(globalConsole, PREFIX),
+  error: originalConsoleMethods.error.bind(globalConsole, PREFIX)
+}

package/src/helper/displayAlreadyInitializedError.js

@@ -0,0 +1,7 @@
+import { display } from './display'
+
+export function displayAlreadyInitializedError(sdkName, initConfiguration) {
+  if (!initConfiguration.silentMultipleInit) {
+    display.error(sdkName + ' is already initialized.')
+  }
+}

package/src/helper/encoder.js

@@ -0,0 +1,43 @@
+import { computeBytesCount } from './byteUtils'
+
+export function createIdentityEncoder() {
+  var output = ''
+  var outputBytesCount = 0
+
+  return {
+    isAsync: false,
+
+    isEmpty: function () {
+      return !output
+    },
+
+    write: function (data, callback) {
+      var additionalEncodedBytesCount = computeBytesCount(data)
+      outputBytesCount += additionalEncodedBytesCount
+      output += data
+      if (callback) {
+        callback(additionalEncodedBytesCount)
+      }
+    },
+
+    finish: function (callback) {
+      callback(this.finishSync())
+    },
+
+    finishSync: function () {
+      var result = {
+        output: output,
+        outputBytesCount: outputBytesCount,
+        rawBytesCount: outputBytesCount,
+        pendingData: ''
+      }
+      output = ''
+      outputBytesCount = 0
+      return result
+    },
+
+    estimateEncodedBytesCount: function (data) {
+      return data.length
+    }
+  }
+}

package/src/helper/lifeCycle.js

@@ -1,6 +1,5 @@
 import { each, filter } from './tools'
 export var LifeCycleEventType = {
-  PERFORMANCE_ENTRIES_COLLECTED: 'PERFORMANCE_ENTRIES_COLLECTED',
   AUTO_ACTION_COMPLETED: 'AUTO_ACTION_COMPLETED',
   BEFORE_VIEW_CREATED: 'BEFORE_VIEW_CREATED',
   VIEW_CREATED: 'VIEW_CREATED',

package/src/helper/monitor.js

@@ -25,21 +25,21 @@ export function callMonitored(fn, context, args) {
   try {
     return fn.apply(context, args)
   } catch (e) {
-    displayIfDebugEnabled(ConsoleApiName.error, e)
+    displayIfDebugEnabled(e)
     if (onMonitorErrorCollected) {
       try {
         onMonitorErrorCollected(e)
       } catch (e) {
-        displayIfDebugEnabled(ConsoleApiName.error, e)
+        displayIfDebugEnabled(e)
       }
     }
   }
 }
 
-export function displayIfDebugEnabled(api) {
-  var args = [].slice.call(arguments, 1)
-  //   display.apply(null, [api, '[MONITOR]'].concat(args))
+export function displayIfDebugEnabled() {
+  var args = [].slice.call(arguments)
+  //   display.error.apply(null, ['[MONITOR]'].concat(args))
   if (debugMode) {
-    display.apply(null, [api, '[MONITOR]'].concat(args))
+    display.error.apply(null, ['[MONITOR]'].concat(args))
   }
 }

package/src/helper/serialisation/jsonStringify.js

@@ -39,7 +39,7 @@ export function detachToJsonMethod(value) {
   const objectToJson = object.toJSON
   if (objectToJson) {
     delete object.toJSON
-    return () => {
+    return function () {
       object.toJSON = objectToJson
     }
   }

package/src/index.js

@@ -48,7 +48,10 @@ export * from './helper/serialisation/heavyCustomerDataWarning'
 export * from './helper/serialisation/jsonStringify'
 export * from './helper/serialisation/rowData'
 export * from './helper/serialisation/storedContextManager'
+export * from './helper/encoder'
 export * from './user'
 export * from './helper/polyfills'
 export * from './telemetry/telemetry'
 export * from './helper/catchUserErrors'
+export * from './helper/connectivity'
+export * from './helper/displayAlreadyInitializedError'

package/src/report/reportObservable.js

@@ -1,6 +1,13 @@
 import { toStackTraceString } from '../helper/errorTools'
 import { mergeObservables, Observable } from '../helper/observable'
-import { includes, safeTruncate, filter, each } from '../helper/tools'
+import {
+  includes,
+  safeTruncate,
+  filter,
+  each,
+  assign,
+  clocksNow
+} from '../helper/tools'
 import { addEventListener } from '../browser/addEventListener'
 import { DOM_EVENT } from '../helper/enums'
 import { monitor } from '../helper/monitor'
@@ -33,7 +40,7 @@ function createReportObservable(reportTypes) {
 
     var handleReports = monitor(function (reports) {
       each(reports, function (report) {
-        observable.notify(buildRawReportFromReport(report))
+        observable.notify(buildRawReportErrorFromReport(report))
       })
     })
 
@@ -47,34 +54,29 @@ function createReportObservable(reportTypes) {
       observer.disconnect()
     }
   })
-
-  return observable
 }
 
 function createCspViolationReportObservable(configuration) {
   return new Observable(function (observable) {
-    var handleCspViolation = function (event) {
-      observable.notify(buildRawReportFromCspViolation(event))
-    }
-
     var _addEventListener = addEventListener(
       document,
       DOM_EVENT.SECURITY_POLICY_VIOLATION,
-      handleCspViolation
+      function (event) {
+        observable.notify(buildRawReportErrorFromCspViolation(event))
+      }
     )
 
     return _addEventListener.stop
   })
-  return observable
 }
 
-function buildRawReportFromReport(report) {
+function buildRawReportErrorFromReport(report) {
   var body = report.body
   var type = report.type
-  return {
-    type: type,
-    subtype: body.id,
+  return buildRawReportError({
+    type: body.id,
     message: type + ': ' + body.message,
+    originalError: report,
     stack: buildStack(
       body.id,
       body.message,
@@ -82,32 +84,46 @@ function buildRawReportFromReport(report) {
       body.lineNumber,
       body.columnNumber
     )
-  }
+  })
 }
-
-function buildRawReportFromCspViolation(event) {
-  var type = RawReportType.cspViolation
+function buildRawReportError(partial) {
+  return assign(
+    {
+      startClocks: clocksNow(),
+      source: ErrorSource.REPORT,
+      handling: ErrorHandling.UNHANDLED
+    },
+    partial
+  )
+}
+function buildRawReportErrorFromCspViolation(event) {
   var message =
     "'" +
     event.blockedURI +
     "' blocked by '" +
     event.effectiveDirective +
     "' directive"
-  return {
-    type: RawReportType.cspViolation,
-    subtype: event.effectiveDirective,
-    message: type + ': ' + message,
+  return buildRawReportError({
+    type: event.effectiveDirective,
+    message: RawReportType.cspViolation + ': ' + message,
+    originalError: event,
+    csp: {
+      disposition: event.disposition
+    },
     stack: buildStack(
       event.effectiveDirective,
-      message +
-        ' of the policy "' +
-        safeTruncate(event.originalPolicy, 100, '...') +
-        '"',
+      event.originalPolicy
+        ? `${message} of the policy "${safeTruncate(
+            event.originalPolicy,
+            100,
+            '...'
+          )}"`
+        : 'no policy',
       event.sourceFile,
       event.lineNumber,
       event.columnNumber
     )
-  }
+  })
 }
 
 function buildStack(name, message, sourceFile, lineNumber, columnNumber) {