update

Author: ymc9

packages/cli/src/index.ts

@@ -1,7 +1,8 @@
 import { ZModelLanguageMetaData } from '@zenstackhq/language';
 import colors from 'colors';
-import { Command, Option } from 'commander';
+import { Command, CommanderError, Option } from 'commander';
 import * as actions from './actions';
+import { CliError } from './cli-error';
 import { telemetry } from './telemetry';
 import { getVersion } from './utils/version-utils';
 
@@ -133,22 +134,28 @@ function createProgram() {
 }
 
 async function main() {
-    const program = createProgram();
-    await telemetry.trackCli(() => void program.parseAsync());
-
     let exitCode = 0;
 
-    process.on('unhandledRejection', (reason) => {
-        if (reason instanceof Error) {
-            telemetry.trackError(reason);
+    const program = createProgram();
+    program.exitOverride();
+
+    try {
+        await telemetry.trackCli(async () => {
+            await program.parseAsync();
+        });
+    } catch (e) {
+        if (e instanceof CommanderError) {
+            // ignore
+            exitCode = e.exitCode;
+        } else if (e instanceof CliError) {
+            // log
+            console.error(colors.red(e.message));
+            exitCode = 1;
+        } else {
+            console.error(colors.red(`Unhandled error: ${e}`));
+            exitCode = 1;
         }
-        exitCode = 1;
-    });
-
-    process.on('uncaughtException', (error) => {
-        telemetry.trackError(error);
-        exitCode = 1;
-    });
+    }
 
     if (telemetry.isTracking) {
         // give telemetry a chance to send events before exit

packages/cli/src/telemetry.ts

@@ -1,5 +1,5 @@
-import { createId } from '@paralleldrive/cuid2';
 import { init, type Mixpanel } from 'mixpanel';
+import { randomUUID } from 'node:crypto';
 import fs from 'node:fs';
 import * as os from 'os';
 import { TELEMETRY_TRACKING_TOKEN } from './constants';
@@ -30,7 +30,7 @@ export type TelemetryEvents =
 export class Telemetry {
     private readonly mixpanel: Mixpanel | undefined;
     private readonly hostId = getMachineId();
-    private readonly sessionid = createId();
+    private readonly sessionid = randomUUID();
     private readonly _os_type = os.type();
     private readonly _os_release = os.release();
     private readonly _os_arch = os.arch();

packages/cli/src/utils/machine-id-utils.ts

@@ -1,7 +1,7 @@
 // modified from https://github.com/automation-stack/node-machine-id
 
 import { execSync } from 'child_process';
-import { createHash, randomUUID } from 'crypto';
+import { createHash, randomUUID } from 'node:crypto';
 
 const { platform } = process;
 const win32RegBinPath = {