fleetmap-reports 2.0.221 → 2.0.223

package/package.json

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

package/src/util/traccar.js

@@ -2,7 +2,7 @@ const automaticReports = require('../automaticReports')
 const { convertFromUTC, isClientSide, convertFromLocal } = require('./utils')
 const path = require('path')
 const Piscina = require('piscina')
-const {cleanPositions, filterPositions, filterPosition} = require("./route");
+const { cleanPositions, filterPosition } = require('./route')
 const piscina = new Piscina()
 async function getRoute (traccar, from, to, devices) {
   const devicesToSlice = devices.slice()
@@ -107,8 +107,7 @@ function streamJson (traccar, u, filter) {
     filter
   },
   {
-    filename: path.resolve(__dirname, './traccar.worker.js'),
-    maxThreads: require('os').cpus().length
+    filename: path.resolve(__dirname, './traccar.worker.js')
   })
 }
 

package/src/zone-report.js

@@ -16,18 +16,17 @@ const {
 } = require('fleetmap-partners')
 const { devicesToProcess } = require('./util/device')
 const {
-  filterPositions,
   cleanPositions
 } = require('./util/route')
 const { checkGeofenceIn } = require('./util/geofence')
 const { parallel } = require('./util/parallel')
 const { getDataByDay } = require('./util/trips')
 const axios = require('axios').default
-const sliceSize = 10
+const sliceSize = 5
 const deviceChunk = 5
 const fileName = 'ZoneReport'
 
-async function process (traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData) {
+exports.process = async (traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData) => {
   const data = await traccarHelper.getAllInOne(
     traccar, from, to, slice, true, false, false, false,
     deviceCount, devices.length, sliceSize, reportRangeDays > 29 ? 1 : deviceChunk, undefined, false, true)
@@ -86,9 +85,9 @@ async function createZoneReport (from, to, userData, traccar) {
 
   let deviceCount = 0
   for (const slice of sliced) {
-    const processed = await process(traccar, from, to, slice, deviceCount, devices, reportRangeDays, userData)
+    const url = `https://${process.env.SERVER_HOST}/pinmeapi/reports/zone-report-processing`
+    const processed = await traccar.axios.post(url, { from, to, userData, slice, deviceCount, devices, reportRangeDays }).then(d => d.data)
     allData.devices.push(...processed)
-
     deviceCount = deviceCount + slice.length
   }