@things-factory/integration-lmd 8.0.0-beta.1 → 8.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-lmd",
-  "version": "8.0.0-beta.1",
+  "version": "8.0.0-beta.2",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -25,17 +25,17 @@
   },
   "dependencies": {
     "@operato/data-grist": "^8.0.0-beta",
-    "@things-factory/apptool-ui": "^8.0.0-beta.1",
-    "@things-factory/auth-ui": "^8.0.0-beta.1",
-    "@things-factory/biz-base": "^8.0.0-beta.1",
-    "@things-factory/code-ui": "^8.0.0-beta.1",
-    "@things-factory/context-ui": "^8.0.0-beta.1",
-    "@things-factory/i18n-base": "^8.0.0-beta.1",
-    "@things-factory/integration-ui": "^8.0.0-beta.1",
-    "@things-factory/more-ui": "^8.0.0-beta.1",
-    "@things-factory/resource-ui": "^8.0.0-beta.1",
-    "@things-factory/setting-ui": "^8.0.0-beta.1",
-    "@things-factory/shell": "^8.0.0-beta.1",
+    "@things-factory/apptool-ui": "^8.0.0-beta.2",
+    "@things-factory/auth-ui": "^8.0.0-beta.2",
+    "@things-factory/biz-base": "^8.0.0-beta.2",
+    "@things-factory/code-ui": "^8.0.0-beta.2",
+    "@things-factory/context-ui": "^8.0.0-beta.2",
+    "@things-factory/i18n-base": "^8.0.0-beta.2",
+    "@things-factory/integration-ui": "^8.0.0-beta.2",
+    "@things-factory/more-ui": "^8.0.0-beta.2",
+    "@things-factory/resource-ui": "^8.0.0-beta.2",
+    "@things-factory/setting-ui": "^8.0.0-beta.2",
+    "@things-factory/shell": "^8.0.0-beta.2",
     "debug": "^4.1.1",
     "node-fetch": "^2.6.0"
   },
@@ -49,5 +49,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "36c494e587640c1490318ef7b95adab02606e0c2"
+  "gitHead": "f03431a09435511b2595515658f9cb8f78ba4ebb"
 }

package/server/controllers/citylink/apis/index.ts

@@ -1 +0,0 @@
-export * from './shipment-request'

package/server/controllers/citylink/apis/shipment-request/create-shipment-request.ts

@@ -1,12 +0,0 @@
-export function createShipmentRequest() {
-  return {
-    method: 'post',
-    path: '/requestShipment',
-    denormalize(req) {
-      return req
-    },
-    normalize(res) {
-      return res
-    }
-  }
-}

package/server/controllers/citylink/apis/shipment-request/index.ts

@@ -1 +0,0 @@
-export * from './create-shipment-request'

package/server/controllers/citylink/citylink.ts

@@ -1,161 +0,0 @@
-import fetch from 'node-fetch'
-
-const ENDPOINT = 'http://202.133.101.28:8889/CitylinkService.svc/rest'
-const debug = require('debug')('things-factory:integration-lmd:citylink')
-
-export type CitylinkConfig = {
-  apiKey: string
-  apiSecret: string
-  accessToken?: string
-  tenantId?: string
-  callback?: string
-}
-
-export class Citylink {
-  private config: CitylinkConfig
-
-  constructor(config: CitylinkConfig) {
-    this.config = {
-      ...config
-    }
-  }
-
-  buildAuthURL(nonce) {
-    const scopes = 'offline_access openid profile email accounting.transactions accounting.settings'
-    const { apiKey, callback: redirectUrl } = this.config
-
-    return `https://login.xero.com/identity/connect/authorize?response_type=code&client_id=${apiKey}&scope=${scopes}&redirect_uri=${redirectUrl}&state=${nonce}`
-  }
-
-  async get(path: string, data: any) {
-    const { accessToken, tenantId } = this.config
-
-    const qs = Object.entries(data)
-      .map(([k, v]) => `${k}=${encodeURIComponent(String(v))}`)
-      .join('&')
-
-    const endpoint = `${ENDPOINT}${path}${qs ? '?' + qs : ''}`
-    debug('endpoint', endpoint)
-
-    const response = await fetch(endpoint, {
-      method: 'get',
-      headers: {
-        accept: 'application/json',
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-        'xero-tenant-id': tenantId
-      }
-    })
-
-    if (!response.ok) {
-      throw response
-    }
-
-    let result = await response.json()
-    debug('response result', result)
-    result = this.convertStatusCode(result)
-
-    return result
-  }
-
-  async post(path: string, data: any = {}) {
-    const { accessToken, tenantId } = this.config
-
-    debug('data', data)
-
-    const jsondata = JSON.stringify(data)
-
-    const endpoint = `${ENDPOINT}${path}`
-    debug('endpoint', endpoint)
-
-    const response = await fetch(endpoint, {
-      method: 'post',
-      headers: {
-        accept: 'application/json',
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-        'xero-tenant-id': tenantId
-      },
-      body: jsondata
-    })
-
-    if (!response.ok) {
-      throw response
-    }
-
-    let result = await response.json()
-    debug('response result', result)
-    result = this.convertStatusCode(result)
-
-    return result
-  }
-
-  async put(path: string, data: any = {}) {
-    const { accessToken, tenantId } = this.config
-
-    debug('data', data)
-
-    const jsondata = JSON.stringify(data)
-
-    const endpoint = `${ENDPOINT}${path}`
-    debug('endpoint', endpoint)
-
-    const response = await fetch(endpoint, {
-      method: 'put',
-      headers: {
-        accept: 'application/json',
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-        'xero-tenant-id': tenantId
-      },
-      body: jsondata
-    })
-
-    if (!response.ok) {
-      throw response
-    }
-
-    let result = await response.json()
-    debug('response result', result)
-    result = this.convertStatusCode(result)
-
-    return result
-  }
-
-  async delete(path: string, data: any = {}) {
-    const { accessToken, tenantId } = this.config
-
-    debug('data', data)
-
-    const jsondata = JSON.stringify(data)
-
-    const endpoint = `${ENDPOINT}${path}`
-    debug('endpoint', endpoint)
-
-    const response = await fetch(endpoint, {
-      method: 'delete',
-      headers: {
-        accept: 'application/json',
-        'Content-Type': 'application/json',
-        Authorization: `Bearer ${accessToken}`,
-        'xero-tenant-id': tenantId
-      },
-      body: jsondata
-    })
-
-    if (!response.ok) {
-      throw response
-    }
-
-    let result = await response.json()
-    debug('response result', result)
-    result = this.convertStatusCode(result)
-
-    return result
-  }
-
-  private convertStatusCode(result: Record<string, any>): Record<string, any> {
-    result.ok = result.Status.toLowerCase() === 'ok'
-    return result
-  }
-}

package/server/controllers/citylink/index.ts

@@ -1,8 +0,0 @@
-export * from './citylink'
-
-import { LastMileAPI } from '../lmd-api'
-import { action } from './platform-action'
-
-import * as APIS from './apis'
-
-LastMileAPI.registerPlatform('citylink', action, APIS)

package/server/controllers/citylink/platform-action.ts

@@ -1,39 +0,0 @@
-import { Citylink } from './citylink'
-
-import { config } from '@things-factory/env'
-const citylinkConfig = config.get('lmdIntegrationCitylink', {})
-const { apiKey, apiSecret, callback } = citylinkConfig
-
-function substitute(path, obj) {
-  var props = []
-  var re = /{([^}]+)}/g
-  var text
-
-  while ((text = re.exec(path))) {
-    props.push(text[1])
-  }
-
-  var result = path
-  props.forEach(prop => {
-    let value = obj[prop.trim()]
-    result = result.replace(`{${prop}}`, value === undefined ? '' : value)
-  })
-
-  return result
-}
-
-export const action = async ({ lastMile, method = 'get', path, request }) => {
-  const client = new Citylink({
-    apiKey,
-    apiSecret,
-    accessToken: lastMile.accessToken,
-    tenantId: lastMile.accountId,
-    callback
-  })
-
-  const { resource = {}, payload = {} } = request
-
-  path = substitute(path, resource)
-
-  return await client[method](path, payload)
-}

package/server/controllers/etrax/apis/create-shipment-request.ts

@@ -1,82 +0,0 @@
-export function createShipmentRequest() {
-  return {
-    method: 'post',
-    path: '/rest/delivery.php?api=create',
-    denormalize(req) {
-      const {
-        orderNo,
-        clientId,
-        clientType,
-        clientName,
-        transporterId,
-        transporterId2,
-        name,
-        address1,
-        address2,
-        postCode,
-        city,
-        state,
-        phone,
-        email,
-        attentionTo,
-        quantity,
-        pickupName,
-        pickupAddress1,
-        pickupAddress2,
-        pickupPostcode,
-        pickupCity,
-        pickupState,
-        pickupPhone,
-        pickupEmail
-      } = req
-
-      //Creta a parcel array, but only 1 needed
-      const parcels = []
-      parcels.push({
-        desc: '',
-        qty: quantity,
-        weight: 0,
-        width: 0,
-        depth: 0,
-        height: 0
-      })
-
-      return {
-        OrderNo: orderNo,
-        ExtOrderNo: orderNo,
-        ClientId: clientId,
-        ClientType: clientType,
-        ClientName: clientName,
-        TransporterId: transporterId,
-        TransporterId2: transporterId2,
-        PickUpAttnTo: pickupName,
-        PickUpAddr1: pickupAddress1,
-        PickUpAddr2: pickupAddress2,
-        PickUpPostCode: pickupPostcode,
-        PickUpCity: pickupCity,
-        PickUpState: pickupState,
-        PickUpPhone: pickupPhone,
-        PickUpEmail: pickupEmail,
-        DeliverToAttnTo: attentionTo,
-        DeliverToAddr1: address1,
-        DeliverToAddr2: address2,
-        DeliverToPostCode: postCode,
-        DeliverToCity: city,
-        DeliverToState: state,
-        DeliverToPhone: phone,
-        DeliverToEmail: email,
-        TotalWeight: 0,
-        TotalVolume: 0,
-        CollectionType: 'Prepaid',
-        CollectionCurrency: 'MYR',
-        FreightType: 0,
-        GoodsType: 0,
-        DeliveryMethod: 0,
-        Parcels: parcels
-      }
-    },
-    normalize(res) {
-      return res
-    }
-  }
-}

package/server/controllers/etrax/apis/index.ts

@@ -1 +0,0 @@
-export * from './create-shipment-request'

package/server/controllers/etrax/etrax.ts

@@ -1,108 +0,0 @@
-import crypto from 'crypto'
-import fetch from 'node-fetch'
-
-import { getRepository } from '@things-factory/shell'
-
-import { LastMileDelivery } from '../../entities'
-
-const ENDPOINT = 'http://ets.sntglobal.com'
-//const ENDPOINT = 'https://localhost:44344'
-const debug = require('debug')('things-factory:integration-lmd:etrax')
-
-export type EtraxAuth = {
-  SourceID: string
-  TimeStamp: string
-  Token: string
-}
-
-export class Etrax {
-  private _auth: EtraxAuth
-  private _secretKey: string
-
-  constructor(customerCode: string) {
-    this._auth = {
-      SourceID: '',
-      TimeStamp: '',
-      Token: ''
-    }
-
-    this._auth.SourceID = customerCode
-  }
-
-  async post(path: string, data: any) {
-    const timestamp = this.getTimestamp()
-    let apiKey = 'CREATE_DELIVERY'
-
-    //Path to APIKEY
-    if (path.includes('create-delivery')) {
-      apiKey = 'CREATE_DELIVERY'
-    }
-
-    await this.generateToken(timestamp, apiKey)
-
-    let finalData = {
-      ...data,
-      ...this._auth
-    }
-    let jsonData = JSON.stringify(finalData)
-
-    debug(ENDPOINT + path)
-    debug(jsonData)
-
-    const response = await fetch(ENDPOINT + path, {
-      method: 'post',
-      headers: {
-        accept: 'application/json',
-        'Content-Type': 'application/json'
-      },
-      body: jsonData
-    })
-
-    if (!response.ok) {
-      throw response
-    }
-    let result = await response.json()
-    debug('response result', result)
-    //result = this.convertStatusCode(result)
-
-    return result
-  }
-
-  async validateToken(receivedToken: string, apiKey: string, timestamp: string) {
-    if (receivedToken !== (await this.generateToken(timestamp, apiKey))) {
-      return false
-    } else {
-      return true
-    }
-  }
-
-  async generateToken(timestamp: string, apiKey: string) {
-    const lmdRepo = getRepository(LastMileDelivery)
-    const lmd = await lmdRepo.findOne({ where: { clientName: this._auth.SourceID } })
-    const secretKey = lmd.secretKey
-
-    const temp = apiKey + timestamp + secretKey
-    const md5 = this.generateMD5(temp)
-    this._auth.TimeStamp = timestamp
-    this._auth.Token = md5
-
-    return md5.toString().toUpperCase()
-  }
-
-  getTimestamp() {
-    const pad = (n: number) => (n < 10 ? '0' + n : n)
-    const date = new Date()
-    const timestamp =
-      date.getFullYear().toString() +
-      pad(date.getMonth() + 1) +
-      pad(date.getDate()) +
-      pad(date.getHours()) +
-      pad(date.getMinutes()) +
-      pad(date.getSeconds())
-    return timestamp
-  }
-
-  generateMD5(input: string) {
-    return crypto.createHash('md5').update(input).digest('hex')
-  }
-}

package/server/controllers/etrax/index.ts

@@ -1,7 +0,0 @@
-export * from './etrax'
-
-import { LastMileAPI } from '../lmd-api'
-import { action } from './platform-action'
-import * as APIS from './apis'
-
-LastMileAPI.registerPlatform('eTrax', action, APIS)

package/server/controllers/etrax/platform-action.ts

@@ -1,32 +0,0 @@
-import { Etrax } from './etrax'
-
-function substitute(path, obj) {
-   var props = []
-   var re = /{([^}]+)}/g
-   var text
- 
-   while ((text = re.exec(path))) {
-     props.push(text[1])
-   }
- 
-   var result = path
-   props.forEach(prop => {
-     let value = obj[prop.trim()]
-     result = result.replace(`{${prop}}`, value === undefined ? '' : value)
-   })
- 
-   return result
- }
- 
-export const action = async ({ lastMile, method = 'get', path, request }) => {
-   //LMD ClientName Store SourceID
-   const customerCode = lastMile.clientName
-
-   const client = new Etrax(customerCode)
- 
-   //const { resource = {}, payload = {} } = request
- 
-   //path = substitute(path, resource)
- 
-   return await client[method](path, request)
- }

package/server/controllers/index.ts

@@ -1,10 +0,0 @@
-import './citylink'
-import './etrax'
-
-export * from './lmd-api'
-
-export const LMD_STATUS = {
-  ACTIVE: 'active',
-  INACTIVE: 'inactive',
-  TERMINATED: 'terminated'
-}

package/server/controllers/lmd-api/decorators.ts

@@ -1,47 +0,0 @@
-import Debug from 'debug'
-const debug = Debug('things-factory:integration-lmd:lmd-api-decorator')
-
-import { LastMileDelivery } from '../../entities'
-
-const NOOP = v => v
-
-export const api = (target: Object, property: string, descriptor: TypedPropertyDescriptor<any>): any => {
-  const method = descriptor.value
-
-  descriptor.value = async function (lastMile: LastMileDelivery, request) {
-    const LastMileAPI = this
-
-    var { platform } = lastMile
-
-    var { action: platformAction, apis } = LastMileAPI.getPlatform(platform)
-
-    var m = apis[method.name]
-    if (!m) {
-      throw Error(`Last Mile Delivery Platform '${platform}' doesn't have API ${method.name}`)
-    }
-
-    var {
-      path,
-      method: httpMethod = 'post',
-      denormalize = NOOP,
-      normalize = NOOP,
-      action = platformAction
-    } = m.apply(this, [request])
-
-    var denormalized = await denormalize(request || {}, { lastMile })
-    debug('request', denormalized)
-
-    var response = await action.apply(this, [
-      { lastMile, method: httpMethod, path, request: denormalized, platformAction }
-    ])
-
-    debug('response', response)
-    /*if (!response.ok) {
-      throw response
-    }*/
-
-    return await normalize(response, { lastMile })
-  }
-
-  return descriptor
-}

package/server/controllers/lmd-api/index.ts

@@ -1,39 +0,0 @@
-import { getRepository } from '@things-factory/shell'
-
-import { LastMileDelivery } from '../../entities'
-import { api } from './decorators'
-
-export const LAST_MILE_STATUS = {
-  ACTIVE: 'active',
-  INACTIVE: 'inactive',
-  TERMINATED: 'terminated'
-}
-
-export class LastMileAPI {
-  static platforms = {}
-
-  static registerPlatform(name, action, apis) {
-    LastMileAPI.platforms[name] = {
-      action,
-      apis
-    }
-  }
-
-  static getPlatform(name) {
-    return LastMileAPI.platforms[name]
-  }
-
-  static async getAccounting(id) {
-    const repository = getRepository(LastMileDelivery)
-    return await repository.findOne({
-      where: { id },
-      relations: ['domain']
-    })
-  }
-
-  @api
-  static createShipmentRequest(lastMile, req): any {}
-
-  @api
-  static getShipmentTracking(lastMile, req): any {}
-}

package/server/engine/connector/index.ts

@@ -1 +0,0 @@
-import './lmd-connector'

package/server/engine/connector/lmd-connector.ts

@@ -1,33 +0,0 @@
-import { ConnectionManager, Connector } from '@things-factory/integration-base'
-
-export class LastMileConnector implements Connector {
-  async ready(connectionConfigs) {
-    await Promise.all(connectionConfigs.map(this.connect))
-
-    ConnectionManager.logger.info('lmd-connector connections are ready')
-  }
-
-  async connect(connection) {
-    const { domain, name, endpoint } = connection
-
-    ConnectionManager.addConnectionInstance(connection, { ...connection })
-
-    ConnectionManager.logger.info(`lmd-connector connection(${name}:${connection.endpoint}) is connected`)
-  }
-
-  async disconnect(connection) {
-    ConnectionManager.removeConnectionInstance(connection)
-
-    ConnectionManager.logger.info(`lmd-connector connection(${connection.name}) is disconnected`)
-  }
-
-  get parameterSpec() {
-    return []
-  }
-
-  get taskPrefixes() {
-    return ['lmd']
-  }
-}
-
-ConnectionManager.registerConnector('lmd-connector', new LastMileConnector())

package/server/engine/index.ts

@@ -1,2 +0,0 @@
-import './connector'
-import './task'

package/server/engine/task/index.ts

@@ -1 +0,0 @@
-import './lmd-api'