@things-factory/integration-sftp 4.3.424 → 4.3.434

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.
@@ -1,9 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.BACKUPPATH = exports.SNFAILEDDATAPATH = exports.SNSUCCESSDATAPATH = exports.SNSUBMITDATAPATH = exports.COMPLETEFAILEDDATAPATH = exports.COMPLETESUCCESSDATAPATH = exports.COMPLETEDATAPATH = exports.FAILEDDATAPATH = exports.SUCCESSDATAPATH = exports.SUBMITDATAPATH = exports.AWSCREDENTIAL = exports.SFTPFILESTORAGE = void 0;
3
+ exports.BACKUPPATH = exports.SNFAILEDDATAPATH = exports.SNSUCCESSDATAPATH = exports.SNSUBMITDATAPATH = exports.COMPLETEFAILEDDATAPATH = exports.COMPLETESUCCESSDATAPATH = exports.COMPLETEDATAPATH = exports.FAILEDDATAPATH = exports.SUCCESSDATAPATH = exports.SUBMITDATAPATH = exports.SFTPFILESTORAGE = void 0;
4
4
  const env_1 = require("@things-factory/env");
5
5
  exports.SFTPFILESTORAGE = env_1.config.get('sftpFileStorage');
6
- exports.AWSCREDENTIAL = env_1.config.get('awsCredential');
7
6
  exports.SUBMITDATAPATH = '/sob/data';
8
7
  exports.SUCCESSDATAPATH = '/sob/success';
9
8
  exports.FAILEDDATAPATH = '/sob/failed';
@@ -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,aAAa,GAAQ,YAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;AAChD,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"}
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"}
@@ -11,47 +11,43 @@ const { PassThrough } = require('stream');
11
11
  const path = require('path');
12
12
  const { fs } = require('memfs');
13
13
  if (sftp_const_1.SFTPFILESTORAGE && sftp_const_1.SFTPFILESTORAGE.type == 's3') {
14
- const getAWSSecret = async () => {
15
- let accessKeyId;
16
- let secretAccessKey;
17
- const secretManager = new aws_sdk_1.default.SecretsManager({ region: sftp_const_1.AWSCREDENTIAL.region });
18
- try {
19
- const secretManagerParams = {
20
- SecretId: sftp_const_1.AWSCREDENTIAL.secretName,
21
- VersionStage: 'AWSCURRENT'
22
- };
23
- await secretManager
24
- .getSecretValue(secretManagerParams, function (err, data) {
25
- if (err) {
26
- console.log(err, err.stack);
27
- }
28
- else {
29
- const dataSecretString = data.SecretString;
30
- if (dataSecretString) {
31
- const secretString = JSON.parse(dataSecretString);
32
- accessKeyId = secretString.accessKeyId;
33
- secretAccessKey = secretString.secretAccessKey;
34
- }
35
- }
36
- })
37
- .promise();
38
- if (accessKeyId && secretAccessKey) {
39
- return { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey };
40
- }
41
- else {
42
- return null;
43
- }
44
- }
45
- catch (e) {
46
- console.log(`[SFTP Get Secret]: ${e}`);
47
- }
48
- };
14
+ const S3 = new aws_sdk_1.default.S3({
15
+ accessKeyId: sftp_const_1.SFTPFILESTORAGE.accessKeyId,
16
+ secretAccessKey: sftp_const_1.SFTPFILESTORAGE.secretAccessKey
17
+ });
18
+ // const getAWSSecret = async () => {
19
+ // let accessKeyId
20
+ // let secretAccessKey
21
+ // const secretManager = new AWS.SecretsManager({ region: 'ap-southeast-1' })
22
+ // try {
23
+ // const secretManagerParams = {
24
+ // SecretId: AWSCREDENTIALSECRET,
25
+ // VersionStage: 'AWSCURRENT'
26
+ // }
27
+ // await secretManager
28
+ // .getSecretValue(secretManagerParams, function (err, data) {
29
+ // if (err) {
30
+ // console.log(err, err.stack)
31
+ // } else {
32
+ // const dataSecretString: any = data.SecretString
33
+ // if (dataSecretString) {
34
+ // const secretString = JSON.parse(dataSecretString)
35
+ // accessKeyId = secretString.accessKeyId
36
+ // secretAccessKey = secretString.secretAccessKey
37
+ // }
38
+ // }
39
+ // })
40
+ // .promise()
41
+ // if (accessKeyId && secretAccessKey) {
42
+ // return { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey }
43
+ // } else {
44
+ // return null
45
+ // }
46
+ // } catch (e) {
47
+ // console.log(`[SFTP Get Secret]: ${e}`)
48
+ // }
49
+ // }
49
50
  sftp_const_1.SFTPFILESTORAGE.readFolders = async (params, encoding) => {
50
- const { accessKeyId, secretAccessKey } = await getAWSSecret();
51
- const S3 = new aws_sdk_1.default.S3({
52
- accessKeyId: accessKeyId,
53
- secretAccessKey: secretAccessKey
54
- });
55
51
  let S3params = {
56
52
  Bucket: sftp_const_1.SFTPFILESTORAGE.bucketName,
57
53
  Delimiter: '/',
@@ -62,11 +58,6 @@ if (sftp_const_1.SFTPFILESTORAGE && sftp_const_1.SFTPFILESTORAGE.type == 's3') {
62
58
  return body;
63
59
  };
64
60
  sftp_const_1.SFTPFILESTORAGE.readFile = async (path, encoding) => {
65
- const { accessKeyId, secretAccessKey } = await getAWSSecret();
66
- const S3 = new aws_sdk_1.default.S3({
67
- accessKeyId: accessKeyId,
68
- secretAccessKey: secretAccessKey
69
- });
70
61
  const result = await S3.getObject({
71
62
  Bucket: sftp_const_1.SFTPFILESTORAGE.bucketName,
72
63
  Key: path
@@ -78,11 +69,6 @@ if (sftp_const_1.SFTPFILESTORAGE && sftp_const_1.SFTPFILESTORAGE.type == 's3') {
78
69
  return body;
79
70
  };
80
71
  sftp_const_1.SFTPFILESTORAGE.moveFile = async (path, encoding) => {
81
- const { accessKeyId, secretAccessKey } = await getAWSSecret();
82
- const S3 = new aws_sdk_1.default.S3({
83
- accessKeyId: accessKeyId,
84
- secretAccessKey: secretAccessKey
85
- });
86
72
  try {
87
73
  const copyResult = await S3.copyObject({
88
74
  Bucket: sftp_const_1.SFTPFILESTORAGE.bucketName,
@@ -106,12 +92,7 @@ if (sftp_const_1.SFTPFILESTORAGE && sftp_const_1.SFTPFILESTORAGE.type == 's3') {
106
92
  return true;
107
93
  };
108
94
  /* upload file */
109
- sftp_const_1.SFTPFILESTORAGE.uploadFile = async ({ stream, filename, uploadPath }) => {
110
- const { accessKeyId, secretAccessKey } = await getAWSSecret();
111
- const S3 = new aws_sdk_1.default.S3({
112
- accessKeyId: accessKeyId,
113
- secretAccessKey: secretAccessKey
114
- });
95
+ sftp_const_1.SFTPFILESTORAGE.uploadFile = ({ stream, filename, uploadPath }) => {
115
96
  const id = (0, uuid_1.v4)();
116
97
  let size = 0;
117
98
  return new Promise((resolve, reject) => stream
@@ -1 +1 @@
1
- {"version":3,"file":"sftp-s3.js","sourceRoot":"","sources":["../server/sftp-s3.ts"],"names":[],"mappings":"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"}
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.424",
3
+ "version": "4.3.434",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -23,13 +23,13 @@
23
23
  "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
24
24
  },
25
25
  "dependencies": {
26
- "@things-factory/auth-base": "^4.3.424",
27
- "@things-factory/biz-base": "^4.3.424",
26
+ "@things-factory/auth-base": "^4.3.434",
27
+ "@things-factory/biz-base": "^4.3.434",
28
28
  "@things-factory/env": "^4.3.381",
29
- "@things-factory/integration-fulfillment": "^4.3.424",
30
- "@things-factory/shell": "^4.3.381",
29
+ "@things-factory/integration-fulfillment": "^4.3.434",
30
+ "@things-factory/shell": "^4.3.434",
31
31
  "aws-sdk": "^2.960.0",
32
32
  "xml-js": "^1.6.11"
33
33
  },
34
- "gitHead": "0c04dd6934c7eb335fc5ad2dd55172b5e79cdca7"
34
+ "gitHead": "1e313f6256aa565f49d71ee37f60f173c7b49bc0"
35
35
  }
@@ -1,7 +1,6 @@
1
1
  import { config } from '@things-factory/env'
2
2
 
3
3
  export var SFTPFILESTORAGE: any = config.get('sftpFileStorage')
4
- export var AWSCREDENTIAL: any = config.get('awsCredential')
5
4
  export var SUBMITDATAPATH: string = '/sob/data'
6
5
  export var SUCCESSDATAPATH: string = '/sob/success'
7
6
  export var FAILEDDATAPATH: string = '/sob/failed'
package/server/sftp-s3.ts CHANGED
@@ -3,54 +3,53 @@ import { v4 as uuidv4 } from 'uuid'
3
3
 
4
4
  import { logger } from '@things-factory/env'
5
5
 
6
- import { AWSCREDENTIAL, SFTPFILESTORAGE } from './sftp-const'
6
+ import { SFTPFILESTORAGE } from './sftp-const'
7
7
 
8
8
  const { PassThrough } = require('stream')
9
9
  const path = require('path')
10
10
  const { fs } = require('memfs')
11
11
 
12
12
  if (SFTPFILESTORAGE && SFTPFILESTORAGE.type == 's3') {
13
- const getAWSSecret = async () => {
14
- let accessKeyId
15
- let secretAccessKey
16
- const secretManager = new AWS.SecretsManager({ region: AWSCREDENTIAL.region })
17
- try {
18
- const secretManagerParams = {
19
- SecretId: AWSCREDENTIAL.secretName,
20
- VersionStage: 'AWSCURRENT'
21
- }
22
- await secretManager
23
- .getSecretValue(secretManagerParams, function (err, data) {
24
- if (err) {
25
- console.log(err, err.stack)
26
- } else {
27
- const dataSecretString: any = data.SecretString
28
- if (dataSecretString) {
29
- const secretString = JSON.parse(dataSecretString)
30
- accessKeyId = secretString.accessKeyId
31
- secretAccessKey = secretString.secretAccessKey
32
- }
33
- }
34
- })
35
- .promise()
36
-
37
- if (accessKeyId && secretAccessKey) {
38
- return { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey }
39
- } else {
40
- return null
41
- }
42
- } catch (e) {
43
- console.log(`[SFTP Get Secret]: ${e}`)
44
- }
45
- }
13
+ const S3 = new AWS.S3({
14
+ accessKeyId: SFTPFILESTORAGE.accessKeyId,
15
+ secretAccessKey: SFTPFILESTORAGE.secretAccessKey
16
+ })
17
+
18
+ // const getAWSSecret = async () => {
19
+ // let accessKeyId
20
+ // let secretAccessKey
21
+ // const secretManager = new AWS.SecretsManager({ region: 'ap-southeast-1' })
22
+ // try {
23
+ // const secretManagerParams = {
24
+ // SecretId: AWSCREDENTIALSECRET,
25
+ // VersionStage: 'AWSCURRENT'
26
+ // }
27
+ // await secretManager
28
+ // .getSecretValue(secretManagerParams, function (err, data) {
29
+ // if (err) {
30
+ // console.log(err, err.stack)
31
+ // } else {
32
+ // const dataSecretString: any = data.SecretString
33
+ // if (dataSecretString) {
34
+ // const secretString = JSON.parse(dataSecretString)
35
+ // accessKeyId = secretString.accessKeyId
36
+ // secretAccessKey = secretString.secretAccessKey
37
+ // }
38
+ // }
39
+ // })
40
+ // .promise()
41
+
42
+ // if (accessKeyId && secretAccessKey) {
43
+ // return { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey }
44
+ // } else {
45
+ // return null
46
+ // }
47
+ // } catch (e) {
48
+ // console.log(`[SFTP Get Secret]: ${e}`)
49
+ // }
50
+ // }
46
51
 
47
52
  SFTPFILESTORAGE.readFolders = async (params, encoding) => {
48
- const { accessKeyId, secretAccessKey } = await getAWSSecret()
49
- const S3 = new AWS.S3({
50
- accessKeyId: accessKeyId,
51
- secretAccessKey: secretAccessKey
52
- })
53
-
54
53
  let S3params = {
55
54
  Bucket: SFTPFILESTORAGE.bucketName,
56
55
  Delimiter: '/',
@@ -65,12 +64,6 @@ if (SFTPFILESTORAGE && SFTPFILESTORAGE.type == 's3') {
65
64
  }
66
65
 
67
66
  SFTPFILESTORAGE.readFile = async (path, encoding) => {
68
- const { accessKeyId, secretAccessKey } = await getAWSSecret()
69
- const S3 = new AWS.S3({
70
- accessKeyId: accessKeyId,
71
- secretAccessKey: secretAccessKey
72
- })
73
-
74
67
  const result = await S3.getObject({
75
68
  Bucket: SFTPFILESTORAGE.bucketName,
76
69
  Key: path
@@ -86,12 +79,6 @@ if (SFTPFILESTORAGE && SFTPFILESTORAGE.type == 's3') {
86
79
  }
87
80
 
88
81
  SFTPFILESTORAGE.moveFile = async (path, encoding) => {
89
- const { accessKeyId, secretAccessKey } = await getAWSSecret()
90
- const S3 = new AWS.S3({
91
- accessKeyId: accessKeyId,
92
- secretAccessKey: secretAccessKey
93
- })
94
-
95
82
  try {
96
83
  const copyResult = await S3.copyObject({
97
84
  Bucket: SFTPFILESTORAGE.bucketName,
@@ -117,13 +104,7 @@ if (SFTPFILESTORAGE && SFTPFILESTORAGE.type == 's3') {
117
104
  }
118
105
 
119
106
  /* upload file */
120
- SFTPFILESTORAGE.uploadFile = async ({ stream, filename, uploadPath }) => {
121
- const { accessKeyId, secretAccessKey } = await getAWSSecret()
122
- const S3 = new AWS.S3({
123
- accessKeyId: accessKeyId,
124
- secretAccessKey: secretAccessKey
125
- })
126
-
107
+ SFTPFILESTORAGE.uploadFile = ({ stream, filename, uploadPath }) => {
127
108
  const id = uuidv4()
128
109
  let size: number = 0
129
110