-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Repl API #10
Open
supermario
wants to merge
35
commits into
lamdera-next
Choose a base branch
from
elm-notebook-repl
base: lamdera-next
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+668
−1
Open
Repl API #10
Changes from 33 commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
d8ae362
llvm@13 fixes local M1 build, try on buildserver
supermario 15a7069
Patch in repl API functionality for elm-notebook exploration
supermario c097d3e
change alllowed origins to http://localhost:8007 only
jxxcarlson b2a2e56
Exclude Jim's experimental files
jxxcarlson e0d55f0
Change Test.hs so as to talk to elm-notebook
jxxcarlson 7c8f310
Add debug statements
jxxcarlson 8290dee
Added: '_ -> error $ "unreachable:" ++ show e' to function 'watch'. …
jxxcarlson fa3cfe3
I am committing this, but I can't see what has changed.
jxxcarlson 441f1ce
Add elm-community/list-extra to outlines/repl/elm.json
jxxcarlson a27d4bb
Remove duplicate elm.json entries
jxxcarlson d591f19
Add module Endpoint.Package from extra/, (2) Chane Develop (in termin…
jxxcarlson d1d0cd9
Fix path for writing the elm.json file
jxxcarlson 92c1c80
Fix stray space in word "dependencies"
jxxcarlson 1e775be
Add type ElmPackage and decoder for it.
jxxcarlson 9e57721
Return outlines/repl/elm.json to its original state
jxxcarlson c9af64d
Introduced a deterministic delay for executing Notebook.Package.nowSe…
jxxcarlson 87727e6
When packages are added to elm.json, report to the client how many we…
jxxcarlson e544b92
Draft 1
jxxcarlson 48def3e
Draft 2
jxxcarlson 3391d5f
Fix JSON output
jxxcarlson b727101
Implement dynamic loading of packages submitted to the Elm compiler.
jxxcarlson 8046918
Return outlines/repl/elm.json to its original state
jxxcarlson 3935f9d
fix but in properly computng evalstate before compilation.
jxxcarlson effbe40
Add debug code to Endpoint/Repl.hs
jxxcarlson 8a8a994
Add 'compiler.iml' to .gitignore
jxxcarlson bdf9ffc
Return to previous working state
jxxcarlson 7d4f078
add back extra/Artifacts.hs
jxxcarlson be46c86
Restore elm.json to original state
jxxcarlson ac87fe8
Renamed: extra/Artifacts.hs -> extra/ReplArtifacts.hs
jxxcarlson dc1fbe5
Add comment explaining the purpose of module Package
jxxcarlson b422951
Add comments to explain the purpose and operation of extra/Endpoint/P…
jxxcarlson 14b46e6
More comments
jxxcarlson 20bb71e
Comments for ReplArtifacts
jxxcarlson 9173633
Add clause 'Types.OnConnected sessionId clientId' to Backend.update:
jxxcarlson 1505d77
Merge branch 'lamdera-next' into elm-notebook-repl
supermario File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
:set -fbyte-code | ||
:set -fobject-code | ||
:set -fwarn-name-shadowing | ||
:def rr const $ return $ unlines ["Ext.Common.killTrackedThreads",":r","Test.target"] | ||
:def rr const $ return $ unlines ["Ext.Common.killTrackedThreads",":r","Test.target"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,3 +17,7 @@ extra/.cache | |
# @TESTS | ||
elm-home | ||
|
||
# Jim | ||
experimental/ | ||
.vscode/ | ||
compiler.iml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
{-# OPTIONS_GHC -Wall #-} | ||
module Cors | ||
( allow | ||
) | ||
where | ||
|
||
|
||
import qualified Data.HashSet as HashSet | ||
import Network.URI (parseURI) | ||
import Snap.Core (Snap, Method, method) | ||
import Snap.Util.CORS (CORSOptions(..), HashableMethod(..), OriginList(Origins), applyCORS, mkOriginSet) | ||
|
||
|
||
|
||
-- ALLOW | ||
|
||
|
||
allow :: Method -> [String] -> Snap () -> Snap () | ||
allow method_ origins snap = | ||
applyCORS (toOptions method_ origins) $ method method_ $ | ||
snap | ||
|
||
|
||
|
||
-- TO OPTIONS | ||
|
||
|
||
toOptions :: (Monad m) => Method -> [String] -> CORSOptions m | ||
toOptions method_ origins = | ||
let | ||
allowedOrigins = toOriginList origins | ||
allowedMethods = HashSet.singleton (HashableMethod method_) | ||
in | ||
CORSOptions | ||
{ corsAllowOrigin = return allowedOrigins | ||
, corsAllowCredentials = return True | ||
, corsExposeHeaders = return HashSet.empty | ||
, corsAllowedMethods = return allowedMethods | ||
, corsAllowedHeaders = return | ||
} | ||
|
||
|
||
toOriginList :: [String] -> OriginList | ||
toOriginList origins = | ||
Origins $ mkOriginSet $ | ||
case traverse parseURI origins of | ||
Just uris -> uris | ||
Nothing -> error "invalid entry given to toOriginList list" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,126 @@ | ||
{-# LANGUAGE OverloadedStrings #-} | ||
{-# LANGUAGE DeriveGeneric #-} | ||
|
||
module Endpoint.Package (handlePost, reportOnInstalledPackages) where | ||
|
||
{- | ||
1. | ||
|
||
This endpoint will respond to POST requests to "https://repl.lamdera.com/packageList" | ||
with a JSON body of the form: | ||
[ | ||
{ "name": "elm/core", "version": "1.0.5" }, | ||
{ "name": "elm/html", "version": "1.0.0" } | ||
] | ||
It will write an elm.json file to the repl directory, and then reload the repl. | ||
This response is mediate by function `handlePost` below. | ||
|
||
2. | ||
|
||
In additon, this endpoint will respond to GET requests to "https://repl.lamdera.com/reportOnInstalledPackages" | ||
with a JSON body of the form: | ||
[ | ||
{ "name": "elm/core", "version": "1.0.5" }, | ||
{ "name": "elm/html", "version": "1.0.0" } | ||
] | ||
The json body reports on the packages that are currently installed in the repl. | ||
This response is mediated by function `reportOnInstalledPackages` below. | ||
|
||
NOTE. handlePost and reportOnInstalledPackages | ||
are referenced in the Snap webserver at Develop.runWithRoot | ||
via the code fragments | ||
|
||
SnapCore.path "packageList" $ Package.handlePost artifactRef) | ||
SnapCore.path "reportOnInstalledPackages" $ Package.reportOnInstalledPackages) | ||
-} | ||
|
||
|
||
import GHC.Generics (Generic) | ||
import Snap.Core | ||
import Snap.Http.Server | ||
import Data.Aeson (FromJSON, eitherDecode, encode, ToJSON, toJSON, object, (.=)) | ||
import Data.ByteString (ByteString) | ||
import Data.ByteString.Lazy (toStrict) | ||
import qualified Data.ByteString.Lazy.Char8 as BL | ||
import qualified Data.ByteString.Char8 as ByteString | ||
import GHC.Generics | ||
import System.IO (writeFile) | ||
import Control.Monad.IO.Class (liftIO) | ||
import qualified Data.Map as Map | ||
--- | ||
import Snap.Util.FileServe | ||
import qualified Data.ByteString.Lazy as LBS | ||
import qualified Data.HashMap.Strict as HM | ||
import Data.Text.Encoding (decodeUtf8) | ||
import Snap.Http.Server.Config (setPort, defaultConfig) | ||
import qualified ReplArtifacts | ||
import Data.IORef | ||
|
||
|
||
data Package = Package { name :: String, version :: String } deriving (Show, Generic) | ||
|
||
instance FromJSON Package | ||
instance ToJSON Package | ||
|
||
|
||
type PackageList = [Package] | ||
|
||
writeElmJson :: PackageList -> IO () | ||
writeElmJson pkgs = do | ||
let directDeps = Map.fromList $ ("elm/core", "1.0.5"):[(name p, version p) | p <- pkgs] | ||
elmJson = object [ | ||
"type" .= ("application" :: String), | ||
"source-directories" .= (["../../repl-src"] :: [String]), | ||
"elm-version" .= ("0.19.1" :: String), | ||
"dependencies" .= object [ | ||
"direct" .= directDeps, | ||
"indirect" .= object [ | ||
"elm/json" .= ("1.1.3" :: String) | ||
] | ||
], | ||
"test-dependencies" .= object [ | ||
"direct" .= (Map.empty :: Map.Map String String), | ||
"indirect" .= (Map.empty :: Map.Map String String) | ||
] | ||
] | ||
writeFile "./outlines/repl/elm.json" ( BL.unpack $ encode elmJson) | ||
|
||
|
||
handlePost :: IORef ReplArtifacts.Artifacts -> Snap () | ||
handlePost artifactRef = do | ||
body <- readRequestBody 10000 | ||
let maybePackageList = eitherDecode body :: Either String PackageList | ||
case maybePackageList of | ||
Left err -> writeBS $ "Error: Could not decode JSON: " <> (ByteString.pack err) | ||
Right packages -> do | ||
liftIO $ writeElmJson packages | ||
let message = ByteString.pack $ "Packages added: " ++ (show $ length packages) | ||
writeBS message | ||
newArtifacts <- liftIO ReplArtifacts.loadRepl | ||
liftIO $ writeIORef artifactRef newArtifacts | ||
|
||
|
||
|
||
data Dependencies = Dependencies { | ||
direct :: HM.HashMap String String | ||
} deriving (Generic, Show) | ||
|
||
data TopLevel = TopLevel { | ||
dependencies :: Dependencies | ||
} deriving (Generic, Show) | ||
|
||
instance FromJSON TopLevel | ||
|
||
instance FromJSON Dependencies | ||
|
||
--- curl -X POST -H "Content-Length: 0" http://localhost:8000/reportOnInstalledPackages | ||
|
||
reportOnInstalledPackages :: Snap () | ||
reportOnInstalledPackages = do | ||
jsonData <- liftIO $ LBS.readFile "./outlines/repl/elm.json" | ||
case eitherDecode jsonData :: Either String TopLevel of | ||
Left err -> writeBS $ "Failed to parse JSON: " <> (LBS.toStrict jsonData) | ||
Right topLevel -> do | ||
let directDeps = HM.toList $ direct $ dependencies topLevel | ||
let outputList = map (\(name, version) -> object ["name" .= name, "version" .= version]) directDeps | ||
writeBS . LBS.toStrict . encode $ outputList |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For testing the endpoint that returns a list of installed packages, for example:
curl -X POST -H "Content-Length: 0" http://localhost:8000/reportOnInstalledPackages
[{"name":"elm/parser","version":"1.1.0"},{"name":"elm/core","version":"1.0.5"}]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should I not add comments explaining the purpose of this file?