pim-import 5.0.2 → 5.1.0

package/dist/libs/s3.d.ts

@@ -1,4 +1,4 @@
-import AWS from "aws-sdk";
+import { S3Client } from "@aws-sdk/client-s3";
 import { AvailableCatalogs } from "../types";
 interface AWSConfig {
     accessKeyId: string;
@@ -9,14 +9,14 @@ interface Config extends AWSConfig {
     bucket: string;
 }
 export declare let config: Config;
-export declare let s3: AWS.S3;
+export declare let s3Client: S3Client;
 export declare const checkConfig: (skipInit?: boolean) => void;
 export declare const init: (opts?: Config) => void;
-export declare const listObjects: (prefix?: string) => Promise<import("aws-sdk/lib/request").PromiseResult<AWS.S3.ListObjectsV2Output, AWS.AWSError>>;
-export declare const upload: (url: string, fileName?: string, path?: string, metaData?: any) => Promise<AWS.S3.ManagedUpload.SendData>;
+export declare const listObjects: (prefix?: string) => Promise<import("@aws-sdk/client-s3").ListObjectsV2CommandOutput>;
+export declare const upload: (url: string, fileName?: string, path?: string, metaData?: any) => Promise<import("@aws-sdk/client-s3").CompleteMultipartUploadCommandOutput>;
 export declare const getFileFromS3: (path: string, returnUrl?: boolean) => Promise<any>;
 export declare const saveCatalogToS3: (catalog: AvailableCatalogs) => Promise<string>;
 export declare const saveAllProductsToS3: (catalog: AvailableCatalogs, lastModified: string) => Promise<string>;
-export declare const saveJsonToS3: (obj: any, fileName?: string, path?: string) => Promise<AWS.S3.ManagedUpload.SendData>;
+export declare const saveJsonToS3: (obj: any, fileName?: string, path?: string) => Promise<import("@aws-sdk/client-s3").CompleteMultipartUploadCommandOutput>;
 export declare const savePDFToS3: (pdf: any, fileName: string, path?: string) => Promise<string | undefined>;
 export {};

package/dist/libs/s3.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.savePDFToS3 = exports.saveJsonToS3 = exports.saveAllProductsToS3 = exports.saveCatalogToS3 = exports.getFileFromS3 = exports.upload = exports.listObjects = exports.init = exports.checkConfig = exports.s3 = exports.config = void 0;
+exports.savePDFToS3 = exports.saveJsonToS3 = exports.saveAllProductsToS3 = exports.saveCatalogToS3 = exports.getFileFromS3 = exports.upload = exports.listObjects = exports.init = exports.checkConfig = exports.s3Client = exports.config = void 0;
 const dotenv_1 = __importDefault(require("dotenv"));
 const axios_1 = __importDefault(require("@atoms-studio/axios"));
-const aws_sdk_1 = __importDefault(require("aws-sdk"));
+const client_s3_1 = require("@aws-sdk/client-s3");
+const lib_storage_1 = require("@aws-sdk/lib-storage");
 const utils_1 = require("../utils");
 const config_1 = require("../pim/config");
 const https_1 = __importDefault(require("https"));
@@ -33,12 +34,13 @@ const checkConfig = (skipInit = false) => {
     else if (!exports.config.bucket) {
         throw new Error(beforeMessage + "bucket not found. " + afterMessage);
     }
-    aws_sdk_1.default.config.update({
-        accessKeyId: exports.config.accessKeyId,
-        secretAccessKey: exports.config.secretAccessKey,
+    exports.s3Client = new client_s3_1.S3Client({
+        credentials: {
+            accessKeyId: exports.config.accessKeyId,
+            secretAccessKey: exports.config.secretAccessKey,
+        },
         region: exports.config.region,
     });
-    exports.s3 = new aws_sdk_1.default.S3();
 };
 exports.checkConfig = checkConfig;
 const init = (opts) => {
@@ -56,20 +58,18 @@ const init = (opts) => {
 exports.init = init;
 const listObjects = async (prefix = "") => {
     (0, exports.checkConfig)();
-    const params = {
+    const command = new client_s3_1.ListObjectsV2Command({
         Bucket: exports.config.bucket,
         Prefix: prefix || "",
-    };
-    return exports.s3
-        .listObjectsV2(params)
-        .promise()
-        .then((data) => {
+    });
+    try {
+        const data = await exports.s3Client.send(command);
         return data;
-    })
-        .catch((err) => {
+    }
+    catch (err) {
         console.log(err);
         throw new Error("Not exist folder exception is not catch here!");
-    });
+    }
 };
 exports.listObjects = listObjects;
 const upload = async (url, fileName = "", path = "", metaData = {}) => {
@@ -92,23 +92,24 @@ const upload = async (url, fileName = "", path = "", metaData = {}) => {
     if (!contentLength) {
         contentLength = Number(fileRes.data.byteLength);
     }
-    const obj = {
+    const uploadParams = {
         Bucket: exports.config.bucket,
         Key: `${path}${fileName}`,
         ContentType: fileRes.headers["content-type"],
-        ContentLength: contentLength,
         Body: fileRes.data,
         Metadata: metaData,
     };
-    return exports.s3
-        .upload(obj)
-        .promise()
-        .then((data) => {
+    try {
+        const upload = new lib_storage_1.Upload({
+            client: exports.s3Client,
+            params: uploadParams,
+        });
+        const data = await upload.done();
         return data;
-    })
-        .catch((err) => {
+    }
+    catch (err) {
         throw new Error(err);
-    });
+    }
 };
 exports.upload = upload;
 const getFileFromS3 = async (path, returnUrl = false) => {
@@ -175,26 +176,27 @@ const saveJsonToS3 = async (obj, fileName = "", path = "") => {
     if (path && path.substr(-1) !== "/") {
         path += "/";
     }
-    const data = {
+    const uploadParams = {
         Bucket: exports.config.bucket,
         Key: `${path}${fileName}`,
         ContentEncoding: "base64",
         ContentType: "application/json",
-        ContentLength: Number(buf.byteLength),
         Body: buf,
     };
-    return exports.s3
-        .upload(data)
-        .promise()
-        .then((res) => {
+    try {
+        const upload = new lib_storage_1.Upload({
+            client: exports.s3Client,
+            params: uploadParams,
+        });
+        const res = await upload.done();
         const timeEnd = new Date();
         const seconds = (0, utils_1.secondBetweenTwoDate)(timeStart, timeEnd);
         (0, logs_1.log)(`Request time: ${seconds} seconds - saveJsonToS3`);
         return res;
-    })
-        .catch((err) => {
+    }
+    catch (err) {
         throw new Error(err);
-    });
+    }
 };
 exports.saveJsonToS3 = saveJsonToS3;
 const savePDFToS3 = async (pdf, fileName, path = "") => {
@@ -205,17 +207,16 @@ const savePDFToS3 = async (pdf, fileName, path = "") => {
     if (path && path.substr(-1) !== "/") {
         path += "/";
     }
-    const s3Params = {
+    const command = new client_s3_1.PutObjectCommand({
         Bucket: exports.config.bucket,
         Key: `${path}${fileName}`,
         Body: pdf,
         ContentType: "application/pdf",
         ServerSideEncryption: "AES256",
-    };
+    });
     let url;
     try {
-        exports.s3.getBucketWebsite();
-        await exports.s3.putObject(s3Params).promise();
+        await exports.s3Client.send(command);
         url = `https://${exports.config.bucket}.s3.${exports.config.region}.amazonaws.com/${path}${fileName}`;
     }
     catch (err) {

package/dist/pim/methods/products.js

@@ -430,7 +430,7 @@ const getProductAssets = async (pimAssets, productCode) => {
                     (0, logs_1.log)(`Asset not exists, importing it to S3 path: ${path}/${fileName}`);
                     try {
                         const res = await (0, s3_1.upload)(pimAsset.url, fileName, path);
-                        assetUrl = res.Location;
+                        assetUrl = res.Location || "";
                     }
                     catch (err) {
                         (0, logs_1.log)(`Unable to upload file: ${err.response.status} - ${err.response.statusText}`, "WARN");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pim-import",
-  "version": "5.0.2",
+  "version": "5.1.0",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -36,8 +36,9 @@
     "@atoms-studio/axios": "^0.26.1",
     "@sentry/node": "^6.10.0",
     "@sentry/tracing": "^6.10.0",
+    "@aws-sdk/client-s3": "^3.600.0",
+    "@aws-sdk/lib-storage": "^3.600.0",
     "algoliasearch": "^4.10.3",
-    "aws-sdk": "^2.895.0",
     "contentful": "^10.5.0",
     "contentful-management": "^10.40.0",
     "csv-parser": "^3.0.0",