blokctl 0.6.1 → 0.6.2

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.2";
 fsExtra.ensureDirSync(HOME_DIR);
 const options = {
     baseDir: HOME_DIR,
@@ -417,7 +417,7 @@ export async function createProject(opts, version, currentPath = false, localRep
             "@blokjs/trigger-pubsub": "triggers/pubsub",
             "@blokjs/trigger-queue": "triggers/queue",
         };
-        const BLOKJS_DEP_RANGE = "^0.6.1";
+        const BLOKJS_DEP_RANGE = "^0.6.2";
         for (const depGroup of ["dependencies", "devDependencies", "peerDependencies"]) {
             const deps = packageJsonContent[depGroup];
             if (!deps)
@@ -484,12 +484,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";
+                : BLOKJS_DEP_RANGE;
         }
         if (Object.keys(triggerPackageDeps).length > 0) {
             packageJsonContent.dependencies = {
@@ -716,10 +716,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 +733,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 +750,9 @@ export default class App {
 			span.end();
 		});
 	}
-
-	getApp() {
-		return this.sseServer.getApp();
-	}
 }
 
- {
+if (process.env.DISABLE_TRIGGER_RUN !== "true") {
 	new App().run();
 }
 `;
@@ -873,26 +869,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/QueueServer.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) {

package/package.json

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