Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: recognize JSON in container logs
Kyle Mendell20c24389f7d9
diff --git a/.arcane.json b/.arcane.jsonindex 7e1eeefe4..ef9174b06 100644--- a/.arcane.json+++ b/.arcane.json@@ -1,5 +1,5 @@{- "version": "2.15.1",- "revision": "9d3e85e84b875652de3fc2cb720d91d40b009056",- "buildTime": "2026-10-07T01:43:13Z"+ "version": "2.15.1",+ "revision": "9d3e85e84b875652de3fc2cb720d91d40b009056",+ "buildTime": "2026-10-07T01:43:13Z"}diff --git a/.goreleaser.yaml b/.goreleaser.yamlindex 6fa4cde36..6860d7451 100644--- a/.goreleaser.yaml+++ b/.goreleaser.yaml@@ -7,10 +7,10 @@ project_name: arcanemetadata:maintainers:- - "Kyle Mendell <[email protected]>"- license: "BSD-3-Clause"- homepage: "https://getarcane.app/"- description: "Modern Docker Management, Designed for Everyone."+ - 'Kyle Mendell <[email protected]>'+ license: 'BSD-3-Clause'+ homepage: 'https://getarcane.app/'+ description: 'Modern Docker Management, Designed for Everyone.'git:ignore_tag_prefixes:@@ -35,11 +35,11 @@ builds:goarch:- amd64- arm64- - "386"+ - '386'- arm- riscv64goarm:- - "7"+ - '7'goamd64:- v1go386:@@ -59,7 +59,7 @@ builds:- -X github.com/getarcaneapp/arcane/backend/v2/internal/config.SvelteKitVersion={{ envOrDefault "SVELTEKIT_VERSION" "unknown" }}flags:- -trimpath- mod_timestamp: "{{ .CommitTimestamp }}"+ mod_timestamp: '{{ .CommitTimestamp }}'- id: arcane-agentmain: ./cmd/main.go@@ -75,11 +75,11 @@ builds:goarch:- amd64- arm64- - "386"+ - '386'- arm- riscv64goarm:- - "7"+ - '7'goamd64:- v1go386:@@ -97,7 +97,7 @@ builds:- -X github.com/getarcaneapp/arcane/backend/v2/internal/config.BuildTime={{ .Date }}flags:- -trimpath- mod_timestamp: "{{ .CommitTimestamp }}"+ mod_timestamp: '{{ .CommitTimestamp }}'- id: arcane-climain: .@@ -111,11 +111,11 @@ builds:goarch:- amd64- arm64- - "386"+ - '386'- arm- riscv64goarm:- - "7"+ - '7'goamd64:- v1go386:@@ -134,7 +134,7 @@ builds:- -X github.com/getarcaneapp/arcane/cli/v2/internal/config.Revision={{ .ShortCommit }}flags:- -trimpath- mod_timestamp: "{{ .CommitTimestamp }}"+ mod_timestamp: '{{ .CommitTimestamp }}'archives:- id: arcane-cli-archive@@ -142,7 +142,7 @@ archives:- arcane-cliformats:- tar.gz- name_template: &binary-name "{{ .Binary }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}"+ name_template: &binary-name '{{ .Binary }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}'- id: arcane-cli-binaryids:- arcane-cli@@ -159,16 +159,16 @@ archives:notarize:macos:- - enabled: "{{ not .IsSnapshot }}"+ - enabled: '{{ not .IsSnapshot }}'ids:- arcane-clisign:- certificate: "{{ .Env.MACOS_SIGN_P12 }}"- password: "{{ .Env.MACOS_SIGN_PASSWORD }}"+ certificate: '{{ .Env.MACOS_SIGN_P12 }}'+ password: '{{ .Env.MACOS_SIGN_PASSWORD }}'notarize:- issuer_id: "{{ .Env.MACOS_NOTARY_ISSUER_ID }}"- key_id: "{{ .Env.MACOS_NOTARY_KEY_ID }}"- key: "{{ .Env.MACOS_NOTARY_KEY }}"+ issuer_id: '{{ .Env.MACOS_NOTARY_ISSUER_ID }}'+ key_id: '{{ .Env.MACOS_NOTARY_KEY_ID }}'+ key: '{{ .Env.MACOS_NOTARY_KEY }}'wait: truetimeout: 20m@@ -176,22 +176,22 @@ signs:- id: cosign-checksumscmd: cosignartifacts: checksum- signature: "${artifact}.sigstore.json"+ signature: '${artifact}.sigstore.json'args:- sign-blob- --key=env://COSIGN_PRIVATE_KEY- --bundle=${signature}- - "${artifact}"+ - '${artifact}'- --yesoutput: truenightly:- version_template: "{{ .Env.NEXT_IMAGE_VERSION }}"+ version_template: '{{ .Env.NEXT_IMAGE_VERSION }}'nfpms:- id: arcane-clipackage_name: '{{ if eq (index .Env "BUILD_NEXT") "true" }}arcane-cli-next{{ else }}arcane-cli{{ end }}'- file_name_template: "{{ .ConventionalFileName }}"+ file_name_template: '{{ .ConventionalFileName }}'ids:- arcane-clivendor: getarcaneapp@@ -214,7 +214,7 @@ publishers:- name: nexus-debianif: '{{ eq .ArtifactExt ".deb" }}'disable: '{{ if not (and (index .Env "NEXUS_USERNAME") (index .Env "NEXUS_PASSWORD")) }}true{{ end }}'- dir: "{{ dir .ArtifactPath }}"+ dir: '{{ dir .ArtifactPath }}'cmd: >-curl --fail-with-body-u "{{ .Env.NEXUS_USERNAME }}:{{ .Env.NEXUS_PASSWORD }}"@@ -226,7 +226,7 @@ publishers:- name: nexus-yumif: '{{ eq .ArtifactExt ".rpm" }}'disable: '{{ if not (and (index .Env "NEXUS_USERNAME") (index .Env "NEXUS_PASSWORD")) }}true{{ end }}'- dir: "{{ dir .ArtifactPath }}"+ dir: '{{ dir .ArtifactPath }}'cmd: >-curl --fail-with-body-u "{{ .Env.NEXUS_USERNAME }}:{{ .Env.NEXUS_PASSWORD }}"@@ -236,7 +236,7 @@ publishers:- name: nexus-alpineif: '{{ eq .ArtifactExt ".apk" }}'disable: '{{ if not (and (index .Env "NEXUS_USERNAME") (index .Env "NEXUS_PASSWORD")) }}true{{ end }}'- dir: "{{ dir .ArtifactPath }}"+ dir: '{{ dir .ArtifactPath }}'cmd: >-curl --fail-with-body-u "{{ .Env.NEXUS_USERNAME }}:{{ .Env.NEXUS_PASSWORD }}"@@ -257,12 +257,12 @@ homebrew_casks:- zsh- fish- pwsh- description: "Arcane CLI - {{ .Metadata.Description }}"+ description: 'Arcane CLI - {{ .Metadata.Description }}'skip_upload: '{{ if eq (index .Env "BUILD_NEXT") "true" }}true{{ end }}'repository:owner: getarcaneappname: homebrew-tap- commit_msg_template: "chore(brew): update {{ .ProjectName }} to {{ .Tag }}"+ commit_msg_template: 'chore(brew): update {{ .ProjectName }} to {{ .Tag }}'dockers_v2:- id: arcane-image@@ -273,7 +273,7 @@ dockers_v2:- ghcr.io/getarcaneapp/managertags:- '{{ if index .Env "BUILD_NEXT" }}next{{ end }}'- - "v{{ .Version }}"+ - 'v{{ .Version }}'- '{{ if not (index .Env "BUILD_NEXT") }}v{{ .Major }}.{{ .Minor }}{{ end }}'- '{{ if not (index .Env "BUILD_NEXT") }}v{{ .Major }}{{ end }}'- '{{ if not (index .Env "BUILD_NEXT") }}latest{{ end }}'@@ -283,16 +283,16 @@ dockers_v2:- linux/arm/v7- linux/riscv64labels:- "org.opencontainers.image.authors": "Arcane Organization"- "org.opencontainers.image.url": "https://github.com/getarcaneapp/arcane"- "org.opencontainers.image.documentation": "https://github.com/getarcaneapp/arcane/blob/main/README.md"- "org.opencontainers.image.source": "https://github.com/getarcaneapp/arcane"- "org.opencontainers.image.version": "v{{.Version}}"- "org.opencontainers.image.revision": "{{.FullCommit}}"- "org.opencontainers.image.licenses": "{{ .Metadata.License }}"- "org.opencontainers.image.title": "Arcane"- "org.opencontainers.image.description": "{{ .Metadata.Description }}"- "com.getarcaneapp.arcane": "true"+ 'org.opencontainers.image.authors': 'Arcane Organization'+ 'org.opencontainers.image.url': 'https://github.com/getarcaneapp/arcane'+ 'org.opencontainers.image.documentation': 'https://github.com/getarcaneapp/arcane/blob/main/README.md'+ 'org.opencontainers.image.source': 'https://github.com/getarcaneapp/arcane'+ 'org.opencontainers.image.version': 'v{{.Version}}'+ 'org.opencontainers.image.revision': '{{.FullCommit}}'+ 'org.opencontainers.image.licenses': '{{ .Metadata.License }}'+ 'org.opencontainers.image.title': 'Arcane'+ 'org.opencontainers.image.description': '{{ .Metadata.Description }}'+ 'com.getarcaneapp.arcane': 'true'sbom: '{{ if eq (index .Env "BUILD_NEXT") "true" }}false{{ else }}true{{ end }}'- id: arcane-agent-image@@ -303,7 +303,7 @@ dockers_v2:- ghcr.io/getarcaneapp/agenttags:- '{{ if index .Env "BUILD_NEXT" }}next{{ end }}'- - "v{{ .Version }}"+ - 'v{{ .Version }}'- '{{ if not (index .Env "BUILD_NEXT") }}v{{ .Major }}.{{ .Minor }}{{ end }}'- '{{ if not (index .Env "BUILD_NEXT") }}v{{ .Major }}{{ end }}'- '{{ if not (index .Env "BUILD_NEXT") }}latest{{ end }}'@@ -313,16 +313,16 @@ dockers_v2:- linux/arm/v7- linux/riscv64labels:- "org.opencontainers.image.authors": "Arcane Organization"- "org.opencontainers.image.url": "https://github.com/getarcaneapp/arcane"- "org.opencontainers.image.documentation": "https://github.com/getarcaneapp/arcane/blob/main/README.md"- "org.opencontainers.image.source": "https://github.com/getarcaneapp/arcane"- "org.opencontainers.image.version": "v{{.Version}}"- "org.opencontainers.image.revision": "{{.FullCommit}}"- "org.opencontainers.image.licenses": "{{ .Metadata.License }}"- "org.opencontainers.image.title": "Arcane Agent"- "org.opencontainers.image.description": "Arcanes Remote Agent"- "com.getarcaneapp.arcane.agent": "true"+ 'org.opencontainers.image.authors': 'Arcane Organization'+ 'org.opencontainers.image.url': 'https://github.com/getarcaneapp/arcane'+ 'org.opencontainers.image.documentation': 'https://github.com/getarcaneapp/arcane/blob/main/README.md'+ 'org.opencontainers.image.source': 'https://github.com/getarcaneapp/arcane'+ 'org.opencontainers.image.version': 'v{{.Version}}'+ 'org.opencontainers.image.revision': '{{.FullCommit}}'+ 'org.opencontainers.image.licenses': '{{ .Metadata.License }}'+ 'org.opencontainers.image.title': 'Arcane Agent'+ 'org.opencontainers.image.description': 'Arcanes Remote Agent'+ 'com.getarcaneapp.arcane.agent': 'true'sbom: '{{ if eq (index .Env "BUILD_NEXT") "true" }}false{{ else }}true{{ end }}'docker_signs:@@ -333,7 +333,7 @@ docker_signs:args:- sign- --key=env://COSIGN_PRIVATE_KEY- - "${artifact}@${digest}"+ - '${artifact}@${digest}'- --yesoutput: true@@ -374,16 +374,16 @@ changelog:use: githubfilters:include:- - "^feat"- - "^fix"- - "^perf"- - "^docs"- - "^refactor"- - "^test"- - "^style"- - "^build"- - "^ci"- - "^revert"+ - '^feat'+ - '^fix'+ - '^perf'+ - '^docs'+ - '^refactor'+ - '^test'+ - '^style'+ - '^build'+ - '^ci'+ - '^revert'ai:use: openaimodel: openai/gpt-6-luna-pro@@ -400,11 +400,11 @@ changelog:announce:discord:enabled: true- message_template: "Arcane version {{.Tag}} has been released! Checkout the changelog at {{ .ReleaseURL }}"- author: "Github Actions"+ message_template: 'Arcane version {{.Tag}} has been released! Checkout the changelog at {{ .ReleaseURL }}'+ author: 'Github Actions'# Color code of the embed. You have to use decimal numeral system, not hexadecimal.- color: "9320959"- icon_url: "https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png"+ color: '9320959'+ icon_url: 'https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png'release:ids:@@ -423,4 +423,4 @@ release:prerelease: automake_latest: truemode: replace- name_template: "{{.Tag}}"+ name_template: '{{.Tag}}'diff --git a/CHANGELOG.md b/CHANGELOG.mdindex e942eac5d..fd464e29f 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -23,6 +23,7 @@- inline logic in project services ([\#4316](https://github.com/getarcaneapp/arcane/pull/4316) by @kmendell)**Full Changelog**: https://github.com/getarcaneapp/arcane/compare/v2.15.0...v2.15.1+## v2.15.0### New featuresdiff --git a/frontend/src/lib/components/logs/log-viewer.utils.ts b/frontend/src/lib/components/logs/log-viewer.utils.tsindex a616190b5..22d0d9520 100644--- a/frontend/src/lib/components/logs/log-viewer.utils.ts+++ b/frontend/src/lib/components/logs/log-viewer.utils.ts@@ -264,7 +264,27 @@ export function tryParseStructuredLog(message: string): {return { isJson: false, isStructured: false };}- const jsonCandidate = unwrapWrappedJson(trimmed);+ let jsonCandidate = unwrapWrappedJson(trimmed);+ if (!jsonCandidate.startsWith('{') && !jsonCandidate.startsWith('[')) {+ let prefixEnd = 0;+ while (prefixEnd < jsonCandidate.length && jsonCandidate.charAt(prefixEnd).trim() !== '') {+ prefixEnd++;+ }++ const payload = jsonCandidate.slice(prefixEnd).trimStart();+ if (payload.startsWith('{') || payload.startsWith('[')) {+ const hasDetailsPrefix = jsonCandidate+ .slice(0, prefixEnd)+ .split(',')+ .every((attribute) => {+ const equalsIndex = attribute.indexOf('=');+ return equalsIndex > 0 && equalsIndex === attribute.lastIndexOf('=');+ });+ if (hasDetailsPrefix) {+ jsonCandidate = payload;+ }+ }+ }if (jsonCandidate.startsWith('{') || jsonCandidate.startsWith('[')) {try {const parsed = JSON.parse(jsonCandidate);