Initial IPFS support. #2589
Initial IPFS support. #2589
Conversation
source/browser.lisp
Outdated
| @@ -131,9 +131,9 @@ issued by Control+<button1> in a new window.") | |||
| (downloads | |||
| :documentation "List of downloads. Used for rendering by the download manager.") | |||
| (startup-timestamp | |||
| (local-time:now) | |||
| (time:now) | |||
| (:toggler-command-p nil)) | ||
|
|
||
| (defmethod daemon-running-p ((mode ipfs-mode)) ; Unused? Useful for debugging though. | ||
| (= 0 |
| (:a url) | ||
| " to " | ||
| (:a new-url)))))) | ||
| (buffer-load new-url :buffer (buffer mode)) |
There was a problem hiding this comment.
I usually make it in a separate thread (run-thread) with a slight timeout ((sleep 0.5)) so that the message is visible.
|
It works! :D |
|
Note: For now my forks of Drakma and cl-ipfs-api2 are needed. There are a bunch of fixes I'm working on with upstream: |
|
What's the status here? |
|
It is ready to merge, just want to see some changes in upstream libraries. |
|
Indeed. Plus please review the code, I believe no one has done it. |
|
IPNS support can be added later. |
source/mode/ipfs.lisp
Outdated
| Return immediately if already started." | ||
| (sera:synchronized ((daemon mode)) | ||
| (when (and (not (daemon mode)) | ||
| (sera:resolve-executable (program mode))) |
There was a problem hiding this comment.
Could be a premature optimization, but: the pattern of storing executable names and resolving them appears several times in our code. Could this be worth of nfiles?
There was a problem hiding this comment.
Good point! See atlas-engineer/nfiles#8
source/mode/ipfs.lisp
Outdated
| (sera:synchronized ((daemon mode)) | ||
| (when (and (not (daemon mode)) | ||
| (sera:resolve-executable (program mode))) | ||
| (let ((p-i (uiop:launch-program (append (list (program mode) "daemon") |
There was a problem hiding this comment.
Maybe use cons to avoid this (append (list ...) ...)?
It's not exactly pretty and SICL style guide discourages using cons for anything but creating conses, though.
source/mode/ipfs.lisp
Outdated
| (bt:with-timeout ((daemon-timeout mode)) | ||
| (loop | ||
| (unless (uiop:process-alive-p p-i) | ||
| (error "Already started?")) |
There was a problem hiding this comment.
Maybe a dedicated error type?
There was a problem hiding this comment.
Yup, this part is ugly, but they are so many edge cases and it's not too clear how we want to behave... Need to think this through.
source/mode/ipfs.lisp
Outdated
| (progn | ||
| (bt:with-timeout ((daemon-timeout mode)) | ||
| (loop | ||
| (unless (uiop:process-alive-p p-i) |
There was a problem hiding this comment.
Maybe use loop's when and else keywords? It reduces nesting and makes things look more coherent.
Example rewrite:
(loop
when (and (uiop:process-alive-p p-i)
(string= "Daemon is ready" (read-line (uiop:process-info-output p-i))))
do (return 'ready)
else
unless (uiop:process-alive-p p-i)
do (error "Already started?"))| (defun ipfs-request-p (request-data) | ||
| (and (toplevel-p request-data) | ||
| (or (str:s-member '("ipfs" "ipns") (quri:uri-scheme (url request-data))) | ||
| ;; TODO: It's in the response header. |
There was a problem hiding this comment.
Request headers are now inspectable on master with http-headers. Response headers, though...
There was a problem hiding this comment.
Could you add support for response headers in cl-webkit?
There was a problem hiding this comment.
It's already there, actually. And I've added it to request-data in 5aec043.
There was a problem hiding this comment.
Fantastic, thanks a lot!
| (let ((cid (quri:uri-domain url))) | ||
| (quri:copy-uri url | ||
| :scheme "https" | ||
| :port (quri.port:scheme-default-port "https") |
There was a problem hiding this comment.
This one should be addressed in quri:copy-uri, shouldn't it? I mean, port mismatch is too easy to miss, so we need to guard against it somehow.
| (let ((mime (or (mimes:mime (pathname (quri:uri-path url))) | ||
| "text/html;charset=utf8"))) | ||
| ;; WARNING: Need byte-vector here because strings CL encoding may confuse the browser. | ||
| (values (flex:string-to-octets (ipfs:cat (nyxt::schemeless-url url))) ; TODO: Export? |
There was a problem hiding this comment.
Export, like lots of other URL utilities! Maybe even contribute it to QURI as some quri/utilities package? ( ͡° ͜ʖ ͡°)
source/mode/ipfs.lisp
Outdated
| (defmethod add ((mode ipfs-mode) path) ; TODO: Report error when daemon is not running. | ||
| "Add PATH to IPFS and the MFS so that it's listed by 'ipfs files ls'. | ||
| See the help message of 'ipfs files'." | ||
| (when (daemon-running-p mode) |
There was a problem hiding this comment.
Maybe move this chacking into some accessor? Seems to be suitable for a data-model-based restriction...
There was a problem hiding this comment.
daemon maybe? We cannot use it until it's started anyway...
| (progn | ||
| (mapc (compose #'ipfs:files-rm #'ipfs-path) files) | ||
| (echo "Deleted IPFS files: ~a" (mapcar #'name files))) | ||
| (echo "Could not start IPFS daemon required to delete files.")))) |
There was a problem hiding this comment.
This thing appears more than once too. Maybe abstract it to an accessor too?
|
What's the status here? CC @jmercouris. |
|
We should probably move this to a separate WIP-extension repository. |
|
Please reopen when ready. |
You should have a local copy of the branch so please backup the work. Deleting the branch on the remote. |
Description
Add support for IPFS web page browsing. To test, just load
ipfs://bafybeiemxf5abjwjbikoz4mc3a3dla6ual3jsgpdr4cjr3oz3evfyavhwq/wiki/Vincent_van_Gogh.html.Partially fixes #1064.
To do:
Add support for adding / pinning files and directories.
For directory support, upstream fixes are needed (my forks have them).
Mostly done, needs testing.
Similar to what https://github.com/ipfs/ipfs-companion does. We need to persist the list of added / pinned files.
Add IPNS support.
Parse response headers.
Discussion
Daemon management is not very robust for now, needs to be improved. Suggestions welcome.
Checklist:
Everything in this checklist is required for each PR. Please do not approve a PR that does not have all of these items.
cd /path/to/nyxt/checkout git submodule add https://gitlab.common-lisp.net/nyxt/py-configparser _build/py-configparser:documentations written in the aforementioned style. (It's OK to skip the docstring for really trivial parts.)changelog.lispwith my changes if it's anything user-facing (new features, important bug fix, compatibility breakage).migration.lispentry for all compatibility-breaking changes.