Migration base

.devcontainer/devcontainer.json

@@ -1,22 +1,18 @@
 {
 	"name": "devicecode-lua",
-	"build": {
-		"dockerfile": "Dockerfile"
-	},
+	"image": "ghcr.io/jangala-dev/mini-lua-image:latest",
 	"remoteUser": "vscode",
 	"postCreateCommand": "bash .devcontainer/postCreateCommand.sh",
 	"forwardPorts": [
-		8081
+		8081,
+		2222,
+		2242
 	],
 	"customizations": {
 		"vscode": {
 			"extensions": [
-				"ms-azuretools.vscode-docker",
-				"ms-vscode-remote.remote-containers",
-				"waderyan.gitblame",
 				"sumneko.lua",
 				"rog2.luacheck",
-				"tomblind.local-lua-debugger-vscode",
 				"bierner.markdown-mermaid"
 			]
 		}

.devcontainer/postCreateCommand.sh

@@ -1,46 +1,62 @@
-#!/bin/sh
-
-sudo apt update -y
-
-sudo apt install -y apt-utils unzip curl wget git build-essential libreadline-dev dialog libssl-dev m4 openssl
-
-# install core lua packages
-
-sudo apt install -y lua5.1 liblua5.1-dev luarocks lua-dkjson
-
-cd /tmp
-sudo rm -rf LuaJIT
-git clone -b v2.1.ROLLING https://github.com/LuaJIT/LuaJIT.git
-cd LuaJIT
-make -j$(nproc)
-sudo make install
-# Find the latest installed luajit binary under /usr/local/bin
-latest=$(ls -1 /usr/local/bin/luajit-2.1.* | sort | tail -n 1)
-# Symlink it to /usr/local/bin/luajit
-sudo ln -sf "$latest" /usr/local/bin/luajit
-sudo ldconfig
-
-# install luarocks packages
-sudo luarocks install bit32
-sudo luarocks install cqueues
-sudo luarocks install http
-sudo luarocks install luaposix
-sudo luarocks install luacheck
-sudo luarocks install lua-cjson
-sudo luarocks install dkjson
-sudo luarocks install luaunit
-
-# install cffi-lua
-sudo apt install -y meson pkg-config cmake libffi-dev
-
-cd /tmp
-sudo rm -rf cffi-lua
-git clone https://github.com/q66/cffi-lua
-mkdir cffi-lua/build
-cd cffi-lua/build
-sudo meson .. -Dlua_version=5.1 --buildtype=release
-sudo ninja all
-sudo ninja test
-sudo cp cffi.so /usr/local/lib/lua/5.1/cffi.so
+#!/usr/bin/env sh
+set -eu
+
+echo "[devcontainer] preparing OpenWrt VM test tools"
+
+if command -v apt-get >/dev/null 2>&1; then
+	sudo apt-get update
+	sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+		curl \
+		ca-certificates \
+		gzip \
+		openssh-client \
+		rsync \
+		socat \
+		qemu-system-x86 \
+		qemu-system-arm \
+		qemu-utils \
+		ovmf \
+		qemu-efi-aarch64 \
+		make \
+		iproute2 \
+		iputils-ping \
+		busybox \
+		dnsutils \
+		wget \
+		tcpdump \
+		cloud-image-utils \
+		genisoimage
+elif command -v apk >/dev/null 2>&1; then
+	sudo apk add --no-cache \
+		curl \
+		ca-certificates \
+		gzip \
+		openssh-client \
+		rsync \
+		socat \
+		qemu-system-x86_64 \
+		qemu-system-aarch64 \
+		qemu-img \
+		ovmf \
+		edk2-aarch64 \
+		make \
+		iproute2 \
+		iputils \
+		busybox \
+		bind-tools \
+		wget \
+		tcpdump \
+		xorriso
+else
+	echo "[devcontainer] unsupported base image: no apt-get or apk found" >&2
+	exit 1
+fi
+
+# Privileged OpenWrt dataplane tests are run inside the optional network-lab VM.
+# The top-level devcontainer is intentionally unprivileged so normal development
+# and fast CI jobs do not inherit bridge/tap/netns permissions.
+mkdir -p tests/integration/openwrt_vm/{images,work,scripts,tests}
+
+echo "[devcontainer] OpenWrt VM tools ready"
 
 exit 0

.env

@@ -1,4 +1,4 @@
-FIBERS_VER=43a04d1
-TRIE_VER=28b3572
-BUS_VER=89af71a
-UI_VER=a8c5965
+FIBERS_VER=30353346ca58c3662b9942f62ff4a9610f8ab8cb
+TRIE_VER=v0.3
+BUS_VER=v0.8.2
+UI_VER=dev

.gitignore

@@ -3,3 +3,6 @@ scratchpad
 src/services/modem-*
 docs/
 build/
+.env.secret
+local-ui/
+src/services/ui/www/

.gitmodules

@@ -1,12 +1,9 @@
-[submodule "src/lua-fibers"]
-	path = src/lua-fibers
+[submodule "vendor/lua-fibers"]
+	path = vendor/lua-fibers
 	url = https://github.com/jangala-dev/lua-fibers.git
-[submodule "src/lua-trie"]
-	path = src/lua-trie
+[submodule "vendor/lua-trie"]
+	path = vendor/lua-trie
 	url = https://github.com/jangala-dev/lua-trie.git
-[submodule "src/lua-bus"]
-	path = src/lua-bus
+[submodule "vendor/lua-bus"]
+	path = vendor/lua-bus
 	url = https://github.com/jangala-dev/lua-bus.git
-[submodule "src/services/ui/local-ui"]
-	path = src/services/ui/local-ui
-	url = https://github.com/jangala-dev/local-ui.git

.luarc.json

@@ -0,0 +1,32 @@
+{
+  "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json",
+
+  "runtime.version": "LuaJIT",
+
+  "runtime.path": [
+    "src/?.lua",
+    "src/?/init.lua",
+
+    "vendor/lua-fibers/src/?.lua",
+    "vendor/lua-fibers/src/?/init.lua",
+
+    "vendor/lua-bus/src/?.lua",
+    "vendor/lua-bus/src/?/init.lua",
+
+    "vendor/lua-trie/src/?.lua",
+    "vendor/lua-trie/src/?/init.lua"
+  ],
+
+  "workspace.library": [
+    "src",
+    "vendor/lua-fibers/src",
+    "vendor/lua-bus/src",
+    "vendor/lua-trie/src"
+  ],
+
+  "workspace.checkThirdParty": false,
+  "workspace.maxPreload": 10000,
+
+  "diagnostics.enable": true,
+  "diagnostics.workspaceDelay": -1
+}

.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Debug Lua Interpreter",
+      "type": "lua-local",
+      "request": "launch",
+      "program": {
+        "lua": "lua",
+        "file": "${file}"
+      }
+    },
+    {
+      "name": "Debug Custom Lua Environment",
+      "type": "lua-local",
+      "request": "launch",
+      "program": {
+        "command": "command"
+      },
+      "args": []
+    }
+  ]
+}

.vscode/settings.json

@@ -14,10 +14,7 @@
     "[lua]": {
       "editor.tabSize": 4
     },
-    "Lua.workspace.checkThirdParty": false,
-    "Lua.workspace.maxPreload": 0,
     "Lua.diagnostics.workspaceDelay": -1,
-    "Lua.workspace.library": [],
     "Lua.diagnostics.enable": true,
     "cSpell.words": [
       "autopin",