@uns-kit/cli 2.0.70 → 2.0.71

package/templates/default/src/examples/uns-gateway-cli.ts

@@ -1,10 +1,10 @@
-import { startUnsGateway } from "@uns-kit/core/uns-grpc/uns-gateway-server.js";
-import { getLogger } from "@uns-kit/core";
-
-const logger = getLogger(import.meta.url);
-
-const addr = await startUnsGateway();
-logger.info(`UNS Gateway listening on ${addr.address} (UDS=${addr.isUDS})`);
-// Keep alive
-setInterval(() => {}, 1 << 30);
-
+import { startUnsGateway } from "@uns-kit/core/uns-grpc/uns-gateway-server.js";
+import { getLogger } from "@uns-kit/core";
+
+const logger = getLogger(import.meta.url);
+
+const addr = await startUnsGateway();
+logger.info(`UNS Gateway listening on ${addr.address} (UDS=${addr.isUDS})`);
+// Keep alive
+setInterval(() => {}, 1 << 30);
+

package/templates/default/src/index.ts

@@ -1,45 +1,66 @@
-import { ConfigFile, UnsProxyProcess } from "@uns-kit/core";
-import type { ISO8601 } from "@uns-kit/core/uns/uns-interfaces.js";
-
-async function main(): Promise<void> {
-  const config = await ConfigFile.loadConfig();
-  const processName = config.uns.processName ?? "__APP_NAME__";
-  const unsProcess = new UnsProxyProcess(config.infra.host ?? "localhost", {
-    processName,
-  });
-
-  const mqttOutput = await unsProcess.createUnsMqttProxy(
-    config.output?.host ?? "localhost",
-    "defaultOutput",
-    config.uns.instanceMode ?? "wait",
-    config.uns.handover ?? true,
-  );
-
-  const time = new Date().toISOString() as ISO8601;
-
+import { ConfigFile, UnsProxyProcess } from "@uns-kit/core";
+import type { ISO8601 } from "@uns-kit/core/uns/uns-interfaces.js";
+
+let activeProcess: UnsProxyProcess | undefined;
+
+async function main(): Promise<void> {
+  const config = await ConfigFile.loadConfig();
+  const processName = config.uns.processName ?? "__APP_NAME__";
+  const unsProcess = new UnsProxyProcess(config.infra.host ?? "localhost", {
+    processName,
+  });
+  activeProcess = unsProcess;
+  const shutdown = (signal: NodeJS.Signals): void => {
+    console.log(`Received ${signal}; shutting down UNS process '${processName}'.`);
+    void unsProcess.shutdown().catch((error: unknown) => {
+      const reason = error instanceof Error ? error : new Error(String(error));
+      console.error(`UNS process '${processName}' shutdown failed: ${reason.message}`);
+      process.exitCode = 1;
+    });
+  };
+  process.once("SIGINT", () => shutdown("SIGINT"));
+  process.once("SIGTERM", () => shutdown("SIGTERM"));
+
+  const mqttOutput = await unsProcess.createUnsMqttProxy(
+    config.output?.host ?? "localhost",
+    "defaultOutput",
+    config.uns.instanceMode ?? "wait",
+    config.uns.handover ?? true,
+  );
+
+  const time = new Date().toISOString() as ISO8601;
+
   await mqttOutput.publishMqttMessage({
-    topic: "example/site/area/line/",
-    asset: "demo-asset",
-    objectType: "utility-resource",
-    objectId: "main",
-    attributes: {
-      attribute: "status",
-      description: "Service startup marker",
-      data: {
-        time,
-        value: "started",
-        dataGroup: "runtime",
-      },
-      validityMode: "lifecycle",
-      lifecycleEndValue: "stopped",
-    },
+    topic: "example/site/area/line/",
+    asset: "demo-asset",
+    objectType: "utility-resource",
+    objectId: "main",
+    attributes: {
+      attribute: "status",
+      description: "Service startup marker",
+      data: {
+        time,
+        value: "started",
+        dataGroup: "runtime",
+      },
+      validityMode: "lifecycle",
+      lifecycleEndValue: "stopped",
+    },
   });
 
   await mqttOutput.flush();
-  await mqttOutput.stop();
-  await unsProcess.shutdown();
 
   console.log(`UNS process '${processName}' is ready. Edit src/index.ts to add your logic.`);
 }
-
-void main();
+
+void main().catch(async (error: unknown) => {
+  const reason = error instanceof Error ? error : new Error(String(error));
+  try {
+    await activeProcess?.shutdown();
+  } catch (shutdownError) {
+    const shutdownReason = shutdownError instanceof Error ? shutdownError : new Error(String(shutdownError));
+    console.error(`UNS process cleanup failed: ${shutdownReason.message}`);
+  }
+  console.error(`UNS process startup failed: ${reason.message}`);
+  process.exitCode = 1;
+});

package/templates/default/src/uns/uns-assets.ts

@@ -1,12 +1,12 @@
-// Generated UNS asset list. Run `pnpm run sync-uns-metadata` to update.
-export const GeneratedAssets = {
-  /** Example asset. Replace with your own names after running sync-uns-metadata. */
-  "asset": "asset",
-} as const;
-export type GeneratedAssetName = typeof GeneratedAssets[keyof typeof GeneratedAssets];
-
-export function resolveGeneratedAsset(name: keyof typeof GeneratedAssets): (typeof GeneratedAssets)[keyof typeof GeneratedAssets];
-export function resolveGeneratedAsset<T extends string>(name: T): (typeof GeneratedAssets)[keyof typeof GeneratedAssets] | T;
-export function resolveGeneratedAsset(name: string): string {
-  return (GeneratedAssets as Record<string, string>)[name] ?? name;
-}
+// Generated UNS asset list. Run `pnpm run sync-uns-metadata` to update.
+export const GeneratedAssets = {
+  /** Example asset. Replace with your own names after running sync-uns-metadata. */
+  "asset": "asset",
+} as const;
+export type GeneratedAssetName = typeof GeneratedAssets[keyof typeof GeneratedAssets];
+
+export function resolveGeneratedAsset(name: keyof typeof GeneratedAssets): (typeof GeneratedAssets)[keyof typeof GeneratedAssets];
+export function resolveGeneratedAsset<T extends string>(name: T): (typeof GeneratedAssets)[keyof typeof GeneratedAssets] | T;
+export function resolveGeneratedAsset(name: string): string {
+  return (GeneratedAssets as Record<string, string>)[name] ?? name;
+}