Added columns

New functions

Author: leganz

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.0] - 2020-11-04
+### Added
+- Changed the saving workflow cause file creation took to long
+- Fixed some minor issues
+
 ## [0.3.2] - 2020-08-09
 ### Added
 - Add update controller method

package-lock.json

@@ -9,6 +9,9 @@ export class Browse {
     @Column()
     filename: string;
 
+    @Column()
+    filename_return: string;
+
     @CreateDateColumn({type: "date"})
     created_at: Date;
 

src/browser/browse.entity.ts

@@ -73,6 +73,10 @@ export class BrowserController {
     let stream;
 
     try {
+
+      if (!params) {
+        throw "Incorrect params";
+      }
 
       fileEntry = await this.browserService.find(params.id);
 
@@ -88,7 +92,7 @@ export class BrowserController {
       res.set({
           'Content-Type': 'application/pdf',
           'Content-Length': stream.length,
-          'Content-Disposition': 'form-data;filename="' + fileEntry.filename +'"'
+          'Content-Disposition': 'form-data;filename="' + fileEntry.filename_return +'.pdf"'
       });
 
       stream.pipe(oppressor(req)).pipe(res);
@@ -131,7 +135,7 @@ export class BrowserController {
     res.status(HttpStatus.OK).json(
       {
         "id": fileEntry.id,
-        "filename": fileEntry.filename,
+        "filename": fileEntry.filename_return,
         "path": this.signature.sign(`${req.protocol}://${req.headers.host}/api/browse/${fileEntry.id}`),
         "created_at": fileEntry.created_at,
         "updated_at": fileEntry.updated_at,
@@ -174,9 +178,19 @@ export class BrowserController {
   @ApiTags("Create pdf documents")
   async create(@Body() createSession: CreateBrowserDto, @Res() res: Response, @Req() request:Request) { 
 
-    let result = await this.browserService.savePage(createSession.url);
+    // Create the database entry for the file
+    let browseEntry: Browse = new Browse();
+
+    browseEntry.id = uuidv4();
+    browseEntry.filename = browseEntry.id;
+    browseEntry.filename_return = (createSession.filename ? createSession.filename.toString() : browseEntry.id.toString());
+    browseEntry.autodelete = createSession.autodelete;
+
+    this.browserService.create(browseEntry);
+
+    let result = await this.browserService.savePage(createSession.url, browseEntry.id,  createSession.filename ? createSession.filename : browseEntry.id );
     let resultUpload = false;
-    let resultUploadFailed = false;
+    let resultUploadFailed = false;   
 
     createSession.autodelete = createSession.autodelete == true;
     createSession.postBackWait = createSession.postBackWait == true;
@@ -206,21 +220,12 @@ export class BrowserController {
 
     }
 
-    // Create the database entry for the file
-    let browseEntry: Browse = new Browse();
-
-    browseEntry.id = result.id.toString();
-    browseEntry.filename = (createSession.filename ? createSession.filename.toString() : result.id.toString()) + '.pdf';
-    browseEntry.autodelete = resultUploadFailed || createSession.autodelete;
-
-    this.browserService.create(browseEntry);
-
     res.status(HttpStatus.OK).json(new PdfResult({
         statusCode: HttpStatus.OK,
         requestUrl: createSession.url,
         downloadUrl: resultUpload == false ? this.signature.sign(`${request.protocol}://${request.headers.host}/api/browse/${result.id}`) : null,
         id: result.id,
-        filename: browseEntry.filename,
+        filename: browseEntry.filename_return,
         uploaded: resultUpload,
         waited: createSession.postBackWait,   
         autodelete: createSession.autodelete   

src/browser/browser.controller.ts

@@ -56,7 +56,7 @@ export class BrowserService {
    * @param path 
    * @param filename 
    */
-  async savePage(path: String, filename?: String): Promise<CreateBrowserResponseDto> {
+  async savePage(path: String, entityId:String, filename?: String): Promise<CreateBrowserResponseDto> {
 
     const executablePath = this.configService.get<string>('browser');
     let settings:any = {headless:true, 'args':["--no-sandbox", "--disable-setuid-sandbox"]};
@@ -65,17 +65,18 @@ export class BrowserService {
        settings.executablePath = this.configService.get<string>('browser');
     }
 
-    filename ? filename : filename = uuidv4();
-    const pathToFile = `storage/${filename}.pdf`;
+    filename ? filename : filename = entityId;
+
+    const pathToFile = `storage/${entityId}.pdf`;
     const browser = await puppeteer.launch(settings);
     const page = await browser.newPage();
 
-    await page.goto(path, {waitUntil: 'networkidle2'});
+    await page.goto(path, {waitUntil: 'networkidle0'});
     await page.pdf({path: pathToFile, format: 'A4'});
     await browser.close();
 
     return new Promise((resolve, rejects) => {
-       resolve(new CreateBrowserResponseDto(filename, path, pathToFile));
+       resolve(new CreateBrowserResponseDto(entityId, path, pathToFile, filename));
     });
 
   }

src/browser/browser.service.ts

@@ -54,10 +54,12 @@ export class CreateBrowserResponseDto {
     url: String;
     id: String;
     storagePath: String;
+    filename: String;
 
-    constructor(id:String, url:String, path: String){
+    constructor(id:String, url:String, path: String, filename:String){
         this.id = id;
         this.url = url;
         this.storagePath = path;
+        this.filename = filename;
     }
 }