@uns-kit/cli 0.0.11 → 0.0.13

package/dist/index.js

@@ -1,14 +1,17 @@
 #!/usr/bin/env node
+import { execFile } from "node:child_process";
 import { access, cp, mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { createRequire } from "node:module";
 import process from "node:process";
 import readline from "node:readline/promises";
+import { promisify } from "node:util";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const require = createRequire(import.meta.url);
 const coreVersion = resolveCoreVersion();
+const execFileAsync = promisify(execFile);
 async function main() {
     const args = process.argv.slice(2);
     const command = args[0];
@@ -91,7 +94,21 @@ async function configureDevops(targetPath) {
     }
     const pkg = JSON.parse(pkgRaw);
     const config = JSON.parse(configRaw);
-    const defaultOrg = config.devops?.organization ?? "sijit";
+    await ensureGitRepository(targetDir);
+    const remoteUrl = await getGitRemoteUrl(targetDir, "origin");
+    let gitRemoteMessage;
+    let ensuredRemoteUrl = remoteUrl;
+    if (!ensuredRemoteUrl) {
+        const remoteAnswer = (await promptQuestion("Azure DevOps repository URL (e.g. https://dev.azure.com/sijit/industry40/_git/my-repo): ")).trim();
+        if (!remoteAnswer) {
+            throw new Error("A repository URL is required to set the git remote origin.");
+        }
+        await addGitRemote(targetDir, "origin", remoteAnswer);
+        ensuredRemoteUrl = remoteAnswer;
+        gitRemoteMessage = `  Added git remote origin -> ${remoteAnswer}`;
+    }
+    const inferredOrganization = ensuredRemoteUrl ? inferAzureOrganization(ensuredRemoteUrl) : undefined;
+    const defaultOrg = config.devops?.organization?.trim() || inferredOrganization || "sijit";
     const answer = (await promptQuestion(`Azure DevOps organization [${defaultOrg}]: `)).trim();
     const organization = answer || defaultOrg;
     if (!config.devops || typeof config.devops !== "object") {
@@ -124,6 +141,9 @@ async function configureDevops(targetPath) {
     }
     console.log(`\nDevOps tooling configured.`);
     console.log(`  Azure organization: ${organization}`);
+    if (gitRemoteMessage) {
+        console.log(gitRemoteMessage);
+    }
     if (pkgChanged) {
         console.log("  Updated package.json scripts/devDependencies. Run pnpm install to fetch new packages.");
     }
@@ -131,6 +151,104 @@ async function configureDevops(targetPath) {
         console.log("  Existing package.json already contained required entries.");
     }
 }
+async function ensureGitRepository(dir) {
+    try {
+        const { stdout } = await execFileAsync("git", ["rev-parse", "--is-inside-work-tree"], {
+            cwd: dir,
+            encoding: "utf8",
+        });
+        if (stdout.trim() !== "true") {
+            throw new Error(`Directory ${dir} is not a git repository.`);
+        }
+    }
+    catch (error) {
+        if (isGitCommandNotFoundError(error)) {
+            throw new Error("Git is required to run configure-devops but was not found in PATH.");
+        }
+        const execError = error;
+        const stderr = typeof execError.stderr === "string" ? execError.stderr : "";
+        if (stderr.includes("not a git repository")) {
+            throw new Error(`Directory ${dir} is not a git repository.`);
+        }
+        throw error;
+    }
+}
+async function getGitRemoteUrl(dir, remoteName) {
+    try {
+        const { stdout } = await execFileAsync("git", ["remote", "get-url", remoteName], {
+            cwd: dir,
+            encoding: "utf8",
+        });
+        return stdout.trim();
+    }
+    catch (error) {
+        if (isGitCommandNotFoundError(error)) {
+            throw new Error("Git is required to run configure-devops but was not found in PATH.");
+        }
+        if (isGitRemoteMissingError(error)) {
+            return null;
+        }
+        throw error;
+    }
+}
+async function addGitRemote(dir, remoteName, remoteUrl) {
+    try {
+        await execFileAsync("git", ["remote", "add", remoteName, remoteUrl], {
+            cwd: dir,
+            encoding: "utf8",
+        });
+    }
+    catch (error) {
+        if (isGitCommandNotFoundError(error)) {
+            throw new Error("Git is required to run configure-devops but was not found in PATH.");
+        }
+        const execError = error;
+        const stderr = typeof execError.stderr === "string" ? execError.stderr.trim() : "";
+        if (stderr) {
+            throw new Error(`Failed to add git remote origin: ${stderr}`);
+        }
+        throw new Error(`Failed to add git remote origin: ${error.message}`);
+    }
+}
+function inferAzureOrganization(remoteUrl) {
+    try {
+        const url = new URL(remoteUrl);
+        const hostname = url.hostname.toLowerCase();
+        if (hostname === "dev.azure.com" || hostname.endsWith(".visualstudio.com")) {
+            const segments = url.pathname.split("/").filter(Boolean);
+            if (segments.length >= 1) {
+                return segments[0];
+            }
+        }
+    }
+    catch (error) {
+        // ignore parse errors for non-HTTP(S) remotes
+    }
+    if (remoteUrl.startsWith("git@ssh.dev.azure.com:")) {
+        const [, pathPart] = remoteUrl.split(":", 2);
+        if (pathPart) {
+            const segments = pathPart.split("/").filter(Boolean);
+            // Format: v3/{organization}/{project}/{repo}
+            if (segments.length >= 2) {
+                return segments[1];
+            }
+        }
+    }
+    return undefined;
+}
+function isGitRemoteMissingError(error) {
+    if (!error || typeof error !== "object") {
+        return false;
+    }
+    const execError = error;
+    if (typeof execError.stderr === "string") {
+        return execError.stderr.includes("No such remote");
+    }
+    return false;
+}
+function isGitCommandNotFoundError(error) {
+    return Boolean(error && typeof error === "object" && error.code === "ENOENT");
+}
 async function promptQuestion(message) {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uns-kit/cli",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Command line scaffolding tool for UNS applications",
   "type": "module",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "templates"
   ],
   "dependencies": {
-    "@uns-kit/core": "0.0.14"
+    "@uns-kit/core": "0.0.16"
   },
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

package/templates/default/src/config/project.config.extension.example

@@ -1,6 +1,6 @@
 import { z } from "zod";
-import { secretValueSchema } from "@uns-kit/core/dist/uns-config/secret-placeholders";
-import { hostValueSchema } from "@uns-kit/core/dist/uns-config/host-placeholders";
+import { secretValueSchema } from "@uns-kit/core/uns-config/secret-placeholders.js";
+import { hostValueSchema } from "@uns-kit/core/uns-config/host-placeholders.js";
 
 // Extend this schema with project-specific configuration sections.
 export const projectExtrasSchema = z.object({

package/templates/default/src/examples/data-example.ts

@@ -1,14 +1,11 @@
 /**
  * Change this file according to your specifications and rename it to index.ts
  */
-import { UnsProxyProcess } from "@uns-kit/core";
-import { ConfigFile } from "@uns-kit/core";
-import { logger } from "@uns-kit/core";
-import { IUnsMessage } from "@uns-kit/core";
-import { PhysicalMeasurements } from "@uns-kit/core/dist/uns/uns-measurements.js";
-import { UnsPacket } from "@uns-kit/core/dist/uns/uns-packet";
-import { UnsTags } from "@uns-kit/core/dist/uns/uns-tags";
-import { UnsTopics } from "@uns-kit/core/dist/uns/uns-topics";
+import { UnsProxyProcess, ConfigFile, logger, type IUnsMessage } from "@uns-kit/core";
+import { PhysicalMeasurements } from "@uns-kit/core/uns/uns-measurements.js";
+import { UnsPacket } from "@uns-kit/core/uns/uns-packet.js";
+import { UnsTags } from "@uns-kit/core/uns/uns-tags.js";
+import { UnsTopics } from "@uns-kit/core/uns/uns-topics.js";
 
 /**
  * Load the configuration from a file.
@@ -21,10 +18,10 @@ const config = await ConfigFile.loadConfig();
  * Connect to input and output brokers
  */
 const unsProxyProcess = new UnsProxyProcess(config.infra.host!, {processName: config.uns.processName!});
-const mqttInput = await unsProxyProcess.createUnsMqttProxy((config.input?.host)!, "templateUnsRttInput", config.uns.instanceMode, config.uns.handover, {
+const mqttInput = await unsProxyProcess.createUnsMqttProxy((config.input?.host)!, "templateUnsRttInput", config.uns.instanceMode!, config.uns.handover!, {
   mqttSubToTopics: ["raw/#"],
 });
-const mqttOutput = await unsProxyProcess.createUnsMqttProxy((config.output?.host)!, "templateUnsRttOutput", config.uns.instanceMode, config.uns.handover, { publishThrottlingDelay: 1000});
+const mqttOutput = await unsProxyProcess.createUnsMqttProxy((config.output?.host)!, "templateUnsRttOutput", config.uns.instanceMode!, config.uns.handover!, { publishThrottlingDelay: 1000});
 
 
 /**
@@ -44,7 +41,8 @@ mqttInput.event.on("input", async (event) => {
       mqttOutput.publishMqttMessage({ topic, attribute: "data-number", packet, description: "Number value", tags });
     }
   } catch (error) {
-    logger.error(`Error publishing message to MQTT: ${error.message}`);
-    throw error;
+    const reason = error instanceof Error ? error : new Error(String(error));
+    logger.error(`Error publishing message to MQTT: ${reason.message}`);
+    throw reason;
   }
 });

package/templates/default/src/examples/load-test-data.ts

@@ -4,9 +4,8 @@
  * In the development environment, you are responsible for creating and maintaining this file and its contents.
  */
 import readline from "readline";
-import { ConfigFile } from "@uns-kit/core";
-import UnsMqttProxy from "@uns-kit/core/dist/uns-mqtt/uns-mqtt-proxy";
-import { logger } from "@uns-kit/core";
+import { ConfigFile, logger } from "@uns-kit/core";
+import UnsMqttProxy from "@uns-kit/core/uns-mqtt/uns-mqtt-proxy.js";
 
 
 /**
@@ -54,7 +53,8 @@ async function main() {
                 const rawData = `${count},${currentDate.getTime()}`;
                 await mqttOutput.publishMessage("raw/data", rawData);
               } catch (error) {
-                logger.error("Error publishing message:", error.message);
+                const reason = error instanceof Error ? error : new Error(String(error));
+                logger.error("Error publishing message:", reason.message);
               }
 
               count++;
@@ -84,7 +84,8 @@ async function main() {
       }
     });
   } catch (error) {
-    logger.error("Error initializing load test:", error.message);
+    const reason = error instanceof Error ? error : new Error(String(error));
+    logger.error("Error initializing load test:", reason.message);
     process.exit(1);
   }
 }

package/templates/default/src/examples/table-example.ts

@@ -2,13 +2,10 @@
  * Change this file according to your specifications and rename it to index.ts
  */
 
-import { UnsProxyProcess } from "@uns-kit/core";
-import { ConfigFile } from "@uns-kit/core";
-import { logger } from "@uns-kit/core";
-import { IUnsMessage } from "@uns-kit/core";
-import { UnsPacket } from "@uns-kit/core/dist/uns/uns-packet";
-import { UnsTags } from "@uns-kit/core/dist/uns/uns-tags";
-import { UnsTopics } from "@uns-kit/core/dist/uns/uns-topics";
+import { UnsProxyProcess, ConfigFile, logger, type IUnsMessage } from "@uns-kit/core";
+import { UnsPacket } from "@uns-kit/core/uns/uns-packet.js";
+import { UnsTags } from "@uns-kit/core/uns/uns-tags.js";
+import { UnsTopics } from "@uns-kit/core/uns/uns-topics.js";
 
 /**
  * Load the configuration from a file.
@@ -21,12 +18,12 @@ const config = await ConfigFile.loadConfig();
  * Load and configure input and output brokers from config.json
  */
 const unsProxyProcess = new UnsProxyProcess(config.infra.host!, {processName: config.uns.processName!});
-const mqttInput = await unsProxyProcess.createUnsMqttProxy((config.input?.host)!, "templateUnsRttInput", config.uns.instanceMode, config.uns.handover, {
+const mqttInput = await unsProxyProcess.createUnsMqttProxy((config.input?.host)!, "templateUnsRttInput", config.uns.instanceMode!, config.uns.handover!, {
   mqttSubToTopics: ["iba/zrm"],
   publishThrottlingDelay:0,
   subscribeThrottlingDelay:0
 });
-const mqttOutput = await unsProxyProcess.createUnsMqttProxy((config.output?.host)!, "templateUnsRttOutput", config.uns.instanceMode, config.uns.handover, {
+const mqttOutput = await unsProxyProcess.createUnsMqttProxy((config.output?.host)!, "templateUnsRttOutput", config.uns.instanceMode!, config.uns.handover!, {
   publishThrottlingDelay:0,
   subscribeThrottlingDelay:0  
 });
@@ -51,6 +48,8 @@ mqttInput.event.on("input", async (event) => {
       mqttOutput.publishMqttMessage({ topic, attribute: "zrm", packet, description: "Table", tags });
     }
   } catch (error) {
-    logger.error(`Error publishing message to MQTT: ${error.message}`);
+    const reason = error instanceof Error ? error : new Error(String(error));
+    logger.error(`Error publishing message to MQTT: ${reason.message}`);
+    throw reason;
   }
 });

package/templates/default/tsconfig.json

@@ -3,7 +3,7 @@
     "target": "ES2022",
     "lib": ["ES2022"],
     "module": "es2022",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "noEmit": false,
     "outDir": "dist",
     "rootDir": "src",

package/templates/default/uns-library.json

@@ -0,0 +1,4 @@
+{
+  "name": "template-uns-rtt",
+  "version": "2.0.0"
+}