Merge branch 'feat/console-cancelled-requests' into alpha

.github/workflows/npm_publish.yaml

@@ -0,0 +1,35 @@
+name: Manual NPM publish
+
+on:
+  workflow_dispatch:
+    inputs:
+      version_tag:
+        description: 'Version tag'
+        required: true
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '20.5.0'
+          registry-url: 'https://registry.npmjs.org/'
+
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.inputs.version_tag }}
+
+      - name: Install Dependencies
+        run: npm ci
+
+      - name: Build
+        run: npm run build
+
+      - name: NPM publish
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}

.github/workflows/release.yaml

@@ -3,8 +3,8 @@ name: Release
 on:
   push:
     branches:
-      # - main
-      # - develop
+      - v2
+      - v2-develop
       - alpha
   workflow_dispatch:
 

.github/workflows/update_dependent_projects_alpha.yaml

@@ -1,28 +1,51 @@
-name: Update dependent projects (ALPHA)
+name: Update dependent projects (alpha)
 
 on:
   release:
     types: [published]
   workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'Tag name'
+        required: false
+      prerelease:
+        description: 'Prerelease'
+        required: false
+        default: 'false'
 
 env:
   LIBRARY_NAME: "gisce/powerp.js"
 
 jobs:
   update-dependents:
-    if: github.event.release.prerelease == true && contains(github.event.release.tag_name, '-alpha.') && !contains(github.event.release.tag_name, '-rc.')
     runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
           - project: "gisce/webclient"
             branch: "alpha"
     steps:
+      - name: Set environment variables and check condition
+        run: |
+          TAG_NAME="${{ github.event.release.tag_name || github.event.inputs.tag_name }}"
+          PRERELEASE="${{ github.event.release.prerelease || github.event.inputs.prerelease }}"
+          if [ "$PRERELEASE" == "true" ] && [[ "$TAG_NAME" != *'-rc.'* ]] && [[ "$TAG_NAME" == *'-alpha.'* ]]; then
+            SHOULD_RUN="true"
+          else
+            SHOULD_RUN="false"
+          fi
+          echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
+          echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV
+          echo "SHOULD_RUN=$SHOULD_RUN" >> $GITHUB_ENV
+      - name: Check Prerelease and Tag Version
+        if: env.SHOULD_RUN == 'true'
+        run: echo "Running update for tag ${{ env.TAG_NAME }}"
       - name: Call Reusable Workflow for each project
+        if: env.SHOULD_RUN == 'true'
         uses: gisce/[email protected]
         with:
           dependentProject: ${{ matrix.project }}
-          tagName: ${{ github.event.release.tag_name }}
+          tagName: ${{ env.TAG_NAME }}
           dependentProjectBranch: ${{ matrix.branch }}
           libraryName: ${{ env.LIBRARY_NAME }}
           githubToken: ${{ secrets.GH_PAT }}

.github/workflows/update_dependent_projects_v2-develop.yaml

@@ -0,0 +1,51 @@
+name: Update dependent projects (v2-develop)
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'Tag name'
+        required: false
+      prerelease:
+        description: 'Prerelease'
+        required: false
+        default: 'false'
+
+env:
+  LIBRARY_NAME: "gisce/powerp.js"
+
+jobs:
+  update-dependents:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - project: "gisce/webclient"
+            branch: "v2-develop"
+    steps:
+      - name: Set environment variables and check condition
+        run: |
+          TAG_NAME="${{ github.event.release.tag_name || github.event.inputs.tag_name }}"
+          PRERELEASE="${{ github.event.release.prerelease || github.event.inputs.prerelease }}"
+          if [ "$PRERELEASE" == "true" ] && [[ "$TAG_NAME" == *'-rc.'* ]] && [[ "$TAG_NAME" != *'-alpha.'* ]]; then
+            SHOULD_RUN="true"
+          else
+            SHOULD_RUN="false"
+          fi
+          echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
+          echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV
+          echo "SHOULD_RUN=$SHOULD_RUN" >> $GITHUB_ENV
+      - name: Check Prerelease and Tag Version
+        if: env.SHOULD_RUN == 'true'
+        run: echo "Running update for tag ${{ env.TAG_NAME }}"
+      - name: Call Reusable Workflow for each project
+        if: env.SHOULD_RUN == 'true'
+        uses: gisce/[email protected]
+        with:
+          dependentProject: ${{ matrix.project }}
+          tagName: ${{ env.TAG_NAME }}
+          dependentProjectBranch: ${{ matrix.branch }}
+          libraryName: ${{ env.LIBRARY_NAME }}
+          githubToken: ${{ secrets.GH_PAT }}

.github/workflows/update_dependent_projects_v2.yaml

@@ -0,0 +1,51 @@
+name: Update dependent projects (v2)
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'Tag name'
+        required: false
+      prerelease:
+        description: 'Prerelease'
+        required: false
+        default: 'false'
+
+env:
+  LIBRARY_NAME: "gisce/powerp.js"
+
+jobs:
+  update-dependents:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - project: "gisce/webclient"
+            branch: "v2"
+    steps:
+      - name: Set environment variables and check condition
+        run: |
+          TAG_NAME="${{ github.event.release.tag_name || github.event.inputs.tag_name }}"
+          PRERELEASE="${{ github.event.release.prerelease || github.event.inputs.prerelease }}"
+          if [ "$PRERELEASE" != "true" ] && [[ "$TAG_NAME" == *'v2'* ]]; then
+            SHOULD_RUN="true"
+          else
+            SHOULD_RUN="false"
+          fi
+          echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
+          echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV
+          echo "SHOULD_RUN=$SHOULD_RUN" >> $GITHUB_ENV
+      - name: Check Prerelease and Tag Version
+        if: env.SHOULD_RUN == 'true'
+        run: echo "Running update for tag ${{ env.TAG_NAME }}"
+      - name: Call Reusable Workflow for each project
+        if: env.SHOULD_RUN == 'true'
+        uses: gisce/[email protected]
+        with:
+          dependentProject: ${{ matrix.project }}
+          tagName: ${{ env.TAG_NAME }}
+          dependentProjectBranch: ${{ matrix.branch }}
+          libraryName: ${{ env.LIBRARY_NAME }}
+          githubToken: ${{ secrets.GH_PAT }}

lib/client.ts

@@ -53,15 +53,16 @@ export class Client {
 
     // console.debug(`Sending ${options.payload} to ${host}/${service}`);
 
+    if (!host) {
+      throw new Error("You must set a host first");
+    }
+
     try {
       const response = await this.getAxiosInstance().post(
         `${host}/${service}`,
         data.payload,
         {
-          headers: {
-            "Content-Type": "application/json",
-            "X-GISCE-Client": this.clientHeader,
-          },
+          headers: getDefaultHeaders(this.clientHeader),
           ...options,
         },
       );
@@ -71,9 +72,19 @@ export class Client {
       }
       return response.data;
     } catch (e) {
-      console.error(
-        `Error in fetching ${host}/${service}: ${JSON.stringify(e, null, 2)}`,
-      );
+      if (e.name === "CanceledError" && process.env.NODE_ENV !== "production") {
+        console.warn(
+          `CANCELED request to ${host}/${service}: ${JSON.stringify(
+            e,
+            null,
+            2,
+          )}`,
+        );
+      } else {
+        console.error(
+          `Error in fetching ${host}/${service}: ${JSON.stringify(e, null, 2)}`,
+        );
+      }
       throw e;
     }
   }
@@ -275,3 +286,14 @@ export class Client {
     });
   }
 }
+
+function getDefaultHeaders(clientHeader?: string): Record<string, string> {
+  const defaultHeaders: Record<string, string> = {
+    "Content-Type": "application/json",
+  };
+  if (clientHeader) {
+    defaultHeaders["X-GISCE-Client"] = clientHeader;
+  }
+
+  return defaultHeaders;
+}