@youcan/cli-kit 2.3.2 → 2.3.3

package/dist/node/cli.js

@@ -10,6 +10,7 @@ import 'formdata-node/file-from-path';
 import 'simple-git';
 import 'execa';
 import 'find-process';
+import 'get-port';
 import 'tcp-port-used';
 import 'node-fetch';
 import 'ramda';

package/dist/node/filesystem.js

@@ -17,6 +17,7 @@ import 'formdata-node/file-from-path';
 import 'simple-git';
 import 'execa';
 import 'find-process';
+import 'get-port';
 import 'tcp-port-used';
 import 'node-fetch';
 import 'ramda';

package/dist/node/http.js

@@ -10,6 +10,7 @@ import 'formdata-node/file-from-path';
 import 'simple-git';
 import 'execa';
 import 'find-process';
+import 'get-port';
 import 'tcp-port-used';
 import { get as get$2 } from './session.js';
 import 'kleur';

package/dist/node/system.d.ts

@@ -17,7 +17,7 @@ export interface ExecOptions {
 }
 export declare function exec(command: string, args: string[], options?: ExecOptions): Promise<void>;
 export declare function isPortAvailable(port: number): Promise<boolean>;
-export declare function getNextAvailablePort(port: number): Promise<number>;
+export declare function getPortOrNextOrRandom(port: number): Promise<number>;
 export declare function getPortProcessName(port: number): Promise<string>;
 export declare function killPortProcess(port: number): Promise<void>;
 export declare function open(url: string): Promise<void>;

package/dist/node/system.js

@@ -1,6 +1,7 @@
 import process from 'node:process';
 import { execa } from 'execa';
 import findProcess from 'find-process';
+import getPort, { portNumbers } from 'get-port';
 import tpu from 'tcp-port-used';
 
 function buildExec(command, args, options) {
@@ -27,10 +28,41 @@ async function exec(command, args, options) {
         commandProcess.stdout?.pipe(options.stdout, { end: false });
     }
     let aborted = false;
+    process.once('SIGINT', () => {
+        if (commandProcess.pid) {
+            try {
+                commandProcess.kill('SIGTERM');
+            }
+            catch (err) {
+            }
+        }
+    });
+    process.once('SIGTERM', () => {
+        if (commandProcess.pid) {
+            try {
+                commandProcess.kill('SIGTERM');
+            }
+            catch (err) {
+            }
+        }
+    });
     options?.signal?.addEventListener('abort', () => {
         const pid = commandProcess.pid;
         if (pid) {
             aborted = true;
+            try {
+                const killProcess = () => {
+                    try {
+                        commandProcess.kill('SIGKILL');
+                    }
+                    catch (err) {
+                    }
+                };
+                commandProcess.kill('SIGTERM');
+                setTimeout(killProcess, 500);
+            }
+            catch (err) {
+            }
         }
     });
     try {
@@ -50,11 +82,8 @@ async function exec(command, args, options) {
 async function isPortAvailable(port) {
     return !await tpu.check(port);
 }
-async function getNextAvailablePort(port) {
-    if (await isPortAvailable(port)) {
-        return port;
-    }
-    return await getNextAvailablePort(port + 1);
+async function getPortOrNextOrRandom(port) {
+    return await getPort({ port: portNumbers(port, port + 1000) });
 }
 async function getPortProcessName(port) {
     const info = await findProcess('port', port);
@@ -89,4 +118,4 @@ function inferUserPackageManager() {
     return defaultPackageManager;
 }
 
-export { exec, getNextAvailablePort, getPortProcessName, inferUserPackageManager, isPortAvailable, killPortProcess, open, sleep };
+export { exec, getPortOrNextOrRandom, getPortProcessName, inferUserPackageManager, isPortAvailable, killPortProcess, open, sleep };

package/dist/node/worker.js

@@ -11,6 +11,7 @@ import 'formdata-node/file-from-path';
 import 'simple-git';
 import 'execa';
 import 'find-process';
+import 'get-port';
 import 'tcp-port-used';
 import 'node-fetch';
 import 'ramda';

package/dist/scripts/install-cloudflared.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/scripts/install-cloudflared.js

@@ -0,0 +1,25 @@
+import 'change-case';
+import '../node/cli.js';
+import 'conf';
+import 'env-paths';
+import '../node/filesystem.js';
+import 'formdata-node';
+import 'formdata-node/file-from-path';
+import 'simple-git';
+import 'execa';
+import 'find-process';
+import 'get-port';
+import 'tcp-port-used';
+import 'node-fetch';
+import 'ramda';
+import 'kleur';
+import 'dayjs';
+import { Cloudflared } from '../services/cloudflared.js';
+import '../ui/components/DevOutput.js';
+import 'react';
+import 'ink';
+
+const cloudflared = new Cloudflared();
+console.log('Installing Cloudflared...');
+await cloudflared.install();
+console.log('Successfully Installed Cloudflared');

package/dist/services/cloudflared.d.ts

@@ -4,7 +4,7 @@ export declare class Cloudflared {
     private readonly output;
     constructor();
     tunnel(port: number, host?: string): Promise<void>;
-    private install;
+    install(): Promise<void>;
     private composeTunnelingCommand;
     private exec;
     getUrl(): string | null;

package/dist/services/cloudflared.js

@@ -164,7 +164,6 @@ class Cloudflared {
         this.system = { platform, arch };
     }
     async tunnel(port, host = 'localhost') {
-        await this.install();
         const { bin, args } = this.composeTunnelingCommand(port, host);
         this.exec(bin, args);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@youcan/cli-kit",
   "type": "module",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Utilities for the YouCan CLI",
   "author": "YouCan <contact@youcan.shop> (https://youcan.shop)",
   "license": "MIT",
@@ -30,6 +30,7 @@
     "find-process": "^1.4.7",
     "formdata-node": "^6.0.3",
     "fs-extra": "^11.1.1",
+    "get-port": "^7.1.0",
     "glob": "^11.0.0",
     "ink": "^5.1.0",
     "kill-port-process": "^3.2.0",
@@ -60,6 +61,7 @@
     "build": "shx rm -rf dist && tsc --noEmit && rollup --config rollup.config.js",
     "dev": "shx rm -rf dist && rollup --config rollup.config.js --watch",
     "release": "pnpm publish --access public",
-    "type-check": "tsc --noEmit"
+    "type-check": "tsc --noEmit",
+    "postinstall": "node -e \"import('fs').then(fs => { if (fs.existsSync('./dist/scripts/install-cloudflared.js')) import('./dist/scripts/install-cloudflared.js'); });\""
   }
 }