@youcan/cli-kit 2.3.1 → 2.3.3

package/dist/index.d.ts

@@ -1,19 +1,19 @@
+export * as String from './common/string';
+export * as Callback from './node/callback';
 export * as Cli from './node/cli';
-export * as Git from './node/git';
+export * as Config from './node/config';
+export * as Crypto from './node/crypto';
 export * as Env from './node/env';
-export * as Path from './node/path';
-export * as Http from './node/http';
+export * as Filesystem from './node/filesystem';
 export * as Form from './node/form';
-export * as Tasks from './node/tasks';
+export * as Git from './node/git';
 export * as Github from './node/github';
+export * as Http from './node/http';
+export * as Path from './node/path';
+export * as Session from './node/session';
 export * as System from './node/system';
-export * as Config from './node/config';
-export * as Crypto from './node/crypto';
+export * as Tasks from './node/tasks';
 export * as Worker from './node/worker';
-export * as Session from './node/session';
-export * as Callback from './node/callback';
-export * as Filesystem from './node/filesystem';
-export * as UI from './ui';
 export * as Services from './services';
-export * as String from './common/string';
+export * as UI from './ui';
 export { default as Color } from 'kleur';

package/dist/index.js

@@ -1,37 +1,37 @@
+import * as string from './common/string.js';
+export { string as String };
+import * as callback from './node/callback.js';
+export { callback as Callback };
 import * as cli from './node/cli.js';
 export { cli as Cli };
-import * as git from './node/git.js';
-export { git as Git };
+import * as config from './node/config.js';
+export { config as Config };
+import * as crypto from './node/crypto.js';
+export { crypto as Crypto };
 import * as env from './node/env.js';
 export { env as Env };
-import * as path from './node/path.js';
-export { path as Path };
-import * as http from './node/http.js';
-export { http as Http };
+import * as filesystem from './node/filesystem.js';
+export { filesystem as Filesystem };
 import * as form from './node/form.js';
 export { form as Form };
-import * as tasks from './node/tasks.js';
-export { tasks as Tasks };
+import * as git from './node/git.js';
+export { git as Git };
 import * as github from './node/github.js';
 export { github as Github };
+import * as http from './node/http.js';
+export { http as Http };
+import * as path from './node/path.js';
+export { path as Path };
+import * as session from './node/session.js';
+export { session as Session };
 import * as system from './node/system.js';
 export { system as System };
-import * as config from './node/config.js';
-export { config as Config };
-import * as crypto from './node/crypto.js';
-export { crypto as Crypto };
+import * as tasks from './node/tasks.js';
+export { tasks as Tasks };
 import * as worker from './node/worker.js';
 export { worker as Worker };
-import * as session from './node/session.js';
-export { session as Session };
-import * as callback from './node/callback.js';
-export { callback as Callback };
-import * as filesystem from './node/filesystem.js';
-export { filesystem as Filesystem };
-import * as index from './ui/index.js';
-export { index as UI };
-import * as index$1 from './services/index.js';
-export { index$1 as Services };
-import * as string from './common/string.js';
-export { string as String };
+import * as index from './services/index.js';
+export { index as Services };
+import * as index$1 from './ui/index.js';
+export { index$1 as UI };
 export { default as Color } from 'kleur';

package/dist/internal/node/constants.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import envpaths from 'env-paths';
 
 const identifier = 'youcan-cli';

package/dist/internal/node/ui.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import kleur from 'kleur';
 
 class Loader {

package/dist/node/cli.js

@@ -1,23 +1,25 @@
+import process from 'node:process';
 import { Flags, Command as Command$1, ux } from '@oclif/core';
 import prompts from 'prompts';
+import 'change-case';
+import 'conf';
+import 'env-paths';
+import './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 'execa';
-import 'env-paths';
 import 'node-fetch';
 import 'ramda';
-import 'change-case';
-import 'formdata-node';
-import 'formdata-node/file-from-path';
 import 'kleur';
-import 'conf';
 import 'dayjs';
-import './filesystem.js';
 import '../ui/components/DevOutput.js';
+import { renderError } from '../ui/components/Error.js';
 import 'react';
 import 'ink';
-import { renderError } from '../ui/components/Error.js';
 import { truthy } from './context/helpers.js';
 import { isDevelopment } from './context/local.js';
 
@@ -37,8 +39,8 @@ function setupColorMode() {
         process.env.FORCE_COLOR = '0';
     }
 }
-function errorHandler(error) {
-    let suggestions = ['Run the command again'];
+function handleError(error) {
+    let suggestions = [];
     const message = error.message;
     if (error instanceof CommandError && error.suggestions) {
         suggestions = error.suggestions;
@@ -55,9 +57,9 @@ async function exec(options) {
     }
     run(undefined, options.moduleUrl)
         .then(() => flush())
-        .catch(errorHandler);
+        .catch(handleError);
 }
-process.on('uncaughtException', errorHandler);
+process.on('uncaughtException', handleError);
 async function execCreate(cmdlet, options) {
     setupEnvVars(options);
     const initIndex = process.argv

package/dist/node/context/local.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import { ENV_VARS } from '../../internal/node/constants.js';
 
 function isDevelopment(env = process.env) {

package/dist/node/crypto.d.ts

@@ -1,7 +1,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import type { BinaryLike } from 'crypto';
+import type { Buffer } from 'node:buffer';
+import type { BinaryLike } from 'node:crypto';
 export declare function randomHex(size: number): string;
 export declare function base64URLEncode(str: Buffer): string;
 export declare function sha256(str: BinaryLike): Buffer;

package/dist/node/env.js

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import { ENV_VARS } from '../internal/node/constants.js';
 
 function get(key) {

package/dist/node/filesystem.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
-import type { Mode, OpenMode, PathLike, Stats } from 'fs';
 import type { GlobOptions } from 'glob';
+import type { Buffer } from 'node:buffer';
+import type { Mode, OpenMode, PathLike, Stats } from 'node:fs';
 export declare function exists(path: string): Promise<boolean>;
 export declare function isExecutable(path: string): Promise<boolean>;
 export declare function isDirectory(path: string): Promise<boolean>;

package/dist/node/filesystem.js

@@ -1,27 +1,28 @@
+import { createWriteStream, createReadStream } from 'node:fs';
 import FilesystemPromises from 'node:fs/promises';
-import { createGunzip } from 'node:zlib';
 import { pipeline } from 'node:stream/promises';
-import { createWriteStream, createReadStream } from 'node:fs';
-import { temporaryDirectoryTask } from 'tempy';
-import FsExtra from 'fs-extra';
+import { createGunzip } from 'node:zlib';
 import archiver from 'archiver';
 import chokidar from 'chokidar';
+import FsExtra from 'fs-extra';
 import { glob as glob$1 } from 'glob';
 import * as tar from 'tar';
+import { temporaryDirectoryTask } from 'tempy';
+import 'change-case';
 import './cli.js';
+import 'conf';
+import 'env-paths';
+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 'execa';
-import 'env-paths';
-import { resolve } from './path.js';
 import 'node-fetch';
 import 'ramda';
-import 'change-case';
-import 'formdata-node';
-import 'formdata-node/file-from-path';
+import { resolve } from './path.js';
 import 'kleur';
-import 'conf';
 import 'dayjs';
 import '../ui/components/DevOutput.js';
 import 'react';

package/dist/node/form.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
-import { FormData } from 'formdata-node';
 import type { FormDataEntryValue } from 'formdata-node';
+import { FormData } from 'formdata-node';
 import { fileFromPath } from 'formdata-node/file-from-path';
 export type FormDataResolvable = Array<FormDataResolvable> | {
     [key: string]: FormDataResolvable;

package/dist/node/http.js

@@ -1,22 +1,23 @@
+import { isJson } from '../common/string.js';
 import fetch from 'node-fetch';
 import { is, mergeDeepLeft } from 'ramda';
 import './cli.js';
-import 'simple-git';
-import 'find-process';
-import 'tcp-port-used';
-import 'execa';
+import 'conf';
 import { get as get$1 } from './env.js';
+import './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 { get as get$2 } from './session.js';
 import 'kleur';
-import 'conf';
 import 'dayjs';
-import { get as get$2 } from './session.js';
-import './filesystem.js';
 import '../ui/components/DevOutput.js';
 import 'react';
 import 'ink';
-import { isJson } from '../common/string.js';
 
 function scheme() {
     return get$1('HOST_ENV') === 'dev' ? 'http' : 'https';

package/dist/node/path.js

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import process from 'node:process';
 
 function resolve(...paths) {
     return path.resolve(...paths);

package/dist/node/session.js

@@ -1,20 +1,20 @@
+import 'change-case';
+import { listen } from './callback.js';
 import './cli.js';
-import 'simple-git';
-import { isPortAvailable, getPortProcessName, killPortProcess, open } from './system.js';
+import { manager } from './config.js';
+import { randomHex, sha256, base64URLEncode } from './crypto.js';
 import { apiHostname, oauthClientId, sellerAreaHostname } from './env.js';
-import { get as get$1, post } from './http.js';
+import './filesystem.js';
 import 'formdata-node';
 import 'formdata-node/file-from-path';
+import 'simple-git';
+import { isPortAvailable, getPortProcessName, killPortProcess, open } from './system.js';
+import { get as get$1, post } from './http.js';
 import 'kleur';
-import { manager } from './config.js';
-import { randomHex, sha256, base64URLEncode } from './crypto.js';
 import 'dayjs';
-import { listen } from './callback.js';
-import './filesystem.js';
 import '../ui/components/DevOutput.js';
 import 'react';
 import 'ink';
-import 'change-case';
 
 const LS_PORT = 3000;
 const LS_HOST = 'localhost';
@@ -95,6 +95,9 @@ async function authenticate(command) {
     const { code, verifier } = await authorize(command);
     const accessToken = await exchange(code, verifier);
     const store = await get$1(`${apiHostname()}/me`, { headers: { Authorization: `Bearer ${accessToken}` } });
+    if (!store.is_dev) {
+        throw new Error('The CLI can only be used with dev stores, you create one through YouCan Partners.');
+    }
     const session = {
         slug: store.slug,
         id: store.id,

package/dist/node/system.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import type { Readable, Writable } from 'stream';
 import type { ExecaError } from 'execa';
+import type { Readable, Writable } from 'node:stream';
 export interface ExecOptions {
     cwd?: string;
     env?: {
@@ -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,8 @@
+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';
-import { execa } from 'execa';
 
 function buildExec(command, args, options) {
     const env = options?.env ?? process.env;
@@ -26,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 {
@@ -49,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);
@@ -88,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/tasks.js

@@ -1,4 +1,4 @@
-import { exit } from 'node:process';
+import process, { exit } from 'node:process';
 import { Loader } from '../internal/node/ui.js';
 
 async function runTask(task, ctx) {

package/dist/node/worker.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="node" />
-import { Writable } from 'stream';
+import { Writable } from 'node:stream';
 export interface Interface {
-    run(): Promise<void>;
-    boot(): Promise<void>;
+    run: () => Promise<void>;
+    boot: () => Promise<void>;
 }
 export declare class Logger extends Writable {
     private readonly type;

package/dist/node/worker.js

@@ -1,19 +1,21 @@
+import { Buffer } from 'node:buffer';
 import { Writable } from 'node:stream';
 import dayjs from 'dayjs';
+import 'change-case';
 import './cli.js';
+import 'conf';
+import 'env-paths';
+import './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 'execa';
-import 'env-paths';
 import 'node-fetch';
 import 'ramda';
-import 'change-case';
-import 'formdata-node';
-import 'formdata-node/file-from-path';
 import 'kleur';
-import 'conf';
-import './filesystem.js';
 import { renderDevOutput } from '../ui/components/DevOutput.js';
 import 'react';
 import 'ink';

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

@@ -1,21 +1,23 @@
+import { Buffer } from 'node:buffer';
+import { createWriteStream } from 'node:fs';
+import process from 'node:process';
 import { Writable, Readable } from 'node:stream';
 import { pipeline } from 'node:stream/promises';
-import { createWriteStream } from 'node:fs';
 import { fileURLToPath } from 'node:url';
+import 'change-case';
 import '../node/cli.js';
+import 'conf';
+import 'env-paths';
+import { isExecutable, tapIntoTmp, mkdir, decompressGzip, extractTar, move } from '../node/filesystem.js';
+import 'formdata-node';
+import 'formdata-node/file-from-path';
 import 'simple-git';
 import { exec } from '../node/system.js';
-import 'env-paths';
-import { join, dirname, basename, resolve } from '../node/path.js';
 import 'node-fetch';
 import 'ramda';
-import 'change-case';
-import 'formdata-node';
-import 'formdata-node/file-from-path';
+import { join, dirname, basename, resolve } from '../node/path.js';
 import 'kleur';
-import 'conf';
 import 'dayjs';
-import { isExecutable, tapIntoTmp, mkdir, decompressGzip, extractTar, move } from '../node/filesystem.js';
 import '../ui/components/DevOutput.js';
 import 'react';
 import 'ink';
@@ -127,7 +129,7 @@ class OutputStream extends Writable {
         return true;
     }
     extractTunnelUrl() {
-        const regex = /https:\/\/(?!api\.trycloudflare\.com)[^\s]+\.trycloudflare\.com/;
+        const regex = /https:\/\/(?!api\.trycloudflare\.com)\S+\.trycloudflare\.com/;
         return this.buffer.match(regex)?.[0] || null;
     }
     extractError() {
@@ -162,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/dist/ui/index.d.ts

@@ -1,3 +1,3 @@
 export { renderDevOutput } from './components/DevOutput';
-export { renderHotKeys } from './components/HotKeys';
 export { renderError } from './components/Error';
+export { renderHotKeys } from './components/HotKeys';

package/dist/ui/index.js

@@ -1,3 +1,3 @@
 export { renderDevOutput } from './components/DevOutput.js';
-export { renderHotKeys } from './components/HotKeys.js';
 export { renderError } from './components/Error.js';
+export { renderHotKeys } from './components/HotKeys.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@youcan/cli-kit",
   "type": "module",
-  "version": "2.3.1",
+  "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'); });\""
   }
 }