@flowcore/cli 2.7.0 → 2.8.1

package/CHANGELOG.md

@@ -10,6 +10,20 @@
 
 * added description to start that includes week ([58687a7](https://github.com/flowcore-io/flowcore-cli/commit/58687a7bbb66aaa5d6da26af88e555cbb1e72467))
 
+## [2.8.1](https://github.com/flowcore-io/flowcore-cli/compare/v2.8.0...v2.8.1) (2024-02-26)
+
+
+### Bug Fixes
+
+* always get current time in live mode ([1a0befc](https://github.com/flowcore-io/flowcore-cli/commit/1a0befc1f29ff0157121ccbd8346357e89c35b18))
+
+## [2.8.0](https://github.com/flowcore-io/flowcore-cli/compare/v2.7.0...v2.8.0) (2024-02-24)
+
+
+### Features
+
+* add now option to start arg to start streaming from now ([8070602](https://github.com/flowcore-io/flowcore-cli/commit/80706025d0a3ce0c9a0e57294d39eb530b34d3f9))
+
 ## [2.7.0](https://github.com/flowcore-io/flowcore-cli/compare/v2.6.0...v2.7.0) (2024-02-22)
 
 

package/README.md

@@ -18,7 +18,7 @@ $ npm install -g @flowcore/cli
 $ flowcore COMMAND
 running command...
 $ flowcore (--version)
-@flowcore/cli/2.7.0 linux-x64 node-v20.11.1
+@flowcore/cli/2.8.1 linux-x64 node-v20.11.1
 $ flowcore --help [COMMAND]
 USAGE
   $ flowcore COMMAND
@@ -75,7 +75,7 @@ EXAMPLES
   $ flowcore apply -f ./path/to/manifest.yml
 ```
 
-_See code: [src/commands/apply.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.7.0/src/commands/apply.ts)_
+_See code: [src/commands/apply.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.8.1/src/commands/apply.ts)_
 
 ## `flowcore autocomplete [SHELL]`
 
@@ -736,7 +736,7 @@ FLAGS
   -l, --[no-]live            Change to live mode when reaching last time bucket
   -o, --output=<option>      [default: http] Output format
                              <options: http|log>
-  -s, --start=<value>        Start time bucket to stream from, example: (1y, 1m, 1w, 1d, 1h)
+  -s, --start=<value>        Start time bucket to stream from, example: (1y, 1m, 1w, 1d, 1h, now)
   -t, --timeout=<value>      [default: 5000] Timeout in milliseconds to wait for a response from the destination
       --profile=<value>      Specify the configuration profile to use
 
@@ -753,7 +753,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.7.0/src/commands/stream.ts)_
+_See code: [src/commands/stream.ts](https://github.com/flowcore-io/flowcore-cli/blob/v2.8.1/src/commands/stream.ts)_
 
 ## `flowcore version`
 

package/dist/commands/stream.js

@@ -1,6 +1,7 @@
 import { Queue } from "@datastructures-js/queue";
 import { BaseCommand, LOGIN_CODES, ValidateLogin } from "@flowcore/cli-plugin-config";
 import { Args, Flags, ux } from '@oclif/core';
+import { TimeUuid } from "cassandra-uuid";
 import dayjs from "dayjs";
 import isSameOrBefore from "dayjs/plugin/isSameOrBefore.js";
 import utc from "dayjs/plugin/utc.js";
@@ -32,7 +33,7 @@ export default class Stream extends BaseCommand {
         live: Flags.boolean({ allowNo: true, char: 'l', default: true, description: 'Change to live mode when reaching last time bucket' }),
         output: Flags.string({ char: 'o', default: 'http', description: 'Output format', options: ['http', 'log'] }),
         scan: Flags.boolean({ char: 'c', default: false, description: 'Scan the full time range' }),
-        start: Flags.string({ char: 's', description: 'Start time bucket to stream from, example: (1y, 1m, 1w, 1d, 1h)' }),
+        start: Flags.string({ char: 's', description: 'Start time bucket to stream from, example: (1y, 1m, 1w, 1d, 1h, now)' }),
         timeout: Flags.integer({ char: 't', default: 5000, description: 'Timeout in milliseconds to wait for a response from the destination' }),
     };
     async run() {
@@ -84,27 +85,35 @@ export default class Stream extends BaseCommand {
             dataCoreId,
         });
         let firstTimeBucket = eventRangeRequest.datacore.flowtypes.find(ft => ft.aggregator === aggregator)?.events.find(e => eventTypes.includes(e.name))?.catalog.range.firstTimeBucket;
+        let afterEventId;
         if (!firstTimeBucket && !flags.start) {
-            firstTimeBucket = createTimebucket(dayjs());
+            firstTimeBucket = createTimebucket(dayjs.utc());
             !this.flags.json && this.warn(`First time bucket not found, setting to current time (${ux.colorize("yellowBright", firstTimeBucket)})`);
         }
-        if (flags.start) {
-            firstTimeBucket = this.setTimeBucket(dayjs(), flags.start);
+        if (flags.start === "now") {
+            afterEventId = TimeUuid.now();
+            firstTimeBucket = createTimebucket(dayjs.utc());
+            !this.flags.json && this.log(ux.colorize("green", `Setting first time bucket and event id to now (${ux.colorize("yellowBright", firstTimeBucket)}), (${ux.colorize("yellowBright", afterEventId)})`));
+        }
+        else if (flags.start) {
+            firstTimeBucket = this.setTimeBucket(dayjs.utc(), flags.start);
             !this.flags.json && this.log(ux.colorize("green", `Setting first time bucket to ${ux.colorize("yellow", flags.start)} ago (${ux.colorize("yellowBright", firstTimeBucket)})`));
         }
         if (!firstTimeBucket) {
-            firstTimeBucket = this.setTimeBucket(dayjs(), "1d");
+            firstTimeBucket = this.setTimeBucket(dayjs.utc(), "1d");
             !this.flags.json && this.log(ux.colorize("green", `Setting first time bucket to ${ux.colorize("yellow", "1d")} ago (${ux.colorize("yellowBright", firstTimeBucket)})`));
         }
-        let lastTimeBucket = eventRangeRequest.datacore.flowtypes.find(ft => ft.aggregator === aggregator)?.events.find(e => eventTypes.includes(e.name))?.catalog.range.lastTimeBucket;
+        let lastTimeBucket = flags.start === "now"
+            ? firstTimeBucket
+            : eventRangeRequest.datacore.flowtypes.find(ft => ft.aggregator === aggregator)?.events.find(e => eventTypes.includes(e.name))?.catalog.range.lastTimeBucket;
         if (!lastTimeBucket) {
-            lastTimeBucket = createTimebucket(dayjs());
+            lastTimeBucket = createTimebucket(dayjs.utc());
             !this.flags.json && this.warn(`Last time bucket not found, setting to current time (${ux.colorize("yellowBright", lastTimeBucket)})`);
         }
         const observer = new Subject();
         !this.flags.json && this.log(ux.colorize("blackBright", `Starting to stream events for ${dataCoreId} - ${aggregator} - ${eventTypes}, press ${ux.colorize("whiteBright", "ctrl+c")} to stop`));
         // eslint-disable-next-line no-void
-        void this.streamEvents(dataCoreId, aggregator, eventTypes, firstTimeBucket, lastTimeBucket, graphqlClient, observer, flags.live);
+        void this.streamEvents(dataCoreId, aggregator, eventTypes, firstTimeBucket, lastTimeBucket, graphqlClient, observer, flags.live, afterEventId);
         await this.processEvents(observer, flags.destination, flags.output, flags.header);
     }
     calculateBuckets(timediff, startTimeBucket) {
@@ -151,7 +160,7 @@ export default class Stream extends BaseCommand {
         !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()));
+            const timediff = this.calculateTimeDifferenceInHours(lastTimeBucket, startTimeBucket, createTimebucket(dayjs.utc()));
             timeBuckets = this.calculateBuckets(timediff, startTimeBucket);
         }
         return timeBuckets;
@@ -251,11 +260,11 @@ export default class Stream extends BaseCommand {
             }
         }
     }
-    async streamEvents(dataCoreId, aggregator, eventTypes, firstTimeBucket, lastTimeBucket, graphqlClient, observer, live) {
+    async streamEvents(dataCoreId, aggregator, eventTypes, firstTimeBucket, lastTimeBucket, graphqlClient, observer, live, afterEventId) {
         const startTimeBucket = dayjs(firstTimeBucket, TIME_BUCKET_HOUR_PATTERN);
-        const currentTime = dayjs.utc();
+        const currentTime = () => dayjs.utc();
         let liveMode = false;
-        let lastEventId = null;
+        let lastEventId = afterEventId ?? null;
         const timediff = this.calculateTimeDifferenceInHours(lastTimeBucket, startTimeBucket, firstTimeBucket);
         let timeBuckets = [];
         timeBuckets = this.flags.scan ? this.calculateBuckets(timediff, startTimeBucket) : (await this.fetchTimeBuckets(dataCoreId, aggregator, eventTypes, startTimeBucket, lastTimeBucket, graphqlClient));
@@ -313,7 +322,7 @@ export default class Stream extends BaseCommand {
                     !this.flags.json && this.warn("Reached last time bucket, switching to live mode");
                     liveMode = true;
                 }
-                timeBuckets.push(createTimebucketDayjs(currentTime).format(TIME_BUCKET_PATTERN));
+                timeBuckets.push(createTimebucketDayjs(currentTime()).format(TIME_BUCKET_PATTERN));
             }
             if (liveMode && !found) {
                 // eslint-disable-next-line no-await-in-loop

package/oclif.manifest.json

@@ -125,7 +125,7 @@
         },
         "start": {
           "char": "s",
-          "description": "Start time bucket to stream from, example: (1y, 1m, 1w, 1d, 1h)",
+          "description": "Start time bucket to stream from, example: (1y, 1m, 1w, 1d, 1h, now)",
           "name": "start",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -157,5 +157,5 @@
       ]
     }
   },
-  "version": "2.7.0"
+  "version": "2.8.1"
 }

package/package.json

@@ -16,6 +16,7 @@
     "@oclif/plugin-plugins": "^4",
     "@oclif/plugin-version": "^2.0.8",
     "axios": "^1.6.2",
+    "cassandra-uuid": "^0.1.0",
     "cross-fetch": "^4.0.0",
     "dayjs": "^1.11.10",
     "enquirer": "^2.4.1",
@@ -89,7 +90,7 @@
     "prestart": "npm run build",
     "update-schema": "rover graph introspect https://graph.api.staging.flowcore.io/graphql -o schema.gql"
   },
-  "version": "2.7.0",
+  "version": "2.8.1",
   "bugs": "https://github.com/flowcore-io/flowcore-cli/issues",
   "keywords": [
     "flowcore",