@youcan/app 2.3.1 → 2.3.3

package/dist/cli/commands/app/dev.d.ts

@@ -1,6 +1,9 @@
 import { AppCommand } from '@/util/app-command';
 declare class Dev extends AppCommand {
     static description: string;
+    private workers;
+    constructor(argv: string[], config: any);
+    private setupExitHandlers;
     private readonly hotKeys;
     run(): Promise<any>;
     private prepareNetworkOptions;

package/dist/cli/commands/app/dev.js

@@ -1,11 +1,42 @@
-import { Session, Tasks, UI, System, Services, Filesystem, Path, Env, Http } from '@youcan/cli-kit';
+import process from 'node:process';
 import { bootTunnelWorker, bootAppWorker, bootWebWorker, bootExtensionWorker } from '../../services/dev/workers/index.js';
+import { APP_CONFIG_FILENAME } from '../../../constants.js';
 import { AppCommand } from '../../../util/app-command.js';
 import { load } from '../../../util/app-loader.js';
-import { APP_CONFIG_FILENAME } from '../../../constants.js';
+import { Session, Tasks, UI, System, Services, Filesystem, Path, Env, Http } from '@youcan/cli-kit';
 
 class Dev extends AppCommand {
     static description = 'Run the app in dev mode';
+    workers = [];
+    constructor(argv, config) {
+        super(argv, config);
+        this.setupExitHandlers();
+    }
+    setupExitHandlers() {
+        const cleanupAndExit = () => {
+            try {
+                if (this.controller) {
+                    this.controller.abort();
+                }
+                this.workers = [];
+                console.log('Shutting down...');
+                setTimeout(() => {
+                    process.exit(0);
+                }, 100);
+            }
+            catch (error) {
+                process.exit(0);
+            }
+        };
+        process.once('SIGINT', cleanupAndExit);
+        process.once('SIGTERM', cleanupAndExit);
+        process.once('SIGQUIT', cleanupAndExit);
+        process.once('exit', () => {
+            if (this.controller) {
+                this.controller.abort();
+            }
+        });
+    }
     hotKeys = [
         {
             keyboardKey: 'p',
@@ -15,7 +46,21 @@ class Dev extends AppCommand {
         {
             keyboardKey: 'q',
             description: 'quit',
-            handler: () => this.exit(0),
+            handler: () => {
+                try {
+                    if (this.controller) {
+                        this.controller.abort();
+                    }
+                    this.workers = [];
+                    console.log('Shutting down...');
+                    setTimeout(() => {
+                        process.exit(0);
+                    }, 100);
+                }
+                catch (error) {
+                    process.exit(0);
+                }
+            },
         },
     ];
     async run() {
@@ -43,10 +88,10 @@ class Dev extends AppCommand {
         this.runWorkers(workers);
     }
     async prepareNetworkOptions() {
-        const port = await System.getNextAvailablePort(3000);
+        const port = await System.getPortOrNextOrRandom(3000);
         this.app.network_config = {
             app_port: port,
-            app_url: `http://localhost:${port}`
+            app_url: `http://localhost:${port}`,
         };
         const worker = await bootTunnelWorker(this, this.app, new Services.Cloudflared());
         this.app.config = {
@@ -54,14 +99,13 @@ class Dev extends AppCommand {
             app_url: worker.getUrl(),
             redirect_urls: this.app.config.redirect_urls?.length > 0
                 ? this.app.config.redirect_urls.map(r => new URL(new URL(r).pathname, worker.getUrl()).toString())
-                : [new URL('/auth/callback', worker.getUrl()).toString()]
+                : [new URL('/auth/callback', worker.getUrl()).toString()],
         };
         await Filesystem.writeJsonFile(Path.join(this.app.root, APP_CONFIG_FILENAME), this.app.config);
         return worker;
     }
     async reloadWorkers() {
         this.controller = new AbortController();
-        // Preserve network config.
         const networkConfig = this.app.network_config;
         this.app = await load();
         this.app.network_config = networkConfig;

package/dist/cli/commands/app/env/show.js

@@ -1,6 +1,6 @@
-import { Session, Tasks, Color } from '@youcan/cli-kit';
 import { AppCommand } from '../../../../util/app-command.js';
 import { load } from '../../../../util/app-loader.js';
+import { Session, Tasks, Color } from '@youcan/cli-kit';
 
 class EnvShow extends AppCommand {
     static description = 'Display app environment variables';

package/dist/cli/commands/app/generate/extension.js

@@ -1,8 +1,8 @@
-import { Path, Filesystem, String, Tasks } from '@youcan/cli-kit';
-import { AppCommand } from '../../../../util/app-command.js';
 import extensions from '../../../services/generate/extensions/index.js';
 import { ensureExtensionDirectoryExists, initThemeExtension } from '../../../services/generate/generate.js';
 import { APP_CONFIG_FILENAME } from '../../../../constants.js';
+import { AppCommand } from '../../../../util/app-command.js';
+import { Path, Filesystem, String, Tasks } from '@youcan/cli-kit';
 
 class GenerateExtension extends AppCommand {
     static description = 'Generate an app extension';

package/dist/cli/commands/app/install.js

@@ -1,6 +1,6 @@
-import { Session, Tasks, Http, Env, System } from '@youcan/cli-kit';
-import { load } from '../../../util/app-loader.js';
 import { AppCommand } from '../../../util/app-command.js';
+import { load } from '../../../util/app-loader.js';
+import { Session, Tasks, Http, Env, System } from '@youcan/cli-kit';
 
 class Install extends AppCommand {
     static description = 'Generate an app installation URL';

package/dist/cli/services/dev/workers/app-worker.d.ts

@@ -1,6 +1,6 @@
-import { Worker } from '@youcan/cli-kit';
-import type { App } from '@/types';
 import type DevCommand from '@/cli/commands/app/dev';
+import type { App } from '@/types';
+import { Worker } from '@youcan/cli-kit';
 export default class AppWorker extends Worker.Abstract {
     private command;
     private app;

package/dist/cli/services/dev/workers/app-worker.js

@@ -1,5 +1,5 @@
-import { Worker, Filesystem, Path } from '@youcan/cli-kit';
 import { APP_CONFIG_FILENAME } from '../../../../constants.js';
+import { Worker, Filesystem, Path } from '@youcan/cli-kit';
 
 class AppWorker extends Worker.Abstract {
     command;

package/dist/cli/services/dev/workers/index.d.ts

@@ -1,10 +1,10 @@
+import type DevCommand from '@/cli/commands/app/dev';
+import type { App, Extension, Web } from '@/types';
+import type { AppCommand } from '@/util/app-command';
 import type { Cli, Services, Worker } from '@youcan/cli-kit';
-import WebWorker from './web-worker';
 import AppWorker from './app-worker';
 import TunnelWorker from './tunnel-worker';
-import type { App, Extension, Web } from '@/types';
-import type DevCommand from '@/cli/commands/app/dev';
-import type { AppCommand } from '@/util/app-command';
+import WebWorker from './web-worker';
 export interface ExtensionWorkerCtor {
     new (command: Cli.Command, app: App, extension: Extension): Worker.Interface;
 }

package/dist/cli/services/dev/workers/index.js

@@ -1,7 +1,7 @@
-import ThemeExtensionWorker from './theme-extension-worker.js';
-import WebWorker from './web-worker.js';
 import AppWorker from './app-worker.js';
+import ThemeExtensionWorker from './theme-extension-worker.js';
 import TunnelWorker from './tunnel-worker.js';
+import WebWorker from './web-worker.js';
 
 const EXTENSION_WORKERS = {
     theme: ThemeExtensionWorker,

package/dist/cli/services/dev/workers/theme-extension-worker.d.ts

@@ -1,6 +1,6 @@
+import type { App, Extension } from '@/types';
 import type { Cli } from '@youcan/cli-kit';
 import { Worker } from '@youcan/cli-kit';
-import type { App, Extension } from '@/types';
 export default class ThemeExtensionWorker extends Worker.Abstract {
     private command;
     private app;

package/dist/cli/services/dev/workers/tunnel-worker.d.ts

@@ -1,7 +1,7 @@
-import { Worker } from '@youcan/cli-kit';
-import type { Services } from '@youcan/cli-kit';
 import type { App } from '@/types';
 import type { AppCommand } from '@/util/app-command';
+import type { Services } from '@youcan/cli-kit';
+import { Worker } from '@youcan/cli-kit';
 export default class TunnelWorker extends Worker.Abstract {
     private command;
     private app;

package/dist/cli/services/dev/workers/tunnel-worker.js

@@ -27,6 +27,7 @@ class TunnelWorker extends Worker.Abstract {
                 this.app.network_config.app_url = this.url;
                 this.logger.write(`tunneled url obtained: \`${url}\``);
             }
+            attempts++;
             await System.sleep(0.5);
         }
         if (!this.url) {

package/dist/cli/services/dev/workers/web-worker.d.ts

@@ -1,5 +1,5 @@
-import { type Cli, Worker } from '@youcan/cli-kit';
 import type { App, Web } from '@/types';
+import { type Cli, Worker } from '@youcan/cli-kit';
 export default class WebWorker extends Worker.Abstract {
     private readonly command;
     private readonly app;

package/dist/cli/services/generate/generate.js

@@ -1,5 +1,5 @@
-import { Path, Filesystem, Git } from '@youcan/cli-kit';
 import { EXTENSION_CONFIG_FILENAME } from '../../../constants.js';
+import { Path, Filesystem, Git } from '@youcan/cli-kit';
 
 async function ensureExtensionDirectoryExists(name) {
     const dir = Path.join(Path.cwd(), 'extensions', name);

package/dist/util/app-command.d.ts

@@ -1,6 +1,6 @@
+import type { App } from '@/types';
 import type { Session } from '@youcan/cli-kit';
 import { Cli } from '@youcan/cli-kit';
-import type { App } from '@/types';
 export declare abstract class AppCommand extends Cli.Command {
     protected app: App;
     protected session: Session.StoreSession;

package/dist/util/app-command.js

@@ -1,5 +1,5 @@
-import { Cli, Env, Http, Filesystem, Path } from '@youcan/cli-kit';
 import { APP_CONFIG_FILENAME } from '../constants.js';
+import { Cli, Env, Http, Filesystem, Path } from '@youcan/cli-kit';
 
 class AppCommand extends Cli.Command {
     app;
@@ -13,7 +13,7 @@ class AppCommand extends Cli.Command {
             body: JSON.stringify({
                 name: this.app.config.name,
                 app_url: this.app.config.app_url,
-                redirect_urls: this.app.config.redirect_urls
+                redirect_urls: this.app.config.redirect_urls,
             }),
         });
         this.app.config = {

package/dist/util/app-loader.js

@@ -1,5 +1,5 @@
-import { Path, Filesystem } from '@youcan/cli-kit';
 import { APP_CONFIG_FILENAME, DEFAULT_EXTENSIONS_DIR, EXTENSION_CONFIG_FILENAME, DEFAULT_WEBS_DIR, WEB_CONFIG_FILENAME } from '../constants.js';
+import { Path, Filesystem } from '@youcan/cli-kit';
 
 async function load() {
     const path = Path.resolve(Path.cwd(), APP_CONFIG_FILENAME);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@youcan/app",
   "type": "module",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "description": "OCLIF plugin for building apps",
   "author": "YouCan <contact@youcan.shop> (https://youcan.shop)",
   "license": "MIT",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@oclif/core": "^2.15.0",
     "dayjs": "^1.11.10",
-    "@youcan/cli-kit": "2.3.1"
+    "@youcan/cli-kit": "2.3.3"
   },
   "devDependencies": {
     "@oclif/plugin-legacy": "^1.3.0",