@things-factory/integration-sftp 4.3.310 → 4.3.319

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.
Files changed (4) hide show
  1. package/dist-server/sftp-s3.js +52 -10
  2. package/dist-server/sftp-s3.js.map +1 -1
  3. package/package.json +2 -2
  4. package/server/sftp-s3.ts +53 -11
package/dist-server/sftp-s3.js CHANGED
@@ -15,6 +15,38 @@ if (sftp_const_1.SFTPFILESTORAGE && sftp_const_1.SFTPFILESTORAGE.type == 's3') {
15
15
  accessKeyId: sftp_const_1.SFTPFILESTORAGE.accessKeyId,
16
16
  secretAccessKey: sftp_const_1.SFTPFILESTORAGE.secretAccessKey
17
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
+ // }
18
50
  sftp_const_1.SFTPFILESTORAGE.readFolders = async (params, encoding) => {
19
51
  let S3params = {
20
52
  Bucket: sftp_const_1.SFTPFILESTORAGE.bucketName,
@@ -37,16 +69,26 @@ if (sftp_const_1.SFTPFILESTORAGE && sftp_const_1.SFTPFILESTORAGE.type == 's3') {
37
69
  return body;
38
70
  };
39
71
  sftp_const_1.SFTPFILESTORAGE.moveFile = async (path, encoding) => {
40
- const copyResult = await S3.copyObject({
41
- Bucket: sftp_const_1.SFTPFILESTORAGE.bucketName,
42
- CopySource: sftp_const_1.SFTPFILESTORAGE.bucketName + '/' + path.source,
43
- Key: path.destination
44
- }).promise();
45
- const copyBody = copyResult.CopyObjectResult;
46
- const deleteResult = await S3.deleteObject({
47
- Bucket: sftp_const_1.SFTPFILESTORAGE.bucketName,
48
- Key: path.source
49
- }).promise();
72
+ try {
73
+ const copyResult = await S3.copyObject({
74
+ Bucket: sftp_const_1.SFTPFILESTORAGE.bucketName,
75
+ CopySource: sftp_const_1.SFTPFILESTORAGE.bucketName + '/' + path.source,
76
+ Key: path.destination
77
+ }).promise();
78
+ const copyBody = copyResult.CopyObjectResult;
79
+ }
80
+ catch (e) {
81
+ console.log(`[S3 Copy Object] ${e}`);
82
+ }
83
+ try {
84
+ const deleteResult = await S3.deleteObject({
85
+ Bucket: sftp_const_1.SFTPFILESTORAGE.bucketName,
86
+ Key: path.source
87
+ }).promise();
88
+ }
89
+ catch (e) {
90
+ console.log(`[S3 Delete Object] ${e}`);
91
+ }
50
92
  return true;
51
93
  };
52
94
  /* upload file */
package/dist-server/sftp-s3.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sftp-s3.js","sourceRoot":"","sources":["../server/sftp-s3.ts"],"names":[],"mappings":";;;;;AAAA,sDAAyB;AACzB,+BAAmC;AAEnC,6CAA4C;AAE5C,6CAA8C;AAE9C,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AACzC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;AAE/B,IAAI,4BAAe,IAAI,4BAAe,CAAC,IAAI,IAAI,IAAI,EAAE;IACnD,MAAM,EAAE,GAAG,IAAI,iBAAG,CAAC,EAAE,CAAC;QACpB,WAAW,EAAE,4BAAe,CAAC,WAAW;QACxC,eAAe,EAAE,4BAAe,CAAC,eAAe;KACjD,CAAC,CAAA;IAEF,4BAAe,CAAC,WAAW,GAAG,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;QACvD,IAAI,QAAQ,GAAG;YACb,MAAM,EAAE,4BAAe,CAAC,UAAU;YAClC,SAAS,EAAE,GAAG;YACd,MAAM,EAAE,MAAM,CAAC,IAAI;SACpB,CAAA;QAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAA;QAEvD,IAAI,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAA;QAE1B,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IAED,4BAAe,CAAC,QAAQ,GAAG,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;QAClD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,CAAC;YAChC,MAAM,EAAE,4BAAe,CAAC,UAAU;YAClC,GAAG,EAAE,IAAI;SACV,CAAC,CAAC,OAAO,EAAE,CAAA;QAEZ,IAAI,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;QAEtB,IAAI,QAAQ,EAAE;YACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;SAC/B;QAED,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IAED,4BAAe,CAAC,QAAQ,GAAG,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;QAClD,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC;YACrC,MAAM,EAAE,4BAAe,CAAC,UAAU;YAClC,UAAU,EAAE,4BAAe,CAAC,UAAU,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM;YAC1D,GAAG,EAAE,IAAI,CAAC,WAAW;SACtB,CAAC,CAAC,OAAO,EAAE,CAAA;QAEZ,MAAM,QAAQ,GAAG,UAAU,CAAC,gBAAgB,CAAA;QAE5C,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC;YACzC,MAAM,EAAE,4BAAe,CAAC,UAAU;YAClC,GAAG,EAAE,IAAI,CAAC,MAAM;SACjB,CAAC,CAAC,OAAO,EAAE,CAAA;QAEZ,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IAED,iBAAiB;IACjB,4BAAe,CAAC,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;QAChE,MAAM,EAAE,GAAG,IAAA,SAAM,GAAE,CAAA;QACnB,IAAI,IAAI,GAAW,CAAC,CAAA;QAEpB,OAAO,IAAI,OAAO,CAA6C,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACjF,MAAM;aACH,IAAI,CACH,CAAC,GAAG,EAAE;YACJ,IAAI,IAAI,GAAG,IAAI,WAAW,EAAE,CAAA;YAE5B,EAAE,CAAC,MAAM,CACP;gBACE,MAAM,EAAE,4BAAe,CAAC,UAAU;gBAClC,GAAG,EAAE,UAAU,GAAG,GAAG,GAAG,QAAQ;gBAChC,IAAI,EAAE,IAAI;aACX,EACD,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAC7E,CAAA;YAED,OAAO,IAAI,CAAA;QACb,CAAC,CAAC,EAAE,CACL;aACA,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;aACnC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAC/C,CAAA;IACH,CAAC,CAAA;IAED,YAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAA;CAC3C"}
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.310",
3
+ "version": "4.3.319",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -31,5 +31,5 @@
31
31
  "aws-sdk": "^2.960.0",
32
32
  "xml-js": "^1.6.11"
33
33
  },
34
- "gitHead": "a65e44ff31b1ca683c81c028d46803916b878730"
34
+ "gitHead": "35875fa9b5bbb19e372f5a1cbcd32eb0411cfcb9"
35
35
  }
package/server/sftp-s3.ts CHANGED
@@ -15,6 +15,40 @@ if (SFTPFILESTORAGE && SFTPFILESTORAGE.type == 's3') {
15
15
  secretAccessKey: SFTPFILESTORAGE.secretAccessKey
16
16
  })
17
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
+ // }
51
+
18
52
  SFTPFILESTORAGE.readFolders = async (params, encoding) => {
19
53
  let S3params = {
20
54
  Bucket: SFTPFILESTORAGE.bucketName,
@@ -45,18 +79,26 @@ if (SFTPFILESTORAGE && SFTPFILESTORAGE.type == 's3') {
45
79
  }
46
80
 
47
81
  SFTPFILESTORAGE.moveFile = async (path, encoding) => {
48
- const copyResult = await S3.copyObject({
49
- Bucket: SFTPFILESTORAGE.bucketName,
50
- CopySource: SFTPFILESTORAGE.bucketName + '/' + path.source,
51
- Key: path.destination
52
- }).promise()
53
-
54
- const copyBody = copyResult.CopyObjectResult
82
+ try {
83
+ const copyResult = await S3.copyObject({
84
+ Bucket: SFTPFILESTORAGE.bucketName,
85
+ CopySource: SFTPFILESTORAGE.bucketName + '/' + path.source,
86
+ Key: path.destination
87
+ }).promise()
88
+
89
+ const copyBody = copyResult.CopyObjectResult
90
+ } catch (e) {
91
+ console.log(`[S3 Copy Object] ${e}`)
92
+ }
55
93
 
56
- const deleteResult = await S3.deleteObject({
57
- Bucket: SFTPFILESTORAGE.bucketName,
58
- Key: path.source
59
- }).promise()
94
+ try {
95
+ const deleteResult = await S3.deleteObject({
96
+ Bucket: SFTPFILESTORAGE.bucketName,
97
+ Key: path.source
98
+ }).promise()
99
+ } catch (e) {
100
+ console.log(`[S3 Delete Object] ${e}`)
101
+ }
60
102
 
61
103
  return true
62
104
  }