@clairejs/server 3.25.5 → 3.26.1

package/README.md

@@ -1,5 +1,15 @@
 ## Change Log
 
+#### 3.26.1
+
+-   remove the resolve url function in file upload handler
+
+#### 3.26.0
+
+-   update file upload handler
+
+-   update packages, remove exit code
+
 #### 3.25.5
 
 -   update packages, remove exit code

package/dist/http/file-upload/AbstractFileUploadHandler.d.ts

@@ -2,6 +2,4 @@ export declare abstract class AbstractFileUploadHandler {
     abstract moveFile(fromUri: string, toUri: string): Promise<void>;
     abstract copyFile(fromUri: string, toUri: string): Promise<void>;
     abstract removeFile(uri: string): Promise<void>;
-    abstract resolvePublicUrl(uri: string): Promise<string>;
-    abstract resolvePrivateUrl(uri: string): Promise<string>;
 }

package/dist/http/file-upload/FileUploadHandler.d.ts

@@ -1,11 +1,11 @@
 import { AbstractFileService } from "../../services/AbstractFileService";
 import { AbstractFileUploadHandler } from "./AbstractFileUploadHandler";
 export declare class FileUploadHandler extends AbstractFileUploadHandler {
-    readonly fileService: AbstractFileService;
-    constructor(fileService: AbstractFileService);
+    private readonly fileService;
+    private readonly prefix;
+    constructor(fileService: AbstractFileService, prefix?: string);
+    protected getPath(uri: string): string;
     moveFile(fromURI: string, toURI: string): Promise<void>;
     copyFile(fromURI: string, toURI: string): Promise<void>;
     removeFile(uri: string): Promise<void>;
-    resolvePublicUrl(uri: string): Promise<string>;
-    resolvePrivateUrl(uri: string): Promise<string>;
 }

package/dist/http/file-upload/FileUploadHandler.js

@@ -1,41 +1,22 @@
-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;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-import { Injectable } from "@clairejs/core";
-import { AbstractFileService } from "../../services/AbstractFileService";
 import { AbstractFileUploadHandler } from "./AbstractFileUploadHandler";
-let FileUploadHandler = class FileUploadHandler extends AbstractFileUploadHandler {
+export class FileUploadHandler extends AbstractFileUploadHandler {
     fileService;
-    constructor(fileService) {
+    prefix;
+    constructor(fileService, prefix = "") {
         super();
         this.fileService = fileService;
+        this.prefix = prefix;
+    }
+    getPath(uri) {
+        return `${this.prefix}${uri}`;
     }
     async moveFile(fromURI, toURI) {
-        await this.fileService.moveObject([{ fromURI, toURI }]);
+        await this.fileService.moveObject([{ fromURI: this.getPath(fromURI), toURI: this.getPath(toURI) }]);
     }
     async copyFile(fromURI, toURI) {
-        await this.fileService.copyObject([{ fromURI, toURI }]);
+        await this.fileService.copyObject([{ fromURI: this.getPath(fromURI), toURI: this.getPath(toURI) }]);
     }
     async removeFile(uri) {
-        await this.fileService.removeObject([uri]);
-    }
-    async resolvePublicUrl(uri) {
-        const result = await this.fileService.getAccessUrls([uri], true);
-        return result[0];
-    }
-    async resolvePrivateUrl(uri) {
-        const result = await this.fileService.getAccessUrls([uri], false);
-        return result[0];
+        await this.fileService.removeObject([this.getPath(uri)]);
     }
-};
-FileUploadHandler = __decorate([
-    Injectable(),
-    __metadata("design:paramtypes", [AbstractFileService])
-], FileUploadHandler);
-export { FileUploadHandler };
+}

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

@@ -1,15 +1,17 @@
-import { AbstractModel, Constructor, CreateManyRequestBody, CreateManyResponseBody, GetManyQueries, GetManyResponseBody, UpdateManyBody, UpdateManyQueries, UpdateManyResponse, AbstractLogger } from "@clairejs/core";
+import { AbstractLogger, AbstractModel, Constructor, CreateManyRequestBody, CreateManyResponseBody, GetManyQueries, GetManyResponseBody, UpdateManyBody, UpdateManyQueries, UpdateManyResponse } from "@clairejs/core";
 import { AbstractDbAdapter, ITransaction, QueryCondition } from "@clairejs/orm";
 import { IPrincipal } from "../../common/auth/IPrincipal";
-import { ICrudRepository } from "./ICrudRepository";
 import { AbstractRepository } from "./AbstractRepository";
+import { ICrudRepository } from "./ICrudRepository";
 export declare class ModelRepository<T extends AbstractModel> extends AbstractRepository<T> implements ICrudRepository<T> {
     protected readonly model: Constructor<T>;
     protected readonly db: AbstractDbAdapter;
     private fileUploadHandler?;
+    private fileService?;
     constructor(model: Constructor<T>, db: AbstractDbAdapter);
     private getNestedQueries;
     private getUploadHandler;
+    private getFileService;
     private getRequestQueryConditionFromQuery;
     uriHandling(records: Partial<T>[]): Promise<() => Promise<void>>;
     beforeReturning(records: Partial<T>[]): Promise<void>;

package/dist/http/repository/ModelRepository.js

@@ -1,9 +1,10 @@
-import { DataType, getModelById, getServiceProvider, RangeQueryDto, uniqueReducer, leanData, getSystemLocale, Errors, omitData, MODEL_FIELD_SEPARATOR, } from "@clairejs/core";
+import { DataType, Errors, getModelById, getServiceProvider, getSystemLocale, leanData, MODEL_FIELD_SEPARATOR, omitData, RangeQueryDto, uniqueReducer, } from "@clairejs/core";
 import { getDirectFields, getSafeUpdate, } from "@clairejs/orm";
+import { AbstractFileService } from "../../services/AbstractFileService";
+import { LocaleEntry } from "../../system/locale/LocaleEntry";
+import { LocaleTranslation } from "../../system/locale/LocaleTranslation";
 import { AbstractFileUploadHandler } from "../file-upload/AbstractFileUploadHandler";
 import { AbstractRepository } from "./AbstractRepository";
-import { LocaleTranslation } from "../../system/locale/LocaleTranslation";
-import { LocaleEntry } from "../../system/locale/LocaleEntry";
 const resolveUris = (record, field) => {
     return field.vectorProps?.elementDataType === DataType.STRING ? record[field.name] : [record[field.name]];
 };
@@ -14,6 +15,7 @@ export class ModelRepository extends AbstractRepository {
     model;
     db;
     fileUploadHandler;
+    fileService;
     constructor(model, db) {
         super(model);
         this.model = model;
@@ -44,6 +46,14 @@ export class ModelRepository extends AbstractRepository {
         }
         return this.fileUploadHandler;
     }
+    async getFileService() {
+        if (this.fileService === undefined) {
+            const injector = getServiceProvider().getInjector();
+            this.fileService = injector.resolveOptional(AbstractFileService) || null;
+            await injector.initInstances();
+        }
+        return this.fileService;
+    }
     getRequestQueryConditionFromQuery(queries, modelMetadata) {
         const result = [];
         for (const fieldMetadata of getDirectFields(modelMetadata)) {
@@ -176,8 +186,8 @@ export class ModelRepository extends AbstractRepository {
     }
     async beforeReturning(records) {
         //-- resolve url
-        const fileUploadHandler = await this.getUploadHandler();
-        if (!fileUploadHandler) {
+        const fileService = await this.getFileService();
+        if (!fileService) {
             return;
         }
         const mappingOperations = [];
@@ -195,8 +205,8 @@ export class ModelRepository extends AbstractRepository {
                         mappingOperations.push((async () => {
                             const urls = await Promise.all(uris.map(async (uri) => {
                                 return field.mimeProps?.public
-                                    ? await fileUploadHandler.resolvePublicUrl(uri)
-                                    : await fileUploadHandler.resolvePrivateUrl(uri);
+                                    ? (await fileService.getAccessUrls([uri], true))[0]
+                                    : (await fileService.getAccessUrls([uri], false))[0];
                             }));
                             assignUrls(record, field, urls);
                         })());

package/package.json

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