fleetmap-reports 1.0.746 → 1.0.748

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fleetmap-reports",
-  "version": "1.0.746",
+  "version": "1.0.748",
   "description": "",
   "main": "src/index.js",
   "scripts": {

package/src/automaticReports.js

@@ -8,6 +8,7 @@ function sliceArray (longArray, size) {
   const arrayToSlice = longArray.slice()
 
   const arrayOfArrays = []
+  console.log('slice', arrayToSlice.length, 'in chunks of', size)
   for (let i = 0; i < arrayToSlice.length; i += size) {
     arrayOfArrays.push(arrayToSlice.slice(i, i + size))
   }

package/src/trip-report.js

@@ -23,19 +23,16 @@ const { parallel } = require('./util/parallel')
 const fileName = 'TripReport'
 
 async function createTripReport (from, to, userData, traccar) {
-  console.log('Create TripReport')
+  console.log('createTripReport', from, to, userData.byDriver ? 'by driver' : userData.byGroup ? 'by group' : 'by device')
   const reportData = []
 
   if (userData.byDriver) {
-    console.log('ByDriver')
     const report = await createTripReportByDriver(from, to, userData, traccar)
     reportData.push(report)
   } else if (userData.byGroup) {
-    console.log('ByGroup')
     const allData = await createTripReportByGroup(from, to, userData, traccar)
     reportData.push(...allData)
   } else {
-    console.log('ByDevice')
     const report = await createTripReportByDevice(from, to, userData, traccar)
     reportData.push(report)
   }
@@ -116,7 +113,7 @@ async function createTripReportByGroup (from, to, userData, traccar) {
 
 async function createTripReportByDriver (from, to, userData, traccar) {
   const devices = await traccar.devices.devicesGet().then(d => d.data)
-  console.log(devices.length)
+  console.log(devices.length, 'devices')
 
   if (!devices.length) {
     // Empty report
@@ -125,9 +122,7 @@ async function createTripReportByDriver (from, to, userData, traccar) {
 
   const results = await reportByDriver(devices, traccar, from, to, userData, processDrivers)
 
-  const report = {
-    drivers: []
-  }
+  const report = { drivers: [] }
 
   results.drivers.forEach(result => {
     const driver = report.drivers.find(d => d.driver.id === result.driver.id)

package/src/util/driver.js

@@ -17,20 +17,15 @@ async function devicesByDriver (traccarInstance, from, to, drivers, devices) {
 }
 
 async function reportByDriver (devices, traccar, from, to, userData, processor) {
-  const report = {
-    drivers: []
-  }
+  const report = { drivers: [] }
 
   const sliced = automaticReports.sliceArray(devices, 5)
 
   let deviceCount = 0
   for (const slice of sliced) {
     const allInOne = await traccarHelper.getAllInOne(traccar, from, to, slice, true, true, true, false, deviceCount, devices.length)
-
     const results = await processor(from, to, userData, { trips: allInOne.trips, route: allInOne.route, stops: allInOne.stops })
-
     report.drivers.push(...results)
-
     deviceCount = deviceCount + slice.length
   }
 

package/src/util/parallel.js

@@ -7,13 +7,15 @@ exports.parallel = (report, method, toSlice, ...args) => {
   return new Promise((resolve, reject) => {
     if (cluster.isPrimary) {
       console.log('master', process.pid, 'is running', process.cwd(), 'with', numCPUs, 'cpus')
-      console.log('setupPrimary', cluster.setupPrimary({
-        exec: path.resolve(__dirname, 'worker.js')
-      }), __dirname, 'worker.js')
+      cluster.setupPrimary({ exec: path.resolve(__dirname, 'worker.js') })
       const sliced = toSlice.length > (numCPUs - 1) ? sliceArray(toSlice, toSlice.length / (numCPUs - 1)) : toSlice
       const _result = []
       let done = 0
       let workerCount = 0
+      if (!sliced.length) {
+        console.error(report, method, 'got sliced length', sliced.length, toSlice)
+        reject(new Error('0 to process'))
+      }
       sliced.forEach((slice) => {
         try {
           console.log('forking worker', workerCount++, report, method, slice)