fix: Embed CSS files into templates by ppodolsky · Pull Request #678 · n0-computer/iroh

ppodolsky · 2023-01-09T08:38:23Z

There are two changes:

Small bugfix for the bug I did in gateway code. Redirecting to index.html does not require trailing slash
Accessing files thought subdomain paths makes impossible to use paths like /style.css for loading resources. I mitigated it by embedding CSS into templates. Original files are left here intentionally for easier development in the future.

…iroh` commands (n0-computer#348) * docs: add full help text for `lookup`, `connect`, `get`, `p2p`, and `iroh` commands * move long descriptions into constants Co-authored-by: b5 <sparkle_pony_2000@qri.io>

We used to use the same config for the service and server (aka the binary). This is confusing when creating configs to use with e.g. iroh-one, iroh-embed or iroh-share because some fields are not used. This splits off the config structs to avoid this problem, services now have a Config and binaries a ServerConfig. This allows creating the services standalone without all the baggage a server needs. While this isn't many fields yet, this will get worse as we add more features (this is split off from another PR where this seemed useful).

This removes the use of mockall which is causing a lot of trouble with the cargo features intricacies it brings with it. A lot of the tooling struggles with these different versions of the structs which also behave differently in surprising ways. The tests affected by this will be converted into end-to-end tests as part of is now unused. This is possibly only temprorary and that might come back when the end-to-end tests are added.

rklaehn

So this removes the assets from ../assets/style.css and ../assets/icons.css and includes them in the dir_list and 404 page.

Not sure if this is an improvement. It simplifies the routes for sure, but now you have to "recompile" the css and icons to html whenever you want to do a change.

ppodolsky · 2023-01-09T12:57:47Z

So this removes the assets from ../assets/style.css and ../assets/icons.css and includes them in the dir_list and 404 page.

Not sure if this is an improvement. It simplifies the routes for sure, but now you have to "recompile" the css and icons to html whenever you want to do a change.

It is not an improvement but a required fix. There is a subdomain handler that accepts urls such as https://bafy<...>.ipfs.localhost:8080/style.css. This request is routed to bafy<...>/style.css, not to custom axum handler in gateway. So there is no way within subdomain handlers to request custom files because any file can be a child of Unixfs directory.

dignifiedquire · 2023-01-09T13:09:40Z

How does Kubo do this currently?

ppodolsky · 2023-01-09T13:14:38Z

Kubo embeds all assets.
I thought about putting assets to a separate subdomain but it would lead to all kinds of CORS issues on loading.

fabricedesre · 2023-01-09T16:29:21Z

Kubo embeds all assets. I thought about putting assets to a separate subdomain but it would lead to all kinds of CORS issues on loading.

In general css & images loads are not subject to SOP restrictions so you should not need CORS. But it should also be possible to serve them from roo_url/static/xxx and set the CORS headers on all of /static/

ppodolsky · 2023-01-09T16:58:00Z

You mean second-level domain by root_url? We need to embed JS snippet for detecting root url then, is it ok?

fabricedesre · 2023-01-09T17:05:55Z

I think the base url is part of the config, so you could use it to generate the css url without needing a script.

ppodolsky · 2023-01-09T18:25:41Z

@fabricedesre Thanks for idea, done. However there is still small regression: by default, public_url_base is empty and users will have to set it manually for development environment

They can be found in https://github.com/n0-computer/attic

ppodolsky · 2023-01-11T14:02:33Z

I've also fixed a bug here with rendering index.html if directory has it in the root.
Before, it merely pushed index.html to the end of path, without reloading of path_metadata and other attributes. It led to inconsistency and erratic behaviour. Now path_metadata is reloaded.

* feat: Add pub ctor to Directory * fix: reduce logging level * feat: Pretty printing for addrs * fix: clippy * pr fixes

) * fix(iroh-share): force close gossip task on finish/done * fmt * fix

ppodolsky · 2023-01-19T10:31:16Z

Let's review and merge?

ramfox · 2023-02-20T16:06:57Z

Hello! The code that was previously hosted in this repository has been moved to n0-computer/beetle. beetle is in maintenance mode, but will still accept PRs.

If you are still interested in getting your PR merged, please re-open your PR on n0-computer/beetle.

Check out our blog post for more info on our new direction for iroh: https://n0.computer/blog/a-new-direction-for-iroh/

b5 and others added 30 commits October 14, 2022 18:07

chore: add dev-install xtask (n0-computer#347)

5937924

reduce invalid stored connections

31cb29c

metrics: bitswap loop & poll ticks

a160805

feat: race a http gateway with p2p in iroh-one's content loader (n0-c…

40cb232

…omputer#338)

docs: add full help text for lookup, connect, get, p2p, and `…

b14a7a8

…iroh` commands (n0-computer#348) * docs: add full help text for `lookup`, `connect`, `get`, `p2p`, and `iroh` commands * move long descriptions into constants Co-authored-by: b5 <sparkle_pony_2000@qri.io>

allow for more dialing out by default

4570621

refactor message queue actor

0904280

try: trigger connects for non bitswap peers

a95d0f5

improve gc and stopping of message queue

56f1df9

fix client loop metric

381f934

track peers

09a5155

improve peer state tracking

71eaab3

only skip real dials when dialing is paused

671d178

fixup triggers

a82ade2

improve connection management

8191cb7

more counters and rely on disconnects for cleanup

0afefe5

connect with identify

16c40c9

misc fixes and debugging

8e3f831

refactor: lock free peer manager

733601d

remove client unused client counters

cd78bd3

serialize incoming message processing

ced8e05

log backpressure for network actions

00a55c6

more evil

4bdec19

more detailed message metrics

a8303df

more debugging

6841992

getting closer

6046da1

bigger buffers

e4b6beb

do not wait for worker to shutdown

85435a2

handle responses only on a best effort

2e4de89

improve message scheduling

6f51330

flub and others added 3 commits January 4, 2023 20:07

docs: rename the README of localops (n0-computer#676)

f4ba4cd

ppodolsky changed the title ~~Embed CSS files into templates~~ fix: Embed CSS files into templates Jan 9, 2023

rklaehn reviewed Jan 9, 2023

View reviewed changes

ppodolsky force-pushed the fix/gateway-path-and-css branch 2 times, most recently from f4d451f to 5c73ff7 Compare January 9, 2023 18:15

rklaehn and others added 5 commits January 10, 2023 17:01

chore: Update quic-rpc (n0-computer#681)

1402690

chore: remove unused test stores (n0-computer#682)

9960340

They can be found in https://github.com/n0-computer/attic

fix: Proper path when redirect to index.html

2e5d745

fix: Set base url for styles

2397535

fix: Process index.html correctly

c63d0b6

ppodolsky force-pushed the fix/gateway-path-and-css branch from a1f2f69 to c63d0b6 Compare January 11, 2023 14:00

ppodolsky and others added 4 commits January 11, 2023 22:18

fix: mall set of fixes for refining logs

7470fd1

* feat: Add pub ctor to Directory * fix: reduce logging level * feat: Pretty printing for addrs * fix: clippy * pr fixes

Merge branch 'main' into fix/gateway-path-and-css

7986d58

fix(iroh-share): force close gossip task on finish/done (n0-computer#690

1b63080

) * fix(iroh-share): force close gossip task on finish/done * fmt * fix

Merge branch 'main' into fix/gateway-path-and-css

6fb533e

dignifiedquire closed this Feb 20, 2023

dignifiedquire force-pushed the main branch from 6527ee4 to 3a3fc46 Compare February 20, 2023 15:47

ppodolsky mentioned this pull request Feb 23, 2023

Migrating PRs n0-computer/beetle#292

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: Embed CSS files into templates#678

fix: Embed CSS files into templates#678
ppodolsky wants to merge 708 commits into
n0-computer:mainfrom
izihawa:fix/gateway-path-and-css

ppodolsky commented Jan 9, 2023

Uh oh!

rklaehn left a comment

Uh oh!

ppodolsky commented Jan 9, 2023 •

edited

Loading

Uh oh!

dignifiedquire commented Jan 9, 2023

Uh oh!

ppodolsky commented Jan 9, 2023 •

edited

Loading

Uh oh!

fabricedesre commented Jan 9, 2023

Uh oh!

ppodolsky commented Jan 9, 2023

Uh oh!

fabricedesre commented Jan 9, 2023

Uh oh!

ppodolsky commented Jan 9, 2023

Uh oh!

ppodolsky commented Jan 11, 2023 •

edited

Loading

Uh oh!

ppodolsky commented Jan 19, 2023

Uh oh!

ramfox commented Feb 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

Uh oh!

Conversation

ppodolsky commented Jan 9, 2023

Uh oh!

rklaehn left a comment

Choose a reason for hiding this comment

Uh oh!

ppodolsky commented Jan 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dignifiedquire commented Jan 9, 2023

Uh oh!

ppodolsky commented Jan 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fabricedesre commented Jan 9, 2023

Uh oh!

ppodolsky commented Jan 9, 2023

Uh oh!

fabricedesre commented Jan 9, 2023

Uh oh!

ppodolsky commented Jan 9, 2023

Uh oh!

ppodolsky commented Jan 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ppodolsky commented Jan 19, 2023

Uh oh!

ramfox commented Feb 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

14 participants

ppodolsky commented Jan 9, 2023 •

edited

Loading

ppodolsky commented Jan 9, 2023 •

edited

Loading

ppodolsky commented Jan 11, 2023 •

edited

Loading