@velox0/cerver 0.6.2-nightly.20260531.8 → 0.6.3

package/Makefile

@@ -1,5 +1,8 @@
 CC ?= cc
-CFLAGS ?= -std=c11 -Wall -Wextra -O2 -D_GNU_SOURCE
+CFLAGS ?= -std=c11 -Wall -Wextra -O2
+WIN_CC ?= x86_64-w64-mingw32-gcc
+WIN_CFLAGS ?= -std=c11 -Wall -Wextra -O2 -D_WIN32_WINNT=0x0601 -DWIN32_LEAN_AND_MEAN -DCERVER_NO_CURL
+WIN_LDFLAGS ?= -lws2_32 -lmswsock -ladvapi32
 
 RUNTIME_SRCS = \
 	runtime/http_parser.c \
@@ -13,8 +16,14 @@ RUNTIME_SRCS = \
 TEST_SRCS = runtime/tests/runtime_tests.c \
 	runtime/tests/minunit.c
 TEST_BIN = build/runtime_tests
+WIN_TEST_BIN = build/runtime_tests.exe
+WIN_OBJ = build/server.win.o
 
-.PHONY: test-runtime clean
+.PHONY: test tests test-runtime test-windows clean
+
+test: test-runtime test-windows
+
+tests: test
 
 test-runtime: $(TEST_BIN)
 	./$(TEST_BIN)
@@ -23,5 +32,15 @@ $(TEST_BIN): $(RUNTIME_SRCS) $(TEST_SRCS) runtime/cerver.h
 	mkdir -p build
 	$(CC) $(CFLAGS) -Iruntime -o $(TEST_BIN) $(RUNTIME_SRCS) $(TEST_SRCS) -pthread -lcurl
 
+test-windows: $(WIN_TEST_BIN) $(WIN_OBJ)
+
+$(WIN_TEST_BIN): $(RUNTIME_SRCS) $(TEST_SRCS) runtime/cerver.h
+	mkdir -p build
+	$(WIN_CC) $(WIN_CFLAGS) -Iruntime -o $(WIN_TEST_BIN) $(RUNTIME_SRCS) $(TEST_SRCS) $(WIN_LDFLAGS)
+
+$(WIN_OBJ): runtime/server.c runtime/cerver.h
+	mkdir -p build
+	$(WIN_CC) $(WIN_CFLAGS) -Iruntime -c runtime/server.c -o $(WIN_OBJ)
+
 clean:
 	rm -rf build

package/WINDOWS.md

@@ -1,7 +1,7 @@
 # Cerver on Windows
 
-Cerver compiles your routes to native C and links against pthreads and (optionally) libcurl.
-On Windows you need a C toolchain that provides these.  Two easy options:
+Cerver compiles your routes to native C and links against Winsock2 and (optionally) libcurl.
+On Windows you need a C toolchain that can build a console executable. Two easy options:
 
 ---
 
@@ -13,7 +13,7 @@ On Windows you need a C toolchain that provides these.  Two easy options:
 
    ```bash
    # MinGW-w64 (recommended for standalone .exe)
-   pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-pthreads
+   pacman -S mingw-w64-x86_64-gcc
 
    # If you want fetch() support (outbound HTTP):
    pacman -S mingw-w64-x86_64-curl
@@ -28,17 +28,11 @@ On Windows you need a C toolchain that provides these.  Two easy options:
 
 ---
 
-## Option B — LLVM/Clang for Windows + pthreads4w
+## Option B — LLVM/Clang for Windows
 
 1. Install Clang from https://releases.llvm.org/ (choose the Windows installer).
 
-2. Download and install **pthreads4w** from https://sourceforge.net/projects/pthreads4w/
-   (or clone + build from https://github.com/jwinarske/pthreads4w).
-
-3. Place the pthreads4w headers and `.a` / `.lib` somewhere on your PATH / in a standard
-   location (e.g. `C:\pthreads4w`).  Cerver's compiler probe will find them automatically.
-
-4. If you want `fetch()` support, install libcurl for Windows from https://curl.se/windows/
+2. If you want `fetch()` support, install libcurl for Windows from https://curl.se/windows/
    and add it to PATH / link path.
 
 ---
@@ -61,7 +55,7 @@ The `build` command produces `dist\server.exe`.  The `run` command executes it d
 | Symptom | Fix |
 |---|---|
 | `no C compiler found` | Add `gcc` or `clang` to `PATH`; see Option A/B above |
-| `undefined reference to pthread_*` | Install pthreads-win32 (MSYS2: `pacman -S mingw-w64-x86_64-pthreads`) |
+| thread runtime compiler errors | Make sure you are using the bundled runtime headers from the same Cerver version |
 | `undefined reference to curl_*` | Install libcurl and ensure `libcurl.a` / `libcurl.dll.a` are findable |
 | `WSAStartup failed` | Should not happen; report a bug |
 | `cerver build` passes but binary crashes | Run from the project root, not from `dist\` |

package/lib/commands/build.js

@@ -155,7 +155,7 @@ async function build(opts) {
   /* ---- 7. Compile ---- */
   console.log("  → compiling...");
   if (process.platform === "win32") {
-    console.log("    Windows target — ensure gcc/clang + pthreads-win32 are on PATH");
+    console.log("    Windows target — ensure gcc/clang is on PATH");
   }
 
   /* Detect if any route uses fetch() — only link libcurl when needed */

package/lib/compiler/compile.js

@@ -61,38 +61,6 @@ function supportsFlag(cc, flag) {
   }
 }
 
-/* ------------------------------------------------------------------ */
-/*  Windows: locate pthreads-win32 / pthreads4w                      */
-/* ------------------------------------------------------------------ */
-
-function findPthreadsWin(cc) {
-  // Try common install locations for pthreads-win32/pthreads4w.
-  // MSYS2/MinGW installs it to the mingw64 tree; standalone
-  // pthreads4w may be in C:\pthreads4w or C:\pthreads-win32.
-  const candidates = [
-    // MSYS2 MinGW-w64
-    "C:\\msys64\\mingw64",
-    "C:\\msys64\\ucrt64",
-    "C:\\msys2\\mingw64",
-    // WinLibs / standalone
-    "C:\\mingw64",
-    "C:\\mingw-w64",
-    // pthreads4w default install
-    "C:\\pthreads4w",
-    "C:\\pthreads-win32",
-  ];
-
-  for (const base of candidates) {
-    const inc = path.join(base, "include");
-    const lib = path.join(base, "lib");
-    const h   = path.join(inc, "pthread.h");
-    // Accept if header exists
-    if (fs.existsSync(h)) return { inc, lib };
-  }
-
-  return null; // caller will warn and continue without explicit -I/-L
-}
-
 /* ------------------------------------------------------------------ */
 /*  Main compile function                                             */
 /* ------------------------------------------------------------------ */
@@ -158,13 +126,6 @@ function compile(distDir, runtimeDir, opts) {
     /* Windows: link Winsock2, ws2_32 required for socket API */
     args.push("-lws2_32");
 
-    /* pthreads — try to point the compiler at a local install */
-    const pt = findPthreadsWin(cc);
-    if (pt) {
-      args.push(`-I${pt.inc}`, `-L${pt.lib}`);
-    }
-    args.push("-lpthread");
-
     /* libcurl for fetch() */
     if (opts && opts.usesFetch) {
       args.push("-lcurl");
@@ -177,7 +138,7 @@ function compile(distDir, runtimeDir, opts) {
     /* Produce a console binary (not a GUI window) */
     args.push("-mconsole");
   } else {
-    /* POSIX: pthreads + optional libcurl */
+    /* POSIX: thread support + optional libcurl */
     args.push("-lpthread");
     if (opts && opts.usesFetch) {
       args.push("-lcurl");
@@ -234,7 +195,7 @@ function compile(distDir, runtimeDir, opts) {
     throw new Error(
       `cerver: compilation failed (exit code ${err.status})\n` +
       (IS_WINDOWS
-        ? "  Tip: ensure gcc/clang, pthreads-win32, and (if using fetch) libcurl are installed."
+        ? "  Tip: ensure gcc/clang and (if using fetch) libcurl are installed."
         : "")
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velox0/cerver",
-  "version": "0.6.2-nightly.20260531.8",
+  "version": "0.6.3",
   "description": "Compile restricted JavaScript server logic into optimized native C binaries (cross-platform: Linux, macOS, Windows)",
   "main": "bin/cerver.js",
   "bin": {

package/runtime/cerver.h

@@ -13,7 +13,6 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <pthread.h>
 
 /* ------------------------------------------------------------------ */
 /*  Limits                                                            */
@@ -36,9 +35,9 @@
 #define CERVER_MAX_EVENTS     256
 #define CERVER_LISTEN_BACKLOG 4096
 
-/* Worker architecture */
-#define CERVER_THREAD_POOL_DEFAULT 4
-#define CERVER_TASK_QUEUE_SIZE     1024
+/* Connection worker architecture */
+#define CERVER_CONNECTION_WORKER_DEFAULT 4
+#define CERVER_TASK_QUEUE_SIZE           1024
 
 /* Stat cache for filesystem serving */
 #define CERVER_STAT_CACHE_SIZE 256
@@ -180,7 +179,7 @@ typedef struct {
 
 typedef struct {
   cerver_stat_entry_t entries[CERVER_STAT_CACHE_SIZE];
-  pthread_mutex_t     lock;
+  cerver_mutex_t      lock;
 } cerver_stat_cache_t;
 
 /* ------------------------------------------------------------------ */
@@ -190,18 +189,18 @@ typedef struct {
 typedef cerver_handler_fn (*cerver_dispatch_fn)(cerver_request_t* req);
 
 /* ------------------------------------------------------------------ */
-/*  Worker state (per-core event loop)                                */
+/*  Acceptor state (per-core event loop)                              */
 /* ------------------------------------------------------------------ */
 
 typedef struct cerver_server cerver_server_t;
 
 typedef struct {
-  int              id;
-  int              event_fd;  /* kqueue or epoll fd */
-  int              listen_fd; /* per-worker on Linux, shared on macOS */
-  cerver_server_t* srv;
-  pthread_t        thread;
-} cerver_worker_t;
+  int                      id;
+  int                      event_fd;  /* kqueue or epoll fd */
+  cerver_sock_t            listen_fd; /* per-acceptor on Linux, shared on macOS */
+  cerver_server_t*         srv;
+  cerver_acceptor_thread_t thread;
+} cerver_acceptor_t;
 
 /* ------------------------------------------------------------------ */
 /*  Server                                                            */
@@ -209,7 +208,7 @@ typedef struct {
 
 struct cerver_server {
   int             port;
-  int             sock_fd;
+  cerver_sock_t   sock_fd;
   cerver_route_t* routes;
   int             route_count;
   cerver_asset_t* assets;
@@ -223,10 +222,10 @@ struct cerver_server {
   /* Stat cache for filesystem serving */
   cerver_stat_cache_t stat_cache;
 
-  /* Worker pool */
-  int              worker_count;   /* configured connection worker count */
-  int              acceptor_count; /* actual acceptor thread count */
-  cerver_worker_t* workers;
+  /* Connection worker pool */
+  int                connection_worker_count; /* configured connection worker count */
+  int                acceptor_count;          /* actual acceptor thread count */
+  cerver_acceptor_t* acceptors;
 
   /* Route trie for radix/trie-based routing */
   void* route_trie;

package/runtime/fetch.c

@@ -10,10 +10,25 @@
 
 #include "cerver.h"
 
-#include <curl/curl.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+
+#if defined(CERVER_NO_CURL)
+char* cerver_fetch(const char* url, const char* method, const char* body, const char** headers) {
+  (void)url;
+  (void)method;
+  (void)body;
+  (void)headers;
+
+  char* empty = malloc(1);
+  if (empty) empty[0] = '\0';
+  return empty;
+}
+
+#else
+
+#include <curl/curl.h>
 
 /* ------------------------------------------------------------------ */
 /*  Internal write callback for curl                                  */
@@ -50,9 +65,10 @@ static size_t fetch_write_cb(void* contents, size_t size, size_t nmemb, void* us
 /*  Global curl init (thread-safe, called once)                       */
 /* ------------------------------------------------------------------ */
 
-static pthread_once_t curl_init_once = PTHREAD_ONCE_INIT;
+static cerver_fetch_global_init_guard_t curl_global_init_guard =
+    CERVER_FETCH_GLOBAL_INIT_GUARD_INITIALIZER;
 
-static void curl_global_init_once(void) { curl_global_init(CURL_GLOBAL_DEFAULT); }
+static void init_curl_global_state(void) { curl_global_init(CURL_GLOBAL_DEFAULT); }
 
 /* ------------------------------------------------------------------ */
 /*  Public API                                                        */
@@ -77,7 +93,7 @@ char* cerver_fetch(const char* url, const char* method, const char* body, const
   }
 
   /* Ensure global curl init */
-  pthread_once(&curl_init_once, curl_global_init_once);
+  cerver_fetch_global_init_guard_run(&curl_global_init_guard, init_curl_global_state);
 
   CURL* curl = curl_easy_init();
   if (!curl) {
@@ -156,3 +172,4 @@ char* cerver_fetch(const char* url, const char* method, const char* body, const
 
   return buf.data;
 }
+#endif  // CERVER_NO_CURL

package/runtime/http_parser.c

@@ -12,7 +12,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#if !CERVER_PLATFORM_WINDOWS
 #include <strings.h>
+#endif  // !CERVER_PLATFORM_WINDOWS
+
 #include <ctype.h>
 
 /* ------------------------------------------------------------------ */

package/runtime/http_writer.c

@@ -13,6 +13,8 @@
 #include <string.h>
 #include <errno.h>
 
+/* Size formatting uses %zu with unsigned long long cast to avoid MinGW warnings */
+
 #if !CERVER_PLATFORM_WINDOWS
 #include <unistd.h>
 #include <sys/uio.h>

package/runtime/mime.c

@@ -6,7 +6,11 @@
 #include "cerver.h"
 
 #include <string.h>
+
+#if !CERVER_PLATFORM_WINDOWS
 #include <strings.h>
+#endif  // !CERVER_PLATFORM_WINDOWS
+
 #include <ctype.h>
 
 typedef struct {

package/runtime/router.c

@@ -12,7 +12,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#if !CERVER_PLATFORM_WINDOWS
 #include <strings.h>
+#endif  // !CERVER_PLATFORM_WINDOWS
 
 /* ------------------------------------------------------------------ */
 /*  Request accessor helpers                                          */