@webda/aws 4.0.0-beta.1 → 4.0.0-beta.3

package/lib/services/s3binary.service.d.ts

@@ -0,0 +1,215 @@
+import { HeadObjectCommandOutput, S3 } from "@aws-sdk/client-s3";
+import { BinaryFile, BinaryFileInfo, BinaryMap, CloudBinary, CloudBinaryParameters, CoreModel, OperationContext } from "@webda/core";
+import { Readable } from "node:stream";
+import { AWSServiceParameters } from "./aws-parameters.js";
+import type { CloudFormationContributor, CloudFormationDeployerInfo } from "./contributors.js";
+/**
+ * S3Binary parameters
+ */
+export declare class S3BinaryParameters extends CloudBinaryParameters implements AWSServiceParameters {
+    /**
+     * Custom endpoint (localstack, minio, ...)
+     */
+    endpoint?: string;
+    /**
+     * Static credentials, default to the AWS environment variables
+     */
+    credentials?: {
+        accessKeyId: string;
+        secretAccessKey: string;
+        sessionToken?: string;
+    };
+    /**
+     * AWS region
+     * @default "us-east-1"
+     */
+    region?: string;
+    /**
+     * Use path style url (required by localstack/minio)
+     * @default false
+     */
+    forcePathStyle?: boolean;
+    /**
+     * Bucket to store the binaries in
+     */
+    bucket: string;
+    /**
+     * CloudFormation customization
+     */
+    CloudFormation?: any;
+    /**
+     * Skip CloudFormation on deploy
+     */
+    CloudFormationSkip?: boolean;
+    /**
+     * @override
+     * @param params - raw parameters
+     * @returns this
+     */
+    load(params?: any): this;
+}
+/**
+ * S3Binary handles the storage of binary on a S3 bucket
+ *
+ * The structure used for now is
+ * /{hash}/data
+ * /{hash}/{targetStore}_{uuid}
+ * The challenge is stored on the metadata of the data object
+ *
+ * It takes parameters
+ *  bucket: "bucketName"
+ *  accessKeyId: ""
+ *  secretAccessKey: ""
+ *  region: ""
+ *
+ * See Binary the general interface
+ *
+ * We can register on S3 Event to get info when /data is pushed
+ *
+ * @WebdaModda
+ */
+export declare class S3Binary<T extends S3BinaryParameters = S3BinaryParameters> extends CloudBinary<T> implements CloudFormationContributor {
+    _s3: S3;
+    /**
+     * Create the S3 client
+     * @override
+     */
+    computeParameters(): void;
+    /**
+     * Return a signed PUT url if the binary is not yet stored
+     *
+     * @param object - the model owning the binary
+     * @param property - the binary attribute
+     * @param body - the binary information (hash and challenge)
+     * @param context - the operation context
+     * @returns the url to upload to, or undefined if the binary is already stored
+     */
+    putRedirectUrl(object: CoreModel, property: string, body?: BinaryFileInfo, context?: OperationContext<BinaryFileInfo>): Promise<{
+        url: string;
+        method: string;
+        headers: {
+            [key: string]: string;
+        };
+    }>;
+    /**
+     * Put an empty marker object next to the binary data
+     * @param hash - the binary hash
+     * @param suffix - the marker name
+     * @param storeName - the model identifier using the binary
+     * @returns the putObject result
+     */
+    putMarker(hash: string, suffix: string, storeName: string): Promise<import("@aws-sdk/client-s3").PutObjectCommandOutput>;
+    /**
+     * Return a signed url to an object
+     *
+     * @param key to the object
+     * @param action to perform
+     * @param params - additional command parameters
+     * @returns the signed url
+     */
+    getSignedUrl(key: string, action?: "getObject" | "putObject", params?: any): Promise<string>;
+    /**
+     * @override
+     * @param binaryMap - the binary to download
+     * @param expire - url validity in seconds
+     * @param _context - the operation context
+     * @returns the signed url
+     */
+    getSignedUrlFromMap(binaryMap: BinaryMap, expire: number, _context: OperationContext): Promise<string>;
+    /**
+     * @override
+     * @param info - the binary to retrieve
+     * @returns the binary content stream
+     */
+    _get(info: BinaryMap): Promise<Readable>;
+    /**
+     * Check if an object exists on S3
+     * @param Key - the object key
+     * @param Bucket - the bucket, default to the configured one
+     * @returns the head result or null if not found
+     */
+    exists(Key: string, Bucket?: string): Promise<HeadObjectCommandOutput | null>;
+    /**
+     * @override
+     * @param hash - the binary hash
+     * @returns the number of objects using the binary
+     */
+    getUsageCount(hash: string): Promise<number>;
+    /**
+     * Delete the binary data and all its markers
+     * @param hash - the binary hash
+     */
+    _cleanHash(hash: string): Promise<void>;
+    /**
+     * @override
+     * @param hash - the binary hash
+     * @param uuid - the object uuid
+     * @param attribute - the binary attribute, if undefined clean the whole binary
+     */
+    _cleanUsage(hash: string, uuid: string, attribute?: string): Promise<void>;
+    /**
+     * Check if the binary data exists
+     * @param hash - the binary hash
+     * @returns true if it exists
+     */
+    _exists(hash: string): Promise<boolean>;
+    /**
+     * Get a head object
+     * @param hash - the binary hash
+     * @returns the head result or undefined if not found
+     */
+    _getS3(hash: string): Promise<HeadObjectCommandOutput>;
+    /**
+     * Get an object from s3 bucket
+     *
+     * @param key to get
+     * @param bucket to retrieve from or default bucket
+     * @returns the object content stream
+     */
+    getObject(key: string, bucket?: string): Promise<Readable>;
+    /**
+     *
+     * Iterate over the files of a bucket
+     *
+     * @param Bucket to iterate on
+     * @param callback to execute with each key
+     * @param Prefix to use
+     * @param filter regexp to execute on the key
+     */
+    forEachFile(Bucket: string, callback: (Key: string, page: number) => Promise<void>, Prefix?: string, filter?: RegExp): Promise<void>;
+    /**
+     * Add an object to S3 bucket
+     *
+     * @param key to add to
+     * @param body content of the object
+     * @param metadatas to put along the object
+     * @param bucket to use
+     */
+    putObject(key: string, body: Buffer | Blob | string | ReadableStream, metadatas?: {}, bucket?: string): Promise<void>;
+    /**
+     * @override
+     * @param object - the model owning the binary
+     * @param property - the binary attribute
+     * @param file - the binary to store
+     */
+    store(object: CoreModel, property: string, file: BinaryFile): Promise<void>;
+    /**
+     * IAM policy required by the service
+     * @param _accountId - AWS account id
+     * @returns the policy statement
+     */
+    getARNPolicy(_accountId: string): {
+        Sid: string;
+        Effect: string;
+        Action: string[];
+        Resource: string[];
+    };
+    /**
+     * CloudFormation resources for the bucket
+     * @param deployer - the deployer requesting the resources
+     * @returns the resources
+     */
+    getCloudFormation(deployer: CloudFormationDeployerInfo): {};
+}
+export default S3Binary;
+//# sourceMappingURL=s3binary.service.d.ts.map

package/lib/services/s3binary.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"s3binary.service.d.ts","sourceRoot":"","sources":["../../src/services/s3binary.service.ts"],"names":[],"mappings":"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"}

package/lib/services/{s3binary.js → s3binary.service.js}

@@ -1,17 +1,25 @@
 // Load the AWS SDK for Node.js
 import { GetObjectCommand, PutObjectCommand, S3 } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-import { BinaryParameters, CloudBinary, WebdaError } from "@webda/core";
-import bluebird from "bluebird";
-import { AWSServiceParameters } from "./aws-mixin.js";
-export class S3BinaryParameters extends AWSServiceParameters(BinaryParameters) {
-    constructor(params, service) {
-        super(params, service);
+import { CloudBinary, CloudBinaryParameters, useModelId, WebdaError } from "@webda/core";
+import { loadAWSParameters } from "./aws-parameters.js";
+/**
+ * S3Binary parameters
+ */
+export class S3BinaryParameters extends CloudBinaryParameters {
+    /**
+     * @override
+     * @param params - raw parameters
+     * @returns this
+     */
+    load(params = {}) {
+        super.load(params);
+        loadAWSParameters(this);
         if (!this.bucket) {
             throw new WebdaError.CodeError("S3BUCKET_PARAMETER_REQUIRED", "Need to define a bucket at least");
         }
         this.forcePathStyle ?? (this.forcePathStyle = false);
-        this.prefix = "";
+        return this;
     }
 }
 /**
@@ -34,45 +42,44 @@ export class S3BinaryParameters extends AWSServiceParameters(BinaryParameters) {
  *
  * @WebdaModda
  */
-export default class S3Binary extends CloudBinary {
-    /**
-     * Load the parameters
-     *
-     * @param params
-     */
-    loadParameters(params) {
-        return new S3BinaryParameters(params, this);
-    }
+export class S3Binary extends CloudBinary {
     /**
-     * @inheritdoc
+     * Create the S3 client
+     * @override
      */
     computeParameters() {
+        super.computeParameters();
         this._s3 = new S3(this.parameters);
     }
     /**
-     * @inheritdoc
+     * Return a signed PUT url if the binary is not yet stored
+     *
+     * @param object - the model owning the binary
+     * @param property - the binary attribute
+     * @param body - the binary information (hash and challenge)
+     * @param context - the operation context
+     * @returns the url to upload to, or undefined if the binary is already stored
      */
-    async putRedirectUrl(ctx) {
-        let body = await ctx.getRequestBody();
-        const { uuid, store, property } = ctx.getParameters();
-        let targetStore = this._verifyMapAndStore(ctx);
-        let object = await targetStore.get(uuid);
-        let base64String = Buffer.from(body.hash, "hex").toString("base64");
-        let params = {
+    async putRedirectUrl(object, property, body, context) {
+        body ?? (body = await context.getInput());
+        const uuid = object.getUUID();
+        const store = useModelId(object.constructor);
+        const base64String = Buffer.from(body.hash, "hex").toString("base64");
+        const params = {
             Bucket: this.parameters.bucket,
             Key: this._getKey(body.hash),
             ContentType: "application/octet-stream",
             ContentMD5: base64String
         };
         // List bucket
-        let data = await this._s3.listObjectsV2({
+        const data = await this._s3.listObjectsV2({
             Bucket: this.parameters.bucket,
             Prefix: this._getKey(body.hash, "")
         });
         let foundMap = false;
         let foundData = false;
         let challenge;
-        for (let i in data.Contents) {
+        for (const i in data.Contents) {
             if (data.Contents[i].Key.endsWith("data"))
                 foundData = true;
             if (data.Contents[i].Key.endsWith(`${property}_${uuid}`))
@@ -116,10 +123,14 @@ export default class S3Binary extends CloudBinary {
         };
     }
     /**
-     * @inheritdoc
+     * Put an empty marker object next to the binary data
+     * @param hash - the binary hash
+     * @param suffix - the marker name
+     * @param storeName - the model identifier using the binary
+     * @returns the putObject result
      */
     putMarker(hash, suffix, storeName) {
-        let s3obj = new S3(this.parameters);
+        const s3obj = new S3(this.parameters);
         return s3obj.putObject({
             Bucket: this.parameters.bucket,
             Key: this._getKey(hash, suffix),
@@ -133,8 +144,8 @@ export default class S3Binary extends CloudBinary {
      *
      * @param key to the object
      * @param action to perform
-     * @param params
-     * @returns
+     * @param params - additional command parameters
+     * @returns the signed url
      */
     async getSignedUrl(key, action = "getObject", params = {}) {
         params.Bucket = params.Bucket || this.parameters.bucket;
@@ -151,9 +162,13 @@ export default class S3Binary extends CloudBinary {
     }
     /**
      * @override
+     * @param binaryMap - the binary to download
+     * @param expire - url validity in seconds
+     * @param _context - the operation context
+     * @returns the signed url
      */
     async getSignedUrlFromMap(binaryMap, expire, _context) {
-        let params = {};
+        const params = {};
         params.Expires = expire; // A get should not take more than 30s
         params.ResponseContentDisposition = `attachment; filename=${binaryMap.name || binaryMap.originalname}`;
         params.ResponseContentType = binaryMap.mimetype;
@@ -162,6 +177,8 @@ export default class S3Binary extends CloudBinary {
     }
     /**
      * @override
+     * @param info - the binary to retrieve
+     * @returns the binary content stream
      */
     async _get(info) {
         return (await this._s3.getObject({
@@ -171,8 +188,9 @@ export default class S3Binary extends CloudBinary {
     }
     /**
      * Check if an object exists on S3
-     * @param key
-     * @param bucket
+     * @param Key - the object key
+     * @param Bucket - the bucket, default to the configured one
+     * @returns the head result or null if not found
      */
     async exists(Key, Bucket = this.parameters.bucket) {
         try {
@@ -189,11 +207,13 @@ export default class S3Binary extends CloudBinary {
         }
     }
     /**
-     * @inheritdoc
+     * @override
+     * @param hash - the binary hash
+     * @returns the number of objects using the binary
      */
     async getUsageCount(hash) {
         // Not efficient if more than 1000 docs
-        let data = await this._s3.listObjects({
+        const data = await this._s3.listObjects({
             Bucket: this.parameters.bucket,
             Prefix: this._getKey(hash, "")
         });
@@ -201,36 +221,45 @@ export default class S3Binary extends CloudBinary {
         return data.Contents.filter(k => !(k.Key.includes("data") || k.Key.includes("challenge"))).length;
     }
     /**
-     * @inheritdoc
+     * Delete the binary data and all its markers
+     * @param hash - the binary hash
      */
     async _cleanHash(hash) {
-        let files = (await this._s3.listObjectsV2({
-            Bucket: this.parameters.bucket,
-            Prefix: this._getKey(hash, "")
-        })).Contents;
-        await bluebird.map(files, file => this._s3.deleteObject({
-            Bucket: this.parameters.bucket,
-            Key: file.Key
-        }), {
-            concurrency: 5
-        });
+        const files = [
+            ...((await this._s3.listObjectsV2({
+                Bucket: this.parameters.bucket,
+                Prefix: this._getKey(hash, "")
+            })).Contents ?? [])
+        ];
+        // Delete with a concurrency of 5
+        while (files.length) {
+            await Promise.all(files.splice(0, 5).map(file => this._s3.deleteObject({
+                Bucket: this.parameters.bucket,
+                Key: file.Key
+            })));
+        }
     }
     /**
-     * @inheritdoc
+     * @override
+     * @param hash - the binary hash
+     * @param uuid - the object uuid
+     * @param attribute - the binary attribute, if undefined clean the whole binary
      */
     async _cleanUsage(hash, uuid, attribute) {
         if (!attribute) {
             return this._cleanHash(hash);
         }
         // Dont clean data for now
-        let params = {
+        const params = {
             Bucket: this.parameters.bucket,
             Key: this._getKey(hash, `${attribute}_${uuid}`)
         };
         await this._s3.deleteObject(params);
     }
     /**
-     * @inheritdoc
+     * Check if the binary data exists
+     * @param hash - the binary hash
+     * @returns true if it exists
      */
     async _exists(hash) {
         try {
@@ -249,8 +278,8 @@ export default class S3Binary extends CloudBinary {
     }
     /**
      * Get a head object
-     * @param hash
-     * @returns
+     * @param hash - the binary hash
+     * @returns the head result or undefined if not found
      */
     async _getS3(hash) {
         try {
@@ -270,32 +299,34 @@ export default class S3Binary extends CloudBinary {
      *
      * @param key to get
      * @param bucket to retrieve from or default bucket
-     * @returns
+     * @returns the object content stream
      */
     async getObject(key, bucket) {
         bucket = bucket || this.parameters.bucket;
-        let s3obj = new S3(this.parameters);
+        const s3obj = new S3(this.parameters);
         return (await s3obj.getObject({
             Bucket: bucket,
             Key: key
         })).Body;
     }
     /**
+     *
+     * Iterate over the files of a bucket
      *
      * @param Bucket to iterate on
-     * @param Prefix to use
      * @param callback to execute with each key
+     * @param Prefix to use
      * @param filter regexp to execute on the key
      */
     async forEachFile(Bucket, callback, Prefix = "", filter = undefined) {
-        let params = { Bucket, Prefix };
+        const params = { Bucket, Prefix };
         let page = 0;
-        let s3 = new S3(this.parameters);
+        const s3 = new S3(this.parameters);
         do {
             await s3.listObjectsV2(params).then(async ({ Contents, NextContinuationToken }) => {
                 params.ContinuationToken = NextContinuationToken;
-                for (let f in Contents) {
-                    let { Key } = Contents[f];
+                for (const f in Contents) {
+                    const { Key } = Contents[f];
                     if (filter && filter.exec(Key) === null) {
                         continue;
                     }
@@ -314,7 +345,7 @@ export default class S3Binary extends CloudBinary {
      * @param bucket to use
      */
     async putObject(key, body, metadatas = {}, bucket = this.parameters.bucket) {
-        let s3obj = new S3(this.parameters);
+        const s3obj = new S3(this.parameters);
         await s3obj.putObject({
             Bucket: bucket,
             Key: key,
@@ -323,34 +354,40 @@ export default class S3Binary extends CloudBinary {
         });
     }
     /**
-     * @inheritdoc
+     * @override
+     * @param object - the model owning the binary
+     * @param property - the binary attribute
+     * @param file - the binary to store
      */
     async store(object, property, file) {
         this.checkMap(object, property);
         await file.getHashes();
-        let data = await this._getS3(file.hash);
+        const data = await this._getS3(file.hash);
         if (data === undefined) {
-            let s3metas = {};
+            const s3metas = {};
             s3metas["x-amz-meta-challenge"] = file.challenge;
-            let s3obj = new S3(this.parameters);
+            const s3obj = new S3(this.parameters);
             await s3obj.putObject({
                 Bucket: this.parameters.bucket,
                 Key: this._getKey(file.hash),
                 Metadata: s3metas,
-                Body: await file.get()
+                Body: await file.get(),
+                ContentLength: file.size
             });
         }
         // Set challenge aside for now
         await this.putMarker(file.hash, `challenge_${file.challenge}`, "challenge");
-        await this.putMarker(file.hash, `${property}_${object.getUuid()}`, object.getStore().getName());
-        await this.uploadSuccess(object, property, file);
+        await this.putMarker(file.hash, `${property}_${object.getUUID()}`, useModelId(object.constructor));
+        await this.uploadSuccess(object, property, file.toBinaryFileInfo());
     }
     /**
-     * @inheritdoc
+     * IAM policy required by the service
+     * @param _accountId - AWS account id
+     * @returns the policy statement
      */
     getARNPolicy(_accountId) {
         return {
-            Sid: this.constructor.name + this._name,
+            Sid: this.constructor.name + this.getName(),
             Effect: "Allow",
             Action: [
                 "s3:AbortMultipartUpload",
@@ -377,16 +414,18 @@ export default class S3Binary extends CloudBinary {
         };
     }
     /**
-     * @inheritdoc
+     * CloudFormation resources for the bucket
+     * @param deployer - the deployer requesting the resources
+     * @returns the resources
      */
     getCloudFormation(deployer) {
         if (this.parameters.CloudFormationSkip) {
             return {};
         }
-        let resources = {};
+        const resources = {};
         this.parameters.CloudFormation = this.parameters.CloudFormation || {};
         this.parameters.CloudFormation.Bucket = this.parameters.CloudFormation.Bucket || {};
-        resources[this._name + "Bucket"] = {
+        resources[this.getName() + "Bucket"] = {
             Type: "AWS::S3::Bucket",
             Properties: {
                 ...this.parameters.CloudFormation.Bucket,
@@ -398,5 +437,5 @@ export default class S3Binary extends CloudBinary {
         return resources;
     }
 }
-export { S3Binary };
-//# sourceMappingURL=s3binary.js.map
+export default S3Binary;
+//# sourceMappingURL=s3binary.service.js.map

package/lib/services/s3binary.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"s3binary.service.js","sourceRoot":"","sources":["../../src/services/s3binary.service.ts"],"names":[],"mappings":"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"}