blokctl 0.6.9 → 0.6.11

package/dist/commands/create/project.js

@@ -17,7 +17,7 @@ const exec = util.promisify(child_process.exec);
 const HOME_DIR = `${os.homedir()}/.blok`;
 const GITHUB_REPO_LOCAL = `${HOME_DIR}/blok`;
 const GITHUB_REPO_REMOTE = "https://github.com/well-prado/blok.git";
-const GITHUB_REPO_RELEASE_TAG = "v0.6.9";
+const GITHUB_REPO_RELEASE_TAG = "v0.6.11";
 fsExtra.ensureDirSync(HOME_DIR);
 const options = {
     baseDir: HOME_DIR,
@@ -264,15 +264,15 @@ export async function createProject(opts, version, currentPath = false, localRep
         const triggerConfigs = selectedTriggers.map((kind) => createTriggerConfig(kind));
         const mountedOnHttp = new Set();
         if (selectedTriggers.includes("http")) {
-            for (const kind of ["sse", "websocket"]) {
+            for (const kind of ["sse", "websocket", "webhook"]) {
                 if (selectedTriggers.includes(kind))
                     mountedOnHttp.add(kind);
             }
         }
         const spawnedTriggerConfigs = triggerConfigs.filter((tc) => !mountedOnHttp.has(tc.kind));
         const primaryTrigger = selectedTriggers[0];
-        const primaryTriggerDir = primaryTrigger === "pubsub" || primaryTrigger === "queue"
-            ? `${repoSource}/triggers/${primaryTrigger === "queue" ? "worker" : primaryTrigger}/template`
+        const primaryTriggerDir = primaryTrigger === "pubsub" || primaryTrigger === "queue" || primaryTrigger === "worker"
+            ? `${repoSource}/triggers/${primaryTrigger === "queue" || primaryTrigger === "worker" ? "worker" : primaryTrigger}/template`
             : `${repoSource}/triggers/${primaryTrigger}`;
         const baseFiles = ["package.json", "tsconfig.json", ".env.example", ".gitignore", "vitest.config.ts"];
         for (const file of baseFiles) {
@@ -318,8 +318,8 @@ export async function createProject(opts, version, currentPath = false, localRep
         for (const triggerKind of selectedTriggers) {
             const triggerDestDir = `${dirPath}/src/triggers/${triggerKind}`;
             fsExtra.ensureDirSync(triggerDestDir);
-            if (triggerKind === "pubsub" || triggerKind === "queue") {
-                const templatePkgDir = triggerKind === "queue" ? "worker" : triggerKind;
+            if (triggerKind === "pubsub" || triggerKind === "queue" || triggerKind === "worker") {
+                const templatePkgDir = triggerKind === "queue" || triggerKind === "worker" ? "worker" : triggerKind;
                 const templateDir = `${repoSource}/triggers/${templatePkgDir}/template/src`;
                 if (fsExtra.existsSync(templateDir)) {
                     fsExtra.copySync(templateDir, triggerDestDir);
@@ -332,7 +332,7 @@ export async function createProject(opts, version, currentPath = false, localRep
                     if (triggerKind === "pubsub") {
                         updatePubSubProvider(triggerDestDir, pubsubProvider);
                     }
-                    else if (triggerKind === "queue") {
+                    else if (triggerKind === "queue" || triggerKind === "worker") {
                         updateQueueProvider(triggerDestDir, queueProvider);
                     }
                 }
@@ -383,7 +383,14 @@ export async function createProject(opts, version, currentPath = false, localRep
         fsExtra.writeFileSync(`${dirPath}/src/Nodes.ts`, sharedNodesContent);
         const sharedWorkflowsContent = generateSharedWorkflowsFile(selectedTriggers);
         fsExtra.writeFileSync(`${dirPath}/src/Workflows.ts`, sharedWorkflowsContent);
+        const triggersWithRealTemplate = new Set(["worker", "queue", "pubsub"]);
         for (const triggerKind of selectedTriggers) {
+            if (triggersWithRealTemplate.has(triggerKind)) {
+                continue;
+            }
+            if (mountedOnHttp.has(triggerKind)) {
+                continue;
+            }
             const entryContent = generateTriggerEntryFile(triggerKind, selectedTriggers);
             fsExtra.writeFileSync(`${dirPath}/src/triggers/${triggerKind}/index.ts`, entryContent);
         }
@@ -426,7 +433,7 @@ export async function createProject(opts, version, currentPath = false, localRep
         fsExtra.ensureDirSync(`${dirPath}/infra/metrics`);
         fsExtra.copySync(`${repoSource}/infra/metrics`, `${dirPath}/infra/metrics`);
         fsExtra.removeSync(`${dirPath}/public/metric`);
-        if (selectedTriggers.includes("queue")) {
+        if (selectedTriggers.includes("queue") || selectedTriggers.includes("worker")) {
             fsExtra.ensureDirSync(`${dirPath}/infra/development`);
             fsExtra.copySync(`${repoSource}/infra/development`, `${dirPath}/infra/development`);
         }
@@ -478,7 +485,7 @@ export async function createProject(opts, version, currentPath = false, localRep
             "@blokjs/trigger-websocket": "triggers/websocket",
             "@blokjs/trigger-worker": "triggers/worker",
         };
-        const BLOKJS_DEP_RANGE = "^0.6.9";
+        const BLOKJS_DEP_RANGE = "^0.6.11";
         for (const depGroup of ["dependencies", "devDependencies", "peerDependencies"]) {
             const deps = packageJsonContent[depGroup];
             if (!deps)
@@ -547,7 +554,8 @@ export async function createProject(opts, version, currentPath = false, localRep
                 ? `file:${path.resolve(repoSource, "triggers/pubsub")}`
                 : BLOKJS_DEP_RANGE;
         }
-        if (selectedTriggers.includes("queue")) {
+        const needsTriggerWorker = selectedTriggers.includes("queue") || selectedTriggers.includes("worker") || examples;
+        if (needsTriggerWorker) {
             triggerPackageDeps["@blokjs/trigger-worker"] = localRepoPath
                 ? `file:${path.resolve(repoSource, "triggers/worker")}`
                 : BLOKJS_DEP_RANGE;
@@ -646,6 +654,23 @@ export async function createProject(opts, version, currentPath = false, localRep
                 "# The plain /chat demo works without Redis; only /chat-memory needs it.",
                 "REDIS_URL=redis://127.0.0.1:6379",
                 "",
+                "# Webhook router demo (--examples + --triggers webhook) — secrets per provider.",
+                "# Stripe: copy from https://dashboard.stripe.com/webhooks (`whsec_…`).",
+                "# GitHub: set in repo Settings → Webhooks → secret field.",
+                "# Linear: workspace settings → API → Webhooks → signing secret.",
+                "# Until set, signature verification fails with 401 — that's the gate working.",
+                "STRIPE_WEBHOOK_SECRET=",
+                "GITHUB_WEBHOOK_SECRET=",
+                "LINEAR_WEBHOOK_SECRET=",
+                "",
+                "# Worker fan-out demo (--examples + --triggers worker) — POST /fanout/jobs with",
+                "# `{items: [...], tenantId?: '...'}` enqueues N worker jobs onto `fanout-jobs`.",
+                "# in-memory adapter works single-process; for cross-process set BLOK_WORKER_ADAPTER",
+                "# to nats / redis / bullmq / rabbitmq / sqs / pg-boss / kafka and supply the matching",
+                "# connection env (e.g. NATS_SERVERS=nats://127.0.0.1:4222, or REDIS_URL above).",
+                "BLOK_WORKER_ADAPTER=in-memory",
+                "NATS_SERVERS=nats://127.0.0.1:4222",
+                "",
             ].join("\n");
             fsExtra.appendFileSync(envLocal, chatEnvBlock);
         }
@@ -704,7 +729,7 @@ export async function createProject(opts, version, currentPath = false, localRep
                 console.log(`  ${rc.label}: http://localhost:${rc.port}/health`);
             }
         }
-        if (selectedTriggers.includes("queue") && queueProvider === "redis") {
+        if ((selectedTriggers.includes("queue") || selectedTriggers.includes("worker")) && queueProvider === "redis") {
             console.log(color.cyan("\n📦 Redis Setup (for Queue trigger):"));
             console.log("  Start Redis with Docker:");
             console.log(color.dim("    cd infra/development"));
@@ -712,7 +737,7 @@ export async function createProject(opts, version, currentPath = false, localRep
             console.log(color.dim("    docker compose up -d redis redis-commander"));
             console.log("  Redis Commander UI: http://localhost:8081");
         }
-        if (selectedTriggers.includes("queue") && queueProvider === "nats") {
+        if ((selectedTriggers.includes("queue") || selectedTriggers.includes("worker")) && queueProvider === "nats") {
             console.log(color.cyan("\n📦 NATS JetStream Setup (for Queue trigger):"));
             console.log("  Start NATS with Docker:");
             console.log(color.dim("    cd infra/development"));
@@ -782,8 +807,8 @@ function generateSharedWorkflowsFile(triggers) {
             imports.push('import OnPubSubMessage from "./workflows/pubsub/messages/on-message";');
             workflowEntries.push('\t"on-pubsub-message": OnPubSubMessage,');
         }
-        else if (trigger === "queue") {
-            imports.push('import ProcessJob from "./workflows/queue/jobs/process-job";');
+        else if (trigger === "queue" || trigger === "worker") {
+            imports.push(`import ProcessJob from "./workflows/${trigger}/jobs/process-job";`);
             workflowEntries.push('\t"process-job": ProcessJob,');
         }
     }
@@ -803,12 +828,14 @@ function generateTriggerEntryFile(triggerKind, selectedTriggers = [triggerKind])
     if (triggerKind === "http") {
         const sseAlsoSelected = selectedTriggers.includes("sse");
         const wsAlsoSelected = selectedTriggers.includes("websocket");
-        const needsShared = sseAlsoSelected || wsAlsoSelected;
+        const webhookAlsoSelected = selectedTriggers.includes("webhook");
+        const needsShared = sseAlsoSelected || wsAlsoSelected || webhookAlsoSelected;
         const sharedHelperImports = needsShared
             ? `\nimport { NodeMap, WorkflowRegistry } from "@blokjs/runner";\nimport sharedNodes from "../../Nodes";\nimport sharedWorkflows from "../../Workflows";`
             : "";
         const sseImports = sseAlsoSelected ? `\nimport SSETrigger from "@blokjs/trigger-sse";` : "";
         const wsImports = wsAlsoSelected ? `\nimport WebSocketTrigger from "@blokjs/trigger-websocket";` : "";
+        const webhookImports = webhookAlsoSelected ? `\nimport WebhookTrigger from "@blokjs/trigger-webhook";` : "";
         const sharedBootstrapPrelude = needsShared
             ? `\n\n			// Build a NodeMap from the shared Nodes record; both SSE and
 			// WebSocket triggers consume this via setNodeMap so they can
@@ -831,15 +858,15 @@ function generateTriggerEntryFile(triggerKind, selectedTriggers = [triggerKind])
 				for (const [name, wf] of Object.entries(sharedWorkflows)) {
 					const w = wf as {
 						name?: string;
-						trigger?: { sse?: unknown; websocket?: unknown };
-						_config?: { name?: string; trigger?: { sse?: unknown; websocket?: unknown } };
+						trigger?: { sse?: unknown; websocket?: unknown; webhook?: unknown };
+						_config?: { name?: string; trigger?: { sse?: unknown; websocket?: unknown; webhook?: unknown } };
 					};
 					const triggerCfg = w._config?.trigger ?? w.trigger;
 					if (!triggerCfg) continue;
-					if (!triggerCfg.sse && !triggerCfg.websocket) continue;
+					if (!triggerCfg.sse && !triggerCfg.websocket && !triggerCfg.webhook) continue;
 					const resolvedName = w._config?.name ?? w.name ?? name;
 					if (registry.get(resolvedName)) continue;
-					const kind = triggerCfg.sse ? "sse" : "websocket";
+					const kind = triggerCfg.sse ? "sse" : triggerCfg.websocket ? "websocket" : "webhook";
 					registry.register({
 						name: resolvedName,
 						source: \`\${kind}:\${name}\`,
@@ -876,10 +903,26 @@ function generateTriggerEntryFile(triggerKind, selectedTriggers = [triggerKind])
 			});
 			await wsTrigger.listen();`
             : "";
-        const fullBootstrap = `${sharedBootstrapPrelude}${sseBootstrap}${wsBootstrap}`;
+        const webhookBootstrap = webhookAlsoSelected
+            ? `\n			// Mount Webhook trigger on the HTTP process's shared Hono app.
+			// WebhookTrigger.constructor(app, httpTrigger?) mirrors SSE / WS —
+			// when an HttpTrigger is supplied, the webhook trigger registers
+			// its /webhooks/<provider> routes inside addPreCatchAllHook so they
+			// win Hono's first-match dispatch over the legacy workflow catch-
+			// all. The shared @blokjs/trigger-webhook singleton this creates
+			// is also what @blokjs/hmac-verify (and other webhook-aware helpers)
+			// look up at run time.
+			const webhookTrigger = new WebhookTrigger(this.httpTrigger.getApp(), this.httpTrigger);
+			webhookTrigger.setNodeMap({
+				nodes: subTriggerNodeMap,
+				workflows: sharedWorkflows as unknown as Parameters<typeof webhookTrigger.setNodeMap>[0]["workflows"],
+			});
+			await webhookTrigger.listen();`
+            : "";
+        const fullBootstrap = `${sharedBootstrapPrelude}${sseBootstrap}${wsBootstrap}${webhookBootstrap}`;
         return `import { DefaultLogger } from "@blokjs/runner";
 import { type Span, metrics, trace } from "@opentelemetry/api";
-import HttpTrigger from "./runner/HttpTrigger";${sharedHelperImports}${sseImports}${wsImports}
+import HttpTrigger from "./runner/HttpTrigger";${sharedHelperImports}${sseImports}${wsImports}${webhookImports}
 
 export default class App {
 	private httpTrigger: HttpTrigger = <HttpTrigger>{};
@@ -1353,7 +1396,7 @@ function fixRunnerImportPaths(triggerDestDir, triggerKind) {
     else if (triggerKind === "pubsub") {
         fileFixes.push({ file: `${triggerDestDir}/runner/PubSubServer.ts`, up: "../../../" });
     }
-    else if (triggerKind === "queue") {
+    else if (triggerKind === "queue" || triggerKind === "worker") {
         fileFixes.push({ file: `${triggerDestDir}/runner/WorkerServer.ts`, up: "../../../" });
     }
     for (const { file, up } of fileFixes) {

package/dist/commands/create/utils/Examples.d.ts

@@ -13,7 +13,7 @@ declare const package_dev_dependencies: {
     "@types/pg": string;
 };
 declare const python3_file = "\nfrom core.blok import BlokService\nfrom core.types.context import Context\nfrom core.types.blok_response import BlokResponse\nfrom core.types.global_error import GlobalError\nfrom typing import Any, Dict\nimport traceback\n\nclass Node(BlokService):\n    def __init__(self):\n        BlokService.__init__(self)\n        self.input_schema = {}\n        self.output_schema = {}\n\n    async def handle(self, ctx: Context, inputs: Dict[str, Any]) -> BlokResponse:\n        response = BlokResponse()\n\n        try:\n            response.setSuccess({ \"message\": \"Hello World from Python3!\" })\n        except Exception as error:\n            err = GlobalError(error)\n            err.setCode(500)\n            err.setName(self.name)\n\n            stack_trace = traceback.format_exc()\n            err.setStack(stack_trace)\n            response.success = False\n            response.setError(err)\n\n        return response\n";
-declare const examples_url = "\nExamples:\n1- Open \"workflow-docs.json\" in your browser at http://localhost:4000/workflow-docs\n2- Open \"db-manager.json\" in your browser at http://localhost:4000/db-manager\n3- Open \"dashboard-gen.json\" in your browser at http://localhost:4000/dashboard-gen\n4- Open \"countries.json\" in your browser at http://localhost:4000/countries\n5- Open \"chat.json\" in your browser at http://localhost:4000/chat (set OPENROUTER_API_KEY first)\n6- Open \"chat-memory.json\" in your browser at http://localhost:4000/chat-memory (needs OPENROUTER_API_KEY + Redis at REDIS_URL)\n\nFor more documentation, visit src/nodes/examples/README.md. The first three examples require a PostgreSQL database to function.\n";
+declare const examples_url = "\nExamples:\n1- Open \"workflow-docs.json\" in your browser at http://localhost:4000/workflow-docs\n2- Open \"db-manager.json\" in your browser at http://localhost:4000/db-manager\n3- Open \"dashboard-gen.json\" in your browser at http://localhost:4000/dashboard-gen\n4- Open \"countries.json\" in your browser at http://localhost:4000/countries\n5- Open \"chat.json\" in your browser at http://localhost:4000/chat (set OPENROUTER_API_KEY first)\n6- Open \"chat-memory.json\" in your browser at http://localhost:4000/chat-memory (needs OPENROUTER_API_KEY + Redis at REDIS_URL)\n7- Webhook router: POST /webhooks/{stripe,github,linear} with signed bodies \u2014 set the matching *_WEBHOOK_SECRET env vars (needs --triggers webhook)\n8- LLM agent w/ tool calls: open http://localhost:4000/agent \u2014 model picks between get_weather and calculate tools (needs OPENROUTER_API_KEY + Redis)\n9- Worker fan-out: POST /fanout/jobs with body '{items:[...], tenantId?:\"...\"}' to enqueue N worker jobs (needs --triggers worker; BLOK_WORKER_ADAPTER=in-memory works single-process)\n\nFor more documentation, visit src/nodes/examples/README.md. The first three examples require a PostgreSQL database to function.\n";
 declare const workflow_template = "\n{\n\t\"name\": \"My Workflow\",\n\t\"description\": \"What this workflow does\",\n\t\"version\": \"1.0.0\",\n\t\"trigger\": {\n\t\t\"http\": {\n\t\t\t\"method\": \"GET\",\n\t\t\t\"accept\": \"application/json\"\n\t\t}\n\t},\n\t\"steps\": [\n\t\t{\n\t\t\t\"id\": \"echo\",\n\t\t\t\"use\": \"@blokjs/respond\",\n\t\t\t\"inputs\": {\n\t\t\t\t\"body\": \"$.req.body\"\n\t\t\t}\n\t\t}\n\t]\n}\n";
 declare const supervisord_nodejs = "\n[supervisord]\nnodaemon=true\n\n[program:nodejs_app]\ncommand=npm start\ndirectory=/app\nautostart=true\nautorestart=true\nstderr_logfile=/var/log/nodejs.err.log\nstdout_logfile=/var/log/nodejs.out.log\n";
 declare const supervisord_python = "\n[program:python_app]\ncommand=python3 /app/.blok/runtimes/python3/server.py\ndirectory=/app\nautostart=true\nautorestart=true\nstderr_logfile=/var/log/python.err.log\nstdout_logfile=/var/log/python.out.log\n";

package/dist/commands/create/utils/Examples.js

@@ -71,6 +71,9 @@ Examples:
 4- Open "countries.json" in your browser at http://localhost:4000/countries
 5- Open "chat.json" in your browser at http://localhost:4000/chat (set OPENROUTER_API_KEY first)
 6- Open "chat-memory.json" in your browser at http://localhost:4000/chat-memory (needs OPENROUTER_API_KEY + Redis at REDIS_URL)
+7- Webhook router: POST /webhooks/{stripe,github,linear} with signed bodies — set the matching *_WEBHOOK_SECRET env vars (needs --triggers webhook)
+8- LLM agent w/ tool calls: open http://localhost:4000/agent — model picks between get_weather and calculate tools (needs OPENROUTER_API_KEY + Redis)
+9- Worker fan-out: POST /fanout/jobs with body '{items:[...], tenantId?:"..."}' to enqueue N worker jobs (needs --triggers worker; BLOK_WORKER_ADAPTER=in-memory works single-process)
 
 For more documentation, visit src/nodes/examples/README.md. The first three examples require a PostgreSQL database to function.
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "blokctl",
-	"version": "0.6.9",
+	"version": "0.6.11",
 	"author": "Deskree Technologies Inc.",
 	"license": "Apache-2.0",
 	"description": "cli for blok",
@@ -30,7 +30,7 @@
 	"keywords": ["blokctl", "cli", "blok", "blok"],
 	"dependencies": {
 		"@ai-sdk/openai": "^1.3.22",
-		"@blokjs/runner": "^0.6.9",
+		"@blokjs/runner": "^0.6.11",
 		"@clack/prompts": "^1.0.0",
 		"ai": "^4.3.16",
 		"better-sqlite3": "^12.6.2",