@things-factory/integration-sftp 4.3.21 → 4.3.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/sftp-const.js +1 -1
- package/dist-server/sftp-const.js.map +1 -1
- package/dist-server/sftp-s3.js +2 -2
- package/dist-server/sftp-s3.js.map +1 -1
- package/package.json +7 -7
- package/server/controllers/herbalife/apis/create-serial-number.ts +4 -3
- package/server/controllers/herbalife/apis/create-shipment.ts +4 -3
- package/server/sftp-s3.ts +2 -2
|
@@ -6,7 +6,7 @@ exports.SFTPFILESTORAGE = env_1.config.get('sftpFileStorage');
|
|
|
6
6
|
exports.SUBMITDATAPATH = '/sob/data';
|
|
7
7
|
exports.SUCCESSDATAPATH = '/sob/success';
|
|
8
8
|
exports.FAILEDDATAPATH = '/sob/failed';
|
|
9
|
-
exports.COMPLETEDATAPATH = '/oc/
|
|
9
|
+
exports.COMPLETEDATAPATH = '/oc/data01';
|
|
10
10
|
exports.COMPLETESUCCESSDATAPATH = '/oc/success';
|
|
11
11
|
exports.COMPLETEFAILEDDATAPATH = '/oc/failed';
|
|
12
12
|
exports.SNSUBMITDATAPATH = '/sn/data';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sftp-const.js","sourceRoot":"","sources":["../server/sftp-const.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAEjC,QAAA,eAAe,GAAQ,YAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;AACpD,QAAA,cAAc,GAAW,WAAW,CAAA;AACpC,QAAA,eAAe,GAAW,cAAc,CAAA;AACxC,QAAA,cAAc,GAAW,aAAa,CAAA;AACtC,QAAA,gBAAgB,GAAW,
|
|
1
|
+
{"version":3,"file":"sftp-const.js","sourceRoot":"","sources":["../server/sftp-const.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAEjC,QAAA,eAAe,GAAQ,YAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;AACpD,QAAA,cAAc,GAAW,WAAW,CAAA;AACpC,QAAA,eAAe,GAAW,cAAc,CAAA;AACxC,QAAA,cAAc,GAAW,aAAa,CAAA;AACtC,QAAA,gBAAgB,GAAW,YAAY,CAAA;AACvC,QAAA,uBAAuB,GAAW,aAAa,CAAA;AAC/C,QAAA,sBAAsB,GAAW,YAAY,CAAA;AAC7C,QAAA,gBAAgB,GAAW,UAAU,CAAA;AACrC,QAAA,iBAAiB,GAAW,aAAa,CAAA;AACzC,QAAA,gBAAgB,GAAW,YAAY,CAAA;AACvC,QAAA,UAAU,GAAW,WAAW,CAAA"}
|
package/dist-server/sftp-s3.js
CHANGED
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const aws_sdk_1 = __importDefault(require("aws-sdk"));
|
|
7
|
-
const
|
|
7
|
+
const uuid_1 = require("uuid");
|
|
8
8
|
const env_1 = require("@things-factory/env");
|
|
9
9
|
const sftp_const_1 = require("./sftp-const");
|
|
10
10
|
const { PassThrough } = require('stream');
|
|
@@ -51,7 +51,7 @@ if (sftp_const_1.SFTPFILESTORAGE && sftp_const_1.SFTPFILESTORAGE.type == 's3') {
|
|
|
51
51
|
};
|
|
52
52
|
/* upload file */
|
|
53
53
|
sftp_const_1.SFTPFILESTORAGE.uploadFile = ({ stream, filename, uploadPath }) => {
|
|
54
|
-
const id = (0,
|
|
54
|
+
const id = (0, uuid_1.v4)();
|
|
55
55
|
let size = 0;
|
|
56
56
|
return new Promise((resolve, reject) => stream
|
|
57
57
|
.pipe((() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sftp-s3.js","sourceRoot":"","sources":["../server/sftp-s3.ts"],"names":[],"mappings":";;;;;AAAA,sDAAyB;AACzB
|
|
1
|
+
{"version":3,"file":"sftp-s3.js","sourceRoot":"","sources":["../server/sftp-s3.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-sftp",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.25",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,13 +24,13 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/auth-base": "^4.3.
|
|
28
|
-
"@things-factory/biz-base": "^4.3.
|
|
29
|
-
"@things-factory/env": "^4.3.
|
|
30
|
-
"@things-factory/integration-fulfillment": "^4.3.
|
|
31
|
-
"@things-factory/shell": "^4.3.
|
|
27
|
+
"@things-factory/auth-base": "^4.3.24",
|
|
28
|
+
"@things-factory/biz-base": "^4.3.24",
|
|
29
|
+
"@things-factory/env": "^4.3.23",
|
|
30
|
+
"@things-factory/integration-fulfillment": "^4.3.24",
|
|
31
|
+
"@things-factory/shell": "^4.3.23",
|
|
32
32
|
"aws-sdk": "^2.960.0",
|
|
33
33
|
"xml-js": "^1.6.11"
|
|
34
34
|
},
|
|
35
|
-
"gitHead": "
|
|
35
|
+
"gitHead": "bdcecd8454d7a76df3c5676a39440d57bc21d5cb"
|
|
36
36
|
}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import { BACKUPPATH } from '../../../sftp-const'
|
|
1
|
+
import { BACKUPPATH, SNSUBMITDATAPATH } from '../../../sftp-const'
|
|
2
2
|
|
|
3
3
|
export function createSerialNumber() {
|
|
4
4
|
return {
|
|
5
5
|
method: 'post',
|
|
6
|
-
path: '{folderPath}/{folderType}
|
|
6
|
+
path: '{folderPath}/{folderType}{snPath}',
|
|
7
7
|
denormalize(req) {
|
|
8
8
|
let { releaseGood, inventoryItems, sftp } = req
|
|
9
9
|
let { folderPath, platform } = sftp
|
|
10
10
|
const folderType: string = sftp.isDevelopment ? `dev` : `prd`
|
|
11
|
+
const snPath: string = SNSUBMITDATAPATH
|
|
11
12
|
const backupPath: string = `${BACKUPPATH}${platform}/${folderType}`
|
|
12
13
|
|
|
13
14
|
let responseFilePattern: any = JSON.parse(sftp.responseFilePattern)
|
|
@@ -39,7 +40,7 @@ export function createSerialNumber() {
|
|
|
39
40
|
}
|
|
40
41
|
|
|
41
42
|
return {
|
|
42
|
-
resource: { folderPath, folderType },
|
|
43
|
+
resource: { folderPath, folderType, snPath },
|
|
43
44
|
payload: { title, content, sftp, backupPath }
|
|
44
45
|
}
|
|
45
46
|
},
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import { BACKUPPATH } from '../../../sftp-const'
|
|
1
|
+
import { BACKUPPATH, COMPLETEDATAPATH } from '../../../sftp-const'
|
|
2
2
|
|
|
3
3
|
export function createShipment() {
|
|
4
4
|
return {
|
|
5
5
|
method: 'post',
|
|
6
|
-
path: '{folderPath}/{folderType}
|
|
6
|
+
path: '{folderPath}/{folderType}{shipmentCompletePath}',
|
|
7
7
|
denormalize(req) {
|
|
8
8
|
let { releaseGood, orderInventories, sftp } = req
|
|
9
9
|
let { folderPath, platform } = sftp
|
|
10
10
|
const folderType: string = sftp.isDevelopment ? `dev` : `prd`
|
|
11
|
+
const shipmentCompletePath: string = COMPLETEDATAPATH
|
|
11
12
|
const backupPath: string = `${BACKUPPATH}${platform}/${folderType}`
|
|
12
13
|
|
|
13
14
|
let responseFilePattern: any = JSON.parse(sftp.responseFilePattern)
|
|
@@ -75,7 +76,7 @@ export function createShipment() {
|
|
|
75
76
|
}
|
|
76
77
|
|
|
77
78
|
return {
|
|
78
|
-
resource: { folderPath, folderType },
|
|
79
|
+
resource: { folderPath, folderType, shipmentCompletePath },
|
|
79
80
|
payload: { title, backupTitle, content, sftp, backupPath }
|
|
80
81
|
}
|
|
81
82
|
},
|
package/server/sftp-s3.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import AWS from 'aws-sdk'
|
|
2
|
-
import
|
|
2
|
+
import { v4 as uuidv4 } from 'uuid'
|
|
3
3
|
|
|
4
4
|
import { logger } from '@things-factory/env'
|
|
5
5
|
|
|
@@ -63,7 +63,7 @@ if (SFTPFILESTORAGE && SFTPFILESTORAGE.type == 's3') {
|
|
|
63
63
|
|
|
64
64
|
/* upload file */
|
|
65
65
|
SFTPFILESTORAGE.uploadFile = ({ stream, filename, uploadPath }) => {
|
|
66
|
-
const id =
|
|
66
|
+
const id = uuidv4()
|
|
67
67
|
let size: number = 0
|
|
68
68
|
|
|
69
69
|
return new Promise<{ id: string; path: string; size: number }>((resolve, reject) =>
|