@tiens.nguyen/gonext-local-worker 1.0.4 → 1.0.6

package/README.md

@@ -6,7 +6,7 @@ Runs on **your Mac** next to **Ollama** or any **OpenAI-compatible** local serve
 2. Runs the job against **`payload.baseURL`** (your LAN `http://127.0.0.1:11434/v1` etc.).
 3. **`PATCH`**es **`running`** → **`completed`** / **`failed`** so DynamoDB and the web app update.
 
-You must create a **Worker API key** in the web app **Settings** (stored as a hash in DynamoDB).
+Set your Firebase **worker user id** in the worker env so it claims your own queued jobs.
 
 ## Install
 
@@ -32,7 +32,7 @@ Create `~/.gonext/worker.env` (optional):
 mkdir -p ~/.gonext
 cat > ~/.gonext/worker.env << 'EOF'
 GONEXT_API_BASE=https://YOUR_API.execute-api.ap-southeast-1.amazonaws.com
-GONEXT_WORKER_KEY=paste-your-worker-secret-here
+GONEXT_WORKER_USER_ID=paste-your-firebase-user-id
 GONEXT_POLL_MS=1500
 EOF
 chmod 600 ~/.gonext/worker.env
@@ -42,7 +42,7 @@ Or export in the shell:
 
 ```bash
 export GONEXT_API_BASE=https://....execute-api....amazonaws.com
-export GONEXT_WORKER_KEY=...
+export GONEXT_WORKER_USER_ID=...
 ```
 
 ## Run
@@ -97,7 +97,7 @@ Local worker API endpoints on port 5001:
 - `POST /api/chat` -> proxies to `http://localhost:11434/api/chat`
 - `POST /api/generate` -> proxies to `http://localhost:11434/api/generate`
 - `GET /api/tags` -> proxies to `http://localhost:11434/api/tags`
-- `POST /api/dispatch-job` -> cloud dispatch entrypoint (token-protected)
+- `POST /api/dispatch-job` -> cloud dispatch entrypoint
 - `GET /api/health`
 
 Legacy non-prefixed routes (`/chat`, `/generate`, `/tags`, `/dispatch-job`, `/health`) are also available for compatibility.
@@ -116,5 +116,5 @@ launchctl unload ~/Library/LaunchAgents/com.gonext.worker.plist
 
 ## Troubleshooting
 
-- **`403` / invalid key** — Regenerate worker key in Settings and update `GONEXT_WORKER_KEY`.
+- **`400` / missing workerUserId** — Set `GONEXT_WORKER_USER_ID` correctly.
 - **Job never claimed** — Ensure DynamoDB + worker routes work; Settings must include **Ollama base URL** so the queued payload points at a reachable host from this Mac (`127.0.0.1` is fine).

package/gonext-local-worker.mjs

@@ -5,7 +5,7 @@
  *
  * Env:
  *   GONEXT_API_BASE   HTTPS origin only (no trailing slash), e.g. https://xxx.execute-api....amazonaws.com
- *   GONEXT_WORKER_KEY Plaintext worker secret from Web → Settings → Worker API key
+ *   GONEXT_WORKER_USER_ID Firebase user id (owner of queued jobs)
  *   GONEXT_POLL_MS    Poll interval when idle (default 1500)
  *
  * Optional env files (loaded in order; shell exports win if set before launch):
@@ -14,7 +14,6 @@
  */
 import { homedir } from "node:os";
 import os from "node:os";
-import { createHash } from "node:crypto";
 import { join } from "node:path";
 import dotenv from "dotenv";
 import express from "express";
@@ -50,7 +49,7 @@ gonext-local-worker — bridge cloud GoNext jobs ↔ local LLM (Ollama / OpenAI-
 
 Usage:
   export GONEXT_API_BASE=https://....amazonaws.com
-  export GONEXT_WORKER_KEY=your-secret-from-settings
+  export GONEXT_WORKER_USER_ID=your-firebase-user-id
   gonext-local-worker
 
 Options:
@@ -81,7 +80,7 @@ const apiBase = (
   process.env.GONEXT_API_BASE ??
   ""
 ).replace(/\/+$/, "");
-const workerKey = process.env.GONEXT_WORKER_KEY ?? "";
+const workerUserId = (process.env.GONEXT_WORKER_USER_ID ?? "").trim();
 const pollMs =
   (Number.isFinite(args.pollMs) && args.pollMs > 0
     ? args.pollMs
@@ -98,19 +97,15 @@ const ollamaBase = (
   process.env.GONEXT_LOCAL_OLLAMA_BASE ?? "http://127.0.0.1:11434"
 ).replace(/\/+$/, "");
 
-if (!apiBase || !workerKey) {
+if (!apiBase || !workerUserId) {
   console.error(
-    "Missing GONEXT_API_BASE or GONEXT_WORKER_KEY.\nSet them or put them in ~/.gonext/worker.env — run with --help."
+    "Missing GONEXT_API_BASE or GONEXT_WORKER_USER_ID.\nSet them or put them in ~/.gonext/worker.env — run with --help."
   );
   process.exit(1);
 }
 
 const WORKER_VERSION = "1.0.0";
 const WORKER_HOST = os.hostname();
-const DISPATCH_TOKEN = createHash("sha256")
-  .update(workerKey, "utf8")
-  .digest("hex");
-
 function ts() {
   return new Date().toISOString();
 }
@@ -137,7 +132,7 @@ async function workerFetch(path, init = {}) {
   const url = `${apiBase}${path.startsWith("/") ? path : `/${path}`}`;
   const headers = {
     "Content-Type": "application/json",
-    "X-Worker-Key": workerKey,
+    "X-Worker-User-Id": workerUserId,
     ...(init.headers ?? {}),
   };
   return fetch(url, { ...init, headers });
@@ -255,15 +250,6 @@ function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
 
-function requireDispatchToken(req, res) {
-  const token = req.header("x-gonext-dispatch-token") ?? "";
-  if (token !== DISPATCH_TOKEN) {
-    res.status(403).json({ error: "Invalid dispatch token." });
-    return false;
-  }
-  return true;
-}
-
 function toOllamaChatMessages(messages) {
   return (messages ?? []).map((m) => ({
     role: m.role,
@@ -386,7 +372,6 @@ function startWebhookServer() {
   app.get("/api/tags", tagsHandler);
 
   const dispatchJobHandler = async (req, res) => {
-    if (!requireDispatchToken(req, res)) return;
     const body = req.body ?? {};
     if (!body?.jobId || !body?.payload) {
       res.status(400).json({ error: "Expected { jobId, payload }." });
@@ -418,7 +403,6 @@ function startWebhookServer() {
     try {
       const body = req.body ?? {};
       const jobId = typeof body.jobId === "string" ? body.jobId : "";
-      if (jobId && !requireDispatchToken(req, res)) return;
       const requestBody =
         body.request && typeof body.request === "object" ? body.request : body;
       const parsed = await runOllamaAndMaybeUpdateJob({
@@ -439,7 +423,6 @@ function startWebhookServer() {
     try {
       const body = req.body ?? {};
       const jobId = typeof body.jobId === "string" ? body.jobId : "";
-      if (jobId && !requireDispatchToken(req, res)) return;
       const requestBody =
         body.request && typeof body.request === "object" ? body.request : body;
       const parsed = await runOllamaAndMaybeUpdateJob({
@@ -460,7 +443,6 @@ function startWebhookServer() {
     console.log(
       `[${ts()}] local worker API on http://127.0.0.1:${webhookPort} (/chat, /generate, /tags, /dispatch-job, /health)`
     );
-    console.log(`[${ts()}] dispatch token is SHA256(worker key)`);
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiens.nguyen/gonext-local-worker",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Polls GoNext cloud API for async local LLM jobs and runs them against Ollama/OpenAI-compatible servers on this Mac",
   "type": "module",
   "license": "MIT",