@clairejs/server 3.17.9 → 3.18.0

package/README.md

@@ -1,7 +1,12 @@
 ## Change Log
 
-#### 3.17.9:
+#### 3.18.0:
 
+-   adapt claire core & clare orm
+
+#### 3.17.10:
+
+-   fix socket manager & isEndpoint
 -   remove handlerFunctionName (using name & displayName instead)
 -   fix missing controller & handlerFunctionName in EndpointMetadata
 -   remove AbstractController

package/dist/common/ControllerMetadata.d.ts

@@ -1,6 +1,7 @@
 import { type ObjectMetadata } from "@clairejs/core";
 import { type EndpointMetadata } from "./request/endpoint-metadata";
 export interface ControllerMetadata extends ObjectMetadata {
+    mount?: string;
     fields: EndpointMetadata[];
     permissionGroup?: string;
 }

package/dist/common/decorator.d.ts

@@ -2,5 +2,6 @@ import { Constructor } from "@clairejs/core";
 import { AbstractSocketController } from "../socket/AbstractSocketController";
 import { AbstractHttpController } from "../http/controller/AbstractHttpController";
 export declare const Controller: (config?: {
+    mount?: string;
     permissionGroup?: string;
 }) => <T extends AbstractSocketController | AbstractHttpController>(constructor: Constructor<T>) => void;

package/dist/common/decorator.js

@@ -3,4 +3,5 @@ export const Controller = (config) => (constructor) => {
     getServiceProvider().register(constructor, "singleton");
     const metadata = initObjectMetadata(constructor.prototype);
     metadata.permissionGroup = config?.permissionGroup;
+    metadata.mount = config?.mount;
 };

package/dist/controllers/FileManageController.d.ts

@@ -1,11 +1,11 @@
-import { AbstractDatabaseAdapter } from "@clairejs/orm";
+import { AbstractDbAdapter } from "@clairejs/orm";
 import { AbstractHttpController } from "../http/controller/AbstractHttpController";
 import { AbstractFileService } from "../services/AbstractFileService";
 import { GetFileAccessUrlRequest, GetFileInfoRequest, GetFileInfoResponse, MoveFileRequest, RemoveFileRequest } from "./dto/upload";
 export declare class FileManageController extends AbstractHttpController {
-    protected readonly db: AbstractDatabaseAdapter;
+    protected readonly db: AbstractDbAdapter;
     protected readonly fileService: AbstractFileService;
-    constructor(db: AbstractDatabaseAdapter, fileService: AbstractFileService);
+    constructor(db: AbstractDbAdapter, fileService: AbstractFileService);
     moveFile(body: MoveFileRequest): Promise<import("../http/common/HttpResponse").HttpResponse<unknown>>;
     copyFile(body: MoveFileRequest): Promise<import("../http/common/HttpResponse").HttpResponse<unknown>>;
     removeFile(body: RemoveFileRequest): Promise<import("../http/common/HttpResponse").HttpResponse<unknown>>;

package/dist/controllers/FileManageController.js

@@ -11,7 +11,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { Injectable } from "@clairejs/core";
-import { AbstractDatabaseAdapter } from "@clairejs/orm";
+import { AbstractDbAdapter } from "@clairejs/orm";
 import { ResponseBuilder } from "../http/common/HttpResponse";
 import { AbstractHttpController } from "../http/controller/AbstractHttpController";
 import { ApiResponse, Body, Get, Post, Queries } from "../http/decorators";
@@ -88,6 +88,6 @@ __decorate([
 ], FileManageController.prototype, "getFileInfo", null);
 FileManageController = __decorate([
     Injectable(),
-    __metadata("design:paramtypes", [AbstractDatabaseAdapter, AbstractFileService])
+    __metadata("design:paramtypes", [AbstractDbAdapter, AbstractFileService])
 ], FileManageController);
 export { FileManageController };

package/dist/controllers/FileUploadController.d.ts

@@ -1,12 +1,12 @@
-import { AbstractDatabaseAdapter } from "@clairejs/orm";
+import { AbstractDbAdapter } from "@clairejs/orm";
 import { AbstractHttpController } from "../http/controller/AbstractHttpController";
 import { AbstractFileService } from "../services/AbstractFileService";
 import { GetMultipleUploadUrlsQueries, GetUploadUrlQueries, GetUploadUrlResponseBody } from "./dto/upload";
 export declare class FileUploadController extends AbstractHttpController {
-    protected readonly db: AbstractDatabaseAdapter;
+    protected readonly db: AbstractDbAdapter;
     protected readonly fileService: AbstractFileService;
     protected readonly allowedUploadExtensions: string[];
-    constructor(db: AbstractDatabaseAdapter, fileService: AbstractFileService, allowedUploadExtensions: string[]);
+    constructor(db: AbstractDbAdapter, fileService: AbstractFileService, allowedUploadExtensions: string[]);
     getUploadUrl(queries: GetUploadUrlQueries): Promise<import("../http/common/HttpResponse").HttpResponse<GetUploadUrlResponseBody>>;
     getMultipleUploadUrls(queries: GetMultipleUploadUrlsQueries): Promise<import("../http/common/HttpResponse").HttpResponse<{
         files: GetUploadUrlResponseBody[];

package/dist/controllers/FileUploadController.js

@@ -11,7 +11,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 import { Errors, Injectable } from "@clairejs/core";
-import { AbstractDatabaseAdapter } from "@clairejs/orm";
+import { AbstractDbAdapter } from "@clairejs/orm";
 import randomstring from "randomstring";
 import { ResponseBuilder } from "../http/common/HttpResponse";
 import { AbstractHttpController } from "../http/controller/AbstractHttpController";
@@ -62,7 +62,7 @@ __decorate([
 ], FileUploadController.prototype, "getMultipleUploadUrls", null);
 FileUploadController = __decorate([
     Injectable(),
-    __metadata("design:paramtypes", [AbstractDatabaseAdapter,
+    __metadata("design:paramtypes", [AbstractDbAdapter,
         AbstractFileService, Array])
 ], FileUploadController);
 export { FileUploadController };

package/dist/http/controller/AbstractHttpController.js

@@ -1,7 +1,7 @@
 import { getObjectMetadata } from "@clairejs/core";
 import { Transactionable } from "../../common/Transactionable";
 const isEndpoint = (metadata) => {
-    return !!metadata.method || metadata.description !== undefined;
+    return !!metadata.method;
 };
 export class AbstractHttpController extends Transactionable {
     databaseAdapter;

package/dist/http/controller/AbstractHttpRequestHandler.js

@@ -13,9 +13,9 @@ export class AbstractHttpRequestHandler {
         if (!controllerMetadata) {
             return "";
         }
-        const urlParts = [];
+        const urlParts = [controllerMetadata.mount || ""];
         urlParts.push(...mappingUrls);
-        let finalUrl = urlParts.reduce((collector, part) => `${collector}/${part}`, "");
+        let finalUrl = urlParts.filter((part) => !!part).reduce((collector, part) => `${collector}/${part}`, "");
         //-- replace double slashes
         return finalUrl.replace(/(\/)\/+/g, "$1");
     }

package/dist/http/controller/CrudHttpController.js

@@ -103,6 +103,7 @@ export class CrudHttpController extends AbstractHttpController {
         endpointMetadata.bodyDto = getUpdateRecordsBodyValidator(this.modelMetadata);
         //-- response dto ------------------------------------
         endpointMetadata.responseDto = getUpdateManyResponseValidator(this.modelMetadata);
+        endpointMetadata.params = { 0: { source: "raw" } };
         return endpointMetadata;
     }
     /**

package/dist/http/controller/DefaultHttpRequestHandler.d.ts

@@ -15,6 +15,7 @@ export declare class DefaultHttpRequestHandler extends AbstractHttpRequestHandle
     constructor(logger: AbstractLogger, authorizationProvider: AbstractRequestAuthorizer, principalResolver: AbstractPrincipalResolver);
     protected handleRequest(endpoint: EndpointMetadata, req: HttpRequest): Promise<HttpResponse<any>>;
     exit(): void;
+    private getMountedInfo;
     private getResponse;
     handle(httpData: HttpData): Promise<HttpResponse<any>>;
     getMiddleware(): Promise<AbstractHttpMiddleware[]>;

package/dist/http/controller/DefaultHttpRequestHandler.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { AbstractLogger, stripData, Injectable, getServiceProvider, Errors, LogContext } from "@clairejs/core";
+import { AbstractLogger, stripData, Injectable, getServiceProvider, Errors, LogContext, } from "@clairejs/core";
 import randomstring from "randomstring";
 import parseurl from "parseurl";
 import { match } from "path-to-regexp";
@@ -53,22 +53,25 @@ let DefaultHttpRequestHandler = class DefaultHttpRequestHandler extends Abstract
         return response;
     }
     exit() { }
-    async getResponse(httpData) {
-        let response = new HttpResponse();
-        //-- match options with handler
-        const method = httpData.method;
-        const result = parseurl({ url: httpData.fullPath });
-        let params = {};
+    async getMountedInfo(method, pathname) {
         const mountedEndpointInfo = await this.getMountedEndpointInfo();
+        let params = {};
         const info = mountedEndpointInfo.find((info) => {
-            const parsedParams = info.method === method &&
-                match(info.mount, { decode: decodeURIComponent })(result.pathname || "/");
+            const parsedParams = info.method === method && match(info.mount, { decode: decodeURIComponent })(pathname);
             if (!parsedParams) {
                 return false;
             }
             params = parsedParams;
             return true;
         });
+        return { info, params };
+    }
+    async getResponse(httpData) {
+        const response = new HttpResponse();
+        //-- match options with handler
+        const method = httpData.method;
+        const result = parseurl({ url: httpData.fullPath });
+        const { params, info } = await this.getMountedInfo(method, result.pathname || "/");
         if (!info) {
             this.logger.debug(httpData);
             throw Errors.NOT_FOUND(`Handler not found`);

package/dist/job/AwsJobScheduler.d.ts

@@ -1,12 +1,12 @@
 import { AbstractLogger } from "@clairejs/core";
-import { AbstractDatabaseAdapter, ITransaction } from "@clairejs/orm";
+import { AbstractDbAdapter, ITransaction } from "@clairejs/orm";
 import aws from "aws-sdk";
 import Redis from "ioredis";
 import { AbstractJobScheduler } from "./AbstractJobScheduler";
 import { JobInfo, ScheduledJob } from "./interfaces";
 export declare class AwsJobScheduler extends AbstractJobScheduler {
     protected readonly logger: AbstractLogger;
-    protected readonly db: AbstractDatabaseAdapter;
+    protected readonly db: AbstractDbAdapter;
     protected readonly redisClient: Redis;
     protected readonly uniqueIdKey: string;
     protected readonly apiLambdaFunctionArn: string;
@@ -26,7 +26,7 @@ export declare class AwsJobScheduler extends AbstractJobScheduler {
     protected readonly oneMinuteRule: string;
     protected readonly eventbridge: aws.EventBridge;
     protected readonly stepfunctions: aws.StepFunctions;
-    constructor(logger: AbstractLogger, db: AbstractDatabaseAdapter, redisClient: Redis, uniqueIdKey: string, apiLambdaFunctionArn: string, stepFunctionName: string, 
+    constructor(logger: AbstractLogger, db: AbstractDbAdapter, redisClient: Redis, uniqueIdKey: string, apiLambdaFunctionArn: string, stepFunctionName: string, 
     /**
      * This IAM role must have following permissions:
      * - trigger any state machine (for one minute rule - as we don't now the state machine ARN until auto creation)

package/dist/job/AwsJobScheduler.js

@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { AbstractLogger, Errors, LogContext } from "@clairejs/core";
-import { AbstractDatabaseAdapter } from "@clairejs/orm";
+import { AbstractDbAdapter } from "@clairejs/orm";
 import aws from "aws-sdk";
 import Redis from "ioredis";
 import { AbstractJobScheduler } from "./AbstractJobScheduler";
@@ -407,7 +407,7 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
 AwsJobScheduler = __decorate([
     LogContext(),
     __metadata("design:paramtypes", [AbstractLogger,
-        AbstractDatabaseAdapter,
+        AbstractDbAdapter,
         Redis, String, String, String, String, Object, Object, Object])
 ], AwsJobScheduler);
 export { AwsJobScheduler };

package/dist/job/LocalJobScheduler.d.ts

@@ -1,12 +1,12 @@
 import { AbstractLogger, IInit } from "@clairejs/core";
 import Redis from "ioredis";
-import { AbstractDatabaseAdapter, ITransaction } from "@clairejs/orm";
+import { AbstractDbAdapter, ITransaction } from "@clairejs/orm";
 import { AbstractJobScheduler } from "./AbstractJobScheduler";
 import { CustomJobInfo, JobInfo, ScheduledJob } from "./interfaces";
 import { AbstractJobRepository } from "./AbstractJobRepository";
 export declare class LocalJobScheduler extends AbstractJobScheduler implements IInit {
     protected readonly logger: AbstractLogger;
-    protected readonly db: AbstractDatabaseAdapter;
+    protected readonly db: AbstractDbAdapter;
     protected readonly redisClient: Redis;
     protected readonly subscribeClient: Redis;
     protected readonly jobRepo: AbstractJobRepository<CustomJobInfo>;
@@ -35,7 +35,7 @@ export declare class LocalJobScheduler extends AbstractJobScheduler implements I
     private isActive;
     private notifyResolver;
     private jobHolder;
-    constructor(logger: AbstractLogger, db: AbstractDatabaseAdapter, redisClient: Redis, subscribeClient: Redis, jobRepo: AbstractJobRepository<CustomJobInfo>, 
+    constructor(logger: AbstractLogger, db: AbstractDbAdapter, redisClient: Redis, subscribeClient: Redis, jobRepo: AbstractJobRepository<CustomJobInfo>, 
     /**
      * Redis lock key to select active scheduler
      */

package/dist/job/LocalJobScheduler.js

@@ -11,7 +11,7 @@ import { AbstractLogger, Errors, Initable, LogContext } from "@clairejs/core";
 import Redis from "ioredis";
 import Redlock from "redlock";
 import scheduler from "node-schedule";
-import { AbstractDatabaseAdapter } from "@clairejs/orm";
+import { AbstractDbAdapter } from "@clairejs/orm";
 import assert from "assert";
 import { AbstractJobScheduler } from "./AbstractJobScheduler";
 import { AbstractJobRepository } from "./AbstractJobRepository";
@@ -272,7 +272,7 @@ LocalJobScheduler = __decorate([
     LogContext(),
     Initable(),
     __metadata("design:paramtypes", [AbstractLogger,
-        AbstractDatabaseAdapter,
+        AbstractDbAdapter,
         Redis,
         Redis,
         AbstractJobRepository, String, String, String, String, Number])

package/dist/socket/AbstractServerSocketManager.js

@@ -288,7 +288,7 @@ export class AbstractServerSocketManager {
                     ...getChannelNameMetadata,
                     id: `${SocketMethod.MESSAGE}:${controller.getChannelName()}`,
                     readOnly: false,
-                    controller: socketController,
+                    controller,
                     apiGroup: controllerMetadata?.permissionGroup,
                     name: controller.onMessage.name,
                     method: SocketMethod.MESSAGE,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.17.9",
+    "version": "3.18.0",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",
@@ -33,8 +33,8 @@
         "ws": "^7.5.5"
     },
     "peerDependencies": {
-        "@clairejs/core": "^3.7.3",
-        "@clairejs/orm": "^3.12.4"
+        "@clairejs/core": "^3.7.9",
+        "@clairejs/orm": "^3.14.0"
     },
     "devDependencies": {
         "@types/cookie-parser": "^1.4.3",
@@ -48,6 +48,7 @@
         "@types/randomstring": "^1.1.8",
         "@types/uuid": "^9.0.0",
         "@types/ws": "^7.4.0",
+        "id-sdk": "^1.5.16",
         "mocha": "^10.2.0",
         "ts-node": "^10.9.1",
         "typescript": "^5.0.4",