diff --git a/src/server/index.js b/src/server/index.js
index b7cfdbb..6215c98 100644
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -1,5 +1,3 @@
-import 'dotenv/config';
-import http from 'http';
 import log4js from 'log4js';
 
 log4js.configure({
@@ -13,17 +11,4 @@ process.on('unhandledRejection', (error, p) => {
   console.dir(error.stack);
 });
 
-const main = async () => {
-  const logger = log4js.getLogger('default');
-  const httpServer = http.createServer(await require('./app').default);
-
-  httpServer.listen(process.env.HTTP_PORT, () => {
-    logger.info(`RetroPilot Server listening at ${process.env.BASE_URL}`);
-  });
-};
-
-try {
-  main();
-} catch (e) {
-  console.error(e);
-}
+require('./server');
diff --git a/src/server/server.js b/src/server/server.js
new file mode 100644
index 0000000..fc05138
--- /dev/null
+++ b/src/server/server.js
@@ -0,0 +1,14 @@
+import 'dotenv/config';
+import http from 'http';
+import log4js from 'log4js';
+
+import app from './app';
+
+app.then((server) => {
+  const logger = log4js.getLogger('default');
+  const httpServer = http.createServer(server);
+
+  httpServer.listen(process.env.HTTP_PORT, () => {
+    logger.info(`RetroPilot Server listening at ${process.env.BASE_URL}`);
+  });
+});
diff --git a/src/worker/index.js b/src/worker/index.js
index 0071696..27149ab 100644
--- a/src/worker/index.js
+++ b/src/worker/index.js
@@ -1,770 +1,24 @@
-import 'dotenv/config';
-import crypto from 'crypto';
-import fs from 'fs';
-import path from 'path';
 import log4js from 'log4js';
-import dirTree from 'directory-tree';
-import { execSync } from 'child_process';
-import Reader from '@commaai/log_reader';
-import ffprobe from 'ffprobe';
-import ffprobeStatic from 'ffprobe-static';
-
-import orm from '../models/index.model';
-
-const startTime = Date.now();
-let lastCleaningTime = 0;
 
 log4js.configure({
   appenders: { logfile: { type: 'file', filename: 'worker.log' }, out: { type: 'console' } },
   categories: { default: { appenders: ['out', 'logfile'], level: 'info' } },
 });
 
+process.on('unhandledRejection', (error, p) => {
+  console.log('=== UNHANDLED REJECTION ===');
+  console.log(error.promise, p);
+  console.dir(error.stack);
+});
+
 const logger = log4js.getLogger('default');
 
-function initializeStorage() {
-  const verifiedPath = mkDirByPathSync(process.env.STORAGE_PATH, { isRelativeToScript: (process.env.STORAGE_PATH.indexOf('/') !== 0) });
-  if (verifiedPath != null) {
-    logger.info(`Verified storage path ${verifiedPath}`);
-  } else {
-    logger.error(`Unable to verify storage path '${process.env.STORAGE_PATH}', check filesystem / permissions`);
-    process.exit();
-  }
-}
-
-function mkDirByPathSync(targetDir, { isRelativeToScript = false } = {}) {
-  const { sep } = path;
-  const initDir = path.isAbsolute(targetDir) ? sep : '';
-
-  let baseDir;
-  if (isRelativeToScript) {
-    // retropilot-server/dist/worker/../.. => retropilot-server
-    baseDir = path.join(__dirname, '..', '..');
-  } else {
-    baseDir = '.';
-  }
-
-  return targetDir.split(sep)
-    .reduce((parentDir, childDir) => {
-      const curDir = path.resolve(baseDir, parentDir, childDir);
-      try {
-        fs.mkdirSync(curDir);
-      } catch (err) {
-        if (err.code === 'EEXIST') { // curDir already exists!
-          return curDir;
-        }
-
-        // To avoid `EISDIR` error on Mac and `EACCES`-->`ENOENT` and `EPERM` on Windows.
-        if (err.code === 'ENOENT') { // Throw the original parentDir error on curDir `ENOENT` failure.
-          logger.error(`EACCES: permission denied, mkdir '${parentDir}'`);
-          return null;
-        }
-
-        const caughtErr = ['EACCES', 'EPERM', 'EISDIR'].indexOf(err.code) > -1;
-        if (!caughtErr || (caughtErr && curDir === path.resolve(targetDir))) {
-          logger.error('\'EACCES\', \'EPERM\', \'EISDIR\' during mkdir');
-          return null;
-        }
-      }
-
-      return curDir;
-    }, initDir);
-}
-
-function writeFileSync(filePath, buffer, permission) {
-  let fileDescriptor;
-  try {
-    fileDescriptor = fs.openSync(filePath, 'w', permission);
-  } catch (e) {
-    fs.chmodSync(filePath, permission);
-    fileDescriptor = fs.openSync(filePath, 'w', permission);
-  }
-
-  if (fileDescriptor) {
-    fs.writeSync(fileDescriptor, buffer, 0, buffer.length, 0);
-    fs.closeSync(fileDescriptor);
-    logger.info(`writeFileSync wiriting to '${filePath}' successful`);
-    return true;
-  }
-  logger.error(`writeFileSync writing to '${filePath}' failed`);
-  return false;
-}
-
-// eslint-disable-next-line
-function moveUploadedFile(buffer, directory, filename) {
-  logger.info(`moveUploadedFile called with '${filename}' -> '${directory}'`);
-
-  if (directory.indexOf('..') >= 0 || filename.indexOf('..') >= 0) {
-    logger.error('moveUploadedFile failed, .. in directory or filename');
-    return false;
-  }
-
-  if (process.env.STORAGE_PATH.lastIndexOf('/') !== process.env.STORAGE_PATH.length - 1) {
-    directory = `/${directory}`;
-  }
-  if (directory.lastIndexOf('/') !== directory.length - 1) directory += '/';
-
-  const finalPath = mkDirByPathSync(process.env.STORAGE_PATH + directory, { isRelativeToScript: (process.env.STORAGE_PATH.indexOf('/') !== 0) });
-  if (finalPath && finalPath.length > 0) {
-    if (writeFileSync(`${finalPath}/${filename}`, buffer, 0o660)) {
-      logger.info(`moveUploadedFile successfully written '${finalPath}/${filename}'`);
-      return `${finalPath}/${filename}`;
-    }
-    logger.error('moveUploadedFile failed to writeFileSync');
-    return false;
-  }
-  logger.error(`moveUploadedFile invalid final path, check permissions to create / write '${process.env.STORAGE_PATH + directory}'`);
-  return false;
-}
-
-function deleteFolderRecursive(directoryPath) {
-  if (fs.existsSync(directoryPath)) {
-    fs.readdirSync(directoryPath)
-      .forEach((file) => {
-        const curPath = path.join(directoryPath, file);
-        if (fs.lstatSync(curPath).isDirectory()) {
-          deleteFolderRecursive(curPath);
-        } else {
-          fs.unlinkSync(curPath);
-        }
-      });
-    fs.rmdirSync(directoryPath);
-  }
-}
-
-let segmentProcessQueue = [];
-let segmentProcessPosition = 0;
-
-let affectedDrives = {};
-let affectedDriveInitData = {};
-let affectedDriveCarParams = {};
-
-let affectedDevices = {};
-
-let rlogLastTsInternal = 0;
-let rlogPrevLatInternal = -1000;
-let rlogPrevLngInternal = -1000;
-let rlogTotalDistInternal = 0;
-let rlogLastTsExternal = 0;
-let rlogPrevLatExternal = -1000;
-let rlogPrevLngExternal = -1000;
-let rlogTotalDistExternal = 0;
-let rlogCarParams = null;
-let rlogInitData = null;
-let qcameraDuration = 0;
-
-function processSegmentRLog(rLogPath) {
-  rlogLastTsInternal = 0;
-  rlogPrevLatInternal = -1000;
-  rlogPrevLngInternal = -1000;
-  rlogTotalDistInternal = 0;
-  rlogLastTsExternal = 0;
-  rlogPrevLatExternal = -1000;
-  rlogPrevLngExternal = -1000;
-  rlogTotalDistExternal = 0;
-  rlogCarParams = null;
-  rlogInitData = null;
-
-  return new Promise((resolve) => {
-    const temporaryFile = rLogPath.replace('.bz2', '');
-
-    try {
-      execSync(`bunzip2 -k -f "${rLogPath}"`);
-    } catch (exception) { // if bunzip2 fails, something was wrong with the file (corrupt / missing)
-      logger.error(exception);
-      try {
-        fs.unlinkSync(temporaryFile);
-        // eslint-disable-next-line no-empty
-      } catch (ignored) {
-      }
-      resolve();
-      return;
-    }
-
-    let readStream;
-    let reader;
-
-    try {
-      readStream = fs.createReadStream(temporaryFile);
-      reader = Reader(readStream);
-    } catch (err) {
-      logger.error('314 - logger', err);
-    }
-
-    readStream.on('close', () => {
-      logger.info('processSegmentRLog readStream close event triggered, resolving promise');
-      try {
-        fs.unlinkSync(temporaryFile);
-        // eslint-disable-next-line no-empty
-      } catch (ignored) {
-      }
-      resolve();
-    });
-
-    // const jsonLog = fs.createWriteStream(rLogPath.replace('.bz2', '.json'));
-    try {
-      reader((obj) => {
-        // jsonLog.write(JSON.stringify(obj));
-        try {
-          if (obj.LogMonoTime && obj.LogMonoTime - rlogLastTsInternal >= 1000000 * 1000 * 0.99 && obj.GpsLocation) {
-            logger.info(`processSegmentRLog GpsLocation @ ${obj.LogMonoTime}: ${obj.GpsLocation.Latitude} ${obj.GpsLocation.Longitude}`);
-
-            if (rlogPrevLatInternal !== -1000) {
-              const lat1 = rlogPrevLatInternal;
-              const lat2 = obj.GpsLocation.Latitude;
-              const lon1 = rlogPrevLngInternal;
-              const lon2 = obj.GpsLocation.Longitude;
-              const p = 0.017453292519943295; // Math.PI / 180
-              const c = Math.cos;
-              const a = 0.5 - c((lat2 - lat1) * p) / 2
-                + c(lat1 * p) * c(lat2 * p)
-                * (1 - c((lon2 - lon1) * p)) / 2;
-
-              let distMetres = 1000 * 12742 * Math.asin(Math.sqrt(a)); // 2 * R; R = 6371 km
-              if (distMetres > 70) {
-                // each segment is max. 60s. if the calculated speed would exceed ~250km/h for this segment, we assume the coordinates off / defective and skip it
-                distMetres = 0;
-              }
-              rlogTotalDistInternal += distMetres;
-            }
-            rlogPrevLatInternal = obj.GpsLocation.Latitude;
-            rlogPrevLngInternal = obj.GpsLocation.Longitude;
-            rlogLastTsInternal = obj.LogMonoTime;
-          } else if (obj.LogMonoTime && obj.LogMonoTime - rlogLastTsExternal >= 1000000 * 1000 * 0.99 && obj.GpsLocationExternal) {
-            logger.info(`processSegmentRLog GpsLocationExternal @ ${obj.LogMonoTime}: ${obj.GpsLocationExternal.Latitude} ${obj.GpsLocationExternal.Longitude}`);
-
-            if (rlogPrevLatExternal !== -1000) {
-              const lat1 = rlogPrevLatExternal;
-              const lat2 = obj.GpsLocationExternal.Latitude;
-              const lon1 = rlogPrevLngExternal;
-              const lon2 = obj.GpsLocationExternal.Longitude;
-              const p = 0.017453292519943295; // Math.PI / 180
-              const c = Math.cos;
-              const a = 0.5 - c((lat2 - lat1) * p) / 2
-                + c(lat1 * p) * c(lat2 * p)
-                * (1 - c((lon2 - lon1) * p)) / 2;
-
-              let distMetres = 1000 * 12742 * Math.asin(Math.sqrt(a)); // 2 * R; R = 6371 km
-              if (distMetres > 70) {
-                // each segment is max. 60s. if the calculated speed would exceed ~250km/h for this segment, we assume the coordinates off / defective and skip it
-                distMetres = 0;
-              }
-              rlogTotalDistExternal += distMetres;
-            }
-            rlogPrevLatExternal = obj.GpsLocationExternal.Latitude;
-            rlogPrevLngExternal = obj.GpsLocationExternal.Longitude;
-            rlogLastTsExternal = obj.LogMonoTime;
-          } else if (obj.LogMonoTime && obj.CarParams && !rlogCarParams) {
-            rlogCarParams = obj.CarParams;
-          } else if (obj.LogMonoTime && obj.InitData && !rlogInitData) {
-            rlogInitData = obj.InitData;
-          }
-          // eslint-disable-next-line no-empty
-        } catch (ignored) {
-        }
-      });
-    } catch (readerErr) {
-      throw new Error('reader Err 385', readerErr);
-    }
-  });
-}
-
-function processSegmentVideo(qcameraPath) {
-  qcameraDuration = 0;
-  return new Promise((resolve) => {
-    ffprobe(qcameraPath, { path: ffprobeStatic.path })
-      .then((info) => {
-        if (info.streams && info.streams[0] && info.streams[0].duration) {
-          qcameraDuration = info.streams[0].duration;
-        }
-        logger.info(`processSegmentVideo duration: ${qcameraDuration}s`);
-        resolve();
-      })
-      .catch((err) => {
-        console.error(err);
-        logger.error(`processSegmentVideo error: ${err}`);
-        resolve();
-      });
-  });
-}
-
-async function processSegmentsRecursive() {
-  if (segmentProcessQueue.length <= segmentProcessPosition) {
-    await updateDrives();
-    return;
-  }
-
-  const {
-    segment,
-    uploadComplete,
-    driveIdentifier,
-    fileStatus,
-  } = segmentProcessQueue[segmentProcessPosition];
-
-  logger.info(`processSegmentsRecursive ${segment.dongle_id} ${segment.drive_identifier} ${segment.segment_id} ${JSON.stringify(segment)}`);
-
-  segment.process_attempts += 1;
-
-  await orm.query(
-    `UPDATE drive_segments SET process_attempts = ${segment.process_attempts} WHERE id = ${segment.id}`,
-  );
-
-  if (segment.process_attempts > 5) {
-    logger.error(`FAILING TO PROCESS SEGMENT,${segment.dongle_id} ${segment.drive_identifier} ${segment.segment_id} JSON: ${JSON.stringify(segment)} SKIPPING `);
-    segmentProcessPosition += 1;
-  } else {
-    Promise.all([
-      processSegmentRLog(fileStatus['rlog.bz2']),
-      processSegmentVideo(fileStatus['qcamera.ts']),
-    ])
-      .then(async () => {
-        logger.info(`processSegmentsRecursive ${segment.dongle_id} ${segment.drive_identifier} ${segment.segment_id} internal gps: ${Math.round(rlogTotalDistInternal * 100) / 100}m, external gps: ${Math.round(rlogTotalDistExternal * 100) / 100}m, duration: ${qcameraDuration}s`);
-
-        const driveSegmentResult = await orm.models.drive_segments.update({
-          duration: Math.round(qcameraDuration),
-          distance_meters: Math.round(Math.max(rlogTotalDistInternal, rlogTotalDistExternal) * 10) / 10,
-          is_processed: true,
-          upload_complete: uploadComplete,
-          is_stalled: false,
-        }, { where: { id: segment.id } });
-
-        // if the update failed, stop right here with segment processing and try to update the drives at least
-        if (!driveSegmentResult) {
-          segmentProcessPosition = segmentProcessQueue.length;
-        }
-
-        affectedDrives[driveIdentifier] = true;
-        if (rlogCarParams) {
-          affectedDriveCarParams[driveIdentifier] = rlogCarParams;
-        }
-        if (rlogInitData) {
-          affectedDriveInitData[driveIdentifier] = rlogInitData;
-        }
-
-        segmentProcessPosition += 1;
-        setTimeout(() => {
-          processSegmentsRecursive();
-        }, 0);
-      })
-      .catch((error) => {
-        logger.error(error);
-      });
-  }
-}
-
-async function updateSegments() {
-  segmentProcessQueue = [];
-  segmentProcessPosition = 0;
-  affectedDrives = {};
-  affectedDriveCarParams = {};
-  affectedDriveInitData = {};
-
-  const [driveSegments] = await orm.query('SELECT * FROM drive_segments WHERE upload_complete = false AND is_stalled = false AND process_attempts < 5 ORDER BY created ASC');
-  logger.info('updateSegments - total drive_segments', driveSegments.length);
-
-  if (driveSegments) {
-    for (let t = 0; t < driveSegments.length; t++) {
-      const segment = driveSegments[t];
-
-      const dongleIdHash = crypto.createHmac('sha256', process.env.APP_SALT)
-        .update(segment.dongle_id)
-        .digest('hex');
-      const driveIdentifierHash = crypto.createHmac('sha256', process.env.APP_SALT)
-        .update(segment.drive_identifier)
-        .digest('hex');
-
-      const directoryTreePath = `${process.env.STORAGE_PATH + segment.dongle_id}/${dongleIdHash}/${driveIdentifierHash}/${segment.drive_identifier}/${segment.segment_id}`;
-      const directoryTree = dirTree(directoryTreePath);
-
-      if (!directoryTree || !directoryTree.children) {
-        console.log('missing directory', directoryTreePath);
-        continue; // happens if upload in progress (db entity written but directory not yet created)
-      }
-
-      const fileStatus = {
-        'fcamera.hevc': false,
-        'dcamera.hevc': false,
-        'qcamera.ts': false,
-        'qlog.bz2': false,
-        'rlog.bz2': false,
-      };
-
-      directoryTree.children.forEach((file) => {
-        if (file.name in fileStatus) {
-          fileStatus[file.name] = true;
-        }
-      });
-
-      const uploadComplete = Object.keys(fileStatus).every((key) => fileStatus[key]);
-
-      if (fileStatus['qcamera.ts'] !== false && fileStatus['rlog.bz2'] !== false && !segment.is_processed) { // can process
-        segmentProcessQueue.push({
-          segment,
-          fileStatus,
-          uploadComplete,
-          driveIdentifier: `${segment.dongle_id}|${segment.drive_identifier}`,
-        });
-      } else if (uploadComplete) {
-        logger.info(`updateSegments uploadComplete for ${segment.dongle_id} ${segment.drive_identifier} ${segment.segment_id}`);
-
-        await orm.query(
-          `UPDATE drive_segments SET upload_complete = true, is_stalled = false WHERE id = ${segment.id}`,
-        );
-
-        affectedDrives[`${segment.dongle_id}|${segment.drive_identifier}`] = true;
-      } else if (Date.now() - segment.created > 10 * 24 * 3600 * 1000) { // ignore non-uploaded segments after 10 days until a new upload_url is requested (which resets is_stalled)
-        logger.info(`updateSegments isStalled for ${segment.dongle_id} ${segment.drive_identifier} ${segment.segment_id}`);
-
-        await orm.query(
-          `UPDATE drive_segments SET is_stalled = true WHERE id = ${segment.id}`,
-        );
-      }
-
-      // we process at most 15 segments per batch
-      if (segmentProcessQueue.length >= 15) {
-        break;
-      }
-    }
-  }
-
-  if (segmentProcessQueue.length > 0) {
-    processSegmentsRecursive();
-  } else {
-    // if no data is to be collected, call updateDrives to update those where eventually just the last segment completed the upload
-    updateDrives();
-  }
-}
-
-async function updateDevices() {
-  // go through all affected devices (with deleted or updated drives) and update them (storage_used)
-  logger.info(`updateDevices - affected drives: ${JSON.stringify(affectedDevices)}`);
-  for (const dongleId of Object.keys(affectedDevices)) {
-    const [device] = await orm.query(`SELECT * FROM devices WHERE dongle_id = ${dongleId}`);
-    if (device == null) continue;
-
-    const dongleIdHash = crypto.createHmac('sha256', process.env.APP_SALT)
-      .update(device.dongle_id)
-      .digest('hex');
-    const devicePath = `${process.env.STORAGE_PATH + device.dongle_id}/${dongleIdHash}`;
-    const deviceQuotaMb = Math.round(parseInt(execSync(`du -s ${devicePath} | awk -F'\t' '{print $1;}'`)
-      .toString(), 10) / 1024);
-    logger.info(`updateDevices device ${dongleId} has an updated storage_used of: ${deviceQuotaMb} MB`);
-
-    await orm.models.drives.update(
-      {
-        storage_used: deviceQuotaMb,
-      },
-      {
-        where: {
-          dongle_id: device.dongle_id,
-        },
-      },
-    );
-  }
-
-  affectedDevices = [];
-}
-
-async function updateDrives() {
-  // go through all affected drives and update them / complete and/or build m3u8
-  logger.info(`updateDrives - affected drives: ${JSON.stringify(affectedDrives)}`);
-  for (const key of Object.keys(affectedDrives)) {
-    const [dongleId, driveIdentifier] = key.split('|');
-    let drive = await orm.models.drives.findOne({ where: { identifier: driveIdentifier, dongle_id: dongleId } });
-    if (!drive) continue;
-    drive = drive.dataValues;
-    const dongleIdHash = crypto.createHmac('sha256', process.env.APP_SALT)
-      .update(drive.dongle_id)
-      .digest('hex');
-    const driveIdentifierHash = crypto.createHmac('sha256', process.env.APP_SALT)
-      .update(drive.identifier)
-      .digest('hex');
-    const driveUrl = `${process.env.BASE_DRIVE_DOWNLOAD_URL + drive.dongle_id}/${dongleIdHash}/${driveIdentifierHash}/${drive.identifier}`;
-    const drivePath = `${process.env.STORAGE_PATH + drive.dongle_id}/${dongleIdHash}/${driveIdentifierHash}/${drive.identifier}`;
-
-    let uploadComplete = true;
-    let isProcessed = true;
-
-    let totalDistanceMeters = 0;
-    let totalDurationSeconds = 0;
-    let playlistSegmentStrings = '';
-
-    const driveSegments = await orm.models.drive_segments.findAll({
-      where: {
-        drive_identifier: driveIdentifier,
-        dongle_id: dongleId,
-      },
-      order: [
-        orm.fn('ASC', orm.col('segment_id')),
-      ],
-    });
-
-    if (driveSegments) {
-      for (let t = 0; t < driveSegments.length; t++) {
-        if (!driveSegments[t].upload_complete) uploadComplete = false;
-        if (!driveSegments[t].is_processed) {
-          isProcessed = false;
-        } else {
-          totalDistanceMeters += parseFloat(driveSegments[t].distance_meters);
-          totalDurationSeconds += parseFloat(driveSegments[t].duration);
-
-          playlistSegmentStrings += `#EXTINF:${driveSegments[t].duration},${driveSegments[t].segment_id}\n${driveUrl}/${driveSegments[t].segment_id}/qcamera.ts\n`;
-        }
-      }
-    }
-
-    let { filesize } = drive;
-    if (uploadComplete) {
-      try {
-        filesize = parseInt(execSync(`du -s ${drivePath} | awk -F'\t' '{print $1;}'`)
-          .toString(), 10); // in kilobytes
-        // eslint-disable-next-line no-empty
-      } catch (exception) {
-      }
-    }
-
-    let metadata = {};
-    try {
-      metadata = JSON.parse(drive.metadata);
-    } catch (exception) {
-      logger.error(exception);
-    }
-    if (metadata == null) metadata = {};
-
-    if (affectedDriveInitData[key] && !metadata.InitData) {
-      metadata.InitData = affectedDriveInitData[key];
-    }
-    if (affectedDriveCarParams[key] && !metadata.CarParams) {
-      metadata.CarParams = affectedDriveCarParams[key];
-    }
-
-    logger.info(`updateDrives drive ${dongleId} ${driveIdentifier} uploadComplete: ${uploadComplete}`);
-
-    await orm.models.drives.update(
-      {
-        distance_meters: Math.round(totalDistanceMeters),
-        duration: Math.round(totalDurationSeconds),
-        upload_complete: uploadComplete,
-        is_processed: isProcessed,
-        filesize,
-        metadata: JSON.stringify(metadata),
-      },
-      { where: { id: drive.id } },
-    );
-
-    affectedDevices[dongleId] = true;
-
-    if (isProcessed) {
-      // create the playlist file m3u8 for cabana
-      const playlist = '#EXTM3U\n'
-        + '#EXT-X-VERSION:3\n'
-        + '#EXT-X-TARGETDURATION:61\n'
-        + '#EXT-X-MEDIA-SEQUENCE:0\n'
-        + `#EXT-X-PLAYLIST-TYPE:VOD\n${playlistSegmentStrings}\n`
-        + '#EXT-X-ENDLIST';
-
-      fs.writeFileSync(`${drivePath}/qcamera.m3u8`, playlist);
-    }
-  }
-
-  await updateDevices();
-
-  setTimeout(() => {
-    mainWorkerLoop();
-  }, 0);
-}
-
-async function deleteExpiredDrives() {
-  const expirationTs = Date.now() - process.env.DEVICE_EXPIRATION_DAYS * 24 * 3600 * 1000;
-
-  const [expiredDrives] = await orm.query(`SELECT * FROM drives WHERE is_preserved = false AND is_deleted = false AND created < ${expirationTs}`);
-  if (!expiredDrives) {
-    return;
-  }
-
-  for (let t = 0; t < expiredDrives.length; t++) {
-    logger.info(`deleteExpiredDrives drive ${expiredDrives[t].dongle_id} ${expiredDrives[t].identifier} is older than ${process.env.DEVICE_EXPIRATION_DAYS} days, set is_deleted=true`);
-    await orm.models.drives.update(
-      {
-        is_deleted: true,
-      },
-      { where: { id: expiredDrives[t].id } },
-    );
-  }
-}
-
-async function removeDeletedDrivesPhysically() {
-  const [deletedDrives] = await orm.query('SELECT * FROM drives WHERE is_deleted = true AND is_physically_removed = false');
-  if (!deletedDrives) {
-    return;
-  }
-
-  for (let t = 0; t < deletedDrives.length; t++) {
-    logger.info(`removeDeletedDrivesPhysically drive ${deletedDrives[t].dongle_id} ${deletedDrives[t].identifier} is deleted, remove physical files and clean database`);
-
-    const dongleIdHash = crypto.createHmac('sha256', process.env.APP_SALT)
-      .update(deletedDrives[t].dongle_id)
-      .digest('hex');
-    const driveIdentifierHash = crypto.createHmac('sha256', process.env.APP_SALT)
-      .update(deletedDrives[t].identifier)
-      .digest('hex');
-
-    const drivePath = `${process.env.STORAGE_PATH + deletedDrives[t].dongle_id}/${dongleIdHash}/${driveIdentifierHash}`;
-    logger.info(`removeDeletedDrivesPhysically drive ${deletedDrives[t].dongle_id} ${deletedDrives[t].identifier} storage path is ${drivePath}`);
-    try {
-      const driveResult = await orm.query(`UPDATE drives SET is_physically_removed = true WHERE id = ${deletedDrives[t].id}`);
-
-      const driveSegmentResult = await orm.query(
-        `DELETE FROM drive_segments WHERE drive_identifier = ${deletedDrives[t].identifier} AND dongle_id = ${deletedDrives[t].dongle_id}`,
-      );
-
-      if (driveResult != null && driveSegmentResult != null) {
-        deleteFolderRecursive(drivePath, { recursive: true });
-      }
-      affectedDevices[deletedDrives[t].dongle_id] = true;
-    } catch (exception) {
-      logger.error(exception);
-    }
-  }
-}
-
-async function deleteOverQuotaDrives() {
-  const [devices] = await orm.query(`SELECT * FROM devices WHERE storage_used > ${process.env.DEVICE_STORAGE_QUOTA_MB}`);
-  if (devices == null) {
-    return;
-  }
-
-  for (let t = 0; t < devices.length; t++) {
-    let foundDriveToDelete = false;
-
-    const [driveNormal] = await orm.query(`SELECT * FROM drives WHERE dongle_id = ${devices[t].dongle_id} AND is_preserved = false AND is_deleted = false ORDER BY created ASC LIMIT 1`);
-    if (driveNormal != null) {
-      logger.info(`deleteOverQuotaDrives drive ${driveNormal.dongle_id} ${driveNormal.identifier} (normal) is deleted for over-quota`);
-      await orm.query(`UPDATE drives SET is_deleted = true WHERE id = ${driveNormal.id}`);
-      foundDriveToDelete = true;
-    }
-
-    if (!foundDriveToDelete) {
-      const [drivePreserved] = await orm.query('SELECT * FROM drives WHERE dongle_id = devices[t].dongle_id AND is_preserved = true AND is_deleted = false ORDER BY created ASC LIMIT 1');
-      if (drivePreserved != null) {
-        logger.info(`deleteOverQuotaDrives drive ${drivePreserved.dongle_id} ${drivePreserved.identifier} (preserved!) is deleted for over-quota`);
-        await orm.query(`UPDATE drives SET is_deleted = ? WHERE id = ${drivePreserved.id}`);
-        foundDriveToDelete = true;
-      }
-    }
-  }
-}
-
-async function deleteBootAndCrashLogs() {
-  const [devices] = await orm.query('SELECT * FROM devices');
-  if (devices == null) {
-    return;
-  }
-
-  for (let t = 0; t < devices.length; t++) {
-    const device = devices[t];
-    const dongleIdHash = crypto.createHmac('sha256', process.env.APP_SALT)
-      .update(device.dongle_id)
-      .digest('hex');
-
-    const bootlogDirectoryTree = dirTree(`${process.env.STORAGE_PATH + device.dongle_id}/${dongleIdHash}/boot/`, { attributes: ['size'] });
-    const bootlogFiles = [];
-    if (bootlogDirectoryTree) {
-      for (let i = 0; i < bootlogDirectoryTree.children.length; i++) {
-        const timeSplit = bootlogDirectoryTree.children[i].name.replace('boot-', '')
-          .replace('crash-', '')
-          .replace('.bz2', '')
-          .split('--');
-        const timeString = `${timeSplit[0]} ${timeSplit[1].replace(/-/g, ':')}`;
-        bootlogFiles.push({
-          name: bootlogDirectoryTree.children[i].name,
-          size: bootlogDirectoryTree.children[i].size,
-          date: Date.parse(timeString),
-          path: bootlogDirectoryTree.children[i].path,
-        });
-      }
-      bootlogFiles.sort((a, b) => ((a.date < b.date) ? 1 : -1));
-      for (let c = 5; c < bootlogFiles.length; c++) {
-        logger.info(`deleteBootAndCrashLogs deleting boot log ${bootlogFiles[c].path}`);
-        try {
-          fs.unlinkSync(bootlogFiles[c].path);
-          affectedDevices[device.dongle_id] = true;
-        } catch (exception) {
-          logger.error(exception);
-        }
-      }
-    }
-
-    const crashlogDirectoryTree = dirTree(`${process.env.STORAGE_PATH + device.dongle_id}/${dongleIdHash}/crash/`, { attributes: ['size'] });
-    const crashlogFiles = [];
-    if (crashlogDirectoryTree) {
-      for (let i = 0; i < crashlogDirectoryTree.children.length; i++) {
-        const timeSplit = crashlogDirectoryTree.children[i].name.replace('boot-', '')
-          .replace('crash-', '')
-          .replace('.bz2', '')
-          .split('--');
-        const timeString = `${timeSplit[0]} ${timeSplit[1].replace(/-/g, ':')}`;
-        crashlogFiles.push({
-          name: crashlogDirectoryTree.children[i].name,
-          size: crashlogDirectoryTree.children[i].size,
-          date: Date.parse(timeString),
-          path: crashlogDirectoryTree.children[i].path,
-        });
-      }
-      crashlogFiles.sort((a, b) => ((a.date < b.date) ? 1 : -1));
-      for (let c = 5; c < crashlogFiles.length; c++) {
-        logger.info(`deleteBootAndCrashLogs deleting crash log ${crashlogFiles[c].path}`);
-        try {
-          fs.unlinkSync(crashlogFiles[c].path);
-          affectedDevices[device.dongle_id] = true;
-        } catch (exception) {
-          logger.error(exception);
-        }
-      }
-    }
-  }
-}
-
-async function mainWorkerLoop() {
-  if (Date.now() - startTime > 60 * 60 * 1000) {
-    logger.info('EXIT WORKER AFTER 1 HOUR TO PREVENT MEMORY LEAKS...');
-    process.exit();
-    return;
-  }
-
-  try {
-    if (Date.now() - lastCleaningTime > 20 * 60 * 1000) {
-      await deleteBootAndCrashLogs();
-      await deleteExpiredDrives();
-      await deleteOverQuotaDrives();
-      await removeDeletedDrivesPhysically();
-      lastCleaningTime = Date.now();
-    }
-
-    setTimeout(() => {
-      updateSegments();
-    }, 5000);
-  } catch (e) {
-    logger.error(e);
-  }
-}
-
-const main = async () => {
-  // make sure bunzip2 is available
-  try {
-    // execSync('bunzip2 --help');
-  } catch (exception) {
-    logger.error('bunzip2 is not installed or not available in environment path');
-    process.exit();
-  }
-
-  initializeStorage();
-  setTimeout(() => {
-    mainWorkerLoop();
-  }, 0);
-};
-
+// make sure bunzip2 is available
 try {
-  main();
-} catch (e) {
-  console.error(e);
+  // execSync('bunzip2 --help');
+} catch (exception) {
+  logger.error('bunzip2 is not installed or not available in environment path');
+  process.exit();
 }
+
+require('./worker');
diff --git a/src/worker/storage.js b/src/worker/storage.js
new file mode 100644
index 0000000..902f624
--- /dev/null
+++ b/src/worker/storage.js
@@ -0,0 +1,115 @@
+import path from 'path';
+import fs from 'fs';
+import log4js from 'log4js';
+
+const logger = log4js.getLogger('default');
+
+export function initializeStorage() {
+  const verifiedPath = mkDirByPathSync(process.env.STORAGE_PATH, { isRelativeToScript: (process.env.STORAGE_PATH.indexOf('/') !== 0) });
+  if (verifiedPath != null) {
+    logger.info(`Verified storage path ${verifiedPath}`);
+  } else {
+    logger.error(`Unable to verify storage path '${process.env.STORAGE_PATH}', check filesystem / permissions`);
+    process.exit();
+  }
+}
+
+export function mkDirByPathSync(targetDir, { isRelativeToScript = false } = {}) {
+  const { sep } = path;
+  const initDir = path.isAbsolute(targetDir) ? sep : '';
+
+  let baseDir;
+  if (isRelativeToScript) {
+    // retropilot-server/dist/worker/../.. => retropilot-server
+    baseDir = path.join(__dirname, '..', '..');
+  } else {
+    baseDir = '.';
+  }
+
+  return targetDir.split(sep)
+    .reduce((parentDir, childDir) => {
+      const curDir = path.resolve(baseDir, parentDir, childDir);
+      try {
+        fs.mkdirSync(curDir);
+      } catch (err) {
+        if (err.code === 'EEXIST') { // curDir already exists!
+          return curDir;
+        }
+
+        // To avoid `EISDIR` error on Mac and `EACCES`-->`ENOENT` and `EPERM` on Windows.
+        if (err.code === 'ENOENT') { // Throw the original parentDir error on curDir `ENOENT` failure.
+          logger.error(`EACCES: permission denied, mkdir '${parentDir}'`);
+          return null;
+        }
+
+        const caughtErr = ['EACCES', 'EPERM', 'EISDIR'].indexOf(err.code) > -1;
+        if (!caughtErr || (caughtErr && curDir === path.resolve(targetDir))) {
+          logger.error('\'EACCES\', \'EPERM\', \'EISDIR\' during mkdir');
+          return null;
+        }
+      }
+
+      return curDir;
+    }, initDir);
+}
+
+export function writeFileSync(filePath, buffer, permission) {
+  let fileDescriptor;
+  try {
+    fileDescriptor = fs.openSync(filePath, 'w', permission);
+  } catch (e) {
+    fs.chmodSync(filePath, permission);
+    fileDescriptor = fs.openSync(filePath, 'w', permission);
+  }
+
+  if (fileDescriptor) {
+    fs.writeSync(fileDescriptor, buffer, 0, buffer.length, 0);
+    fs.closeSync(fileDescriptor);
+    logger.info(`writeFileSync wiriting to '${filePath}' successful`);
+    return true;
+  }
+  logger.error(`writeFileSync writing to '${filePath}' failed`);
+  return false;
+}
+
+// eslint-disable-next-line
+export function moveUploadedFile(buffer, directory, filename) {
+  logger.info(`moveUploadedFile called with '${filename}' -> '${directory}'`);
+
+  if (directory.indexOf('..') >= 0 || filename.indexOf('..') >= 0) {
+    logger.error('moveUploadedFile failed, .. in directory or filename');
+    return false;
+  }
+
+  if (process.env.STORAGE_PATH.lastIndexOf('/') !== process.env.STORAGE_PATH.length - 1) {
+    directory = `/${directory}`;
+  }
+  if (directory.lastIndexOf('/') !== directory.length - 1) directory += '/';
+
+  const finalPath = mkDirByPathSync(process.env.STORAGE_PATH + directory, { isRelativeToScript: (process.env.STORAGE_PATH.indexOf('/') !== 0) });
+  if (finalPath && finalPath.length > 0) {
+    if (writeFileSync(`${finalPath}/${filename}`, buffer, 0o660)) {
+      logger.info(`moveUploadedFile successfully written '${finalPath}/${filename}'`);
+      return `${finalPath}/${filename}`;
+    }
+    logger.error('moveUploadedFile failed to writeFileSync');
+    return false;
+  }
+  logger.error(`moveUploadedFile invalid final path, check permissions to create / write '${process.env.STORAGE_PATH + directory}'`);
+  return false;
+}
+
+export function deleteFolderRecursive(directoryPath) {
+  if (fs.existsSync(directoryPath)) {
+    fs.readdirSync(directoryPath)
+      .forEach((file) => {
+        const curPath = path.join(directoryPath, file);
+        if (fs.lstatSync(curPath).isDirectory()) {
+          deleteFolderRecursive(curPath);
+        } else {
+          fs.unlinkSync(curPath);
+        }
+      });
+    fs.rmdirSync(directoryPath);
+  }
+}
diff --git a/src/worker/worker.js b/src/worker/worker.js
new file mode 100644
index 0000000..3da69cb
--- /dev/null
+++ b/src/worker/worker.js
@@ -0,0 +1,647 @@
+import 'dotenv/config';
+import crypto from 'crypto';
+import fs from 'fs';
+import log4js from 'log4js';
+import dirTree from 'directory-tree';
+import { execSync } from 'child_process';
+import Reader from '@commaai/log_reader';
+import ffprobe from 'ffprobe';
+import ffprobeStatic from 'ffprobe-static';
+
+import orm from '../models/index.model';
+import {
+  initializeStorage,
+  deleteFolderRecursive,
+} from './storage';
+
+const logger = log4js.getLogger('default');
+
+const startTime = Date.now();
+let lastCleaningTime = 0;
+
+let segmentProcessQueue = [];
+let segmentProcessPosition = 0;
+
+let affectedDrives = {};
+let affectedDriveInitData = {};
+let affectedDriveCarParams = {};
+
+let affectedDevices = {};
+
+let rlogLastTsInternal = 0;
+let rlogPrevLatInternal = -1000;
+let rlogPrevLngInternal = -1000;
+let rlogTotalDistInternal = 0;
+let rlogLastTsExternal = 0;
+let rlogPrevLatExternal = -1000;
+let rlogPrevLngExternal = -1000;
+let rlogTotalDistExternal = 0;
+let rlogCarParams = null;
+let rlogInitData = null;
+let qcameraDuration = 0;
+
+function calculateDistance(lat1, lon1, lat2, lon2) {
+  const p = 0.017453292519943295; // Math.PI / 180
+  const c = Math.cos;
+  const a = 0.5 - c((lat2 - lat1) * p) / 2
+    + c(lat1 * p) * c(lat2 * p)
+    * (1 - c((lon2 - lon1) * p)) / 2;
+
+  let distMetres = 1000 * 12742 * Math.asin(Math.sqrt(a)); // 2 * R; R = 6371 km
+  if (distMetres > 70) {
+    // each segment is max. 60s. if the calculated speed would exceed ~250km/h for this segment, we assume the coordinates off / defective and skip it
+    distMetres = 0;
+  }
+  return distMetres;
+}
+
+function processSegmentRLog(rLogPath) {
+  rlogLastTsInternal = 0;
+  rlogPrevLatInternal = -1000;
+  rlogPrevLngInternal = -1000;
+  rlogTotalDistInternal = 0;
+  rlogLastTsExternal = 0;
+  rlogPrevLatExternal = -1000;
+  rlogPrevLngExternal = -1000;
+  rlogTotalDistExternal = 0;
+  rlogCarParams = null;
+  rlogInitData = null;
+
+  return new Promise((resolve) => {
+    const temporaryFile = rLogPath.replace('.bz2', '');
+
+    try {
+      execSync(`bunzip2 -k -f "${rLogPath}"`);
+    } catch (exception) { // if bunzip2 fails, something was wrong with the file (corrupt / missing)
+      logger.error(exception);
+      try {
+        fs.unlinkSync(temporaryFile);
+        // eslint-disable-next-line no-empty
+      } catch (ignored) {
+      }
+      resolve();
+      return;
+    }
+
+    let readStream;
+    let reader;
+
+    try {
+      readStream = fs.createReadStream(temporaryFile);
+      reader = Reader(readStream);
+    } catch (err) {
+      logger.error('314 - logger', err);
+    }
+
+    readStream.on('close', () => {
+      logger.info('processSegmentRLog readStream close event triggered, resolving promise');
+      try {
+        fs.unlinkSync(temporaryFile);
+        // eslint-disable-next-line no-empty
+      } catch (ignored) {
+      }
+      resolve();
+    });
+
+    try {
+      reader((obj) => {
+        try {
+          if (
+            obj.LogMonoTime
+            && obj.LogMonoTime - rlogLastTsInternal >= 1000000 * 1000 * 0.99
+            && obj.GpsLocation
+          ) {
+            logger.info(`processSegmentRLog GpsLocation @ ${obj.LogMonoTime}: ${obj.GpsLocation.Latitude} ${obj.GpsLocation.Longitude}`);
+
+            if (rlogPrevLatInternal !== -1000) {
+              rlogTotalDistInternal += calculateDistance(
+                rlogPrevLatInternal,
+                rlogPrevLngInternal,
+                obj.GpsLocation.Latitude,
+                obj.GpsLocation.Longitude,
+              );
+            }
+
+            rlogPrevLatInternal = obj.GpsLocation.Latitude;
+            rlogPrevLngInternal = obj.GpsLocation.Longitude;
+            rlogLastTsInternal = obj.LogMonoTime;
+          } else if (
+            obj.LogMonoTime
+            && obj.LogMonoTime - rlogLastTsExternal >= 1000000 * 1000 * 0.99
+            && obj.GpsLocationExternal
+          ) {
+            logger.info(`processSegmentRLog GpsLocationExternal @ ${obj.LogMonoTime}: ${obj.GpsLocationExternal.Latitude} ${obj.GpsLocationExternal.Longitude}`);
+
+            if (rlogPrevLatExternal !== -1000) {
+              rlogTotalDistExternal += calculateDistance(
+                rlogPrevLatExternal,
+                rlogPrevLngExternal,
+                obj.GpsLocationExternal.Latitude,
+                obj.GpsLocationExternal.Longitude,
+              );
+            }
+
+            rlogPrevLatExternal = obj.GpsLocationExternal.Latitude;
+            rlogPrevLngExternal = obj.GpsLocationExternal.Longitude;
+            rlogLastTsExternal = obj.LogMonoTime;
+          } else if (obj.LogMonoTime && obj.CarParams && !rlogCarParams) {
+            rlogCarParams = obj.CarParams;
+          } else if (obj.LogMonoTime && obj.InitData && !rlogInitData) {
+            rlogInitData = obj.InitData;
+          }
+          // eslint-disable-next-line no-empty
+        } catch (ignored) {
+        }
+      });
+    } catch (readerErr) {
+      throw new Error('reader Err 385', readerErr);
+    }
+  });
+}
+
+function processSegmentVideo(qcameraPath) {
+  qcameraDuration = 0;
+  return new Promise((resolve) => {
+    ffprobe(qcameraPath, { path: ffprobeStatic.path })
+      .then((info) => {
+        if (info.streams && info.streams[0] && info.streams[0].duration) {
+          qcameraDuration = info.streams[0].duration;
+        }
+        logger.info(`processSegmentVideo duration: ${qcameraDuration}s`);
+        resolve();
+      })
+      .catch((err) => {
+        console.error(err);
+        logger.error(`processSegmentVideo error: ${err}`);
+        resolve();
+      });
+  });
+}
+
+async function processSegmentsRecursive() {
+  if (segmentProcessQueue.length <= segmentProcessPosition) {
+    await updateDrives();
+    return;
+  }
+
+  const {
+    segment,
+    uploadComplete,
+    driveIdentifier,
+    fileStatus,
+  } = segmentProcessQueue[segmentProcessPosition];
+
+  logger.info(`processSegmentsRecursive ${segment.dongle_id} ${segment.drive_identifier} ${segment.segment_id} ${JSON.stringify(segment)}`);
+
+  segment.process_attempts += 1;
+
+  await orm.query(
+    `UPDATE drive_segments SET process_attempts = ${segment.process_attempts} WHERE id = ${segment.id}`,
+  );
+
+  if (segment.process_attempts > 5) {
+    logger.error(`FAILING TO PROCESS SEGMENT,${segment.dongle_id} ${segment.drive_identifier} ${segment.segment_id} JSON: ${JSON.stringify(segment)} SKIPPING `);
+    segmentProcessPosition += 1;
+  } else {
+    Promise.all([
+      processSegmentRLog(fileStatus['rlog.bz2']),
+      processSegmentVideo(fileStatus['qcamera.ts']),
+    ])
+      .then(async () => {
+        logger.info(`processSegmentsRecursive ${segment.dongle_id} ${segment.drive_identifier} ${segment.segment_id} internal gps: ${Math.round(rlogTotalDistInternal * 100) / 100}m, external gps: ${Math.round(rlogTotalDistExternal * 100) / 100}m, duration: ${qcameraDuration}s`);
+
+        const driveSegmentResult = await orm.models.drive_segments.update({
+          duration: Math.round(qcameraDuration),
+          distance_meters: Math.round(
+            Math.max(rlogTotalDistInternal, rlogTotalDistExternal) * 10,
+          ) / 10,
+          is_processed: true,
+          upload_complete: uploadComplete,
+          is_stalled: false,
+        }, { where: { id: segment.id } });
+
+        // if the update failed, stop right here with segment processing and try to update the drives at least
+        if (!driveSegmentResult) {
+          segmentProcessPosition = segmentProcessQueue.length;
+        }
+
+        affectedDrives[driveIdentifier] = true;
+        if (rlogCarParams) {
+          affectedDriveCarParams[driveIdentifier] = rlogCarParams;
+        }
+        if (rlogInitData) {
+          affectedDriveInitData[driveIdentifier] = rlogInitData;
+        }
+
+        segmentProcessPosition += 1;
+        setTimeout(processSegmentsRecursive);
+      })
+      .catch((error) => {
+        logger.error(error);
+      });
+  }
+}
+
+async function updateSegments() {
+  segmentProcessQueue = [];
+  segmentProcessPosition = 0;
+  affectedDrives = {};
+  affectedDriveCarParams = {};
+  affectedDriveInitData = {};
+
+  const [driveSegments] = await orm.query('SELECT * FROM drive_segments WHERE upload_complete = false AND is_stalled = false AND process_attempts < 5 ORDER BY created ASC');
+  logger.info('updateSegments - total drive_segments', driveSegments.length);
+
+  if (driveSegments) {
+    for (let t = 0; t < driveSegments.length; t++) {
+      const segment = driveSegments[t];
+
+      const dongleIdHash = crypto.createHmac('sha256', process.env.APP_SALT)
+        .update(segment.dongle_id)
+        .digest('hex');
+      const driveIdentifierHash = crypto.createHmac('sha256', process.env.APP_SALT)
+        .update(segment.drive_identifier)
+        .digest('hex');
+
+      const directoryTreePath = `${process.env.STORAGE_PATH + segment.dongle_id}/${dongleIdHash}/${driveIdentifierHash}/${segment.drive_identifier}/${segment.segment_id}`;
+      const directoryTree = dirTree(directoryTreePath);
+
+      if (!directoryTree || !directoryTree.children) {
+        console.log('missing directory', directoryTreePath);
+        continue; // happens if upload in progress (db entity written but directory not yet created)
+      }
+
+      const fileStatus = {
+        'fcamera.hevc': false,
+        'dcamera.hevc': false,
+        'qcamera.ts': false,
+        'qlog.bz2': false,
+        'rlog.bz2': false,
+      };
+
+      directoryTree.children.forEach((file) => {
+        if (file.name in fileStatus) {
+          fileStatus[file.name] = true;
+        }
+      });
+
+      const uploadComplete = Object.keys(fileStatus).every((key) => fileStatus[key]);
+
+      if (fileStatus['qcamera.ts'] !== false && fileStatus['rlog.bz2'] !== false && !segment.is_processed) { // can process
+        segmentProcessQueue.push({
+          segment,
+          fileStatus,
+          uploadComplete,
+          driveIdentifier: `${segment.dongle_id}|${segment.drive_identifier}`,
+        });
+      } else if (uploadComplete) {
+        logger.info(`updateSegments uploadComplete for ${segment.dongle_id} ${segment.drive_identifier} ${segment.segment_id}`);
+
+        await orm.query(
+          `UPDATE drive_segments SET upload_complete = true, is_stalled = false WHERE id = ${segment.id}`,
+        );
+
+        affectedDrives[`${segment.dongle_id}|${segment.drive_identifier}`] = true;
+      } else if (Date.now() - segment.created > 10 * 24 * 3600 * 1000) { // ignore non-uploaded segments after 10 days until a new upload_url is requested (which resets is_stalled)
+        logger.info(`updateSegments isStalled for ${segment.dongle_id} ${segment.drive_identifier} ${segment.segment_id}`);
+
+        await orm.query(
+          `UPDATE drive_segments SET is_stalled = true WHERE id = ${segment.id}`,
+        );
+      }
+
+      // we process at most 15 segments per batch
+      if (segmentProcessQueue.length >= 15) {
+        break;
+      }
+    }
+  }
+
+  if (segmentProcessQueue.length > 0) {
+    processSegmentsRecursive();
+  } else {
+    // if no data is to be collected, call updateDrives to update those where eventually just the last segment completed the upload
+    updateDrives();
+  }
+}
+
+async function updateDevices() {
+  // go through all affected devices (with deleted or updated drives) and update them (storage_used)
+  logger.info(`updateDevices - affected drives: ${JSON.stringify(affectedDevices)}`);
+  for (const dongleId of Object.keys(affectedDevices)) {
+    const [device] = await orm.query(`SELECT * FROM devices WHERE dongle_id = ${dongleId}`);
+    if (device == null) continue;
+
+    const dongleIdHash = crypto.createHmac('sha256', process.env.APP_SALT)
+      .update(device.dongle_id)
+      .digest('hex');
+    const devicePath = `${process.env.STORAGE_PATH + device.dongle_id}/${dongleIdHash}`;
+    const deviceQuotaMb = Math.round(parseInt(execSync(`du -s ${devicePath} | awk -F'\t' '{print $1;}'`)
+      .toString(), 10) / 1024);
+    logger.info(`updateDevices device ${dongleId} has an updated storage_used of: ${deviceQuotaMb} MB`);
+
+    await orm.models.drives.update(
+      {
+        storage_used: deviceQuotaMb,
+      },
+      {
+        where: {
+          dongle_id: device.dongle_id,
+        },
+      },
+    );
+  }
+
+  affectedDevices = [];
+}
+
+async function updateDrives() {
+  // go through all affected drives and update them / complete and/or build m3u8
+  logger.info(`updateDrives - affected drives: ${JSON.stringify(affectedDrives)}`);
+  for (const key of Object.keys(affectedDrives)) {
+    const [dongleId, driveIdentifier] = key.split('|');
+
+    let drive = await orm.models.drives.findOne({
+      where: { identifier: driveIdentifier, dongle_id: dongleId },
+    });
+    if (!drive) {
+      continue;
+    }
+
+    drive = drive.dataValues;
+    const dongleIdHash = crypto.createHmac('sha256', process.env.APP_SALT)
+      .update(drive.dongle_id)
+      .digest('hex');
+    const driveIdentifierHash = crypto.createHmac('sha256', process.env.APP_SALT)
+      .update(drive.identifier)
+      .digest('hex');
+    const driveUrl = `${process.env.BASE_DRIVE_DOWNLOAD_URL + drive.dongle_id}/${dongleIdHash}/${driveIdentifierHash}/${drive.identifier}`;
+    const drivePath = `${process.env.STORAGE_PATH + drive.dongle_id}/${dongleIdHash}/${driveIdentifierHash}/${drive.identifier}`;
+
+    let uploadComplete = true;
+    let isProcessed = true;
+
+    let totalDistanceMeters = 0;
+    let totalDurationSeconds = 0;
+    let playlistSegmentStrings = '';
+
+    const driveSegments = await orm.models.drive_segments.findAll({
+      where: {
+        drive_identifier: driveIdentifier,
+        dongle_id: dongleId,
+      },
+      order: [
+        orm.fn('ASC', orm.col('segment_id')),
+      ],
+    });
+
+    if (driveSegments) {
+      for (let t = 0; t < driveSegments.length; t++) {
+        if (!driveSegments[t].upload_complete) uploadComplete = false;
+        if (!driveSegments[t].is_processed) {
+          isProcessed = false;
+        } else {
+          totalDistanceMeters += parseFloat(driveSegments[t].distance_meters);
+          totalDurationSeconds += parseFloat(driveSegments[t].duration);
+
+          playlistSegmentStrings += `#EXTINF:${driveSegments[t].duration},${driveSegments[t].segment_id}\n${driveUrl}/${driveSegments[t].segment_id}/qcamera.ts\n`;
+        }
+      }
+    }
+
+    let { filesize } = drive;
+    if (uploadComplete) {
+      try {
+        filesize = parseInt(execSync(`du -s ${drivePath} | awk -F'\t' '{print $1;}'`)
+          .toString(), 10); // in kilobytes
+        // eslint-disable-next-line no-empty
+      } catch (exception) {
+      }
+    }
+
+    let metadata = {};
+    try {
+      metadata = JSON.parse(drive.metadata);
+    } catch (exception) {
+      logger.error(exception);
+    }
+    if (metadata == null) metadata = {};
+
+    if (affectedDriveInitData[key] && !metadata.InitData) {
+      metadata.InitData = affectedDriveInitData[key];
+    }
+    if (affectedDriveCarParams[key] && !metadata.CarParams) {
+      metadata.CarParams = affectedDriveCarParams[key];
+    }
+
+    logger.info(`updateDrives drive ${dongleId} ${driveIdentifier} uploadComplete: ${uploadComplete}`);
+
+    await orm.models.drives.update(
+      {
+        distance_meters: Math.round(totalDistanceMeters),
+        duration: Math.round(totalDurationSeconds),
+        upload_complete: uploadComplete,
+        is_processed: isProcessed,
+        filesize,
+        metadata: JSON.stringify(metadata),
+      },
+      { where: { id: drive.id } },
+    );
+
+    affectedDevices[dongleId] = true;
+
+    if (isProcessed) {
+      // create the playlist file m3u8 for cabana
+      const playlist = '#EXTM3U\n'
+        + '#EXT-X-VERSION:3\n'
+        + '#EXT-X-TARGETDURATION:61\n'
+        + '#EXT-X-MEDIA-SEQUENCE:0\n'
+        + `#EXT-X-PLAYLIST-TYPE:VOD\n${playlistSegmentStrings}\n`
+        + '#EXT-X-ENDLIST';
+
+      fs.writeFileSync(`${drivePath}/qcamera.m3u8`, playlist);
+    }
+  }
+
+  await updateDevices();
+
+  setTimeout(mainWorkerLoop);
+}
+
+async function deleteExpiredDrives() {
+  const expirationTs = Date.now() - process.env.DEVICE_EXPIRATION_DAYS * 24 * 3600 * 1000;
+
+  const [expiredDrives] = await orm.query(`SELECT * FROM drives WHERE is_preserved = false AND is_deleted = false AND created < ${expirationTs}`);
+  if (!expiredDrives) {
+    return;
+  }
+
+  for (let t = 0; t < expiredDrives.length; t++) {
+    logger.info(`deleteExpiredDrives drive ${expiredDrives[t].dongle_id} ${expiredDrives[t].identifier} is older than ${process.env.DEVICE_EXPIRATION_DAYS} days, set is_deleted=true`);
+    await orm.models.drives.update(
+      {
+        is_deleted: true,
+      },
+      { where: { id: expiredDrives[t].id } },
+    );
+  }
+}
+
+async function removeDeletedDrivesPhysically() {
+  const [deletedDrives] = await orm.query('SELECT * FROM drives WHERE is_deleted = true AND is_physically_removed = false');
+  if (!deletedDrives) {
+    return;
+  }
+
+  for (let t = 0; t < deletedDrives.length; t++) {
+    logger.info(`removeDeletedDrivesPhysically drive ${deletedDrives[t].dongle_id} ${deletedDrives[t].identifier} is deleted, remove physical files and clean database`);
+
+    const dongleIdHash = crypto.createHmac('sha256', process.env.APP_SALT)
+      .update(deletedDrives[t].dongle_id)
+      .digest('hex');
+    const driveIdentifierHash = crypto.createHmac('sha256', process.env.APP_SALT)
+      .update(deletedDrives[t].identifier)
+      .digest('hex');
+
+    const drivePath = `${process.env.STORAGE_PATH + deletedDrives[t].dongle_id}/${dongleIdHash}/${driveIdentifierHash}`;
+    logger.info(`removeDeletedDrivesPhysically drive ${deletedDrives[t].dongle_id} ${deletedDrives[t].identifier} storage path is ${drivePath}`);
+    try {
+      const driveResult = await orm.query(`UPDATE drives SET is_physically_removed = true WHERE id = ${deletedDrives[t].id}`);
+
+      const driveSegmentResult = await orm.query(
+        `DELETE FROM drive_segments WHERE drive_identifier = ${deletedDrives[t].identifier} AND dongle_id = ${deletedDrives[t].dongle_id}`,
+      );
+
+      if (driveResult != null && driveSegmentResult != null) {
+        deleteFolderRecursive(drivePath, { recursive: true });
+      }
+      affectedDevices[deletedDrives[t].dongle_id] = true;
+    } catch (exception) {
+      logger.error(exception);
+    }
+  }
+}
+
+async function deleteOverQuotaDrives() {
+  const [devices] = await orm.query(`SELECT * FROM devices WHERE storage_used > ${process.env.DEVICE_STORAGE_QUOTA_MB}`);
+  if (devices == null) {
+    return;
+  }
+
+  for (let t = 0; t < devices.length; t++) {
+    let foundDriveToDelete = false;
+
+    const [driveNormal] = await orm.query(`SELECT * FROM drives WHERE dongle_id = ${devices[t].dongle_id} AND is_preserved = false AND is_deleted = false ORDER BY created ASC LIMIT 1`);
+    if (driveNormal != null) {
+      logger.info(`deleteOverQuotaDrives drive ${driveNormal.dongle_id} ${driveNormal.identifier} (normal) is deleted for over-quota`);
+      await orm.query(`UPDATE drives SET is_deleted = true WHERE id = ${driveNormal.id}`);
+      foundDriveToDelete = true;
+    }
+
+    if (!foundDriveToDelete) {
+      const [drivePreserved] = await orm.query('SELECT * FROM drives WHERE dongle_id = devices[t].dongle_id AND is_preserved = true AND is_deleted = false ORDER BY created ASC LIMIT 1');
+      if (drivePreserved != null) {
+        logger.info(`deleteOverQuotaDrives drive ${drivePreserved.dongle_id} ${drivePreserved.identifier} (preserved!) is deleted for over-quota`);
+        await orm.query(`UPDATE drives SET is_deleted = ? WHERE id = ${drivePreserved.id}`);
+        foundDriveToDelete = true;
+      }
+    }
+  }
+}
+
+async function deleteBootAndCrashLogs() {
+  const [devices] = await orm.query('SELECT * FROM devices');
+  if (devices == null) {
+    return;
+  }
+
+  for (let t = 0; t < devices.length; t++) {
+    const device = devices[t];
+    const dongleIdHash = crypto.createHmac('sha256', process.env.APP_SALT)
+      .update(device.dongle_id)
+      .digest('hex');
+
+    const bootlogDirectoryTree = dirTree(`${process.env.STORAGE_PATH + device.dongle_id}/${dongleIdHash}/boot/`, { attributes: ['size'] });
+    const bootlogFiles = [];
+    if (bootlogDirectoryTree) {
+      for (let i = 0; i < bootlogDirectoryTree.children.length; i++) {
+        const timeSplit = bootlogDirectoryTree.children[i].name.replace('boot-', '')
+          .replace('crash-', '')
+          .replace('.bz2', '')
+          .split('--');
+        const timeString = `${timeSplit[0]} ${timeSplit[1].replace(/-/g, ':')}`;
+        bootlogFiles.push({
+          name: bootlogDirectoryTree.children[i].name,
+          size: bootlogDirectoryTree.children[i].size,
+          date: Date.parse(timeString),
+          path: bootlogDirectoryTree.children[i].path,
+        });
+      }
+      bootlogFiles.sort((a, b) => ((a.date < b.date) ? 1 : -1));
+      for (let c = 5; c < bootlogFiles.length; c++) {
+        logger.info(`deleteBootAndCrashLogs deleting boot log ${bootlogFiles[c].path}`);
+        try {
+          fs.unlinkSync(bootlogFiles[c].path);
+          affectedDevices[device.dongle_id] = true;
+        } catch (exception) {
+          logger.error(exception);
+        }
+      }
+    }
+
+    const crashlogDirectoryTree = dirTree(`${process.env.STORAGE_PATH + device.dongle_id}/${dongleIdHash}/crash/`, { attributes: ['size'] });
+    const crashlogFiles = [];
+    if (crashlogDirectoryTree) {
+      for (let i = 0; i < crashlogDirectoryTree.children.length; i++) {
+        const timeSplit = crashlogDirectoryTree.children[i].name.replace('boot-', '')
+          .replace('crash-', '')
+          .replace('.bz2', '')
+          .split('--');
+        const timeString = `${timeSplit[0]} ${timeSplit[1].replace(/-/g, ':')}`;
+        crashlogFiles.push({
+          name: crashlogDirectoryTree.children[i].name,
+          size: crashlogDirectoryTree.children[i].size,
+          date: Date.parse(timeString),
+          path: crashlogDirectoryTree.children[i].path,
+        });
+      }
+      crashlogFiles.sort((a, b) => ((a.date < b.date) ? 1 : -1));
+      for (let c = 5; c < crashlogFiles.length; c++) {
+        logger.info(`deleteBootAndCrashLogs deleting crash log ${crashlogFiles[c].path}`);
+        try {
+          fs.unlinkSync(crashlogFiles[c].path);
+          affectedDevices[device.dongle_id] = true;
+        } catch (exception) {
+          logger.error(exception);
+        }
+      }
+    }
+  }
+}
+
+async function mainWorkerLoop() {
+  if (Date.now() - startTime > 60 * 60 * 1000) {
+    logger.info('EXIT WORKER AFTER 1 HOUR TO PREVENT MEMORY LEAKS...');
+    process.exit();
+    return;
+  }
+
+  try {
+    if (Date.now() - lastCleaningTime > 20 * 60 * 1000) {
+      await deleteBootAndCrashLogs();
+      await deleteExpiredDrives();
+      await deleteOverQuotaDrives();
+      await removeDeletedDrivesPhysically();
+      lastCleaningTime = Date.now();
+    }
+
+    setTimeout(updateSegments, 5000);
+  } catch (e) {
+    logger.error(e);
+  }
+}
+
+export default async () => {
+  initializeStorage();
+  setTimeout(mainWorkerLoop);
+};