From 7ce1e0b1dc466e48606164aad223c81c93a9cea2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 21 Oct 2019 15:55:18 +1100
Subject: [PATCH] extmod/webrepl: Move webrepl scripts to common place and use
 manifest.

Move webrepl support code from ports/esp8266/modules into extmod/webrepl
(to be alongside extmod/modwebrepl.c), and use frozen manifests to include
it in the build on esp8266 and esp32.

A small modification is made to webrepl.py to make it work on non-ESP
ports, i.e. don't call dupterm_notify if not available.
---
 extmod/webrepl/manifest.py                                   | 1 +
 {ports/esp8266/modules => extmod/webrepl}/webrepl.py         | 5 +++--
 {ports/esp8266/modules => extmod/webrepl}/webrepl_setup.py   | 0
 .../esp8266/modules => extmod/webrepl}/websocket_helper.py   | 0
 ports/esp32/boards/manifest.py                               | 2 +-
 ports/esp8266/boards/manifest.py                             | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 extmod/webrepl/manifest.py
 rename {ports/esp8266/modules => extmod/webrepl}/webrepl.py (92%)
 rename {ports/esp8266/modules => extmod/webrepl}/webrepl_setup.py (100%)
 rename {ports/esp8266/modules => extmod/webrepl}/websocket_helper.py (100%)

diff --git a/extmod/webrepl/manifest.py b/extmod/webrepl/manifest.py
new file mode 100644
index 000000000..0f2b44005
--- /dev/null
+++ b/extmod/webrepl/manifest.py
@@ -0,0 +1 @@
+freeze('.', ('webrepl.py', 'webrepl_setup.py', 'websocket_helper.py',))
diff --git a/ports/esp8266/modules/webrepl.py b/extmod/webrepl/webrepl.py
similarity index 92%
rename from ports/esp8266/modules/webrepl.py
rename to extmod/webrepl/webrepl.py
index bbf8bdb32..24c63299d 100644
--- a/ports/esp8266/modules/webrepl.py
+++ b/extmod/webrepl/webrepl.py
@@ -43,8 +43,9 @@ def accept_conn(listen_sock):
     ws = uwebsocket.websocket(cl, True)
     ws = _webrepl._webrepl(ws)
     cl.setblocking(False)
-    # notify REPL on socket incoming data
-    cl.setsockopt(socket.SOL_SOCKET, 20, uos.dupterm_notify)
+    # notify REPL on socket incoming data (ESP32/ESP8266-only)
+    if hasattr(uos, 'dupterm_notify'):
+        cl.setsockopt(socket.SOL_SOCKET, 20, uos.dupterm_notify)
     uos.dupterm(ws)
 
 
diff --git a/ports/esp8266/modules/webrepl_setup.py b/extmod/webrepl/webrepl_setup.py
similarity index 100%
rename from ports/esp8266/modules/webrepl_setup.py
rename to extmod/webrepl/webrepl_setup.py
diff --git a/ports/esp8266/modules/websocket_helper.py b/extmod/webrepl/websocket_helper.py
similarity index 100%
rename from ports/esp8266/modules/websocket_helper.py
rename to extmod/webrepl/websocket_helper.py
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index 2b07639ee..bab2b614b 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -1,6 +1,6 @@
 freeze('$(PORT_DIR)/modules')
 freeze('$(MPY_DIR)/tools', ('upip.py', 'upip_utarfile.py'))
 freeze('$(MPY_DIR)/ports/esp8266/modules', 'ntptime.py')
-freeze('$(MPY_DIR)/ports/esp8266/modules', ('webrepl.py', 'webrepl_setup.py', 'websocket_helper.py',))
 freeze('$(MPY_DIR)/drivers/dht', 'dht.py')
 freeze('$(MPY_DIR)/drivers/onewire')
+include('$(MPY_DIR)/extmod/webrepl/manifest.py')
diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py
index 779e84088..b6df53fc6 100644
--- a/ports/esp8266/boards/manifest.py
+++ b/ports/esp8266/boards/manifest.py
@@ -2,3 +2,4 @@ freeze('$(PORT_DIR)/modules')
 freeze('$(MPY_DIR)/tools', ('upip.py', 'upip_utarfile.py'))
 freeze('$(MPY_DIR)/drivers/dht', 'dht.py')
 freeze('$(MPY_DIR)/drivers/onewire')
+include('$(MPY_DIR)/extmod/webrepl/manifest.py')