Skip to content

Use deps.edn #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.

Sign up for GitHub

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

Open
branch14 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use deps.edn #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
baf079f
fix typo to make it work for jvm
branch14 Aug 7, 2022
308fc99
remove initial newline
branch14 Aug 7, 2022
0a248c5
use deps.edn
branch14 Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{:paths ["src" "resources"]
:deps {org.clojure/clojure {:mvn/version "1.8.0"}
selfsame/pdfn {:mvn/version "1.0.3"}}}
7 changes: 3 additions & 4 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
:url "http://github.com/selfsame/tenlet"
:license {:name "The MIT License (MIT)"
:url "https://github.com/selfsame/pdfn/blob/master/LICENSE"}
:dependencies [
[org.clojure/clojure "1.8.0"]
[selfsame/pdfn "1.0.3"]]
;; use deps from deps.edn
:plugins [[lein-tools-deps "0.4.5"]]
:deploy-repositories [
["clojars" {
:sign-releases false}]])
:sign-releases false}]])
62 changes: 31 additions & 31 deletions src/tenlet/server.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(ns tenlet.server
(:require
[tenlet.decode :as decode])
#?(:clj (import
#?(:clj (:import
[java.net ServerSocket Socket SocketException]
[java.io InputStreamReader OutputStreamWriter BufferedWriter]
[java.nio.charset Charset])))
Expand Down Expand Up @@ -36,7 +36,7 @@
ITelnet
(connect [o c]
(swap! opts update :clients conj c))
(write [o s]
(write [o s]
(dorun (map #(write % s) (:clients @opts))))
(close [o]
(dorun (map close (:clients @opts)))
Expand All @@ -45,25 +45,25 @@
(deftype Client [socket ow opts]
ITelnet
(connect [o] (call @opts :connect o))
#?(:clj
#?(:clj
(write [o s]
(try
(.write ow (str s))
(try
(.write ow (str s))
(.flush ow)
(catch Exception e)))
:cljs
(write [o s]
(try
(write [o s]
(try
(.write socket (str s) "latin1")
(catch :default e))))
(input [o c]
(input [o c]
(debug [c (int c)])
(let [code (decode/op (or (::code @opts) {}) c)
out (:out code)
-line (:line code)
resize (:resize code)]
(debug :code code)
(when resize
(when resize
(call @opts :resize o resize)
(swap! opts assoc ::code (dissoc code :resize)))
(when out
Expand All @@ -75,33 +75,33 @@
(if-not (or out -line resize)
(swap! opts assoc ::code code))))
(line [o s] (call @opts :line o s))
(close [o]
(swap! (.-opts (::server @opts)) update :clients
(close [o]
(swap! (.-opts (::server @opts)) update :clients
#(-> % set (disj o) seq))
#?(:clj
(try
#?(:clj
(try
(.close socket)
(call @opts :close o)
(catch Exception e))
:cljs
(try
:cljs
(try
(.destroy socket)
(catch :default e)))))

(defn- new-connection [S c opts]
#?(:clj
(on-thread
(fn []
(let [i (. c (getInputStream))
#?(:clj
(on-thread
(fn []
(let [i (. c (getInputStream))
o (. c (getOutputStream))
ir (new InputStreamReader i iso-latin-1)
ow (new OutputStreamWriter o iso-latin-1)
C (Client. c ow (atom opts))]
(connect S C)
(connect C)
((fn []
((fn []
(when-not (.isClosed c)
(try
(try
(input C (char (.read ir)))
(catch java.lang.IllegalArgumentException e
(close C))
Expand All @@ -113,20 +113,20 @@
(connect S C)
(connect C)
(.on c "data" (fn [d] (dorun (map #(input C %) (str d)))))
(.on c "close"
(fn [e]
(.on c "close"
(fn [e]
(close C)
(call @(.-opts C) :close C))))))

(defn create-server [port opts]
#?(:clj
#?(:clj
(let [s (new ServerSocket port)
S (Server. s (atom {}))
opts (assoc opts ::server S)]
(on-thread
(fn []
(on-thread
(fn []
(when-not (.isClosed s)
(try
(try
(let [c (.accept s)]
(new-connection S c opts))
(catch SocketException e
Expand All @@ -136,8 +136,8 @@
(let [s ((.-createServer net))
S (Server. s (atom {}))
opts (assoc opts ::server S)]
(.listen s port)
(.on s "connection" (fn [c]
(.listen s port)
(.on s "connection" (fn [c]
(new-connection S c opts)))
(.on s "close"
(fn [e] (call opts :shutdown S))) S)))
(.on s "close"
(fn [e] (call opts :shutdown S))) S)))