@clairejs/server 3.26.0 → 3.26.2

package/README.md

@@ -1,5 +1,13 @@
 ## Change Log
 
+#### 3.26.2
+
+-   clean up jobs after run
+
+#### 3.26.1
+
+-   remove the resolve url function in file upload handler
+
 #### 3.26.0
 
 -   update file upload handler

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

@@ -8,6 +8,4 @@ export declare class FileUploadHandler extends AbstractFileUploadHandler {
     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

@@ -19,12 +19,4 @@ export class FileUploadHandler extends AbstractFileUploadHandler {
     async removeFile(uri) {
         await this.fileService.removeObject([this.getPath(uri)]);
     }
-    async resolvePublicUrl(uri) {
-        const result = await this.fileService.getAccessUrls([this.getPath(uri)], true);
-        return result[0];
-    }
-    async resolvePrivateUrl(uri) {
-        const result = await this.fileService.getAccessUrls([this.getPath(uri)], false);
-        return result[0];
-    }
 }

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/dist/job/AbstractJobScheduler.d.ts

@@ -29,6 +29,11 @@ export declare abstract class AbstractJobScheduler {
      * @param id The job id returned from scheduleJobAt function
      */
     protected abstract cancelJob(id: string): Promise<void>;
+    /**
+     * Clean up the job after it has been executed
+     * @param job The job to clean up
+     */
+    protected abstract cleanupJob(job: AbstractJob): Promise<void>;
     /**
      * Remove the scheduled job and prevent if from running in the future
      * @param id The job id returned from scheduleJobAt function

package/dist/job/AbstractJobScheduler.js

@@ -129,6 +129,8 @@ export class AbstractJobScheduler {
                 await jobHandler.handlerFn(job);
                 //-- job run success, update
                 update.lastSuccessAt = Date.now();
+                //-- clean up
+                await this.cleanupJob(job);
                 //-- reset retry count if this is cron job
                 if (job.cron) {
                     if (job.retryCount) {

package/dist/job/AwsJobScheduler.d.ts

@@ -19,6 +19,7 @@ export declare class AwsJobScheduler extends AbstractJobScheduler {
     constructor(logger: AbstractLogger, db: AbstractDbAdapter, jobRepo: AbstractJobRepository, apiLambdaFunctionArn: string, jobNamespace: string, eventBusName?: string);
     handleCron(jobInfo: AbstractJob): Promise<void>;
     private generateCronFromTimestamp;
+    protected cleanupJob(job: AbstractJob): Promise<void>;
     protected getScheduledJobs(): Promise<AbstractJob[]>;
     protected _scheduleJob(jobInfo: AbstractJob): Promise<void>;
     cancelJob(jobId: string): Promise<void>;

package/dist/job/AwsJobScheduler.js

@@ -49,6 +49,14 @@ let AwsJobScheduler = class AwsJobScheduler extends AbstractJobScheduler {
             date.getUTCFullYear(),
         ].join(" ");
     }
+    async cleanupJob(job) {
+        if (job.cron) {
+            //-- do nothing
+        }
+        else {
+            await this.cancelJob(job.id);
+        }
+    }
     async getScheduledJobs() {
         const allRules = await this.eventbridge
             .listRules({

package/dist/job/LocalJobScheduler.d.ts

@@ -50,6 +50,7 @@ export declare class LocalJobScheduler extends AbstractJobScheduler implements I
     private sendJob;
     private processMessage;
     private extendMutexKey;
+    protected cleanupJob(): Promise<void>;
     init(): Promise<void>;
     exit(): void;
     protected getScheduledJobs(): Promise<AbstractJob[]>;

package/dist/job/LocalJobScheduler.js

@@ -103,6 +103,9 @@ let LocalJobScheduler = class LocalJobScheduler extends AbstractJobScheduler {
         await this.redisClient.setex(this.holdMutexKey, this.keyRetentionDurationSeconds, 1);
         this.logger.debug("Scheduler extends mutex key");
     }
+    async cleanupJob() {
+        //-- do nothing
+    }
     async init() {
         this.logger.debug("LocalJobScheduler init");
         //-- subscribe to multi client channel

package/package.json

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