fleetmap-reports 1.0.708 → 1.0.710

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.708",
+  "version": "1.0.710",
   "description": "",
   "main": "src/index.js",
   "scripts": {
@@ -14,7 +14,6 @@
     "@turf/distance": "^6.5.0",
     "@turf/helpers": "^6.5.0",
     "@turf/point-to-line-distance": "^6.5.0",
-    "async": "^3.2.4",
     "axios": "^0.22.0",
     "axios-cookiejar-support": "^1.0.1",
     "docx": "^7.3.0",

package/src/tests/fuel.test.js

@@ -5,7 +5,6 @@ const assert = require('assert')
 const deviceId = 122575
 // eslint-disable-next-line no-undef
 describe('Test_Reports', function () {
-  this.timeout(5000000)
   it('Trip by device', async () => {
     console.log('trip by device')
     const report = await getReports()

package/src/util/parallel.js

@@ -0,0 +1,36 @@
+const { sliceArray } = require('../automaticReports')
+const cluster = require('cluster')
+
+exports.parallel = (report, method, devices, route, userData) => {
+  const numCPUs = require('os').cpus().length
+  return new Promise((resolve) => {
+    if (cluster.isPrimary) {
+      console.log(`Master ${process.pid} is running`, process.cwd())
+      cluster.setupPrimary({
+        exec: './src/worker.js'
+      })
+      const sliced = sliceArray(devices, numCPUs)
+      const _result = []
+      let done = 0
+      sliced.forEach((_devices) => {
+        const worker = cluster.fork()
+        worker.send({
+          report,
+          method,
+          args: [_devices, route.filter(p => _devices.find(d => d.id === p.deviceId)), userData]
+        })
+        worker.on('message', ({ result }) => {
+          console.log(`Received result from worker ${worker.process.pid}:`, result)
+          _result.push(result)
+          if (++done === sliced.length) {
+            resolve(_result.flat())
+          }
+        })
+      })
+
+      cluster.on('exit', (worker, code, signal) => {
+        console.log('Worker died', worker.process.pid, code, signal)
+      })
+    }
+  })
+}

package/src/worker.js

@@ -0,0 +1,6 @@
+process.on('message', async (message) => {
+  const { report, method, args } = message
+  console.log(message)
+  const _report = require(`./${report}`)
+  process.send({ result: await _report[method](...args) })
+})

package/src/zone-report.js

@@ -2,7 +2,8 @@ const automaticReports = require('./automaticReports')
 const {
   convertMS, convertToLocaleString, getTranslations, convertToFeature, convertPositionToFeature,
   calculateDistance,
-  sortPositions, getDates, convertToLocaleDateString, convertToLocaleTimeString
+  sortPositions, getDates, convertToLocaleDateString, convertToLocaleTimeString,
+  isClientSide
 } = require('./util/utils')
 const jsPDF = require('jspdf')
 require('jspdf-autotable')
@@ -12,9 +13,9 @@ const { getStyle } = require('./reportStyle')
 const { getUserPartner } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
 const axios = require('axios')
-const { processServerSide } = require('./util')
 const { filterPositions } = require('./util/route')
 const { checkGeofenceIn } = require('./util/geofence')
+const { parallel } = require('./util/parallel')
 const sliceSize = 100
 const deviceChunk = 5
 const fileName = 'ZoneReport'
@@ -27,19 +28,10 @@ async function createZoneReport (from, to, userData, traccar) {
     xpert: devices.filter(d => d.attributes.xpert).length > 0
   }
 
-  if (processServerSide(userData)) {
+  if (isClientSide()) {
     const url = `https://${process.env.SERVER_HOST}/reports/zone-report`
-    const sliced = automaticReports.sliceArray(devices, sliceSize)
-    const promises = []
-    for (const slice of sliced) {
-      promises.push(axios.post(url, { from, to, userData: { ...userData, devices: slice } }, { withCredentials: true })
-        .then(d => d.data)
-        .then(data => allData.devices.push(...(data[0].devices)))
-      )
-    }
-    await Promise.all(promises)
-    reportData.push(allData)
-    return reportData
+    return axios.post(url, { from, to, userData }, { withCredentials: true })
+      .then(d => d.data)
   }
   const types = ['geofenceEnter', 'geofenceExit']
 
@@ -75,8 +67,7 @@ async function createZoneReport (from, to, userData, traccar) {
       deviceCount, devices.length, sliceSize, deviceChunk, undefined)
 
     const route = filterPositions(data.route)
-    const alerts = await getInAndOutEvents(slice, route, userData)
-
+    const alerts = await parallel('zone-report', 'getInAndOutEvents', slice, route, userData)
     allData.devices.push(...await processDevices(from, to, devices, userData, { alerts, route }))
 
     deviceCount = deviceCount + slice.length
@@ -304,18 +295,16 @@ async function getInAndOutEvents (devices, route, userData) {
   const events = []
   const geofencesFeatures = userData.geofences.map(g => convertToFeature(g))
 
-  const async = require('async')
-  await async.parallel(devices.map(async.asyncify(async d => {
+  devices.forEach(d => {
     const deviceRoute = route.filter(p => p.deviceId === d.id)
     const routePoints = deviceRoute.sort(sortPositions).map(p => convertPositionToFeature(p))
-    const deviceEvents = []
     routePoints.filter(p => p.properties.position.valid).forEach((p, i, array) => {
       p.inside = {}
       if (!i) {
         geofencesFeatures.forEach((g, id) => {
           if (checkGeofenceIn(p, g)) {
             p.inside[id] = true
-            deviceEvents.push(createEvent('geofenceIn', d.id, p, g))
+            events.push(createEvent('geofenceIn', d.id, p, g))
           }
         })
         return
@@ -324,20 +313,19 @@ async function getInAndOutEvents (devices, route, userData) {
       geofencesFeatures.forEach((g, id) => {
         if (previous.inside[id]) {
           if (!checkGeofenceIn(p, g)) {
-            deviceEvents.push(createEvent('geofenceExit', d.id, p, g))
+            events.push(createEvent('geofenceExit', d.id, p, g))
           } else {
             p.inside[id] = true
           }
         } else {
           if (checkGeofenceIn(p, g)) {
             p.inside[id] = true
-            deviceEvents.push(createEvent('geofenceEnter', d.id, p, g))
+            events.push(createEvent('geofenceEnter', d.id, p, g))
           }
         }
       })
     })
-    events.push(...deviceEvents)
-  })))
+  })
   return events
 }
 
@@ -555,3 +543,4 @@ function geofenceExit (user, row) {
 exports.createZoneReport = createZoneReport
 exports.exportZoneReportToPDF = exportZoneReportToPDF
 exports.exportZoneReportToExcel = exportZoneReportToExcel
+exports.getInAndOutEvents = getInAndOutEvents