kangaroo-and-rabbit/archidata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DEV] add progress callback ==> does not work

Browse Source
This commit is contained in:
Edouard DUPIN 2024-04-15 00:54:22 +02:00
parent 4cb8c84312
commit 9cd71ab601
5 changed files with 159 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/kar/archidata/annotation/TypeScriptProgress.java Normal file
View File

@ -0,0 +1,12 @@
package org.kar.archidata.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/** In case of the update parameter with String input to detect null element. */
@Target({ ElementType.PARAMETER, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
public @interface TypeScriptProgress {
}

7
src/org/kar/archidata/api/DataResource.java
View File

@ -319,8 +319,8 @@ public class DataResource {
return Response.status(404).entity("{\"error\":\"media Does not exist: " + id + "\"}").type("application/json").build();
}
if (value.mimeType.contentEquals("image/jpeg") || value.mimeType.contentEquals("image/png")
// || value.mimeType.contentEquals("image/webp")
) {
// || value.mimeType.contentEquals("image/webp")
) {
// reads input image
final BufferedImage inputImage = ImageIO.read(inputFile);
final int scaledWidth = 250;
@ -355,13 +355,12 @@ public class DataResource {
return buildStream(filePathName, range, value.mimeType);
}
// @Secured
@GET
@Path("{id}/{name}")
@PermitTokenInURI
@RolesAllowed("USER")
@Produces(MediaType.APPLICATION_OCTET_STREAM)
@Operation(description = "Get back some data from the data environment (with a beautifull name (permit download with basic name)", tags = "SYSTEM")
@Operation(description = "Get back some data from the data environment (with a beautiful name (permit download with basic name)", tags = "SYSTEM")
public Response retrieveDataFull(@Context final SecurityContext sc, @QueryParam(HttpHeaders.AUTHORIZATION) final String token, @HeaderParam("Range") final String range,
@PathParam("id") final UUID id, @PathParam("name") final String name) throws Exception {
final GenericContext gc = (GenericContext) sc.getUserPrincipal();

21
src/org/kar/archidata/dataAccess/DataFactoryTsApi.java
View File

@ -20,6 +20,7 @@ import java.util.Set;
import org.glassfish.jersey.media.multipart.FormDataParam;
import org.kar.archidata.annotation.AsyncType;
import org.kar.archidata.annotation.TypeScriptProgress;
import org.kar.archidata.catcher.RestErrorResponse;
import org.kar.archidata.dataAccess.DataFactoryZod.ClassElement;
import org.kar.archidata.dataAccess.DataFactoryZod.GeneratedTypes;
@ -56,7 +57,7 @@ public class DataFactoryTsApi {
/**
* API of the server (auto-generated code)
*/
import { HTTPMimeType, HTTPRequestModel, ModelResponseHttp, RESTConfig, RESTRequestJson, RESTRequestJsonArray, RESTRequestVoid } from "./rest-tools"
import { HTTPMimeType, HTTPRequestModel, ModelResponseHttp, RESTConfig, ProgressCallback, RESTRequestJson, RESTRequestJsonArray, RESTRequestVoid } from "./rest-tools"
import { """;
for (final Class<?> clazz : classs) {
@ -125,6 +126,14 @@ public class DataFactoryTsApi {
return Arrays.asList(((Produces) annotation[0]).value());
}
public static boolean apiAnnotationTypeScriptProgress(final Method element) throws Exception {
final Annotation[] annotation = element.getDeclaredAnnotationsByType(TypeScriptProgress.class);
if (annotation.length == 0) {
return false;
}
return true;
}
public static List<String> apiAnnotationProduces(final Class<?> clazz, final Method method) throws Exception {
final List<String> data = apiAnnotationProduces(method);
if (data != null) {
@ -261,6 +270,7 @@ public class DataFactoryTsApi {
if (methodDescription != null) {
LOGGER.trace(" description: {}", methodDescription);
}
final boolean needGenerateProgress = apiAnnotationTypeScriptProgress(method);
Class<?> returnTypeModel = apiAnnotationGetAsyncType(method);
if (returnTypeModel == null) {
returnTypeModel = method.getReturnType();
@ -387,6 +397,9 @@ public class DataFactoryTsApi {
} else if (formDataParams.size() != 0) {
builder.append(" data,");
}
if (needGenerateProgress) {
builder.append(" progress,");
}
builder.append(" }: {");
builder.append("\n\t\trestConfig: RESTConfig,");
if (!queryParams.isEmpty()) {
@ -454,6 +467,9 @@ public class DataFactoryTsApi {
}
builder.append(",");
}
if (needGenerateProgress) {
builder.append("\n\t\tprogress?: ProgressCallback,");
}
builder.append("\n\t}): Promise<");
builder.append(tmpReturn.tsTypeName);
if (returnModelIsArray) {
@ -519,6 +535,9 @@ public class DataFactoryTsApi {
} else if (formDataParams.size() != 0) {
builder.append("\n\t\t\tdata,");
}
if (needGenerateProgress) {
builder.append("\n\t\t\tprogress,");
}
builder.append("\n\t\t}");
if (tmpReturn.tsCheckType != null) {
builder.append(", ");

47
src/org/kar/archidata/dataAccess/addOn/AddOnManyToOne.java
View File

@ -5,6 +5,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.Types;
import java.util.List;
import java.util.UUID;
import org.kar.archidata.annotation.AnnotationTools;
import org.kar.archidata.dataAccess.CountInOut;
@ -14,6 +15,7 @@ import org.kar.archidata.dataAccess.DataFactory;
import org.kar.archidata.dataAccess.LazyGetter;
import org.kar.archidata.dataAccess.QueryOptions;
import org.kar.archidata.exception.DataAccessException;
import org.kar.archidata.tools.UuidUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -88,7 +90,11 @@ public class AddOnManyToOne implements DataAccessAddOn {
@Override
public boolean canRetrieve(final Field field) {
if (field.getType() == Long.class) {
if (field.getType() == Long.class
|| field.getType() == Integer.class
|| field.getType() == Short.class
|| field.getType() == String.class
|| field.getType() == UUID.class) {
return true;
}
final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
@ -101,7 +107,11 @@ public class AddOnManyToOne implements DataAccessAddOn {
@Override
public void generateQuerry(@NotNull final String tableName, @NotNull final Field field, @NotNull final StringBuilder querrySelect, @NotNull final StringBuilder querry, @NotNull final String name,
@NotNull final CountInOut elemCount, final QueryOptions options) throws Exception {
if (field.getType() == Long.class) {
if (field.getType() == Long.class
|| field.getType() == Integer.class
|| field.getType() == Short.class
|| field.getType() == String.class
|| field.getType() == UUID.class) {
querrySelect.append(" ");
querrySelect.append(tableName);
querrySelect.append(".");
@ -150,6 +160,39 @@ public class AddOnManyToOne implements DataAccessAddOn {
}
return;
}
if (field.getType() == Integer.class) {
final Integer foreignKey = rs.getInt(count.value);
count.inc();
if (!rs.wasNull()) {
field.set(data, foreignKey);
}
return;
}
if (field.getType() == Short.class) {
final Short foreignKey = rs.getShort(count.value);
count.inc();
if (!rs.wasNull()) {
field.set(data, foreignKey);
}
return;
}
if (field.getType() == String.class) {
final String foreignKey = rs.getString(count.value);
count.inc();
if (!rs.wasNull()) {
field.set(data, foreignKey);
}
return;
}
if (field.getType() == UUID.class) {
final byte[] tmp = rs.getBytes(count.value);
count.inc();
if (!rs.wasNull()) {
final UUID foreignKey = UuidUtils.asUuid(tmp);
field.set(data, foreignKey);
}
return;
}
final Class<?> objectClass = field.getType();
final ManyToOne decorators = field.getDeclaredAnnotation(ManyToOne.class);
if (decorators == null) {

87
src/resources/rest-tools.ts
View File

@ -67,22 +67,33 @@ export function isArrayOf<TYPE>(
return true;
}
function isNullOrUndefined(data: any): data is undefined | null {
return data === undefined || data === null;
}
export type RESTRequestType = {
restModel: RESTModel,
restConfig: RESTConfig,
data?: any,
params?: object,
queries?: object,
progress?: ProgressCallback,
};
function removeTrailingSlashes(input: string): string {
if (isNullOrUndefined(input)) {
return "undefined";
}
return input.replace(/\/+$/, '');
}
function removeLeadingSlashes(input: string): string {
if (isNullOrUndefined(input)) {
return "";
}
return input.replace(/^\/+/, '');
}
export function RESTUrl({ restModel, restConfig, data, params, queries }: RESTRequestType): string {
export function RESTUrl({ restModel, restConfig, params, queries }: RESTRequestType): string {
// Create the URL PATH:
let generateUrl = `${removeTrailingSlashes(restConfig.server)}/${removeLeadingSlashes(restModel.endPoint)}`;
if (params !== undefined) {
@ -91,7 +102,7 @@ export function RESTUrl({ restModel, restConfig, data, params, queries }: RESTRe
}
}
if (queries === undefined && (restConfig.token === undefined || restModel.tokenInUrl !== true)) {
return generateUrl;
return generateUrl;
}
const searchParams = new URLSearchParams();
if (queries !== undefined) {
@ -112,7 +123,55 @@ export function RESTUrl({ restModel, restConfig, data, params, queries }: RESTRe
return generateUrl + "?" + searchParams.toString();
}
export function RESTRequest({ restModel, restConfig, data, params, queries }: RESTRequestType): Promise<ModelResponseHttp> {
export type ProgressCallback = (count: number, total: number) => void;
// input: RequestInfo | URL, init?: RequestInit): Promise<Response>;
export function fetchProgress<TYPE>(generateUrl: string, { method, headers, body }: {
method: HTTPRequestModel,
headers: any,
body: any,
}, progress: ProgressCallback): Promise<Response> {
//async function fetchForm(form, options = {}) {
const action = generateUrl;
const data = body;
const xhr = new XMLHttpRequest();
return new Promise((resolve, reject) => {
xhr.responseType = 'blob';
xhr.onreadystatechange = () => {
if (xhr.readyState != 4) {
// done
return;
}
const response = new Response(xhr.response, {
status: xhr.status,
statusText: xhr.statusText
});
resolve(response);
}
// If fail:
xhr.addEventListener('error', () => {
reject(new TypeError('Failed to fetch'))
});
// Link the progression callback
if (progress) {
xhr.addEventListener('progress', (dataEvent) => {
progress(dataEvent.loaded, dataEvent.total);
});
}
// open the socket
xhr.open(method, action, true);
// configure the header
if (!isNullOrUndefined(headers)) {
for (const [key, value] of Object.entries(headers)) {
xhr.setRequestHeader(key, value as string);
}
}
xhr.send(data);
});
}
export function RESTRequest({ restModel, restConfig, data, params, queries, progress }: RESTRequestType): Promise<ModelResponseHttp> {
// Create the URL PATH:
let generateUrl = RESTUrl({ restModel, restConfig, data, params, queries });
let headers: any = {};
@ -141,11 +200,21 @@ export function RESTRequest({ restModel, restConfig, data, params, queries }: RE
}
console.log(`Call ${generateUrl}`)
return new Promise((resolve, reject) => {
fetch(generateUrl, {
method: restModel.requestType,
headers,
body,
}).then((response: Response) => {
let action: Promise<Response> = undefined;
if (isNullOrUndefined(progress)) {
action = fetch(generateUrl, {
method: restModel.requestType,
headers,
body,
});
} else {
action = fetchProgress(generateUrl, {
method: restModel.requestType,
headers,
body,
}, progress);
}
action.then((response: Response) => {
if (response.status >= 200 && response.status <= 299) {
const contentType = response.headers.get('Content-Type');
if (restModel.accept !== contentType) {
@ -196,6 +265,8 @@ export function RESTRequest({ restModel, restConfig, data, params, queries }: RE
});
}
export function RESTRequestJson<TYPE>(request: RESTRequestType, checker: (data: any) => data is TYPE): Promise<TYPE> {
return new Promise((resolve, reject) => {
RESTRequest(request).then((value: ModelResponseHttp) => {