@clairejs/server 3.16.6 → 3.16.8

package/README.md

@@ -1,7 +1,8 @@
 ## Change Log
 
-#### 3.16.6:
+#### 3.16.8:
 
+-   refactor aws s3 file service
 -   do not throw when fail to clean up in ModelRepository
 -   fix file controllers
 -   fix socket authentication, fix http error code in response

package/dist/services/implementations/S3FileService.d.ts

@@ -7,7 +7,7 @@ export interface S3FileServiceConfig {
     PRESIGNED_URL_EXPIRATION_S: number;
     CLOUD_FRONT_PUBLIC_DOMAIN: string;
     CLOUD_FRONT_PUBLIC_KEY_ID: string;
-    CLOUD_FRONT_PRIVATE_KEY_BASE64: string;
+    CLOUD_FRONT_PRIVATE_KEY: string;
 }
 export declare class S3FileService extends AbstractFileService {
     protected readonly config: S3FileServiceConfig;

package/dist/services/implementations/S3FileService.js

@@ -9,6 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { AbstractLogger, LogContext } from "@clairejs/core";
 import aws from "aws-sdk";
+import { FileOperation } from "../../common/FileOperation";
 import { AbstractFileService } from "../AbstractFileService";
 let S3FileService = class S3FileService extends AbstractFileService {
     config;
@@ -23,7 +24,7 @@ let S3FileService = class S3FileService extends AbstractFileService {
             signatureVersion: "v4",
             region: this.config.S3_BUCKET_REGION,
         });
-        this.cloudfrontSigner = new aws.CloudFront.Signer(this.config.CLOUD_FRONT_PUBLIC_KEY_ID, Buffer.from(this.config.CLOUD_FRONT_PRIVATE_KEY_BASE64, "base64").toString());
+        this.cloudfrontSigner = new aws.CloudFront.Signer(this.config.CLOUD_FRONT_PUBLIC_KEY_ID, this.config.CLOUD_FRONT_PRIVATE_KEY);
     }
     async getFileSize(objectKeys) {
         return await Promise.all(objectKeys.map((uri) => this.getSingleFileSize(uri)));
@@ -53,7 +54,7 @@ let S3FileService = class S3FileService extends AbstractFileService {
     getSinglePresignedUrl(_operation, objectKey) {
         return this.cloudfrontSigner.getSignedUrl({
             url: `${this.config.CLOUD_FRONT_PUBLIC_DOMAIN}/${objectKey}`,
-            expires: Date.now() + 3600000,
+            expires: this.config.PRESIGNED_URL_EXPIRATION_S * 1000
         });
     }
     async copySingleObject(fromObjectKey, toObjectKey) {
@@ -82,14 +83,10 @@ let S3FileService = class S3FileService extends AbstractFileService {
         }
     }
     getSingleAccessUrl(objectKey, isPublic) {
-        const url = `${this.config.CLOUD_FRONT_PUBLIC_DOMAIN}/${objectKey}`;
         if (isPublic) {
-            return url;
+            return `${this.config.CLOUD_FRONT_PUBLIC_DOMAIN}/${objectKey}`;
         }
-        return this.cloudfrontSigner.getSignedUrl({
-            url,
-            expires: Date.now() + this.config.PRESIGNED_URL_EXPIRATION_S * 1000,
-        });
+        return this.getSinglePresignedUrl(FileOperation.GET, objectKey);
     }
     async removeSingleObject(objectKey) {
         await this.s3Client

package/package.json

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