@clairejs/server 3.16.19 → 3.17.1

package/dist/http/repository/ICrudRepository.d.ts

@@ -1,6 +1,6 @@
-import { AbstractLogger, CreateManyRequestBody, CreateManyResponseBody, GetManyQueries, GetManyResponseBody, UpdateManyBody, UpdateManyQueries, UpdateManyResponse } from "@clairejs/core";
-import { IQueryProvider, ITransaction, QueryCondition } from "@clairejs/orm";
-import { IPrincipal } from "../../common/auth/IPrincipal";
+import { type AbstractLogger, type CreateManyRequestBody, type CreateManyResponseBody, type GetManyQueries, type GetManyResponseBody, type UpdateManyBody, type UpdateManyQueries, type UpdateManyResponse } from "@clairejs/core";
+import { type IQueryProvider, type ITransaction, type QueryCondition } from "@clairejs/orm";
+import { type IPrincipal } from "../../common/auth/IPrincipal";
 export interface ICrudRepository<T> {
     createMany({ principal, body, tx, logger, }: {
         body: CreateManyRequestBody<T>;

package/dist/http/utils.d.ts

@@ -1,4 +1,2 @@
-import { ApiInfoResponse } from "@clairejs/core";
-import { HttpEndpoint } from "../common/request/HttpEndpoint";
-export declare const getEndpointId: (endpoint: HttpEndpoint) => string;
+import { type ApiInfoResponse } from "@clairejs/core";
 export declare const getApiInfo: () => Promise<ApiInfoResponse>;

package/dist/http/utils.js

@@ -1,9 +1,7 @@
-import { HttpMethod, getServiceProvider } from "@clairejs/core";
+import { getServiceProvider, pickData, ApiInfo, getObjectMetadata } from "@clairejs/core";
 import { AbstractHttpRequestHandler } from "./controller/AbstractHttpRequestHandler";
 import { AbstractServerSocketManager } from "../socket/AbstractServerSocketManager";
-export const getEndpointId = (endpoint) => {
-    return `${endpoint.httpMethod}:${endpoint.mount}`;
-};
+const fields = (getObjectMetadata(ApiInfo)?.fields || []).map((f) => f.name);
 export const getApiInfo = async () => {
     const injector = getServiceProvider().getInjector();
     const httpHandler = injector.resolveOptional(AbstractHttpRequestHandler);
@@ -12,21 +10,6 @@ export const getApiInfo = async () => {
     const httpInfo = httpHandler ? await httpHandler.getMountedEndpointInfo() : [];
     const socketInfo = socketManager ? await socketManager.getMountedEndpointInfo() : [];
     return {
-        permissions: [...httpInfo, ...socketInfo].map((endpointInfo) => ({
-            id: getEndpointId(endpointInfo.endpoint),
-            description: endpointInfo.endpointMetadata.description,
-            name: endpointInfo.endpointMetadata.displayName || endpointInfo.endpointMetadata.name,
-            openAccess: !!endpointInfo.endpointMetadata.openAccess,
-            permissionGroup: endpointInfo.endpointMetadata.permissionGroup || "",
-            accessConditions: endpointInfo.endpointMetadata.accessConditions?.map((ac) => injector.resolve(ac).getConditionMetadata()) || [],
-            readOnly: endpointInfo.endpointMetadata.httpMethod === HttpMethod.GET,
-            tfaRequired: !!endpointInfo.endpointMetadata.tfaRequired,
-            method: endpointInfo.endpointMetadata.httpMethod,
-            mount: endpointInfo.endpoint.mount || "",
-            paramDto: endpointInfo.endpointMetadata.paramsValidationDto,
-            queryDto: endpointInfo.endpointMetadata.queriesValidationDto,
-            bodyDto: endpointInfo.endpointMetadata.bodyValidationDto,
-            responseDto: endpointInfo.endpointMetadata.responseValidationDto,
-        })),
+        apis: [...httpInfo, ...socketInfo].map((metadata) => pickData(metadata, fields)),
     };
 };

package/dist/index.d.ts

@@ -1,9 +1,7 @@
 export * from "./common/FileOperation";
 export * from "./common/auth/AbstractPrincipalResolver";
 export * from "./common/auth/IPrincipal";
-export * from "./common/request/MountedEndpointInfo";
-export * from "./common/request/HttpEndpoint";
-export * from "./common/request/EndpointMetadata";
+export * from "./common/request/endpoint-metadata";
 export * from "./common/request/RequestOptions";
 export * from "./common/AbstractController";
 export * from "./common/ControllerMetadata";
@@ -17,9 +15,6 @@ export * from "./http/controller/CrudHttpController";
 export * from "./http/controller/AbstractHttpRequestHandler";
 export * from "./http/controller/AbstractHttpMiddleware";
 export * from "./http/security/cors";
-export * from "./http/security/AbstractAccessCondition";
-export * from "./http/security/access-conditions/FilterModelFieldAccessCondition";
-export * from "./http/security/access-conditions/MaximumQueryLimit";
 export * from "./http/auth/AbstractHttpAuthorizer";
 export * from "./http/repository/ModelRepository";
 export * from "./http/repository/DtoRepository";

package/dist/index.js

@@ -2,9 +2,7 @@
 export * from "./common/FileOperation";
 export * from "./common/auth/AbstractPrincipalResolver";
 export * from "./common/auth/IPrincipal";
-export * from "./common/request/MountedEndpointInfo";
-export * from "./common/request/HttpEndpoint";
-export * from "./common/request/EndpointMetadata";
+export * from "./common/request/endpoint-metadata";
 export * from "./common/request/RequestOptions";
 export * from "./common/AbstractController";
 export * from "./common/ControllerMetadata";
@@ -19,9 +17,6 @@ export * from "./http/controller/CrudHttpController";
 export * from "./http/controller/AbstractHttpRequestHandler";
 export * from "./http/controller/AbstractHttpMiddleware";
 export * from "./http/security/cors";
-export * from "./http/security/AbstractAccessCondition";
-export * from "./http/security/access-conditions/FilterModelFieldAccessCondition";
-export * from "./http/security/access-conditions/MaximumQueryLimit";
 export * from "./http/auth/AbstractHttpAuthorizer";
 export * from "./http/repository/ModelRepository";
 export * from "./http/repository/DtoRepository";

package/dist/services/AbstractFileService.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { FileOperation } from "../common/FileOperation";
 import { GetUploadUrlResponseBody } from "../controllers/dto/upload";
 export declare abstract class AbstractFileService {
@@ -13,5 +14,6 @@ export declare abstract class AbstractFileService {
         toURI: string;
     }[]): Promise<void>;
     abstract removeObject(uris: string[]): Promise<void>;
+    abstract putFile(uri: string, data: Buffer, headers?: Record<string, string>): Promise<void>;
     getUploadUrlForTempUri(temporaryUri: string): Promise<GetUploadUrlResponseBody>;
 }

package/dist/services/implementations/LocalFileService.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { FileOperation } from "../../common/FileOperation";
 import { AbstractFileService } from "../AbstractFileService";
 export declare class LocalFileService extends AbstractFileService {
@@ -6,6 +7,7 @@ export declare class LocalFileService extends AbstractFileService {
     getFileSize(objectKeys: string[]): Promise<number[]>;
     getAccessUrls(uris: (string | undefined)[], _isPublic: boolean): Promise<string[]>;
     getPresignedUrl(operation: FileOperation, uris: string[]): Promise<string[]>;
+    putFile(uri: string, data: Buffer, headers?: Record<string, string>): Promise<void>;
     moveObject(uris: {
         fromURI: string;
         toURI: string;

package/dist/services/implementations/LocalFileService.js

@@ -23,6 +23,15 @@ export class LocalFileService extends AbstractFileService {
         }
         return uris.map((uri) => `${this.fileServerUrl}/?objectKey="/${uri}"`);
     }
+    async putFile(uri, data, headers) {
+        const [url] = await this.getPresignedUrl(FileOperation.PUT, [uri]);
+        await axios({
+            method: 'PUT',
+            url,
+            data,
+            headers,
+        });
+    }
     async moveObject(uris) {
         await Promise.all(uris.map((uri) => axios.post(`${this.fileServerUrl}/`, {
             from: uri.fromURI,

package/dist/services/implementations/S3FileService.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { AbstractLogger } from "@clairejs/core";
 import { FileOperation } from "../../common/FileOperation";
 import { AbstractFileService } from "../AbstractFileService";
@@ -13,8 +14,9 @@ export declare class S3FileService extends AbstractFileService {
     protected readonly config: S3FileServiceConfig;
     protected readonly logger: AbstractLogger;
     private readonly s3Client;
-    private readonly cloudfrontSigner;
+    private readonly cloudfrontSigner?;
     constructor(config: S3FileServiceConfig, logger: AbstractLogger);
+    putFile(uri: string, data: Buffer, headers?: Record<string, string>): Promise<void>;
     getFileSize(objectKeys: string[]): Promise<number[]>;
     getAccessUrls(uris: (string | undefined)[], isPublic: boolean): Promise<string[]>;
     getPresignedUrl(operation: FileOperation, uris: string[]): Promise<string[]>;

package/dist/services/implementations/S3FileService.js

@@ -24,7 +24,17 @@ let S3FileService = class S3FileService extends AbstractFileService {
             signatureVersion: "v4",
             region: this.config.S3_BUCKET_REGION,
         });
-        this.cloudfrontSigner = new aws.CloudFront.Signer(this.config.CLOUD_FRONT_PUBLIC_KEY_ID, this.config.CLOUD_FRONT_PRIVATE_KEY);
+        if (this.config.CLOUD_FRONT_PUBLIC_DOMAIN && this.config.CLOUD_FRONT_PRIVATE_KEY && this.config.CLOUD_FRONT_PUBLIC_KEY_ID) {
+            this.cloudfrontSigner = new aws.CloudFront.Signer(this.config.CLOUD_FRONT_PUBLIC_KEY_ID, this.config.CLOUD_FRONT_PRIVATE_KEY);
+        }
+    }
+    async putFile(uri, data, headers) {
+        await this.s3Client.putObject({
+            Key: uri,
+            Bucket: this.config.S3_BUCKET_NAME,
+            Body: data,
+            Metadata: headers,
+        }).promise();
     }
     async getFileSize(objectKeys) {
         return await Promise.all(objectKeys.map((uri) => this.getSingleFileSize(uri)));
@@ -51,10 +61,17 @@ let S3FileService = class S3FileService extends AbstractFileService {
             .then((res) => res.ContentLength);
         return size || 0;
     }
-    getSinglePresignedUrl(_operation, objectKey) {
-        return this.cloudfrontSigner.getSignedUrl({
-            url: `${this.config.CLOUD_FRONT_PUBLIC_DOMAIN}/${objectKey}`,
-            expires: Date.now() + this.config.PRESIGNED_URL_EXPIRATION_S * 1000,
+    getSinglePresignedUrl(operation, objectKey) {
+        if (this.cloudfrontSigner) {
+            return this.cloudfrontSigner.getSignedUrl({
+                url: `${this.config.CLOUD_FRONT_PUBLIC_DOMAIN}/${objectKey}`,
+                expires: Date.now() + this.config.PRESIGNED_URL_EXPIRATION_S * 1000,
+            });
+        }
+        return this.s3Client.getSignedUrl(operation, {
+            Bucket: this.config.S3_BUCKET_NAME,
+            Key: objectKey,
+            Expires: this.config.PRESIGNED_URL_EXPIRATION_S
         });
     }
     async copySingleObject(fromObjectKey, toObjectKey) {

package/dist/socket/AbstractServerSocketManager.d.ts

@@ -2,8 +2,8 @@ import { AbstractLogger, SocketMessage } from "@clairejs/core";
 import Redis from "ioredis";
 import { SocketData } from "../common/request/SocketData";
 import { IPrincipal } from "../common/auth/IPrincipal";
+import { EndpointMetadata } from "../common/request/endpoint-metadata";
 import { AbstractPrincipalResolver } from "../common/auth/AbstractPrincipalResolver";
-import { MountedEndpointInfo } from "../common/request/MountedEndpointInfo";
 import { AbstractRequestAuthorizer } from "../http/auth/AbstractHttpAuthorizer";
 import { AbstractSocketConnectionHandler } from "./AbstractSocketConnectionHandler";
 import { AbstractServerSocket } from "./AbstractServerSocket";
@@ -42,5 +42,5 @@ export declare abstract class AbstractServerSocketManager {
     removeSocket(socketId: string, _physicRemove?: boolean): Promise<void>;
     abstract getById(socketId: string): Promise<AbstractServerSocket | undefined>;
     handle(socketData: SocketData): Promise<void>;
-    getMountedEndpointInfo(): Promise<MountedEndpointInfo[]>;
+    getMountedEndpointInfo(): Promise<EndpointMetadata[]>;
 }

package/dist/socket/AbstractServerSocketManager.js

@@ -1,53 +1,10 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { AccessConditionValueType, DataType, Errors, getObjectMetadata, getServiceProvider, MessageType, Register, SocketMethod, } from "@clairejs/core";
-import { AbstractAccessCondition } from "../http/security/AbstractAccessCondition";
+import { DataType, Errors, getServiceProvider, MessageType, SocketMethod, } from "@clairejs/core";
 import { HttpRequest } from "../http/common/HttpRequest";
 import { AbstractSocketConnectionHandler } from "./AbstractSocketConnectionHandler";
 import { AbstractSocketController } from "./AbstractSocketController";
 const SOCKET_ACTION_HEADER = "x-socket-action";
 const SOCKET_ACTION_READ = "read";
 const SOCKET_ACTION_WRITE = "write";
-let SocketReadCondition = class SocketReadCondition extends AbstractAccessCondition {
-    async resolveConditionValue(request) {
-        return request.headers[SOCKET_ACTION_HEADER] === SOCKET_ACTION_READ;
-    }
-    async validate(conditionValue) {
-        return !!conditionValue;
-    }
-    getConditionMetadata() {
-        return {
-            name: "disable_write",
-            description: "Disable send message to channel",
-            valueType: AccessConditionValueType.BOOLEAN,
-        };
-    }
-};
-SocketReadCondition = __decorate([
-    Register()
-], SocketReadCondition);
-let SocketWriteCondition = class SocketWriteCondition extends AbstractAccessCondition {
-    async resolveConditionValue(request) {
-        return request.headers[SOCKET_ACTION_HEADER] === SOCKET_ACTION_WRITE;
-    }
-    async validate(conditionValue) {
-        return !!conditionValue;
-    }
-    getConditionMetadata() {
-        return {
-            name: "disable_read",
-            description: "Disable receive message from channel",
-            valueType: AccessConditionValueType.BOOLEAN,
-        };
-    }
-};
-SocketWriteCondition = __decorate([
-    Register()
-], SocketWriteCondition);
 export class AbstractServerSocketManager {
     requireAuthentication;
     logger;
@@ -157,9 +114,9 @@ export class AbstractServerSocketManager {
                     //-- notify all channels
                     this.logger.debug("Notify channels");
                     for (const channelInfo of socket.getChannelsInfo()) {
-                        const currentEndpoint = mountedEndpoints.find((e) => e.endpointMetadata.url === channelInfo.name);
+                        const currentEndpoint = mountedEndpoints.find((e) => e.mount === channelInfo.name);
                         if (currentEndpoint) {
-                            currentEndpoint.endpoint.controller.onChannelLeave(socket);
+                            currentEndpoint.controller.onChannelLeave(socket);
                         }
                     }
                     this.logger.debug("Calling disconnection handler");
@@ -206,7 +163,7 @@ export class AbstractServerSocketManager {
                                     let canSend = false;
                                     let canReceive = false;
                                     const mountedEndpoints = await this.getMountedEndpointInfo();
-                                    const currentEndpoint = mountedEndpoints.find((e) => e.endpointMetadata.url === channel);
+                                    const currentEndpoint = mountedEndpoints.find((e) => e.mount === channel);
                                     if (!currentEndpoint) {
                                         continue;
                                     }
@@ -215,7 +172,7 @@ export class AbstractServerSocketManager {
                                             method: SocketMethod.MESSAGE,
                                             pathName: channel,
                                             headers: { [SOCKET_ACTION_HEADER]: SOCKET_ACTION_READ },
-                                        }, currentEndpoint.endpointMetadata);
+                                        }, currentEndpoint);
                                         request.setAuthInfo(clientSocket.getAuthInfo());
                                         await this.requestAuthorizer.authorize(request, currentEndpoint);
                                         canReceive = true;
@@ -228,7 +185,7 @@ export class AbstractServerSocketManager {
                                             method: SocketMethod.MESSAGE,
                                             pathName: channel,
                                             headers: { [SOCKET_ACTION_HEADER]: SOCKET_ACTION_WRITE },
-                                        }, currentEndpoint.endpointMetadata);
+                                        }, currentEndpoint);
                                         request.setAuthInfo(clientSocket.getAuthInfo());
                                         await this.requestAuthorizer.authorize(request, currentEndpoint);
                                         canSend = true;
@@ -258,7 +215,7 @@ export class AbstractServerSocketManager {
                                             type: MessageType.CHANNEL_JOIN,
                                             data: channelsInfo.map((c) => c.name),
                                         }),
-                                        ...endpoints.map((endpoint) => endpoint.endpoint.controller.onChannelJoin(clientSocket)),
+                                        ...endpoints.map((endpoint) => endpoint.controller.onChannelJoin(clientSocket)),
                                     ]);
                                 }
                             }
@@ -269,11 +226,11 @@ export class AbstractServerSocketManager {
                                 //-- remove channels from socket
                                 const mountedEndpoints = await this.getMountedEndpointInfo();
                                 Promise.all(channels.map((channel) => () => {
-                                    const currentEndpoint = mountedEndpoints.find((e) => e.endpointMetadata.url === channel);
+                                    const currentEndpoint = mountedEndpoints.find((e) => e.mount === channel);
                                     if (!currentEndpoint) {
                                         return;
                                     }
-                                    return currentEndpoint.endpoint.controller.onChannelLeave(clientSocket);
+                                    return currentEndpoint.controller.onChannelLeave(clientSocket);
                                 }));
                                 //-- remove socket from channels
                                 await this.removeSocketFromChannel(clientSocket.getId(), channels);
@@ -291,9 +248,9 @@ export class AbstractServerSocketManager {
                                         .find((info) => info.name === channel && info.clientToServerAllowed);
                                     if (allowed) {
                                         const mountedEndpoints = await this.getMountedEndpointInfo();
-                                        const currentEndpoint = mountedEndpoints.find((e) => e.endpointMetadata.url === channel);
+                                        const currentEndpoint = mountedEndpoints.find((e) => e.mount === channel);
                                         if (currentEndpoint) {
-                                            const result = await currentEndpoint.endpoint.controller.onMessage(clientSocket, data);
+                                            const result = await currentEndpoint.controller.onMessage(clientSocket, data);
                                             if (result !== false) {
                                                 //-- broadcast
                                                 this.logger.debug("broadcasting to channel", channel, data);
@@ -325,23 +282,16 @@ export class AbstractServerSocketManager {
             const socketController = injector.resolveMultiple(AbstractSocketController);
             await injector.initInstances();
             this.mountedEndpointInfo = socketController.map((controller) => {
-                const controllerMetadata = getObjectMetadata(controller.constructor);
                 return {
-                    endpoint: {
-                        httpMethod: SocketMethod.MESSAGE,
-                        mount: controller.getChannelName(),
-                        controller: controller,
-                        handlerFunctionName: controller.onMessage.name,
-                    },
-                    endpointMetadata: {
-                        httpMethod: SocketMethod.MESSAGE,
-                        description: "Send / Receive message to / from channel",
-                        permissionGroup: controllerMetadata.permissionGroup,
-                        dataType: DataType.OBJECT,
-                        url: controller.getChannelName(),
-                        name: controller.getChannelName(),
-                        accessConditions: [SocketReadCondition, SocketWriteCondition],
-                    },
+                    id: `${SocketMethod.MESSAGE}:${controller.getChannelName()}`,
+                    readOnly: false,
+                    controller: socketController,
+                    method: SocketMethod.MESSAGE,
+                    mount: controller.getChannelName(),
+                    handlerFunctionName: controller.onMessage.name,
+                    description: "Send / Receive message to / from channel",
+                    name: controller.getChannelName(),
+                    dataType: DataType.OBJECT,
                 };
             });
         }

package/dist/socket/AbstractSocketController.d.ts

@@ -7,7 +7,6 @@ export declare abstract class AbstractSocketController extends AbstractControlle
     /**
      * Handle the message sent to this channel
      * @param socket the socket sending message
-     * @param data the data payload being sent
      * @returns return false to prevent message broadcast
      */
     onMessage(_socket: IServerSocket, _message: any): Promise<boolean | void>;

package/dist/socket/AbstractSocketController.js

@@ -5,7 +5,6 @@ export class AbstractSocketController extends AbstractController {
     /**
      * Handle the message sent to this channel
      * @param socket the socket sending message
-     * @param data the data payload being sent
      * @returns return false to prevent message broadcast
      */
     async onMessage(_socket, _message) { }

package/dist/system/ClaireServer.d.ts

@@ -1,6 +1,6 @@
 import { AbstractLogger, ClaireApp } from "@clairejs/core";
-import { AbstractHttpRequestHandler } from "../http/controller/AbstractHttpRequestHandler";
-import { AbstractServerSocketManager } from "../socket/AbstractServerSocketManager";
+import { type AbstractHttpRequestHandler } from "../http/controller/AbstractHttpRequestHandler";
+import { type AbstractServerSocketManager } from "../socket/AbstractServerSocketManager";
 export declare class ClaireServer extends ClaireApp {
     protected readonly logger: AbstractLogger;
     protected readonly httpRequestHandler?: AbstractHttpRequestHandler | undefined;
@@ -8,6 +8,5 @@ export declare class ClaireServer extends ClaireApp {
     private booted;
     constructor(logger: AbstractLogger, httpRequestHandler?: AbstractHttpRequestHandler | undefined, socketManager?: AbstractServerSocketManager | undefined);
     init(): Promise<void>;
-    exit(): void;
     private stop;
 }

package/dist/system/ClaireServer.js

@@ -9,9 +9,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { AbstractLogger, ClaireApp, LogContext, getGlobalStore } from "@clairejs/core";
 import { ExitCode } from "../common/constants";
-import { AbstractHttpRequestHandler } from "../http/controller/AbstractHttpRequestHandler";
-import { AbstractServerSocketManager } from "../socket/AbstractServerSocketManager";
-import { getEndpointId } from "../http/utils";
 let ClaireServer = class ClaireServer extends ClaireApp {
     logger;
     httpRequestHandler;
@@ -38,7 +35,7 @@ let ClaireServer = class ClaireServer extends ClaireApp {
         }
         //-- save mounted endpoint info in server store to prevent circular dependency when resolving http request handler in controller
         for (const endpoint of mountedEndpointInfo) {
-            this.logger.info(`Mounting: ${getEndpointId(endpoint.endpoint)}`);
+            this.logger.info(`Mounting: ${endpoint.method}:${endpoint.mount}`);
         }
         getGlobalStore().mountedEndpointInfo = mountedEndpointInfo;
         this.logger.debug("Claire server initing");
@@ -60,9 +57,6 @@ let ClaireServer = class ClaireServer extends ClaireApp {
         });
         this.booted = true;
     }
-    exit() {
-        super.exit();
-    }
     stop(code) {
         this.logger.debug("Server is shutting down");
         this.exit();
@@ -71,8 +65,6 @@ let ClaireServer = class ClaireServer extends ClaireApp {
 };
 ClaireServer = __decorate([
     LogContext(),
-    __metadata("design:paramtypes", [AbstractLogger,
-        AbstractHttpRequestHandler,
-        AbstractServerSocketManager])
+    __metadata("design:paramtypes", [AbstractLogger, Function, Function])
 ], ClaireServer);
 export { ClaireServer };

package/dist/system/ServerGlobalStore.d.ts

@@ -1,5 +1,5 @@
 import { CoreGlobalStore } from "@clairejs/core";
-import { MountedEndpointInfo } from "../common/request/MountedEndpointInfo";
+import { EndpointMetadata } from "../common/request/endpoint-metadata";
 export interface ServerGlobalStore extends CoreGlobalStore {
-    mountedEndpointInfo?: MountedEndpointInfo[];
+    mountedEndpointInfo?: EndpointMetadata[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.16.19",
+    "version": "3.17.1",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",
@@ -16,10 +16,12 @@
     "license": "ISC",
     "dependencies": {
         "aws-sdk": "^2.841.0",
+        "axios": "^0.21.4",
         "cookie-parser": "^1.4.6",
         "cors": "^2.8.5",
         "express": "^4.17.1",
         "express-fileupload": "^1.2.1",
+        "ioredis": "^5.2.0",
         "node-cron": "^3.0.1",
         "node-schedule": "^2.1.0",
         "parseurl": "^1.3.3",
@@ -28,12 +30,10 @@
         "randomstring": "^1.2.2",
         "redlock": "^5.0.0-beta.2",
         "reflect-metadata": "^0.1.13",
-        "ws": "^7.5.5",
-        "ioredis": "^5.2.0",
-        "axios": "^0.21.4"
+        "ws": "^7.5.5"
     },
     "peerDependencies": {
-        "@clairejs/core": "^3.6.1",
+        "@clairejs/core": "^3.7.1",
         "@clairejs/orm": "^3.11.0"
     },
     "devDependencies": {

package/dist/common/request/EndpointMetadata.d.ts

@@ -1,40 +0,0 @@
-import { Constructor, DtoMetadata, HttpMethod, SocketMethod, ObjectFieldMetadata } from "@clairejs/core";
-import { RequestDataSource } from "./types";
-import { AbstractAccessCondition } from "../../http/security/AbstractAccessCondition";
-export interface EndpointMetadata extends ObjectFieldMetadata {
-    /**
-     * Basic HTTP information, name property is handler function name.
-     */
-    httpMethod: HttpMethod | SocketMethod;
-    url: string;
-    /**
-     * User-friendly display name of endpoint.
-     */
-    displayName?: string;
-    bodyValidationDto?: DtoMetadata;
-    queriesValidationDto?: DtoMetadata;
-    paramsValidationDto?: DtoMetadata;
-    responseValidationDto?: DtoMetadata;
-    params?: {
-        [index: number]: {
-            source?: RequestDataSource;
-            diClass?: Constructor<any>;
-        };
-    };
-    /**
-     * This endpoint requires tfa
-     */
-    tfaRequired?: boolean;
-    /**
-     * Allow public access to this endpoint.
-     */
-    openAccess?: boolean;
-    /**
-     * Metadata of access condition to allow a conditional access to the endpoint.
-     */
-    accessConditions?: Constructor<AbstractAccessCondition>[];
-    /**
-     * Group of permission of this endpoint.
-     */
-    permissionGroup?: string;
-}

package/dist/common/request/HttpEndpoint.d.ts

@@ -1,7 +0,0 @@
-import { HttpMethod, SocketMethod } from "@clairejs/core";
-export interface HttpEndpoint {
-    mount?: string;
-    httpMethod?: HttpMethod | SocketMethod;
-    controller: any;
-    handlerFunctionName: string;
-}

package/dist/common/request/HttpEndpoint.js

@@ -1 +0,0 @@
-export {};

package/dist/common/request/MountedEndpointInfo.d.ts

@@ -1,6 +0,0 @@
-import { EndpointMetadata } from "./EndpointMetadata";
-import { HttpEndpoint } from "./HttpEndpoint";
-export interface MountedEndpointInfo {
-    endpointMetadata: EndpointMetadata;
-    endpoint: HttpEndpoint;
-}

package/dist/common/request/MountedEndpointInfo.js

@@ -1 +0,0 @@
-export {};

package/dist/http/security/AbstractAccessCondition.d.ts

@@ -1,7 +0,0 @@
-import { AccessConditionMetadata } from "@clairejs/core";
-import { HttpRequest } from "../common/HttpRequest";
-export declare abstract class AbstractAccessCondition<T = any> {
-    abstract resolveConditionValue(request: HttpRequest): Promise<T>;
-    abstract validate(conditionValue: T, permittedConditionValue: any): Promise<boolean>;
-    abstract getConditionMetadata(): AccessConditionMetadata;
-}

package/dist/http/security/AbstractAccessCondition.js

@@ -1,2 +0,0 @@
-export class AbstractAccessCondition {
-}

package/dist/http/security/access-conditions/FilterModelFieldAccessCondition.d.ts

@@ -1,4 +0,0 @@
-import { Constructor } from "@clairejs/core";
-import { HttpRequest } from "../../common/HttpRequest";
-import { AbstractAccessCondition } from "../AbstractAccessCondition";
-export declare const FilterModelFieldAccessCondition: <T extends Constructor<any>>(model: T, name: string, requestedConditionValueResolver: (request: HttpRequest) => string[] | undefined) => Constructor<AbstractAccessCondition<string[] | undefined>>;

package/dist/http/security/access-conditions/FilterModelFieldAccessCondition.js

@@ -1,30 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { AccessConditionValueType, getObjectMetadata, Register, } from "@clairejs/core";
-import { AbstractAccessCondition } from "../AbstractAccessCondition";
-export const FilterModelFieldAccessCondition = (model, name, requestedConditionValueResolver) => {
-    let _ = class _ extends AbstractAccessCondition {
-        async resolveConditionValue(request) {
-            return requestedConditionValueResolver(request);
-        }
-        getConditionMetadata() {
-            return {
-                name,
-                valueType: AccessConditionValueType.CHOICES,
-                valueConstraint: getObjectMetadata(model).fields.map((f) => f.name),
-            };
-        }
-        async validate(requestedConditionValue, permittedConditionValue) {
-            return (!!requestedConditionValue &&
-                requestedConditionValue.every((value) => permittedConditionValue.includes(value)));
-        }
-    };
-    _ = __decorate([
-        Register()
-    ], _);
-    return _;
-};

package/dist/http/security/access-conditions/MaximumQueryLimit.d.ts

@@ -1,8 +0,0 @@
-import { AccessConditionMetadata } from "@clairejs/core";
-import { HttpRequest } from "../../common/HttpRequest";
-import { AbstractAccessCondition } from "../AbstractAccessCondition";
-export declare class MaximumQueryLimit extends AbstractAccessCondition {
-    resolveConditionValue(request: HttpRequest): Promise<any>;
-    validate(conditionValue: number, permittedConditionValue: number): Promise<boolean>;
-    getConditionMetadata(): AccessConditionMetadata;
-}