Merge branch 'refs/heads/main' into feature/remote-app

flybywiresim · May 11, 2024 · e6d613e · e6d613e
2 parents dc1981c + 00bdec9
commit e6d613e
Show file tree

Hide file tree

Showing 4 changed files with 211 additions and 24 deletions.
diff --git a/apps/server/src/interfaces/mcdu.gateway.ts b/apps/server/src/interfaces/mcdu.gateway.ts
@@ -24,9 +24,7 @@ export class McduGateway implements OnGatewayInit, OnGatewayConnection {
   async afterInit(server: Server) {
     this.server = server;
     this.logger.log('Remote MCDU websocket initialised');
-    this.logger.log(
-      `Initialised on http://${await this.networkService.getLocalIp(true)}:${this.serverConf.port}${server.path}`,
-    );
+    this.logger.log(`Initialised websocket gateway on ws://${await this.networkService.getLocalIp(true)}:${this.serverConf.port}${server.path}`);
   }
 
   handleConnection(client: WebSocket) {

diff --git a/apps/server/src/utilities/file.service.ts b/apps/server/src/utilities/file.service.ts
@@ -110,7 +110,7 @@ export class FileService {
 
   async getNumberOfPdfPages(Directory: string, fileName: string): Promise<number> {
     const retrievedFile = await this.getFile(Directory, fileName);
-    return getDocument({ data: retrievedFile }).promise.then((document) => document.numPages);
+    return getDocument({ data: retrievedFile, isEvalSupported: false }).promise.then((document) => document.numPages);
   }
 
   /**
@@ -160,6 +160,7 @@ export class FileService {
           cMapUrl: CMAP_URL,
           cMapPacked: CMAP_PACKED,
           standardFontDataUrl: STANDARD_FONT_DATA_URL,
+          isEvalSupported: false,
         }).promise;
 
         this.pdfCache.set(conversionFilePath, pdfDocument);

diff --git a/package-lock.json b/package-lock.json