adapty 0.8.4-beta.1 → 0.8.5

package/dist/commands/flows/media/upload.js

@@ -1,6 +1,6 @@
-import { Args, Command } from '@oclif/core';
 import { readFile } from 'node:fs/promises';
 import { basename, extname } from 'node:path';
+import { Args, Command } from '@oclif/core';
 import { createAuthenticatedClient } from '../../../lib/client-from-config.js';
 import { appFlag } from '../../../lib/flags.js';
 import { printResponse } from '../../../lib/output.js';

package/dist/commands/flows/publish.js

@@ -9,8 +9,8 @@ export default class FlowsPublish extends Command {
     static args = {
         flow_id: Args.string({ description: 'Flow ID (UUID)', required: true }),
     };
-    static description = 'Publish a flow (async — publication completes in the background). ' +
-        'Publishing is async: returns status `publishing`. Poll `adapty flows get <flow_id>` for `published`/`publication_failed`; on failure, `adapty flows config get <flow_id>` shows why.';
+    static description = 'Publish a flow (async — publication completes in the background). '
+        + 'Publishing is async: returns status `publishing`. Poll `adapty flows get <flow_id>` for `published`/`publication_failed`; on failure, `adapty flows config get <flow_id>` shows why.';
     static enableJsonFlag = true;
     static examples = ['<%= config.bin %> flows publish --app UUID 550e8400-e29b-41d4-a716-446655440000'];
     static flags = {
@@ -35,9 +35,9 @@ export default class FlowsPublish extends Command {
         }
         catch (error) {
             if (error instanceof ApiError && (error.statusCode === 400 || error.errorCode === 'validation_error')) {
-                this.error(`Flow publish failed: ${error.message}\n` +
-                    'Publishing needs a flow with a valid config. Fix it, then run `adapty flows publish` again:\n' +
-                    flowFixLinks(args.flow_id), { exit: 1 });
+                this.error(`Flow publish failed: ${error.message}\n`
+                    + 'Publishing needs a flow with a valid config. Fix it, then run `adapty flows publish` again:\n'
+                    + flowFixLinks(args.flow_id), { exit: 1 });
             }
             throw error;
         }

package/dist/commands/paywalls/create.js

@@ -15,7 +15,7 @@ export default class PaywallsCreate extends Command {
             multiple: true,
             required: true,
         }),
-        title: Flags.string({ description: 'Paywall title', required: true }),
+        'title': Flags.string({ description: 'Paywall title', required: true }),
     };
     async run() {
         const { flags } = await this.parse(PaywallsCreate);

package/dist/commands/paywalls/list.d.ts

@@ -1,6 +1,6 @@
 import { Command } from '@oclif/core';
 import type { PaywallDTO } from '../../lib/api-schemas.js';
-import { type PaginatedResponse } from '../../lib/flags.js';
+import type { PaginatedResponse } from '../../lib/flags.js';
 export default class PaywallsList extends Command {
     static description: string;
     static enableJsonFlag: boolean;

package/dist/commands/paywalls/placements.d.ts

@@ -1,8 +1,8 @@
 import { Command } from '@oclif/core';
 import type { PlacementSummaryDTO } from '../../lib/api-schemas.js';
-interface PlacementsByPaywallResponse {
+type PlacementsByPaywallResponse = {
     data: PlacementSummaryDTO[];
-}
+};
 export default class PaywallsPlacements extends Command {
     static args: {
         paywall_id: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;

package/dist/commands/paywalls/update.js

@@ -18,7 +18,7 @@ export default class PaywallsUpdate extends Command {
             multiple: true,
             required: true,
         }),
-        title: Flags.string({ description: 'Paywall title', required: true }),
+        'title': Flags.string({ description: 'Paywall title', required: true }),
     };
     async run() {
         const { args, flags } = await this.parse(PaywallsUpdate);

package/dist/commands/placements/create.js

@@ -14,11 +14,11 @@ export default class PlacementsCreate extends Command {
     ];
     static flags = {
         ...appFlag,
-        audiences: Flags.string({
-            description: 'JSON array of audience entries. Every entry needs an explicit content_type. ' +
-                'Paywall: {content_type:"paywall", segment_ids, paywall_id, priority}. ' +
-                'Flow: {content_type:"flow", segment_ids, flow_id, priority}. ' +
-                'A flow must be published first (flows publish) — attaching a draft flow returns 400.',
+        'audiences': Flags.string({
+            description: 'JSON array of audience entries. Every entry needs an explicit content_type. '
+                + 'Paywall: {content_type:"paywall", segment_ids, paywall_id, priority}. '
+                + 'Flow: {content_type:"flow", segment_ids, flow_id, priority}. '
+                + 'A flow must be published first (flows publish) — attaching a draft flow returns 400.',
             exactlyOne: ['paywall-id', 'audiences'],
         }),
         'developer-id': Flags.string({ description: 'Developer ID for the placement', required: true }),
@@ -26,7 +26,7 @@ export default class PlacementsCreate extends Command {
             description: 'Paywall ID (UUID). DEPRECATED: use --audiences.',
             exactlyOne: ['paywall-id', 'audiences'],
         }),
-        title: Flags.string({ description: 'Placement title', required: true }),
+        'title': Flags.string({ description: 'Placement title', required: true }),
     };
     async run() {
         const { flags } = await this.parse(PlacementsCreate);
@@ -37,13 +37,15 @@ export default class PlacementsCreate extends Command {
             title: flags.title,
         };
         if (flags['paywall-id']) {
-            process.stderr.write('⚠️  --paywall-id is deprecated. Use --audiences instead.\n' +
-                '    `paywall_id` will be removed from the API in a future release.\n');
+            process.stderr.write('⚠️  --paywall-id is deprecated. Use --audiences instead.\n'
+                + '    `paywall_id` will be removed from the API in a future release.\n');
+            // eslint-disable-next-line @typescript-eslint/no-deprecated -- FIXME if you see this
             body.paywall_id = flags['paywall-id'];
         }
         else {
             let parsed;
             try {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- FIXME if you see this
                 parsed = JSON.parse(flags.audiences);
             }
             catch (error) {
@@ -52,12 +54,14 @@ export default class PlacementsCreate extends Command {
             if (!Array.isArray(parsed)) {
                 this.error('--audiences must be a JSON array of audience entries.', { exit: 2 });
             }
-            for (const [index, entry] of parsed.entries()) {
+            const entries = parsed;
+            for (const [index, entry] of entries.entries()) {
                 const problem = audienceEntryProblem(entry);
-                if (problem)
+                if (problem) {
                     this.error(`--audiences[${index}]: ${problem}`, { exit: 2 });
+                }
             }
-            body.audiences = parsed;
+            body.audiences = entries;
         }
         const client = await createAuthenticatedClient(this.config);
         let result;
@@ -66,8 +70,9 @@ export default class PlacementsCreate extends Command {
         }
         catch (error) {
             const message = draftFlowError(error, flags.app, body.audiences);
-            if (message)
+            if (message) {
                 this.error(message, { exit: 2 });
+            }
             throw error;
         }
         this.log('Placement created!');

package/dist/commands/placements/list.d.ts

@@ -1,6 +1,6 @@
 import { Command } from '@oclif/core';
 import type { PlacementSummaryDTO } from '../../lib/api-schemas.js';
-import { type PaginatedResponse } from '../../lib/flags.js';
+import type { PaginatedResponse } from '../../lib/flags.js';
 export default class PlacementsList extends Command {
     static description: string;
     static enableJsonFlag: boolean;

package/dist/commands/placements/update.js

@@ -17,11 +17,11 @@ export default class PlacementsUpdate extends Command {
     ];
     static flags = {
         ...appFlag,
-        audiences: Flags.string({
-            description: 'JSON array of audience entries. Every entry needs an explicit content_type. ' +
-                'Paywall: {content_type:"paywall", segment_ids, paywall_id, priority}. ' +
-                'Flow: {content_type:"flow", segment_ids, flow_id, priority}. ' +
-                'A flow must be published first (flows publish) — attaching a draft flow returns 400.',
+        'audiences': Flags.string({
+            description: 'JSON array of audience entries. Every entry needs an explicit content_type. '
+                + 'Paywall: {content_type:"paywall", segment_ids, paywall_id, priority}. '
+                + 'Flow: {content_type:"flow", segment_ids, flow_id, priority}. '
+                + 'A flow must be published first (flows publish) — attaching a draft flow returns 400.',
             exactlyOne: ['paywall-id', 'audiences'],
         }),
         'developer-id': Flags.string({ description: 'Developer ID for the placement', required: true }),
@@ -29,7 +29,7 @@ export default class PlacementsUpdate extends Command {
             description: 'Paywall ID (UUID). DEPRECATED: use --audiences.',
             exactlyOne: ['paywall-id', 'audiences'],
         }),
-        title: Flags.string({ description: 'Placement title', required: true }),
+        'title': Flags.string({ description: 'Placement title', required: true }),
     };
     async run() {
         const { args, flags } = await this.parse(PlacementsUpdate);
@@ -43,16 +43,18 @@ export default class PlacementsUpdate extends Command {
             title: flags.title,
         };
         if (flags['paywall-id']) {
-            process.stderr.write('⚠️  --paywall-id is deprecated. Use --audiences instead.\n' +
-                '    `paywall_id` will be removed from the API in a future release.\n');
-            process.stderr.write('⚠️  --paywall-id will rewrite all audiences on this placement.\n' +
-                '    If the placement has segment-specific paywalls, they will be replaced\n' +
-                '    by a single default audience. Use --audiences to preserve them.\n');
+            process.stderr.write('⚠️  --paywall-id is deprecated. Use --audiences instead.\n'
+                + '    `paywall_id` will be removed from the API in a future release.\n');
+            process.stderr.write('⚠️  --paywall-id will rewrite all audiences on this placement.\n'
+                + '    If the placement has segment-specific paywalls, they will be replaced\n'
+                + '    by a single default audience. Use --audiences to preserve them.\n');
+            // eslint-disable-next-line @typescript-eslint/no-deprecated -- FIXME if you see this
             body.paywall_id = flags['paywall-id'];
         }
         else {
             let parsed;
             try {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- FIXME if you see this
                 parsed = JSON.parse(flags.audiences);
             }
             catch (error) {
@@ -61,12 +63,14 @@ export default class PlacementsUpdate extends Command {
             if (!Array.isArray(parsed)) {
                 this.error('--audiences must be a JSON array of audience entries.', { exit: 2 });
             }
-            for (const [index, entry] of parsed.entries()) {
+            const entries = parsed;
+            for (const [index, entry] of entries.entries()) {
                 const problem = audienceEntryProblem(entry);
-                if (problem)
+                if (problem) {
                     this.error(`--audiences[${index}]: ${problem}`, { exit: 2 });
+                }
             }
-            body.audiences = parsed;
+            body.audiences = entries;
         }
         const client = await createAuthenticatedClient(this.config);
         let result;
@@ -75,8 +79,9 @@ export default class PlacementsUpdate extends Command {
         }
         catch (error) {
             const message = draftFlowError(error, flags.app, body.audiences);
-            if (message)
+            if (message) {
                 this.error(message, { exit: 2 });
+            }
             throw error;
         }
         this.log('Placement updated!');

package/dist/commands/products/create.js

@@ -26,13 +26,13 @@ export default class ProductsCreate extends Command {
         'ios-product-id': Flags.string({ description: 'iOS product ID', helpGroup: 'STORE BINDINGS' }),
         'paddle-price-id': Flags.string({ description: 'Paddle price ID (requires --paddle-product-id)', helpGroup: 'STORE BINDINGS' }),
         'paddle-product-id': Flags.string({ description: 'Paddle product ID (requires --paddle-price-id)', helpGroup: 'STORE BINDINGS' }),
-        period: Flags.string({
+        'period': Flags.string({
             description: 'Subscription period (weekly, monthly, two_months, trimonthly, semiannual, annual, lifetime)',
             required: true,
         }),
         'stripe-price-id': Flags.string({ description: 'Stripe price ID (requires --stripe-product-id)', helpGroup: 'STORE BINDINGS' }),
         'stripe-product-id': Flags.string({ description: 'Stripe product ID (requires --stripe-price-id)', helpGroup: 'STORE BINDINGS' }),
-        title: Flags.string({ description: 'Product title', required: true }),
+        'title': Flags.string({ description: 'Product title', required: true }),
     };
     async run() {
         const { flags } = await this.parse(ProductsCreate);
@@ -45,10 +45,10 @@ export default class ProductsCreate extends Command {
         if (xor(flags['paddle-product-id'], flags['paddle-price-id'])) {
             this.error('--paddle-product-id and --paddle-price-id are required together', { exit: 2 });
         }
-        if (!flags['ios-product-id'] &&
-            !flags['android-product-id'] &&
-            !flags['stripe-product-id'] &&
-            !flags['paddle-product-id']) {
+        if (!flags['ios-product-id']
+            && !flags['android-product-id']
+            && !flags['stripe-product-id']
+            && !flags['paddle-product-id']) {
             this.error('At least one store binding is required (ios/android/stripe/paddle)', { exit: 2 });
         }
         if (flags['android-product-id'] && !flags['android-base-plan-id'] && flags.period !== 'lifetime') {
@@ -60,20 +60,27 @@ export default class ProductsCreate extends Command {
             period: flags.period,
             title: flags.title,
         };
-        if (flags['ios-product-id'])
+        if (flags['ios-product-id']) {
             body.ios_product_id = flags['ios-product-id'];
-        if (flags['android-product-id'])
+        }
+        if (flags['android-product-id']) {
             body.android_product_id = flags['android-product-id'];
-        if (flags['android-base-plan-id'])
+        }
+        if (flags['android-base-plan-id']) {
             body.android_base_plan_id = flags['android-base-plan-id'];
-        if (flags['stripe-product-id'])
+        }
+        if (flags['stripe-product-id']) {
             body.stripe_product_id = flags['stripe-product-id'];
-        if (flags['stripe-price-id'])
+        }
+        if (flags['stripe-price-id']) {
             body.stripe_price_id = flags['stripe-price-id'];
-        if (flags['paddle-product-id'])
+        }
+        if (flags['paddle-product-id']) {
             body.paddle_product_id = flags['paddle-product-id'];
-        if (flags['paddle-price-id'])
+        }
+        if (flags['paddle-price-id']) {
             body.paddle_price_id = flags['paddle-price-id'];
+        }
         const result = await client.post(`/apps/${flags.app}/products`, body);
         this.log('Product created!');
         printResponse(result, this.log.bind(this));

package/dist/commands/products/list.d.ts

@@ -1,6 +1,6 @@
 import { Command } from '@oclif/core';
 import type { ProductDTO } from '../../lib/api-schemas.js';
-import { type PaginatedResponse } from '../../lib/flags.js';
+import type { PaginatedResponse } from '../../lib/flags.js';
 export default class ProductsList extends Command {
     static description: string;
     static enableJsonFlag: boolean;

package/dist/commands/products/update.js

@@ -14,7 +14,7 @@ export default class ProductsUpdate extends Command {
     static flags = {
         ...appFlag,
         'access-level-id': Flags.string({ description: 'Access level ID (UUID)', required: true }),
-        title: Flags.string({ description: 'Product title', required: true }),
+        'title': Flags.string({ description: 'Product title', required: true }),
     };
     async run() {
         const { args, flags } = await this.parse(ProductsUpdate);

package/dist/commands/segments/list.d.ts

@@ -1,6 +1,6 @@
 import { Command } from '@oclif/core';
 import type { SegmentDTO } from '../../lib/api-schemas.js';
-import { type PaginatedResponse } from '../../lib/flags.js';
+import type { PaginatedResponse } from '../../lib/flags.js';
 export default class SegmentsList extends Command {
     static description: string;
     static enableJsonFlag: boolean;

package/dist/lib/api-client.d.ts

@@ -1,20 +1,22 @@
-import { type ApiErrorFormat } from './errors.js';
+import type { ApiErrorFormat } from './errors.js';
 export type QueryParams = Record<string, string | string[] | undefined>;
-export interface RequestOptions {
+export type RequestOptions = {
     headers?: Record<string, string>;
     onResponse?: (headers: Headers) => void;
-}
-export interface ApiClientOptions {
+};
+export type ApiClientOptions = {
     baseUrl?: string;
     defaultBaseUrl?: string;
     errorFormat?: ApiErrorFormat;
+    quiet?: boolean;
     token?: null | string;
     urlEnvVar?: string;
     userAgent?: string;
-}
+};
 export declare class ApiClient {
     private baseUrl;
     private errorFormat;
+    private quiet;
     private token;
     private userAgent;
     constructor(opts?: ApiClientOptions);
@@ -22,7 +24,9 @@ export declare class ApiClient {
     post<T = unknown>(path: string, body?: unknown, params?: QueryParams, opts?: RequestOptions): Promise<T>;
     postForm<T = unknown>(path: string, form: FormData, params?: QueryParams, opts?: RequestOptions): Promise<T>;
     put<T = unknown>(path: string, body?: unknown, params?: QueryParams, opts?: RequestOptions): Promise<T>;
+    private buildHeaders;
     private buildUrl;
-    private isRetryableRateLimit;
+    private isRetryableRefusal;
+    private readBody;
     private request;
 }

package/dist/lib/api-client.js

@@ -1,12 +1,16 @@
 import { ApiError, NetworkError, parseApiError } from './errors.js';
 const DEFAULT_API_URL = 'https://api-admin.adapty.io/api/v1/developer';
 const MAX_RETRY_AFTER_SECONDS = 60;
+// 429 is the caller going too fast; 503 is a dependency being down. Both name a wait and clear up on their own.
+const RETRYABLE_STATUSES = new Set([429, 503]);
 function ensureTrailingSlash(path) {
     return path.endsWith('/') ? path : `${path}/`;
 }
+const NO_RETRIES = { network: false, refused: false };
 export class ApiClient {
     baseUrl;
     errorFormat;
+    quiet;
     token;
     userAgent;
     constructor(opts = {}) {
@@ -17,6 +21,7 @@ export class ApiClient {
             process.stderr.write(`Warning: using non-default API URL: ${this.baseUrl}\n`);
         }
         this.errorFormat = opts.errorFormat ?? 'developer';
+        this.quiet = opts.quiet ?? false;
         this.token = opts.token ?? null;
         this.userAgent = opts.userAgent ?? 'adapty-cli';
     }
@@ -25,7 +30,7 @@ export class ApiClient {
     }
     async post(path, body, params, opts) {
         return this.request(this.buildUrl(path, params), {
-            body: body ? JSON.stringify(body) : undefined,
+            body: body ? JSON.stringify(body) : null,
             method: 'POST',
         }, opts);
     }
@@ -34,48 +39,70 @@ export class ApiClient {
     }
     async put(path, body, params, opts) {
         return this.request(this.buildUrl(path, params), {
-            body: body ? JSON.stringify(body) : undefined,
+            body: body ? JSON.stringify(body) : null,
             method: 'PUT',
         }, opts);
     }
+    buildHeaders(init, opts) {
+        const headers = { 'User-Agent': this.userAgent };
+        if (init.body && !(init.body instanceof FormData)) {
+            headers['Content-Type'] = 'application/json';
+        }
+        if (this.token) {
+            headers.Authorization = `Bearer ${this.token}`;
+        }
+        return { ...headers, ...opts.headers };
+    }
     buildUrl(path, params) {
         const url = `${this.baseUrl}${ensureTrailingSlash(path)}`;
-        if (!params)
+        if (!params) {
             return url;
+        }
         const search = new URLSearchParams();
         for (const [key, value] of Object.entries(params)) {
-            if (value === undefined)
+            if (value === undefined) {
                 continue;
-            for (const item of Array.isArray(value) ? value : [value])
+            }
+            for (const item of Array.isArray(value) ? value : [value]) {
                 search.append(key, item);
+            }
         }
         return search.size === 0 ? url : `${url}?${search.toString()}`;
     }
-    isRetryableRateLimit(error) {
-        return (this.errorFormat === 'asa' &&
-            error.statusCode === 429 &&
-            error.errorCode !== 'cli_cooldown_active' &&
-            error.retryAfterSeconds !== undefined &&
-            error.retryAfterSeconds <= MAX_RETRY_AFTER_SECONDS);
+    isRetryableRefusal(error) {
+        return (this.errorFormat === 'asa'
+            && RETRYABLE_STATUSES.has(error.statusCode)
+            && error.errorCode !== 'cli_cooldown_active'
+            && error.retryAfterSeconds !== undefined
+            && error.retryAfterSeconds <= MAX_RETRY_AFTER_SECONDS);
     }
-    // eslint-disable-next-line no-undef
-    async request(url, init, opts = {}, retried = false) {
-        const headers = {
-            'User-Agent': this.userAgent,
-        };
-        if (init.body && !(init.body instanceof FormData)) {
-            headers['Content-Type'] = 'application/json';
+    async readBody(response, errorOptions) {
+        try {
+            return await response.json();
         }
-        if (this.token) {
-            headers.Authorization = `Bearer ${this.token}`;
+        catch {
+            if (!response.ok) {
+                throw new ApiError(response.status, `http_${response.status}`, {}, errorOptions);
+            }
+            throw new ApiError(response.status, 'malformed_response', {}, {
+                ...errorOptions,
+                detail: `The server answered ${response.status} with a body that is not JSON, so the response was cut short `
+                    + 'rather than refused. Nothing was read; retry the request.',
+            });
         }
-        Object.assign(headers, opts.headers);
+    }
+    async request(url, init, opts = {}, retried = NO_RETRIES) {
+        const headers = this.buildHeaders(init, opts);
         let response;
         try {
             response = await fetch(url, { ...init, headers });
         }
         catch (error) {
-            throw new NetworkError(error instanceof Error ? error.message : 'Connection failed');
+            const failure = new NetworkError(error instanceof Error ? error.message : 'Connection failed');
+            if (retried.network || init.method !== 'GET') {
+                throw failure;
+            }
+            return this.request(url, init, opts, { ...retried, network: true });
         }
         opts.onResponse?.(response.headers);
         if (response.status === 204) {
@@ -83,28 +110,22 @@ export class ApiClient {
         }
         const retryAfter = Number.parseInt(response.headers.get('Retry-After') ?? '', 10);
         const errorOptions = this.errorFormat === 'asa' && !Number.isNaN(retryAfter) ? { retryAfterSeconds: retryAfter } : {};
-        let body;
-        try {
-            body = await response.json();
-        }
-        catch {
-            if (!response.ok) {
-                throw new ApiError(response.status, `http_${response.status}`, {}, errorOptions);
-            }
-            return undefined;
-        }
+        const body = await this.readBody(response, errorOptions);
         if (!response.ok) {
             const error = parseApiError(response.status, body, errorOptions, this.errorFormat);
             if (response.status === 401) {
                 error.message = 'Token expired or invalid. Run `adapty auth login`.';
             }
-            if (!retried && this.isRetryableRateLimit(error)) {
+            if (!retried.refused && this.isRetryableRefusal(error)) {
                 const seconds = error.retryAfterSeconds ?? 0;
-                process.stderr.write(`Rate limited (${error.errorCode}); waiting ${seconds}s per Retry-After, then retrying once.\n`);
+                if (!this.quiet) {
+                    const reason = error.statusCode === 429 ? 'Rate limited' : 'Temporarily unavailable';
+                    process.stderr.write(`${reason} (${error.errorCode}); waiting ${seconds}s per Retry-After, then retrying once.\n`);
+                }
                 await new Promise((resolve) => {
                     setTimeout(resolve, seconds * 1000);
                 });
-                return this.request(url, init, opts, true);
+                return this.request(url, init, opts, { ...retried, refused: true });
             }
             throw error;
         }