Merge pull request #284 from fleetbase/dev-v0.5.3

Upgraded Registry Bridge to v0.0.11

.github/workflows/cd.yml

@@ -109,13 +109,13 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
 
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         id: pnpm-install
         with:
-          version: 8
+          version: 9.5.0
           run_install: false
 
       - name: Get pnpm Store Directory
@@ -142,13 +142,15 @@ jobs:
       - name: Set Env Variables for QA
         if: startsWith(github.ref, 'refs/heads/deploy/qa')
         run: |
-          echo "STRIPE_KEY=${{ secrets.STRIPE_TEST_KEY }}" >> ./console/environments/.env.production
+          echo "STRIPE_KEY=${{ secrets.STRIPE_TEST_KEY }}" >> ./environments/.env.production
+          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine" >> ./environments/.env.production
         working-directory: ./console
 
       - name: Set Env Variables for Production
         if: startsWith(github.ref, 'refs/heads/deploy/production')
         run: |
-          echo "STRIPE_KEY=${{ secrets.STRIPE_KEY }}" >> ./console/environments/.env.production
+          echo "STRIPE_KEY=${{ secrets.STRIPE_KEY }}" >> ./environments/.env.production
+          echo "EXTENSIONS=@fleetbase/billing-engine,@fleetbase/internals-engine" >> ./environments/.env.production
         working-directory: ./console
 
       - name: Install dependencies

.gitmodules

@@ -39,3 +39,6 @@
 [submodule "packages/registry-bridge"]
 	path = packages/registry-bridge
 	url = git@github.com:fleetbase/registry-bridge.git
+[submodule "packages/ledger"]
+	path = packages/ledger
+	url = git@github.com:fleetbase/ledger.git

Caddyfile

@@ -1,11 +1,13 @@
 {
-	frankenphp
+	frankenphp {
+		num_threads 24
+	}
 	order php_server before file_server
 }
 
 http://:8000 {
 	root * /fleetbase/api/public
-	encode zstd gzip
+	encode zstd br gzip
 	php_server {
 		resolve_root_symlink
 	}

api/composer.json

@@ -9,9 +9,9 @@
     "license": "AGPL-3.0-or-later",
     "require": {
         "php": "^8.0",
-        "fleetbase/core-api": "^1.4.30",
-        "fleetbase/fleetops-api": "^0.5.4",
-        "fleetbase/registry-bridge": "^0.0.8",
+        "fleetbase/core-api": "^1.5.1",
+        "fleetbase/fleetops-api": "^0.5.5",
+        "fleetbase/registry-bridge": "^0.0.11",
         "fleetbase/storefront-api": "^0.3.13",
         "guzzlehttp/guzzle": "^7.0.1",
         "laravel/framework": "^10.0",

console/config/environment.js

@@ -2,6 +2,7 @@
 const toBoolean = require('./utils/to-boolean');
 const getenv = require('./utils/getenv');
 const fixApiHost = require('./utils/fix-api-host');
+const asArray = require('./utils/as-array');
 const { version } = require('../package');
 
 module.exports = function (environment) {
@@ -20,7 +21,7 @@ module.exports = function (environment) {
         },
 
         APP: {
-            showExtensionsLink: toBoolean(getenv('SHOW_EXTENSIONS_LINK', true)),
+            extensions: asArray(getenv('EXTENSIONS')),
         },
 
         API: {
@@ -29,8 +30,8 @@ module.exports = function (environment) {
         },
 
         osrm: {
-            host: getenv('OSRM_HOST', 'https://bundle.routing.fleetbase.io'),
-            servers: getenv('OSRM_SERVERS', '').split(',').filter(Boolean),
+            host: getenv('OSRM_HOST', 'https://router.project-osrm.org'),
+            servers: {},
         },
 
         socket: {

console/config/icons.js

@@ -1,5 +1,6 @@
 module.exports = function () {
     return {
         'free-solid-svg-icons': 'all',
+        'free-brands-svg-icons': 'all',
     };
 };

console/config/utils/as-array.js

@@ -0,0 +1,11 @@
+module.exports = function asArray(value) {
+    if (Array.isArray(value)) {
+        return value;
+    }
+
+    if (typeof value === 'string' && value.includes(',')) {
+        return value.split(',');
+    }
+
+    return [];
+};

console/environments/.env.development

@@ -4,5 +4,4 @@ SOCKETCLUSTER_PATH=/socketcluster/
 SOCKETCLUSTER_HOST=localhost
 SOCKETCLUSTER_SECURE=false
 SOCKETCLUSTER_PORT=38000
-OSRM_HOST=https://bundle.routing.fleetbase.io
-OSRM_SERVERS=https://canada.routing.fleetbase.io,https://us.routing.fleetbase.io
+OSRM_HOST=https://router.project-osrm.org

console/environments/.env.production

@@ -5,5 +5,4 @@ SOCKETCLUSTER_PATH=/socketcluster/
 SOCKETCLUSTER_HOST=
 SOCKETCLUSTER_SECURE=true
 SOCKETCLUSTER_PORT=38000
-OSRM_HOST=https://bundle.routing.fleetbase.io
-OSRM_SERVERS=https://canada.routing.fleetbase.io,https://us.routing.fleetbase.io
+OSRM_HOST=https://router.project-osrm.org

console/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/console",
-    "version": "0.5.0",
+    "version": "0.5.3",
     "private": true,
     "description": "Modular logistics and supply chain operating system (LSOS)",
     "repository": "https://github.com/fleetbase/fleetbase",
@@ -29,13 +29,13 @@
         "test:ember": "ember test"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.2.13",
-        "@fleetbase/ember-ui": "^0.2.19",
-        "@fleetbase/fleetops-engine": "^0.5.4",
+        "@fleetbase/ember-core": "^0.2.14",
+        "@fleetbase/ember-ui": "^0.2.20",
+        "@fleetbase/fleetops-engine": "^0.5.5",
         "@fleetbase/storefront-engine": "^0.3.13",
         "@fleetbase/dev-engine": "^0.2.5",
         "@fleetbase/iam-engine": "^0.0.14",
-        "@fleetbase/registry-bridge-engine": "^0.0.8",
+        "@fleetbase/registry-bridge-engine": "^0.0.11",
         "@fleetbase/fleetops-data": "^0.1.17",
         "@fleetbase/leaflet-routing-machine": "^3.2.16",
         "@ember/legacy-built-in-components": "^0.4.1",
@@ -143,8 +143,8 @@
     },
     "pnpm": {
         "overrides": {
-            "@fleetbase/ember-core": "^0.2.13",
-            "@fleetbase/ember-ui": "^0.2.19",
+            "@fleetbase/ember-core": "^0.2.14",
+            "@fleetbase/ember-ui": "^0.2.20",
             "@fleetbase/fleetops-data": "^0.1.17"
         }
     },

docker-compose.yml

@@ -75,6 +75,7 @@ services:
       RESPONSE_CACHE_DRIVER: redis
       REGISTRY_HOST: https://registry.fleetbase.io
       REGISTRY_PREINSTALLED_EXTENSIONS: 'true'
+      OSRM_HOST: https://router.project-osrm.org
     depends_on:
       - database
       - cache

docker/Dockerfile

@@ -63,7 +63,7 @@ ARG GITHUB_AUTH_KEY
 COPY --chown=www-data:www-data ./Caddyfile $CADDYFILE_PATH
 
 # Create /fleetbase directory and set correct permissions
-RUN mkdir -p /fleetbase/api && chown -R www-data:www-data /fleetbase
+RUN mkdir -p /fleetbase/api && mkdir -p /fleetbase/console && chown -R www-data:www-data /fleetbase
 
 # Set working directory
 WORKDIR /fleetbase/api
@@ -130,9 +130,9 @@ CMD ["php", "artisan", "queue:work"]
 FROM base as app-dev
 ENTRYPOINT ["docker-php-entrypoint"]
 # Add --watch flag later
-CMD ["sh", "-c", "php artisan octane:frankenphp --port=8000 --host=0.0.0.0 --caddyfile $CADDYFILE_PATH"] 
+CMD ["sh", "-c", "php artisan octane:frankenphp --workers=6 --max-requests=250 --port=8000 --host=0.0.0.0 --caddyfile $CADDYFILE_PATH"] 
 
 # Application stage
 FROM base as app
 ENTRYPOINT ["/sbin/ssm-parent", "-c", ".ssm-parent.yaml", "run", "--", "docker-php-entrypoint"]
-CMD ["sh", "-c", "php artisan octane:frankenphp --port=8000 --host=0.0.0.0 --https --http-redirect --caddyfile $CADDYFILE_PATH"]
+CMD ["sh", "-c", "php artisan octane:frankenphp --workers=6 --max-requests=250 --port=8000 --host=0.0.0.0 --https --http-redirect --caddyfile $CADDYFILE_PATH"]