eoas 3.1.2 → 3.1.3

package/dist/commands/doctor.js

@@ -60,19 +60,10 @@ class Doctor extends core_1.Command {
         const privateConfig = await (0, expoConfig_1.getPrivateExpoConfigAsync)(projectDir, {
             env: process.env,
         });
-        const updateUrl = flags.url ?? (0, expoConfig_1.getExpoConfigUpdateUrl)(privateConfig);
-        if (!updateUrl) {
-            log_1.default.error("Update url is not setup in your config. Please run 'eoas init' to setup the update url, or pass --url");
+        const baseUrl = await (0, expoConfig_1.resolveServerUrl)(privateConfig, flags.url).catch(e => {
+            log_1.default.error(e.message);
             process.exit(1);
-        }
-        let baseUrl;
-        try {
-            baseUrl = new URL(updateUrl).origin;
-        }
-        catch (e) {
-            log_1.default.error('Invalid URL', e);
-            process.exit(1);
-        }
+        });
         const appId = flags.appId ?? (0, expoConfig_1.getExpoAppId)(privateConfig);
         log_1.default.log(`🩺 Probing ${baseUrl} on channel '${flags.channel}'`);
         log_1.default.newLine();

package/dist/commands/init.js

@@ -38,7 +38,7 @@ class Init extends core_1.Command {
             validate: v => !!v,
         });
         const { updateUrl: promptedUrl } = await (0, prompts_1.promptAsync)({
-            message: 'Enter the URL of your update server (ex: https://customota.com)',
+            message: 'Enter the URL of your update server (ex: https://customota.com or https://api.example.com/ota)',
             name: 'updateUrl',
             type: 'text',
             initial: ((0, expoConfig_1.getExpoConfigUpdateUrl)(config) || '').replace(/\/manifest$/, ''),
@@ -46,7 +46,7 @@ class Init extends core_1.Command {
                 return !!v && (0, utils_1.isValidUpdateUrl)(v);
             },
         });
-        let manifestEndpoint = `${promptedUrl}/manifest`;
+        let manifestEndpoint = `${promptedUrl.replace(/\/+$/, '')}/manifest`;
         const updateUrl = (0, expoConfig_1.getExpoConfigUpdateUrl)(config);
         if (updateUrl && !updateUrl.includes('expo.dev')) {
             const confirmed = await (0, prompts_1.confirmAsync)({

package/dist/commands/publish.js

@@ -51,7 +51,7 @@ class Publish extends core_1.Command {
             required: true,
         }),
         serverUrl: core_1.Flags.string({
-            description: 'URL of the self-hosted update server to publish to. Defaults to the origin of updates.url from your Expo config',
+            description: 'URL of the self-hosted update server to publish to. Defaults to updates.url from your Expo config, minus a trailing /manifest',
             required: false,
         }),
         nonInteractive: core_1.Flags.boolean({

package/dist/commands/republish.js

@@ -28,7 +28,7 @@ class Publish extends core_1.Command {
             required: true,
         }),
         serverUrl: core_1.Flags.string({
-            description: 'URL of the self-hosted update server to republish on. Defaults to the origin of updates.url from your Expo config',
+            description: 'URL of the self-hosted update server to republish on. Defaults to updates.url from your Expo config, minus a trailing /manifest',
             required: false,
         }),
     };

package/dist/commands/rollback.js

@@ -29,7 +29,7 @@ class Publish extends core_1.Command {
             required: true,
         }),
         serverUrl: core_1.Flags.string({
-            description: 'URL of the self-hosted update server to roll back on. Defaults to the origin of updates.url from your Expo config',
+            description: 'URL of the self-hosted update server to roll back on. Defaults to updates.url from your Expo config, minus a trailing /manifest',
             required: false,
         }),
         nonInteractive: core_1.Flags.boolean({

package/dist/commands/server/init.js

@@ -64,6 +64,18 @@ function isHttpUrl(value) {
         return false;
     }
 }
+/** The path of the URL without trailing slash; '' when at the root or invalid. */
+function pathPrefix(baseUrl) {
+    if (!baseUrl) {
+        return '';
+    }
+    try {
+        return new URL(baseUrl).pathname.replace(/\/+$/, '');
+    }
+    catch {
+        return '';
+    }
+}
 function shortPasswordHint(missing) {
     const short = missing.map(rule => rule
         .replace('at least 8 characters', '8+ chars')
@@ -117,8 +129,19 @@ function summaryLines(state) {
     const storageChoice = STORAGE_CHOICES.find(choice => choice.value === state.storagePick);
     const set = ACCENT;
     const later = chalk_1.default.dim('to fill later');
+    const prefix = pathPrefix(state.baseUrl);
     const rows = [
         ['Base URL', state.baseUrl ? set(state.baseUrl) : later],
+        ...(prefix
+            ? [
+                [
+                    'Path prefix',
+                    set(state.serveFromSubPath
+                        ? `${prefix} · routed by the server`
+                        : `${prefix} · stripped by the proxy`),
+                ],
+            ]
+            : []),
         ['JWT secret', state.jwtSecret ? set('generated') : later],
         ['PostgreSQL', state.dbUrl ? set(state.dbUrl) : later],
         ['Master key', set('generated, keep a backup')],
@@ -165,16 +188,39 @@ class ServerInit extends core_1.Command {
             {
                 id: 'base-url',
                 run: async () => {
-                    const value = await (0, prompts_1.textStep)('Public HTTPS URL of the server', {
-                        optional: true,
-                        initial: state.baseUrl,
-                        validate: v => isHttpUrl(v) || 'Must be a valid http(s) URL',
-                    });
-                    if (value === prompts_1.BACK) {
-                        return 'back';
+                    while (true) {
+                        const value = await (0, prompts_1.textStep)('Public HTTPS URL of the server', {
+                            optional: true,
+                            initial: state.baseUrl,
+                            validate: v => isHttpUrl(v) || 'Must be a valid http(s) URL',
+                        });
+                        if (value === prompts_1.BACK) {
+                            return 'back';
+                        }
+                        state.baseUrl = value;
+                        const prefix = pathPrefix(value);
+                        if (!prefix) {
+                            state.serveFromSubPath = undefined;
+                            return 'next';
+                        }
+                        const passthrough = await (0, prompts_1.selectStep)(`How does your proxy forward the ${prefix} prefix?`, [
+                            {
+                                title: 'It strips it',
+                                value: false,
+                                description: `${prefix}/manifest reaches the server as /manifest`,
+                            },
+                            {
+                                title: 'It passes it through',
+                                value: true,
+                                description: `the server routes under ${prefix} itself`,
+                            },
+                        ], { allowBack: true, initial: state.serveFromSubPath ?? false });
+                        if (passthrough === prompts_1.BACK) {
+                            continue;
+                        }
+                        state.serveFromSubPath = passthrough;
+                        return 'next';
                     }
-                    state.baseUrl = value;
-                    return 'next';
                 },
             },
             {
@@ -552,6 +598,7 @@ class ServerInit extends core_1.Command {
         }
         const choices = {
             baseUrl: state.baseUrl,
+            serveFromSubPath: state.serveFromSubPath,
             jwtSecret: state.jwtSecret,
             dbUrl: state.dbUrl,
             // The wizard always seals the master key in the env; storing it in AWS

package/dist/lib/expoConfig.d.ts

@@ -30,4 +30,5 @@ export type CommentedValue = {
 };
 /** Strips the comment wrappers, for the JSON path and for reading values back. */
 export declare function unwrapValue(value: any): any;
+export declare function publicServerUrl(raw: string): string;
 export declare function resolveServerUrl(config: ExpoConfig, customServerUrl?: string): Promise<string>;

package/dist/lib/expoConfig.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveServerUrl = exports.unwrapValue = exports.createOrModifyExpoConfigAsync = exports.requireExpoAppId = exports.getExpoAppId = exports.getExpoConfigUpdateUrl = exports.getPublicExpoConfigAsync = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfigAsync = exports.RequestedPlatform = void 0;
+exports.resolveServerUrl = exports.publicServerUrl = exports.unwrapValue = exports.createOrModifyExpoConfigAsync = exports.requireExpoAppId = exports.getExpoAppId = exports.getExpoConfigUpdateUrl = exports.getPublicExpoConfigAsync = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfigAsync = exports.RequestedPlatform = void 0;
 const tslib_1 = require("tslib");
 // This file is copied from eas-cli[https://github.com/expo/eas-cli] to ensure consistent user experience across the CLI.
 const config_1 = require("@expo/config");
@@ -314,6 +314,17 @@ function stringifyWithEnv(obj) {
         : value, 2);
     return json.replace(/"__RAW_EXPR_(\d+)__"/g, (_match, index) => rawExpressions[Number(index)]);
 }
+// Strips a trailing /manifest from an Expo updates.url (or --serverUrl) and
+// keeps any path prefix the server is mounted under.
+function publicServerUrl(raw) {
+    const parsed = new URL(raw);
+    let path = parsed.pathname.replace(/\/+$/, '');
+    if (path.endsWith('/manifest')) {
+        path = path.slice(0, -'/manifest'.length);
+    }
+    return `${parsed.origin}${path}`;
+}
+exports.publicServerUrl = publicServerUrl;
 // customServerUrl wins over the Expo config, so a project serving updates and
 // receiving publishes on two different origins can point the CLI at the second
 // one without touching its config.
@@ -323,7 +334,7 @@ async function resolveServerUrl(config, customServerUrl) {
         throw new Error("Update url is not setup in your config. Please run 'eoas init' to setup the update url, or pass --serverUrl");
     }
     try {
-        return new URL(updateUrl).origin;
+        return publicServerUrl(updateUrl);
     }
     catch {
         throw new Error(customServerUrl ? 'Invalid --serverUrl value.' : 'Invalid update URL.');

package/dist/lib/serverConfig/choices.d.ts

@@ -9,6 +9,8 @@ export type Deployment = 'docker' | 'binary' | 'helm';
 export type GeoipStrategy = 'proxy-headers' | 'maxmind';
 export type ServerChoices = {
     baseUrl?: string;
+    /** The server routes under BASE_URL's path itself (SERVE_FROM_SUB_PATH). */
+    serveFromSubPath?: boolean;
     jwtSecret?: string;
     dbUrl?: string;
     masterKeySource: MasterKeySource;

package/dist/lib/serverConfig/envCatalog.js

@@ -19,7 +19,14 @@ exports.ENV_SECTIONS = [
                 applies: () => true,
                 required: true,
                 value: c => or(c.baseUrl, '<https://your-ota-domain>'),
-                comment: 'Public HTTPS URL of the server; manifest and asset URLs are built from it.',
+                comment: 'Public HTTPS URL of the server, including a path prefix if the gateway mounts it under one (e.g. https://api.example.com/ota).',
+            },
+            {
+                name: 'SERVE_FROM_SUB_PATH',
+                applies: c => c.serveFromSubPath === true,
+                required: true,
+                value: () => 'true',
+                comment: "Serve every route under the BASE_URL path prefix. Remove when the gateway strips the prefix before forwarding (it only affects routing; links always use BASE_URL's path).",
             },
             {
                 name: 'JWT_SECRET',
@@ -282,6 +289,13 @@ exports.ENV_SECTIONS = [
                 value: c => or(c.adminPassword, '<strong-password>'),
                 comment: 'Policy: 8+ characters, an uppercase, a lowercase, a digit and a special character.',
             },
+            {
+                name: 'DASHBOARD_ROOT_REDIRECT',
+                applies: c => c.dashboard !== false,
+                required: false,
+                value: () => 'true',
+                comment: 'Sends / to the dashboard login. Off by default: the root stays a 404 rather than pointing every visitor at the admin UI.',
+            },
         ],
     },
     {
@@ -474,6 +488,7 @@ function inferChoicesFromEnv(env) {
     const cacheMode = (env.CACHE_MODE ?? 'local');
     return {
         baseUrl: env.BASE_URL,
+        serveFromSubPath: env.SERVE_FROM_SUB_PATH === 'true',
         jwtSecret: env.JWT_SECRET,
         dbUrl: env.DB_URL,
         masterKeySource,

package/dist/lib/utils.js

@@ -6,7 +6,23 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const log_1 = tslib_1.__importDefault(require("./log"));
 function isValidUpdateUrl(updateUrl) {
-    return updateUrl.match(/^https?:\/\/[^/]+$/) !== null;
+    try {
+        const parsed = new URL(updateUrl);
+        if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
+            return false;
+        }
+        if (!parsed.host) {
+            return false;
+        }
+        // A query or fragment would corrupt the `${url}/manifest` concatenation.
+        if (parsed.search || parsed.hash) {
+            return false;
+        }
+        return !parsed.pathname.replace(/\/+$/, '').endsWith('/manifest');
+    }
+    catch {
+        return false;
+    }
 }
 exports.isValidUpdateUrl = isValidUpdateUrl;
 // Appends pattern to the project .gitignore unless an identical rule is already

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoas",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "main": "index.js",
   "scripts": {
     "build": "tsc --project tsconfig.json",