master..15c0410 · airlock

LICENSEdeleted−7

@@ -1,7 +0,0 @@

2−

3−Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

4−

5−The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

6−

7−THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md−7

@@ -8,15 +8,8 @@

88

99[![DEMO](https://img.youtube.com/vi/tynCzifvIzE/0.jpg)](https://www.youtube.com/watch?v=tynCzifvIzE)

1010

11−

12−## Getting started

13−

14−The easiest way of using this library is by using the [airlock template](https://github.com/ilyakooo0/airlock-template).

15−

1611### FFI

1712

18−This is for setting up this library from scratch.

19−

2013Urbit subscriptions require [server-side event (SSE)](https://developer.mozilla.org/en-US/docs/Web/API/Server-sent_events).

2114Unfortunately, Elm does not provide a native implementation.

2215This means that we will need to use [JS FFI (aka ports)](https://guide.elm-lang.org/interop/ports.html).

elm.json+2−11

@@ -3,18 +3,9 @@

33 "name": "ilyakooo0/airlock",

44 "summary": "Urbit airlock",

55 "license": "MIT",

6− "version": "1.1.1",

6+ "version": "1.0.0",

77 "exposed-modules": [

8− "Ur",

9− "Ur.Cmd",

10− "Ur.Sub",

11− "Ur.Constructor",

12− "Ur.Deconstructor",

13− "Ur.Phonemic",

14− "Ur.Da",

15− "Ur.Uw",

16− "Ur.Run",

17− "Ur.Types"

8+ "Ur", "Ur.Cmd", "Ur.Sub", "Ur.Constructor", "Ur.Deconstructor", "Ur.Phonemic", "Ur.Da", "Ur.Uw", "Ur.Run", "Ur.Types"

189 ],

1910 "elm-version": "0.19.0 <= v < 0.20.0",

2011 "dependencies": {

src/BitWriter.elm+5−5

@@ -14,17 +14,17 @@ import Bytes.Encode as BE

1414

1515empty : BitWriter

1616empty =

17− BitWriter { running = Nothing, collected = [], offset = 0 }

17+ BitWriter { running = Nothing, collected = BE.sequence [], offset = 0 }

1818

1919

2020run : BitWriter -> Bytes

2121run (BitWriter { running, collected }) =

2222 case running of

2323 Nothing ->

24− BE.encode (collected |> List.reverse |> BE.sequence)

24+ BE.encode collected

2525

2626 Just { value } ->

27− BE.sequence (BE.unsignedInt8 value :: collected |> List.reverse) |> BE.encode

27+ BE.sequence [ collected, BE.unsignedInt8 value ] |> BE.encode

2828

2929

3030type BitWriter

@@ -35,7 +35,7 @@ type BitWriter

3535 , length : Int

3636 }

3737 , offset : Int

38− , collected : List BE.Encoder

38+ , collected : BE.Encoder

3939 }

4040

4141

@@ -68,7 +68,7 @@ bit b (BitWriter { running, collected, offset }) =

6868 if length == 7 then

6969 BitWriter

7070 { running = Nothing

71− , collected = BE.unsignedInt8 newValue :: collected

71+ , collected = BE.sequence [ collected, BE.unsignedInt8 newValue ]

7272 , offset = newOffset

7373 }

7474

src/Ur/Deconstructor.elm+3−46

@@ -6,7 +6,7 @@ module Ur.Deconstructor exposing

66 , int, signedInt, bigint

77 , float32, float64

88 , cord, tape

9− , bytes, sig, ignore, tar, lazy, debug

9+ , bytes, sig, ignore, tar, lazy

1010 )

1111

1212{-| This module provides an API to deconstruct `Noun`s into arbitrary Elm data structures.

@@ -55,7 +55,7 @@ You would parse a `[%edit @ cord]` like this:

5555

5656# Miscellaneous

5757

58−@docs bytes, sig, ignore, tar, lazy, debug

58+@docs bytes, sig, ignore, tar, lazy

5959

6060-}

6161

@@ -66,7 +66,7 @@ import Bytes exposing (Bytes, Endianness(..))

6666import Bytes.Decode as BD

6767import Bytes.Encode as BE

6868import Bytes.Extra

69−import Ur.Jam exposing (cue, isSig)

69+import Ur.Jam exposing (cue)

7070import Ur.Types exposing (..)

7171

7272

@@ -113,8 +113,6 @@ const f value noun =

113113 Nothing

114114

115115

116−{-| Extracts a `BigInt`.

117−-}

118116bigint : Deconstructor BigInt

119117bigint x =

120118 case x of

@@ -274,8 +272,6 @@ lazy f noun =

274272 f () noun

275273

276274

277−{-| Maps over the result of the deconstructor.

278−-}

279275map : (a -> b) -> Deconstructor a -> Deconstructor b

280276map g f noun =

281277 f noun |> Maybe.map g

@@ -337,42 +333,3 @@ Always succeeds.

337333tar : Deconstructor Noun

338334tar =

339335 Just

340−

341−

342−{-| Debug a deconstructor.

343−If the deconstructor from the second argument fails then the failed nock will be printed to the console.

344−-}

345−debug : (String -> String) -> Deconstructor a -> Deconstructor a

346−debug log f noun =

347− case f noun of

348− Just x ->

349− Just x

350−

351− Nothing ->

352− let

353− _ =

354− log (prettyNoun noun)

355− in

356− Nothing

357−

358−

359−prettyNoun : Noun -> String

360−prettyNoun noun =

361− let

362− go isRhs n =

363− case n of

364− Atom a ->

365− if isSig a then

366− "~"

367−

368− else

369− "@"

370−

371− Cell ( lhs, rhs ) ->

372− if isRhs then

373− go False lhs ++ " " ++ go True rhs

374−

375− else

376− "[" ++ go False lhs ++ " " ++ go True rhs ++ "]"

377− in

378− go False noun

src/Ur/Requests.elm+1−1

@@ -98,7 +98,7 @@ toNoun eventId req =

9898 C.cell (C.cord app) (C.listOf C.cord path)

9999

100100 Unsubscribe subId ->

101− C.cell (C.cord "unsubscribe") <|

101+ C.cell (C.cord "usubscribe") <|

102102 C.cell (C.int eventId) (C.int subId)

103103

104104 Poke { ship, agent, mark, noun } ->

src/Ur/Run.elm+3−3

@@ -178,7 +178,7 @@ update inp msg model =

178178 processUrSubs

179179 model.eventId

180180 model.subscriptions

181− (inp.urbitSubscriptions appModel |> (\(Ur.Sub.Internal.Sub x) -> x))

181+ (inp.urbitSubscriptions model.app |> (\(Ur.Sub.Internal.Sub x) -> x))

182182

183183 ( eventId_, cmds, urReqs ) =

184184 processCmd subsResult.eventId appCmds

@@ -282,7 +282,7 @@ update inp msg model =

282282 ( model, Cmd.none )

283283

284284 else

285− case D.run (D.cell D.ignore (D.cell D.ignore deconstructor) |> D.map (\( (), ( (), m ) ) -> m)) rest of

285+ case D.run (D.cell D.ignore (D.cell D.ignore deconstructor) |> D.map (\((), ((), m)) -> m)) rest of

286286 Just subMsg ->

287287 ( model_, pureCmd (AppMsg subMsg) )

288288

@@ -313,7 +313,7 @@ update inp msg model =

313313 NeedsActivation ->

314314 let

315315 ( eventId, reqs ) =

316− [ Poke { ship = "", agent = "hood", mark = "helm-hi", noun = C.cord "Opening airlock!" } ]

316+ [ Poke { ship = "~zod", agent = "hood", mark = "helm-hi", noun = C.cord "Opening airlock!" } ]

317317 |> tag model.eventId

318318 in

319319 ( { model | eventId = eventId }

src/Ur/Sub.elm+5−2

@@ -1,8 +1,11 @@

1−module Ur.Sub exposing (Sub, subscribe, none, batch, sink)

1+module Ur.Sub exposing

2+ ( Sub, subscribe, none, batch

3+ , sink

4+ )

25

36{-| This module is conceptually similar to `Platform.Sub`, but allows you to subscribe to Urbit channels.

47

5−@docs Sub, subscribe, none, batch, sink

8+@docs Sub, subscribe, none, batch

69

710-}

811

src/Ur/Uw.elm+7−7

@@ -29,24 +29,24 @@ decode string =

2929 -- 0w

3030 |> List.drop 2

3131

32− go : List Char -> List Int -> BW.BitWriter -> BW.BitWriter

33− go cs append writer =

32+ go : List Char -> BW.BitWriter -> BW.BitWriter

33+ go cs writer =

3434 case cs of

3535 [] ->

36− BW.bits append writer

36+ writer

3737

3838 '.' :: rest ->

39− go rest append writer

39+ go rest writer

4040

4141 c :: rest ->

4242 case Dict.get c charToBits of

4343 Just bits ->

44− go rest (bits ++ append) writer

44+ go rest writer |> BW.bits bits

4545

4646 Nothing ->

47− go rest [] writer

47+ go rest writer

4848 in

49− BW.run (go chars [] BW.empty)

49+ BW.run (go chars BW.empty)

5050

5151

5252{-| -}