fleetmap-reports 1.0.740 → 1.0.742

package/package.json

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

package/src/automaticReports.js

@@ -65,4 +65,3 @@ exports.calculateSpentFuel = calculateSpentFuel
 exports.calculateXpertSpentFuel = calculateXpertSpentFuel
 exports.calculateXpertDistance = calculateXpertDistance
 exports.maxParallelRequests = maxParallelRequests
-

package/src/kms-report.js

@@ -18,20 +18,15 @@ const { getDriverData } = require('./util/driver')
 const fileName = 'KmsReport'
 
 async function createKmsReport (from, to, userData, traccarInstance) {
-  console.log('Create KmsReport')
-
-  console.log(from, to)
+  console.log('Create KmsReport', from, to, userData.byDriver ? 'by driver' : (userData.byGroup ? 'by group' : 'by device'))
   const reportData = []
   if (userData.byDriver) {
-    console.log('ByDriver')
     const allData = await createKmsReportByDriver(from, to, userData, traccarInstance)
     reportData.push(allData)
   } else if (userData.byGroup) {
-    console.log('ByGroup')
     const allData = await createKmsReportByGroup(from, to, userData, traccarInstance)
     reportData.push(...allData)
   } else {
-    console.log('ByDevice')
     const allData = await createKmsReportByDevice(from, to, userData, traccarInstance)
     reportData.push(allData)
   }

package/src/tests/kms.test.js

@@ -8,13 +8,23 @@ describe('Kms_Reports', function () {
     const reports = await getReports()
     const userData = await reports.getUserData()
     userData.devices = userData.devices.filter(d => d.id === 22326)
-    const data = await reports.kmsReport(new Date(2021, 10, 1, 0, 0, 0), new Date(2021, 10, 31, 23, 59, 59),
+    const data = await reports.kmsReport(new Date(2023, 5, 1, 0, 0, 0), new Date(2023, 5, 31, 23, 59, 59),
       userData)
     assert.equal(data.length, 1)
     assert.equal(data.length, 1)
     const device = data[0].devices.find(d => d.device.id === 22326)
-    assert.equal(device.summary.distance, 1183950.9299999475) // Total Kms
+    assert.notEqual(device, undefined)
+    assert.equal(device.summary.distance, 1878840.7300000389) // Total Kms
   }, 30000)
+  it('works with many devices', async () => {
+    const reports = await getReports(process.env.USER_NOGARTEL, process.env.PASS_NOGARTEL)
+    const userData = await reports.getUserData()
+    const data = await reports.kmsReport(new Date(2023, 5, 1, 0, 0, 0), new Date(2023, 5, 31, 23, 59, 59),
+      userData)
+    assert.equal(data.length, 1)
+    assert.notEqual(device, undefined)
+    assert.equal(device.summary.distance, 1878840.7300000389) // Total Kms
+  }, 300000)
   // eslint-disable-next-line no-undef
   it('KmsReport byDevice groupByDay', async () => {
     const reports = await getReports()

package/src/util/parallel.js

@@ -2,50 +2,46 @@ const { sliceArray } = require('../automaticReports')
 const path = require('path')
 
 exports.parallel = (report, method, toSlice, ...args) => {
-  try {
-    const cluster = require('cluster')
-    const numCPUs = require('os').cpus().length
-    return new Promise((resolve, reject) => {
-      if (cluster.isPrimary) {
-        console.log(`Master ${process.pid} is running`, process.cwd())
-        cluster.setupPrimary({
-          exec: path.resolve(__dirname, 'worker.js')
-        })
-        const sliced = sliceArray(toSlice, toSlice.length / (numCPUs - 1))
-        const _result = []
-        let done = 0
-        let workerCount = 0
-        sliced.forEach((slice) => {
-          try {
-            const worker = cluster.fork()
-            workerCount++
-            worker.send({
-              report,
-              method,
-              args: [slice, ...args]
-            })
-            worker.on('message', ({ result }) => {
-              console.log('Received result from worker', worker.process.pid)
-              _result.push(result)
-              if (++done === sliced.length) {
-                resolve(_result.flat())
-              }
-            })
-          } catch (e) {
-            console.error(report, method, 'worker', workerCount, 'numCPUs', numCPUs)
-            reject(e)
-          }
-        })
+  const cluster = require('cluster')
+  const numCPUs = require('os').cpus().length
+  return new Promise((resolve, reject) => {
+    if (cluster.isPrimary) {
+      console.log(`master ${process.pid} is running`, process.cwd())
+      cluster.setupPrimary({
+        exec: path.resolve(__dirname, 'worker.js')
+      })
+      const sliced = sliceArray(toSlice, toSlice.length / (numCPUs - 1))
+      const _result = []
+      let done = 0
+      let workerCount = 0
+      sliced.forEach((slice) => {
+        try {
+          console.log('forking', workerCount++)
+          const worker = cluster.fork()
+          worker.send({
+            report,
+            method,
+            args: [slice, ...args]
+          })
+          worker.on('message', ({ result }) => {
+            console.log('received result from worker', worker.process.pid)
+            _result.push(result)
+            if (++done === sliced.length) {
+              resolve(_result.flat())
+            }
+          })
+        } catch (e) {
+          console.error(report, method, 'worker', workerCount, 'numCPUs', numCPUs)
+          reject(e)
+        }
+      })
 
-        cluster.on('exit', (worker, code, signal) => {
-          console.log('Worker died', worker.process.pid, code, signal)
-          if (signal === 'SIGKILL') {
-            reject(new Error(`Worker died ${worker.process.pid}, code ${code} signal ${signal}`))
-          }
-        })
-      }
-    })
-  } catch (e) {
-    console.log('ClientSide')
-  }
+      cluster.on('exit', (worker, code, signal) => {
+        console.log('worker died', worker.process.pid, code, signal)
+        if (signal === 'SIGKILL') {
+          reject(new Error(`Worker died ${worker.process.pid}, code ${code} signal ${signal}`))
+        }
+      })
+    }
+  })
 }

package/src/util/traccar.js

@@ -111,6 +111,7 @@ async function getAllInOne (
         }))
     }
     const now = new Date()
+    console.log('parallel', requests.length)
     result.push(...(await Promise.all(requests)))
     console.log('took', new Date() - now, 'ms')
   }

package/src/util/worker.js

@@ -1,5 +1,5 @@
 const path = require('path')
-
+console.log(`worker ${process.pid} is running`, process.cwd())
 process.on('message', async (message) => {
   const { report, method, args } = message
   const _report = require(path.resolve(__dirname, `../${report}`))