Feat: Add analytics transfer (#76)

.github/workflows/cargo-build.yml

@@ -24,79 +24,36 @@ env:
 
 jobs:
 
-  skip_check:
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
+  # skip_check:
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     should_skip: ${{ steps.skip_check.outputs.should_skip }}
+  #   steps:
+  #     - id: skip_check
+  #       uses: fkirc/skip-duplicate-actions@v5
 
   backend-build:
-    needs: skip_check
-    if: needs.skip_check.outputs.should_skip != 'true'
-
-    runs-on: ubuntu-latest
+    # needs: skip_check
+    # if: needs.skip_check.outputs.should_skip != 'true'
 
+    runs-on: self-hosted-build
+
     steps:
     - uses: actions/checkout@v3
 
-    - uses: actions/cache@v3
+    # - uses: actions/cache@v3
+    #   with:
+    #     path: ./target
+    #     key: ${{ runner.os }}-cargo-build-release-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml', './rs') }}
+    #     restore-keys: |
+    #       ${{ runner.os }}-cargo-build-release-
+
+    - name: Local cargo cache
+      id: build-cargo-cache
+      uses: MasterworksIO/[email protected]
       with:
         path: ./target
-        key: ${{ runner.os }}-cargo-build-release-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml', './rs') }}
-        restore-keys: |
-          ${{ runner.os }}-cargo-build-release-
-    
-    # - uses: Swatinem/rust-cache@v2
-    #   with:
-    #     cache-all-crates: true
-
-    # with:
-        # The prefix cache key, this can be changed to start a new cache manually.
-        # default: "v0-rust"
-        # prefix-key: ""
-
-        # A cache key that is used instead of the automatic `job`-based key,
-        # and is stable over multiple jobs.
-        # default: empty
-        # shared-key: ""
-
-        # An additional cache key that is added alongside the automatic `job`-based
-        # cache key and can be used to further differentiate jobs.
-        # default: empty
-        # key: ""
-
-        # A whitespace separated list of env-var *prefixes* who's value contributes
-        # to the environment cache key.
-        # The env-vars are matched by *prefix*, so the default `RUST` var will
-        # match all of `RUSTC`, `RUSTUP_*`, `RUSTFLAGS`, `RUSTDOC_*`, etc.
-        # default: "CARGO CC CFLAGS CXX CMAKE RUST"
-        # env-vars: ""
-
-        # The cargo workspaces and target directory configuration.
-        # These entries are separated by newlines and have the form
-        # `$workspace -> $target`. The `$target` part is treated as a directory
-        # relative to the `$workspace` and defaults to "target" if not explicitly given.
-        # default: ". -> target"
-        # workspaces: ""
-
-        # Additional non workspace directories to be cached, separated by newlines.
-        # cache-directories: ""
-
-        # Determines whether workspace `target` directories are cached.
-        # If `false`, only the cargo registry will be cached.
-        # default: "true"
-        # cache-targets: ""
-
-        # Determines if the cache should be saved even when the workflow has failed.
-        # default: "false"
-        # cache-on-failure: ""
+        key: build-cargo-target
 
-        # Determiners whether the cache should be saved.
-        # If `false`, the cache is only restored.
-        # Useful for jobs where the matrix is additive e.g. additional Cargo features.
-        # default: "true"
-        # save-if: ""
     - name: Cargo Build
       run: cargo build

.github/workflows/cargo-integration-tests.yml

@@ -24,79 +24,37 @@ env:
 
 jobs:
 
-  skip_check:
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
+  # skip_check:
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     should_skip: ${{ steps.skip_check.outputs.should_skip }}
+  #   steps:
+  #     - id: skip_check
+  #       uses: fkirc/skip-duplicate-actions@v5
 
   backend-integration-tests:
-    needs: skip_check
-    if: needs.skip_check.outputs.should_skip != 'true'
+    # needs: skip_check
+    # if: needs.skip_check.outputs.should_skip != 'true'
 
-    runs-on: ubuntu-latest
+    runs-on: self-hosted-integration-tests
 
     steps:
 
     - uses: actions/checkout@v3
 
-    - uses: actions/cache@v3
+    # - uses: actions/cache@v3
+    #   with:
+    #     path: ./target
+    #     key: "${{ runner.os }}-cargo-integration-tests-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml', './rs') }}"
+    #     restore-keys: |
+    #       ${{ runner.os }}-cargo-integration-tests-
+
+    - name: Local cargo cache
+      id: integration-tests-cargo-cache
+      uses: MasterworksIO/[email protected]
       with:
         path: ./target
-        key: "${{ runner.os }}-cargo-integration-tests-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml', './rs') }}"
-        restore-keys: |
-          ${{ runner.os }}-cargo-integration-tests-
-
-    # - uses: Swatinem/rust-cache@v2
-    #   with:
-    #     cache-all-crates: true
-    # with:
-        # The prefix cache key, this can be changed to start a new cache manually.
-        # default: "v0-rust"
-        # prefix-key: ""
-
-        # A cache key that is used instead of the automatic `job`-based key,
-        # and is stable over multiple jobs.
-        # default: empty
-        # shared-key: ""
-
-        # An additional cache key that is added alongside the automatic `job`-based
-        # cache key and can be used to further differentiate jobs.
-        # default: empty
-        # key: ""
-
-        # A whitespace separated list of env-var *prefixes* who's value contributes
-        # to the environment cache key.
-        # The env-vars are matched by *prefix*, so the default `RUST` var will
-        # match all of `RUSTC`, `RUSTUP_*`, `RUSTFLAGS`, `RUSTDOC_*`, etc.
-        # default: "CARGO CC CFLAGS CXX CMAKE RUST"
-        # env-vars: ""
-
-        # The cargo workspaces and target directory configuration.
-        # These entries are separated by newlines and have the form
-        # `$workspace -> $target`. The `$target` part is treated as a directory
-        # relative to the `$workspace` and defaults to "target" if not explicitly given.
-        # default: ". -> target"
-        # workspaces: ""
-
-        # Additional non workspace directories to be cached, separated by newlines.
-        # cache-directories: ""
-
-        # Determines whether workspace `target` directories are cached.
-        # If `false`, only the cargo registry will be cached.
-        # default: "true"
-        # cache-targets: ""
-
-        # Determines if the cache should be saved even when the workflow has failed.
-        # default: "false"
-        # cache-on-failure: ""
+        key: integration-tests-cargo-target
 
-        # Determiners whether the cache should be saved.
-        # If `false`, the cache is only restored.
-        # Useful for jobs where the matrix is additive e.g. additional Cargo features.
-        # default: "true"
-        # save-if: ""
     - name: Cargo Integration Tests
       run: cargo test --test "*"

.github/workflows/cargo-unit-tests.yml

@@ -24,80 +24,38 @@ env:
 
 jobs:
 
-  skip_check:
-    runs-on: ubuntu-latest
-    outputs:
-      should_skip: ${{ steps.skip_check.outputs.should_skip }}
-    steps:
-      - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5
+  # skip_check:
+  #   runs-on: self-hosted-unit-tests
+  #   outputs:
+  #     should_skip: ${{ steps.skip_check.outputs.should_skip }}
+  #   steps:
+  #     - id: skip_check
+  #       uses: fkirc/skip-duplicate-actions@v5
 
   backend-unit-tests:
 
-    needs: skip_check
-    if: needs.skip_check.outputs.should_skip != 'true'
+    # needs: skip_check
+    # if: needs.skip_check.outputs.should_skip != 'true'
 
     runs-on: ubuntu-latest
 
     steps:
 
     - uses: actions/checkout@v3
 
-    - uses: actions/cache@v3
+    # - uses: actions/cache@v3
+    #   with:
+    #     path: ./target
+    #     key: "${{ runner.os }}-cargo-unit-tests-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml', './rs') }}"
+    #     restore-keys: |
+    #       ${{ runner.os }}-cargo-unit-tests-
+
+    - name: Local cargo cache
+      id: unit-tests-cargo-cache
+      uses: MasterworksIO/[email protected]
       with:
         path: ./target
-        key: "${{ runner.os }}-cargo-unit-tests-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml', './rs') }}"
-        restore-keys: |
-          ${{ runner.os }}-cargo-unit-tests-
-
-    #- uses: Swatinem/rust-cache@v2
-    #  with:
-    #    cache-all-crates: true
-    # with:
-      # The prefix cache key, this can be changed to start a new cache manually.
-      # default: "v0-rust"
-      # prefix-key: ""
-
-      # A cache key that is used instead of the automatic `job`-based key,
-      # and is stable over multiple jobs.
-      # default: empty
-      # shared-key: ""
-
-      # An additional cache key that is added alongside the automatic `job`-based
-      # cache key and can be used to further differentiate jobs.
-      # default: empty
-      # key: ""
-
-      # A whitespace separated list of env-var *prefixes* who's value contributes
-      # to the environment cache key.
-      # The env-vars are matched by *prefix*, so the default `RUST` var will
-      # match all of `RUSTC`, `RUSTUP_*`, `RUSTFLAGS`, `RUSTDOC_*`, etc.
-      # default: "CARGO CC CFLAGS CXX CMAKE RUST"
-      # env-vars: ""
-
-      # The cargo workspaces and target directory configuration.
-      # These entries are separated by newlines and have the form
-      # `$workspace -> $target`. The `$target` part is treated as a directory
-      # relative to the `$workspace` and defaults to "target" if not explicitly given.
-      # default: ". -> target"
-      # workspaces: ""
-
-      # Additional non workspace directories to be cached, separated by newlines.
-      # cache-directories: ""
-
-      # Determines whether workspace `target` directories are cached.
-      # If `false`, only the cargo registry will be cached.
-      # default: "true"
-      # cache-targets: ""
-
-      # Determines if the cache should be saved even when the workflow has failed.
-      # default: "false"
-      # cache-on-failure: ""
+        key: unit-tests-cargo-target
 
-      # Determiners whether the cache should be saved.
-      # If `false`, the cache is only restored.
-      # Useful for jobs where the matrix is additive e.g. additional Cargo features.
-      # default: "true"
-      # save-if: ""
     - name: Cargo Unit Tests
       run: cargo test --bins --lib -- --nocapture

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
 
   release:
 
-    runs-on: self-hosted
+    runs-on: self-hosted-release
 
     strategy:
       matrix:

defs/analytics/Analytics.ts

@@ -15,6 +15,7 @@ export type Analytics = {
   sessions: number;
   ips: number;
   total_duration_ms: number;
+  total_transfer_bytes: number;
   by_month: Array<AnalyticsItem<YearMonth>>;
   by_day: Array<AnalyticsItem<YearMonthDay>>;
   by_hour: Array<AnalyticsItem<number>>;

defs/analytics/AnalyticsItem.ts

@@ -4,4 +4,5 @@ export type AnalyticsItem<K> = {
   key: K;
   sessions: number;
   total_duration_ms: number;
+  total_transfer_bytes: number;
 };

defs/db/StreamConnection.ts

@@ -7,7 +7,7 @@ export type StreamConnection = {
   _id: string;
   station_id: string;
   deployment_id: string;
-  transfer_bytes: number;
+  transfer_bytes: number | null;
   duration_ms: number | null;
   is_open: boolean;
   created_at: DateTime;

defs/db/StreamConnectionLite.ts

@@ -9,6 +9,7 @@ export type StreamConnectionLite = {
   ip: string;
   cc: CountryCode | null;
   du: number | null;
+  by: number | null;
   br: string | null;
   os: string | null;
   ca: DateTime;

front/admin/src/lib/css/app.css

@@ -5,12 +5,15 @@
 /* @import url("./gilroy/gilroy.css"); */
 /* @import url("./g/g.css");  */
 @import url("./circular/circular.css");
+@import url("./azeret-mono/azeret-mono.css");
 
 
 :root {
   font-family: Circular, "Fira Sans", G, Cera, Jost, Overpass, sans-serif;
   font-size: 16px;
 
+  --monospace: "Azeret Mono", "Chivo Mono", monospace, ui-monospace;
+
   --drawer-width: 250px;
   --top-h: 4.5rem;
   --player-h: 5rem;
@@ -20,7 +23,7 @@
   --blue-rgb: 0, 116, 217;
   --blue: rgb(var(--blue-rgb));
 
-  --loading-color: var(--blue);
+  --loading-color: rgb(32, 118, 232);
 
   --green: #75A633;