@clairejs/server 3.25.4 → 3.26.0

package/README.md

@@ -1,5 +1,15 @@
 ## Change Log
 
+#### 3.26.0
+
+-   update file upload handler
+
+-   update packages, remove exit code
+
+#### 3.25.5
+
+-   update packages, remove exit code
+
 #### 3.25.4
 
 -   update claire orm, claire client

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

@@ -1,8 +1,10 @@
 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>;

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

@@ -1,41 +1,30 @@
-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]);
+        await this.fileService.removeObject([this.getPath(uri)]);
     }
     async resolvePublicUrl(uri) {
-        const result = await this.fileService.getAccessUrls([uri], true);
+        const result = await this.fileService.getAccessUrls([this.getPath(uri)], true);
         return result[0];
     }
     async resolvePrivateUrl(uri) {
-        const result = await this.fileService.getAccessUrls([uri], false);
+        const result = await this.fileService.getAccessUrls([this.getPath(uri)], false);
         return result[0];
     }
-};
-FileUploadHandler = __decorate([
-    Injectable(),
-    __metadata("design:paramtypes", [AbstractFileService])
-], FileUploadHandler);
-export { FileUploadHandler };
+}

package/dist/job/AbstractJobScheduler.js

@@ -118,7 +118,7 @@ export class AbstractJobScheduler {
         const tx = await this.db.createTransaction();
         if (!jobHandler) {
             this.logger.info(`Disable job with id: ${job.id} as handler is not found`);
-            await this.disableJob(job.id || job.id, tx);
+            await this.disableJob(job.id, tx);
         }
         else {
             const update = {

package/dist/system/ClaireServer.js

@@ -8,7 +8,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { AbstractLogger, ClaireApp, LogContext, getGlobalStore } from "@clairejs/core";
-import { ExitCode } from "../common/constants";
 let ClaireServer = class ClaireServer extends ClaireApp {
     logger;
     httpRequestHandler;
@@ -43,11 +42,11 @@ let ClaireServer = class ClaireServer extends ClaireApp {
         this.logger.debug(`Setting up exception handlers`);
         process.on("SIGTERM", () => {
             this.logger.warn("SIGTERM interrupt signal");
-            return this.stop(ExitCode.SIGTERM_INTERUPTION);
+            return this.stop();
         });
         process.on("SIGINT", () => {
             this.logger.warn("SIGINT interrupt signal");
-            return this.stop(ExitCode.SIGTERM_INTERUPTION);
+            return this.stop();
         });
         process.on("uncaughtException", (err) => {
             this.logger.error("uncaughtException", err.name, err.stack);
@@ -57,10 +56,10 @@ let ClaireServer = class ClaireServer extends ClaireApp {
         });
         this.booted = true;
     }
-    stop(code) {
+    stop() {
         this.logger.debug("Server is shutting down");
         this.exit();
-        process.exit(code);
+        process.exit(0);
     }
 };
 ClaireServer = __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@clairejs/server",
-    "version": "3.25.4",
+    "version": "3.26.0",
     "description": "Claire server NodeJs framework written in Typescript.",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",
@@ -33,9 +33,9 @@
         "ws": "^7.5.5"
     },
     "peerDependencies": {
-        "@clairejs/client": "^3.5.0",
-        "@clairejs/core": "^3.8.13",
-        "@clairejs/orm": "^3.16.31"
+        "@clairejs/client": "^3.5.1",
+        "@clairejs/core": "^3.9.0",
+        "@clairejs/orm": "^3.17.2"
     },
     "devDependencies": {
         "@types/cookie-parser": "^1.4.3",

package/dist/common/constants.d.ts

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

package/dist/common/constants.js

@@ -1,7 +0,0 @@
-//@internal
-export const ExitCode = {
-    SIGTERM_INTERUPTION: -1,
-    SIGINT_INTERUPTION: -2,
-    UNCAUGHT_EXCEPTION: -3,
-    UNHANDLED_REJECTION: -4,
-};