@hestia-earth/pipeline-utils 0.16.4 → 0.16.5

package/dist/ec2.js

@@ -7,11 +7,9 @@ const log_1 = require("./log");
 const s3_1 = require("./s3");
 const defaultInstanceIds = (process.env.START_INSTANCE_ID || '').split(',');
 const startInstances = (functionName, instanceIds = defaultInstanceIds) => s3_1.isS3Mode
-    ? (0, rxjs_1.from)(new client_ec2_1.EC2Client({}).send(new client_ec2_1.StartInstancesCommand({
-        InstanceIds: instanceIds
-    }))).pipe((0, rxjs_1.take)(1), (0, rxjs_1.map)(res => {
-        (0, log_1.debug)(`EC2 start instances ${functionName}`, res);
-        return res;
+    ? (0, rxjs_1.from)(new client_ec2_1.EC2Client({}).send(new client_ec2_1.DescribeInstancesCommand({ InstanceIds: instanceIds }))).pipe((0, rxjs_1.map)(res => (res.Reservations || []).flatMap(r => r.Instances || [])), (0, rxjs_1.mergeAll)(), (0, rxjs_1.filter)(instance => { var _a; return ((_a = instance.State) === null || _a === void 0 ? void 0 : _a.Name) === 'stopped'; }), (0, rxjs_1.take)(1), (0, rxjs_1.switchMap)(instance => {
+        (0, log_1.debug)('EC2 start instances', functionName, instance.InstanceId);
+        return new client_ec2_1.EC2Client({}).send(new client_ec2_1.StartInstancesCommand({ InstanceIds: [instance.InstanceId] }));
     }))
     : (0, rxjs_1.of)(null);
 exports.startInstances = startInstances;

package/dist/ec2.js.map

@@ -1 +1 @@
-{"version":3,"file":"ec2.js","sourceRoot":"","sources":["../src/ec2.ts"],"names":[],"mappings":";;;AAAA,oDAAuE;AACvE,+BAA2C;AAE3C,+BAA8B;AAC9B,6BAAgC;AAEhC,MAAM,kBAAkB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAErE,MAAM,cAAc,GAAG,CAAC,YAAoB,EAAE,WAAW,GAAG,kBAAkB,EAAE,EAAE,CACvF,aAAQ;IACN,CAAC,CAAC,IAAA,WAAI,EACF,IAAI,sBAAS,CAAC,EAAE,CAAC,CAAC,IAAI,CACpB,IAAI,kCAAqB,CAAC;QACxB,WAAW,EAAE,WAAW;KACzB,CAAC,CACH,CACF,CAAC,IAAI,CACJ,IAAA,WAAI,EAAC,CAAC,CAAC,EACP,IAAA,UAAG,EAAC,GAAG,CAAC,EAAE;QACR,IAAA,WAAK,EAAC,uBAAuB,YAAY,EAAE,EAAE,GAAG,CAAC,CAAC;QAClD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CACH;IACH,CAAC,CAAC,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;AAfF,QAAA,cAAc,kBAeZ"}
+{"version":3,"file":"ec2.js","sourceRoot":"","sources":["../src/ec2.ts"],"names":[],"mappings":";;;AAAA,oDAAiG;AACjG,+BAAwE;AAExE,+BAA8B;AAC9B,6BAAgC;AAEhC,MAAM,kBAAkB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAErE,MAAM,cAAc,GAAG,CAAC,YAAoB,EAAE,WAAW,GAAG,kBAAkB,EAAE,EAAE,CACvF,aAAQ;IACN,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,sBAAS,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,qCAAwB,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAC3F,IAAA,UAAG,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,EACpE,IAAA,eAAQ,GAAE,EACV,IAAA,aAAM,EAAC,QAAQ,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,QAAQ,CAAC,KAAK,0CAAE,IAAI,MAAK,SAAS,CAAA,EAAA,CAAC,EACtD,IAAA,WAAI,EAAC,CAAC,CAAC,EACP,IAAA,gBAAS,EAAC,QAAQ,CAAC,EAAE;QACnB,IAAA,WAAK,EAAC,qBAAqB,EAAE,YAAY,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;QAChE,OAAO,IAAI,sBAAS,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,kCAAqB,CAAC,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IACnG,CAAC,CAAC,CACH;IACH,CAAC,CAAC,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;AAZF,QAAA,cAAc,kBAYZ"}

package/dist/lambda.js

@@ -13,7 +13,7 @@ const invoke = (functionName, params) => s3_1.isS3Mode
         LogType: 'None',
         Payload: (0, util_utf8_node_1.fromUtf8)(JSON.stringify(params))
     }))).pipe((0, rxjs_1.take)(1), (0, rxjs_1.map)(res => {
-        (0, log_1.info)(`invoke ${functionName}`, { params }, res);
+        (0, log_1.info)('Lambda invoke', functionName, { params }, res);
         return res;
     }))
     : (0, rxjs_1.of)(null);

package/dist/lambda.js.map

@@ -1 +1 @@
-{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../src/lambda.ts"],"names":[],"mappings":";;;AAAA,0DAAqE;AACrE,+BAA2C;AAC3C,4DAAmD;AAEnD,+BAA6B;AAC7B,6BAAgD;AAEzC,MAAM,MAAM,GAAG,CAAC,YAAoB,EAAE,MAA4C,EAAE,EAAE,CAC3F,aAAQ;IACN,CAAC,CAAC,IAAA,WAAI,EACF,IAAI,4BAAY,CAAC,EAAE,CAAC,CAAC,IAAI,CACvB,IAAI,6BAAa,CAAC;QAChB,YAAY,EAAE,YAAY;QAC1B,cAAc,EAAE,OAAO;QACvB,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,IAAA,yBAAQ,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;KAC1C,CAAC,CACH,CACF,CAAC,IAAI,CACJ,IAAA,WAAI,EAAC,CAAC,CAAC,EACP,IAAA,UAAG,EAAC,GAAG,CAAC,EAAE;QACR,IAAA,UAAI,EAAC,UAAU,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;QAChD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CACH;IACH,CAAC,CAAC,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;AAlBF,QAAA,MAAM,UAkBJ"}
+{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../src/lambda.ts"],"names":[],"mappings":";;;AAAA,0DAAqE;AACrE,+BAA2C;AAC3C,4DAAmD;AAEnD,+BAA6B;AAC7B,6BAAgD;AAEzC,MAAM,MAAM,GAAG,CAAC,YAAoB,EAAE,MAA4C,EAAE,EAAE,CAC3F,aAAQ;IACN,CAAC,CAAC,IAAA,WAAI,EACF,IAAI,4BAAY,CAAC,EAAE,CAAC,CAAC,IAAI,CACvB,IAAI,6BAAa,CAAC;QAChB,YAAY,EAAE,YAAY;QAC1B,cAAc,EAAE,OAAO;QACvB,OAAO,EAAE,MAAM;QACf,OAAO,EAAE,IAAA,yBAAQ,EAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;KAC1C,CAAC,CACH,CACF,CAAC,IAAI,CACJ,IAAA,WAAI,EAAC,CAAC,CAAC,EACP,IAAA,UAAG,EAAC,GAAG,CAAC,EAAE;QACR,IAAA,UAAI,EAAC,eAAe,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;QACrD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CACH;IACH,CAAC,CAAC,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;AAlBF,QAAA,MAAM,UAkBJ"}

package/dist/sns.js

@@ -28,7 +28,7 @@ const publishSnsMessage = (functionName, params, topicArn = process.env.SNS_TOPI
         return res;
     }), (0, rxjs_1.catchError)(err => {
         (0, log_1.error)(`SNS publish ${functionName}`, { params }, ', params byte size:', (0, utils_1.byteSize)(params), err);
-        return (0, rxjs_1.throwError)(err);
+        return (0, rxjs_1.throwError)(() => err);
     }))
     : (0, rxjs_1.of)(null);
 exports.publishSnsMessage = publishSnsMessage;

package/dist/sns.js.map

@@ -1 +1 @@
-{"version":3,"file":"sns.js","sourceRoot":"","sources":["../src/sns.ts"],"names":[],"mappings":";;;AAAA,oDAAgE;AAChE,+BAAmE;AAEnE,+BAAoC;AACpC,6BAAgD;AAChD,mCAAmC;AAM5B,MAAM,iBAAiB,GAAG,CAC/B,YAAoB,EACpB,MAA4C,EAC5C,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,EAChC,SAAqB,EAAE,EACvB,EAAE,CACF,aAAQ;IACN,CAAC,CAAC,IAAA,WAAI,EACF,IAAI,sBAAS,CAAC,EAAE,CAAC,CAAC,IAAI,CACpB,IAAI,2BAAc,CAAC;QACjB,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QAC/B,iBAAiB,EAAE;YACjB,YAAY,EAAE;gBACZ,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,YAAY;aAC1B;YACD,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;gBACjD,GAAG;gBACH;oBACE,QAAQ,EAAE,QAAQ;oBAClB,WAAW,EAAE,KAAK;iBACnB;aACF,CAAC,CACH;SACF;KACF,CAAC,CACH,CACF,CAAC,IAAI,CACJ,IAAA,WAAI,EAAC,CAAC,CAAC,EACP,IAAA,UAAG,EAAC,GAAG,CAAC,EAAE;QACR,IAAA,UAAI,EAAC,eAAe,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,qBAAqB,EAAE,IAAA,gBAAQ,EAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;QAC9F,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,EACF,IAAA,iBAAU,EAAC,GAAG,CAAC,EAAE;QACf,IAAA,WAAK,EAAC,eAAe,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,qBAAqB,EAAE,IAAA,gBAAQ,EAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;QAC/F,OAAO,IAAA,iBAAU,EAAC,GAAG,CAAC,CAAC;IACzB,CAAC,CAAC,CACH;IACH,CAAC,CAAC,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;AAxCF,QAAA,iBAAiB,qBAwCf"}
+{"version":3,"file":"sns.js","sourceRoot":"","sources":["../src/sns.ts"],"names":[],"mappings":";;;AAAA,oDAAgE;AAChE,+BAAmE;AAEnE,+BAAoC;AACpC,6BAAgD;AAChD,mCAAmC;AAM5B,MAAM,iBAAiB,GAAG,CAC/B,YAAoB,EACpB,MAA4C,EAC5C,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,EAChC,SAAqB,EAAE,EACvB,EAAE,CACF,aAAQ;IACN,CAAC,CAAC,IAAA,WAAI,EACF,IAAI,sBAAS,CAAC,EAAE,CAAC,CAAC,IAAI,CACpB,IAAI,2BAAc,CAAC;QACjB,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;QAC/B,iBAAiB,EAAE;YACjB,YAAY,EAAE;gBACZ,QAAQ,EAAE,QAAQ;gBAClB,WAAW,EAAE,YAAY;aAC1B;YACD,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;gBACjD,GAAG;gBACH;oBACE,QAAQ,EAAE,QAAQ;oBAClB,WAAW,EAAE,KAAK;iBACnB;aACF,CAAC,CACH;SACF;KACF,CAAC,CACH,CACF,CAAC,IAAI,CACJ,IAAA,WAAI,EAAC,CAAC,CAAC,EACP,IAAA,UAAG,EAAC,GAAG,CAAC,EAAE;QACR,IAAA,UAAI,EAAC,eAAe,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,qBAAqB,EAAE,IAAA,gBAAQ,EAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;QAC9F,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,EACF,IAAA,iBAAU,EAAC,GAAG,CAAC,EAAE;QACf,IAAA,WAAK,EAAC,eAAe,YAAY,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,qBAAqB,EAAE,IAAA,gBAAQ,EAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;QAC/F,OAAO,IAAA,iBAAU,EAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC,CAAC,CACH;IACH,CAAC,CAAC,IAAA,SAAE,EAAC,IAAI,CAAC,CAAC;AAxCF,QAAA,iBAAiB,qBAwCf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/pipeline-utils",
-  "version": "0.16.4",
+  "version": "0.16.5",
   "description": "Utilities for running pipelines",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/ec2.ts

@@ -1,5 +1,5 @@
-import { EC2Client, StartInstancesCommand } from '@aws-sdk/client-ec2';
-import { from, of, take, map } from 'rxjs';
+import { DescribeInstancesCommand, EC2Client, StartInstancesCommand } from '@aws-sdk/client-ec2';
+import { from, of, take, map, filter, switchMap, mergeAll } from 'rxjs';
 
 import { debug } from './log';
 import { isS3Mode } from './s3';
@@ -8,17 +8,14 @@ const defaultInstanceIds = (process.env.START_INSTANCE_ID || '').split(',');
 
 export const startInstances = (functionName: string, instanceIds = defaultInstanceIds) =>
   isS3Mode
-    ? from(
-        new EC2Client({}).send(
-          new StartInstancesCommand({
-            InstanceIds: instanceIds
-          })
-        )
-      ).pipe(
+    ? from(new EC2Client({}).send(new DescribeInstancesCommand({ InstanceIds: instanceIds }))).pipe(
+        map(res => (res.Reservations || []).flatMap(r => r.Instances || [])),
+        mergeAll(),
+        filter(instance => instance.State?.Name === 'stopped'),
         take(1),
-        map(res => {
-          debug(`EC2 start instances ${functionName}`, res);
-          return res;
+        switchMap(instance => {
+          debug('EC2 start instances', functionName, instance.InstanceId);
+          return new EC2Client({}).send(new StartInstancesCommand({ InstanceIds: [instance.InstanceId] }));
         })
       )
     : of(null);

package/src/lambda.ts

@@ -19,7 +19,7 @@ export const invoke = (functionName: string, params: IFunctionParam | Record<str
       ).pipe(
         take(1),
         map(res => {
-          info(`invoke ${functionName}`, { params }, res);
+          info('Lambda invoke', functionName, { params }, res);
           return res;
         })
       )

package/src/sns.ts

@@ -46,7 +46,7 @@ export const publishSnsMessage = (
         }),
         catchError(err => {
           error(`SNS publish ${functionName}`, { params }, ', params byte size:', byteSize(params), err);
-          return throwError(err);
+          return throwError(() => err);
         })
       )
     : of(null);