Commit Graph

199 Commits

Author SHA1 Message Date
Yuri Astrakhan
b71c846abc
fix for mbtiles apply-patch with raw bindiff (#1384)
When applying raw (no gzip) patches, `mbtiles` was trying to un-gzip
them first. Now handles it properly.  Also adds a number of tests to catch these cases.
2024-06-26 20:37:20 +00:00
Yuri Astrakhan
ccd550a2cf
Add binary diff for mbtiles (#1358)
* `mbtiles diff` now has an additional `--patch-type` param with
`whole`, `bin-diff-raw` and `bin-diff-gz` values:
* `whole` stores different tiles as before - as whole tiles in the
`tiles` table
* `bin-diff-raw` computes binary difference between tiles, and stores
them as brotli-encoded value in a `bsdiffraw` table, together with a
`xxh3_64` hash of the tile as it will be stored after patching
* `bin-diff-gz` same as `bin-diff-raw`, but assumes the tiles are
gzip-compressed, so it uncompresses them before comparing. The `xxh3_64`
stores the hash of the uncompressed tile. The data will be stored in the
`bsdiffrawgz` table (identical structure with above)

* `mbtiles copy --apply-patch` will automatically detect if
`bsdiffrawgz` or `bsdiffraw` tables exist, and will use binary patching.
* `mbtiles apply-patch` does not support binary patching yet
* `mbtiles copy --diff-with-file ... --patch-type ...` is an alias to
`mbtiles diff --patch-type ...`
2024-06-25 19:34:14 +00:00
dependabot[bot]
454df5e31a
chore(deps): Bump sqlite-hashes from 0.7.2 to 0.7.3 (#1379)
Bumps [sqlite-hashes](https://github.com/nyurik/sqlite-hashes) from
0.7.2 to 0.7.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/nyurik/sqlite-hashes/releases">sqlite-hashes's
releases</a>.</em></p>
<blockquote>
<h2>v0.7.3</h2>
<p>Minor dependency updates and readme fixes</p>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/nyurik/sqlite-hashes/compare/v0.7.2...v0.7.3">https://github.com/nyurik/sqlite-hashes/compare/v0.7.2...v0.7.3</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="51fdad1c2d"><code>51fdad1</code></a>
bump deps, fix readme tests</li>
<li><a
href="d55150b503"><code>d55150b</code></a>
readme</li>
<li><a
href="1930cebc42"><code>1930ceb</code></a>
Fix SQLx example</li>
<li>See full diff in <a
href="https://github.com/nyurik/sqlite-hashes/compare/v0.7.2...v0.7.3">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sqlite-hashes&package-manager=cargo&previous-version=0.7.2&new-version=0.7.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-20 02:54:00 +00:00
Yuri Astrakhan
68aca37ba2 fix ci, dep bump 2024-06-13 18:33:29 -04:00
dependabot[bot]
9c24e3b4fd
chore(deps): Bump rustls from 0.23.8 to 0.23.9 (#1360)
Bumps [rustls](https://github.com/rustls/rustls) from 0.23.8 to 0.23.9.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="e754234b64"><code>e754234</code></a>
Prepare 0.23.9</li>
<li><a
href="590716e478"><code>590716e</code></a>
Fix unstable fmt job</li>
<li><a
href="de851b4601"><code>de851b4</code></a>
unbuffered examples: avoid clippy lint</li>
<li><a
href="5faa88c65b"><code>5faa88c</code></a>
hs.rs: refactor to eliminate conditional allow()</li>
<li><a
href="503d42bd5f"><code>503d42b</code></a>
Tidy away unneeded #[allow()]s</li>
<li><a
href="0c85c0199f"><code>0c85c01</code></a>
Add issue number for server-side ECH in the roadmap.</li>
<li><a
href="bacc19c9f0"><code>bacc19c</code></a>
General roadmap updates.</li>
<li><a
href="4bd989c7ef"><code>4bd989c</code></a>
handshake_test: reorder items in file</li>
<li><a
href="1aba137522"><code>1aba137</code></a>
handshake_test: clarify cloning tests</li>
<li><a
href="d202e0d581"><code>d202e0d</code></a>
handshake_test: remove get_ function prefices</li>
<li>Additional commits viewable in <a
href="https://github.com/rustls/rustls/compare/v/0.23.8...v/0.23.9">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rustls&package-manager=cargo&previous-version=0.23.8&new-version=0.23.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-04 02:52:36 +00:00
dependabot[bot]
a7f0937d9a
chore(deps): Bump sqlite-hashes from 0.7.1 to 0.7.2 (#1361)
Bumps [sqlite-hashes](https://github.com/nyurik/sqlite-hashes) from
0.7.1 to 0.7.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/nyurik/sqlite-hashes/releases">sqlite-hashes's
releases</a>.</em></p>
<blockquote>
<h2>v0.7.2</h2>
<h2>What's Changed</h2>
<ul>
<li>Improve CI, bump dependencies by <a
href="https://github.com/nyurik"><code>@​nyurik</code></a> in <a
href="https://redirect.github.com/nyurik/sqlite-hashes/pull/33">nyurik/sqlite-hashes#33</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/nyurik/sqlite-hashes/compare/v0.7.1...v0.7.2">https://github.com/nyurik/sqlite-hashes/compare/v0.7.1...v0.7.2</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="8618df28eb"><code>8618df2</code></a>
Improve CI, bump deps (<a
href="https://redirect.github.com/nyurik/sqlite-hashes/issues/33">#33</a>)</li>
<li><a
href="65827a9982"><code>65827a9</code></a>
Bump dependabot/fetch-metadata from 2.0.0 to 2.1.0 (<a
href="https://redirect.github.com/nyurik/sqlite-hashes/issues/30">#30</a>)</li>
<li><a
href="23d1835acc"><code>23d1835</code></a>
bump deps, CI fix</li>
<li><a
href="17e56bd447"><code>17e56bd</code></a>
Bump ctor from 0.2.7 to 0.2.8 (<a
href="https://redirect.github.com/nyurik/sqlite-hashes/issues/29">#29</a>)</li>
<li><a
href="daba0a9c4b"><code>daba0a9</code></a>
Bump insta from 1.37.0 to 1.38.0 (<a
href="https://redirect.github.com/nyurik/sqlite-hashes/issues/28">#28</a>)</li>
<li><a
href="81f47cf27a"><code>81f47cf</code></a>
Bump insta from 1.36.1 to 1.37.0 (<a
href="https://redirect.github.com/nyurik/sqlite-hashes/issues/27">#27</a>)</li>
<li><a
href="0686924162"><code>0686924</code></a>
Bump dependabot/fetch-metadata from 1.6.0 to 2.0.0 (<a
href="https://redirect.github.com/nyurik/sqlite-hashes/issues/26">#26</a>)</li>
<li>See full diff in <a
href="https://github.com/nyurik/sqlite-hashes/compare/v0.7.1...v0.7.2">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sqlite-hashes&package-manager=cargo&previous-version=0.7.1&new-version=0.7.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-04 02:41:09 +00:00
Yuri Astrakhan
5c31d21120 Bump deps 2024-05-30 14:34:53 -04:00
Yuri Astrakhan
a98bc81086
Bump all dependencies, fix CI (#1353) 2024-05-25 01:17:26 -04:00
dependabot[bot]
f9f6777812
chore(deps): Bump rustls from 0.23.7 to 0.23.8 (#1350)
Bumps [rustls](https://github.com/rustls/rustls) from 0.23.7 to 0.23.8.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="99abca5e49"><code>99abca5</code></a>
Prepare 0.23.8</li>
<li><a
href="06c777bb3f"><code>06c777b</code></a>
Hide internals from documentation</li>
<li><a
href="091587bc8b"><code>091587b</code></a>
Derive Clone for <code>ServerConfig</code> &amp;
<code>ClientConfig</code></li>
<li><a
href="96648336a7"><code>9664833</code></a>
Refactor construction of <code>CertificatePayloadTls13</code></li>
<li><a
href="45c8a54589"><code>45c8a54</code></a>
Remove <code>PayloadU24::new</code></li>
<li><a
href="04ef27c7eb"><code>04ef27c</code></a>
api.rs: format imports</li>
<li><a
href="572f970b0b"><code>572f970</code></a>
Add test for CRL expiration</li>
<li><a
href="8da353056a"><code>8da3530</code></a>
Add support for enforcing CRL expiration</li>
<li><a
href="c57079361b"><code>c570793</code></a>
Cover <code>HandshakeMessagePayload::into_owned()</code></li>
<li><a
href="125d64164e"><code>125d641</code></a>
Test theoretical support for OCSP pinning</li>
<li>Additional commits viewable in <a
href="https://github.com/rustls/rustls/compare/v/0.23.7...v/0.23.8">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rustls&package-manager=cargo&previous-version=0.23.7&new-version=0.23.8)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-05-24 03:13:35 +00:00
dependabot[bot]
054c803eb9
chore(deps): Bump rustls from 0.23.6 to 0.23.7 (#1344)
Bumps [rustls](https://github.com/rustls/rustls) from 0.23.6 to 0.23.7.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="e45fec43e1"><code>e45fec4</code></a>
Prepare 0.23.7</li>
<li><a
href="2c72fb0c31"><code>2c72fb0</code></a>
Test for more <code>close_notify</code> conditions</li>
<li><a
href="7d4e809e5e"><code>7d4e809</code></a>
Ignore duplicative <code>send_close_notify</code> calls</li>
<li><a
href="ced64bcedf"><code>ced64bc</code></a>
<code>read_tls</code> refuse to read further data after
<code>close_notify</code> alert</li>
<li><a
href="386b6fd2f9"><code>386b6fd</code></a>
Correctly discard data after <code>close_notify</code> alert</li>
<li>See full diff in <a
href="https://github.com/rustls/rustls/compare/v/0.23.6...v/0.23.7">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rustls&package-manager=cargo&previous-version=0.23.6&new-version=0.23.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-05-20 02:38:37 +00:00
Yuri Astrakhan
df8880fe4c
Fix a few CI issues and bump deps (#1341) 2024-05-17 01:05:19 -04:00
dependabot[bot]
3031e104f9
chore(deps): Bump rustls from 0.23.5 to 0.23.6 (#1340)
Bumps [rustls](https://github.com/rustls/rustls) from 0.23.5 to 0.23.6.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="06dc1d540c"><code>06dc1d5</code></a>
deps: update cargo semver compatible deps</li>
<li><a
href="252b5d360b"><code>252b5d3</code></a>
Prepare 0.23.6</li>
<li><a
href="55890f0ee6"><code>55890f0</code></a>
Test for junk in unbuffered input after <code>close_notify</code></li>
<li><a
href="972da7ff71"><code>972da7f</code></a>
Test app data after <code>close_notify</code> is ignored</li>
<li><a
href="424bb317ea"><code>424bb31</code></a>
Test for junk in deframer buffer after <code>close_notify</code></li>
<li><a
href="749121a976"><code>749121a</code></a>
Ignore data appearing after <code>close_notify</code></li>
<li><a
href="ef024342d1"><code>ef02434</code></a>
Deduplicate Reader state checks</li>
<li><a
href="ccb352c075"><code>ccb352c</code></a>
Linearize Reader::read() and read_buf()</li>
<li><a
href="27d81e01e8"><code>27d81e0</code></a>
Warn on lints, don't deny</li>
<li><a
href="f214df9826"><code>f214df9</code></a>
bogo: fix config rewriting when cpp is clang</li>
<li>Additional commits viewable in <a
href="https://github.com/rustls/rustls/compare/v/0.23.5...v/0.23.6">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rustls&package-manager=cargo&previous-version=0.23.5&new-version=0.23.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-05-17 02:50:02 +00:00
dependabot[bot]
4ac4ff2b20
chore(deps): Bump rustls from 0.23.4 to 0.23.5 (#1312)
Bumps [rustls](https://github.com/rustls/rustls) from 0.23.4 to 0.23.5.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="14cb5d2eac"><code>14cb5d2</code></a>
Prepare 0.23.5</li>
<li><a
href="6e938bcfe8"><code>6e938bc</code></a>
complete_io: bail out if progress is impossible</li>
<li><a
href="2123576840"><code>2123576</code></a>
Regression test for <code>complete_io</code> infinite loop bug</li>
<li><a
href="f45664fbde"><code>f45664f</code></a>
Don't specially handle unauthenticated close_notify alerts</li>
<li><a
href="1f5146cdfa"><code>1f5146c</code></a>
docs: update SECURITY example</li>
<li><a
href="5ea02ed56f"><code>5ea02ed</code></a>
Return <code>Option</code> from <code>handshake_kind()</code></li>
<li><a
href="d2e1e668aa"><code>d2e1e66</code></a>
bogo: verify expected handshake kind</li>
<li><a
href="d8a2ae040c"><code>d8a2ae0</code></a>
Add API exposing shape of the performed handshake</li>
<li><a
href="740ca41773"><code>740ca41</code></a>
tests/api.rs: reformat</li>
<li><a
href="5ed2c9739d"><code>5ed2c97</code></a>
deps: update cargo semver compatible deps</li>
<li>Additional commits viewable in <a
href="https://github.com/rustls/rustls/compare/v/0.23.4...v/0.23.5">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=rustls&package-manager=cargo&previous-version=0.23.4&new-version=0.23.5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/maplibre/martin/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-19 20:20:11 +00:00
Yuri Astrakhan
ce182d2a9e Bump dependencies 2024-04-14 23:07:39 -04:00
Yuri Astrakhan
99db6d771d
Upgrade to pmtiles, rm async-trait in a trait (#1300)
* Bump to pmtiles that doesn't use `async_trait` crate
* `trait SourceConfigExtras` no longer needs `#[async_trait]`
2024-04-11 03:36:19 -04:00
Yuri Astrakhan
e89e90f163
Migrate to newer pmtiles dependency (#1299)
also minor code cleanup
2024-04-10 23:55:27 -04:00
Yuri Astrakhan
566f91d4cd
upgrade dependencies, Nasm on Windows (#1295)
* Install `nasm` when running CI on Windows (required by rustls new
faster crypto-provider)
* In integration testing, wrap connection in mutex due to `rstest` now
requiring `once` fixtures to be `Sync`
* Upgrade to Brotli v4, and disable FFI due to compilation conflict
2024-04-09 19:36:40 -04:00
Yuri Astrakhan
115c976c92
Update sqlite-hashes dependency (#1268)
Minor internal breaking changes
2024-03-22 17:04:16 -04:00
dependabot[bot]
7c56e50440
chore(deps): Bump pbf_font_tools from 2.5.0 to 2.5.1 (#1191)
Bumps [pbf_font_tools](https://github.com/stadiamaps/sdf_font_tools)
from 2.5.0 to 2.5.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/stadiamaps/sdf_font_tools/releases">pbf_font_tools's
releases</a>.</em></p>
<blockquote>
<h2>tools-v2.5.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Housekeeping by <a
href="https://github.com/ianthetechie"><code>@​ianthetechie</code></a>
in <a
href="https://redirect.github.com/stadiamaps/sdf_font_tools/pull/17">stadiamaps/sdf_font_tools#17</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/stadiamaps/sdf_font_tools/compare/cli-v1.4.1...sdf-v1.0.1">https://github.com/stadiamaps/sdf_font_tools/compare/cli-v1.4.1...sdf-v1.0.1</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="011f994a59"><code>011f994</code></a>
Housekeeping (<a
href="https://redirect.github.com/stadiamaps/sdf_font_tools/issues/17">#17</a>)</li>
<li><a
href="97c5634b8e"><code>97c5634</code></a>
Fix CI issues round 2</li>
<li>See full diff in <a
href="https://github.com/stadiamaps/sdf_font_tools/compare/tools-v2.5.0...tools-v2.5.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pbf_font_tools&package-manager=cargo&previous-version=2.5.0&new-version=2.5.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-13 02:59:51 +00:00
Yuri Astrakhan
35d8e25703
upgrade to pmtiles v0.7.0 (#1173)
remove reqwest deps, and use the reexport
2024-02-05 19:26:38 +00:00
Josh Lee
9f9f18163c
Add AWS Lambda support (#1127)
This adds the lambda-web crate to adapt the actix App to speak to Lambda
by way of the lambda_runtime crate.

AWS Lambda has native support for scripting languages to
execute a function directly; compiled languages must embed a runtime to
fetch incoming events from Lambda and post the responses. This detects
the environment variables to start up in Lambda mode instead of the
normal HTTP server, and is added as an optional feature.

Lambda has five (!) distinct ways of routing HTTP requests to a
function; this supports some of them. (Specifically, the most obvious
way to do this is with a Function URL, which is newest and simplest, and
perhaps with CloudFront, which speaks to the Function URL and not Lambda
directly.)

The error handling could probably be refined, I was just trying to get
this to compile.

(Supported: API Gateway HTTP API with payload format version 2.0; API
Gateway REST API; Lambda function URLs / Not supported: API Gateway HTTP
API with payload format version 1.0; Application Load Balancer)

Necessary for #1102 to be able to run the released packages directly,
and only having to configure the appropriate environment.

---------

Co-authored-by: Yuri Astrakhan <yuriastrakhan@gmail.com>
2024-02-01 18:56:40 +00:00
Yuri Astrakhan
74c67a3812
Use ORDERBY in calc_agg_tiles_hash - SQLite v3.44 (#1156)
Require SQLite v3.44+ ORDER BY clause inside aggregate function instead
of the windowing one - might solve out of memory issues reported by
users - see #1154
2024-01-27 21:48:54 -05:00
Yuri Astrakhan
7c75a6dee6 Bump dependencies 2024-01-20 19:52:09 -05:00
Yuri Astrakhan
ecdeb8bf21
Use Rust 1.74 std::io::Error::other fn (#1009) 2024-01-17 02:18:14 +00:00
Yuri Astrakhan
b832bb22f4
Upgrade to Rustls 0.22 (#1136)
Fix #1036
2024-01-17 01:42:11 +00:00
Yuri Astrakhan
e3821b8d78 better bench test 2023-12-27 14:53:12 -05:00
Yuri Astrakhan
2def6288f1
PMTiles cache, refactor file configs, modularize (#1094)
* Make it possible to have configuration specific to the file-based
config sections: pmtiles, mbtiles, and sprites.
* Implement PMTiles directory cache shared between all pmtiles (both
http and local), with configurable max cache size (in MB), or 0 to
disable. Defaults to 32MB (?)
* PMTiles now share web client instance, which optimizes connection
reuse in case multiple pmtiles reside on the same host
* Major refactoring to allow modular reuse, enabling the following build
features:
    * **postgres** - enable PostgreSQL/PostGIS tile sources
    * **pmtiles** - enable PMTile tile sources
    * **mbtiles** - enable MBTile tile sources
    * **fonts** - enable font sources
    * **sprites** - enable sprite sources
* Use justfile in the CI

Fixes #1093
2023-12-25 05:52:04 +00:00
Yuri Astrakhan
7ff2f5105a bump deps and lock 2023-12-24 23:50:37 -05:00
Yuri Astrakhan
f13c3f7514
Improve mbtiles update, update min/max zoom on martin-cp (#1096)
* `mbtiles update` now allows different types of zoom updates - reset to
content, grow only, or skip (dry run)
* `martin-cp` will now update (grow-only) metadata zooms

Addresses a few concerns in the #1081
2023-12-24 17:30:45 +08:00
Yuri Astrakhan
ea2b934d70 update MSRV 2023-12-22 22:56:22 -05:00
Yuri Astrakhan
1a8e7c89a4
Implement http pmtiles (#991)
PMTiles is a web-optimized format, allowing the actual file to be read
with HTTP range requests. Supporting this use case instantly allows
Martin to function as a lambda executable accessing PMTiles, but without
any significant investment into devops or hosting large file.

PMTiles config now also allows `http` and `https` protocol.

```
# Publish PMTiles files
pmtiles:
  paths:
    # specific pmtiles file will be published as mypmtiles source
    # (use last portion of the URL without extension)
    - http://example.org/path/to/mypmtiles.pmtiles
  sources:
    # named source matching source name to a single file
    pm-src1: https://example.org/path/to/some_pmtiles.pmtiles
 ```

fixes #884

---------

Co-authored-by: Kyle Slugg-Urbino <35903887+kyleslugg@users.noreply.github.com>
2023-12-22 06:01:50 +00:00
Yuri Astrakhan
fc15e0da5e Preparing release, version bump 2023-12-18 20:24:43 -05:00
Yuri Astrakhan
5a0f4c2d11 Update deadpool-postgres, lock 2023-12-15 18:40:56 -05:00
Yuri Astrakhan
886358e93f
Fix bbox to xyz roundtrip computation (#1059)
Add `tile-grid` as a dependency to use its webmercator tile math.

---------

Co-authored-by: sharkAndshark <zhangyijunmetro@hotmail.com>
2023-12-15 06:11:31 +00:00
Yuri Astrakhan
b97f1ccdbe Move utils to v0.2, MAX_ZOOM 2023-12-09 10:19:49 -05:00
Yuri Astrakhan
dc5fef9c65 bump lock 2023-12-07 02:26:09 -05:00
Yuri Astrakhan
713a51b74d
Upgarde to v0.10 spreet crate, cleanup SpreetResult (#984) 2023-11-29 19:09:05 -05:00
Yuri Astrakhan
999179029b Prepare for release 2023-11-20 01:51:08 -05:00
Yuri Astrakhan
f88fd10aa8
Add martin-cp tool to bulk-copy tiles from any Martin-supported sources (#1011)
This adds a new utility called `martin-cp` that allows copying any
number of tiles from a single source (or a composite source) to an
mbtiles file.

`martin-cp` is a tool for generating tiles in bulk, and save retrieved
tiles into a new or an existing MBTiles file. It can be used to generate
tiles for a large area or multiple areas. If multiple areas overlap, it
will generate tiles only once. `martin-cp` supports the same
configuration file and CLI arguments as Martin server, so it can support
all sources and even combining sources.
2023-11-20 06:27:51 +00:00
Yuri Astrakhan
140ed25679
mbtiles improvements, minor changes (#1013)
# MBTiles
* New `--agg-hash (update|verify|off)` flag replaces
`--update-agg-tiles-hash` (still supported, but not shown in the help
screen). This allows bypassing aggregate hash validation entirely,
without either updating or validating it.
* Simplify MBTiles SQL generation
* MBTiles now uses faster `1 << zoom` everywhere, and a dedicated TMS
inversion fn
* split up metadata insert and delete into separate fn
* consolidated schema initialization
* ensure db settings (like pragma) are always reset on new files

# Other
* Always sort JSON-serialized keys for consistency
  * this affects `/catalog` key ordering, but content is the same
* Minor code cleanup
2023-11-19 10:06:37 +00:00
Lucas
a3b2bfd705
Minor cleanup (#1008)
- Add separators to long literal.
- Use first() instead of get(0)
- Move some SQL-making code to their own functions
- Minor mathematics and rounding cleanup

---------

Co-authored-by: Yuri Astrakhan <YuriAstrakhan@gmail.com>
2023-11-17 18:55:05 +00:00
Yuri Astrakhan
d8e386fb0c
Use Rust's 1.74 cargo lint section (#1006)
https://blog.rust-lang.org/2023/11/16/Rust-1.74.0.html
2023-11-17 08:29:25 +08:00
Yuri Astrakhan
66eb925e47 bump dep, update pmtiles 2023-11-15 18:36:21 -05:00
Lucas
0398336114
Add mbtiles statistics command (#986)
- [x] Add tile statistics to mbtiles tools
- [x] Add test
- [x] Use 4326 instead of 3857 for tile bounds
- [x] Add document
- [x] Use size-format to prettify output 
- [x]  Statistics  struct Refactor
- [x] Cleanup and reformat

Closes #964 

---------

Co-authored-by: Yuri Astrakhan <yuriastrakhan@gmail.com>
2023-11-13 06:03:40 +00:00
Yuri Astrakhan
fad89d742f
simplify serde optional handling (#998) 2023-11-12 22:22:04 -05:00
Yuri Astrakhan
fe05faaa20 bump lock 2023-11-09 22:28:15 -05:00
Yuri Astrakhan
f7c69f8302
Minor cleanup and just reorg (#992)
Only run git push diff on linux to make development on non-linux easier,
and a few preparations for pmtiles over http serving

Fixes #855
2023-11-08 19:46:23 -05:00
Yuri Astrakhan
47b3106ac6
Rename martin-mbtiles crate to mbtiles (#976)
This simplifies usage as both a crate and as a tool
2023-10-28 08:50:49 +00:00
Yuri Astrakhan
9b112ae7b9
Implement dynamic font support /font/<name>/<start>-<end> (#755)
This implements dynamic font protobuf generation, allowing users to
request font ranges on the fly, and combining them in any order, e.g.
`Font1,Font2,Font3`, same as with sprites and tiles

This is a first iteration, without any multithreading support. In
theory, this could be done far faster by generating SDFs with multiple
threads.

### Current process
* during init, figure out all glyphs available in each font, and store
them as a bitset
* during request:
* combine requested bitsets to figure out which glyph should come from
which font file
* load those glyphs from files (using a single instance of the freetype
lib)
  * convert them to SDFs and package them into a protobuf

---------

Co-authored-by: Lucas <zhangyijunmetro@hotmail.com>
2023-10-28 05:10:48 +00:00
Yuri Astrakhan
502413aecb
Fix martin integration tests (#952)
Turns out some integration tests were not running after `martin` was
moved to subdir
2023-10-20 11:40:08 +08:00