Skip to content

Commit 1c34d2d

Browse files
committed
merge: docs & test updates from main
2 parents b6472d5 + 906d929 commit 1c34d2d

File tree

6 files changed

+40
-40
lines changed

6 files changed

+40
-40
lines changed

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414
<a href="https://discord.gg/pQPt8HBUPu">
1515
💬 community discord server
1616
</a>
17+
<br/>
1718
<a href="https://x.com/justusecobalt">
1819
🐦 twitter
1920
</a>
21+
<a href="https://bsky.app/profile/cobalt.tools">
22+
🦋 bluesky
23+
</a>
2024
</p>
2125
<br/>
2226
</div>
@@ -34,11 +38,10 @@ this monorepo includes source code for api, frontend, and related packages:
3438
it also includes documentation in the [docs tree](/docs/):
3539
- [cobalt api documentation](/docs/api.md)
3640
- [how to run a cobalt instance](/docs/run-an-instance.md)
37-
- [how to protect a cobalt instance](/docs/protect-an-instance.md)
38-
- [how to configure a cobalt instance for youtube](/docs/configure-for-youtube.md)
41+
- [how to protect a cobalt instance](/docs/protect-an-instance.md) (recommended if you host a public instance)
3942

4043
### thank you
41-
cobalt is sponsored by [royalehosting.net](https://royalehosting.net/?partner=cobalt) and the main processing servers are hosted on their network. we really appreciate their kindness and support!
44+
cobalt is sponsored by [royalehosting.net](https://royalehosting.net/?partner=cobalt). a part of our infrastructure is hosted on their network. we really appreciate their kindness and support!
4245

4346
### ethics
4447
cobalt is a tool that makes downloading public content easier. it takes **zero liability**.
@@ -50,7 +53,7 @@ it can only download free & publicly accessible content.
5053
same content can be downloaded via dev tools of any modern web browser.
5154

5255
### contributing
53-
thank you for considering making a contribution to cobalt! please check the [contributing guidelines here](/CONTRIBUTING.md) before making a pull request.
56+
if you're considering contributing to cobalt, first of all, thank you! check the [contribution guidelines here](/CONTRIBUTING.md) before getting started, they'll help you do your best right away.
5457

5558
### licenses
5659
for relevant licensing information, see the [api](api/README.md) and [web](web/README.md) READMEs.

api/README.md

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@ we recommend [deploying your own instance](/docs/run-an-instance.md) if you wish
1111

1212
you can read [the api documentation here](/docs/api.md).
1313

14-
> [!WARNING]
15-
> the v7 public api (/api/json) will be shut down on **november 11th, 2024**.
16-
> you can access documentation for it [here](https://github.com/imputnet/cobalt/blob/7/docs/api.md).
17-
1814
## supported services
19-
this list is not final and keeps expanding over time. if support for a service you want is missing, create an issue (or a pull request 👀).
15+
this list is not final and keeps expanding over time!
16+
if the desired service isn't supported yet, feel free to create an appropriate issue (or a pull request 👀).
2017

2118
| service | video + audio | only audio | only video | metadata | rich file names |
2219
| :-------- | :-----------: | :--------: | :--------: | :------: | :-------------: |
@@ -39,12 +36,13 @@ this list is not final and keeps expanding over time. if support for a service y
3936
| twitter/x ||||||
4037
| vimeo ||||||
4138
| vk videos & clips ||||||
39+
| xiaohongshu ||||||
4240
| youtube ||||||
4341

4442
| emoji | meaning |
4543
| :-----: | :---------------------- |
4644
|| supported |
47-
|| impossible/unreasonable |
45+
|| unreasonable/impossible |
4846
|| not supported |
4947

5048
### additional notes or features (per service)
@@ -71,36 +69,35 @@ as long as you:
7169
- provide a link to the license and indicate if changes to the code were made, and
7270
- release the code under the **same license**
7371

74-
## acknowledgements
72+
## open source acknowledgements
7573
### ffmpeg
76-
cobalt heavily relies on ffmpeg for converting and merging media files. it's an absolutely amazing piece of software offered for anyone for free, yet doesn't receive as much credit as it should.
74+
cobalt relies on ffmpeg for muxing and encoding media files. ffmpeg is absolutely spectacular and we're privileged to have an ability to use it for free, just like anyone else. we believe it should be way more recognized.
7775

7876
you can [support ffmpeg here](https://ffmpeg.org/donations.html)!
7977

80-
#### ffmpeg-static
81-
we use [ffmpeg-static](https://github.com/eugeneware/ffmpeg-static) to get binaries for ffmpeg depending on the platform.
82-
83-
you can support the developer via various methods listed on their github page! (linked above)
84-
8578
### youtube.js
86-
cobalt relies on [youtube.js](https://github.com/LuanRT/YouTube.js) for interacting with the innertube api, it wouldn't have been possible without it.
79+
cobalt relies on **[youtube.js](https://github.com/LuanRT/YouTube.js)** for interacting with youtube's innertube api, it wouldn't have been possible without this package.
8780

88-
you can support the developer via various methods listed on their github page! (linked above)
81+
you can support the developer via various methods listed on their github page!
82+
(linked above)
8983

9084
### many others
91-
cobalt also depends on:
92-
93-
- [content-disposition-header](https://www.npmjs.com/package/content-disposition-header) to simplify the provision of `content-disposition` headers.
94-
- [cors](https://www.npmjs.com/package/cors) to manage cross-origin resource sharing within expressjs.
95-
- [dotenv](https://www.npmjs.com/package/dotenv) to load environment variables from the `.env` file.
96-
- [express](https://www.npmjs.com/package/express) as the backbone of cobalt servers.
97-
- [express-rate-limit](https://www.npmjs.com/package/express-rate-limit) to rate limit api endpoints.
98-
- [hls-parser](https://www.npmjs.com/package/hls-parser) to parse `m3u8` playlists for certain services.
99-
- [ipaddr.js](https://www.npmjs.com/package/ipaddr.js) to parse ip addresses (for rate limiting).
100-
- [nanoid](https://www.npmjs.com/package/nanoid) to generate unique (temporary) identifiers for each requested stream.
101-
- [psl](https://www.npmjs.com/package/psl) as the domain name parser.
102-
- [set-cookie-parser](https://www.npmjs.com/package/set-cookie-parser) to parse cookies that cobalt receives from certain services.
103-
- [undici](https://www.npmjs.com/package/undici) for making http requests.
104-
- [url-pattern](https://www.npmjs.com/package/url-pattern) to match provided links with supported patterns.
85+
cobalt-api also depends on:
86+
87+
- **[content-disposition-header](https://www.npmjs.com/package/content-disposition-header)** to simplify the provision of `content-disposition` headers.
88+
- **[cors](https://www.npmjs.com/package/cors)** to manage cross-origin resource sharing within expressjs.
89+
- **[dotenv](https://www.npmjs.com/package/dotenv)** to load environment variables from the `.env` file.
90+
- **[express](https://www.npmjs.com/package/express)** as the backbone of cobalt servers.
91+
- **[express-rate-limit](https://www.npmjs.com/package/express-rate-limit)** to rate limit api endpoints.
92+
- **[ffmpeg-static](https://www.npmjs.com/package/ffmpeg-static)** to get binaries for ffmpeg depending on the platform.
93+
- **[hls-parser](https://www.npmjs.com/package/hls-parser)** to parse HLS playlists according to spec (very impressive stuff).
94+
- **[ipaddr.js](https://www.npmjs.com/package/ipaddr.js)** to parse ip addresses (used for rate limiting).
95+
- **[nanoid](https://www.npmjs.com/package/nanoid)** to generate unique identifiers for each requested tunnel.
96+
- **[set-cookie-parser](https://www.npmjs.com/package/set-cookie-parser)** to parse cookies that cobalt receives from certain services.
97+
- **[undici](https://www.npmjs.com/package/undici)** for making http requests.
98+
- **[url-pattern](https://www.npmjs.com/package/url-pattern)** to match provided links with supported patterns.
99+
- **[zod](https://www.npmjs.com/package/zod)** to lock down the api request schema.
100+
- **[@datastructures-js/priority-queue](https://www.npmjs.com/package/@datastructures-js/priority-queue)** for sorting stream caches for future clean up (without redis).
101+
- **[@imput/psl](https://www.npmjs.com/package/@imput/psl)** as the domain name parser, our fork of [psl](https://www.npmjs.com/package/psl).
105102

106103
...and many other packages that these packages rely on.

api/src/util/tests/loom.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"name": "1080p video",
4-
"url": "https://www.loom.com/share/313bf71d20ca47b2a35b6634cefdb761",
4+
"url": "https://www.loom.com/share/d165fd054a294d8a8587807bcc50c885",
55
"params": {},
66
"expected": {
77
"code": 200,
@@ -10,7 +10,7 @@
1010
},
1111
{
1212
"name": "1080p video (muted)",
13-
"url": "https://www.loom.com/share/313bf71d20ca47b2a35b6634cefdb761",
13+
"url": "https://www.loom.com/share/d165fd054a294d8a8587807bcc50c885",
1414
"params": {
1515
"downloadMode": "mute"
1616
},
@@ -21,7 +21,7 @@
2121
},
2222
{
2323
"name": "1080p video (audio only)",
24-
"url": "https://www.loom.com/share/313bf71d20ca47b2a35b6634cefdb761",
24+
"url": "https://www.loom.com/share/d165fd054a294d8a8587807bcc50c885",
2525
"params": {
2626
"downloadMode": "audio"
2727
},

api/src/util/tests/pinterest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
},
6969
{
7070
"name": "regular gif",
71-
"url": "https://www.pinterest.com/pin/814447913881127862/",
71+
"url": "https://www.pinterest.com/pin/643170390530326178/",
7272
"params": {},
7373
"expected": {
7474
"code": 200,
@@ -77,7 +77,7 @@
7777
},
7878
{
7979
"name": "regular gif (.ca TLD)",
80-
"url": "https://www.pinterest.ca/pin/814447913881127862/",
80+
"url": "https://www.pinterest.ca/pin/643170390530326178/",
8181
"params": {},
8282
"expected": {
8383
"code": 200,

api/src/util/tests/xiaohongshu.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
{
2121
"name": "one photo",
22-
"url": "https://www.xiaohongshu.com/explore/6788b56200000000210008c8?xsec_token=CBSDiWU4N-DgirHrOVbIWrlKfUNFHKwm-Wsjqz7dIMc_k",
22+
"url": "https://www.xiaohongshu.com/explore/676e132d000000000b016f68?xsec_token=ABRv6LKzizOFeSaf2HnnBkdBqniB5Ak1fI8tMAHzO31jA",
2323
"params": {},
2424
"expected": {
2525
"code": 200,

web/i18n/en/about/general.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ no ads, trackers, paywalls, or other nonsense. just a convenient web app that wo
2525
cobalt was created for public benefit, to protect people from ads and malware pushed by its alternatives.
2626
we believe that the best software is safe, open, and accessible.
2727

28-
it's possible to keep the main instances up thanks to our long-standing infrastructure partner, [royalehosting.net]({partners.royalehosting})!
28+
a part of our infrastructure is provided by our long-standing partner, [royalehosting.net]({partners.royalehosting})!
2929
</section>
3030

3131
<section id="privacy">

0 commit comments

Comments
 (0)