@uwayss/bareed 0.1.1 → 0.3.0

package/README.md

@@ -19,4 +19,21 @@ It runs `expo export`, zips the result, and asks which application and which
 runtime version to upload it to. The first upload asks for the address of your
 server and the admin password, and keeps them in `~/.config/bareed/config.json`.
 
+It offers to install your dependencies when they are missing, and to create the
+application on the server when your slug is not there yet.
+
 `bareed --login` saves them without an upload. `bareed --logout` deletes them.
+
+## In CI
+
+`--yes` asks nothing. Set `BAREED_URL` and `BAREED_PASSWORD` in the environment,
+and name the target with `--app` and `--runtime`:
+
+```bash
+bareed --yes --app your-app-slug --runtime 1.0.0
+```
+
+The password stays in the environment. Nothing is written to the config file.
+
+Without `--app` or `--runtime`, it reads your Expo config. `--yes` creates a
+runtime version that is not on the server yet, but never an application.

package/bin/bareed.js

@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+// The real CLI is a Go binary. npm installs one prebuilt package per platform
+// through optionalDependencies, and this file runs whichever one landed.
+const { spawnSync } = require("node:child_process");
+const { existsSync } = require("node:fs");
+const path = require("node:path");
+
+const target = `${process.platform}-${process.arch}`;
+const pkg = `@uwayss/bareed-${target}`;
+const binary = process.platform === "win32" ? "bareed.exe" : "bareed";
+
+function findBinary() {
+  let manifest;
+  try {
+    // Resolving package.json rather than the binary itself, because Node adds
+    // .js and .node to an extensionless path and would miss the file.
+    manifest = require.resolve(`${pkg}/package.json`);
+  } catch {
+    return null;
+  }
+
+  const file = path.join(path.dirname(manifest), "bin", binary);
+  return existsSync(file) ? file : null;
+}
+
+const file = findBinary();
+if (!file) {
+  console.error(`bareed has no prebuilt binary for ${target}.`);
+  console.error("");
+  console.error("Build it from source instead:");
+  console.error("  go install code.uwayss.com/uwayss/bareed/cmd/push@latest");
+  process.exit(1);
+}
+
+// stdio: inherit keeps the prompts and the expo export output on the terminal.
+const result = spawnSync(file, process.argv.slice(2), { stdio: "inherit" });
+
+if (result.error) {
+  console.error(`bareed could not start. ${result.error.message}`);
+  process.exit(1);
+}
+// A signal leaves status null. 128 + signal is what a shell reports.
+if (result.signal) {
+  process.exit(128 + (require("node:os").constants.signals[result.signal] ?? 0));
+}
+process.exit(result.status ?? 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uwayss/bareed",
-  "version": "0.1.1",
+  "version": "0.3.0",
   "description": "Export an Expo app and upload it to your own Bareed update server",
   "license": "MIT",
   "author": "Muhammed Antar",
@@ -13,43 +13,23 @@
     "url": "git+https://code.uwayss.com/uwayss/bareed.git",
     "directory": "packages/cli"
   },
-  "keywords": [
-    "expo",
-    "expo-updates",
-    "ota",
-    "self-hosted",
-    "cli"
-  ],
   "publishConfig": {
     "access": "public"
   },
-  "type": "module",
-  "main": "dist/index.js",
-  "bin": {
-    "bareed": "dist/index.js"
-  },
-  "files": [
-    "dist",
-    "README.md"
-  ],
+  "keywords": ["expo", "expo-updates", "ota", "self-hosted", "cli"],
   "engines": {
-    "node": ">=20.17.0"
+    "node": ">=18"
   },
-  "scripts": {
-    "dev": "tsx src/index.ts",
-    "build": "tsc",
-    "start": "node dist/index.js",
-    "typecheck": "tsc --noEmit",
-    "prepublishOnly": "pnpm run build"
-  },
-  "dependencies": {
-    "@inquirer/prompts": "^8.6.0",
-    "archiver": "^8.0.0"
+  "bin": {
+    "bareed": "bin/bareed.js"
   },
-  "devDependencies": {
-    "@types/archiver": "^8.0.0",
-    "@types/node": "^26.2.0",
-    "tsx": "^4.23.12",
-    "typescript": "^7.0.2"
+  "files": ["bin", "README.md"],
+  "optionalDependencies": {
+    "@uwayss/bareed-darwin-arm64": "0.3.0",
+    "@uwayss/bareed-darwin-x64": "0.3.0",
+    "@uwayss/bareed-linux-x64": "0.3.0",
+    "@uwayss/bareed-linux-arm64": "0.3.0",
+    "@uwayss/bareed-win32-x64": "0.3.0",
+    "@uwayss/bareed-win32-arm64": "0.3.0"
   }
 }

package/dist/api.js

@@ -1,86 +0,0 @@
-import { openAsBlob } from 'node:fs';
-import path from 'node:path';
-import { writeCredentials } from './credentials.js';
-export class ApiError extends Error {
-    status;
-    constructor(message, status) {
-        super(message);
-        this.status = status;
-    }
-}
-async function readError(res) {
-    try {
-        const body = (await res.json());
-        if (body.error)
-            return body.error;
-    }
-    catch {
-        // A proxy in front of the server can answer with HTML.
-    }
-    return `The server answered ${res.status}.`;
-}
-export async function login(serverUrl, password) {
-    let res;
-    try {
-        res = await fetch(`${serverUrl}/api/auth/login`, {
-            method: 'POST',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify({ password }),
-        });
-    }
-    catch (err) {
-        throw new ApiError(`Cannot reach ${serverUrl}. ${err instanceof Error ? err.message : 'Unknown error'}`, 0);
-    }
-    if (res.status === 401)
-        throw new ApiError('The server refused that password.', 401);
-    if (!res.ok)
-        throw new ApiError(await readError(res), res.status);
-    const body = (await res.json());
-    if (!body.token)
-        throw new ApiError('The server sent no token.', res.status);
-    return body.token;
-}
-export function createClient(credentials) {
-    let token = credentials.token;
-    async function send(pathname, init) {
-        return fetch(`${credentials.serverUrl}${pathname}`, {
-            ...init,
-            headers: { ...init.headers, authorization: `Bearer ${token}` },
-        });
-    }
-    async function call(pathname, init = {}) {
-        if (!token) {
-            token = await login(credentials.serverUrl, credentials.password);
-            writeCredentials({ ...credentials, token });
-        }
-        let res = await send(pathname, init);
-        // The token lasts seven days. The saved password buys a new one without
-        // asking, so a run days after the last one still works.
-        if (res.status === 401) {
-            token = await login(credentials.serverUrl, credentials.password);
-            writeCredentials({ ...credentials, token });
-            res = await send(pathname, init);
-        }
-        if (!res.ok)
-            throw new ApiError(await readError(res), res.status);
-        if (res.status === 204)
-            return undefined;
-        return (await res.json());
-    }
-    return {
-        serverUrl: credentials.serverUrl,
-        listApps: () => call('/api/apps'),
-        listRuntimes: (appId) => call(`/api/runtimes/${appId}`),
-        createRuntime: (appId, version) => call(`/api/runtimes/${appId}`, {
-            method: 'POST',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify({ version }),
-        }),
-        async uploadUpdate(runtimeId, zipPath) {
-            const form = new FormData();
-            // openAsBlob streams the archive off disk instead of holding it in memory.
-            form.set('update', await openAsBlob(zipPath, { type: 'application/zip' }), path.basename(zipPath));
-            await call(`/api/updates/${runtimeId}`, { method: 'POST', body: form });
-        },
-    };
-}

package/dist/credentials.js

@@ -1,46 +0,0 @@
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-const configDir = path.join(os.homedir(), '.config', 'bareed');
-const configFile = path.join(configDir, 'config.json');
-export const credentialsPath = configFile;
-export function readCredentials() {
-    let raw;
-    try {
-        raw = fs.readFileSync(configFile, 'utf8');
-    }
-    catch {
-        return null;
-    }
-    try {
-        const parsed = JSON.parse(raw);
-        if (!parsed.serverUrl || !parsed.password)
-            return null;
-        return { serverUrl: parsed.serverUrl, password: parsed.password, token: parsed.token };
-    }
-    catch {
-        return null;
-    }
-}
-export function writeCredentials(credentials) {
-    fs.mkdirSync(configDir, { recursive: true, mode: 0o700 });
-    // The file holds the admin password in clear text. Owner-only, and the mode
-    // is set again because an existing file keeps the mode it was made with.
-    fs.writeFileSync(configFile, JSON.stringify(credentials, null, 2), { mode: 0o600 });
-    fs.chmodSync(configFile, 0o600);
-}
-export function clearCredentials() {
-    try {
-        fs.unlinkSync(configFile);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-/** Accepts "localhost:4000" and "https://updates.example.com/" alike. */
-export function normalizeServerUrl(input) {
-    const trimmed = input.trim();
-    const withScheme = /^https?:\/\//i.test(trimmed) ? trimmed : `http://${trimmed}`;
-    return withScheme.replace(/\/+$/, '');
-}

package/dist/expo.js

@@ -1,91 +0,0 @@
-import { execFile, spawn } from 'node:child_process';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { promisify } from 'node:util';
-const execFileAsync = promisify(execFile);
-/** Turns "~/Code/app/", '"/Users/me/app"' and "./app" into an absolute path. */
-export function expandPath(input) {
-    let value = input.trim();
-    if ((value.startsWith('"') && value.endsWith('"')) ||
-        (value.startsWith("'") && value.endsWith("'"))) {
-        value = value.slice(1, -1);
-    }
-    // A path dragged into the terminal arrives with its spaces escaped.
-    value = value.replace(/\\ /g, ' ').trim();
-    if (value === '~')
-        value = os.homedir();
-    else if (value.startsWith('~/'))
-        value = path.join(os.homedir(), value.slice(2));
-    return path.resolve(value);
-}
-export function isExpoProject(dir) {
-    let raw;
-    try {
-        raw = fs.readFileSync(path.join(dir, 'package.json'), 'utf8');
-    }
-    catch {
-        return false;
-    }
-    try {
-        const pkg = JSON.parse(raw);
-        return Boolean(pkg.dependencies?.expo ?? pkg.devDependencies?.expo);
-    }
-    catch {
-        return false;
-    }
-}
-function shape(raw) {
-    const slugFromUrl = raw.updates?.url?.split('?')[0].replace(/\/+$/, '').split('/').pop();
-    return {
-        name: raw.name ?? raw.slug ?? 'your app',
-        // The dashboard matches on the slug in the update URL, which is the one the
-        // client asks for. It does not have to equal the Expo slug.
-        slug: slugFromUrl ?? raw.slug ?? '',
-        // A runtime version policy resolves per build, so there is no one value to
-        // preselect. Only a literal version is usable here.
-        runtimeVersion: typeof raw.runtimeVersion === 'string' ? raw.runtimeVersion : undefined,
-    };
-}
-/**
- * `app.config.js` and `app.config.ts` are code, so only Expo can resolve them.
- * `app.json` is the fallback for when the command is missing or fails.
- */
-export async function readAppConfig(dir) {
-    try {
-        const { stdout } = await execFileAsync('npx', ['expo', 'config', '--type', 'public', '--json'], {
-            cwd: dir,
-            maxBuffer: 32 * 1024 * 1024,
-        });
-        const parsed = JSON.parse(stdout);
-        return shape(parsed.expo ?? parsed);
-    }
-    catch {
-        try {
-            const raw = JSON.parse(fs.readFileSync(path.join(dir, 'app.json'), 'utf8'));
-            return shape(raw.expo ?? {});
-        }
-        catch {
-            return { name: 'your app', slug: '' };
-        }
-    }
-}
-export function exportDir(appDir) {
-    return path.join(appDir, 'dist');
-}
-export function runExport(appDir) {
-    return new Promise((resolve, reject) => {
-        const child = spawn('npx', ['expo', 'export', '--platform', 'ios', '--platform', 'android'], {
-            cwd: appDir,
-            stdio: 'inherit',
-            shell: process.platform === 'win32',
-        });
-        child.on('error', (err) => reject(new Error(`Cannot run npx. ${err.message}`)));
-        child.on('close', (code) => {
-            if (code === 0)
-                resolve();
-            else
-                reject(new Error(`The export failed. "expo export" ended with code ${code}.`));
-        });
-    });
-}

package/dist/index.js

@@ -1,152 +0,0 @@
-#!/usr/bin/env node
-import { confirm, input, password as passwordPrompt, select } from '@inquirer/prompts';
-import fs from 'node:fs';
-import path from 'node:path';
-import { createClient, login } from './api.js';
-import { clearCredentials, credentialsPath, normalizeServerUrl, readCredentials, writeCredentials, } from './credentials.js';
-import { exportDir, expandPath, isExpoProject, readAppConfig, runExport } from './expo.js';
-import { formatSize, zipDirectory } from './zip.js';
-const HELP = `Export an Expo app and upload it to your update server.
-
-Usage:
-  bareed [option]
-
-Options:
-  --login    Save the server address and the admin password, then stop.
-  --logout   Delete the saved server address and password.
-  --help     Show this text.
-
-With no option, the tool exports the app, zips the export, and offers to
-upload it.`;
-async function askForLogin(current) {
-    const serverUrl = normalizeServerUrl(await input({
-        message: 'Server address',
-        default: current?.serverUrl ?? 'http://localhost:4000',
-        validate: (value) => (value.trim() ? true : 'Type the address of your update server.'),
-    }));
-    const password = await passwordPrompt({ message: 'Admin password', mask: true });
-    const token = await login(serverUrl, password);
-    const credentials = { serverUrl, password, token };
-    writeCredentials(credentials);
-    return credentials;
-}
-async function findExpoApp() {
-    if (isExpoProject(process.cwd()))
-        return process.cwd();
-    const answer = await input({
-        message: "Where's your expo app?",
-        validate: (value) => {
-            if (!value.trim())
-                return 'Type the path to your Expo app.';
-            const dir = expandPath(value);
-            if (!fs.existsSync(dir))
-                return `There is no directory at ${dir}.`;
-            if (!isExpoProject(dir))
-                return `${dir} has no package.json that depends on expo.`;
-            return true;
-        },
-    });
-    return expandPath(answer);
-}
-async function chooseApp(client, slug) {
-    const apps = await client.listApps();
-    if (apps.length === 0) {
-        throw new Error(`${client.serverUrl} holds no applications. Create one in the dashboard.`);
-    }
-    const match = apps.find((app) => app.slug === slug);
-    return select({
-        message: 'Which application?',
-        choices: apps.map((app) => ({ name: `${app.name} (${app.slug})`, value: app })),
-        default: match,
-    });
-}
-async function chooseRuntime(client, app, wanted) {
-    const runtimes = await client.listRuntimes(app.id);
-    const match = wanted ? runtimes.find((runtime) => runtime.version === wanted) : undefined;
-    if (wanted && !match) {
-        const create = await confirm({
-            message: `${app.name} has no runtime version ${wanted} on the server. Create it?`,
-            default: true,
-        });
-        if (create)
-            return client.createRuntime(app.id, wanted);
-    }
-    if (runtimes.length === 0) {
-        throw new Error(`${app.name} has no runtime versions. Create one in the dashboard.`);
-    }
-    return select({
-        message: 'Which runtime version?',
-        choices: runtimes.map((runtime) => ({
-            name: runtime.version === wanted
-                ? `${runtime.version} (your app asks for this one)`
-                : runtime.version,
-            value: runtime,
-        })),
-        default: match,
-    });
-}
-async function run() {
-    const args = process.argv.slice(2);
-    if (args.includes('--help') || args.includes('-h')) {
-        console.log(HELP);
-        return;
-    }
-    if (args.includes('--logout')) {
-        console.log(clearCredentials() ? `Deleted ${credentialsPath}.` : 'There is nothing saved.');
-        return;
-    }
-    if (args.includes('--login')) {
-        const credentials = await askForLogin(readCredentials());
-        console.log(`Saved ${credentials.serverUrl} in ${credentialsPath}.`);
-        return;
-    }
-    const unknown = args.filter((arg) => arg.startsWith('-'));
-    if (unknown.length > 0) {
-        throw new Error(`Unknown option ${unknown[0]}. Run with --help to see the options.`);
-    }
-    const appDir = await findExpoApp();
-    const appConfig = await readAppConfig(appDir);
-    console.log(`\nExporting ${appConfig.name} in ${appDir}\n`);
-    await runExport(appDir);
-    const dist = exportDir(appDir);
-    if (!fs.existsSync(path.join(dist, 'metadata.json'))) {
-        throw new Error(`The export wrote no metadata.json to ${dist}.`);
-    }
-    const zipPath = path.join(dist, 'update.zip');
-    const size = await zipDirectory(dist, zipPath);
-    console.log(`\nMade ${zipPath} (${formatSize(size)})\n`);
-    const label = [
-        appConfig.slug ? `${appConfig.name} (${appConfig.slug})` : appConfig.name,
-        appConfig.runtimeVersion,
-    ]
-        .filter(Boolean)
-        .join(' - ');
-    if (!(await confirm({ message: 'Do you want me to upload it as well?', default: true }))) {
-        console.log(`\nThe archive is at ${zipPath}`);
-        console.log(`Upload it to "${label}" in the dashboard.`);
-        return;
-    }
-    let credentials = readCredentials();
-    if (!credentials) {
-        console.log('\nYou are not logged in yet.');
-        credentials = await askForLogin(null);
-    }
-    const client = createClient(credentials);
-    const app = await chooseApp(client, appConfig.slug);
-    const runtime = await chooseRuntime(client, app, appConfig.runtimeVersion);
-    console.log('\nUploading...');
-    await client.uploadUpdate(runtime.id, zipPath);
-    console.log(`Uploaded to ${app.name} (${app.slug}) - ${runtime.version}.`);
-}
-try {
-    await run();
-}
-catch (err) {
-    // Ctrl+C inside a question is a stop, not a failure.
-    if (err instanceof Error && err.name === 'ExitPromptError') {
-        console.log('\nStopped.');
-        process.exit(130);
-    }
-    console.error(`\n${err instanceof Error ? err.message : String(err)}`);
-    process.exit(1);
-}

package/dist/zip.js

@@ -1,39 +0,0 @@
-import { ZipArchive } from 'archiver';
-import fs from 'node:fs';
-import path from 'node:path';
-/**
- * The archive lands inside the directory it packs, so it has to leave itself
- * out. The server reads `metadata.json` at the root of the archive, so the
- * entries are the contents of the directory, not the directory itself.
- */
-export function zipDirectory(sourceDir, outPath) {
-    return new Promise((resolve, reject) => {
-        const output = fs.createWriteStream(outPath);
-        const archive = new ZipArchive({ zlib: { level: 9 } });
-        output.on('close', () => resolve(archive.pointer()));
-        output.on('error', reject);
-        archive.on('error', reject);
-        archive.on('warning', (err) => {
-            if (err.code === 'ENOENT')
-                return;
-            reject(err);
-        });
-        archive.pipe(output);
-        archive.glob('**/*', {
-            cwd: sourceDir,
-            dot: true,
-            ignore: [path.basename(outPath)],
-        });
-        void archive.finalize();
-    });
-}
-export function formatSize(bytes) {
-    const units = ['B', 'KB', 'MB', 'GB'];
-    let value = bytes;
-    let unit = 0;
-    while (value >= 1024 && unit < units.length - 1) {
-        value /= 1024;
-        unit += 1;
-    }
-    return `${value.toFixed(value >= 10 || unit === 0 ? 0 : 1)} ${units[unit]}`;
-}