@clairejs/server 3.16.3 → 3.16.5

package/README.md

@@ -1,7 +1,9 @@
 ## Change Log
 
-#### 3.16.3:
+#### 3.16.5:
 
+-   do not throw when fail to clean up in ModelRepository
+-   fix file controllers
 -   fix socket authentication, fix http error code in response
 -   update claire orm
 -   update packages, fix mount undefined:undefined when introducing updateRecords

package/dist/controllers/FileManageController.d.ts

@@ -1,9 +1,11 @@
+import { AbstractDatabaseAdapter } 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 {
-    readonly fileService: AbstractFileService;
-    constructor(fileService: AbstractFileService);
+    protected readonly db: AbstractDatabaseAdapter;
+    protected readonly fileService: AbstractFileService;
+    constructor(db: AbstractDatabaseAdapter, 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,15 +11,18 @@ 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 { ResponseBuilder } from "../http/common/HttpResponse";
 import { AbstractHttpController } from "../http/controller/AbstractHttpController";
 import { ApiResponse, Body, Get, Post, Queries } from "../http/decorators";
 import { AbstractFileService } from "../services/AbstractFileService";
 import { GetFileAccessUrlRequest, GetFileAccessUrlResponse, GetFileInfoRequest, GetFileInfoResponse, MoveFileRequest, RemoveFileRequest, } from "./dto/upload";
 let FileManageController = class FileManageController extends AbstractHttpController {
+    db;
     fileService;
-    constructor(fileService) {
-        super(null);
+    constructor(db, fileService) {
+        super(db);
+        this.db = db;
         this.fileService = fileService;
     }
     async moveFile(body) {
@@ -85,6 +88,6 @@ __decorate([
 ], FileManageController.prototype, "getFileInfo", null);
 FileManageController = __decorate([
     Injectable(),
-    __metadata("design:paramtypes", [AbstractFileService])
+    __metadata("design:paramtypes", [AbstractDatabaseAdapter, AbstractFileService])
 ], FileManageController);
 export { FileManageController };

package/dist/controllers/FileUploadController.d.ts

@@ -1,10 +1,12 @@
+import { AbstractDatabaseAdapter } 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 {
-    readonly fileService: AbstractFileService;
-    readonly allowedUploadExtensions: string[];
-    constructor(fileService: AbstractFileService, allowedUploadExtensions: string[]);
+    protected readonly db: AbstractDatabaseAdapter;
+    protected readonly fileService: AbstractFileService;
+    protected readonly allowedUploadExtensions: string[];
+    constructor(db: AbstractDatabaseAdapter, 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,6 +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 randomstring from "randomstring";
 import { ResponseBuilder } from "../http/common/HttpResponse";
 import { AbstractHttpController } from "../http/controller/AbstractHttpController";
@@ -18,10 +19,12 @@ import { ApiResponse, Get, Queries } from "../http/decorators";
 import { AbstractFileService } from "../services/AbstractFileService";
 import { GetMultipleUploadResponseBody, GetMultipleUploadUrlsQueries, GetUploadUrlQueries, GetUploadUrlResponseBody, } from "./dto/upload";
 let FileUploadController = class FileUploadController extends AbstractHttpController {
+    db;
     fileService;
     allowedUploadExtensions;
-    constructor(fileService, allowedUploadExtensions) {
-        super(null);
+    constructor(db, fileService, allowedUploadExtensions) {
+        super(db);
+        this.db = db;
         this.fileService = fileService;
         this.allowedUploadExtensions = allowedUploadExtensions;
     }
@@ -59,6 +62,7 @@ __decorate([
 ], FileUploadController.prototype, "getMultipleUploadUrls", null);
 FileUploadController = __decorate([
     Injectable(),
-    __metadata("design:paramtypes", [AbstractFileService, Array])
+    __metadata("design:paramtypes", [AbstractDatabaseAdapter,
+        AbstractFileService, Array])
 ], FileUploadController);
 export { FileUploadController };

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

@@ -2,7 +2,7 @@ import { Constructor, DeepPartial, Identifiable } from "@clairejs/core";
 import { ServerModelMetadata } from "../../common/ServerModelMetadata";
 import { IPrincipal } from "../../common/auth/IPrincipal";
 export declare abstract class AbstractRepository<T extends Identifiable> {
-    readonly model: Constructor<T>;
+    protected readonly model: Constructor<T>;
     protected readonly modelMetadata: ServerModelMetadata;
     constructor(model: Constructor<T>);
     protected beforeCreating(principal: IPrincipal | undefined, records: DeepPartial<T>[]): Promise<void>;

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

@@ -1,4 +1,4 @@
-import { AbstractModel, Constructor, CreateManyRequestBody, CreateManyResponseBody, DeepPartial, GetManyQueries, GetManyResponseBody, Identifiable, UpdateManyBody, UpdateManyQueries, UpdateManyResponse } from "@clairejs/core";
+import { AbstractLogger, AbstractModel, Constructor, CreateManyRequestBody, CreateManyResponseBody, DeepPartial, GetManyQueries, GetManyResponseBody, Identifiable, UpdateManyBody, UpdateManyQueries, UpdateManyResponse } from "@clairejs/core";
 import { IQueryProvider, ITransaction, QueryCondition } from "@clairejs/orm";
 import { IPrincipal } from "../../common/auth/IPrincipal";
 import { AbstractRepository } from "./AbstractRepository";
@@ -29,9 +29,10 @@ export declare const MultipleMap: <R extends Identifiable, K extends AbstractMod
     nestedMapping: DtoDissolver<R, K> | undefined;
 };
 export declare class DtoRepository<T extends Identifiable> extends AbstractRepository<T> implements ICrudRepository<T> {
-    readonly model: Constructor<T>;
-    readonly dissolver: DtoDissolver<T, any>;
-    constructor(model: Constructor<T>, dissolver: DtoDissolver<T, any>);
+    protected readonly model: Constructor<T>;
+    protected readonly dissolver: DtoDissolver<T, any>;
+    protected readonly logger: AbstractLogger;
+    constructor(model: Constructor<T>, dissolver: DtoDissolver<T, any>, logger: AbstractLogger);
     private getMapValue;
     createMany({ principal, body, tx, }: {
         principal?: IPrincipal | undefined;

package/dist/http/repository/DtoRepository.js

@@ -26,10 +26,12 @@ export const MultipleMap = (modelClass, forwardOps, forwardMapping, rootMapping,
 export class DtoRepository extends AbstractRepository {
     model;
     dissolver;
-    constructor(model, dissolver) {
+    logger;
+    constructor(model, dissolver, logger) {
         super(model);
         this.model = model;
         this.dissolver = dissolver;
+        this.logger = logger;
     }
     async getMapValue(root, currentInstancesResolver, mappers, preOperator, postOperator) {
         for (const mapper of mappers) {
@@ -56,7 +58,7 @@ export class DtoRepository extends AbstractRepository {
         await this.beforeCreating(principal, body.records);
         for (const record of body.records) {
             await this.getMapValue(record, async (mapper) => {
-                const repo = new ModelRepository(mapper.modelClass);
+                const repo = new ModelRepository(mapper.modelClass, this.logger);
                 const currentInstances = await repo.getMany({
                     ops: mapper.forwardOps(),
                     queryProvider: tx,
@@ -66,7 +68,7 @@ export class DtoRepository extends AbstractRepository {
                 if (!ks) {
                     return [];
                 }
-                const repo = new ModelRepository(mapper.modelClass);
+                const repo = new ModelRepository(mapper.modelClass, this.logger);
                 const ops = mapper.forwardOps();
                 if (mapper.multiple) {
                     //-- if ks contain an array of instances, we need to remove old instances and create new ones
@@ -111,7 +113,7 @@ export class DtoRepository extends AbstractRepository {
         const result = { ...body.update, id: queries.fields.id[0] };
         await this.beforeCreating(principal, [result]);
         await this.getMapValue(result, async (mapper) => {
-            const repo = new ModelRepository(mapper.modelClass);
+            const repo = new ModelRepository(mapper.modelClass, this.logger);
             const currentInstances = await repo.getMany({
                 ops: mapper.forwardOps(ops),
                 queryProvider: tx,
@@ -121,7 +123,7 @@ export class DtoRepository extends AbstractRepository {
             if (!ks) {
                 return [];
             }
-            const repo = new ModelRepository(mapper.modelClass);
+            const repo = new ModelRepository(mapper.modelClass, this.logger);
             const opsx = mapper.forwardOps(ops);
             if (mapper.multiple) {
                 //-- if ks contain an array of instances, we need to remove old instances and create new ones
@@ -170,7 +172,7 @@ export class DtoRepository extends AbstractRepository {
         }
         const result = { id: queries.fields.id[0] };
         await this.getMapValue(result, async () => [], this.dissolver(result), async (mapper) => {
-            const repo = new ModelRepository(mapper.modelClass);
+            const repo = new ModelRepository(mapper.modelClass, this.logger);
             //-- forward get
             const instances = await repo.getMany({
                 ops: mapper.forwardOps(ops),
@@ -189,7 +191,7 @@ export class DtoRepository extends AbstractRepository {
         }
         const result = { id: queries.fields.id[0] };
         await this.getMapValue(result, async () => [], this.dissolver(result), undefined, async (mapper) => {
-            const repo = new ModelRepository(mapper.modelClass);
+            const repo = new ModelRepository(mapper.modelClass, this.logger);
             //const nestedQueries = mapper.forwardQuery();
             const nestedOps = mapper.forwardOps(ops);
             const result = await repo.deleteMany({

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

@@ -1,12 +1,13 @@
-import { AbstractModel, Constructor, CreateManyRequestBody, CreateManyResponseBody, GetManyQueries, GetManyResponseBody, UpdateManyBody, UpdateManyQueries, UpdateManyResponse } from "@clairejs/core";
+import { AbstractModel, Constructor, CreateManyRequestBody, CreateManyResponseBody, GetManyQueries, GetManyResponseBody, UpdateManyBody, UpdateManyQueries, UpdateManyResponse, AbstractLogger } from "@clairejs/core";
 import { IQueryProvider, ITransaction, QueryCondition } from "@clairejs/orm";
 import { IPrincipal } from "../../common/auth/IPrincipal";
 import { ICrudRepository } from "./ICrudRepository";
 import { AbstractRepository } from "./AbstractRepository";
 export declare class ModelRepository<T extends AbstractModel> extends AbstractRepository<T> implements ICrudRepository<T> {
-    readonly model: Constructor<T>;
+    protected readonly model: Constructor<T>;
+    protected readonly logger: AbstractLogger;
     private fileUploadHandler?;
-    constructor(model: Constructor<T>);
+    constructor(model: Constructor<T>, logger: AbstractLogger);
     private getNestedQueries;
     private getUploadHandler;
     private getRequestQueryConditionFromQuery;

package/dist/http/repository/ModelRepository.js

@@ -6,10 +6,12 @@ import { LocaleTranslation } from "../../system/locale/LocaleTranslation";
 import { LocaleEntry } from "../../system/locale/LocaleEntry";
 export class ModelRepository extends AbstractRepository {
     model;
+    logger;
     fileUploadHandler;
-    constructor(model) {
+    constructor(model, logger) {
         super(model);
         this.model = model;
+        this.logger = logger;
     }
     getNestedQueries(queries) {
         return this.modelMetadata.fields
@@ -305,7 +307,7 @@ export class ModelRepository extends AbstractRepository {
             });
             if (hasManyRecords.length) {
                 //-- insert to db
-                const innerService = new ModelRepository(getModelById(field.hasMany.relationDto.id));
+                const innerService = new ModelRepository(getModelById(field.hasMany.relationDto.id), this.logger);
                 body.records = hasManyRecords;
                 const persistedInnerRecords = await innerService.createMany({ principal, body, tx });
                 //-- map back ids to hasManyRecords
@@ -329,7 +331,7 @@ export class ModelRepository extends AbstractRepository {
             }
         }
         //-- everything is ok, remove original Uris
-        await cleanUp();
+        cleanUp().catch((err) => this.logger.error("Error in clean up", err));
         return { records };
     }
     async updateMany({ principal, ops, queries, body, tx, }) {
@@ -479,7 +481,7 @@ export class ModelRepository extends AbstractRepository {
             if (tobeRemovedIds.length) {
                 await adapter.deleteMany({ _in: { id: tobeRemovedIds } });
             }
-            const modelService = new ModelRepository(model);
+            const modelService = new ModelRepository(model, this.logger);
             const added = await modelService.createMany({
                 principal,
                 body: { records: tobeAdded },
@@ -510,7 +512,7 @@ export class ModelRepository extends AbstractRepository {
             ];
         }
         //-- ok clean up
-        await cleanUp();
+        cleanUp().catch((err) => this.logger.error("Error in clean up", err));
         await this.beforeReturning(records);
         return { modified: this.project(records, projection) };
     }
@@ -599,7 +601,7 @@ export class ModelRepository extends AbstractRepository {
                 continue;
             }
             const model = getModelById(field.hasMany.relationDto.id);
-            const service = new ModelRepository(model);
+            const service = new ModelRepository(model, this.logger);
             const innerRecords = !recordIds.length
                 ? { records: [] }
                 : await service.getMany({
@@ -683,7 +685,7 @@ export class ModelRepository extends AbstractRepository {
             if (toBeRemovedUris.length) {
                 const fileUploadHandler = await this.getUploadHandler();
                 if (fileUploadHandler) {
-                    await Promise.all(toBeRemovedUris.map((uri) => fileUploadHandler.removeFile(uri)));
+                    Promise.all(toBeRemovedUris.map((uri) => fileUploadHandler.removeFile(uri))).catch((err) => this.logger.error("Fail to remove some files", err));
                 }
             }
             returning = tobeRemoved;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.16.3",
+    "version": "3.16.5",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",