closer-cli 2.33.0 → 2.37.0

package/.eslintrc.json

@@ -0,0 +1,15 @@
+{
+  "rules": {
+    "semi": "off",
+    "comma-dangle": "off",
+    "arrow-parens": "off",
+    "no-use-before-define": "off",
+    "object-curly-newline": "off",
+    "import/prefer-default-export": "off",
+    "operator-linebreak": "off",
+    "import/extensions": "off"
+  },
+  "parserOptions": {
+    "ecmaVersion": 2020
+  }
+}

package/CHANGELOG.md

@@ -3,6 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.37.0](https://code.hfarm.dev/closer/closer/compare/v2.36.1...v2.37.0) (2022-11-14)
+
+
+### Bug Fixes
+
+* **PJX-621:** Fine tuning report mail ([719ce9c](https://code.hfarm.dev/closer/closer/commits/719ce9cf5f6e78db4deeb452a0974ed4877c07dc))
+
+
+
+
+
+## [2.36.1](https://code.hfarm.dev/closer/closer/compare/v2.36.0...v2.36.1) (2022-11-09)
+
+
+### Bug Fixes
+
+* **PJX-619:** Import: link csv file inviati via mail non corrispondono ([af27d64](https://code.hfarm.dev/closer/closer/commits/af27d64b49145014d46afce1786ba72a3c78ebe3))
+
+
+
+
+
+# [2.36.0](https://code.hfarm.dev/closer/closer/compare/v2.35.0...v2.36.0) (2022-11-09)
+
+
+### Features
+
+* **PJX-560:** AdminJS R&D ([dbfa216](https://code.hfarm.dev/closer/closer/commits/dbfa2165f4d05475c32b4e750bee205d77180643))
+
+
+
+
+
+# [2.35.0](https://code.hfarm.dev/closer/closer/compare/v2.34.0...v2.35.0) (2022-11-04)
+
+**Note:** Version bump only for package closer-cli
+
+
+
+
+
+# [2.34.0](https://code.hfarm.dev/closer/closer/compare/v2.33.2...v2.34.0) (2022-11-04)
+
+**Note:** Version bump only for package closer-cli
+
+
+
+
+
 # [2.33.0](https://code.hfarm.dev/closer/closer/compare/v2.32.3...v2.33.0) (2022-10-27)
 
 

package/cmds/importData.js

@@ -1,11 +1,13 @@
-const { ALLOWED_CSV_FILES } = require('../helpers')
+import { ALLOWED_CSV_FILES, getHumanTimestamp } from '../helpers.js'
+import * as ImportDataMultipleCmd from './importData_cmds/multiple.js'
+import * as ImportDataSingleCmd from './importData_cmds/single.js'
 
-exports.command = 'import:data <command>'
-exports.desc = 'Import CSV data to Closer'
+export const command = 'import:data <command>'
+export const desc = 'Import CSV data to Closer'
 
-exports.builder = yargs => {
+export function builder(yargs) {
   yargs
-    .commandDir('importData_cmds')
+    // .commandDir('importData_cmds')
     .option('type', {
       alias: 't',
       describe: 'CSV type to consider during import',
@@ -35,7 +37,25 @@ exports.builder = yargs => {
       type: 'string',
       default: ';'
     })
+    .option('n', {
+      alias: 'name',
+      describe: 'Define import process name',
+      type: 'string',
+      default: getHumanTimestamp(new Date())
+    })
     .implies('non-interactive', ['type', 'mode'])
+    .command(
+      ImportDataMultipleCmd.command,
+      ImportDataMultipleCmd.desc,
+      ImportDataMultipleCmd.builder,
+      ImportDataMultipleCmd.handler
+    )
+    .command(
+      ImportDataSingleCmd.command,
+      ImportDataSingleCmd.desc,
+      ImportDataSingleCmd.builder,
+      ImportDataSingleCmd.handler
+    )
 }
 
-exports.handler = () => {}
+export function handler() {}

package/cmds/importData_cmds/multiple.js

@@ -1,13 +1,16 @@
 /* eslint-disable no-console */
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
-const fs = require('fs')
-const path = require('path')
-const chalk = require('chalk')
-const prompts = require('prompts')
-const Ora = require('ora')
-
-const {
+import { accessSync, constants, existsSync, mkdirSync } from 'fs'
+import path from 'path'
+import chalk from 'chalk'
+import prompts from 'prompts'
+import Ora from 'ora'
+import move from 'mv'
+import { promisify } from 'util'
+import { deleteAsync } from 'del'
+
+import {
   getCsvFilesFromDir,
   ALLOWED_CSV_FILES,
   getGoogleSheetCsvUrl,
@@ -19,18 +22,20 @@ const {
   callAfterDataImportProcess,
   getExecutionTime,
   getArchiveFolder,
-  renameWithTimestamp,
   sendImportErrorMail,
-  deleteRowsBeforeImportDate
-} = require('../../helpers')
+  deleteRowsBeforeImportDate,
+  readImportDir
+} from '../../helpers.js'
+
+const mv = promisify(move)
 
-exports.command = 'multiple [options]'
+export const command = 'multiple [options]'
 
-exports.desc = 'Import different CSV files'
+export const desc = 'Import different CSV files'
 
-exports.builder = yargs => {
+export function builder(yargs) {
   yargs
-    .usage(`Usage: ${chalk.cyan('$0 import multiple')} [options]`)
+    .usage(`Usage: ${chalk.cyan('$0 import:data multiple')} [options]`)
     .option('fromDir', {
       alias: 'd',
       describe: 'Directory path that contains files to import',
@@ -48,18 +53,20 @@ exports.builder = yargs => {
       }
 
       if (argv.fromDir) {
-        fs.accessSync(argv.fromDir, fs.constants.F_OK)
+        accessSync(argv.fromDir, constants.F_OK)
       }
 
       return true
     })
 }
 
-exports.handler = async argv => {
+export async function handler(argv) {
   // eslint-disable-next-line no-param-reassign
   argv.out = argv.out || getArchiveFolder(argv.endpoint)
 
+  const spinner = new Ora()
   const hrstart = process.hrtime()
+
   const importProcess = {
     importProcessStart: new Date(),
     importProcessEnd: null,
@@ -71,8 +78,17 @@ exports.handler = async argv => {
     result: []
   }
 
+  const dirPathTemp = path.resolve(argv.out, `${importProcess.name}_temp`)
+  const dirPathFinal = path.resolve(argv.out, importProcess.name)
+  const dirPathOriginal = path.resolve(dirPathTemp, '_original')
+
   const interactive = !argv.nonInteractive
 
+  const ws = {
+    endpoint: argv.endpoint,
+    secret: argv.secret
+  }
+
   let csvChoices = []
 
   if (argv.fromDir) {
@@ -157,27 +173,39 @@ exports.handler = async argv => {
 
   importProcess.mode = mode
 
-  const spinner = new Ora()
-
   const validations = []
   const csvReports = []
 
-  const ws = {
-    endpoint: argv.endpoint,
-    adminSecret: argv['admin-secret']
-  }
-
   let parsedFiles = [...files]
 
+  if (!existsSync(dirPathFinal) && !existsSync(dirPathOriginal)) {
+    mkdirSync(dirPathOriginal, { recursive: true })
+  } else {
+    console.log('')
+    console.log(`ERROR => directory "${dirPathFinal}" already exists, change the import name.`)
+    process.exit(1)
+  }
+
   if (argv.fromGoogleDocId) {
     parsedFiles = []
     console.log('')
     spinner.start('Downloading Google sheets...')
     for (const item of files) {
-      const filepath = await download(item.url, argv.out, `${item.csvType}.csv`)
+      const filepath = await download(
+        item.url,
+        dirPathOriginal,
+        `${importProcess.name}_${item.csvType}.csv`
+      )
       parsedFiles.push({ file: filepath, csvType: item.csvType })
     }
     spinner.succeed('Google sheets downloaded')
+  } else {
+    for (const file of files) {
+      parsedFiles = []
+      const dst = path.resolve(dirPathOriginal, `${importProcess.name}_${file.csvType}.csv`)
+      await mv(file.file, dst)
+      parsedFiles.push({ file: dst, csvType: file.csvType })
+    }
   }
 
   //
@@ -242,7 +270,7 @@ exports.handler = async argv => {
     const csvReport = await importCsvFromFile({
       file: item.file,
       csvType: item.csvType,
-      outputDir: argv.out,
+      outputDir: dirPathTemp,
       spinner,
       ws,
       delimiter: argv.csvDelimiter,
@@ -268,7 +296,7 @@ exports.handler = async argv => {
   }
 
   //
-  // Refresh Orders of type Draft
+  // Refresh Orders of type Draft, Template
   //
   // eslint-disable-next-line no-unused-vars
   const refreshedOrders = await refreshOrders(spinner, ws, importProcess)
@@ -298,7 +326,18 @@ exports.handler = async argv => {
 
   await callAfterDataImportProcess(spinner, ws, importProcess)
 
-  await renameWithTimestamp(argv.out)
+  await deleteAsync(path.resolve(dirPathTemp, '_processing'))
+
+  const reportFiles = await readImportDir(dirPathTemp)
+
+  for (const reportFile of reportFiles) {
+    const { filename, size } = reportFile
+    if ((filename.includes('skipped') || filename.includes('errors')) && size === 0) {
+      await deleteAsync(path.resolve(dirPathTemp, filename))
+    }
+  }
+
+  await mv(dirPathTemp, dirPathFinal)
 
   process.exit()
 }

package/cmds/importData_cmds/single.js

@@ -1,31 +1,39 @@
-/* eslint-disable no-restricted-syntax */
 /* eslint-disable no-console */
-const fs = require('fs')
-const chalk = require('chalk')
-
-const Ora = require('ora')
-const prompts = require('prompts')
-const {
+/* eslint-disable no-await-in-loop */
+/* eslint-disable no-restricted-syntax */
+import { accessSync, constants, existsSync, mkdirSync } from 'fs'
+import path from 'path'
+import chalk from 'chalk'
+import prompts from 'prompts'
+import Ora from 'ora'
+import move from 'mv'
+import { promisify } from 'util'
+import { deleteAsync } from 'del'
+
+import {
+  ALLOWED_CSV_FILES,
   importCsvFromFile,
-  getExecutionTime,
+  validateCsvFromFile,
   refreshOrders,
-  callAfterDataImportProcess,
-  callBeforeDataImportProcess,
-  ALLOWED_CSV_FILES,
   download,
-  validateCsvFromFile,
+  callBeforeDataImportProcess,
+  callAfterDataImportProcess,
+  getExecutionTime,
   getArchiveFolder,
-  renameWithTimestamp,
-  sendImportErrorMail
-} = require('../../helpers')
+  sendImportErrorMail,
+  deleteRowsBeforeImportDate,
+  readImportDir
+} from '../../helpers.js'
+
+const mv = promisify(move)
 
-exports.command = 'single [options]'
+export const command = 'single [options]'
 
-exports.desc = 'Import only one CSV file'
+export const desc = 'Import only one CSV file'
 
-exports.builder = yargs => {
+export function builder(yargs) {
   yargs
-    .usage(`Usage: ${chalk.cyan('$0 import single')} [options]`)
+    .usage(`Usage: ${chalk.cyan('$0 import:data single')} [options]`)
     .option('fromFile', {
       alias: 'f',
       describe: 'File to import',
@@ -43,14 +51,14 @@ exports.builder = yargs => {
       }
 
       if (argv.fromFile) {
-        fs.accessSync(argv.fromFile, fs.constants.F_OK)
+        accessSync(argv.fromFile, constants.F_OK)
       }
 
       return true
     })
 }
 
-exports.handler = async argv => {
+export async function handler(argv) {
   // eslint-disable-next-line no-param-reassign
   argv.out = argv.out || getArchiveFolder(argv.endpoint)
 
@@ -68,13 +76,17 @@ exports.handler = async argv => {
     result: []
   }
 
+  const dirPathTemp = path.resolve(argv.out, `${importProcess.name}_temp`)
+  const dirPathFinal = path.resolve(argv.out, importProcess.name)
+  const dirPathOriginal = path.resolve(dirPathTemp, '_original')
+
+  const interactive = !argv.nonInteractive
+
   const ws = {
     endpoint: argv.endpoint,
-    adminSecret: argv['admin-secret']
+    secret: argv.secret
   }
 
-  const interactive = !argv.nonInteractive
-
   let type
   if (interactive && !argv.type) {
     const answers = await prompts(
@@ -99,6 +111,8 @@ exports.handler = async argv => {
     type = argv.type[0]
   }
 
+  importProcess.type = [type]
+
   let mode
   if (interactive && !argv.mode) {
     const answers = await prompts(
@@ -129,6 +143,16 @@ exports.handler = async argv => {
     mode = argv.mode
   }
 
+  importProcess.mode = mode
+
+  if (!existsSync(dirPathFinal) && !existsSync(dirPathOriginal)) {
+    mkdirSync(dirPathOriginal, { recursive: true })
+  } else {
+    console.log('')
+    console.log(`ERROR => directory "${dirPathFinal}" already exists, change the import name.`)
+    process.exit(1)
+  }
+
   if (interactive) {
     console.log('')
     const { confirmed } = await prompts(
@@ -150,16 +174,19 @@ exports.handler = async argv => {
     console.log('')
   }
 
-  let csvReport
-
-  let filepath = argv.fromFile
+  let filepath = null
 
   if (argv.fromUrl) {
     spinner.start('Downloading file...')
-    filepath = await download(argv.fromUrl, argv.out, `${type}.csv`)
+    filepath = await download(argv.fromUrl, dirPathOriginal, `${importProcess.name}_${type}.csv`)
     spinner.succeed('Downloaded file')
   }
 
+  if (argv.fromFile) {
+    filepath = path.resolve(dirPathOriginal, `${importProcess.name}_${type}.csv`)
+    await mv(argv.fromFile, filepath)
+  }
+
   const validation = await validateCsvFromFile(filepath, type, ws, argv.csvDelimiter, importProcess)
 
   if (validation.error) {
@@ -167,9 +194,6 @@ exports.handler = async argv => {
     process.exit(1)
   }
 
-  importProcess.mode = mode
-  importProcess.type = [type]
-
   //
   // Call ImportService.beforeImportProcess (import flag)
   //
@@ -181,25 +205,44 @@ exports.handler = async argv => {
     }
   }
 
-  if (argv.fromFile) {
-    csvReport = await importCsvFromFile({
-      file: argv.fromFile,
-      csvType: type,
-      outputDir: argv.out,
+  const partitionsForCsvType = new Map()
+
+  const csvReport = await importCsvFromFile({
+    file: filepath,
+    csvType: type,
+    outputDir: dirPathTemp,
+    spinner,
+    ws,
+    delimiter: argv.csvDelimiter,
+    importProcess
+  })
+
+  if (csvReport.countFailed > 0 || csvReport.countSkipped > 0) {
+    sendImportErrorMail(ws, importProcess, csvReport)
+  }
+
+  partitionsForCsvType.set(csvReport.csvType, Array.from(csvReport.partitions))
+
+  //
+  // Import FULL?
+  //
+  if (mode === 'full') {
+    await deleteRowsBeforeImportDate(
+      importProcess,
+      Object.fromEntries(partitionsForCsvType),
       spinner,
-      ws,
-      delimiter: argv.csvDelimiter,
-      importProcess
-    })
-    if (csvReport.countFailed > 0 || csvReport.countSkipped > 0) {
-      sendImportErrorMail(ws, importProcess, csvReport)
-    }
+      ws
+    )
   }
 
+  //
+  // Refresh Orders of type Draft, Template
+  //
+
   const refreshedOrders = await refreshOrders(spinner, ws, importProcess)
 
   //
-  // Report
+  // importProcess
   //
 
   importProcess.importProcessEnd = new Date()
@@ -221,7 +264,18 @@ exports.handler = async argv => {
 
   await callAfterDataImportProcess(spinner, ws, importProcess)
 
-  await renameWithTimestamp(argv.out)
+  await deleteAsync(path.resolve(dirPathTemp, '_processing'))
+
+  const reportFiles = await readImportDir(dirPathTemp)
+
+  for (const reportFile of reportFiles) {
+    const { filename, size } = reportFile
+    if ((filename.includes('skipped') || filename.includes('errors')) && size === 0) {
+      await deleteAsync(path.resolve(dirPathTemp, filename))
+    }
+  }
+
+  await mv(dirPathTemp, dirPathFinal)
 
   process.exit()
 }

package/cmds/importMedia.js

@@ -1,16 +1,16 @@
-const chalk = require('chalk')
-const Ora = require('ora')
-const {
+import chalk from 'chalk'
+import Ora from 'ora'
+import {
   importMedia,
   flushMedia,
   getExecutionTime,
   callAfterMediaImportProcess
-} = require('../helpers')
+} from '../helpers.js'
 
-exports.command = 'import:media'
-exports.desc = 'Import media (images, 360, videos) to Closer'
+export const command = 'import:media'
+export const desc = 'Import media (images, 360, videos) to Closer'
 
-exports.builder = yargs => {
+export function builder(yargs) {
   yargs
     .usage(`Usage: ${chalk.cyan('$0 import:media')} [options]`)
 
@@ -25,7 +25,7 @@ exports.builder = yargs => {
     })
 }
 
-exports.handler = async argv => {
+export async function handler(argv) {
   const spinner = new Ora()
   const hrstart = process.hrtime()
 
@@ -41,11 +41,15 @@ exports.handler = async argv => {
 
   const ws = {
     endpoint: argv.endpoint,
-    adminSecret: argv['admin-secret']
+    secret: argv.secret
   }
 
   if (argv.flush) {
-    await flushMedia(spinner, ws)
+    try {
+      await flushMedia(spinner, ws)
+    } catch (e) {
+      process.exit(1)
+    }
   }
 
   const result = await importMedia(argv.reprocess, spinner, ws)

package/helpers.js

@@ -1,27 +1,40 @@
 /* eslint-disable no-console */
 /* eslint-disable no-param-reassign */
 /* eslint-disable implicit-arrow-linebreak */
-const fs = require('fs')
-const path = require('path')
-const WebSocket = require('ws')
-const chalk = require('chalk')
-const es = require('event-stream')
-const { parse } = require('csv-parse/sync')
-const { stringify } = require('csv-stringify/sync')
-const got = require('got')
-const { createWriteStream } = require('fs')
-const slugify = require('slugify')
-
-exports.createSocketConnection = (endpoint, adminSecret) => {
+import {
+  readdirSync,
+  existsSync,
+  mkdirSync,
+  copyFileSync,
+  createWriteStream,
+  createReadStream,
+  rename,
+  statSync
+} from 'fs'
+import path from 'path'
+import WebSocket from 'ws'
+import chalk from 'chalk'
+import { parse } from 'csv-parse/sync'
+import { stringify } from 'csv-stringify/sync'
+import got from 'got'
+import slugify from 'slugify'
+import { deleteAsync } from 'del'
+import eventStream from 'event-stream'
+
+const { split, mapSync } = eventStream
+const { stream } = got
+
+export function createSocketConnection(endpoint, secret) {
   const protocol = endpoint.includes('localhost') || endpoint.includes('127.0.0.1') ? 'ws' : 'wss'
-  const socket = new WebSocket(`${protocol}://${endpoint}/import`, {
-    headers: { 'x-closer-admin-secret': adminSecret }
+  const url = `${protocol}://${endpoint}/import`
+  const socket = new WebSocket(url, {
+    headers: { 'x-closer-secret': secret }
   })
 
   return socket
 }
 
-exports.ALLOWED_CSV_FILES = {
+export const ALLOWED_CSV_FILES = {
   product: 'products.csv',
   localizedProduct: 'localizedProducts.csv',
   localizedFilter: 'localizedFilters.csv',
@@ -40,15 +53,15 @@ exports.ALLOWED_CSV_FILES = {
   team: 'teams.csv'
 }
 
-const getCsvFilesFromDir = dir =>
-  fs.readdirSync(dir).filter(file => path.extname(file).toLowerCase() === '.csv')
-
-exports.getCsvFilesFromDir = getCsvFilesFromDir
+export function getCsvFilesFromDir(dir) {
+  return readdirSync(dir).filter(file => path.extname(file).toLowerCase() === '.csv')
+}
 
-exports.getGoogleSheetCsvUrl = (docId, sheet) =>
-  `https://docs.google.com/spreadsheets/d/${docId}/gviz/tq?tqx=out:csv&sheet=${sheet}`
+export function getGoogleSheetCsvUrl(docId, sheet) {
+  return `https://docs.google.com/spreadsheets/d/${docId}/gviz/tq?tqx=out:csv&sheet=${sheet}`
+}
 
-exports.importCsvFromFile = ({
+export function importCsvFromFile({
   file,
   csvType,
   outputDir,
@@ -56,27 +69,31 @@ exports.importCsvFromFile = ({
   ws,
   delimiter = ';',
   importProcess
-}) =>
-  new Promise(resolve => {
-    const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
+}) {
+  return new Promise(resolve => {
+    const socket = createSocketConnection(ws.endpoint, ws.secret)
 
     const hrstart = process.hrtime()
     const importFileStart = new Date()
 
     let readStream = null
 
-    if (!fs.existsSync(outputDir)) {
-      fs.mkdirSync(outputDir, { recursive: true })
+    const dirPathProcessing = path.resolve(outputDir, '_processing')
+
+    if (!existsSync(dirPathProcessing)) {
+      mkdirSync(dirPathProcessing, { recursive: true })
     }
 
     const filename = path.basename(file)
-    fs.copyFileSync(file, path.resolve(outputDir, filename))
+    const filepath = path.resolve(dirPathProcessing, filename)
 
-    const errorCsvFile = path.resolve(outputDir, `${csvType}_errors.csv`)
-    const errorFileStream = fs.createWriteStream(errorCsvFile)
+    copyFileSync(file, filepath)
 
-    const skippedCsvFile = path.resolve(outputDir, `${csvType}_skipped.csv`)
-    const skippedFileStream = fs.createWriteStream(skippedCsvFile)
+    const errorCsvFile = path.resolve(outputDir, `${importProcess.name}_${csvType}_errors.csv`)
+    const errorFileStream = createWriteStream(errorCsvFile)
+
+    const skippedCsvFile = path.resolve(outputDir, `${importProcess.name}_${csvType}_skipped.csv`)
+    const skippedFileStream = createWriteStream(skippedCsvFile)
 
     let header = ''
     let lineNumber = 0
@@ -92,14 +109,14 @@ exports.importCsvFromFile = ({
 
       countImported += 1
 
-      spinner.text = this.printImportProcessResult({
+      spinner.text = printImportProcessResult({
         csvType,
         countImported,
         countFailed,
         countSkipped,
         importFileStart,
         importFileEnd: new Date(),
-        executionTime: this.getExecutionTime(hrstart),
+        executionTime: getExecutionTime(hrstart),
         name: filename
       })
 
@@ -111,14 +128,14 @@ exports.importCsvFromFile = ({
 
       countFailed += 1
 
-      spinner.text = this.printImportProcessResult({
+      spinner.text = printImportProcessResult({
         csvType,
         countImported,
         countFailed,
         countSkipped,
         importFileStart,
         importFileEnd: new Date(),
-        executionTime: this.getExecutionTime(hrstart),
+        executionTime: getExecutionTime(hrstart),
         name: filename
       })
 
@@ -137,14 +154,14 @@ exports.importCsvFromFile = ({
       partitions.add(csvRow.Partition || '')
 
       spinner.fail(
-        this.printImportProcessResult({
+        printImportProcessResult({
           csvType,
           countImported,
           countFailed,
           countSkipped,
           importFileStart,
           importFileEnd: new Date(),
-          executionTime: this.getExecutionTime(hrstart),
+          executionTime: getExecutionTime(hrstart),
           name: filename,
           fatalError: errorMessage
         })
@@ -155,7 +172,7 @@ exports.importCsvFromFile = ({
         countImported,
         countFailed,
         countSkipped,
-        executionTime: this.getExecutionTime(hrstart),
+        executionTime: getExecutionTime(hrstart),
         importFileStart,
         importFileEnd: new Date(),
         inputFile: file,
@@ -178,6 +195,8 @@ exports.importCsvFromFile = ({
       errorFileStream.end()
       skippedFileStream.end()
 
+      deleteAsync(filepath)
+
       resolve({
         csvType,
         countImported,
@@ -185,18 +204,17 @@ exports.importCsvFromFile = ({
         countSkipped,
         importFileStart,
         importFileEnd: new Date(),
-        executionTime: this.getExecutionTime(hrstart),
+        executionTime: getExecutionTime(hrstart),
         inputFile: file,
         partitions
       })
     }
 
     socket.on('open', () => {
-      readStream = fs
-        .createReadStream(file)
-        .pipe(es.split())
+      readStream = createReadStream(file)
+        .pipe(split())
         .pipe(
-          es.mapSync(line => {
+          mapSync(line => {
             readStream.pause()
 
             if (lineNumber === 0) {
@@ -261,9 +279,10 @@ exports.importCsvFromFile = ({
       importFatal(e.message)
     })
   })
+}
 
-exports.sendImportErrorMail = (ws, importProcess, csvReport) => {
-  const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
+export function sendImportErrorMail(ws, importProcess, csvReport) {
+  const socket = createSocketConnection(ws.endpoint, ws.secret)
 
   socket.on('open', () => {
     socket.send(
@@ -275,9 +294,9 @@ exports.sendImportErrorMail = (ws, importProcess, csvReport) => {
   })
 }
 
-exports.validateCsvFromFile = (file, csvType, ws, delimiter = ';', importProcess) =>
-  new Promise(resolve => {
-    const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
+export function validateCsvFromFile(file, csvType, ws, delimiter, importProcess) {
+  return new Promise(resolve => {
+    const socket = createSocketConnection(ws.endpoint, ws.secret)
     const hrstart = process.hrtime()
 
     let readStream = null
@@ -287,11 +306,10 @@ exports.validateCsvFromFile = (file, csvType, ws, delimiter = ';', importProcess
     const filename = path.basename(file)
 
     socket.on('open', () => {
-      readStream = fs
-        .createReadStream(file)
-        .pipe(es.split())
+      readStream = createReadStream(file)
+        .pipe(split())
         .pipe(
-          es.mapSync(line => {
+          mapSync(line => {
             readStream.pause()
 
             if (lineNumber === 0) {
@@ -303,7 +321,7 @@ exports.validateCsvFromFile = (file, csvType, ws, delimiter = ';', importProcess
               if (line === '') {
                 resolve({
                   csvType,
-                  executionTime: this.getExecutionTime(hrstart),
+                  executionTime: getExecutionTime(hrstart),
                   inputFile: filename
                 })
               } else {
@@ -335,7 +353,7 @@ exports.validateCsvFromFile = (file, csvType, ws, delimiter = ';', importProcess
         .on('error', e => {
           resolve({
             csvType,
-            executionTime: this.getExecutionTime(hrstart),
+            executionTime: getExecutionTime(hrstart),
             inputFile: filename,
             error: e.message
           })
@@ -348,7 +366,7 @@ exports.validateCsvFromFile = (file, csvType, ws, delimiter = ';', importProcess
         case 'validateCsvHeaderResponse': {
           const result = {
             csvType,
-            executionTime: this.getExecutionTime(hrstart),
+            executionTime: getExecutionTime(hrstart),
             inputFile: filename
           }
 
@@ -367,38 +385,32 @@ exports.validateCsvFromFile = (file, csvType, ws, delimiter = ';', importProcess
     socket.on('error', e => {
       resolve({
         csvType,
-        executionTime: this.getExecutionTime(hrstart),
+        executionTime: getExecutionTime(hrstart),
         inputFile: file,
         error: e.message
       })
     })
   })
-
-exports.importCsvFromUrl = async (url, csvType, outputDir, importProcess, spinner, ws) => {
-  spinner.start('Downloading file...')
-  const file = await this.download(url, outputDir, `${csvType}.csv`)
-  spinner.succeed('Downloaded file')
-  return this.importCsvFromFile({ file, csvType, outputDir, spinner, ws, importProcess })
 }
 
-exports.getExecutionTime = importProcessStart => {
+export function getExecutionTime(importProcessStart) {
   const hrend = process.hrtime(importProcessStart)
   return ((hrend[0] * 1e9 + hrend[1]) / 1e9).toFixed(1)
 }
 
-exports.printValidationProcessHeader = () => {
+export function printValidationProcessHeader() {
   console.log('\n=== Validation Process Result ===\n')
 }
 
-exports.printImportProcessHeader = () => {
+export function printImportProcessHeader() {
   console.log('\n=== Import Process Result ===\n')
 }
 
-exports.printValidationProcessResult = ({
+export function printValidationProcessResult({
   inputFile,
   error
   // eslint-disable-next-line consistent-return
-}) => {
+}) {
   let message = ''
   const filename = path.basename(inputFile)
 
@@ -411,7 +423,7 @@ exports.printValidationProcessResult = ({
   console.log(message)
 }
 
-exports.printImportProcessResult = ({
+export function printImportProcessResult({
   countImported,
   countFailed,
   countSkipped,
@@ -419,7 +431,7 @@ exports.printImportProcessResult = ({
   name,
   fatalError
   // eslint-disable-next-line consistent-return
-}) => {
+}) {
   let message = ''
 
   if (fatalError) {
@@ -427,19 +439,19 @@ exports.printImportProcessResult = ({
     return message
   }
 
-  message = `[${this.colorByResult(
+  message = `[${colorByResult(
     name,
     countImported,
     countFailed,
     countSkipped
-  )}] imported ${this.colorGreaterThanZero(countImported, 'green')} items`
+  )}] imported ${colorGreaterThanZero(countImported, 'green')} items`
 
   if (countFailed) {
-    message += `, failed ${this.colorGreaterThanZero(countFailed, 'red')} items`
+    message += `, failed ${colorGreaterThanZero(countFailed, 'red')} items`
   }
 
   if (countSkipped) {
-    message += `, skipped ${this.colorGreaterThanZero(countSkipped, 'red')} items`
+    message += `, skipped ${colorGreaterThanZero(countSkipped, 'red')} items`
   }
 
   message += ` ${chalk.gray(`[${executionTime}s]`)}`
@@ -447,7 +459,7 @@ exports.printImportProcessResult = ({
   return message
 }
 
-exports.colorByResult = (value, countImported, countFailed, countSkipped) => {
+export function colorByResult(value, countImported, countFailed, countSkipped) {
   let color = 'green'
 
   if (countImported > 0 && (countFailed > 0 || countSkipped > 0)) {
@@ -461,7 +473,7 @@ exports.colorByResult = (value, countImported, countFailed, countSkipped) => {
   return chalk[color](value)
 }
 
-exports.colorGreaterThanZero = (value, color) => {
+export function colorGreaterThanZero(value, color) {
   if (value > 0) {
     return chalk[color](value)
   }
@@ -469,11 +481,11 @@ exports.colorGreaterThanZero = (value, color) => {
   return value
 }
 
-exports.refreshOrders = (spinner, ws, importProcess) =>
-  new Promise(resolve => {
+export function refreshOrders(spinner, ws, importProcess) {
+  return new Promise(resolve => {
     const hrstart = process.hrtime()
 
-    const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
+    const socket = createSocketConnection(ws.endpoint, ws.secret)
 
     spinner.start('Refreshing orders (draft, template)...')
 
@@ -485,9 +497,9 @@ exports.refreshOrders = (spinner, ws, importProcess) =>
       const { type, payload } = JSON.parse(packet)
       switch (type) {
         case 'refreshOrdersResponse': {
-          spinner.text = this.printRefreshedOrders({
+          spinner.text = printRefreshedOrders({
             ...payload,
-            executionTime: this.getExecutionTime(hrstart)
+            executionTime: getExecutionTime(hrstart)
           })
           spinner.succeed()
           resolve({
@@ -495,7 +507,7 @@ exports.refreshOrders = (spinner, ws, importProcess) =>
             refreshed: payload.refreshed,
             errored: payload.errored,
             name: importProcess.name,
-            executionTime: this.getExecutionTime(hrstart)
+            executionTime: getExecutionTime(hrstart)
           })
           break
         }
@@ -508,13 +520,14 @@ exports.refreshOrders = (spinner, ws, importProcess) =>
       resolve({ error: e.message })
     })
   })
+}
 
 // eslint-disable-next-line consistent-return
-exports.printRefreshedOrders = ({ refreshed, errored, executionTime }) => {
+export function printRefreshedOrders({ refreshed, errored, executionTime }) {
   let message = ''
 
-  const stringRefreshed = this.colorGreaterThanZero(refreshed.length, 'green')
-  const stringErrored = this.colorGreaterThanZero(errored.length, 'red')
+  const stringRefreshed = colorGreaterThanZero(refreshed.length, 'green')
+  const stringErrored = colorGreaterThanZero(errored.length, 'red')
 
   message += `Refreshed ${stringRefreshed} orders (draft, template)`
 
@@ -527,9 +540,9 @@ exports.printRefreshedOrders = ({ refreshed, errored, executionTime }) => {
   return message
 }
 
-exports.deleteRowsBeforeImportDate = (importProcess, partitionsForCsvType, spinner, ws) =>
-  new Promise(resolve => {
-    const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
+export function deleteRowsBeforeImportDate(importProcess, partitionsForCsvType, spinner, ws) {
+  return new Promise(resolve => {
+    const socket = createSocketConnection(ws.endpoint, ws.secret)
 
     spinner.start('Deleting old database records for chosen partitions...')
 
@@ -559,17 +572,18 @@ exports.deleteRowsBeforeImportDate = (importProcess, partitionsForCsvType, spinn
       resolve({ error: e.message })
     })
   })
+}
 
-exports.download = async (url, destPath, fileName) =>
-  new Promise((resolve, reject) => {
+export async function download(url, destPath, fileName) {
+  return new Promise((resolve, reject) => {
     const filePath = path.resolve(destPath, fileName)
 
     const dirname = path.dirname(filePath)
-    if (!fs.existsSync(dirname)) {
-      fs.mkdirSync(dirname, { recursive: true })
+    if (!existsSync(dirname)) {
+      mkdirSync(dirname, { recursive: true })
     }
 
-    const downloadStream = got.stream(url)
+    const downloadStream = stream(url)
     const fileWriterStream = createWriteStream(filePath)
 
     downloadStream
@@ -585,10 +599,11 @@ exports.download = async (url, destPath, fileName) =>
 
     downloadStream.pipe(fileWriterStream)
   })
+}
 
-exports.callBeforeDataImportProcess = (spinner, ws, importProcess) =>
-  new Promise((resolve, reject) => {
-    const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
+export function callBeforeDataImportProcess(spinner, ws, importProcess) {
+  return new Promise((resolve, reject) => {
+    const socket = createSocketConnection(ws.endpoint, ws.secret)
 
     spinner.start('Executing tasks before start...')
 
@@ -620,10 +635,11 @@ exports.callBeforeDataImportProcess = (spinner, ws, importProcess) =>
       resolve({ error: e.message })
     })
   })
+}
 
-exports.callAfterDataImportProcess = (spinner, ws, importProcess) =>
-  new Promise(resolve => {
-    const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
+export function callAfterDataImportProcess(spinner, ws, importProcess) {
+  return new Promise(resolve => {
+    const socket = createSocketConnection(ws.endpoint, ws.secret)
 
     spinner.start('Executing tasks after the end process...')
 
@@ -650,10 +666,11 @@ exports.callAfterDataImportProcess = (spinner, ws, importProcess) =>
       resolve({ error: e.message })
     })
   })
+}
 
-exports.callAfterMediaImportProcess = (spinner, ws, report) =>
-  new Promise(resolve => {
-    const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
+export function callAfterMediaImportProcess(spinner, ws, report) {
+  return new Promise(resolve => {
+    const socket = createSocketConnection(ws.endpoint, ws.secret)
 
     spinner.start('Executing tasks after the end process...')
 
@@ -678,11 +695,12 @@ exports.callAfterMediaImportProcess = (spinner, ws, report) =>
       resolve({ error: e.message })
     })
   })
+}
 
-exports.importMedia = (reprocess, spinner, ws) =>
-  new Promise(resolve => {
+export function importMedia(reprocess, spinner, ws) {
+  return new Promise(resolve => {
     const hrstart = process.hrtime()
-    const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
+    const socket = createSocketConnection(ws.endpoint, ws.secret)
 
     let countAssetImported = 0
     let countAssetSkipped = 0
@@ -690,11 +708,11 @@ exports.importMedia = (reprocess, spinner, ws) =>
     let countProductAssetImported = 0
 
     const updateSpinnerText = () => {
-      spinner.text = this.printImportProcessResult({
+      spinner.text = printImportProcessResult({
         countImported: countAssetImported,
         countSkipped: countAssetSkipped,
         countFailed: countAssetFailed,
-        executionTime: this.getExecutionTime(hrstart),
+        executionTime: getExecutionTime(hrstart),
         name: 'Asset'
       })
     }
@@ -729,10 +747,10 @@ exports.importMedia = (reprocess, spinner, ws) =>
           break
         case 'import.images.productAssets.end':
           spinner.succeed(
-            this.printImportProcessResult({
+            printImportProcessResult({
               countImported: payload.count,
               countFailed: 0,
-              executionTime: this.getExecutionTime(hrstart),
+              executionTime: getExecutionTime(hrstart),
               name: 'ProductAsset'
             })
           )
@@ -754,10 +772,11 @@ exports.importMedia = (reprocess, spinner, ws) =>
       resolve({ error: e.message })
     })
   })
+}
 
-exports.flushMedia = (spinner, ws) =>
-  new Promise(resolve => {
-    const socket = this.createSocketConnection(ws.endpoint, ws.adminSecret)
+export function flushMedia(spinner, ws) {
+  return new Promise((resolve, reject) => {
+    const socket = createSocketConnection(ws.endpoint, ws.secret)
 
     spinner.start('Flushing... ')
 
@@ -779,18 +798,22 @@ exports.flushMedia = (spinner, ws) =>
     })
 
     socket.on('error', e => {
-      resolve({ error: e.message })
+      spinner.fail(e.message)
+      reject(e)
     })
   })
+}
 
-exports.getArchiveFolder = instanceEndpoint => {
+export function getArchiveFolder(instanceEndpoint) {
   const prefix = 'closer'
-  const instance = slugify(instanceEndpoint.split('/')[0], { lower: true })
-  const ts = getTimestampForFilename()
-  return `${prefix}_${instance}/${ts}`
+  const instance = slugify(instanceEndpoint.split('/')[0], {
+    lower: true,
+    remove: /[*+~.()'"!:@]/g
+  })
+  return `${prefix}_${instance}`
 }
 
-exports.renameWithTimestamp = dirPath => {
+export function renameWithTimestamp(dirPath) {
   const ts = getTimestampForFilename()
 
   const files = getCsvFilesFromDir(dirPath).map(filename => {
@@ -803,7 +826,7 @@ exports.renameWithTimestamp = dirPath => {
     }
   })
 
-  files.forEach(file => fs.rename(file.oldPath, file.newPath, () => {}))
+  files.forEach(file => rename(file.oldPath, file.newPath, () => {}))
 }
 
 const getTimestampForFilename = () => {
@@ -813,3 +836,26 @@ const getTimestampForFilename = () => {
   const timeString = isoTimeString.split(':').join('').split('.')[0]
   return `${dateString}_${timeString}`.split(':').join('')
 }
+
+export function getHumanTimestamp(date) {
+  const [isoDateString, isoTimeString] = date.toISOString().split('T')
+  const dateString = isoDateString.split('-').join('')
+  const timeString = isoTimeString.split(':').join('').split('.')[0]
+  return `${dateString}_${timeString}`.split(':').join('')
+}
+
+export async function readImportDir(dirpath) {
+  const allFiles = readdirSync(dirpath)
+  const csvFiles = allFiles.filter(file => path.extname(file) === '.csv')
+
+  if (csvFiles.length === 0) {
+    return []
+  }
+
+  const files = csvFiles.map(file => {
+    const stat = statSync(path.resolve(dirpath, file))
+    return { filename: file, mtimeMS: stat.mtimeMs, mtime: stat.mtime, size: stat.size }
+  })
+
+  return files
+}

package/index.js

@@ -1,32 +1,28 @@
 #!/usr/bin/env node
 
-/* eslint-disable no-unused-expressions */
-/* eslint-disable no-console */
+import chalk from 'chalk'
+import pkg from './package.json' assert { type: 'json' }
+import yargs from 'yargs'
 
-const chalk = require('chalk')
-const packageJson = require('./package.json')
+import * as ImportData from './cmds/importData.js'
+import * as ImportMedia from './cmds/importMedia.js'
 
-console.log(chalk.bold(`\n 👜 Closer CLI (${packageJson.version})\n`))
+console.log(chalk.bold(`\n 👜 Closer CLI (${pkg.version})\n`))
 
-require('yargs/yargs')(process.argv.slice(2))
+yargs(process.argv.slice(2))
   .scriptName('closer')
   .usage(`Usage: ${chalk.cyan('$0')} <command> [options]`)
-  .commandDir('cmds')
   .option('e', {
     alias: 'endpoint',
     describe: 'Closer URL',
     demandOption: true
   })
   .option('s', {
-    alias: 'admin-secret',
-    describe: 'Admin Secret for Closer',
-    demandOption: true
-  })
-  .option('n', {
-    alias: 'name',
-    describe: 'Attach string name label to import process',
-    type: 'string',
+    alias: 'secret',
+    describe: 'Closer Secret',
     demandOption: true
   })
+  .command(ImportData.command, ImportData.desc, ImportData.builder, ImportData.handler)
+  .command(ImportMedia.command, ImportMedia.desc, ImportMedia.builder, ImportMedia.handler)
   .help()
   .version().argv

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "closer-cli",
-  "version": "2.33.0",
+  "version": "2.37.0",
   "description": "",
-  "main": "index.js",
+  "exports": "./index.js",
+  "type": "module",
   "bin": {
     "closer": "./index.js"
   },
@@ -11,14 +12,17 @@
   "author": "Francesco Pasqua <cesconix@me.com>",
   "license": "ISC",
   "dependencies": {
-    "chalk": "^4.1.2",
+    "chalk": "^5.1.2",
     "csv-parse": "^5.3.1",
     "csv-stringify": "^6.2.0",
+    "del": "^7.0.0",
     "event-stream": "^4.0.1",
-    "got": "^11.8.5",
-    "ora": "^5.4.1",
+    "got": "^12.5.2",
+    "mv": "^2.1.1",
+    "ora": "^6.1.2",
     "prompts": "^2.4.2",
     "require-directory": "^2.1.1",
+    "rimraf": "^3.0.2",
     "slugify": "^1.6.3",
     "ws": "^8.0.0",
     "yargs": "^17.0.1"