Commit Graph
3889 Commits
Author SHA1 Message Date
maziggy eda86e5198 Show the picked preset's real values in the process-settings panel
The panel baselined every field on the option schema's compiled-in
    defaults, so a preset setting a 0.42mm line width displayed 0 -- the C++
    default meaning "derive from the nozzle". Every field was affected; the
    Line width group just made it obvious.

    Bambuddy cannot answer this itself. A standard-tier pick is only an
    {inherits: ...} stub on our side, and local/cloud presets are deltas whose
    remainder lives in the profile tree bundled inside the running sidecar.
    The values now come from the sidecar's POST /profiles/resolve, which runs
    the same resolver /slice does against the same profiles, so what the panel
    shows cannot disagree with what a slice produces. Deliberately not the
    local orca_profiles resolver: it walks OrcaSlicer's published tree, which
    can differ from the image actually installed.

    An untouched field shows the preset's value and reverting returns to it.
    isModified compares against that baseline too, so fields the preset moved
    off the C++ default are no longer flagged as user edits, and values nobody
    typed are no longer sent. When the values can't be read -- sidecar offline
    or older than the endpoint -- the panel falls back to schema defaults and
    says so rather than presenting them as the preset's.

    Row layout, from screenshots:

    - The control column is anchored to the right edge at a fixed width. It
      had been packed left after a fixed label column, leaving the values
      stranded mid-container with dead space beside them.
    - Units are no longer truncated to "mm o...". The cap fitted the common
      "mm" but not "mm or %" or "mm/s² or %".
    - The "from file" tick moved ahead of the control it qualifies; it used to
      sit past the unit at the row's right edge, reading as unrelated.

    Both the unit and the control keep fixed widths, and the tick's slot is
    reserved on rows without one -- sizing any of them to content makes each
    row's input land at a different x and the column comes out ragged.

    Also fixes a field that could not be cleared: emptying a free-text input
    dropped the key, so it snapped back to the baseline and retyping appended
    to it ("0.42" + "0.5" = "0.420.5"). The number branch was fixed earlier;
    the text branch -- coFloatOrPercent, coString, the vector types -- was
    not, and the regression test used a number input so it never caught it.

    Requires a sidecar built from orca-slicer-api 4b664b7 or later. Older
    images 404 the endpoint, which is handled as the fallback above.
2026-08-15 14:47:46 +02:00
maziggy f67f32133b Sync 2026-08-15 14:47:29 +02:00
maziggy 13bcf52f22 Changed layout 2026-08-15 14:47:14 +02:00
maziggy a7324ad846 Edit the full print-parameter set from the slice dialog
Slicing from Bambuddy meant taking a process preset as-is; any change
    meant a round trip through Bambu Studio. The slice dialog now carries
    OrcaSlicer's full process tree -- pages, groups, labels, tooltips,
    ranges and defaults extracted from the slicer's own sources.

    Enable/disable rules are evaluated from the slicer's own enable_if
    expressions via a recursive-descent interpreter (no eval, CSP), with
    enum comparisons validated against each option's declared values.
    Anything undecidable leaves the field editable rather than greyed.

    Overrides apply after the source's support config (#1881) and the
    designer's carried tweaks (#2622), so an explicit choice always wins;
    an untouched panel sends the same request as before.

    Adds slice_engine as a separate setting from preferred_slicer -- where
    slicing runs is a different axis from which binary the sidecar drives.
    Only the sidecar engine is registered, so no picker renders yet.
2026-08-15 14:46:56 +02:00
maziggy a2b250b936 Updated .github/workflows/windows-installer.yml 2026-08-15 14:46:36 +02:00
maziggy 124627d0e5 Removed unused test backend/tests/unit/test_finance_table_migration.py 2026-08-15 14:46:25 +02:00
maziggy d417724d0c chore(deps): clear every npm audit and pip-audit finding
Frontend:
    - react-router/-dom 7.18.1 -> 7.18.2. The RSC-mode CSRF advisory was carried
      as a documented exception in the audit gate because its only fix was the
      8.3.0 major; upstream backported it, so the exemption lapsed on its own --
      an entry only holds while fixAvailable.isSemVerMajor is true. The allowlist
      is now empty; the machinery stays for the next one.
    - dompurify 3.4.12 -> 3.4.13. Ships in the app, but the path is unreachable:
      no hooks registered, IN_PLACE never used.
    - js-yaml override ^4.3.0 -> ^5.2.3 (fix not backported below 5.x, so a
      major) and nanoid override ^3.3.18. Both dev-only, via eslint and postcss.
      eslintrc calls only load(), on the legacy .eslintrc.yml path this repo does
      not use; eslint, vite build and 2861 frontend tests pass on it.

    Backend:
    - cryptography >=48.0.1 -> >=50.0.0, aiohttp >=3.14.0 -> >=3.14.3, pyopenssl
      >=26.3.0 -> >=26.4.0. CI resolves from scratch and was already installing
      the fixed releases; the floors cover the case CI does not, an existing venv
      where >= is satisfied and `pip install -r` upgrades nothing. pyOpenSSL has
      to move with cryptography -- each release caps it to a narrow window, so a
      stale pyOpenSSL pins cryptography below its own fix line.
2026-08-15 14:46:09 +02:00
maziggy 421e533513 Updated BACKERS 2026-08-15 14:45:53 +02:00
maziggy 7d137e312b Stop auto-drying re-arming into a threshold it can never reach (#2770)
An H2D armed five 12-hour drying cycles inside four hours, one of them six
    seconds after the previous one ended, and none ran more than a couple of
    hours.

    Two things combine. The firmware ends a cycle when it decides the filament
    is dry rather than when the clock runs out, and reports no fault doing it --
    across this printer's history the run length tracks how wet the spools were,
    from nearly the full 12 hours starting at 32% down to minutes once the unit
    sat at 10-13%. That part is the AMS doing its job.

    The loop is ours. An AMS reports higher relative humidity while it is warm
    than once it has cooled: the same unit read 10-13% cold and 15-20% through
    every cycle. With the threshold at 14% the reading at the moment a cycle
    ended was always still above it, so the next 30-second pass armed another
    12-hour cycle. Nothing counted, nothing waited, and it only stopped when the
    box finally cooled enough to read 13%.

    Auto-drying now waits 30 minutes after a cycle ends before arming another on
    the same unit, and gives up on a unit after two consecutive cycles that
    bring the reading no lower -- logging why and sending a new notification,
    on by default because it reports that Bambuddy has stopped acting. Progress
    is judged against the lowest reading any cycle on that unit has ended at,
    not against the threshold, so a genuinely wet spool in a humid room coming
    down 40-37-35 keeps drying however far it still is from the target;
    comparing against the best so far rather than the previous end stops a
    sensor wobbling by one point reading as progress every other cycle. The
    suspension lifts by itself once the reading falls below the threshold.

    Neither guard can stop a running cycle, and a cycle Bambuddy cut short for a
    print, or that the user stopped by hand, is not counted against the unit --
    so a farm that dries between queue jobs is unaffected. The threshold field
    now warns below 20%, and every cycle end logs the unit's temperature and
    humidity, which is what made this diagnosable.

    The same bundle showed unrelated tasks failing with "database is locked",
    each inside a 30.000-second Discord connect timeout. Alarms are raised from
    inside the loop that records sensor history, at a point where the new rows
    are added but not committed; the first read in the notification path flushed
    them to satisfy itself, opening a write transaction, and the provider was
    then contacted over the network with that transaction still open. SQLite
    allows one writer and 30 seconds outlives the 15-second busy timeout, so
    every other write in that window failed. The two reads that run before a
    provider is contacted no longer flush the caller's pending work, and the
    connect timeout is 5 seconds rather than 30 -- the body keeps the full 30,
    so image uploads on a slow uplink are unaffected. SQLite only; Postgres has
    no single-writer limit.
2026-08-15 14:45:16 +02:00
maziggy b15340c99b Say which header blocked the 3D preview, instead of leaving the browser's page (#2787)
A reporter uploaded an STL, sliced it in Bambuddy, and got a frowny icon and
    "<hostname> refused to connect" when previewing the sliced file -- while the
    STL's own preview worked. That is Chrome's ERR_BLOCKED_BY_RESPONSE page, drawn
    inside our layout shell, and the split between the two previews is where the
    cause is: an STL or source 3MF renders in the page, a sliced file opens the
    embedded G-code viewer, which is the only thing in Bambuddy that frames a
    Bambuddy page (FileManagerPage.tsx:2472, GCodeViewerPage.tsx:47).

    Our headers permit that frame -- frame-ancestors 'self' plus SAMEORIGIN on
    everything under /gcode-viewer (main.py:7709) -- and the frame is same-origin,
    so a refusal means a stricter header was added after we replied: a reverse
    proxy, a security add-on, an auth gateway. None of which the user could see.
    The browser drew its own page and nothing said what was refused, by whom, or
    that the viewer opens perfectly well in a tab.

    The frame cannot report this itself. A frame blocked by X-Frame-Options or
    frame-ancestors still fires onLoad -- the browser commits an error document --
    so there is no failure to catch. The page now asks for the same URL directly:
    same-origin, so every response header is readable, and it goes through whatever
    proxy the browser reaches Bambuddy by.

    findFramingRefusal reads the verdict the way a browser does. frame-ancestors
    wins outright when present, because CSP requires X-Frame-Options to be ignored
    in that case -- reading both would blame a proxy-added DENY the browser never
    consulted. Multiple CSP headers are intersected and fetch joins them into one
    comma-separated string, so every frame-ancestors occurrence has to permit us,
    not just the first; that is the shape a proxy appending its own policy to ours
    actually takes. Failing that, a legacy header that is anything other than a
    single SAMEORIGIN refuses us, including the conflicting "SAMEORIGIN, DENY" that
    appears when a second copy is appended.

    On refusal the frame is replaced with the header named verbatim, so an operator
    can go and find the rule in their proxy config, and a link that opens the viewer
    in its own tab -- a top-level page, which no framing header applies to. A
    non-200 is reported the same way rather than as raw {"detail":"Not Found"}
    inside the frame, which the startup-time warning at main.py:8120 already calls
    out as easy to miss. A probe that cannot reach a verdict changes nothing: the
    iframe stays, because guessing at a cause we cannot see is worse than the
    browser's own page.

    The working case is unaffected -- the iframe renders immediately as before and
    the probe only ever replaces it.
2026-08-15 14:44:22 +02:00
maziggy 69b1782a00 Housekeeping 2026-08-15 14:44:00 +02:00
maziggy d75a59252e Merge branch 'worktree-fix-2791-cursor-pointer' into dev 2026-08-15 14:43:46 +02:00
maziggy af8f423e9d . 2026-08-15 14:43:28 +02:00
maziggy 50ec1872cb Restore the pointer cursor on interactive controls (#2791)
Hovering most of Bambuddy gave an arrow rather than a hand. Not everywhere,
    which is what made it read as sloppiness rather than a bug: the update pill was
    inert while the buttons beside it were fine, a bed or nozzle tile responded but
    the history-graph button in its corner did not, and dropdowns went either way
    with no pattern behind it.

    The pattern was there. Tailwind v3's Preflight set `button { cursor: pointer }`.
    v4 dropped it to match the browser default, which for a button is `default`.
    Bambuddy has been on v4 since the frontend was built, and `src/index.css` never
    had a base layer restoring it, so a button only looked clickable where someone
    had written `cursor-pointer` by hand. 15 of 934 had. 0 of 149 selects, and 19
    of 130 checkbox/radio inputs. The 233 ad-hoc `cursor-pointer` usages are why it
    looked arbitrary instead of uniformly broken.

    One `@layer base` rule now covers button, select, checkbox, radio, summary and
    [role=button]. base sits below utilities, so `cursor-not-allowed` and the
    `disabled:cursor-*` variants still win; the `:not(:disabled)` guard catches the
    disabled controls that carry no such utility. Verified against the built bundle
    rather than the source -- the rule lands inside @layer base, and
    `.cursor-not-allowed` is emitted after it.

    Click-outside backdrops are deliberately excluded. 90 of the 96 remaining
    onClick divs are `fixed inset-0` overlays; a full-screen sheet advertising
    itself as a button is worse than one that says nothing. Of the rest, 50 are
    stopPropagation wrappers and 3 are the temperature tiles, which already set the
    cursor through `statusControlClass` -- which is exactly why those tiles worked
    while the button nested inside them did not. That left two real ones: Card, now
    conditional on an onClick actually being passed, and the queue card, whose
    existing `sm:cursor-default` kept the desktop intent.

    Separately, from the same report. FilamentHoverCard draws the slot menu twice,
    and the two paths had drifted into opposite orders: Configure above Assign Spool
    on an empty slot, the reverse on a filled one, so the menu reshuffled itself
    depending on whether the slot held filament. Both now lead with the spool
    action. Tests assert the order on each path, so one can no longer move without
    the other -- checked by reinstating the old order and confirming the empty-slot
    test fails.

    Those buttons also used justify-center, which centred each label independently
    and left the icons in a ragged column; they are justify-start now. Their hover
    was a 10% opacity step that was very hard to see, now 20%. And the favourites
    star previews yellow on hover, suppressed when the user lacks archives:update.
2026-08-15 14:43:04 +02:00
maziggy 5c1c0914f4 Explain Bambu Cloud's CAPTCHA challenge instead of repeating it (#2790)
A reporter tried to connect to Bambu Cloud and got "We need you to confirm you
    are not a robot" as an error toast, with no CAPTCHA anywhere to answer and
    nothing to click. That sentence is Bambu's, not ours. Their anti-abuse layer had
    flagged the network and was answering the sign-in with HTTP 418 and a challenge
    body: {"captchaId": "...", "error": "We need you to confirm you are not a
    robot"}.

    Bambuddy had no idea what that was. The reply is well-formed JSON, so
    _detect_cloudflare_challenge -- which triggers on an unparseable body, CF
    markers, 403+cf-mitigated or 503+cf-ray -- never fired on it, and login_request
    fell through to its generic error path, which lifts data["message"] or
    data["error"] out and hands it to the UI verbatim. The user was left to conclude
    their password was wrong or that Bambuddy was broken. Four sign-in attempts
    inside eighteen seconds appear in their log, each one more evidence for the
    thing that had flagged them.

    is_captcha_challenge matches on the 418 status plus a challenge marker in the
    body -- captchaId is the reliable one, the wording is matched too because Bambu
    has shipped it under more than one phrasing. A bare 418 with no marker is
    has shipped it under more than one phrasing. A bare 418 with no marker is
    deliberately NOT reported as a CAPTCHA: telling someone to solve a challenge
    that was never offered is the exact confusion this issue is about.

    login_request, verify_code and verify_totp now return reason="captcha" with an
    explanation covering the three things the reporter had no way to find out: the
    credentials are not the problem, the block is keyed to the public IP address
    rather than the account, and it clears by itself within a few hours.

    Sign-in requests are then held back for 300s so Bambuddy stops deepening the
    block. Keyed per origin, not per service: TOTP verification posts to
    bambulab.com while everything else posts to api.bambulab.com, and a challenge
    seen on one must not strand somebody halfway through a two-factor sign-in on the
    other. Entries expire on read, so the map cannot grow past one per region. The
    token endpoint is deliberately left ungated -- it is the way out.

    The UI shows a persistent panel rather than a toast. A toast names a problem the
    user cannot act on and then vanishes; this one stays put and carries a one-click
    route to "Use access token instead", which is the only thing that works while
    the challenge lasts, since that path does not touch the challenged endpoint.

    MakerWorld meets the same challenge from the same edge and now shares the
    detection. It used to require the literal word "robot" in the error text and
    reported any other wording as an unexplained block.

    The System Health scanner gets a bambu-cloud-captcha signature. The reporter's
    bundle came back with zero findings while their log was full of the failure.

    Its advice for a failed FTPS handshake was corrected at the same time: it still
    blamed firewalls and outdated firmware, which the #2780 investigation ruled out
    last release -- it is the printer's own file service wedging, and the fix is to
    restart the printer. The wiki said so already; the health panel did not.
2026-08-15 14:42:27 +02:00
maziggy 430c45666a Power on a printer for jobs queued to a printer class (#2786)
Queue a print against a printer class -- "Any X1C", or a Slicer Pipeline whose
    target type is Printer class -- with every printer of that class switched off,
    and nothing happened. The job sat pending and no smart plug was touched, while
    the same file pinned to a specific printer powered that printer on within one
    queue check. The reporter's log holds both halves: thirteen minutes of the item
    being polled as (133, None, ...) and passed over, then a PATCH onto printer 2,
    then "Printer 2 offline, attempting to power on via smart plug(s)" on the very
    next tick. Same item, same plug, same Auto On setting.

    Powering a printer on had only ever been written inside `if item.printer_id:`.
    The model-based branch below it walks the same queue but its matcher classes an
    offline printer as a reason to keep waiting -- printers_offline collects the
    *name*, for the waiting reason -- and nothing on that path ever looks at plugs.

    _wake_printer_for_model adds it. The model query moves into _printers_for_model
    so the matcher and the wake step answer "which printers can this job run on"
    from one place: a job can only be woken onto a printer the matcher would also
    have considered. Candidates that failed the cross-model gate are excluded --
    switching a printer on for a file that can never legally run on it leaves the
    job just as stuck, with the printer now drawing power.

    Two things it does that the fixed-printer branch does not:

    A printer awaiting plate-clear acknowledgment is skipped. Waking it buys
    nothing; it boots into IDLE and is held by the gate. That is what the reporter's
    log shows for the eighty minutes after their manual edit -- "printer 2 not
    available -- connected=True, state=IDLE, awaiting_plate_clear=True" every thirty
    seconds to the end of the capture. The flag is Bambuddy-side and persisted, so
    it is readable while the printer is still off.

    At most one printer per pass, because each wake blocks the queue loop for the
    boot wait. Several queued jobs bring several printers up over the following
    minutes rather than a whole shelf at once.

    A failed power-on opens a 600s per-printer cool-off. Without it the walk is by
    id, the pass spends its single attempt on the same broken printer every time,
    and a healthy sibling two slots down is never reached -- one unreachable plug
    starves its whole model, and costs a 180s boot timeout out of every 30s pass.
    Entries expire on read: a printer inside its cool-off is skipped before the
    power-on is reached, so a live entry can never be overwritten by a success.

    The failed printer is deliberately NOT added to busy_printers. It is off, not
    busy; labelling it busy would misdescribe it in every later item's waiting
    reason and, because an all-busy reason is treated as needing no user action,
    suppress the notification too.

    Assignment is left to the next pass. AMS trays arrive with the first status push
    after connect, so matching filament against a printer that booted five seconds
    ago can reject the printer we just woke.

    Finally, the waiting reason separates "Offline: X1C-1" from "Offline, no Auto On
    smart plug: X1C-2". Those are different problems and only the second is one the
    user has to go and fix -- it was also the first question the reporter had to be
    asked, and the queue could not answer it.

    Tests cover the wake, the plate-clear skip in both gate states, all-candidates-
    awaiting-plate-clear waking nothing, one wake per pass, the starvation case over
    two passes, cool-off expiry, no-Auto-On-plug being left alone and named, an
    incompatible sliced model waking nothing, connected printers being left alone,
    scheduled-for-later and manual-start jobs switching nothing on, and a regression
    pin on the fixed-printer branch.
2026-08-15 14:41:44 +02:00
maziggy a9b15e727f Stop retrying a printer whose FTPS handshake fails, and name the cause (#2780)
Two printers went on printing while every archive they produced held nothing
    but a filename. Bambuddy opened port 990, the printer accepted the connection
    and answered with something that was not TLS, and connect() logged a warning
    and returned False -- indistinguishable, to every caller, from "the file is
    not at this path". So the 3MF lookup walked all six filename variants across
    five directories with four retries each, the cover endpoint ran its own
    sixteen-path sweep, and the timelapse scan added four more, all against a
    sixteen-path sweep, and the timelapse scan added four more, all against a
    printer that could not have answered any of them. One reporter's log carried
    1813 identical handshake failures, another's 3511.

    The evidence says this is the printer's own file service getting stuck, not a
    model, firmware or TLS-configuration problem. In #2780's bundle the same two
    printers ran clean from 22 July to 4 August and failed again from the 5th; a
    second bundle shows an X2D serving files for five days, flipping on 19 July,
    then failing every connection for eight days with zero successes. The same
    models and firmware appear in roughly twenty other bundles with no occurrences
    at all. Both bundles show it happening with cap_tls_v1_2 in effect -- the X2D
    and H2C entries in ftp_profiles were added on analogy with P2S to fix exactly
    this symptom, and the reporter's own debug line proves they do not.

    An ssl.SSLError from connect() now opens a five-minute cool-off for that
    printer. Subsequent connects return False without touching the network, so a
    wedged printer is contacted twice an hour instead of hundreds of times a
    minute, and the single warning that is logged names the remedy. The cool-off
    is dropped on expiry rather than kept, so the map holds one key per currently
    wedged printer. ftps_handshake_blocked() lets the sweeps stop: the 3MF lookup
    abandons the remaining paths and skips the directory-walk fallback, the cover
    endpoint returns 503 naming the file service instead of a 404 that reads as
    "this print has no thumbnail", and the timelapse scan separates 503 (cannot
    reach the printer) from 404 (no timelapse directory) -- one 500 used to cover
    both, which is what the reporter hit when reproducing.

    The Connection Diagnostic completed a bare TCP connect to 990, which is why it
    reported the port green throughout: the port is open, it is what is behind it
    that is broken. It now completes a real implicit-TLS handshake using the
    model's own ftp_profiles cap, so a pass means the FTP client would also get
    through. An open port that cannot negotiate reports warn with reason no_tls,
    selecting a new message in all 13 locales that points at a printer restart
    rather than at the firewall. No login is attempted, so this stays valid in the
    pre-save Add Printer flow.

    The cool-off tests run against a real socket that accepts on 990 and replies
    with a plaintext FTP banner, reproducing WRONG_VERSION_NUMBER rather than
    mocking ssl. The autouse fixture clearing _mode_cache now clears the cool-off
    map too -- every test here talks to 127.0.0.1, so one left behind would make
    the next test's connect() a no-op.
2026-08-15 14:41:08 +02:00
maziggy b0927b426c implemented pr (minor) feedback 2026-08-15 14:40:37 +02:00
maziggy 40ba1f4b0e implemented pr (worth fixing) feedback
update commit
2026-08-15 14:40:25 +02:00
maziggy 7dcfd0921d Check filament deficit for Library-backed queue items (#2779)
A job needing 20.5 g was dispatched onto a spool holding 9 g and the printer
    started. _resolve_source_3mf returned LibraryFile.file_path verbatim, but that
    column stores a path relative to base_dir -- so it resolved against the process
    working directory, found nothing, and compute_deficit_for_queue_item treated a
    missing source as "nothing to verify" and returned no deficit.

    Every library-backed queue item was affected: Slicer Pipeline jobs, which are
    always library-backed, and everything added through the Library's bulk Add to
    queue. Both callers share the resolver, so the Play button on the queue was as
    blind as the auto-dispatcher. Archive-backed items (print history, VP intake)
    resolved correctly and were never affected, and neither was PrintModal, which
    resolves the file on its own path.

    The library branch now uses the same idiom as the eleven other readers of
    file_path -- absolute stays, relative joins base_dir. The join carries a
    SEC-PATH-OK marker: the value is DB-stored and generated by the Library ingest,
    and it is already what resolves the file for upload, so the check has to
    resolve it identically or it is not checking what gets printed.

    A source that is configured but absent now logs a warning naming the item and
    the resolved path. It still dispatches, because the upload needs the same file
    seconds later and fails there, where blocking would strand a queue on a moved
    file -- but a safety check that skips itself must not do so in silence, which
    is what hid this for every library-backed item.

    Tests cover the relative path (the reporter's 20.5 g against 9 g), the absolute
    path against a base_dir the file is not under, and the missing-source warning.
    The existing cases all used archives with absolute paths, which is the gap the
    bug lived in.
2026-08-15 14:40:02 +02:00
maziggy 34243ce7e4 Accept Forgejo tokens scoped to a single repository (#2775)
ForgejoBackend.test_connection asked GET /user who the token belonged to
    before asking whether the token could reach the repository, and treated a 403
    there as fatal. A Forgejo v15 repository-scoped token may only carry
    read/write on issues and repositories, so it 403s on /user -- and was rejected
    despite reaching its own repository fine, which is all a backup needs: the push
    path uses the Contents API and restore reads commits, trees and blobs, all
    under /repos/{owner}/{repo}. That /user call was the only one in the whole
    provider layer.

    The probe stays, because a 401 from it is genuinely conclusive and names a bad
    token before the repo call has to guess -- Forgejo v15+ hides a private repo
    behind 404 rather than 403, so the repo call cannot always tell those apart.
    Every other status now falls through to the repo check.

    Two additions keep the messages as sharp as before: the repo call's own 401 is
    mapped to "Invalid access token" instead of a generic API error, and the 404
    names write:repository and the scoped-to-another-repository case, mentioning a
    possibly-invalid token only when /user did not confirm the identity.

    The token hint under the field was one shared string reading "fine-grained
    token with Contents read/write" -- GitHub's advice, shown to Gitea, Forgejo and
    GitLab users too. It is now per provider via PROVIDER_TOKEN_HINT_I18N_KEY,
    following the existing repo-URL placeholder map, translated in all 13 locales.

    Tests pin the repository-scoped token connecting, a transient /user status not
    blocking the repo call, both 404 wordings, and the repo-call 401; a frontend
    test switches providers and asserts the hint follows.
2026-08-15 14:39:32 +02:00
maziggy ffcfa70e5b Record who queued a file from the Library and the webhook API
PrintQueueItem.created_by_id is what the queue:read_own / queue:update_own /
    queue:delete_own permissions filter on, but only three of the paths that create
    queue items were setting it.

    The Library's bulk "Add to queue" required Permission.QUEUE_CREATE and then
    bound the dependency to `_`, discarding the user, so every item it created was
    ownerless -- and invisible to the person who added it if their permissions are
    scoped to their own work. That is the one path built for adding many files at
    once, which is where it was hardest to notice.

    The webhook queue endpoint has no request user, but APIKey.user_id records the
    key's owner, which is the acting identity everywhere else the key is used, so
    its items are credited to that owner. Keys minted before per-user ownership
    have no user_id and their items stay ownerless.

    The virtual-printer path is left as-is on purpose. VirtualPrinter carries no
    owner, and the obvious substitute is wrong rather than incomplete: one admin
    typically configures the VP while everyone sends prints through it, so
    crediting those to the admin would make the "added by" column lie and put other
    people's jobs in the admin's own queue. Existing NULL rows are not backfilled
    -- there is no record of who created them, and the ownerless case is already
    handled throughout.

    Tests pin both fixed paths and the two cases that must stay ownerless (auth
    disabled, legacy key).
2026-08-15 14:39:11 +02:00
maziggy 035faee06e Merge pull request #2714 from jmoore-skild/feature/2656-restore-from-github
feat(backup): restore selected categories from a Git backup commit
2026-08-15 14:38:35 +02:00
maziggy c38e6566f3 fix(backup): report the categories a failed restore already committed (#2656)
The service reports what landed on a part-way failure -- categories commit as
    they finish, so results names the ones on disk -- and the modal gated the
    whole result panel on success, so it showed the failure message and dropped
    them.

    The cache invalidation was inside that same branch, which is the half that
    mattered: a run that committed the settings category and then failed left the
    app rendering pre-restore settings, with no reload and no re-read, which is
    the failure the modal's own reload-on-close exists to prevent.

    Gate on what was written instead. A refusal that never reached a category
    still carries an empty results and still keeps the form, so the mutex and
    backup-in-flight cases are unchanged. A partial does not read as a success:
    the tick becomes a warning and a line says the listed categories are the ones
    on disk.

    ---

    fix(backup): keep the local owner when the backup names one we cannot resolve (#2656)

    An owner the backup names but this instance has no user for was written as
    NULL, and overwrite is a blanket setattr -- so restoring over a local archive
    that had a perfectly good owner took it away, which is the 404-for-its-own-
    owner failure this column is carried across to fix. Resolving by username
    widened the trigger from a stale id to any user renamed since the backup.

    It is the same state as an absent key: the backup has not told us who owns
    this. So it takes the same action -- the column is not written at all.
    Overwrite keeps the local owner, insert lands ownerless with the note, and an
    explicit null still writes, so overwrite still means "match the backup".

    The notes move to the insert path with it. On overwrite nothing was taken
    away, so there is nothing to warn about, which is the rule the absent-key
    case already follows.
2026-08-15 14:38:18 +02:00
maziggy cde7bc9e12 . 2026-08-15 14:37:27 +02:00
maziggy 0dfb53c5c5 Resolve a spool's material to a known drying preset before starting a cycle (#2774)
The drying popover prefilled its material from the loaded spool without
    checking the preset table had that material. An AMS-HT holding Support for
    PLA/PETG (tray_type PLA-S) fell back to PLA's temperature but kept PLA-S as
    the material, and the dropdown displays its first option when handed a value
    outside its list -- so it read PLA while PLA-S was sent. Same gap for every
    composite: PETG-CF prefilled at PLA's 45C.

    Resolve the tray_type to a key the table has before setting either value.
    Support materials and composites resolve to their base, nylon is aliased
    under its several spellings, and anything unrecognised falls back to PLA --
    the coolest row, so an unknown material under-dries rather than deforming a
    PLA spool.

    Also record request-topic messages in the MQTT debug log. That topic carries
    every command a printer is given, including Bambu Studio's, and returned
    before the logging block -- so a capture could show only what the printer
    said, never what it was told.
2026-08-15 14:36:57 +02:00
maziggy fc7a85f8e7 docs(changelog): note that the LDAP family is refused alongside auth policy (#2656) 2026-08-15 14:28:05 +02:00
maziggy a12a4a8707 fix(backup): refuse the whole LDAP family on restore, not just its password (#2656)
A settings restore could substitute the instance'"'"'s authentication source.
    auth.py reads the LDAP config live from the settings table on every
    login, and none of ldap_server_url, ldap_user_filter, ldap_auto_provision
    or ldap_default_group is credential-shaped, so the secret-key hints never
    saw them and only the four auth-policy keys were protected.

    ldap_enabled was covered by the companion-credential rule instead, and
    that rule asks the wrong question. It judges availability - "will the
    integration still work?" - and an anonymous bind works, so a payload that
    simply OMITS ldap_bind_password skips the refusal and has its toggle
    written. Omitting the credential is exactly what an attacker authoring
    the file would do: they own the directory being pointed at, so they need
    no bind credential from us.

    Left unrefused, a backup repository anyone can write to yields admin:
    point ldap_server_url at your own directory, set ldap_auto_provision and
    ldap_default_group=Administrators, and the next login on a fresh username
    is provisioned into the admin group. Overwrite-off is enough on an
    instance that never configured LDAP - there are no rows to skip.

    Refused by prefix so a key added to the LDAP schema later is refused by
    default, and matched case-insensitively because the key comes from the
    backup JSON rather than from our own writer. ldap_enabled leaves
    _COMPANION_CREDENTIALS rather than sitting there as dead code, since
    _is_protected_setting_key runs first.

    The two tests asserting an anonymous bind was a false positive are
    inverted - they encoded the hole - and the refusal reuses the existing
    settingsAuthSkipped note, which already points at Settings >
    Authentication.
2026-08-15 14:27:48 +02:00
maziggy 2710fa3400 docs(changelog): add the restore-from-Git entry (#2656)
The branch had never added one, though the convention here is one bullet
    per PR in the same commit as the code.

    One entry for the whole feature rather than one per commit - it has not
    shipped yet, so the review rounds are refinements of an unreleased thing
    rather than fixes to a released one. For the same reason the per-category
    permissions are written as what to grant, not as something that changed.
2026-08-15 14:27:34 +02:00
maziggy 63b7ec90fa build(frontend): rebuild static/ on the merged tip (#2656)
One build on the tip after merging dev, per the branch'"'"'s standing rule
    that intermediate commits carry a stale bundle and only the tip has to be
    right.

    dev'"'"'s CSS moved to index-Db2rfQf-.css while this branch was out; the
    rebuild lands on the same hash, so static/index.html differs from dev by
    the script line alone again.
2026-08-15 14:27:09 +02:00
maziggy 0ec62fbca7 Merge branch 'dev' into feature/2656-restore-from-github 2026-08-15 14:26:53 +02:00
maziggy e879cd6100 build(frontend): rebuild static/ so the restore UI actually ships (#2656)
The dev merge took dev's static/index.html, which loads the pre-restore
    bundle, and left both bundles tracked. Merged as-is none of the frontend
    shipped: no Restore button, no modal, no Type column.

    Rebuild drops the superseded bundle and points index.html at a single one
    that carries restoreFromGit and this round's new note leaf. The CSS
    hashes identically to dev'"'"'s, so index.html differs by the script line
    alone.
2026-08-15 14:26:33 +02:00
maziggy a0d1c3674b fix(backup): keep both restore tallies equal to the number the preview showed (#2656)
Two ways the K-profile and spool categories broke the
    restored + skipped + failed == item_count invariant the settings count
    holds:

    * The spools preview counted only the spools and put the usage records
      in the detail, but _restore_spool_usage increments the same tally, so
      any backup with usage history reported a total larger than the number
      the user was shown. The preview now counts both and the detail breaks
      the total down instead of adding to it.
    * A K-profile entry that is not a dict was dropped silently on the
      connected path. _kprofile_profile_count includes it, so the offline,
      printer-missing and step-failed paths all account for it; only the one
      path that talks to a printer let it leave the tally. It now counts
      failed.
2026-08-15 14:26:14 +02:00
maziggy 43d268655f fix(backup): commit each database category so SQLite's writer is not held (#2656)
The database phase had the same shape the K-profile phase did: _find_
    archive, _find_spool, the usage dedupe and _restore_settings are all one
    SELECT per row or per key, interleaved with autoflushed INSERTs, inside a
    single open write transaction. A few thousand archives plus a full usage
    history plausibly passes the 15 s busy_timeout, and every concurrent
    writer in the app fails with "database is locked" until it finishes.

    Each category now commits before the next starts. The id maps are plain
    dicts in memory and the session is expire_on_commit=False, so the
    ordering tolerates it.

    The cost is that a later failure no longer rolls back an earlier
    category, so a tally is recorded only after its category commits and
    run_restore reports the categories already on disk instead of an empty
    result - the same correction the K-profile split needed.
2026-08-15 14:26:02 +02:00
maziggy 732b1d7034 fix(backup): gate every restore category on the permission owning its rows (#2656)
settings was gated on settings:update because a restore rewrites rows
    PUT /api/v1/settings/ owns. The same argument applies to the other three
    categories, and gating one but not the rest is the only state that is
    not defensible: a role holding Backup alone could still write spools,
    archives and K-profiles through a restore that it cannot write through
    the endpoints that own them.

    Each category now also requires that endpoint's write permission -
    inventory:update, archives:update_all and kprofiles:update. archives
    takes update_all rather than create because a restore writes rows owned
    by other users, which is exactly what update_all means.

    All missing permissions are reported in one refusal: a restore is a
    multi-select, so naming them one at a time turns picking four categories
    into four round trips.
2026-08-15 14:25:46 +02:00
maziggy 2ef43943d3 docs(backup): say what the secret-key hints actually refuse (#2656)
The comment called the hint list belt-and-braces over keys the collector
    already refuses to write. It is not: _collect_settings filters exactly
    bambu_cloud_token and auth_secret_key, so a current backup really does
    carry mqtt_password, ldap_bind_password, ha_token and prometheus_token,
    and the hints are the only thing that refuses them. The companion-
    credential rule sits downstream of that, so reading the list as redundant
    and shortening it would write a stale credential and make that rule inert
    at the same time.

    Comment and test docstring only - no behaviour change.
2026-08-15 14:25:31 +02:00
maziggy ca6b9f8fe0 fix(backup): resolve a restored archive's owner by username, not by id (#2656)
created_by_id is only meaningful on the instance that wrote it. Restoring
    onto a rebuilt instance - this feature's main use case - renumbers the
    users table, so a live id can land on a different person and hand one
    user's print history to another under archives:read_own. The id path
    cannot even detect that: archivesOwnerCleared fires only for an id that
    is absent, so a valid-but-wrong id produced no note at all.

    The collector now records created_by_username alongside the id, and the
    restore prefers it. username is unique on users, so a match is the same
    person; the one case it cannot resolve - a user renamed since the backup
    - falls through to ownerless with a note rather than guessing from the
    id. The id stays as the fallback for backups taken before this change.
2026-08-15 14:25:16 +02:00
maziggy 09a7413efc implemented pr feedback #2 2026-08-15 14:24:45 +02:00
maziggy 12c6749abe Merge remote-tracking branch 'upstream/dev' into feature/billing 2026-08-15 14:24:32 +02:00
maziggy b1610f70ae Security hardening (maziggy/bambuddy-security #9) 2026-08-15 14:24:04 +02:00
maziggy 5bee8df5cd Broadcast AMS slot changes that keep the same material
Configuring a slot from the printer card left the card showing the old
    filament until a reload or the 30s fallback poll. The command reached the
    printer and the printer applied it; the update just never got broadcast.

    on_printer_status_change deduplicates WebSocket pushes against a status_key
    whose AMS part carried id, tray_type and state. Configure Slot writes none of
    those -- it writes tray_info_idx, tray_color, tray_sub_brands and cali_idx. So
    PLA to another brand or colour of PLA produced an identical key and was
    dropped, while PLA to PETG came through. Reset always worked because it clears
    tray_type.

    Those four fields only move when someone configures a slot or swaps a spool,
    so this costs no broadcasts mid-print. remain stays out of the key for the
    opposite reason.
2026-08-15 14:23:47 +02:00
maziggy 50399144a1 Write printer status straight through while the tab is hidden (#2754)
Removing the requestAnimationFrame wrapper fixed the total stall but left the
    100ms coalescing timer in the path, and a hidden page's timers are clamped to
    once a second at best -- once a minute past five minutes hidden. The reporter
    still saw a tab title at 2% beside a page at 40%.

    The coalescing guards against a render cascade, which a hidden tab cannot
    have, so it is skipped there and kept while visible.

    The existing hidden-tab tests advanced fake timers, which simulates the timer
    the browser was throttling; the new one never advances the clock.
2026-08-15 14:23:22 +02:00
maziggy f35c184b52 Show Home Assistant sensors on the printer card (#1148, #448)
Binds binary_sensor and reading-carrying sensor entities to a printer and
    renders their state on its card, worded by Home Assistant's device_class.
    Optional per-sensor alert condition drives a notification on the transition
    into the alert state and an opt-in interlock that holds queued prints while
    alerting -- a hold with a readable waiting_reason, never a failure, and only
    ever on a sensor that was read successfully.

    Sensors get their own table rather than a wider entity pattern on SmartPlug:
    get_smart_plug_by_printer would otherwise hand the card's power button a door
    contact to switch.

    The hold is passed to the model matcher directly rather than merged into
    busy_printers: _check_auto_drying reads that set as "is currently printing"
    and would put an idle-but-held printer down the mid-print drying path.

    The notification_providers migration spells its default FALSE, not 0 --
    Postgres rejects an integer default for a boolean and _safe_execute swallows
    the error.
2026-08-15 14:23:00 +02:00
maziggy 372ab3b788 Route external spools to a nozzle when the printer has no AMS (#2771)
Five X2Ds with no AMS, each printing from its external spool holder,
    took a job sent to a named printer and refused the same job sent to
    "Any X2D": the file uploaded, the firmware answered 0700_8012 "Failed
    to get AMS mapping table", and the item failed after three attempts.

    A named-printer job carries a mapping the frontend resolved at queue
    time, so the scheduler's matcher never runs. A model-based job has no
    printer until dispatch, so the matcher does run -- and could not see an
    external spool on a dual-nozzle printer. _build_loaded_filaments derived
    dual-nozzle status from ams_extruder_map, which is built from AMS info
    bits, so a printer with zero AMS units reported an empty map; every
    external spool got extruder_id=None, and the nozzle-aware hard filter in
    _match_filaments_to_slots discarded it because None equals neither 0 nor
    1. The mapping came back all -1, was cleared to None, and the print
    command went out as use_ams:true with no ams_mapping and no
    ams_mapping2 at all.

    This is the backend half of #1257, which fixed the same logic in
    useFilamentMapping.ts and left this copy behind. Mirror its inference:
    a populated nozzles[1].nozzle_diameter, a non-empty ams_extruder_map, or
    more than one vt_tray entry. Replaying the reporter's own push-status
    now yields extruder 1 for Ext-L and 0 for Ext-R, and a nozzle-1
    requirement resolves to [254] -- what their working named-printer
    dispatch sent. Single-nozzle printers keep extruder_id=None; nozzles
    always has two entries, so its length alone must not be the signal.

    Also stop dispatching a job the firmware is certain to reject. When the
    matcher ran, matched nothing, and the printer has no AMS, fail the item
    with the filament and nozzle it wants instead of spending an upload and
    two retries on it -- that path already ended in a failed item, just an
    opaque one. With an AMS attached the firmware error still stands, since
    there the user can load a spool and press Resume. Fail-safe like the
    nozzle-diameter guard (#1899): every branch short of a positive finding
    returns None and dispatches as before.

    _apply_filament_overrides is extracted from _compute_ams_mapping_for_printer
    so the message names the filament the matcher looked for rather than the one
    the 3MF was sliced with.
2026-08-15 14:22:24 +02:00
maziggy ae802e74ca Say why a drying cycle ended when the firmware cuts it short (#2770)
An H2D started a twelve-hour PETG dry at 65 degC and the AMS gave up on it
    twenty minutes in, with 700 of the 720 minutes still on the clock. It cooled,
    humidity climbed back over the threshold, auto-drying started another
    twelve-hour cycle, and that one went the same way; the reporter's AMS
    temperature history shows the loop running all morning.

    The log had one line for it: "AMS 0 drying complete", which is exactly what it
    says for a dry that ran its full twelve hours. Nothing in a support bundle told
    the two apart, and the one number that does -- the time still remaining -- was
    written into that line as the previous value, where it reads like a duration
    rather than a shortfall. The reporter took 700 for seconds and concluded the
    cycle had lasted twelve minutes.

    Bambuddy did not stop that cycle; every stop it sends is logged with the full
    outgoing command and there was none. So ending it was the printer's decision,
    and the account of why lives in three things already received and parsed and
    never written down: the drying phase and sub-phase from the AMS info hex, the
    per-unit dry_sf_reason constraint codes, and the live HMS errors.

    A cycle that ends with most of its countdown left now logs all three alongside
    how much of the requested duration ran. One that reaches its duration keeps the
    single line it has always had. A stop Bambuddy sent is named as ours -- it is
    short of its duration too, and on the telemetry alone is indistinguishable from
    the firmware abandoning the cycle, so without tracking it the print-takes-priority
    stop and the Stop button would both have been blamed on the printer.

    Diagnostics only. Nothing about when drying starts or stops has changed, and the
    restart loop is not addressed: what the firmware objects to has to be established
    before Bambuddy can sensibly decide how long to wait before trying again.
2026-08-15 14:22:04 +02:00
maziggy 9f12eefcf9 Merge pull request #2763 from pascalheidmann/feature/slicer-multi-button
Feature/slicer multi button
2026-08-15 14:21:43 +02:00
maziggy 4cbbd52aa0 fix(slicer): drop the legacy library:read from the slice gate (#2725)
The desktop handoff accepted library:read alongside read_all/read_own, on
    the reasoning that default groups do not carry it and requiring it would
    lock out Operators and Viewers. The permission grants nothing in that
    position: the slicer-token endpoint gates on
    require_ownership_permission(LIBRARY_READ_ALL, LIBRARY_READ_OWN), and
    neither that dependency nor User.has_permission expands the legacy name,
    so a group holding only library:read gets a 403 there. It cannot reach
    the File Manager to try, either - GET /library/folders gates on the same
    pair - and the library:read -> library:read_own migration in
    core/database.py runs only over the groups named in DEFAULT_GROUPS, so a
    custom role that still carries it stays stuck rather than being upgraded.
    custom role that still carries it stays stuck rather than being upgraded.

    Accepting it only enabled a menu item the server refuses, and the failure
    is indistinguishable from "no slicer installed" once the catch hands the
    unauthenticated URL over. Removed, with the comment recording the reason
    so the next reader does not re-add it, and a test that pins it.

    ---

    refactor(slicer): share one sliceable-file-type rule (#2725)

    The File Manager and the 3D preview decide the same thing about the same
    file and each held its own list of extensions - which is how they came to
    disagree, offering a desktop handoff for an STL whose own preview showed
    "Open in Slicer" greyed out. Making the two lists identical fixed the
    symptom and left the drift, so SLICEABLE_FILE_TYPES now lives in
    utils/slicer.ts with isSliceableFileType for a stored file_type and
    isSliceableFilename for a name.

    The filename form still rules out the compound extensions explicitly,
    since .gcode.3mf ends with .3mf; the type form does not need to, because
    classify_file_type stores that one whole.

    Both test files mocked the whole slicer module, which would have replaced
    the new predicates with undefined - switched to importOriginal so only
    openInSlicer is stubbed. That is the better shape regardless: the tests
    now exercise the rule the component runs instead of a copy declared
    beside them.

    Carries the rebuilt bundle. The CSS hash moves with it - the split button
    introduces Tailwind classes the previous build had no reason to emit.
2026-08-15 14:21:17 +02:00
maziggy da1f655c3d Cover nested data structures in the HA notify pass-through (#1441)
The three tests around it use flat scalars, which is also all the field's
    placeholder and the wiki showed, so nothing recorded that the value is
    forwarded verbatim rather than treated as a key/value list. A reporter asked
    whether action buttons work; they always have, and now that is pinned.

    The changelog entry said "nested options work" and left it there. It now names
    actions and the two things that decide whether the buttons do anything - the
    mobile_app_notification_action automation, and iOS needing a registered
    category - since neither is set from Bambuddy and both are what a reader would
    otherwise have to discover the way the reporter did.
2026-08-15 14:20:40 +02:00
maziggy d8d637cbfe Survive a directory that defines no posixGroup class (#2769)
Every LDAP user on an lldap directory was rejected with "Incorrect
    username or password", on an install where Test Connection passed and
    where the same bind DN, filter and group membership all checked out
    under ldapsearch. The directory never saw the request.

    _extract_user_info searches for POSIX groups alongside the memberOf
    ones, and both of those filters name the posixGroup object class. ldap3
    fetches the schema at connect time (get_info=ALL) and validates class
    names in a filter against it while building the request, raising
    LDAPObjectClassError before anything is sent. lldap marks every account
    it creates as posixAccount -- which is what makes us look for POSIX
    groups at all -- but defines no group class beyond groupOfNames. The
    exception escaped authenticate_ldap_user, and the login route reports
    any LDAP failure as bad credentials.

    A directory with no posixGroup class has no posixGroup entries, which is
    exactly the answer those searches would have returned. Catch it, log it
    once, and carry on with the memberOf groups collected above. Both
    searches sit inside the one try: they name the same class, so once one
    is rejected the other cannot succeed, and attempting it would only
    produce a second identical exception to swallow.

    Not a regression from 848f55810. The memberUid filter has named the
    class since b6599dd41 and runs for every user whether or not they have a
    gidNumber, so a directory of this shape has never been able to log in;
    the primary-group lookup only added a second trigger. Test Connection
    was unaffected throughout because (objectClass=*) is a presence filter
    and never reaches the value validator.

    The mock connection gained a hook that raises on a filter substring,
    standing in for that client-side validation. Reset in the fixture and
    default None, so existing tests are unchanged.
2026-08-15 14:20:07 +02:00
maziggy 868cfa2d1e Read the printer's own slot mapping when Spoolman has none (#2768)
A sliced file numbers its filaments 1..4; which AMS tray each came from is
    a separate decision made when the job is sent. store_print_data learns it
    from one of two sources, both of which require the print command to pass
    through us: the mapping Bambuddy chose itself, or the one it intercepted
    on the printer's local request topic. A job dispatched from Bambu Studio
    while the printer is cloud-bound satisfies neither -- the command travels
    through Bambu's broker and never reaches the topic we subscribe to.

    slot_to_tray is then NULL and _resolve_global_tray_id guesses by position:
    filament 1 from the first loaded tray, filament 2 from the second. The
    reporter's X1C was loaded in the order 2, 4, 1, AMS-HT, so all four slots
    were charged to the wrong spool. Their log carries the printer's own
    answer, mapping=[1, 3, 0, 32768], sitting unread.

    usage_tracker has consulted that field since it started resolving mappings
    at completion, along with a colour match against the loaded trays for the
    models that never publish it (A1, A1 Mini, P1S, P2S). Only the Spoolman
    writer, which resolves at print start, never learned to -- and main.py
    gates usage_tracker behind Spoolman being off, so enabling Spoolman is
    what costs you the better resolver.

    _resolve_slot_to_tray_fallback gives it both, at completion rather than at
    print start: a printer keeps publishing the last job's mapping while it
    sits idle, so reading it early would risk stamping the previous print's
    mapping onto this one. A mapping we or the slicer actually recorded is
    never second-guessed.

    Applied in _report_partial_usage too. Cancelled and failed prints feed the
    same slot_to_tray to the same resolver and mis-charged just as readily.

    The resolved mapping and its source are now logged at print start and at
    completion. "source: none" at start is the signal that completion will
    have to fall back, and it was the one line that would have turned this
    report into a five-minute triage.

    Not addressed: editing the mapping after the fact, which the reporter also
    asked for. ArchiveUpdate exposes neither filament field and there is no way
    to re-run an attribution, so that is a feature rather than a fix.
2026-08-15 14:19:45 +02:00