refactor export middleware typing (#1366)

Author: evilz

src/RevealServer.ts

@@ -12,7 +12,6 @@ import { RevealContext } from './RevealContext'
 
 /** Http server to serve reveal presentation */
 export class RevealServer extends Disposable {
-
   public readonly app = express()
 
   private server: http.Server | null = null
@@ -23,7 +22,6 @@ export class RevealServer extends Disposable {
     this.configure()
   }
 
-
   /**
    * If the server is not listening, start the server and log the server's status.
    * @returns The uri of the server.
@@ -58,7 +56,7 @@ export class RevealServer extends Disposable {
   /** Current uri for this server, empty is not listening */
   public get uri() {
     if (!this.isListening || this.server === null) {
-      return ""
+      return ''
     }
 
     const addr = this.server.address()
@@ -76,8 +74,6 @@ export class RevealServer extends Disposable {
     const app = this.app
     const context = this.context
 
-
-
     //disable cache
     app.set('etag', false)
     app.use((req, res, next) => {
@@ -86,9 +82,9 @@ export class RevealServer extends Disposable {
     })
 
     // Set EJS as view
-    app.set('view engine', 'ejs');
+    app.set('view engine', 'ejs')
     app.engine('ejs', ejs.__express)
-    app.set('views', path.resolve(context.extensionPath, 'views'));
+    app.set('views', path.resolve(context.extensionPath, 'views'))
     app.use(cors())
     // LOG REQUEST
     app.use(morgan(':method :url :status :res[content-length] - :response-time ms', { stream: { write: (str) => context.logger.info(str) } }))
@@ -98,25 +94,23 @@ export class RevealServer extends Disposable {
 
     // STATIC LIBS
     const libsPAth = path.join(context.extensionPath, 'libs')
-    app.use('/libs', express.static(libsPAth, { cacheControl: false, etag: false, immutable: false }));
+    app.use('/libs', express.static(libsPAth, { cacheControl: false, etag: false, immutable: false }))
 
     // STATIC RELATIVE TO MD FILE if file is saved
     if (context.dirname) {
-      app.use('/', express.static(context.dirname, { cacheControl: false, etag: false, immutable: false }));
+      app.use('/', express.static(context.dirname, { cacheControl: false, etag: false, immutable: false }))
     }
 
     // MAIN FILE
     app.use((req, res, next) => {
       if (req.path !== '/') {
         next()
-      }
-      else {
-
-        let init: string | null = null;
+      } else {
+        let init: string | null = null
         if (context.dirname) {
           const initPath = path.join(context.dirname, 'init.js')
           if (fs.existsSync(initPath)) {
-            init = fs.readFileSync(initPath, "utf8");
+            init = fs.readFileSync(initPath, 'utf8')
           }
         }
 
@@ -126,74 +120,72 @@ export class RevealServer extends Disposable {
           children: s.verticalChildren.map((c) => ({ ...c, html: markdownit.render(c.text) })),
         }))
         res.render('index', { slides: htmlSlides, ...context.configuration, rootUrl: this.uri, init })
-
       }
     })
 
     // ERROR HANDLER
     app.use(function (err, req, res, next) {
       context.logger.error(err.stack)
-      res.status(500).send(err.stack);
-    });
+      res.status(500).send(err.stack)
+    })
   }
 
   /* A middleware function that is used to export the presentation to a folder. */
-  private readonly exportMiddleware = (exportfn: (ExportOptions) => Promise<void>, isInExport) => {
-
+  private readonly exportMiddleware = (exportfn: (opts: IExportOptions) => Promise<void>, isInExport: () => boolean) => {
     const { exportPath } = this.context
 
     return async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-
       if (isInExport()) {
-
-        console.log("in export");
+        this.context.logger.debug('in export')
         const oldWrite = res.write
-        const oldEnd = res.end;
+        const oldEnd = res.end
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const chunks: any[] = [];
+        const chunks: Buffer[] | string[] = []
 
         res.write = (chunk, ...args) => {
-          chunks.push(chunk);
+          if (typeof chunk === 'string') {
+            ;(chunks as string[]).push(chunk)
+          } else {
+            ;(chunks as Buffer[]).push(chunk)
+          }
           // @ts-ignore
-          return oldWrite.apply(res, [chunk, ...args]);
-        };
+          return oldWrite.apply(res, [chunk, ...args])
+        }
         // @ts-ignore
         res.end = async (chunk, ...args) => {
           this.context.logger.info(`${req.originalUrl.split('?')[0]} - ${chunks.length}`)
           if (chunk) {
-            chunks.push(chunk);
+            if (typeof chunk === 'string') {
+              ;(chunks as string[]).push(chunk)
+            } else {
+              ;(chunks as Buffer[]).push(chunk)
+            }
           }
           try {
-            let body: string | Buffer;
+            let body: string | Buffer
             if (chunks.length > 0 && typeof chunks[0] === 'string') {
-              body = "".concat(...(chunks as string[]));
-            }
-            else {
-              body = Buffer.concat(chunks);
+              body = ''.concat(...(chunks as string[]))
+            } else {
+              body = Buffer.concat(chunks as Buffer[])
             }
 
-
             const opts: IExportOptions = { folderPath: exportPath, url: req.originalUrl.split('?')[0], srcFilePath: null, data: body }
-            await exportfn(opts);
-          }
-          catch (error) {
+            await exportfn(opts)
+          } catch (error) {
             this.context.logger.info(`Error : ${error}`)
           }
 
           // @ts-ignore
-          return oldEnd.apply(res, [chunk, ...args]);
-        };
+          return oldEnd.apply(res, [chunk, ...args])
+        }
       }
       next()
-
-
     }
   }
 
   dispose(): void {
     this.stop()
     this.server = null
-    super.dispose();
+    super.dispose()
   }
 }