Skip to content

Improves error handling #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 23, 2025
Merged

Improves error handling #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 58 additions & 54 deletions src/clients/AasRepositoryClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ export class AasRepositoryClient {
const client = createCustomClient(baseUrl, headers);
const encodedAssetIds = assetIds?.map((id) => base64Encode(JSON.stringify(id)));

const { data, error } = await AasRepository.getAllAssetAdministrationShells({
const result = await AasRepository.getAllAssetAdministrationShells({
client,
query: { assetIds: encodedAssetIds, idShort, limit, cursor },
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}

const shells = (data.result ?? []).map(convertApiAasToCoreAas);
const shells = (result.data.result ?? []).map(convertApiAasToCoreAas);
return {
success: true,
data: {
pagedResult: data.paging_metadata,
pagedResult: result.data.paging_metadata,
result: shells,
},
};
Expand Down Expand Up @@ -95,15 +95,15 @@ export class AasRepositoryClient {
const { baseUrl, assetAdministrationShell, headers } = options;
try {
const client = createCustomClient(baseUrl, headers);
const { data, error } = await AasRepository.postAssetAdministrationShell({
const result = await AasRepository.postAssetAdministrationShell({
client,
body: convertCoreAasToApiAas(assetAdministrationShell),
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}
return { success: true, data: convertApiAasToCoreAas(data) };
return { success: true, data: convertApiAasToCoreAas(result.data) };
} catch (err) {
return { success: false, error: err instanceof Error ? err : new Error(String(err)) };
}
Expand Down Expand Up @@ -134,15 +134,15 @@ export class AasRepositoryClient {
const client = createCustomClient(baseUrl, headers);
const encodedAasIdentifier = base64Encode(aasIdentifier);

const { data, error } = await AasRepository.deleteAssetAdministrationShellById({
const result = await AasRepository.deleteAssetAdministrationShellById({
client,
path: { aasIdentifier: encodedAasIdentifier },
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}
return { success: true, data };
return { success: true, data: result.data };
} catch (err) {
return { success: false, error: err instanceof Error ? err : new Error(String(err)) };
}
Expand All @@ -168,15 +168,19 @@ export class AasRepositoryClient {
const client = createCustomClient(baseUrl, headers);
const encodedAasIdentifier = base64Encode(aasIdentifier);

const { data, error } = await AasRepository.getAssetAdministrationShellById({
const result = await AasRepository.getAssetAdministrationShellById({
client,
path: { aasIdentifier: encodedAasIdentifier },
});

if (error) {
return { success: false, error };
if (result.error) {
// Return the complete error object with status code
return {
success: false,
error: result.error,
};
}
return { success: true, data: convertApiAasToCoreAas(data) };
return { success: true, data: convertApiAasToCoreAas(result.data) };
} catch (err) {
return { success: false, error: err instanceof Error ? err : new Error(String(err)) };
}
Expand Down Expand Up @@ -209,16 +213,16 @@ export class AasRepositoryClient {
const client = createCustomClient(baseUrl, headers);
const encodedAasIdentifier = base64Encode(aasIdentifier);

const { data, error } = await AasRepository.putAssetAdministrationShellById({
const result = await AasRepository.putAssetAdministrationShellById({
client,
path: { aasIdentifier: encodedAasIdentifier },
body: convertCoreAasToApiAas(assetAdministrationShell),
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}
return { success: true, data };
return { success: true, data: result.data };
} catch (err) {
return { success: false, error: err instanceof Error ? err : new Error(String(err)) };
}
Expand All @@ -244,17 +248,17 @@ export class AasRepositoryClient {
const client = createCustomClient(baseUrl, headers);
const encodedAasIdentifier = base64Encode(aasIdentifier);

const { data, error } = await AasRepository.getAssetInformationAasRepository({
const result = await AasRepository.getAssetInformationAasRepository({
client,
path: { aasIdentifier: encodedAasIdentifier },
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}
return {
success: true,
data: convertApiAssetInformationToCoreAssetInformation(data),
data: convertApiAssetInformationToCoreAssetInformation(result.data),
};
} catch (err) {
return { success: false, error: err instanceof Error ? err : new Error(String(err)) };
Expand Down Expand Up @@ -288,16 +292,16 @@ export class AasRepositoryClient {
const client = createCustomClient(baseUrl, headers);
const encodedAasIdentifier = base64Encode(aasIdentifier);

const { data, error } = await AasRepository.putAssetInformationAasRepository({
const result = await AasRepository.putAssetInformationAasRepository({
client,
path: { aasIdentifier: encodedAasIdentifier },
body: convertCoreAssetInformationToApiAssetInformation(assetInformation),
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}
return { success: true, data };
return { success: true, data: result.data };
} catch (err) {
return { success: false, error: err instanceof Error ? err : new Error(String(err)) };
}
Expand Down Expand Up @@ -328,17 +332,17 @@ export class AasRepositoryClient {
const client = createCustomClient(baseUrl, headers);
const encodedAasIdentifier = base64Encode(aasIdentifier);

const { data, error } = await AasRepository.deleteThumbnailAasRepository({
const result = await AasRepository.deleteThumbnailAasRepository({
client,
path: { aasIdentifier: encodedAasIdentifier },
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}
return {
success: true,
data: data as AasRepository.DeleteThumbnailAasRepositoryResponses,
data: result.data as AasRepository.DeleteThumbnailAasRepositoryResponses,
};
} catch (err) {
return { success: false, error: err instanceof Error ? err : new Error(String(err)) };
Expand All @@ -365,15 +369,15 @@ export class AasRepositoryClient {
const client = createCustomClient(baseUrl, headers);
const encodedAasIdentifier = base64Encode(aasIdentifier);

const { data, error } = await AasRepository.getThumbnailAasRepository({
const result = await AasRepository.getThumbnailAasRepository({
client,
path: { aasIdentifier: encodedAasIdentifier },
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}
return { success: true, data };
return { success: true, data: result.data };
} catch (err) {
return { success: false, error: err instanceof Error ? err : new Error(String(err)) };
}
Expand Down Expand Up @@ -403,16 +407,16 @@ export class AasRepositoryClient {
const client = createCustomClient(baseUrl, headers);
const encodedAasIdentifier = base64Encode(aasIdentifier);

const { data, error } = await AasRepository.putThumbnailAasRepository({
const result = await AasRepository.putThumbnailAasRepository({
client,
path: { aasIdentifier: encodedAasIdentifier },
body: thumbnail,
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}
return { success: true, data };
return { success: true, data: result.data };
} catch (err) {
return { success: false, error: err instanceof Error ? err : new Error(String(err)) };
}
Expand Down Expand Up @@ -450,21 +454,21 @@ export class AasRepositoryClient {
const client = createCustomClient(baseUrl, headers);
const encodedAasIdentifier = base64Encode(aasIdentifier);

const { data, error } = await AasRepository.getAllSubmodelReferencesAasRepository({
const result = await AasRepository.getAllSubmodelReferencesAasRepository({
client,
path: { aasIdentifier: encodedAasIdentifier },
query: { limit, cursor },
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}

const submodelReferences = (data.result ?? []).map(convertApiReferenceToCoreReference);
const submodelReferences = (result.data.result ?? []).map(convertApiReferenceToCoreReference);
return {
success: true,
data: {
pagedResult: data.paging_metadata,
pagedResult: result.data.paging_metadata,
result: submodelReferences,
},
};
Expand Down Expand Up @@ -495,16 +499,16 @@ export class AasRepositoryClient {
const client = createCustomClient(baseUrl, headers);
const encodedAasIdentifier = base64Encode(aasIdentifier);

const { data, error } = await AasRepository.postSubmodelReferenceAasRepository({
const result = await AasRepository.postSubmodelReferenceAasRepository({
client,
path: { aasIdentifier: encodedAasIdentifier },
body: convertCoreReferenceToApiReference(submodelReference),
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}
return { success: true, data: convertApiReferenceToCoreReference(data) };
return { success: true, data: convertApiReferenceToCoreReference(result.data) };
} catch (err) {
return { success: false, error: err instanceof Error ? err : new Error(String(err)) };
}
Expand Down Expand Up @@ -538,18 +542,18 @@ export class AasRepositoryClient {
const encodedAasIdentifier = base64Encode(aasIdentifier);
const encodedSubmodelIdentifier = base64Encode(submodelIdentifier);

const { data, error } = await AasRepository.deleteSubmodelReferenceByIdAasRepository({
const result = await AasRepository.deleteSubmodelReferenceByIdAasRepository({
client,
path: {
aasIdentifier: encodedAasIdentifier,
submodelIdentifier: encodedSubmodelIdentifier,
},
});

if (error) {
return { success: false, error };
if (result.error) {
return { success: false, error: result.error };
}
return { success: true, data };
return { success: true, data: result.data };
} catch (err) {
return { success: false, error: err instanceof Error ? err : new Error(String(err)) };
}
Expand Down