Prepare v0.38.0

README.md

@@ -164,6 +164,8 @@ There are several installations you need to perform to get STH up and running, a
 - ts-node
 - docker
 - pip
+- wget
+- jq
 
 Our hub is based on node.js, so you need to install node.js and npm, which is the default package manager for node.js.
 To check if you already have Node.js(v16.xx.x) and npm installed, run the following commands in your console:
@@ -175,7 +177,7 @@ npm -v
 
 If none of the above commands is found, **you must proceed with the installation.**
 
-It is recommended to use a **Node version manager** like [nvm](https://github.com/nvm-sh/nvm/blob/master/README.md) to install Node.js and npm. Do it by running the install script using either of the commands bellow. 
+It is recommended to use a **Node version manager** like [nvm](https://github.com/nvm-sh/nvm/blob/master/README.md) to install Node.js and npm. Do it by running the install script using either of the commands bellow.
 > Note: Make sure you replace v0.39.0 with the latest version of nvm. The actual version of nvm to install is [here](https://github.com/nvm-sh/nvm/blob/master/README.md#install--update-script).
 
 ```bash
@@ -221,7 +223,7 @@ $ npm -v
 8.15.0
 ```
 
-**OK!** It looks like you have successfully installed node.js and npm. 
+**OK!** It looks like you have successfully installed node.js and npm.
 
 There are two more installations you need to perform, run the following commands in your console one after another:
 
@@ -249,10 +251,22 @@ pip --version
 
 If they are not present, refer to the official installation guide for [Python](https://wiki.python.org/moin/BeginnersGuide/Download) and [Pip](https://pip.pypa.io/en/stable/installation/).
 
+Additionally you have to have `wget` and `jq` installed:
+
+```bash
+# Debian based distributions:
+apt install wget jq
+
+# Mac
+brew install wget jq
+```
+
 > **If you don't want to use Docker, please skip this step!**
 
 We also work with Docker, but this is optional. Running STH is possible without Docker in the background. If you want to use Docker, you can install it by running the following commands in your console:
 
+*On Mac u can use [Docker-Desktop](https://www.docker.com/products/docker-desktop/)*
+
 ```bash
 # Install docker and docker-compose
 sudo apt install -y docker.io docker-compose
@@ -302,7 +316,7 @@ In the meantime let me describe for you what is happening in the command you hav
 
 When both the package installation and build are complete, STH should be ready to run.
 
- 
+
 
 ---
 
@@ -499,7 +513,7 @@ We use our own scripts to control our monorepo. Here's a couple of helpful comma
 ```bash
 ./scripts/run-script.js [script]
     # Run an npm script in each package that contains that script.
-./scripts/run-script.js --scope @scramjet/<package_name> <script-name> 
+./scripts/run-script.js --scope @scramjet/<package_name> <script-name>
     # Run script only in one package
 ./scripts/run-script.js --workspace packages <script-name>
     # Run script in all packages in workspace

bdd/features/e2e/E2E-010-cli.feature

@@ -110,14 +110,14 @@ Feature: CLI tests
         When I execute CLI with "seq deploy ../packages/event-sequence-v2.tar.gz"
         When I execute CLI with "inst event emit - test-event test message"
         When I execute CLI with "inst event on - test-event-response"
-        Then I get event "test-event-response" with event message "{\"eventName\":\"test-event-response\",\"message\":\"message from sequence\"}" from Instance
+        Then I get event "test-event-response" with event message "\"message from sequence\"" from Instance
 
     @ci-api @cli
     Scenario: E2E-010 TC-013a Test Instance 'event' option without payload
         When I execute CLI with "seq deploy ../packages/event-sequence-v2.tar.gz"
         When I execute CLI with "inst event emit - test-event"
         When I execute CLI with "inst event on - test-event-response"
-        Then I get event "test-event-response" with event message "{\"eventName\":\"test-event-response\",\"message\":\"message from sequence\"}" from Instance
+        Then I get event "test-event-response" with event message "\"message from sequence\"" from Instance
 
     @ci-api @cli
     Scenario: E2E-010 TC-014 Test Sequence 'start' with multiple JSON arguments

bdd/features/e2e/E2E-012-stream-flooding-test.feature

@@ -11,7 +11,7 @@ Feature: Stream flooding tests. Ensure that even if a large amount of data is se
         And wait for "3000" ms
         And send event "test-event" to instance with message "test message"
         Then get event "test-event-response" from instance
-        Then instance response body is "{\"eventName\":\"test-event-response\",\"message\":\"message from sequence\"}"
+        Then instance response body is "\"message from sequence\""
         Then host is still running
 
     @ci-api @runner-cleanup
@@ -23,6 +23,6 @@ Feature: Stream flooding tests. Ensure that even if a large amount of data is se
         And get runner PID
         Then get event "test-event-response" from instance
         When wait for "1000" ms
-        Then instance response body is "{\"eventName\":\"test-event-response\",\"message\":\"message from sequence\"}"
+        Then instance response body is "\"message from sequence\""
         Then host is still running
 

bdd/features/e2e/E2E-015-unified.feature

@@ -75,6 +75,6 @@ Feature: Test our shiny new Python runner
         And send event "test-event" to instance with message "foo"
         Then instance emits event "test-response" with body
             """
-            {"eventName":"test-response","message":"reply to foo"}
+            "reply to foo"
             """
         And host is still running

bdd/lib/utils.ts

@@ -251,6 +251,23 @@ export async function killProcessByName(processName: string): Promise<void> {
     });
 }
 
+export async function getActiveProfile() {
+    try {
+        const res = await getStreamsFromSpawn("/usr/bin/env", [...si, "config", "profile", "ls"]);
+
+        const match = res[1].match(/->\s*([^\n]+)/);
+        const activeProfile = match ? match[1].trim() : null;
+
+        if (isLogActive) {
+            logger.log("Active profile:", activeProfile);
+        }
+        return activeProfile;
+    } catch (error: any) {
+        logger.error(`Error while getting the active profile: ${error.message}`);
+        return "";
+    }
+}
+
 export async function createProfile(profileName: string) {
     const res = await getStreamsFromSpawn("/usr/bin/env", [...si, "config", "profile", "create", profileName]);
 

bdd/step-definitions/e2e/host-steps.ts

@@ -12,7 +12,8 @@ import {
     createProfile,
     setProfile,
     createDirectory,
-    deleteDirectory
+    deleteDirectory,
+    getActiveProfile
 } from "../../lib/utils";
 import fs, { createReadStream, existsSync, ReadStream } from "fs";
 import { HostClient, InstanceOutputStream } from "@scramjet/api-client";
@@ -37,6 +38,7 @@ let actualLogResponse: any;
 let containerId: string;
 let processId: number;
 let streams: { [key: string]: Promise<string | undefined> } = {};
+let activeProfile: any;
 
 const freeport = promisify(require("freeport"));
 
@@ -116,13 +118,12 @@ const killRunner = async () => {
     }
 };
 
-BeforeAll({ timeout: 10e3 }, async () => {
+BeforeAll({ timeout: 20e3 }, async () => {
     if (process.env.NO_HOST) {
         return;
     }
 
-    await createProfile(profileName);
-    await setProfile(profileName);
+    activeProfile = await getActiveProfile();
 
     let apiUrl = process.env.SCRAMJET_HOST_BASE_URL;
 
@@ -158,6 +159,8 @@ BeforeAll({ timeout: 10e3 }, async () => {
         });
     }
     await hostUtils.spawnHost([]);
+    await createProfile(profileName);
+    await setProfile(profileName);
 });
 
 AfterAll(async () => {
@@ -168,7 +171,7 @@ AfterAll(async () => {
             throw new Error("Host unexpected closed");
         }
     }
-
+    await setProfile(activeProfile);
     await removeProfile(profileName);
 });
 
@@ -184,6 +187,7 @@ After({ tags: "@runner-cleanup" }, killRunner);
 Before({ tags: "@test-si-init" }, function() {
     createDirectory("data/template_seq");
 });
+
 After({ tags: "@test-si-init" }, function() {
     deleteDirectory("data/template_seq");
 });
@@ -226,6 +230,7 @@ const startHost = async () => {
 };
 
 Given("start host", () => startHost());
+
 Then("stop host", () => hostUtils.stopHost());
 
 Then("send fake stream as sequence", async function(this: CustomWorld) {
@@ -692,7 +697,7 @@ When("confirm that sequence and volumes are removed", async function(this: Custo
 
     if (!sequenceId) assert.fail();
 
-    const sequences = (await hostClient.listSequences()) || [];
+    const sequences = await hostClient.listSequences() || [];
     const sequenceExist = !!sequences.find((sequenceInfo) => sequenceId === sequenceInfo.id);
 
     assert.equal(sequenceExist, false);