blokctl 0.6.1 → 0.6.3

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.1";
+const GITHUB_REPO_RELEASE_TAG = "v0.6.3";
 fsExtra.ensureDirSync(HOME_DIR);
 const options = {
     baseDir: HOME_DIR,
@@ -306,7 +306,8 @@ export async function createProject(opts, version, currentPath = false, localRep
             const triggerDestDir = `${dirPath}/src/triggers/${triggerKind}`;
             fsExtra.ensureDirSync(triggerDestDir);
             if (triggerKind === "pubsub" || triggerKind === "queue") {
-                const templateDir = `${repoSource}/triggers/${triggerKind}/template/src`;
+                const templatePkgDir = triggerKind === "queue" ? "worker" : triggerKind;
+                const templateDir = `${repoSource}/triggers/${templatePkgDir}/template/src`;
                 if (fsExtra.existsSync(templateDir)) {
                     fsExtra.copySync(templateDir, triggerDestDir);
                     if (fsExtra.existsSync(`${templateDir}/workflows`)) {
@@ -325,20 +326,38 @@ export async function createProject(opts, version, currentPath = false, localRep
             }
             else {
                 const triggerSrcDir = `${repoSource}/triggers/${triggerKind}/src`;
-                if (fsExtra.existsSync(`${triggerSrcDir}/runner`)) {
-                    fsExtra.copySync(`${triggerSrcDir}/runner`, `${triggerDestDir}/runner`);
-                }
-                if (fsExtra.existsSync(`${triggerSrcDir}/AppRoutes.ts`)) {
-                    fsExtra.copySync(`${triggerSrcDir}/AppRoutes.ts`, `${triggerDestDir}/AppRoutes.ts`);
-                }
-                if (fsExtra.existsSync(`${triggerSrcDir}/workflows`)) {
-                    fsExtra.copySync(`${triggerSrcDir}/workflows`, `${dirPath}/src/workflows/${triggerKind}`);
-                }
-                if (triggerKind === "sse" && fsExtra.existsSync(`${triggerSrcDir}/SSETrigger.ts`)) {
-                    fsExtra.copySync(`${triggerSrcDir}/SSETrigger.ts`, `${triggerDestDir}/SSETrigger.ts`);
+                if (triggerKind === "sse") {
+                    const entries = fsExtra.readdirSync(triggerSrcDir, { withFileTypes: true });
+                    for (const entry of entries) {
+                        const src = `${triggerSrcDir}/${entry.name}`;
+                        if (entry.isFile()) {
+                            if (entry.name.endsWith(".test.ts") || entry.name.endsWith(".integration.test.ts")) {
+                                continue;
+                            }
+                            fsExtra.copySync(src, `${triggerDestDir}/${entry.name}`);
+                        }
+                        else if (entry.isDirectory()) {
+                            if (entry.name === "__tests__")
+                                continue;
+                            if (entry.name === "workflows") {
+                                fsExtra.copySync(src, `${dirPath}/src/workflows/${triggerKind}`);
+                            }
+                            else {
+                                fsExtra.copySync(src, `${triggerDestDir}/${entry.name}`);
+                            }
+                        }
+                    }
                 }
-                if (fsExtra.existsSync(`${triggerSrcDir}/lib.ts`)) {
-                    fsExtra.copySync(`${triggerSrcDir}/lib.ts`, `${triggerDestDir}/lib.ts`);
+                else {
+                    if (fsExtra.existsSync(`${triggerSrcDir}/runner`)) {
+                        fsExtra.copySync(`${triggerSrcDir}/runner`, `${triggerDestDir}/runner`);
+                    }
+                    if (fsExtra.existsSync(`${triggerSrcDir}/AppRoutes.ts`)) {
+                        fsExtra.copySync(`${triggerSrcDir}/AppRoutes.ts`, `${triggerDestDir}/AppRoutes.ts`);
+                    }
+                    if (fsExtra.existsSync(`${triggerSrcDir}/workflows`)) {
+                        fsExtra.copySync(`${triggerSrcDir}/workflows`, `${dirPath}/src/workflows/${triggerKind}`);
+                    }
                 }
             }
         }
@@ -415,9 +434,9 @@ export async function createProject(opts, version, currentPath = false, localRep
             "@blokjs/runner": "core/runner",
             "@blokjs/shared": "core/shared",
             "@blokjs/trigger-pubsub": "triggers/pubsub",
-            "@blokjs/trigger-queue": "triggers/queue",
+            "@blokjs/trigger-worker": "triggers/worker",
         };
-        const BLOKJS_DEP_RANGE = "^0.6.1";
+        const BLOKJS_DEP_RANGE = "^0.6.3";
         for (const depGroup of ["dependencies", "devDependencies", "peerDependencies"]) {
             const deps = packageJsonContent[depGroup];
             if (!deps)
@@ -484,12 +503,12 @@ export async function createProject(opts, version, currentPath = false, localRep
         if (selectedTriggers.includes("pubsub")) {
             triggerPackageDeps["@blokjs/trigger-pubsub"] = localRepoPath
                 ? `file:${path.resolve(repoSource, "triggers/pubsub")}`
-                : "^0.2.0";
+                : BLOKJS_DEP_RANGE;
         }
         if (selectedTriggers.includes("queue")) {
-            triggerPackageDeps["@blokjs/trigger-queue"] = localRepoPath
-                ? `file:${path.resolve(repoSource, "triggers/queue")}`
-                : "^0.2.0";
+            triggerPackageDeps["@blokjs/trigger-worker"] = localRepoPath
+                ? `file:${path.resolve(repoSource, "triggers/worker")}`
+                : BLOKJS_DEP_RANGE;
         }
         if (Object.keys(triggerPackageDeps).length > 0) {
             packageJsonContent.dependencies = {
@@ -611,12 +630,6 @@ function generateSharedNodesFile(triggers, _repoSource) {
     nodeImports.add('import type { BlokService } from "@blokjs/runner";');
     nodeExports.set("@blokjs/api-call", "ApiCall");
     nodeExports.set("@blokjs/if-else", "IfElse");
-    for (const trigger of triggers) {
-        if (trigger === "sse") {
-            nodeImports.add('import WelcomeMessage from "./nodes/welcome-message/index";');
-            nodeExports.set("welcome-message", "WelcomeMessage");
-        }
-    }
     const importLines = Array.from(nodeImports).join("\n");
     const exportEntries = Array.from(nodeExports.entries())
         .map(([key, value]) => `\t"${key}": ${value},`)
@@ -635,21 +648,18 @@ function generateSharedWorkflowsFile(triggers) {
     const workflowEntries = [];
     for (const trigger of triggers) {
         if (trigger === "http") {
-            imports.push("// Import HTTP workflows here");
+            imports.push("// HTTP workflows are auto-discovered from workflows/json/");
         }
         else if (trigger === "sse") {
-            imports.push('import OnConnect from "./workflows/sse/notifications/on-connect";');
-            imports.push('import OnSubscribe from "./workflows/sse/notifications/on-subscribe";');
-            workflowEntries.push('\t"on-connect": OnConnect,');
-            workflowEntries.push('\t"on-subscribe": OnSubscribe,');
+            imports.push("// SSE workflows: register in this Workflows record manually");
         }
         else if (trigger === "pubsub") {
             imports.push('import OnPubSubMessage from "./workflows/pubsub/messages/on-message";');
             workflowEntries.push('\t"on-pubsub-message": OnPubSubMessage,');
         }
         else if (trigger === "queue") {
-            imports.push('import OnQueueMessage from "./workflows/queue/messages/on-message";');
-            workflowEntries.push('\t"on-queue-message": OnQueueMessage,');
+            imports.push('import ProcessJob from "./workflows/queue/jobs/process-job";');
+            workflowEntries.push('\t"process-job": ProcessJob,');
         }
     }
     const importSection = imports.length > 0 ? `${imports.join("\n")}\n` : "";
@@ -716,10 +726,10 @@ if (process.env.DISABLE_TRIGGER_RUN !== "true") {
     if (triggerKind === "sse") {
         return `import { DefaultLogger } from "@blokjs/runner";
 import { type Span, metrics, trace } from "@opentelemetry/api";
-import SSEServer from "./runner/SSEServer";
+import SSETrigger from "./SSETrigger";
 
 export default class App {
-	private sseServer: SSEServer = <SSEServer>{};
+	private sseTrigger: SSETrigger = <SSETrigger>{};
 	protected trigger_initializer = 0;
 	protected initializer = 0;
 	protected tracer = trace.getTracer(
@@ -733,12 +743,12 @@ export default class App {
 
 	constructor() {
 		this.initializer = performance.now();
-		this.sseServer = new SSEServer();
+		this.sseTrigger = new SSETrigger();
 	}
 
 	async run() {
 		this.tracer.startActiveSpan("initialization", async (span: Span) => {
-			await this.sseServer.listen();
+			await this.sseTrigger.listen();
 			this.initializer = performance.now() - this.initializer;
 
 			this.logger.log(\`Server initialized in \${(this.initializer).toFixed(2)}ms\`);
@@ -750,13 +760,9 @@ export default class App {
 			span.end();
 		});
 	}
-
-	getApp() {
-		return this.sseServer.getApp();
-	}
 }
 
- {
+if (process.env.DISABLE_TRIGGER_RUN !== "true") {
 	new App().run();
 }
 `;
@@ -808,10 +814,10 @@ if (process.env.DISABLE_TRIGGER_RUN !== "true") {
     if (triggerKind === "queue") {
         return `import { DefaultLogger } from "@blokjs/runner";
 import { type Span, metrics, trace } from "@opentelemetry/api";
-import QueueServer from "./runner/QueueServer";
+import WorkerServer from "./runner/WorkerServer";
 
 export default class App {
-	private queueServer: QueueServer = <QueueServer>{};
+	private workerServer: WorkerServer = <WorkerServer>{};
 	protected trigger_initializer = 0;
 	protected initializer = 0;
 	protected tracer = trace.getTracer(
@@ -825,12 +831,12 @@ export default class App {
 
 	constructor() {
 		this.initializer = performance.now();
-		this.queueServer = new QueueServer();
+		this.workerServer = new WorkerServer();
 	}
 
 	async run() {
 		this.tracer.startActiveSpan("initialization", async (span: Span) => {
-			await this.queueServer.listen();
+			await this.workerServer.listen();
 			this.initializer = performance.now() - this.initializer;
 
 			this.logger.log(\`Queue trigger initialized in \${(this.initializer).toFixed(2)}ms\`);
@@ -873,26 +879,26 @@ function replaceBlokImportsInDirectory(dirPath) {
     }
 }
 function fixRunnerImportPaths(triggerDestDir, triggerKind) {
-    const filesToFix = [];
+    const fileFixes = [];
     if (triggerKind === "http") {
-        filesToFix.push(`${triggerDestDir}/runner/HttpTrigger.ts`);
+        fileFixes.push({ file: `${triggerDestDir}/runner/HttpTrigger.ts`, up: "../../../" });
     }
     else if (triggerKind === "sse") {
-        filesToFix.push(`${triggerDestDir}/runner/SSEServer.ts`);
+        fileFixes.push({ file: `${triggerDestDir}/SSETrigger.ts`, up: "../../" });
     }
     else if (triggerKind === "pubsub") {
-        filesToFix.push(`${triggerDestDir}/runner/PubSubServer.ts`);
+        fileFixes.push({ file: `${triggerDestDir}/runner/PubSubServer.ts`, up: "../../../" });
     }
     else if (triggerKind === "queue") {
-        filesToFix.push(`${triggerDestDir}/runner/QueueServer.ts`);
+        fileFixes.push({ file: `${triggerDestDir}/runner/WorkerServer.ts`, up: "../../../" });
     }
-    for (const filePath of filesToFix) {
-        if (!fsExtra.existsSync(filePath))
+    for (const { file, up } of fileFixes) {
+        if (!fsExtra.existsSync(file))
             continue;
-        let content = fsExtra.readFileSync(filePath, "utf8");
-        content = content.replace(/from ["']\.\.\/Nodes["']/g, 'from "../../../Nodes"');
-        content = content.replace(/from ["']\.\.\/Workflows["']/g, 'from "../../../Workflows"');
-        fsExtra.writeFileSync(filePath, content);
+        let content = fsExtra.readFileSync(file, "utf8");
+        content = content.replace(/from ["']\.\.\/Nodes["']/g, `from "${up}Nodes"`);
+        content = content.replace(/from ["']\.\.\/Workflows["']/g, `from "${up}Workflows"`);
+        fsExtra.writeFileSync(file, content);
     }
 }
 function updatePubSubProvider(triggerDestDir, provider) {
@@ -928,7 +934,7 @@ function updatePubSubProvider(triggerDestDir, provider) {
     fsExtra.writeFileSync(serverPath, content);
 }
 function updateQueueProvider(triggerDestDir, provider) {
-    const serverPath = `${triggerDestDir}/runner/QueueServer.ts`;
+    const serverPath = `${triggerDestDir}/runner/WorkerServer.ts`;
     if (!fsExtra.existsSync(serverPath))
         return;
     let content = fsExtra.readFileSync(serverPath, "utf8");
@@ -953,15 +959,17 @@ function updateQueueProvider(triggerDestDir, provider) {
 	})`,
         },
         redis: {
-            importName: "RedisAdapter",
-            init: `new RedisAdapter({
-		host: process.env.REDIS_HOST || "localhost",
-		port: Number(process.env.REDIS_PORT) || 6379,
+            importName: "BullMQAdapter",
+            init: `new BullMQAdapter({
+		connection: {
+			host: process.env.REDIS_HOST || "localhost",
+			port: Number(process.env.REDIS_PORT) || 6379,
+		},
 	})`,
         },
         nats: {
-            importName: "NATSAdapter",
-            init: `new NATSAdapter({
+            importName: "NATSWorkerAdapter",
+            init: `new NATSWorkerAdapter({
 		servers: (process.env.NATS_SERVERS || "localhost:4222").split(","),
 	})`,
         },
@@ -969,8 +977,8 @@ function updateQueueProvider(triggerDestDir, provider) {
     const config = adapterConfigs[provider];
     if (!config)
         return;
-    content = content.replace(/import \{ (\w+), (\w+) \} from ["']@blokjs\/trigger-queue["'];/, `import { ${config.importName}, QueueTrigger } from "@blokjs/trigger-queue";`);
-    content = content.replace(/(export default class \w+ extends QueueTrigger \{[\s\S]*?)\n\tprotected adapter = new \w+\(\{[\s\S]*?\}\);/, `$1\n\tprotected adapter = ${config.init};`);
+    content = content.replace(/import \{ (\w+), (\w+) \} from ["']@blokjs\/trigger-worker["'];/, `import { ${config.importName}, WorkerTrigger } from "@blokjs/trigger-worker";`);
+    content = content.replace(/(export default class \w+ extends WorkerTrigger \{[\s\S]*?)\n\tprotected adapter = new \w+\(\{[\s\S]*?\}\);/, `$1\n\tprotected adapter = ${config.init};`);
     fsExtra.writeFileSync(serverPath, content);
     const workflowPath = `${triggerDestDir}/workflows/messages/on-message.ts`;
     if (fsExtra.existsSync(workflowPath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "blokctl",
-	"version": "0.6.1",
+	"version": "0.6.3",
 	"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.1",
+		"@blokjs/runner": "^0.6.3",
 		"@clack/prompts": "^1.0.0",
 		"ai": "^4.3.16",
 		"better-sqlite3": "^12.6.2",