aas-server bug fixing

FraunhoferIOSB · Nov 9, 2023 · c8c11e1 · c8c11e1
1 parent b1d5429
commit c8c11e1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/projects/aas-server/src/app/aas-provider/aas-provider.ts b/projects/aas-server/src/app/aas-provider/aas-provider.ts
@@ -457,7 +457,7 @@ export class AASProvider {
                             this.startContainerScan,
                             this.timeout,
                             result.taskId,
-                            { name: task.id, container: endpoint, documents },
+                            { ...endpoint, documents },
                             result.statistic);
                     }).catch(error => this.logger.error(error));
                 }
@@ -592,10 +592,6 @@ export class AASProvider {
     //     return document;
     // }
 
-    private getUrl(url: string): string {
-        return url.split('?')[0];
-    }
-
     private createTaskId(): number {
         const taskId = this.nextTaskId;
         ++this.nextTaskId;

diff --git a/projects/aas-server/src/app/configuration.ts b/projects/aas-server/src/app/configuration.ts
@@ -59,10 +59,15 @@ export function createEndpoint(url: string, name: string, type: AASEndpointType
     return { url, name, type, version };
 }
 
+/**
+ * Creates an AASEndpoint form an URL.
+ * @param url The current URL.
+ * @returns An equivalent AASEndpoint.
+ */
 export function urlToEndpoint(url: string): AASEndpoint {
     const value = new URL(url);
     const name = value.searchParams.get('name');
-    const type = value.searchParams.get('type') as AASEndpointType ?? 'AasxServer';
+    const type = value.searchParams.get('type') as AASEndpointType ?? getEndpointType(value);
     const version = value.searchParams.get('version') ?? '3.0';
 
     value.search = '';
@@ -71,6 +76,9 @@ export function urlToEndpoint(url: string): AASEndpoint {
     return { url: value.href, name: name ?? value.href, type, version };
 }
 
+/**
+ * Creates an URL that represents an AASEndpoint.
+ */
 export function endpointUrl(url: string, name: string, type: AASEndpointType, version?: string): URL {
     const value = new URL(url);
     value.searchParams.append('name', name);

diff --git a/projects/aas-server/src/app/packages/aasx-server/aasx-server-package.ts b/projects/aas-server/src/app/packages/aasx-server/aasx-server-package.ts
@@ -80,8 +80,12 @@ export class AasxServerPackage extends AASPackage {
     }
 
     private async createThumbnail(id: string): Promise<string | undefined> {
-        const input = await this.source.getThumbnailAsync(id);
-        const output = await ImageProcessing.resizeAsync(input, 40, 40);
-        return await this.streamToBase64(output);
+        try {
+            const input = await this.source.getThumbnailAsync(id);
+            const output = await ImageProcessing.resizeAsync(input, 40, 40);
+            return await this.streamToBase64(output);
+        } catch {
+            return undefined;
+        }
     }
 }