@flowcore/cli 2.0.0 → 2.0.1

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 * added description to start that includes week ([58687a7](https://github.com/flowcore-io/flowcore-cli/commit/58687a7bbb66aaa5d6da26af88e555cbb1e72467))
 
+## [2.0.1](https://github.com/flowcore-io/flowcore-cli/compare/v2.0.0...v2.0.1) (2024-01-15)
+
+
+### Bug Fixes
+
+* set to use scan mode when no time buckets are found ([f1fac44](https://github.com/flowcore-io/flowcore-cli/commit/f1fac447a058eb7a61eeff5690208203d27c0a79))
+
 ## [2.0.0](https://github.com/flowcore-io/flowcore-cli/compare/v1.3.0...v2.0.0) (2024-01-15)
 
 

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @flowcore/cli
 $ flowcore COMMAND
 running command...
 $ flowcore (--version)
-@flowcore/cli/2.0.0 linux-x64 node-v20.10.0
+@flowcore/cli/2.0.1 linux-x64 node-v20.10.0
 $ flowcore --help [COMMAND]
 USAGE
   $ flowcore COMMAND
@@ -103,7 +103,7 @@ EXAMPLES
   $ flowcore config set -l https://auth.flowcore.io/realms/flowcore/.well-known/openid-configuration -c my-client-id -p
 ```
 
-_See code: [src/commands/config/set.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.0/src/commands/config/set.ts)_
+_See code: [src/commands/config/set.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.1/src/commands/config/set.ts)_
 
 ## `flowcore config show`
 
@@ -123,7 +123,7 @@ EXAMPLES
   $ flowcore config show
 ```
 
-_See code: [src/commands/config/show.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.0/src/commands/config/show.ts)_
+_See code: [src/commands/config/show.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.1/src/commands/config/show.ts)_
 
 ## `flowcore help [COMMANDS]`
 
@@ -166,7 +166,7 @@ EXAMPLES
   $ flowcore login --port 8080
 ```
 
-_See code: [src/commands/login.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.0/src/commands/login.ts)_
+_See code: [src/commands/login.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.1/src/commands/login.ts)_
 
 ## `flowcore plugins`
 
@@ -479,7 +479,7 @@ EXAMPLES
   $ flowcore stream https://flowcore.io/<org>/<data core>/<flow type>/[<event type1>,<event type2>,<event type3>].stream -o log -s 3m
 ```
 
-_See code: [src/commands/stream.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.0/src/commands/stream.ts)_
+_See code: [src/commands/stream.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.1/src/commands/stream.ts)_
 
 ## `flowcore version`
 
@@ -516,5 +516,5 @@ DESCRIPTION
   Check what user you are logged in as
 ```
 
-_See code: [src/commands/whoami.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.0/src/commands/whoami.ts)_
+_See code: [src/commands/whoami.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.0.1/src/commands/whoami.ts)_
 <!-- commandsstop -->

package/dist/commands/stream.d.ts

@@ -15,6 +15,8 @@ export default class Stream extends BaseCommand<typeof Stream> {
         timeout: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
     };
     run(): Promise<void>;
+    private calculateBuckets;
+    private calculateTimeDifferenceInHours;
     private fetchTimeBuckets;
     private processEvents;
     private setTimeBucket;

package/dist/commands/stream.js

@@ -97,6 +97,16 @@ export default class Stream extends BaseCommand {
         void this.streamEvents(dataCoreId, aggregator, eventTypes, firstTimeBucket, lastTimeBucket, graphqlClient, observer, flags.live);
         await this.processEvents(observer, flags.destination, flags.output);
     }
+    calculateBuckets(timediff, startTimeBucket) {
+        return _.times(timediff + 1, (n) => dayjs(startTimeBucket).add(n, "hour").format(TIME_BUCKET_PATTERN));
+    }
+    calculateTimeDifferenceInHours(lastTimeBucket, startTimeBucket, firstTimeBucket) {
+        const timediff = dayjs(lastTimeBucket, TIME_BUCKET_HOUR_PATTERN).diff(startTimeBucket, "hour");
+        if (timediff < 0) {
+            ux.error(`Invalid time range, start time bucket (${ux.colorize("yellow", firstTimeBucket)}) is after last time bucket (${ux.colorize("yellow", lastTimeBucket)})`);
+        }
+        return timediff;
+    }
     async fetchTimeBuckets(dataCoreId, aggregator, eventTypes, startTimeBucket, lastTimeBucket, graphqlClient) {
         !this.flags.json && ux.action.start("Fetching time buckets");
         let timeBuckets = [];
@@ -129,6 +139,11 @@ export default class Stream extends BaseCommand {
         }
         timeBuckets = _.uniq(timeBuckets);
         !this.flags.json && ux.action.stop(`Found ${timeBuckets.length} time buckets`);
+        if (timeBuckets.length === 0) {
+            !this.flags.json && this.warn("No time buckets found, setting to scan based on requested time range");
+            const timediff = this.calculateTimeDifferenceInHours(lastTimeBucket, startTimeBucket, createTimebucket(dayjs()));
+            timeBuckets = this.calculateBuckets(timediff, startTimeBucket);
+        }
         return timeBuckets;
     }
     async processEvents(observer, destination, output) {
@@ -225,12 +240,9 @@ export default class Stream extends BaseCommand {
         const currentTime = dayjs.utc();
         let liveMode = false;
         let lastEventId = null;
-        const timediff = dayjs(lastTimeBucket, TIME_BUCKET_HOUR_PATTERN).diff(startTimeBucket, "hour");
-        if (timediff < 0) {
-            ux.error(`Invalid time range, start time bucket (${ux.colorize("yellow", firstTimeBucket)}) is after last time bucket (${ux.colorize("yellow", lastTimeBucket)})`);
-        }
+        const timediff = this.calculateTimeDifferenceInHours(lastTimeBucket, startTimeBucket, firstTimeBucket);
         let timeBuckets = [];
-        timeBuckets = this.flags.scan ? _.times(timediff + 1, (n) => dayjs(startTimeBucket).add(n, "hour").format(TIME_BUCKET_PATTERN)) : (await this.fetchTimeBuckets(dataCoreId, aggregator, eventTypes, startTimeBucket, lastTimeBucket, graphqlClient));
+        timeBuckets = this.flags.scan ? this.calculateBuckets(timediff, startTimeBucket) : (await this.fetchTimeBuckets(dataCoreId, aggregator, eventTypes, startTimeBucket, lastTimeBucket, graphqlClient));
         // eslint-disable-next-line no-constant-condition
         while (true) {
             const timeBucket = timeBuckets.shift();

package/oclif.manifest.json

@@ -275,5 +275,5 @@
       ]
     }
   },
-  "version": "2.0.0"
+  "version": "2.0.1"
 }

package/package.json

@@ -86,7 +86,7 @@
     "prestart": "npm run build",
     "update-schema": "rover graph introspect https://graph.api.staging.flowcore.io/graphql -o schema.gql"
   },
-  "version": "2.0.0",
+  "version": "2.0.1",
   "bugs": "https://github.com/flowcore-io/flowcore-cli/issues",
   "keywords": [
     "flowcore",