@youcan/app 2.3.0 → 2.3.2

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

@@ -1,7 +1,8 @@
-import { Session, Tasks, UI, System, Services, Env, Http } from '@youcan/cli-kit';
 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 { 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';
@@ -43,18 +44,27 @@ class Dev extends AppCommand {
     }
     async prepareNetworkOptions() {
         const port = await System.getNextAvailablePort(3000);
-        // Start by `localhost` until a tunneled url is available
-        const appUrl = `http://localhost:${port}`;
-        this.app.networkConfig = { port, appUrl };
+        this.app.network_config = {
+            app_port: port,
+            app_url: `http://localhost:${port}`,
+        };
         const worker = await bootTunnelWorker(this, this.app, new Services.Cloudflared());
+        this.app.config = {
+            ...this.app.config,
+            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()],
+        };
+        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.networkConfig;
+        const networkConfig = this.app.network_config;
         this.app = await load();
-        this.app.networkConfig = networkConfig;
+        this.app.network_config = networkConfig;
         await this.syncAppConfig();
         await this.runWorkers(await this.prepareDevProcesses());
     }
@@ -70,18 +80,18 @@ class Dev extends AppCommand {
         return Promise.all(promises);
     }
     buildEnvironmentVariables() {
-        if (!this.app.remoteConfig) {
+        if (!this.app.remote_config) {
             throw new Error('remote app config not loaded');
         }
-        if (!this.app.networkConfig) {
+        if (!this.app.network_config) {
             throw new Error('app network config is not set');
         }
         return {
-            YOUCAN_API_KEY: this.app.remoteConfig.client_id,
-            YOUCAN_API_SECRET: this.app.remoteConfig.client_secret,
-            YOUCAN_API_SCOPES: this.app.remoteConfig.scopes.join(','),
-            APP_URL: this.app.networkConfig.appUrl,
-            PORT: this.app.networkConfig.port.toString(),
+            YOUCAN_API_KEY: this.app.remote_config.client_id,
+            YOUCAN_API_SECRET: this.app.remote_config.client_secret,
+            YOUCAN_API_SCOPES: this.app.remote_config.scopes.join(','),
+            APP_URL: this.app.network_config.app_url,
+            PORT: this.app.network_config.app_port.toString(),
         };
     }
     async openAppPreview() {

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';
@@ -16,13 +16,13 @@ class EnvShow extends AppCommand {
         await this.printEnvironmentVariables();
     }
     async printEnvironmentVariables() {
-        if (!this.app.remoteConfig) {
+        if (!this.app.remote_config) {
             throw new Error('remote app config not loaded');
         }
         this.log();
-        this.log(`${Color.yellow('YOUCAN_API_KEY')}=%s`, this.app.remoteConfig.client_id);
-        this.log(`${Color.yellow('YOUCAN_API_SECRET')}=%s`, this.app.remoteConfig.client_secret);
-        this.log(`${Color.yellow('YOUCAN_API_SCOPES')}=%s`, this.app.remoteConfig.scopes.join(','));
+        this.log(`${Color.yellow('YOUCAN_API_KEY')}=%s`, this.app.remote_config.client_id);
+        this.log(`${Color.yellow('YOUCAN_API_SECRET')}=%s`, this.app.remote_config.client_secret);
+        this.log(`${Color.yellow('YOUCAN_API_SCOPES')}=%s`, this.app.remote_config.scopes.join(','));
     }
 }
 

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;
@@ -12,4 +12,5 @@ export default class TunnelWorker extends Worker.Abstract {
     boot(): Promise<void>;
     run(): Promise<void>;
     private checkForError;
+    getUrl(): string;
 }

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

@@ -14,43 +14,40 @@ class TunnelWorker extends Worker.Abstract {
         this.logger = new Worker.Logger('tunnel', 'dim');
     }
     async boot() {
-        if (!this.app.networkConfig) {
+        if (!this.app.network_config) {
             throw new Error('app network config is not set');
         }
         this.logger.write('start tunneling the app');
-        await this.tunnelService.tunnel(this.app.networkConfig.port);
-        // Stop the execution for while and see if the tunnel is available.
-        await System.sleep(5);
-        const url = this.tunnelService.getUrl();
-        if (url) {
-            this.logger.write(`tunneled url obtained: \`${url}\``);
-            this.url = url;
-            this.app.networkConfig.appUrl = this.url;
+        await this.tunnelService.tunnel(this.app.network_config.app_port);
+        let attempts = 0;
+        while (!this.url && attempts <= 28) {
+            const url = this.tunnelService.getUrl();
+            if (url) {
+                this.url = url;
+                this.app.network_config.app_url = this.url;
+                this.logger.write(`tunneled url obtained: \`${url}\``);
+            }
+            attempts++;
+            await System.sleep(0.5);
+        }
+        if (!this.url) {
+            this.logger.write('could not establish a tunnel, using localhost instead');
         }
     }
     async run() {
-        const timeInterval = 500;
-        if (this.url) {
-            return;
-        }
-        setInterval(() => {
-            if (this.url !== null) {
-                this.checkForError();
-                return;
-            }
-            this.url = this.tunnelService.getUrl();
-            if (this.url) {
-                this.logger.write(`tunneled url obtained: \`${this.url}\``);
-                this.app.networkConfig.appUrl = this.url;
-                this.command.syncAppConfig();
-            }
-        }, timeInterval);
+        setInterval(() => this.checkForError, 500);
     }
     checkForError() {
         const error = this.tunnelService.getError();
         if (error) {
-            throw new Error(`Tunnel stopped: ${error}`);
+            throw new Error(`tunnel stopped: ${error}`);
+        }
+    }
+    getUrl() {
+        if (!this.url) {
+            throw new Error('app url not set');
         }
+        return 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/types.d.ts

@@ -64,10 +64,10 @@ export interface App {
     root: string;
     webs: Web[];
     config: AppConfig;
-    remoteConfig?: RemoteAppConfig;
-    networkConfig?: {
-        appUrl: string;
-        port: number;
+    remote_config?: RemoteAppConfig;
+    network_config?: {
+        app_url: string;
+        app_port: number;
     };
     extensions: Extension[];
 }

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;
@@ -8,18 +8,12 @@ class AppCommand extends Cli.Command {
         const endpoint = this.app.config.id == null
             ? `${Env.apiHostname()}/apps/create`
             : `${Env.apiHostname()}/apps/${this.app.config.id}/update`;
-        if (!this.app.networkConfig) {
-            throw new Error('app network config is not set');
-        }
-        const backUrl = new URL('/auth/callback', this.app.networkConfig.appUrl).toString();
         const res = await Http.post(endpoint, {
             headers: { Authorization: `Bearer ${this.session.access_token}` },
             body: JSON.stringify({
                 name: this.app.config.name,
-                app_url: this.app.networkConfig.appUrl,
-                redirect_urls: [
-                    backUrl,
-                ],
+                app_url: this.app.config.app_url,
+                redirect_urls: this.app.config.redirect_urls,
             }),
         });
         this.app.config = {
@@ -33,7 +27,7 @@ class AppCommand extends Cli.Command {
             },
         };
         await Filesystem.writeJsonFile(Path.join(this.app.root, APP_CONFIG_FILENAME), this.app.config);
-        this.app.remoteConfig = res;
+        this.app.remote_config = res;
         return this.app;
     }
 }

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.0",
+  "version": "2.3.2",
   "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.0"
+    "@youcan/cli-kit": "2.3.2"
   },
   "devDependencies": {
     "@oclif/plugin-legacy": "^1.3.0",