fix neckline

.dockerignore

@@ -1,8 +1,9 @@
-app.properties
 public/**
 !public/g3c.scan.image.sph.js
+!public/index.html
 !public/pictures/iconBorder.gif
 !public/pictures/vector2x.png
+!public/pictures/graymaticsLogo.png
 adscopeManual.docx
 .eslintrc.js
 .prettierrc
@@ -14,4 +15,6 @@ csv/**
 !csv/objetos2.json
 index.html
 startDocker.sh
-.gitignore
+.gitignore
+oldDist
+test.js

.gitignore

@@ -3,14 +3,19 @@ public/**
 !public/g3c.scan.image.sph.js
 !public/pictures/iconBorder.gif
 !public/pictures/vector2x.png
+!public/iframe.html
 adscopeManual.docx
 .eslintrc.js
 .prettierrc
 access.log
 node_modules/**
-clientClient
-clientAis
+clientAis/node_modules/**
+clientClient/node_modules/**
 csv/**
 !csv/objetos2.json
 index.html
-startDocker.sh
+startDocker.sh
+oldDist
+test.js
+.vscode/settings.json
+.gitignore

Dockerfile

@@ -1,4 +1,4 @@
-FROM node
+FROM node:12-alpine
 
 WORKDIR /usr/src/app
 

app.js

@@ -1,7 +1,6 @@
 const express = require('express')
 const path = require('path')
 const cookieParser = require('cookie-parser')
-const logger = require('morgan')
 const handleError = require('./helper/handle-error')
 const routers = require('./routes')
 const cors = require('cors')
@@ -10,60 +9,142 @@ const mysql = require('mysql2/promise')
 const app = express()
 const port = conf.get('port')
 const portS = conf.get('portS')
-const https = require('https');
-const http = require('http');
-const fs = require('fs');
-const shell = require("shelljs");
+const refreshTimeInterval = conf.get('refresh_time_interval') || 604800000
+const https = require('https')
+const http = require('http')
+const fs = require('fs')
 const options = {
-  key: fs.readFileSync('key.pem'),
-  cert: fs.readFileSync('cert.pem')
-};
+  key: fs.readFileSync(conf.get('ssl_key_file_path')),
+  cert: fs.readFileSync(conf.get('ssl_cert_file_path'))
+}
 const sequelize = require('./campaigns-db/database')
-const httpsServer = https.createServer(options, app);
-const httpServer = http.createServer(app);
+const httpsServer = https.createServer(options, app)
+const httpServer = http.createServer(app)
+const db = require('./campaigns-db/database')
+const products = db.products
+const clothing = db.clothing
+const publishers = db.publishers
+const User = db.users
+const { delay } = require('bluebird')
+const bcrypt = require('bcrypt')
+const axios = require('axios')
+const axiosRetry = require('axios-retry')
+const { reloadPublisher } = require('./helper/util')
+
+let server = conf.get('server').split('/')
+server[2] = `www.${server[2]}`
+server = server.join('/')
 
 app.use(express.json())
 app.use(express.urlencoded({ extended: false }))
 app.use(cookieParser())
 app.use(cors())
 
-require("./helper/cacheManager");
+require('./helper/cacheManager')
+
+function customHeaders(req, res, next) {
+  app.disable('X-Powered-By')
+  res.setHeader('X-Powered-By', 'Graymatics-server')
+  next()
+}
+
+process.on('uncaughtException', (err) => {
+    console.log('Unexpected error occurred')
+    console.log(err)
+})
 
+app.use(customHeaders)
+
+app.all(function (req, res, next) {
+  res.header('Access-Control-Allow-Origin', '*')
+  res.header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE')
+  res.header(
+    'Access-Control-Allow-Headers',
+    'Origin, X-Requested-With, Content-Type, Accept, x-access-token',
+  )
+  next()
+})
+
+async function check() {
+    const publisherList = await publishers.findAll()
+
+  if (publisherList) {
+    for (const publisher of publisherList) {
+      const sampleProductClothList = await Promise.all([products.findOne({ where: { Page_ID: publisher.dataValues.publisherId } }), 
+        clothing.findOne({ where: { Page_ID: publisher.dataValues.publisherId } })])
+      const updatedAtTime = publisher.dataValues.updatedAt.getTime()
+      const currentTime = new Date().getTime()
+
+      if((currentTime - updatedAtTime) >= refreshTimeInterval || (!sampleProductClothList[0] && !sampleProductClothList[1])) {
+        reloadPublisher(publisher)
+      }
+    }
+  }
+
+  //Wait and run the same method after 1 day
+  await delay(86400000)
+
+  return check()
+}
+
+async function createAdminUser() {
+  const adminCreated = await User.findOne({ where: { username: 'adminAis' } })
+  if (!adminCreated) {
+    await User.create({
+      username: 'adminAis',
+      password: bcrypt.hashSync('AisGraymatics1!', 12),
+      email: 'test@graymatics.com',
+      role: 'ADMIN',
+    })
+  }
+}
 
 if (conf.get('install') == true) {
-  console.log("Installing DB")
+  console.log('Installing DB...')
   mysql
-  .createConnection({
-    user: conf.get('user'),
-    password: conf.get('password'),
-    host: conf.get('host')
-  })
-  .then(connection => {
-    connection.query('CREATE DATABASE IF NOT EXISTS ' + conf.get('database') + ' CHARACTER SET=utf8mb4 COLLATE=utf8mb4_general_ci;').then(() => {
-      sequelize.sequelize.sync({force: true}).then(()=>{
-        console.log('sequelize is connected')
-      }).catch(err =>{
-        console.error('no se concecto',err)
-      })
+    .createConnection({
+      user: conf.get('user'),
+      password: conf.get('password'),
+      host: conf.get('host'),
+      port: conf.get('dbport')
     })
-  })
+    .then((connection) => {
+      connection
+        .query(
+          'CREATE DATABASE IF NOT EXISTS ' +
+            conf.get('database') +
+            ' CHARACTER SET=utf8mb4 COLLATE=utf8mb4_general_ci;',
+        )
+        .then(() => {
+          sequelize.sequelize
+            .sync({ force: false, alter: true })
+            .then(() => {
+              console.log('Sequelize is connected and updated.')
+              createAdminUser()
+              check()
+            })
+            .catch((err) => {
+              console.error('Sequelize was not able to connect.', err)
+            })
+        })
+    })
+} else {
+  console.log('Sequelize is connected.')
+  check()
 }
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'))
-app.set('view engine', 'pug')
-app.use(logger('Date: :date[web] // Url: :remote-addr // Method: :method:url // Status::status // User-agent: :user-agent'))
-app.use(logger('Date: :date[web] // Url: :remote-addr // Method: :method:url // Status::status // User-agent: :user-agent',
-    {
-      stream: fs.createWriteStream('./access.log', { flags: 'a' })
-    }
-  )
-)
-app.use('/system',express.static(path.join(__dirname, 'public')))
+app.set('view engine', 'jade')
+app.use('/not-found', express.static('./views/error.html'))
+
+app.use('/system', express.static(path.join(__dirname, 'public')))
 
-app.use('/management',express.static(conf.get('dashboardAis')));
+app.use('/system/2', express.static(path.join(__dirname, 'public')))
 
-app.use('/client',express.static(conf.get('dashboardClient')));
+app.use('/management', express.static(conf.get('dashboardAis')))
+
+app.use('/client', express.static(conf.get('dashboardClient')))
 
 app.use('/api/pictures', express.static('./public/pictures'))
 
@@ -73,11 +154,35 @@ app.use(routers)
 // global error handling
 app.use(handleError)
 
-httpsServer.listen(portS || 3000, function () {
-	console.log(`App is up on port ${portS || '3000'} on HTTPS`)
-});
+// 404 re-route
+app.get('*', function (req, res) {
+  const path = req._parsedUrl.path.split('/')[1]
+  switch (path) {
+    case 'management':
+      return res.redirect('/management')
+    case 'client':
+      return res.redirect('/client')
+    default:
+      return res.redirect('/not-found')
+  }
+})
+
+httpsServer.listen(portS || 3311, function () {
+  console.log(`App is running on HTTPS mode using port: ${portS || '3311'}`)
+})
 
-httpServer.listen(port || 3000, function () {
-	console.log(`App is up on port ${port || '3000'} on HTTP`)
-});
+httpServer.listen(port || 3310, function () {
+	console.log(`App is running on HTTP mode using port: ${port || '3310'}`)
+})
 
+axiosRetry(axios, {
+  retries: 2,
+  retryDelay: (retryCount) => {
+    console.log(`retry attempt: ${retryCount}`)
+    return retryCount * 1000
+  },
+  retryCondition: (error) => {
+    return (error && (error.reponse == null || error.response.status !== 200 || 
+      error.response.status !== 201 || error.response.status !== 404 || error.response.status !== 500))
+  }
+})

app.properties

@@ -1,26 +1,53 @@
-vista_api_url=
-vista_api_user=
-vista_api_password=
+vista_api_url=http://20.119.220.118
+vista_api_user=admin
+vista_api_password=admin
+server=http://localhost:3310
 
 accesstrade_endpoint=https://gurkha.accesstrade.in.th
 
-accesstrade_user=
-accesstrade_pass=
+accesstrade_user=alex@graymatics.com
+accesstrade_pass=GDdpeQB!nH8tCD9o
 
 host=localhost
-user=
-password=
-database=ads1
+dbport=3306
+user=graymatics
+password=graymatics
+database=campaign
 
+port=3309
+portS=3310
 
-port=3310
-portS=3311
+install=true
 
-install=false
+dashboardAis=./distAis
+dashboardClient=./distClient
 
-dashboardAis= ./distAis
-dashboardClient= ./distClient
-
-redis_host= localhost
+redis_host=127.0.0.1
 redis_port=6379
 redis_password=''
+
+#Product and cloth Refresh time interval in milisecond
+refresh_time_interval=604800000
+
+#Campaign id for providers
+bigc.campaign_id=308
+lazada.campaign_id=520
+topsOnline.campaign_id=704
+jdCentral.campaign_id=722
+centralOnline.campaign_id=730
+
+#SSL Configuration
+ssl_key_file_path=key.pem
+ssl_cert_file_path=cert.pem
+
+#CSV download folder location
+csv_download_folder_location=csv
+
+#dataset size
+male_cloth_dataset_size=7500
+female_cloth_dataset_size=7500
+product_dataset_size=15000
+
+#min and max possible ads for image for publishers
+min_possible_ads_count_per_image=1
+max_possible_ads_count_per_image=4

benchmark.js

@@ -0,0 +1,24 @@
+const autocannon = require('autocannon')
+const { PassThrough } = require('stream')
+
+function run (url) {
+  const buf = []
+  const outputStream = new PassThrough()
+
+  const inst = autocannon({
+    url,
+    connections: 100,
+    duration: 20
+  })
+
+  autocannon.track(inst, { outputStream })
+
+  outputStream.on('data', data => buf.push(data))
+  inst.on('done', function () {
+    process.stdout.write(Buffer.concat(buf))
+  })
+}
+
+console.log('Running all benchmarks in parallel ...')
+
+run('http://localhost:3310/system/')