From e7f2ff748df8ed153bf167e28e46a572a3cbab7a Mon Sep 17 00:00:00 2001
From: "Rodrigo E. Merino" <github@rodronet.com.ar>
Date: Sun, 28 Nov 2021 20:04:46 -0300
Subject: [PATCH 1/6] Heroku deployment config

---
 bin/compile | 29 +++++++++++++++++++++++++++++
 bin/detect  |  7 +++++++
 bin/release |  5 +++++
 3 files changed, 41 insertions(+)
 create mode 100644 bin/compile
 create mode 100644 bin/detect
 create mode 100644 bin/release

diff --git a/bin/compile b/bin/compile
new file mode 100644
index 0000000..d6450ca
--- /dev/null
+++ b/bin/compile
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# bin/compile <build-dir> <cache-dir> <env-dir>
+
+# used for inline heroku buildpack
+
+BUILD_DIR=${1:-}
+CACHE_DIR=${2:-}
+ENV_DIR=${3:-}
+
+PROJECT_PATH=controller/src/main/python
+
+echo "-----> My Subdir buildpack: path is $PROJECT_PATH"
+echo "       creating cache: $CACHE_DIR"
+mkdir -p $CACHE_DIR
+TMP_DIR=`mktemp -d $CACHE_DIR/subdirXXXXX`
+echo "       created tmp dir: $TMP_DIR"
+
+echo "       moving working dir: $PROJECT_PATH to $TMP_DIR"
+cp -R $BUILD_DIR/$PROJECT_PATH/. $TMP_DIR/
+
+echo "       cleaning build dir $BUILD_DIR"
+rm -rf $BUILD_DIR
+echo "       recreating $BUILD_DIR"
+mkdir -p $BUILD_DIR
+echo "       copying work dir from cache $TMP_DIR to build dir $BUILD_DIR"
+cp -R $TMP_DIR/. $BUILD_DIR/
+echo "       cleaning tmp dir $TMP_DIR"
+rm -rf $TMP_DIR
+exit 0
diff --git a/bin/detect b/bin/detect
new file mode 100644
index 0000000..2987d54
--- /dev/null
+++ b/bin/detect
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# bin/detect <build-dir>
+
+# used for inline heroku buildpack
+
+echo "My Subdir buildpack"
+exit 0
diff --git a/bin/release b/bin/release
new file mode 100644
index 0000000..47640ef
--- /dev/null
+++ b/bin/release
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+# used for inline heroku buildpack
+
+echo "--- {}"

From a9c146d5454c98868194156d1927adec9fa1dbcc Mon Sep 17 00:00:00 2001
From: "Rodrigo E. Merino" <github@rodronet.com.ar>
Date: Sun, 28 Nov 2021 20:07:07 -0300
Subject: [PATCH 2/6] Heroku deployment config: execute permissions

---
 bin/compile | 0
 bin/detect  | 0
 bin/release | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 bin/compile
 mode change 100644 => 100755 bin/detect
 mode change 100644 => 100755 bin/release

diff --git a/bin/compile b/bin/compile
old mode 100644
new mode 100755
diff --git a/bin/detect b/bin/detect
old mode 100644
new mode 100755
diff --git a/bin/release b/bin/release
old mode 100644
new mode 100755

From 4e307a212e21f2fba97bf4ab53a7a34f5638a1f3 Mon Sep 17 00:00:00 2001
From: "Rodrigo E. Merino" <github@rodronet.com.ar>
Date: Sun, 28 Nov 2021 20:13:26 -0300
Subject: [PATCH 3/6] Point ws clients to heroku app

---
 controller/src/main/www/camera_joystick.html | 2 +-
 projection/src/main/python/eye.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/controller/src/main/www/camera_joystick.html b/controller/src/main/www/camera_joystick.html
index 20515c4..f01ff10 100644
--- a/controller/src/main/www/camera_joystick.html
+++ b/controller/src/main/www/camera_joystick.html
@@ -19,7 +19,7 @@ <h1 style="text-align:center; display: none;">
     </p>
     <canvas id="canvas" name="game"></canvas>
     <script>
-        var connection = new WebSocket('ws://' + "localhost" + ':8000/');
+        var connection = new WebSocket('ws://' + "cara-bot.herokuapp.com" + ':8000/');
         connection.onopen = function () {
             connection.send('Connect ' + new Date());
         };
diff --git a/projection/src/main/python/eye.py b/projection/src/main/python/eye.py
index 5a0179a..096175e 100644
--- a/projection/src/main/python/eye.py
+++ b/projection/src/main/python/eye.py
@@ -79,7 +79,7 @@ def run(*args):
 
 if __name__ == "__main__":
 #    websocket.enableTrace(True)
-    ws = websocket.WebSocketApp("ws://192.168.66.137:8000/",
+    ws = websocket.WebSocketApp("ws://cara-bot.herokuapp.com:8000/",
 #    ws = websocket.WebSocketApp("ws://echo.websocket.org/",
                               on_open=on_open,
                               on_message=on_message,

From ae74ea7f7f80b27ea841d052e3c324dafe0027dd Mon Sep 17 00:00:00 2001
From: "Rodrigo E. Merino" <github@rodronet.com.ar>
Date: Sun, 28 Nov 2021 22:07:37 -0300
Subject: [PATCH 4/6] dependencies + porf from env

---
 controller/src/main/python/requirements.txt | 1 +
 controller/src/main/python/runtime.txt      | 1 +
 controller/src/main/python/server.py        | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 controller/src/main/python/requirements.txt
 create mode 100644 controller/src/main/python/runtime.txt

diff --git a/controller/src/main/python/requirements.txt b/controller/src/main/python/requirements.txt
new file mode 100644
index 0000000..e6a80a7
--- /dev/null
+++ b/controller/src/main/python/requirements.txt
@@ -0,0 +1 @@
+simple-websocket-server==0.4.1
diff --git a/controller/src/main/python/runtime.txt b/controller/src/main/python/runtime.txt
new file mode 100644
index 0000000..a48890e
--- /dev/null
+++ b/controller/src/main/python/runtime.txt
@@ -0,0 +1 @@
+python-3.8.10
diff --git a/controller/src/main/python/server.py b/controller/src/main/python/server.py
index 80f02cb..6b63bee 100644
--- a/controller/src/main/python/server.py
+++ b/controller/src/main/python/server.py
@@ -1,6 +1,6 @@
+import os
 from simple_websocket_server import WebSocketServer, WebSocket
 
-
 class SimpleChat(WebSocket):
     def handle(self):
         for client in clients:
@@ -23,5 +23,5 @@ def handle_close(self):
 
 clients = []
 
-server = WebSocketServer('', 8000, SimpleChat)
+server = WebSocketServer('', os.environ.get('PORT', '8000'), SimpleChat)
 server.serve_forever()

From fa630d560518bd4dec6a771ecc548541baf2c39a Mon Sep 17 00:00:00 2001
From: "Rodrigo E. Merino" <github@rodronet.com.ar>
Date: Sun, 28 Nov 2021 22:19:08 -0300
Subject: [PATCH 5/6] Procfile

---
 controller/src/main/python/Procfile | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 controller/src/main/python/Procfile

diff --git a/controller/src/main/python/Procfile b/controller/src/main/python/Procfile
new file mode 100644
index 0000000..9845e02
--- /dev/null
+++ b/controller/src/main/python/Procfile
@@ -0,0 +1 @@
+web: gunicorn -w 1 server:app

From 1fa49e3d2150e368e899038f17d89283e441c311 Mon Sep 17 00:00:00 2001
From: "Rodrigo E. Merino" <github@rodronet.com.ar>
Date: Fri, 3 Dec 2021 21:37:54 -0300
Subject: [PATCH 6/6] attempt at websockets

---
 controller/src/main/python/server.py         | 2 +-
 controller/src/main/www/camera_joystick.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/controller/src/main/python/server.py b/controller/src/main/python/server.py
index 6b63bee..9719556 100644
--- a/controller/src/main/python/server.py
+++ b/controller/src/main/python/server.py
@@ -23,5 +23,5 @@ def handle_close(self):
 
 clients = []
 
-server = WebSocketServer('', os.environ.get('PORT', '8000'), SimpleChat)
+server = WebSocketServer('0.0.0.0', os.environ.get('PORT', '8000'), SimpleChat)
 server.serve_forever()
diff --git a/controller/src/main/www/camera_joystick.html b/controller/src/main/www/camera_joystick.html
index f01ff10..571366f 100644
--- a/controller/src/main/www/camera_joystick.html
+++ b/controller/src/main/www/camera_joystick.html
@@ -19,7 +19,7 @@ <h1 style="text-align:center; display: none;">
     </p>
     <canvas id="canvas" name="game"></canvas>
     <script>
-        var connection = new WebSocket('ws://' + "cara-bot.herokuapp.com" + ':8000/');
+        var connection = new WebSocket('wss://' + "cara-bot.herokuapp.com" + '/0.0.0.0');
         connection.onopen = function () {
             connection.send('Connect ' + new Date());
         };