Dev environment + Typescript + Variables Improvements

.eslintrc.json

@@ -0,0 +1,18 @@
+{
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:prettier/recommended"
+  ],
+  "rules": {
+    "@typescript-eslint/no-unused-vars": [
+      "warn",
+      {
+        "argsIgnorePattern": "^_",
+        "varsIgnorePattern": "^_",
+        "caughtErrorsIgnorePattern": "^_"
+      }
+    ]
+  },
+  "root": true
+}

.prettierrc.yml

@@ -0,0 +1,4 @@
+# style settings, see https://prettier.io/docs/en/options.html
+semi: false
+singleQuote: true
+trailingComma: es5

Dockerfile

@@ -1,43 +1,14 @@
-
-ARG NGINX_VERSION=1.24.0
-ARG NJS_VERSION=0.7.12
-
-FROM node:20.2.0-bullseye  AS builder
-ENV NODE_ENV=development
-WORKDIR /app
-COPY package.json package-lock.json* ./
-RUN npm ci
-COPY ./.mocharc.js ./
-COPY ./babel.config.js ./
-COPY ./rollup.config.js ./
-COPY ./tsconfig.json ./
-COPY ./src ./src
-
-RUN npm run build
-
-FROM nginx:${NGINX_VERSION}
-ARG NGINX_VERSION
-ARG NJS_VERSION
+FROM nginx:1.24.0
 
 # following installation steps from http://nginx.org/en/linux_packages.html#Debian
 RUN --mount=type=cache,target=/var/cache/apt <<EOF
     set -eux
     export DEBIAN_FRONTEND=noninteractive
     apt-get -qq update
     apt-get -qq install --yes --no-install-recommends --no-install-suggests \
-        curl gnupg2 ca-certificates debian-archive-keyring
+        curl gnupg2 ca-certificates debian-archive-keyring inotify-tools
     update-ca-certificates
-    curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \
-        | tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
-    gpg --dry-run --quiet --no-keyring --import --import-options import-show \
-        /usr/share/keyrings/nginx-archive-keyring.gpg
-    echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \
-        http://nginx.org/packages/mainline/debian $(echo $PKG_RELEASE | cut -f2 -d~) nginx" \
-        | tee /etc/apt/sources.list.d/nginx.list
-    apt-get -qq install --yes --no-install-recommends --no-install-suggests \
-        curl nginx-module-njs=${NGINX_VERSION}+${NJS_VERSION}-${PKG_RELEASE}
     apt-get remove --purge --auto-remove --yes
     rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/nginx.list
 EOF
 RUN mkdir -p /usr/lib/nginx/njs_modules
-COPY --from=builder /app/dist/* /usr/lib/nginx/njs_modules/

docker-compose.yml

@@ -1,7 +1,7 @@
-version: '3'
 services:
   pebble:
     image: letsencrypt/pebble:latest
+    platform: linux/amd64
     command: pebble -config /etc/pebble/config.json
     hostname: pebble
     volumes:
@@ -12,18 +12,30 @@ services:
       - 15000:15000  # HTTPS Management API
   challtestsrv:
     image: letsencrypt/pebble-challtestsrv:latest
+    platform: linux/amd64
     command: pebble-challtestsrv -defaultIPv6 "" -defaultIPv4 10.30.50.3
     hostname: challtestsrv
     ports:
       - 8055:8055  # HTTP Management API
+  node:
+    build:
+      context: .
+      dockerfile: Dockerfile.node
+    volumes:
+      - .:/app
+      - /app/node_modules
+      - node_dist:/app/dist
   nginx:
-    image: nginxinc/njs-acme-experemental
+    image: nginxinc/njs-acme
     build: .
-    command: nginx -c examples/nginx.conf
+    command: /nginx_wait_for_js nginx -c examples/nginx.conf
+    depends_on:
+      - node
     hostname: proxy.nginx.com
     volumes:
       - ./examples:/etc/nginx/examples/
-      # - ./dist:/etc/nginx/dist/
+      - ./nginx_wait_for_js:/nginx_wait_for_js
+      - node_dist:/usr/lib/nginx/njs_modules/
       - certs:/etc/letsencrypt/
     environment:
       - NJS_ACME_DIR=/etc/letsencrypt/
@@ -41,3 +53,4 @@ services:
       start_period: 10s
 volumes:
   certs:
+  node_dist:

nginx_wait_for_js

@@ -0,0 +1,24 @@
+#!/bin/sh
+JS_FILE=/usr/lib/nginx/njs_modules/acme.js
+
+# wait until the .js file appears
+while ! [ -f $JS_FILE ]
+do
+  echo "Waiting for $JS_FILE to appear..."
+  sleep 1
+done
+
+# start nginx in background
+echo "Starting nginx..."
+$@ &
+
+sleep 3
+
+echo "Watching for changes..."
+
+# when the .js file is modified, reload nginx
+inotifywait -m -e create,modify $JS_FILE |
+  while read filename
+  do
+    nginx -s reload
+  done