fix: ES6 import/export fixed

Author: bitIO

src/file-service.js

@@ -1,5 +1,5 @@
 import { readFileSync, unlinkSync } from 'fs';
-import { debug, error } from './log';
+import logger from './log';
 
 const files = {};
 
@@ -20,7 +20,7 @@ const remove = (filename) => {
     unlinkSync(file.filepath);
   }
   delete files[filename];
-  debug('File removed', filename);
+  logger.debug('File removed', filename);
 };
 const write = (filename, buffer, filesize, filepath) => {
   files[filename] = {
@@ -29,59 +29,59 @@ const write = (filename, buffer, filesize, filepath) => {
     filepath,
     size: (buffer ? buffer.length : filesize),
   };
-  debug('File saved', files[filename]);
+  logger.debug('File saved', files[filename]);
 };
 
-const getFileSize = (filename) => {
+export const getFileSize = (filename) => {
   if (exists(filename)) {
     const fileSize = size(filename);
-    debug('Request size of', filename, 'is', fileSize);
+    logger.debug('Request size of', filename, 'is', fileSize);
     return result(200, { fileSize });
   }
-  debug('Request size of', filename, 'not found');
+  logger.debug('Request size of', filename, 'not found');
   return result(404);
 };
 
-const readFile = (filename) => {
+export const readFile = (filename) => {
   if (exists(filename)) {
-    debug('Streaming', filename);
+    logger.debug('Streaming', filename);
     return result(200, read(filename));
   }
-  debug('Streaming', filename, 'not found');
+  logger.debug('Streaming', filename, 'not found');
   return result(404);
 };
 
-const writeFile = (file) => {
-  debug('Storing', file.originalname);
+export const writeFile = (file) => {
+  logger.debug('Storing', file.originalname);
   write(file.originalname, file.buffer, file.size, file.path);
   return result(200);
 };
-const writeFileChunk = (filename, buffer, chunkNumber) => {
-  debug('Storing', filename, 'chunk', chunkNumber);
+export const writeFileChunk = (filename, buffer, chunkNumber) => {
+  logger.debug('Storing', filename, 'chunk', chunkNumber);
   write(`${filename}.${chunkNumber}.chunk`, buffer);
   return result(200);
 };
-const assembleFileChunks = (filename, requestTotalSize) => {
-  debug('Assembling', filename, 'total size', requestTotalSize);
+export const assembleFileChunks = (filename, requestTotalSize) => {
+  logger.debug('Assembling', filename, 'total size', requestTotalSize);
   let chunkNumber = 1;
   let totalSize = 0;
   while (true) {
     const chunkName = `${filename}.${chunkNumber}.chunk`;
     if (exists(chunkName)) {
       const fileSize = size(chunkName);
-      debug('Testing', chunkName, 'with size', fileSize);
+      logger.debug('Testing', chunkName, 'with size', fileSize);
       chunkNumber += 1;
       totalSize += fileSize;
     } else {
-      error('Testing', chunkName, 'not found');
+      logger.error('Testing', chunkName, 'not found');
       break;
     }
   }
   if (requestTotalSize !== totalSize) {
-    error('Request total size', requestTotalSize, 'not equal to calculated total size', totalSize);
+    logger.error('Request total size', requestTotalSize, 'not equal to calculated total size', totalSize);
     return result(412);
   }
-  debug('Request total size', requestTotalSize, 'equal to calculated total size', totalSize);
+  logger.debug('Request total size', requestTotalSize, 'equal to calculated total size', totalSize);
   let buffer = null;
   chunkNumber = 1;
   while (true) {
@@ -97,21 +97,12 @@ const assembleFileChunks = (filename, requestTotalSize) => {
   return result(200);
 };
 
-const removeFile = (filename) => {
+export const removeFile = (filename) => {
   if (exists(filename)) {
-    debug('Removing file', filename);
+    logger.debug('Removing file', filename);
     remove(filename);
     return result(200);
   }
-  error('Removing', filename, 'not found');
+  logger.error('Removing', filename, 'not found');
   return result(404);
 };
-
-export default {
-  assembleFileChunks,
-  getFileSize,
-  readFile,
-  removeFile,
-  writeFile,
-  writeFileChunk,
-};

src/log.js

@@ -1,9 +1,9 @@
-const winston = require('winston');
+import winston, { Logger, transports as _transports } from 'winston';
 
 const { config } = winston;
-const logger = new (winston.Logger)({
+const logger = new (Logger)({
   transports: [
-    new (winston.transports.Console)({
+    new (_transports.Console)({
       timestamp() {
         return Date.now();
       },
@@ -19,4 +19,4 @@ const logger = new (winston.Logger)({
   ],
 });
 
-module.exports = logger;
+export default logger;

src/server.js

@@ -4,11 +4,11 @@ import cors from 'cors';
 import multer, { diskStorage, memoryStorage } from 'multer';
 import { urlencoded, json } from 'body-parser';
 import { writeFile, getFileSize, readFile, removeFile, writeFileChunk, assembleFileChunks } from './file-service';
-import { verbose, info, error } from './log';
+import logger from './log';
 
 /* eslint-disable no-underscore-dangle */
 const saveFile = (request, response, filename) => {
-  verbose('Saving file', request.file, filename);
+  logger.verbose('Saving file', request.file, filename);
   const result = writeFile(request.file);
   if (request.query._postmessage) {
     if (request.query._postmessageid) {
@@ -28,10 +28,10 @@ export default {
   init(options) {
     let storage;
     if (options.storage.type === 'disk') {
-      info('Using disk storage', (options.storage.path || '/tmp'));
+      logger.info('Using disk storage', (options.storage.path || '/tmp'));
 
       if (options.storage.path && !existsSync(options.storage.pathh)) {
-        error(options.storage.path, 'does not exist');
+        logger.error(options.storage.path, 'does not exist');
         throw new Error(`${options.storage.path} does not exist`);
       }
 
@@ -44,7 +44,7 @@ export default {
         },
       });
     } else {
-      info('Using memory storage');
+      logger.info('Using memory storage');
       storage = memoryStorage();
     }
     const upload = multer({ storage });
@@ -99,12 +99,12 @@ export default {
   },
 
   run(options) {
-    info('================================');
-    info('>>> Express REST file server <<<');
-    info('================================');
+    logger.info('================================');
+    logger.info('>>> Express REST file server <<<');
+    logger.info('================================');
     const server = this.init(options);
     server.listen(options.port, () => {
-      info('Listening on', options.port);
+      logger.info('Listening on', options.port);
     });
   },
 };