Merge pull request #344 from bnema/chore/upstream-foundations
chore(deps): integrate approved upstream foundations
921 files · +28709 -25527
M docs/first-presentation.md +5 -2
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||
| 46 | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | |
| 47 | 47 | do not use a device model or other identifier. Publish only the seven reviewed | |
| 48 | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | |
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | |
| 50 | - | invalid run fails collection. | |
| 49 | + | must not be published. `metadata.json` derives the selected | |
| 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git | |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |
| 53 | + | run also fails collection. | |
| @@ -46,5 +46,8 @@ labels. Set `DUMBER_MACHINE_GPU_PROFILE` to one of `generic-gpu`, | |||||
| 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | 46 | `integrated-gpu`, `discrete-gpu`, `hybrid-gpu`, `virtual-gpu`, or `unknown-gpu`; | ||
| 47 | do not use a device model or other identifier. Publish only the seven reviewed | 47 | do not use a device model or other identifier. Publish only the seven reviewed | ||
| 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | 48 | JSON files to an external Gist. Raw logs and temporary XDG homes are removed and | ||
| 49 | - | must not be published. A missing or incomplete timeline, non-DMABUF backend, or | 49 | + | must not be published. `metadata.json` derives the selected |
| 50 | - | invalid run fails collection. | 50 | + | `github.com/bnema/purego-cef2gtk` pseudo-version and its full immutable Git |
| 51 | + | origin hash from Go module metadata; branch selectors or missing origin metadata | |||
| 52 | + | fail collection. A missing or incomplete timeline, non-DMABUF backend, or invalid | |||
| 53 | + | run also fails collection. | |||
M go.mod +5 -5
| @@ -6,11 +6,11 @@ require ( | |||
| 6 | 6 | github.com/a-h/templ v0.3.1020 | |
| 7 | 7 | github.com/andybalholm/brotli v1.2.2 | |
| 8 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | |
| 9 | - | github.com/bnema/purego-cef v0.13.3 | |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | |
| 13 | - | github.com/bnema/puregotk v0.7.0 | |
| 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e | |
| 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe | |
| 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | 14 | github.com/charmbracelet/bubbles v1.0.0 | |
| 15 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 16 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -6,11 +6,11 @@ require ( | |||||
| 6 | github.com/a-h/templ v0.3.1020 | 6 | github.com/a-h/templ v0.3.1020 | ||
| 7 | github.com/andybalholm/brotli v1.2.2 | 7 | github.com/andybalholm/brotli v1.2.2 | ||
| 8 | github.com/bnema/purego v0.11.0-bnema.4 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | ||
| 9 | - | github.com/bnema/purego-cef v0.13.3 | 9 | + | github.com/bnema/purego-cef v0.13.4-0.20260714140305-f0b7414af67e |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.4 | 10 | + | github.com/bnema/purego-cef2gtk v0.8.4-0.20260714160309-bbd397409ebe |
| 11 | - | github.com/bnema/purego-pipewire v0.1.4 | 11 | + | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a |
| 12 | - | github.com/bnema/purego-sqlite v0.1.3 | 12 | + | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c |
| 13 | - | github.com/bnema/puregotk v0.7.0 | 13 | + | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 |
| 14 | github.com/charmbracelet/bubbles v1.0.0 | 14 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 15 | github.com/charmbracelet/bubbletea v1.3.10 | 15 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 16 | github.com/charmbracelet/lipgloss v1.1.0 | 16 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +12 -0 generated file: collapsed
A internal/infrastructure/persistence/sqlite/history_repo_benchmark_test.go +71 -0
| @@ -0,0 +1,71 @@ | |||
| 1 | + | package sqlite_test | |
| 2 | + | ||
| 3 | + | import ( | |
| 4 | + | "fmt" | |
| 5 | + | "path/filepath" | |
| 6 | + | "testing" | |
| 7 | + | ||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |
| 11 | + | ) | |
| 12 | + | ||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |
| 15 | + | // history suggestions use Search. | |
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |
| 17 | + | b.Helper() | |
| 18 | + | ||
| 19 | + | ctx := historyTestCtx() | |
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |
| 21 | + | if err != nil { | |
| 22 | + | b.Fatal(err) | |
| 23 | + | } | |
| 24 | + | ||
| 25 | + | b.Cleanup(func() { | |
| 26 | + | if err := db.Close(); err != nil { | |
| 27 | + | b.Errorf("close benchmark database: %v", err) | |
| 28 | + | } | |
| 29 | + | }) | |
| 30 | + | ||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |
| 32 | + | for i := range 200 { | |
| 33 | + | entry := &entity.HistoryEntry{ | |
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |
| 36 | + | } | |
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |
| 38 | + | b.Fatal(err) | |
| 39 | + | } | |
| 40 | + | } | |
| 41 | + | ||
| 42 | + | return repo, func() {} | |
| 43 | + | } | |
| 44 | + | ||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 47 | + | defer closeDB() | |
| 48 | + | ctx := historyTestCtx() | |
| 49 | + | ||
| 50 | + | b.ReportAllocs() | |
| 51 | + | b.ResetTimer() | |
| 52 | + | for range b.N { | |
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |
| 54 | + | b.Fatal(err) | |
| 55 | + | } | |
| 56 | + | } | |
| 57 | + | } | |
| 58 | + | ||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |
| 61 | + | defer closeDB() | |
| 62 | + | ctx := historyTestCtx() | |
| 63 | + | ||
| 64 | + | b.ReportAllocs() | |
| 65 | + | b.ResetTimer() | |
| 66 | + | for range b.N { | |
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |
| 68 | + | b.Fatal(err) | |
| 69 | + | } | |
| 70 | + | } | |
| 71 | + | } | |
| @@ -0,0 +1,71 @@ | |||||
| 1 | + | package sqlite_test | |||
| 2 | + | ||||
| 3 | + | import ( | |||
| 4 | + | "fmt" | |||
| 5 | + | "path/filepath" | |||
| 6 | + | "testing" | |||
| 7 | + | ||||
| 8 | + | "github.com/bnema/dumber/internal/domain/entity" | |||
| 9 | + | "github.com/bnema/dumber/internal/domain/repository" | |||
| 10 | + | "github.com/bnema/dumber/internal/infrastructure/persistence/sqlite" | |||
| 11 | + | ) | |||
| 12 | + | ||||
| 13 | + | // newHistoryBenchmarkRepository creates a representative local history corpus | |||
| 14 | + | // outside the measured operation. Sidebar reads use GetRecent and omnibox | |||
| 15 | + | // history suggestions use Search. | |||
| 16 | + | func newHistoryBenchmarkRepository(b *testing.B) (repository.HistoryRepository, func()) { | |||
| 17 | + | b.Helper() | |||
| 18 | + | ||||
| 19 | + | ctx := historyTestCtx() | |||
| 20 | + | db, err := sqlite.NewConnection(ctx, filepath.Join(b.TempDir(), "dumber.db")) | |||
| 21 | + | if err != nil { | |||
| 22 | + | b.Fatal(err) | |||
| 23 | + | } | |||
| 24 | + | ||||
| 25 | + | b.Cleanup(func() { | |||
| 26 | + | if err := db.Close(); err != nil { | |||
| 27 | + | b.Errorf("close benchmark database: %v", err) | |||
| 28 | + | } | |||
| 29 | + | }) | |||
| 30 | + | ||||
| 31 | + | repo := sqlite.NewHistoryRepository(db) | |||
| 32 | + | for i := range 200 { | |||
| 33 | + | entry := &entity.HistoryEntry{ | |||
| 34 | + | URL: fmt.Sprintf("https://example%d.test/dumber/history/%d", i%20, i), | |||
| 35 | + | Title: fmt.Sprintf("Dumber history entry %d", i), | |||
| 36 | + | } | |||
| 37 | + | if err := repo.Save(ctx, entry); err != nil { | |||
| 38 | + | b.Fatal(err) | |||
| 39 | + | } | |||
| 40 | + | } | |||
| 41 | + | ||||
| 42 | + | return repo, func() {} | |||
| 43 | + | } | |||
| 44 | + | ||||
| 45 | + | func BenchmarkHistorySQLiteSidebarRecent(b *testing.B) { | |||
| 46 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 47 | + | defer closeDB() | |||
| 48 | + | ctx := historyTestCtx() | |||
| 49 | + | ||||
| 50 | + | b.ReportAllocs() | |||
| 51 | + | b.ResetTimer() | |||
| 52 | + | for range b.N { | |||
| 53 | + | if _, err := repo.GetRecent(ctx, 50, 0); err != nil { | |||
| 54 | + | b.Fatal(err) | |||
| 55 | + | } | |||
| 56 | + | } | |||
| 57 | + | } | |||
| 58 | + | ||||
| 59 | + | func BenchmarkHistorySQLiteOmniboxSearch(b *testing.B) { | |||
| 60 | + | repo, closeDB := newHistoryBenchmarkRepository(b) | |||
| 61 | + | defer closeDB() | |||
| 62 | + | ctx := historyTestCtx() | |||
| 63 | + | ||||
| 64 | + | b.ReportAllocs() | |||
| 65 | + | b.ResetTimer() | |||
| 66 | + | for range b.N { | |||
| 67 | + | if _, err := repo.Search(ctx, "dumber history", 10); err != nil { | |||
| 68 | + | b.Fatal(err) | |||
| 69 | + | } | |||
| 70 | + | } | |||
| 71 | + | } | |||
M internal/logging/first_presentation_collector_test.go +132 -1
| @@ -2,6 +2,7 @@ package logging | |||
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | 4 | "encoding/json" | |
| 5 | + | "fmt" | |
| 5 | 6 | "os" | |
| 6 | 7 | "os/exec" | |
| 7 | 8 | "path/filepath" | |
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 143 | 144 | } | |
| 144 | 145 | for _, required := range []string{ | |
| 145 | 146 | `"measured_source_revision"`, | |
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |
| 146 | 148 | `"tag": "v0.8.4"`, | |
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | |
| 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, | |
| 148 | 150 | } { | |
| 149 | 151 | require.Contains(t, artifacts.String(), required) | |
| 150 | 152 | } | |
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 166 | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | |
| 167 | 169 | } | |
| 168 | 170 | ||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 173 | + | require.NoError(t, err) | |
| 174 | + | temp := t.TempDir() | |
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 177 | + | binary := filepath.Join(temp, "dumber") | |
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 179 | + | ||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |
| 181 | + | // hardcode; the collector must report what the selected module says. | |
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |
| 185 | + | output := filepath.Join(temp, "artifacts") | |
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 187 | + | cmd.Dir = repoRoot | |
| 188 | + | cmd.Env = append(os.Environ(), | |
| 189 | + | "DISPLAY=:test", | |
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 195 | + | ) | |
| 196 | + | result, err := cmd.CombinedOutput() | |
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |
| 198 | + | ||
| 199 | + | var metadata struct { | |
| 200 | + | Upstream struct { | |
| 201 | + | Module string `json:"module"` | |
| 202 | + | Version string `json:"version"` | |
| 203 | + | Tag string `json:"tag"` | |
| 204 | + | Revision string `json:"revision"` | |
| 205 | + | } `json:"upstream"` | |
| 206 | + | } | |
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |
| 208 | + | require.NoError(t, err) | |
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |
| 214 | + | ||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 216 | + | require.NoError(t, err) | |
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |
| 218 | + | } | |
| 219 | + | ||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 222 | + | require.NoError(t, err) | |
| 223 | + | ||
| 224 | + | for _, test := range []struct { | |
| 225 | + | name, version, revision, ref string | |
| 226 | + | }{ | |
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |
| 230 | + | } { | |
| 231 | + | t.Run(test.name, func(t *testing.T) { | |
| 232 | + | temp := t.TempDir() | |
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |
| 235 | + | binary := filepath.Join(temp, "dumber") | |
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 237 | + | ||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |
| 239 | + | output := filepath.Join(temp, "artifacts") | |
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 241 | + | cmd.Dir = repoRoot | |
| 242 | + | cmd.Env = append(os.Environ(), | |
| 243 | + | "DISPLAY=:test", | |
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 248 | + | ) | |
| 249 | + | result, runErr := cmd.CombinedOutput() | |
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |
| 252 | + | require.NotContains(t, string(result), temp) | |
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |
| 254 | + | for _, name := range runArtifactNames() { | |
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |
| 256 | + | } | |
| 257 | + | }) | |
| 258 | + | } | |
| 259 | + | } | |
| 260 | + | ||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |
| 262 | + | t.Helper() | |
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |
| 264 | + | info := map[string]any{"Version": version} | |
| 265 | + | if revision != "" { | |
| 266 | + | info["Origin"] = map[string]string{ | |
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |
| 268 | + | } | |
| 269 | + | } | |
| 270 | + | infoJSON, err := json.Marshal(info) | |
| 271 | + | require.NoError(t, err) | |
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |
| 273 | + | ||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |
| 276 | + | }) | |
| 277 | + | require.NoError(t, err) | |
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |
| 280 | + | }) | |
| 281 | + | require.NoError(t, err) | |
| 282 | + | binDir := filepath.Join(temp, "bin") | |
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |
| 284 | + | goBin := filepath.Join(binDir, "go") | |
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |
| 287 | + | printf '%%s\n' '%s' | |
| 288 | + | exit 0 | |
| 289 | + | fi | |
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |
| 291 | + | printf '%%s\n' '%s' | |
| 292 | + | exit 0 | |
| 293 | + | fi | |
| 294 | + | exit 1 | |
| 295 | + | `, selectedJSON, version, downloadedJSON) | |
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |
| 297 | + | return goBin | |
| 298 | + | } | |
| 299 | + | ||
| 169 | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | |
| 170 | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |
| 171 | 302 | require.NoError(t, err) | |
| @@ -2,6 +2,7 @@ package logging | |||||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | "encoding/json" | 4 | "encoding/json" | ||
| 5 | + | "fmt" | |||
| 5 | "os" | 6 | "os" | ||
| 6 | "os/exec" | 7 | "os/exec" | ||
| 7 | "path/filepath" | 8 | "path/filepath" | ||
| @@ -143,8 +144,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 143 | } | 144 | } | ||
| 144 | for _, required := range []string{ | 145 | for _, required := range []string{ | ||
| 145 | `"measured_source_revision"`, | 146 | `"measured_source_revision"`, | ||
| 147 | + | `"version": "v0.8.4-0.20260714160309-bbd397409ebe"`, | |||
| 146 | `"tag": "v0.8.4"`, | 148 | `"tag": "v0.8.4"`, | ||
| 147 | - | `"revision": "f217ece342dea3ef2a3f98671fcd16a39ad0037d"`, | 149 | + | `"revision": "bbd397409ebed75a5979c1e4566a2ef319f6a484"`, |
| 148 | } { | 150 | } { | ||
| 149 | require.Contains(t, artifacts.String(), required) | 151 | require.Contains(t, artifacts.String(), required) | ||
| 150 | } | 152 | } | ||
| @@ -166,6 +168,135 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 166 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | 168 | require.Equal(t, "integrated-gpu", metadata.Comparison.MachineGPUProfile) | ||
| 167 | } | 169 | } | ||
| 168 | 170 | ||||
| 171 | + | func TestFirstPresentationCollectorDerivesSelectedImmutableModuleProvenance(t *testing.T) { | |||
| 172 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 173 | + | require.NoError(t, err) | |||
| 174 | + | temp := t.TempDir() | |||
| 175 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 176 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 177 | + | binary := filepath.Join(temp, "dumber") | |||
| 178 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 179 | + | ||||
| 180 | + | // This exact pseudo-version is deliberately newer than the former v0.8.4 | |||
| 181 | + | // hardcode; the collector must report what the selected module says. | |||
| 182 | + | const version = "v0.8.5-0.20300102030405-bbd397409ebe" | |||
| 183 | + | const revision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |||
| 184 | + | goBin := collectorProvenanceGo(t, temp, version, revision, "") | |||
| 185 | + | output := filepath.Join(temp, "artifacts") | |||
| 186 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 187 | + | cmd.Dir = repoRoot | |||
| 188 | + | cmd.Env = append(os.Environ(), | |||
| 189 | + | "DISPLAY=:test", | |||
| 190 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 191 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 192 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 193 | + | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |||
| 194 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 195 | + | ) | |||
| 196 | + | result, err := cmd.CombinedOutput() | |||
| 197 | + | require.NoErrorf(t, err, "collector failed: %s", result) | |||
| 198 | + | ||||
| 199 | + | var metadata struct { | |||
| 200 | + | Upstream struct { | |||
| 201 | + | Module string `json:"module"` | |||
| 202 | + | Version string `json:"version"` | |||
| 203 | + | Tag string `json:"tag"` | |||
| 204 | + | Revision string `json:"revision"` | |||
| 205 | + | } `json:"upstream"` | |||
| 206 | + | } | |||
| 207 | + | contents, err := os.ReadFile(filepath.Join(output, "metadata.json")) | |||
| 208 | + | require.NoError(t, err) | |||
| 209 | + | require.NoError(t, json.Unmarshal(contents, &metadata)) | |||
| 210 | + | require.Equal(t, "github.com/bnema/purego-cef2gtk", metadata.Upstream.Module) | |||
| 211 | + | require.Equal(t, version, metadata.Upstream.Version) | |||
| 212 | + | require.Equal(t, "v0.8.5", metadata.Upstream.Tag) | |||
| 213 | + | require.Equal(t, revision, metadata.Upstream.Revision) | |||
| 214 | + | ||||
| 215 | + | script, err := os.ReadFile(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 216 | + | require.NoError(t, err) | |||
| 217 | + | require.NotContains(t, string(script), "f217ece342dea3ef2a3f98671fcd16a39ad0037d") | |||
| 218 | + | } | |||
| 219 | + | ||||
| 220 | + | func TestFirstPresentationCollectorRejectsNonImmutableModuleProvenanceWithoutLeaks(t *testing.T) { | |||
| 221 | + | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | |||
| 222 | + | require.NoError(t, err) | |||
| 223 | + | ||||
| 224 | + | for _, test := range []struct { | |||
| 225 | + | name, version, revision, ref string | |||
| 226 | + | }{ | |||
| 227 | + | {name: "branch selector", version: "main", ref: "main"}, | |||
| 228 | + | {name: "missing origin", version: "v0.8.5-0.20300102030405-bbd397409ebe"}, | |||
| 229 | + | {name: "named origin ref", version: "v0.8.5-0.20300102030405-bbd397409ebe", revision: "bbd397409ebed75a5979c1e4566a2ef319f6a484", ref: "main"}, | |||
| 230 | + | } { | |||
| 231 | + | t.Run(test.name, func(t *testing.T) { | |||
| 232 | + | temp := t.TempDir() | |||
| 233 | + | runtime := filepath.Join(temp, "cef-147-runtime") | |||
| 234 | + | require.NoError(t, os.Mkdir(runtime, 0o755)) | |||
| 235 | + | binary := filepath.Join(temp, "dumber") | |||
| 236 | + | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |||
| 237 | + | ||||
| 238 | + | goBin := collectorProvenanceGo(t, temp, test.version, test.revision, test.ref) | |||
| 239 | + | output := filepath.Join(temp, "artifacts") | |||
| 240 | + | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |||
| 241 | + | cmd.Dir = repoRoot | |||
| 242 | + | cmd.Env = append(os.Environ(), | |||
| 243 | + | "DISPLAY=:test", | |||
| 244 | + | "DUMBER_CEF_DIR="+runtime, | |||
| 245 | + | "DUMBER_FIRST_PRESENTATION_BIN="+binary, | |||
| 246 | + | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |||
| 247 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 248 | + | ) | |||
| 249 | + | result, runErr := cmd.CombinedOutput() | |||
| 250 | + | require.Errorf(t, runErr, "collector accepted nonimmutable module provenance: %s", result) | |||
| 251 | + | require.Contains(t, string(result), "immutable module provenance is unavailable") | |||
| 252 | + | require.NotContains(t, string(result), temp) | |||
| 253 | + | require.NoFileExists(t, filepath.Join(output, "metadata.json")) | |||
| 254 | + | for _, name := range runArtifactNames() { | |||
| 255 | + | require.NoFileExists(t, filepath.Join(output, name)) | |||
| 256 | + | } | |||
| 257 | + | }) | |||
| 258 | + | } | |||
| 259 | + | } | |||
| 260 | + | ||||
| 261 | + | func collectorProvenanceGo(t *testing.T, temp, version, revision, ref string) string { | |||
| 262 | + | t.Helper() | |||
| 263 | + | infoPath := filepath.Join(temp, "module.info") | |||
| 264 | + | info := map[string]any{"Version": version} | |||
| 265 | + | if revision != "" { | |||
| 266 | + | info["Origin"] = map[string]string{ | |||
| 267 | + | "VCS": "git", "URL": "https://github.com/bnema/purego-cef2gtk", "Hash": revision, "Ref": ref, | |||
| 268 | + | } | |||
| 269 | + | } | |||
| 270 | + | infoJSON, err := json.Marshal(info) | |||
| 271 | + | require.NoError(t, err) | |||
| 272 | + | require.NoError(t, os.WriteFile(infoPath, infoJSON, 0o600)) | |||
| 273 | + | ||||
| 274 | + | selectedJSON, err := json.Marshal(map[string]string{ | |||
| 275 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, | |||
| 276 | + | }) | |||
| 277 | + | require.NoError(t, err) | |||
| 278 | + | downloadedJSON, err := json.Marshal(map[string]string{ | |||
| 279 | + | "Path": "github.com/bnema/purego-cef2gtk", "Version": version, "Info": infoPath, | |||
| 280 | + | }) | |||
| 281 | + | require.NoError(t, err) | |||
| 282 | + | binDir := filepath.Join(temp, "bin") | |||
| 283 | + | require.NoError(t, os.Mkdir(binDir, 0o755)) | |||
| 284 | + | goBin := filepath.Join(binDir, "go") | |||
| 285 | + | script := fmt.Sprintf(`#!/bin/sh | |||
| 286 | + | if [ "$1" = "list" ] && [ "$2" = "-m" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk" ]; then | |||
| 287 | + | printf '%%s\n' '%s' | |||
| 288 | + | exit 0 | |||
| 289 | + | fi | |||
| 290 | + | if [ "$1" = "mod" ] && [ "$2" = "download" ] && [ "$3" = "-json" ] && [ "$4" = "github.com/bnema/purego-cef2gtk@%s" ]; then | |||
| 291 | + | printf '%%s\n' '%s' | |||
| 292 | + | exit 0 | |||
| 293 | + | fi | |||
| 294 | + | exit 1 | |||
| 295 | + | `, selectedJSON, version, downloadedJSON) | |||
| 296 | + | require.NoError(t, os.WriteFile(goBin, []byte(script), 0o755)) | |||
| 297 | + | return goBin | |||
| 298 | + | } | |||
| 299 | + | ||||
| 169 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | 300 | func TestFirstPresentationCollectorDefaultsToXDGStateEvidenceDirectory(t *testing.T) { | ||
| 170 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | 301 | repoRoot, err := filepath.Abs(filepath.Join("..", "..")) | ||
| 171 | require.NoError(t, err) | 302 | require.NoError(t, err) | ||
M scripts/collect_first_presentation.sh +78 -9
| @@ -31,8 +31,78 @@ else | |||
| 31 | 31 | fi | |
| 32 | 32 | readonly output | |
| 33 | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | |
| 34 | - | readonly upstream_tag="v0.8.4" | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | |
| 34 | + | ||
| 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS | |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |
| 38 | + | resolve_upstream_provenance() { | |
| 39 | + | local selected_metadata selected_version downloaded_metadata | |
| 40 | + | ||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 43 | + | exit 2 | |
| 44 | + | } | |
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |
| 46 | + | import json, sys | |
| 47 | + | try: | |
| 48 | + | metadata = json.loads(sys.argv[2]) | |
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |
| 50 | + | raise ValueError | |
| 51 | + | print(metadata["Version"]) | |
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 54 | + | PY | |
| 55 | + | )" || exit $? | |
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |
| 58 | + | exit 2 | |
| 59 | + | } | |
| 60 | + | ||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |
| 62 | + | import json, re, sys | |
| 63 | + | ||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |
| 65 | + | ||
| 66 | + | def fail(): | |
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |
| 69 | + | ||
| 70 | + | try: | |
| 71 | + | selected = json.loads(selected_raw) | |
| 72 | + | downloaded = json.loads(downloaded_raw) | |
| 73 | + | version = selected["Version"] | |
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |
| 75 | + | fail() | |
| 76 | + | if downloaded.get("Version") != version: | |
| 77 | + | fail() | |
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |
| 80 | + | if not match: | |
| 81 | + | fail() | |
| 82 | + | info_path = downloaded.get("Info") | |
| 83 | + | if not isinstance(info_path, str) or not info_path: | |
| 84 | + | fail() | |
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |
| 86 | + | info = json.load(info_file) | |
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |
| 89 | + | fail() | |
| 90 | + | revision = origin.get("Hash") | |
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |
| 92 | + | fail() | |
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |
| 94 | + | fail() | |
| 95 | + | if not revision.startswith(match.group(2)): | |
| 96 | + | fail() | |
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |
| 99 | + | fail() | |
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |
| 101 | + | fail() | |
| 102 | + | ||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |
| 104 | + | PY | |
| 105 | + | } | |
| 36 | 106 | ||
| 37 | 107 | # The artifact destination is caller-controlled. Never empty or recursively | |
| 38 | 108 | # clear it: collection only writes to a newly-created directory whose parent is | |
| @@ -66,10 +136,9 @@ prepare_output | |||
| 66 | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | |
| 67 | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | |
| 68 | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | |
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | |
| 71 | - | exit 2 | |
| 72 | - | } | |
| 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? | |
| 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" | |
| 141 | + | readonly upstream_version upstream_tag upstream_revision | |
| 73 | 142 | ||
| 74 | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | |
| 75 | 144 | # outside the committed artifact directory and always remove them. | |
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||
| 80 | 149 | rm -rf -- "$work_root" | |
| 81 | 150 | } | |
| 82 | 151 | trap cleanup_work_root EXIT | |
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' | |
| 84 | 153 | import hashlib, json, os, platform, subprocess, sys | |
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | |
| 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] | |
| 86 | 155 | with open(binary, "rb") as candidate: | |
| 87 | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | |
| 88 | 157 | ||
| @@ -102,7 +171,7 @@ json.dump({ | |||
| 102 | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | |
| 103 | 172 | "timeout_seconds": int(timeout), | |
| 104 | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | |
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | |
| 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, | |
| 106 | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | |
| 107 | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | |
| 108 | 177 | }, open(path, "w"), indent=2, sort_keys=True) | |
| @@ -31,8 +31,78 @@ else | |||||
| 31 | fi | 31 | fi | ||
| 32 | readonly output | 32 | readonly output | ||
| 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | 33 | readonly upstream_module="github.com/bnema/purego-cef2gtk" | ||
| 34 | - | readonly upstream_tag="v0.8.4" | 34 | + | |
| 35 | - | readonly upstream_revision="f217ece342dea3ef2a3f98671fcd16a39ad0037d" | 35 | + | # Resolve the version selected by this checkout, then obtain its immutable VCS |
| 36 | + | # origin from Go's cached module metadata. Do not infer a revision from a tag, | |||
| 37 | + | # a branch, or a truncated pseudo-version suffix. | |||
| 38 | + | resolve_upstream_provenance() { | |||
| 39 | + | local selected_metadata selected_version downloaded_metadata | |||
| 40 | + | ||||
| 41 | + | selected_metadata="$(go list -m -json "$upstream_module" 2>/dev/null)" || { | |||
| 42 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 43 | + | exit 2 | |||
| 44 | + | } | |||
| 45 | + | selected_version="$(python3 - "$upstream_module" "$selected_metadata" <<'PY' | |||
| 46 | + | import json, sys | |||
| 47 | + | try: | |||
| 48 | + | metadata = json.loads(sys.argv[2]) | |||
| 49 | + | if metadata.get("Path") != sys.argv[1] or not isinstance(metadata.get("Version"), str): | |||
| 50 | + | raise ValueError | |||
| 51 | + | print(metadata["Version"]) | |||
| 52 | + | except (AttributeError, TypeError, ValueError, json.JSONDecodeError): | |||
| 53 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 54 | + | PY | |||
| 55 | + | )" || exit $? | |||
| 56 | + | downloaded_metadata="$(go mod download -json "$upstream_module@$selected_version" 2>/dev/null)" || { | |||
| 57 | + | echo "first-presentation: immutable module provenance is unavailable" >&2 | |||
| 58 | + | exit 2 | |||
| 59 | + | } | |||
| 60 | + | ||||
| 61 | + | python3 - "$upstream_module" "$selected_metadata" "$downloaded_metadata" <<'PY' | |||
| 62 | + | import json, re, sys | |||
| 63 | + | ||||
| 64 | + | module, selected_raw, downloaded_raw = sys.argv[1:] | |||
| 65 | + | ||||
| 66 | + | def fail(): | |||
| 67 | + | # Do not expose Go cache locations or other machine-local values. | |||
| 68 | + | raise SystemExit("first-presentation: immutable module provenance is unavailable") | |||
| 69 | + | ||||
| 70 | + | try: | |||
| 71 | + | selected = json.loads(selected_raw) | |||
| 72 | + | downloaded = json.loads(downloaded_raw) | |||
| 73 | + | version = selected["Version"] | |||
| 74 | + | if selected.get("Path") != module or downloaded.get("Path") != module: | |||
| 75 | + | fail() | |||
| 76 | + | if downloaded.get("Version") != version: | |||
| 77 | + | fail() | |||
| 78 | + | # A selected pseudo-version is an exact immutable selector, never a branch. | |||
| 79 | + | match = re.fullmatch(r"(v\d+\.\d+\.\d+)-0\.\d{14}-([0-9a-f]{12})", version) | |||
| 80 | + | if not match: | |||
| 81 | + | fail() | |||
| 82 | + | info_path = downloaded.get("Info") | |||
| 83 | + | if not isinstance(info_path, str) or not info_path: | |||
| 84 | + | fail() | |||
| 85 | + | with open(info_path, encoding="utf-8") as info_file: | |||
| 86 | + | info = json.load(info_file) | |||
| 87 | + | origin = info.get("Origin") or downloaded.get("Origin") | |||
| 88 | + | if info.get("Version") != version or not isinstance(origin, dict): | |||
| 89 | + | fail() | |||
| 90 | + | revision = origin.get("Hash") | |||
| 91 | + | if origin.get("VCS") != "git" or origin.get("URL") != "https://github.com/bnema/purego-cef2gtk": | |||
| 92 | + | fail() | |||
| 93 | + | if not isinstance(revision, str) or not re.fullmatch(r"[0-9a-f]{40}", revision): | |||
| 94 | + | fail() | |||
| 95 | + | if not revision.startswith(match.group(2)): | |||
| 96 | + | fail() | |||
| 97 | + | # A named ref can move. Only the immutable hash itself is acceptable. | |||
| 98 | + | if origin.get("Ref") not in (None, "", revision): | |||
| 99 | + | fail() | |||
| 100 | + | except (AttributeError, KeyError, OSError, TypeError, ValueError, json.JSONDecodeError): | |||
| 101 | + | fail() | |||
| 102 | + | ||||
| 103 | + | print("\t".join((version, match.group(1), revision))) | |||
| 104 | + | PY | |||
| 105 | + | } | |||
| 36 | 106 | ||||
| 37 | # The artifact destination is caller-controlled. Never empty or recursively | 107 | # The artifact destination is caller-controlled. Never empty or recursively | ||
| 38 | # clear it: collection only writes to a newly-created directory whose parent is | 108 | # clear it: collection only writes to a newly-created directory whose parent is | ||
| @@ -66,10 +136,9 @@ prepare_output | |||||
| 66 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | 136 | [[ -x "$binary" ]] || { echo "first-presentation: executable not found: $binary" >&2; exit 2; } | ||
| 67 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | 137 | [[ -d "$runtime" ]] || { echo "first-presentation: CEF runtime not found: $runtime" >&2; exit 2; } | ||
| 68 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | 138 | [[ -n "${WAYLAND_DISPLAY:-}${DISPLAY:-}" ]] || { echo "first-presentation: a current Wayland/X11 display is required" >&2; exit 2; } | ||
| 69 | - | [[ "$(go list -m -f '{{.Version}}' "$upstream_module")" == "$upstream_tag" ]] || { | 139 | + | upstream_provenance="$(resolve_upstream_provenance)" || exit $? |
| 70 | - | echo "first-presentation: expected $upstream_module@$upstream_tag" >&2 | 140 | + | IFS=$'\t' read -r upstream_version upstream_tag upstream_revision <<<"$upstream_provenance" |
| 71 | - | exit 2 | 141 | + | readonly upstream_version upstream_tag upstream_revision |
| 72 | - | } | |||
| 73 | 142 | ||||
| 74 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | 143 | # Raw logs and temporary XDG homes may contain machine-local paths. Keep them | ||
| 75 | # outside the committed artifact directory and always remove them. | 144 | # outside the committed artifact directory and always remove them. | ||
| @@ -80,9 +149,9 @@ cleanup_work_root() { | |||||
| 80 | rm -rf -- "$work_root" | 149 | rm -rf -- "$work_root" | ||
| 81 | } | 150 | } | ||
| 82 | trap cleanup_work_root EXIT | 151 | trap cleanup_work_root EXIT | ||
| 83 | - | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_tag" "$upstream_revision" <<'PY' | 152 | + | python3 - "$output/metadata.json" "$binary" "$timeout_seconds" "$upstream_module" "$upstream_version" "$upstream_tag" "$upstream_revision" <<'PY' |
| 84 | import hashlib, json, os, platform, subprocess, sys | 153 | import hashlib, json, os, platform, subprocess, sys | ||
| 85 | - | path, binary, timeout, upstream_module, upstream_tag, upstream_revision = sys.argv[1:] | 154 | + | path, binary, timeout, upstream_module, upstream_version, upstream_tag, upstream_revision = sys.argv[1:] |
| 86 | with open(binary, "rb") as candidate: | 155 | with open(binary, "rb") as candidate: | ||
| 87 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | 156 | binary_sha256 = hashlib.file_digest(candidate, "sha256").hexdigest() | ||
| 88 | 157 | ||||
| @@ -102,7 +171,7 @@ json.dump({ | |||||
| 102 | "binary": {"label": "dumber", "sha256": binary_sha256}, | 171 | "binary": {"label": "dumber", "sha256": binary_sha256}, | ||
| 103 | "timeout_seconds": int(timeout), | 172 | "timeout_seconds": int(timeout), | ||
| 104 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | 173 | "measured_source_revision": subprocess.check_output(["git", "-c", f"safe.directory={os.getcwd()}", "rev-parse", "HEAD"], text=True).strip(), | ||
| 105 | - | "upstream": {"module": upstream_module, "tag": upstream_tag, "revision": upstream_revision}, | 174 | + | "upstream": {"module": upstream_module, "version": upstream_version, "tag": upstream_tag, "revision": upstream_revision}, |
| 106 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | 175 | "comparison": {"os": os_label, "architecture": architecture, "display_protocol": display_protocol, "machine_gpu_profile": gpu_profile}, | ||
| 107 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | 176 | "render_configuration": {"backend": "gdk-dmabuf", "buffer_sharing": "dmabuf", "renderer": "vulkan"} | ||
| 108 | }, open(path, "w"), indent=2, sort_keys=True) | 177 | }, open(path, "w"), indent=2, sort_keys=True) | ||
M vendor/github.com/bnema/purego-cef/cef/bridge.go +8 -13 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/cefadapter/accelerated_paint.go +34 -37 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/dmabuf/frame.go +38 -19 generated file: collapsed
M vendor/github.com/bnema/purego-cef2gtk/internal/gtkgdk/renderer.go +89 -69 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player.go +5 -0 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/player_rt.go +10 -6 generated file: collapsed
M vendor/github.com/bnema/purego-pipewire/internal/core/pwbuffer.go +66 -32 generated file: collapsed
M vendor/github.com/bnema/purego-sqlite/driver/driver.go +268 -63
| @@ -1,8 +1,13 @@ | |||
| 1 | 1 | package driver | |
| 2 | 2 | ||
| 3 | 3 | import ( | |
| 4 | + | "context" | |
| 5 | + | "database/sql" | |
| 4 | 6 | "database/sql/driver" | |
| 7 | + | "errors" | |
| 5 | 8 | "io" | |
| 9 | + | "strings" | |
| 10 | + | "sync" | |
| 6 | 11 | "time" | |
| 7 | 12 | ||
| 8 | 13 | "github.com/bnema/purego-sqlite/sqlite" | |
| @@ -38,9 +43,69 @@ func (d *Driver) Open(dsn string) (driver.Conn, error) { | |||
| 38 | 43 | return &conn{db: db}, nil | |
| 39 | 44 | } | |
| 40 | 45 | ||
| 41 | - | // conn implements database/sql/driver.Conn. | |
| 46 | + | // conn implements database/sql/driver.Conn and its context-aware extensions. | |
| 42 | 47 | type conn struct { | |
| 43 | 48 | db sqlite.DB | |
| 49 | + | ||
| 50 | + | // opMu serializes SQLite calls on this connection. In particular, a query | |
| 51 | + | // retains it until its Rows are closed, so a late cancellation cannot | |
| 52 | + | // interrupt a later operation after this connection is returned to a pool. | |
| 53 | + | opMu sync.Mutex | |
| 54 | + | activeMu sync.Mutex | |
| 55 | + | active *operation | |
| 56 | + | } | |
| 57 | + | ||
| 58 | + | type operation struct { | |
| 59 | + | done chan struct{} | |
| 60 | + | once sync.Once | |
| 61 | + | } | |
| 62 | + | ||
| 63 | + | func (c *conn) beginOperation(ctx context.Context) (*operation, error) { | |
| 64 | + | if err := ctx.Err(); err != nil { | |
| 65 | + | return nil, err | |
| 66 | + | } | |
| 67 | + | c.opMu.Lock() | |
| 68 | + | if err := ctx.Err(); err != nil { | |
| 69 | + | c.opMu.Unlock() | |
| 70 | + | return nil, err | |
| 71 | + | } | |
| 72 | + | // A context without a Done channel cannot cancel. It still holds opMu to | |
| 73 | + | // serialize the SQLite connection, but avoids allocating a token/watcher. | |
| 74 | + | if ctx.Done() == nil { | |
| 75 | + | return nil, nil | |
| 76 | + | } | |
| 77 | + | op := &operation{done: make(chan struct{})} | |
| 78 | + | c.activeMu.Lock() | |
| 79 | + | c.active = op | |
| 80 | + | c.activeMu.Unlock() | |
| 81 | + | go func() { | |
| 82 | + | select { | |
| 83 | + | case <-ctx.Done(): | |
| 84 | + | c.activeMu.Lock() | |
| 85 | + | if c.active == op { | |
| 86 | + | c.db.Interrupt() | |
| 87 | + | } | |
| 88 | + | c.activeMu.Unlock() | |
| 89 | + | case <-op.done: | |
| 90 | + | } | |
| 91 | + | }() | |
| 92 | + | return op, nil | |
| 93 | + | } | |
| 94 | + | ||
| 95 | + | func (c *conn) finishOperation(op *operation) { | |
| 96 | + | if op == nil { | |
| 97 | + | c.opMu.Unlock() | |
| 98 | + | return | |
| 99 | + | } | |
| 100 | + | op.once.Do(func() { | |
| 101 | + | c.activeMu.Lock() | |
| 102 | + | if c.active == op { | |
| 103 | + | c.active = nil | |
| 104 | + | } | |
| 105 | + | close(op.done) | |
| 106 | + | c.activeMu.Unlock() | |
| 107 | + | c.opMu.Unlock() | |
| 108 | + | }) | |
| 44 | 109 | } | |
| 45 | 110 | ||
| 46 | 111 | // Prepare returns a prepared statement. | |
| @@ -49,117 +114,242 @@ func (c *conn) Prepare(query string) (driver.Stmt, error) { | |||
| 49 | 114 | if err != nil { | |
| 50 | 115 | return nil, err | |
| 51 | 116 | } | |
| 52 | - | return &stmt{s: s}, nil | |
| 117 | + | return &stmt{s: s, conn: c}, nil | |
| 118 | + | } | |
| 119 | + | ||
| 120 | + | // PrepareContext prepares a statement without database/sql's legacy fallback. | |
| 121 | + | func (c *conn) PrepareContext(ctx context.Context, query string) (driver.Stmt, error) { | |
| 122 | + | op, err := c.beginOperation(ctx) | |
| 123 | + | if err != nil { | |
| 124 | + | return nil, err | |
| 125 | + | } | |
| 126 | + | defer c.finishOperation(op) | |
| 127 | + | s, err := c.db.Prepare(query) | |
| 128 | + | if err != nil { | |
| 129 | + | if ctxErr := ctx.Err(); ctxErr != nil { | |
| 130 | + | return nil, ctxErr | |
| 131 | + | } | |
| 132 | + | return nil, err | |
| 133 | + | } | |
| 134 | + | return &stmt{s: s, conn: c}, nil | |
| 53 | 135 | } | |
| 54 | 136 | ||
| 55 | 137 | // Close closes the connection. | |
| 56 | 138 | func (c *conn) Close() error { | |
| 139 | + | c.opMu.Lock() | |
| 140 | + | defer c.opMu.Unlock() | |
| 57 | 141 | return c.db.Close() | |
| 58 | 142 | } | |
| 59 | 143 | ||
| 60 | 144 | // Begin starts a transaction. | |
| 61 | - | func (c *conn) Begin() (driver.Tx, error) { | |
| 145 | + | func (c *conn) Begin() (driver.Tx, error) { return c.begin() } | |
| 146 | + | ||
| 147 | + | func (c *conn) begin() (driver.Tx, error) { | |
| 62 | 148 | if _, err := c.db.Exec("BEGIN"); err != nil { | |
| 63 | 149 | return nil, err | |
| 64 | 150 | } | |
| 65 | 151 | return &tx{db: c.db}, nil | |
| 66 | 152 | } | |
| 67 | 153 | ||
| 68 | - | // tx implements database/sql/driver.Tx. | |
| 69 | - | type tx struct { | |
| 70 | - | db sqlite.DB | |
| 154 | + | // BeginTx starts a transaction directly while honoring context cancellation. | |
| 155 | + | func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) { | |
| 156 | + | if opts.ReadOnly { | |
| 157 | + | return nil, errors.New("sqlite3: read-only transactions are not supported") | |
| 158 | + | } | |
| 159 | + | if opts.Isolation != driver.IsolationLevel(sql.LevelDefault) && opts.Isolation != driver.IsolationLevel(sql.LevelSerializable) { | |
| 160 | + | return nil, errors.New("sqlite3: requested isolation level is not supported") | |
| 161 | + | } | |
| 162 | + | op, err := c.beginOperation(ctx) | |
| 163 | + | if err != nil { | |
| 164 | + | return nil, err | |
| 165 | + | } | |
| 166 | + | defer c.finishOperation(op) | |
| 167 | + | if _, err := c.db.Exec("BEGIN"); err != nil { | |
| 168 | + | if ctxErr := ctx.Err(); ctxErr != nil { | |
| 169 | + | return nil, ctxErr | |
| 170 | + | } | |
| 171 | + | return nil, err | |
| 172 | + | } | |
| 173 | + | return &tx{db: c.db}, nil | |
| 71 | 174 | } | |
| 72 | 175 | ||
| 73 | - | // Commit commits the transaction. | |
| 74 | - | func (t *tx) Commit() error { | |
| 75 | - | _, err := t.db.Exec("COMMIT") | |
| 76 | - | return err | |
| 176 | + | // ExecContext executes directly without database/sql's prepare/close fallback. | |
| 177 | + | func (c *conn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) { | |
| 178 | + | op, err := c.beginOperation(ctx) | |
| 179 | + | if err != nil { | |
| 180 | + | return nil, err | |
| 181 | + | } | |
| 182 | + | defer c.finishOperation(op) | |
| 183 | + | result, err := c.db.Exec(query, namedValuesToAny(args)...) | |
| 184 | + | if err != nil && ctx.Err() != nil { | |
| 185 | + | return nil, ctx.Err() | |
| 186 | + | } | |
| 187 | + | return result, err | |
| 77 | 188 | } | |
| 78 | 189 | ||
| 79 | - | // Rollback rolls back the transaction. | |
| 80 | - | func (t *tx) Rollback() error { | |
| 81 | - | _, err := t.db.Exec("ROLLBACK") | |
| 82 | - | return err | |
| 190 | + | // QueryContext executes directly without database/sql's prepare/close fallback. | |
| 191 | + | // Its operation remains owned by the returned Rows until Close or exhaustion. | |
| 192 | + | func (c *conn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) { | |
| 193 | + | op, err := c.beginOperation(ctx) | |
| 194 | + | if err != nil { | |
| 195 | + | return nil, err | |
| 196 | + | } | |
| 197 | + | rows, err := c.db.Query(query, namedValuesToAny(args)...) | |
| 198 | + | if err != nil { | |
| 199 | + | c.finishOperation(op) | |
| 200 | + | if ctx.Err() != nil { | |
| 201 | + | return nil, ctx.Err() | |
| 202 | + | } | |
| 203 | + | return nil, err | |
| 204 | + | } | |
| 205 | + | declTypes, err := rows.ColumnDeclTypes() | |
| 206 | + | if err != nil { | |
| 207 | + | closeErr := rows.Close() | |
| 208 | + | c.finishOperation(op) | |
| 209 | + | return nil, errors.Join(err, closeErr) | |
| 210 | + | } | |
| 211 | + | return &driverRows{rows: rows, declTypes: declTypes, ctx: ctx, release: func() { c.finishOperation(op) }}, nil | |
| 83 | 212 | } | |
| 84 | 213 | ||
| 85 | - | // stmt implements database/sql/driver.Stmt. | |
| 214 | + | // tx implements database/sql/driver.Tx. | |
| 215 | + | type tx struct{ db sqlite.DB } | |
| 216 | + | ||
| 217 | + | func (t *tx) Commit() error { _, err := t.db.Exec("COMMIT"); return err } | |
| 218 | + | func (t *tx) Rollback() error { _, err := t.db.Exec("ROLLBACK"); return err } | |
| 219 | + | ||
| 220 | + | // stmt implements database/sql/driver.Stmt and its context-aware extensions. | |
| 86 | 221 | type stmt struct { | |
| 87 | - | s sqlite.Stmt | |
| 222 | + | s sqlite.Stmt | |
| 223 | + | conn *conn | |
| 88 | 224 | } | |
| 89 | 225 | ||
| 90 | - | // Close closes the statement. | |
| 91 | - | func (s *stmt) Close() error { | |
| 92 | - | return s.s.Close() | |
| 226 | + | func (s *stmt) Close() error { return s.s.Close() } | |
| 227 | + | func (s *stmt) NumInput() int { return s.s.NumInput() } | |
| 228 | + | func (s *stmt) Exec(args []driver.Value) (driver.Result, error) { | |
| 229 | + | return s.s.Exec(driverValuesToAny(args)...) | |
| 230 | + | } | |
| 231 | + | func (s *stmt) Query(args []driver.Value) (driver.Rows, error) { | |
| 232 | + | return s.query(driverValuesToAny(args), context.Background(), nil) | |
| 93 | 233 | } | |
| 94 | 234 | ||
| 95 | - | // NumInput returns the number of placeholder parameters. | |
| 96 | - | func (s *stmt) NumInput() int { | |
| 97 | - | return s.s.NumInput() | |
| 235 | + | func (s *stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (driver.Result, error) { | |
| 236 | + | if s.conn == nil { | |
| 237 | + | if err := ctx.Err(); err != nil { | |
| 238 | + | return nil, err | |
| 239 | + | } | |
| 240 | + | return s.s.Exec(namedValuesToAny(args)...) | |
| 241 | + | } | |
| 242 | + | op, err := s.conn.beginOperation(ctx) | |
| 243 | + | if err != nil { | |
| 244 | + | return nil, err | |
| 245 | + | } | |
| 246 | + | defer s.conn.finishOperation(op) | |
| 247 | + | result, err := s.s.Exec(namedValuesToAny(args)...) | |
| 248 | + | if err != nil && ctx.Err() != nil { | |
| 249 | + | return nil, ctx.Err() | |
| 250 | + | } | |
| 251 | + | return result, err | |
| 98 | 252 | } | |
| 99 | 253 | ||
| 100 | - | // Exec executes the statement with the given args. | |
| 101 | - | func (s *stmt) Exec(args []driver.Value) (driver.Result, error) { | |
| 102 | - | anyArgs := driverValuesToAny(args) | |
| 103 | - | return s.s.Exec(anyArgs...) | |
| 254 | + | func (s *stmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) { | |
| 255 | + | if s.conn == nil { | |
| 256 | + | if err := ctx.Err(); err != nil { | |
| 257 | + | return nil, err | |
| 258 | + | } | |
| 259 | + | return s.query(namedValuesToAny(args), ctx, nil) | |
| 260 | + | } | |
| 261 | + | op, err := s.conn.beginOperation(ctx) | |
| 262 | + | if err != nil { | |
| 263 | + | return nil, err | |
| 264 | + | } | |
| 265 | + | return s.query(namedValuesToAny(args), ctx, func() { s.conn.finishOperation(op) }) | |
| 104 | 266 | } | |
| 105 | 267 | ||
| 106 | - | // Query executes the statement and returns rows. | |
| 107 | - | func (s *stmt) Query(args []driver.Value) (driver.Rows, error) { | |
| 108 | - | anyArgs := driverValuesToAny(args) | |
| 109 | - | rows, err := s.s.Query(anyArgs...) | |
| 268 | + | func (s *stmt) query(args []any, ctx context.Context, release func()) (driver.Rows, error) { | |
| 269 | + | rows, err := s.s.Query(args...) | |
| 110 | 270 | if err != nil { | |
| 271 | + | if release != nil { | |
| 272 | + | release() | |
| 273 | + | } | |
| 274 | + | if ctx.Err() != nil { | |
| 275 | + | return nil, ctx.Err() | |
| 276 | + | } | |
| 111 | 277 | return nil, err | |
| 112 | 278 | } | |
| 113 | - | return &driverRows{rows: rows}, nil | |
| 279 | + | declTypes, err := rows.ColumnDeclTypes() | |
| 280 | + | if err != nil { | |
| 281 | + | closeErr := rows.Close() | |
| 282 | + | if release != nil { | |
| 283 | + | release() | |
| 284 | + | } | |
| 285 | + | return nil, errors.Join(err, closeErr) | |
| 286 | + | } | |
| 287 | + | return &driverRows{rows: rows, declTypes: declTypes, ctx: ctx, release: release}, nil | |
| 114 | 288 | } | |
| 115 | 289 | ||
| 116 | 290 | // driverRows implements database/sql/driver.Rows. | |
| 117 | 291 | type driverRows struct { | |
| 118 | - | rows sqlite.Rows | |
| 292 | + | rows sqlite.Rows | |
| 293 | + | declTypes []string | |
| 294 | + | values []any | |
| 295 | + | ptrs []any | |
| 296 | + | ctx context.Context | |
| 297 | + | release func() | |
| 298 | + | closeOnce sync.Once | |
| 299 | + | closeErr error | |
| 119 | 300 | } | |
| 120 | 301 | ||
| 121 | 302 | // Columns returns the column names. | |
| 122 | - | func (r *driverRows) Columns() []string { | |
| 123 | - | cols, _ := r.rows.Columns() | |
| 124 | - | return cols | |
| 125 | - | } | |
| 303 | + | func (r *driverRows) Columns() []string { cols, _ := r.rows.Columns(); return cols } | |
| 126 | 304 | ||
| 127 | - | // Close closes the rows. | |
| 305 | + | // Close closes the rows and releases its cancellation ownership. | |
| 128 | 306 | func (r *driverRows) Close() error { | |
| 129 | - | return r.rows.Close() | |
| 307 | + | r.closeOnce.Do(func() { | |
| 308 | + | r.closeErr = r.rows.Close() | |
| 309 | + | if r.release != nil { | |
| 310 | + | r.release() | |
| 311 | + | } | |
| 312 | + | }) | |
| 313 | + | return r.closeErr | |
| 130 | 314 | } | |
| 131 | 315 | ||
| 132 | - | // Next fills dest with the next row's values. | |
| 133 | - | // Returns io.EOF when there are no more rows. | |
| 316 | + | // Next fills dest with the next row's values and releases ownership at EOF. | |
| 134 | 317 | func (r *driverRows) Next(dest []driver.Value) error { | |
| 135 | 318 | if !r.rows.Next() { | |
| 136 | - | if err := r.rows.Err(); err != nil { | |
| 137 | - | return err | |
| 319 | + | err := r.rows.Err() | |
| 320 | + | closeErr := r.Close() | |
| 321 | + | if r.ctx != nil && r.ctx.Err() != nil { | |
| 322 | + | return errors.Join(r.ctx.Err(), err, closeErr) | |
| 323 | + | } | |
| 324 | + | if err != nil || closeErr != nil { | |
| 325 | + | return errors.Join(err, closeErr) | |
| 138 | 326 | } | |
| 139 | 327 | return io.EOF | |
| 140 | 328 | } | |
| 141 | - | // We cannot pass *driver.Value to core.Scan because driver.Value is a | |
| 142 | - | // distinct named type (not a type alias) in Go 1.22+, so *driver.Value | |
| 143 | - | // does not match *any in a type switch. Use intermediate *any variables. | |
| 144 | - | vals := make([]any, len(dest)) | |
| 145 | - | ptrs := make([]any, len(dest)) | |
| 146 | - | for i := range dest { | |
| 147 | - | ptrs[i] = &vals[i] | |
| 329 | + | // driver.Value is a distinct named type, so Scan needs *any scratch slots. | |
| 330 | + | if len(r.values) != len(dest) { | |
| 331 | + | r.values = make([]any, len(dest)) | |
| 332 | + | r.ptrs = make([]any, len(dest)) | |
| 333 | + | for i := range dest { | |
| 334 | + | r.ptrs[i] = &r.values[i] | |
| 335 | + | } | |
| 148 | 336 | } | |
| 149 | - | if err := r.rows.Scan(ptrs...); err != nil { | |
| 150 | - | return err | |
| 337 | + | if err := r.rows.Scan(r.ptrs...); err != nil { | |
| 338 | + | return errors.Join(err, r.Close()) | |
| 151 | 339 | } | |
| 152 | 340 | for i := range dest { | |
| 153 | - | dest[i] = maybeParseTime(vals[i]) | |
| 341 | + | dest[i] = maybeParseDeclaredTime(r.declTypes, i, r.values[i]) | |
| 154 | 342 | } | |
| 155 | 343 | return nil | |
| 156 | 344 | } | |
| 157 | 345 | ||
| 158 | - | // maybeParseTime converts a string value to time.Time if it matches a known | |
| 159 | - | // SQLite datetime format. Non-string values and non-matching strings pass through. | |
| 160 | - | func maybeParseTime(v any) any { | |
| 346 | + | // maybeParseDeclaredTime converts values for SQLite DATE, DATETIME, and TIMESTAMP columns. | |
| 347 | + | func maybeParseDeclaredTime(declTypes []string, index int, v any) any { | |
| 348 | + | if index >= len(declTypes) || !isDateTimeDeclType(declTypes[index]) { | |
| 349 | + | return v | |
| 350 | + | } | |
| 161 | 351 | s, ok := v.(string) | |
| 162 | - | if !ok || len(s) < 10 { // "2006-01-02" is the shortest format | |
| 352 | + | if !ok || len(s) < 10 { | |
| 163 | 353 | return v | |
| 164 | 354 | } | |
| 165 | 355 | for _, format := range sqliteTimeFormats { | |
| @@ -169,17 +359,32 @@ func maybeParseTime(v any) any { | |||
| 169 | 359 | } | |
| 170 | 360 | return v | |
| 171 | 361 | } | |
| 362 | + | func isDateTimeDeclType(declType string) bool { | |
| 363 | + | switch strings.ToUpper(strings.TrimSpace(declType)) { | |
| 364 | + | case "DATE", "DATETIME", "TIMESTAMP": | |
| 365 | + | return true | |
| 366 | + | } | |
| 367 | + | return false | |
| 368 | + | } | |
| 172 | 369 | ||
| 173 | - | // driverValuesToAny converts a []driver.Value to []any, formatting time.Time | |
| 174 | - | // values as SQLite-compatible datetime strings. | |
| 370 | + | // driverValuesToAny formats time.Time values as SQLite-compatible timestamps. | |
| 175 | 371 | func driverValuesToAny(args []driver.Value) []any { | |
| 176 | 372 | out := make([]any, len(args)) | |
| 177 | 373 | for i, v := range args { | |
| 178 | - | if t, ok := v.(time.Time); ok { | |
| 179 | - | out[i] = t.UTC().Format("2006-01-02 15:04:05.999999999") | |
| 180 | - | } else { | |
| 181 | - | out[i] = v | |
| 182 | - | } | |
| 374 | + | out[i] = normalizeValue(v) | |
| 183 | 375 | } | |
| 184 | 376 | return out | |
| 185 | 377 | } | |
| 378 | + | func namedValuesToAny(args []driver.NamedValue) []any { | |
| 379 | + | out := make([]any, len(args)) | |
| 380 | + | for i := range args { | |
| 381 | + | out[i] = normalizeValue(args[i].Value) | |
| 382 | + | } | |
| 383 | + | return out | |
| 384 | + | } | |
| 385 | + | func normalizeValue(v any) any { | |
| 386 | + | if t, ok := v.(time.Time); ok { | |
| 387 | + | return t.UTC().Format("2006-01-02 15:04:05.999999999") | |
| 388 | + | } | |
| 389 | + | return v | |
| 390 | + | } | |
| @@ -1,8 +1,13 @@ | |||||
| 1 | package driver | 1 | package driver | ||
| 2 | 2 | ||||
| 3 | import ( | 3 | import ( | ||
| 4 | + | "context" | |||
| 5 | + | "database/sql" | |||
| 4 | "database/sql/driver" | 6 | "database/sql/driver" | ||
| 7 | + | "errors" | |||
| 5 | "io" | 8 | "io" | ||
| 9 | + | "strings" | |||
| 10 | + | "sync" | |||
| 6 | "time" | 11 | "time" | ||
| 7 | 12 | ||||
| 8 | "github.com/bnema/purego-sqlite/sqlite" | 13 | "github.com/bnema/purego-sqlite/sqlite" | ||
| @@ -38,9 +43,69 @@ func (d *Driver) Open(dsn string) (driver.Conn, error) { | |||||
| 38 | return &conn{db: db}, nil | 43 | return &conn{db: db}, nil | ||
| 39 | } | 44 | } | ||
| 40 | 45 | ||||
| 41 | - | // conn implements database/sql/driver.Conn. | 46 | + | // conn implements database/sql/driver.Conn and its context-aware extensions. |
| 42 | type conn struct { | 47 | type conn struct { | ||
| 43 | db sqlite.DB | 48 | db sqlite.DB | ||
| 49 | + | ||||
| 50 | + | // opMu serializes SQLite calls on this connection. In particular, a query | |||
| 51 | + | // retains it until its Rows are closed, so a late cancellation cannot | |||
| 52 | + | // interrupt a later operation after this connection is returned to a pool. | |||
| 53 | + | opMu sync.Mutex | |||
| 54 | + | activeMu sync.Mutex | |||
| 55 | + | active *operation | |||
| 56 | + | } | |||
| 57 | + | ||||
| 58 | + | type operation struct { | |||
| 59 | + | done chan struct{} | |||
| 60 | + | once sync.Once | |||
| 61 | + | } | |||
| 62 | + | ||||
| 63 | + | func (c *conn) beginOperation(ctx context.Context) (*operation, error) { | |||
| 64 | + | if err := ctx.Err(); err != nil { | |||
| 65 | + | return nil, err | |||
| 66 | + | } | |||
| 67 | + | c.opMu.Lock() | |||
| 68 | + | if err := ctx.Err(); err != nil { | |||
| 69 | + | c.opMu.Unlock() | |||
| 70 | + | return nil, err | |||
| 71 | + | } | |||
| 72 | + | // A context without a Done channel cannot cancel. It still holds opMu to | |||
| 73 | + | // serialize the SQLite connection, but avoids allocating a token/watcher. | |||
| 74 | + | if ctx.Done() == nil { | |||
| 75 | + | return nil, nil | |||
| 76 | + | } | |||
| 77 | + | op := &operation{done: make(chan struct{})} | |||
| 78 | + | c.activeMu.Lock() | |||
| 79 | + | c.active = op | |||
| 80 | + | c.activeMu.Unlock() | |||
| 81 | + | go func() { | |||
| 82 | + | select { | |||
| 83 | + | case <-ctx.Done(): | |||
| 84 | + | c.activeMu.Lock() | |||
| 85 | + | if c.active == op { | |||
| 86 | + | c.db.Interrupt() | |||
| 87 | + | } | |||
| 88 | + | c.activeMu.Unlock() | |||
| 89 | + | case <-op.done: | |||
| 90 | + | } | |||
| 91 | + | }() | |||
| 92 | + | return op, nil | |||
| 93 | + | } | |||
| 94 | + | ||||
| 95 | + | func (c *conn) finishOperation(op *operation) { | |||
| 96 | + | if op == nil { | |||
| 97 | + | c.opMu.Unlock() | |||
| 98 | + | return | |||
| 99 | + | } | |||
| 100 | + | op.once.Do(func() { | |||
| 101 | + | c.activeMu.Lock() | |||
| 102 | + | if c.active == op { | |||
| 103 | + | c.active = nil | |||
| 104 | + | } | |||
| 105 | + | close(op.done) | |||
| 106 | + | c.activeMu.Unlock() | |||
| 107 | + | c.opMu.Unlock() | |||
| 108 | + | }) | |||
| 44 | } | 109 | } | ||
| 45 | 110 | ||||
| 46 | // Prepare returns a prepared statement. | 111 | // Prepare returns a prepared statement. | ||
| @@ -49,117 +114,242 @@ func (c *conn) Prepare(query string) (driver.Stmt, error) { | |||||
| 49 | if err != nil { | 114 | if err != nil { | ||
| 50 | return nil, err | 115 | return nil, err | ||
| 51 | } | 116 | } | ||
| 52 | - | return &stmt{s: s}, nil | 117 | + | return &stmt{s: s, conn: c}, nil |
| 118 | + | } | |||
| 119 | + | ||||
| 120 | + | // PrepareContext prepares a statement without database/sql's legacy fallback. | |||
| 121 | + | func (c *conn) PrepareContext(ctx context.Context, query string) (driver.Stmt, error) { | |||
| 122 | + | op, err := c.beginOperation(ctx) | |||
| 123 | + | if err != nil { | |||
| 124 | + | return nil, err | |||
| 125 | + | } | |||
| 126 | + | defer c.finishOperation(op) | |||
| 127 | + | s, err := c.db.Prepare(query) | |||
| 128 | + | if err != nil { | |||
| 129 | + | if ctxErr := ctx.Err(); ctxErr != nil { | |||
| 130 | + | return nil, ctxErr | |||
| 131 | + | } | |||
| 132 | + | return nil, err | |||
| 133 | + | } | |||
| 134 | + | return &stmt{s: s, conn: c}, nil | |||
| 53 | } | 135 | } | ||
| 54 | 136 | ||||
| 55 | // Close closes the connection. | 137 | // Close closes the connection. | ||
| 56 | func (c *conn) Close() error { | 138 | func (c *conn) Close() error { | ||
| 139 | + | c.opMu.Lock() | |||
| 140 | + | defer c.opMu.Unlock() | |||
| 57 | return c.db.Close() | 141 | return c.db.Close() | ||
| 58 | } | 142 | } | ||
| 59 | 143 | ||||
| 60 | // Begin starts a transaction. | 144 | // Begin starts a transaction. | ||
| 61 | - | func (c *conn) Begin() (driver.Tx, error) { | 145 | + | func (c *conn) Begin() (driver.Tx, error) { return c.begin() } |
| 146 | + | ||||
| 147 | + | func (c *conn) begin() (driver.Tx, error) { | |||
| 62 | if _, err := c.db.Exec("BEGIN"); err != nil { | 148 | if _, err := c.db.Exec("BEGIN"); err != nil { | ||
| 63 | return nil, err | 149 | return nil, err | ||
| 64 | } | 150 | } | ||
| 65 | return &tx{db: c.db}, nil | 151 | return &tx{db: c.db}, nil | ||
| 66 | } | 152 | } | ||
| 67 | 153 | ||||
| 68 | - | // tx implements database/sql/driver.Tx. | 154 | + | // BeginTx starts a transaction directly while honoring context cancellation. |
| 69 | - | type tx struct { | 155 | + | func (c *conn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) { |
| 70 | - | db sqlite.DB | 156 | + | if opts.ReadOnly { |
| 157 | + | return nil, errors.New("sqlite3: read-only transactions are not supported") | |||
| 158 | + | } | |||
| 159 | + | if opts.Isolation != driver.IsolationLevel(sql.LevelDefault) && opts.Isolation != driver.IsolationLevel(sql.LevelSerializable) { | |||
| 160 | + | return nil, errors.New("sqlite3: requested isolation level is not supported") | |||
| 161 | + | } | |||
| 162 | + | op, err := c.beginOperation(ctx) | |||
| 163 | + | if err != nil { | |||
| 164 | + | return nil, err | |||
| 165 | + | } | |||
| 166 | + | defer c.finishOperation(op) | |||
| 167 | + | if _, err := c.db.Exec("BEGIN"); err != nil { | |||
| 168 | + | if ctxErr := ctx.Err(); ctxErr != nil { | |||
| 169 | + | return nil, ctxErr | |||
| 170 | + | } | |||
| 171 | + | return nil, err | |||
| 172 | + | } | |||
| 173 | + | return &tx{db: c.db}, nil | |||
| 71 | } | 174 | } | ||
| 72 | 175 | ||||
| 73 | - | // Commit commits the transaction. | 176 | + | // ExecContext executes directly without database/sql's prepare/close fallback. |
| 74 | - | func (t *tx) Commit() error { | 177 | + | func (c *conn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) { |
| 75 | - | _, err := t.db.Exec("COMMIT") | 178 | + | op, err := c.beginOperation(ctx) |
| 76 | - | return err | 179 | + | if err != nil { |
| 180 | + | return nil, err | |||
| 181 | + | } | |||
| 182 | + | defer c.finishOperation(op) | |||
| 183 | + | result, err := c.db.Exec(query, namedValuesToAny(args)...) | |||
| 184 | + | if err != nil && ctx.Err() != nil { | |||
| 185 | + | return nil, ctx.Err() | |||
| 186 | + | } | |||
| 187 | + | return result, err | |||
| 77 | } | 188 | } | ||
| 78 | 189 | ||||
| 79 | - | // Rollback rolls back the transaction. | 190 | + | // QueryContext executes directly without database/sql's prepare/close fallback. |
| 80 | - | func (t *tx) Rollback() error { | 191 | + | // Its operation remains owned by the returned Rows until Close or exhaustion. |
| 81 | - | _, err := t.db.Exec("ROLLBACK") | 192 | + | func (c *conn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) { |
| 82 | - | return err | 193 | + | op, err := c.beginOperation(ctx) |
| 194 | + | if err != nil { | |||
| 195 | + | return nil, err | |||
| 196 | + | } | |||
| 197 | + | rows, err := c.db.Query(query, namedValuesToAny(args)...) | |||
| 198 | + | if err != nil { | |||
| 199 | + | c.finishOperation(op) | |||
| 200 | + | if ctx.Err() != nil { | |||
| 201 | + | return nil, ctx.Err() | |||
| 202 | + | } | |||
| 203 | + | return nil, err | |||
| 204 | + | } | |||
| 205 | + | declTypes, err := rows.ColumnDeclTypes() | |||
| 206 | + | if err != nil { | |||
| 207 | + | closeErr := rows.Close() | |||
| 208 | + | c.finishOperation(op) | |||
| 209 | + | return nil, errors.Join(err, closeErr) | |||
| 210 | + | } | |||
| 211 | + | return &driverRows{rows: rows, declTypes: declTypes, ctx: ctx, release: func() { c.finishOperation(op) }}, nil | |||
| 83 | } | 212 | } | ||
| 84 | 213 | ||||
| 85 | - | // stmt implements database/sql/driver.Stmt. | 214 | + | // tx implements database/sql/driver.Tx. |
| 215 | + | type tx struct{ db sqlite.DB } | |||
| 216 | + | ||||
| 217 | + | func (t *tx) Commit() error { _, err := t.db.Exec("COMMIT"); return err } | |||
| 218 | + | func (t *tx) Rollback() error { _, err := t.db.Exec("ROLLBACK"); return err } | |||
| 219 | + | ||||
| 220 | + | // stmt implements database/sql/driver.Stmt and its context-aware extensions. | |||
| 86 | type stmt struct { | 221 | type stmt struct { | ||
| 87 | - | s sqlite.Stmt | 222 | + | s sqlite.Stmt |
| 223 | + | conn *conn | |||
| 88 | } | 224 | } | ||
| 89 | 225 | ||||
| 90 | - | // Close closes the statement. | 226 | + | func (s *stmt) Close() error { return s.s.Close() } |
| 91 | - | func (s *stmt) Close() error { | 227 | + | func (s *stmt) NumInput() int { return s.s.NumInput() } |
| 92 | - | return s.s.Close() | 228 | + | func (s *stmt) Exec(args []driver.Value) (driver.Result, error) { |
| 229 | + | return s.s.Exec(driverValuesToAny(args)...) | |||
| 230 | + | } | |||
| 231 | + | func (s *stmt) Query(args []driver.Value) (driver.Rows, error) { | |||
| 232 | + | return s.query(driverValuesToAny(args), context.Background(), nil) | |||
| 93 | } | 233 | } | ||
| 94 | 234 | ||||
| 95 | - | // NumInput returns the number of placeholder parameters. | 235 | + | func (s *stmt) ExecContext(ctx context.Context, args []driver.NamedValue) (driver.Result, error) { |
| 96 | - | func (s *stmt) NumInput() int { | 236 | + | if s.conn == nil { |
| 97 | - | return s.s.NumInput() | 237 | + | if err := ctx.Err(); err != nil { |
| 238 | + | return nil, err | |||
| 239 | + | } | |||
| 240 | + | return s.s.Exec(namedValuesToAny(args)...) | |||
| 241 | + | } | |||
| 242 | + | op, err := s.conn.beginOperation(ctx) | |||
| 243 | + | if err != nil { | |||
| 244 | + | return nil, err | |||
| 245 | + | } | |||
| 246 | + | defer s.conn.finishOperation(op) | |||
| 247 | + | result, err := s.s.Exec(namedValuesToAny(args)...) | |||
| 248 | + | if err != nil && ctx.Err() != nil { | |||
| 249 | + | return nil, ctx.Err() | |||
| 250 | + | } | |||
| 251 | + | return result, err | |||
| 98 | } | 252 | } | ||
| 99 | 253 | ||||
| 100 | - | // Exec executes the statement with the given args. | 254 | + | func (s *stmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) { |
| 101 | - | func (s *stmt) Exec(args []driver.Value) (driver.Result, error) { | 255 | + | if s.conn == nil { |
| 102 | - | anyArgs := driverValuesToAny(args) | 256 | + | if err := ctx.Err(); err != nil { |
| 103 | - | return s.s.Exec(anyArgs...) | 257 | + | return nil, err |
| 258 | + | } | |||
| 259 | + | return s.query(namedValuesToAny(args), ctx, nil) | |||
| 260 | + | } | |||
| 261 | + | op, err := s.conn.beginOperation(ctx) | |||
| 262 | + | if err != nil { | |||
| 263 | + | return nil, err | |||
| 264 | + | } | |||
| 265 | + | return s.query(namedValuesToAny(args), ctx, func() { s.conn.finishOperation(op) }) | |||
| 104 | } | 266 | } | ||
| 105 | 267 | ||||
| 106 | - | // Query executes the statement and returns rows. | 268 | + | func (s *stmt) query(args []any, ctx context.Context, release func()) (driver.Rows, error) { |
| 107 | - | func (s *stmt) Query(args []driver.Value) (driver.Rows, error) { | 269 | + | rows, err := s.s.Query(args...) |
| 108 | - | anyArgs := driverValuesToAny(args) | |||
| 109 | - | rows, err := s.s.Query(anyArgs...) | |||
| 110 | if err != nil { | 270 | if err != nil { | ||
| 271 | + | if release != nil { | |||
| 272 | + | release() | |||
| 273 | + | } | |||
| 274 | + | if ctx.Err() != nil { | |||
| 275 | + | return nil, ctx.Err() | |||
| 276 | + | } | |||
| 111 | return nil, err | 277 | return nil, err | ||
| 112 | } | 278 | } | ||
| 113 | - | return &driverRows{rows: rows}, nil | 279 | + | declTypes, err := rows.ColumnDeclTypes() |
| 280 | + | if err != nil { | |||
| 281 | + | closeErr := rows.Close() | |||
| 282 | + | if release != nil { | |||
| 283 | + | release() | |||
| 284 | + | } | |||
| 285 | + | return nil, errors.Join(err, closeErr) | |||
| 286 | + | } | |||
| 287 | + | return &driverRows{rows: rows, declTypes: declTypes, ctx: ctx, release: release}, nil | |||
| 114 | } | 288 | } | ||
| 115 | 289 | ||||
| 116 | // driverRows implements database/sql/driver.Rows. | 290 | // driverRows implements database/sql/driver.Rows. | ||
| 117 | type driverRows struct { | 291 | type driverRows struct { | ||
| 118 | - | rows sqlite.Rows | 292 | + | rows sqlite.Rows |
| 293 | + | declTypes []string | |||
| 294 | + | values []any | |||
| 295 | + | ptrs []any | |||
| 296 | + | ctx context.Context | |||
| 297 | + | release func() | |||
| 298 | + | closeOnce sync.Once | |||
| 299 | + | closeErr error | |||
| 119 | } | 300 | } | ||
| 120 | 301 | ||||
| 121 | // Columns returns the column names. | 302 | // Columns returns the column names. | ||
| 122 | - | func (r *driverRows) Columns() []string { | 303 | + | func (r *driverRows) Columns() []string { cols, _ := r.rows.Columns(); return cols } |
| 123 | - | cols, _ := r.rows.Columns() | |||
| 124 | - | return cols | |||
| 125 | - | } | |||
| 126 | 304 | ||||
| 127 | - | // Close closes the rows. | 305 | + | // Close closes the rows and releases its cancellation ownership. |
| 128 | func (r *driverRows) Close() error { | 306 | func (r *driverRows) Close() error { | ||
| 129 | - | return r.rows.Close() | 307 | + | r.closeOnce.Do(func() { |
| 308 | + | r.closeErr = r.rows.Close() | |||
| 309 | + | if r.release != nil { | |||
| 310 | + | r.release() | |||
| 311 | + | } | |||
| 312 | + | }) | |||
| 313 | + | return r.closeErr | |||
| 130 | } | 314 | } | ||
| 131 | 315 | ||||
| 132 | - | // Next fills dest with the next row's values. | 316 | + | // Next fills dest with the next row's values and releases ownership at EOF. |
| 133 | - | // Returns io.EOF when there are no more rows. | |||
| 134 | func (r *driverRows) Next(dest []driver.Value) error { | 317 | func (r *driverRows) Next(dest []driver.Value) error { | ||
| 135 | if !r.rows.Next() { | 318 | if !r.rows.Next() { | ||
| 136 | - | if err := r.rows.Err(); err != nil { | 319 | + | err := r.rows.Err() |
| 137 | - | return err | 320 | + | closeErr := r.Close() |
| 321 | + | if r.ctx != nil && r.ctx.Err() != nil { | |||
| 322 | + | return errors.Join(r.ctx.Err(), err, closeErr) | |||
| 323 | + | } | |||
| 324 | + | if err != nil || closeErr != nil { | |||
| 325 | + | return errors.Join(err, closeErr) | |||
| 138 | } | 326 | } | ||
| 139 | return io.EOF | 327 | return io.EOF | ||
| 140 | } | 328 | } | ||
| 141 | - | // We cannot pass *driver.Value to core.Scan because driver.Value is a | 329 | + | // driver.Value is a distinct named type, so Scan needs *any scratch slots. |
| 142 | - | // distinct named type (not a type alias) in Go 1.22+, so *driver.Value | 330 | + | if len(r.values) != len(dest) { |
| 143 | - | // does not match *any in a type switch. Use intermediate *any variables. | 331 | + | r.values = make([]any, len(dest)) |
| 144 | - | vals := make([]any, len(dest)) | 332 | + | r.ptrs = make([]any, len(dest)) |
| 145 | - | ptrs := make([]any, len(dest)) | 333 | + | for i := range dest { |
| 146 | - | for i := range dest { | 334 | + | r.ptrs[i] = &r.values[i] |
| 147 | - | ptrs[i] = &vals[i] | 335 | + | } |
| 148 | } | 336 | } | ||
| 149 | - | if err := r.rows.Scan(ptrs...); err != nil { | 337 | + | if err := r.rows.Scan(r.ptrs...); err != nil { |
| 150 | - | return err | 338 | + | return errors.Join(err, r.Close()) |
| 151 | } | 339 | } | ||
| 152 | for i := range dest { | 340 | for i := range dest { | ||
| 153 | - | dest[i] = maybeParseTime(vals[i]) | 341 | + | dest[i] = maybeParseDeclaredTime(r.declTypes, i, r.values[i]) |
| 154 | } | 342 | } | ||
| 155 | return nil | 343 | return nil | ||
| 156 | } | 344 | } | ||
| 157 | 345 | ||||
| 158 | - | // maybeParseTime converts a string value to time.Time if it matches a known | 346 | + | // maybeParseDeclaredTime converts values for SQLite DATE, DATETIME, and TIMESTAMP columns. |
| 159 | - | // SQLite datetime format. Non-string values and non-matching strings pass through. | 347 | + | func maybeParseDeclaredTime(declTypes []string, index int, v any) any { |
| 160 | - | func maybeParseTime(v any) any { | 348 | + | if index >= len(declTypes) || !isDateTimeDeclType(declTypes[index]) { |
| 349 | + | return v | |||
| 350 | + | } | |||
| 161 | s, ok := v.(string) | 351 | s, ok := v.(string) | ||
| 162 | - | if !ok || len(s) < 10 { // "2006-01-02" is the shortest format | 352 | + | if !ok || len(s) < 10 { |
| 163 | return v | 353 | return v | ||
| 164 | } | 354 | } | ||
| 165 | for _, format := range sqliteTimeFormats { | 355 | for _, format := range sqliteTimeFormats { | ||
| @@ -169,17 +359,32 @@ func maybeParseTime(v any) any { | |||||
| 169 | } | 359 | } | ||
| 170 | return v | 360 | return v | ||
| 171 | } | 361 | } | ||
| 362 | + | func isDateTimeDeclType(declType string) bool { | |||
| 363 | + | switch strings.ToUpper(strings.TrimSpace(declType)) { | |||
| 364 | + | case "DATE", "DATETIME", "TIMESTAMP": | |||
| 365 | + | return true | |||
| 366 | + | } | |||
| 367 | + | return false | |||
| 368 | + | } | |||
| 172 | 369 | ||||
| 173 | - | // driverValuesToAny converts a []driver.Value to []any, formatting time.Time | 370 | + | // driverValuesToAny formats time.Time values as SQLite-compatible timestamps. |
| 174 | - | // values as SQLite-compatible datetime strings. | |||
| 175 | func driverValuesToAny(args []driver.Value) []any { | 371 | func driverValuesToAny(args []driver.Value) []any { | ||
| 176 | out := make([]any, len(args)) | 372 | out := make([]any, len(args)) | ||
| 177 | for i, v := range args { | 373 | for i, v := range args { | ||
| 178 | - | if t, ok := v.(time.Time); ok { | 374 | + | out[i] = normalizeValue(v) |
| 179 | - | out[i] = t.UTC().Format("2006-01-02 15:04:05.999999999") | |||
| 180 | - | } else { | |||
| 181 | - | out[i] = v | |||
| 182 | - | } | |||
| 183 | } | 375 | } | ||
| 184 | return out | 376 | return out | ||
| 185 | } | 377 | } | ||
| 378 | + | func namedValuesToAny(args []driver.NamedValue) []any { | |||
| 379 | + | out := make([]any, len(args)) | |||
| 380 | + | for i := range args { | |||
| 381 | + | out[i] = normalizeValue(args[i].Value) | |||
| 382 | + | } | |||
| 383 | + | return out | |||
| 384 | + | } | |||
| 385 | + | func normalizeValue(v any) any { | |||
| 386 | + | if t, ok := v.(time.Time); ok { | |||
| 387 | + | return t.UTC().Format("2006-01-02 15:04:05.999999999") | |||
| 388 | + | } | |||
| 389 | + | return v | |||
| 390 | + | } | |||