@zeroexcore/tuna 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeroexcore/tuna",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Cloudflare Tunnel Wrapper for Development Servers",
   "type": "module",
   "repository": {
@@ -18,6 +18,15 @@
   "bin": {
     "tuna": "./src/index.ts"
   },
+  "scripts": {
+    "dev": "tsx watch src/index.ts",
+    "typecheck": "tsc --noEmit",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:ui": "vitest --ui",
+    "lint": "eslint src",
+    "prepublishOnly": "pnpm typecheck && pnpm test"
+  },
   "keywords": [
     "cloudflare",
     "tunnel",
@@ -48,13 +57,5 @@
     "js-yaml": "^4.1.1",
     "keytar": "^7.9.0",
     "ora": "^9.1.0"
-  },
-  "scripts": {
-    "dev": "tsx watch src/index.ts",
-    "typecheck": "tsc --noEmit",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:ui": "vitest --ui",
-    "lint": "eslint src"
   }
-}
+}

package/src/commands/run.ts

@@ -9,11 +9,7 @@ import { randomBytes } from 'crypto';
 import { readConfig, generateTunnelName } from '../lib/config.ts';
 import { getCredentials, getRootDomain } from '../lib/credentials.ts';
 import { CloudflareAPI } from '../lib/api.ts';
-import {
-  isInstalled,
-  download,
-  ensureDirectories,
-} from '../lib/cloudflared.ts';
+import { isInstalled, download, ensureDirectories } from '../lib/cloudflared.ts';
 import {
   generateIngressConfig,
   writeIngressConfig,
@@ -116,7 +112,9 @@ export async function runCommand(args: string[]): Promise<void> {
     // Check if we have local credentials
     if (!tunnelCredentialsExist(tunnel.id)) {
       spinner.fail('Tunnel exists but local credentials missing');
-      console.error(chalk.red('\nThe tunnel exists on Cloudflare but local credentials are missing.'));
+      console.error(
+        chalk.red('\nThe tunnel exists on Cloudflare but local credentials are missing.')
+      );
       console.log(chalk.yellow('Options:'));
       console.log(chalk.yellow('  1. Delete the tunnel and let tuna recreate it:'));
       console.log(chalk.cyan(`     tuna --delete ${tunnelName}`));
@@ -153,6 +151,7 @@ export async function runCommand(args: string[]): Promise<void> {
       spinner.succeed('Service restarted');
     }
   } catch (error) {
+    console.log(error);
     spinner.fail('Failed to start service');
     console.error(chalk.red(`\nError: ${(error as Error).message}`));
     process.exit(1);

package/src/lib/service.ts

@@ -269,7 +269,9 @@ export async function startService(): Promise<void> {
     throw new Error('Service not installed. Run tuna first to set up the tunnel.');
   }
 
-  await execa('launchctl', ['start', LAUNCHD_LABEL]);
+  // Use launchctl load which loads and starts the service (since RunAtLoad is true)
+  // This works whether the service is already loaded or not
+  await execa('launchctl', ['load', PLIST_PATH]);
 }
 
 /**
@@ -285,9 +287,11 @@ export async function stopService(): Promise<void> {
   }
 
   try {
-    await execa('launchctl', ['stop', LAUNCHD_LABEL]);
+    // Use launchctl unload to stop and unregister the service
+    // This works whether the service is running or not
+    await execa('launchctl', ['unload', PLIST_PATH]);
   } catch {
-    // Ignore errors if service wasn't running
+    // Ignore errors if service wasn't loaded
   }
 }