@makefully/adaptfully 4.0.0 → 4.2.0

package/lib/node/pipeline.js

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { loadProjectConfig, resolveServerUrl } from './config.js';
+import { loadProjectConfig, resolveServerUrl, resolveAccessToken, resolveEncryptFlag } from './config.js';
 import { send } from './deploy.js';
 import { resolveBuildArtifactDir } from './artifacts.js';
 import { prebuildPlatform } from './prebuild.js';
@@ -12,6 +12,8 @@ import {
 import { steamPublishFromCli } from './steam-publish.js';
 import { googlePublishFromCli } from './google-publish.js';
 import { applePublishFromCli } from './apple-publish.js';
+import { androidKeystoreFromCli } from './android-keystore.js';
+import { appleSigningFromCli } from './apple-signing.js';
 
 /** @typedef {'prebuild' | 'build' | 'deploy' | 'release'} AdaptfullyStage */
 
@@ -20,6 +22,8 @@ const PUBLISH_COMMANDS = {
     'steam-publish': steamPublishFromCli,
     'google-publish': googlePublishFromCli,
     'apple-publish': applePublishFromCli,
+    'android-keystore': androidKeystoreFromCli,
+    'apple-signing': appleSigningFromCli,
 };
 
 /**
@@ -40,7 +44,7 @@ export function resolveWrapfullyRoute(buildSpec) {
 /**
  * @param {AdaptfullyStage} stage
  * @param {string} platformKey
- * @param {{ pkg: object, deployFolder: string, server?: string, mode?: string, deployment?: string, artifactPath?: string, log?: (message: string) => void, outputRoot?: string }} options
+ * @param {{ pkg: object, deployFolder: string, server?: string, mode?: string, deployment?: string, artifactPath?: string, log?: (message: string) => void, outputRoot?: string, accessToken?: string, encrypt?: boolean, encryptPublicKey?: string, wrapfullyConfig?: object }} options
  */
 export async function runAdaptfullyStage(stage, platformKey, options) {
     if (!VALID_STAGES.has(stage)) {
@@ -99,7 +103,7 @@ export async function runAdaptfullyStage(stage, platformKey, options) {
 
         log(
             `adaptfully: ${stage} ${platformKey} → ${buildSpec.family} `
-            + `(${buildSpec.targets.join(', ')}) via /${wrapfullyRoute}/release`,
+            + `(${buildSpec.targets.join(', ')}) via Yap /yap/wrapfully (route ${wrapfullyRoute}/release)`,
         );
 
         log(
@@ -121,6 +125,10 @@ export async function runAdaptfullyStage(stage, platformKey, options) {
                 log,
                 platformKey,
                 deploymentDirs: deploymentDirs.map((dir) => path.resolve(dir)),
+                accessToken: options.accessToken,
+                encrypt: options.encrypt,
+                encryptPublicKey: options.encryptPublicKey,
+                wrapfullyConfig: options.wrapfullyConfig,
             },
         );
 
@@ -138,7 +146,7 @@ export async function runAdaptfullyStage(stage, platformKey, options) {
         log(
             `adaptfully: ${stage} ${platformKey} → `
             + `${deploymentKey === 'zip' ? 'artifact zip' : `deployment "${deploymentKey}"`} `
-            + `via Wrapfully /${wrapfullyRoute}/${wrapStage} (${buildSpec.family})`,
+            + `via Yap /yap/wrapfully (route ${wrapfullyRoute}/${wrapStage}, ${buildSpec.family})`,
         );
 
         if (deploymentDirs.length) {
@@ -165,6 +173,10 @@ export async function runAdaptfullyStage(stage, platformKey, options) {
                 platformKey,
                 deploymentKey: wrapStage === 'deploy' ? deploymentKey : undefined,
                 artifactPath,
+                accessToken: options.accessToken,
+                encrypt: options.encrypt,
+                encryptPublicKey: options.encryptPublicKey,
+                wrapfullyConfig: options.wrapfullyConfig,
             },
         );
 
@@ -190,7 +202,7 @@ export async function adaptfullyFromCli(argv = process.argv) {
     }
 
     const stage = command;
-    const { positionals, deployment, artifactPath } = parseStageArgs(argv.slice(3));
+    const { positionals, deployment, artifactPath, encrypt, encryptPublicKey } = parseStageArgs(argv.slice(3));
     const platformKey = positionals[0];
     const cliServer = positionals[1];
     const mode = positionals[2] ?? 'extract';
@@ -198,29 +210,42 @@ export async function adaptfullyFromCli(argv = process.argv) {
     if (!stage || !platformKey) {
         throw new Error(
             'Usage:\n'
-            + '  adaptfully <prebuild|build|deploy|release> <platform> [server] [mode] [--deployment <key>] [--artifact <path>]\n'
+            + '  adaptfully <prebuild|build|deploy|release> <platform> [showfullyServer] [mode]\n'
+            + '    [--deployment <key>] [--artifact <path>] [--encrypt] [--encrypt-public-key <pem|path>]\n'
             + '  adaptfully steam-publish [--username U] [--password P] [--deployment steam] [--output path]\n'
             + '  adaptfully google-publish [--from service-account.json] [--deployment android] [--output path]\n'
             + '  adaptfully apple-publish [--deployment ios] [--category C] [--identity I] [--username U] [--password P]\n'
+            + '  adaptfully android-keystore [--deployment android] [--debug-only] [--yes]\n'
+            + '  adaptfully apple-signing [--deployment ios] [--kind development|distribution] [--csr-only] [--from-cer path] [--provision path]\n'
             + '\n'
             + 'Stages:\n'
             + '  prebuild  Copy deploy/ and apply platform registrations → output/<platform>-prebuild/\n'
-            + '  build     prebuild + POST /{target|family}/build (zip artifact only)\n'
-            + '  deploy    POST /deploy/{key} with prior artifact + deployment credentials\n'
-            + '  release   prebuild + POST /{target|family}/release (build + configured deployments)\n'
+            + '  build     prebuild + POST /yap/wrapfully (zip artifact only; Showfully PAT required)\n'
+            + '  deploy    Yap deploy chore with prior artifact + deployment credentials\n'
+            + '  release   Yap release chore (build + configured deployments)\n'
             + '\n'
             + '  --deployment <key>  Target a single named deployment.\n'
             + '  --artifact <path>   Prior build artifact directory (deploy only; default: ./output/ after build).\n'
+            + '  --encrypt           Envelope-encrypt chore to Wrapfully (optional; default key embedded).\n'
+            + '  --encrypt-public-key <pem|path>  Override Wrapfully public key when encrypting.\n'
+            + '\n'
+            + 'Auth / server (wrapfully.json or env):\n'
+            + '  SHOWFULLY_PAT / accessToken   required PAT from play.makefullystudios.com Settings\n'
+            + '  SHOWFULLY_SERVER / server     Showfully Yap base (default https://make.makefullystudios.com/)\n'
             + '\n'
             + 'Publish credential helpers (one-time local setup):\n'
-            + '  steam-publish   Install steamcmd if needed, log in, write steam deployment steam.json\n'
-            + '  google-publish  Import a Play service-account JSON into the android deployment folder\n'
-            + '  apple-publish   Write App Store Connect credentials into the ios deployment folder',
+            + '  steam-publish     Install steamcmd if needed, log in, write steam deployment steam.json\n'
+            + '  google-publish    Import a Play service-account JSON into the android deployment folder\n'
+            + '  apple-publish     Write App Store Connect credentials into the ios deployment folder\n'
+            + '  android-keystore  Generate debug/release keystores and write android build.json\n'
+            + '  apple-signing     Generate CSR, export .p12, place provisioning profiles under ios/apple/',
         );
     }
 
     const { pkg, wrapfullyConfig } = await loadProjectConfig();
     const server = resolveServerUrl(wrapfullyConfig, cliServer);
+    const accessToken = resolveAccessToken(wrapfullyConfig);
+    const encryptFlag = resolveEncryptFlag(wrapfullyConfig, encrypt);
     const deployFolder = pkg.config?.deployFolder || 'deploy';
 
     return runAdaptfullyStage(/** @type {AdaptfullyStage} */ (stage), platformKey, {
@@ -230,18 +255,24 @@ export async function adaptfullyFromCli(argv = process.argv) {
         mode,
         deployment,
         artifactPath,
+        accessToken,
+        encrypt: encryptFlag,
+        encryptPublicKey,
+        wrapfullyConfig,
     });
 }
 
 /**
  * @param {string[]} args
- * @returns {{ positionals: string[], deployment?: string, artifactPath?: string }}
+ * @returns {{ positionals: string[], deployment?: string, artifactPath?: string, encrypt?: boolean, encryptPublicKey?: string }}
  */
 export function parseStageArgs(args) {
     /** @type {string[]} */
     const positionals = [];
     let deployment;
     let artifactPath;
+    let encrypt;
+    let encryptPublicKey;
 
     for (let i = 0; i < args.length; i++) {
         const arg = args[i];
@@ -254,10 +285,16 @@ export function parseStageArgs(args) {
             artifactPath = args[++i];
         } else if (arg.startsWith('--artifact=')) {
             artifactPath = arg.slice('--artifact='.length);
+        } else if (arg === '--encrypt') {
+            encrypt = true;
+        } else if (arg === '--encrypt-public-key' && args[i + 1]) {
+            encryptPublicKey = args[++i];
+        } else if (arg.startsWith('--encrypt-public-key=')) {
+            encryptPublicKey = arg.slice('--encrypt-public-key='.length);
         } else {
             positionals.push(arg);
         }
     }
 
-    return { positionals, deployment, artifactPath };
+    return { positionals, deployment, artifactPath, encrypt, encryptPublicKey };
 }

package/lib/node/publish-credentials.js

@@ -211,13 +211,33 @@ export async function promptRequired(prompt, existing) {
     }
 }
 
+/**
+ * @param {string} prompt
+ * @param {boolean} [defaultYes=false]
+ * @returns {Promise<boolean>}
+ */
+export async function promptConfirm(prompt, defaultYes = false) {
+    const rl = readline.createInterface({ input, output });
+    const suffix = defaultYes ? ' [Y/n] ' : ' [y/N] ';
+
+    try {
+        const answer = String(await rl.question(`${prompt}${suffix}`)).trim().toLowerCase();
+        if (!answer) {
+            return defaultYes;
+        }
+        return answer === 'y' || answer === 'yes';
+    } finally {
+        rl.close();
+    }
+}
+
 /**
  * Parse shared CLI flags used by publish credential helpers.
  * @param {string[]} argv
  * @param {number} [startIndex=3]
  */
 export function parsePublishCredentialArgv(argv, startIndex = 3) {
-    /** @type {Record<string, string>} */
+    /** @type {Record<string, string | boolean>} */
     const options = {
         projectRoot: '.',
     };
@@ -243,6 +263,32 @@ export function parsePublishCredentialArgv(argv, startIndex = 3) {
             options.username = argv[++i];
         } else if (arg === '--password' && argv[i + 1]) {
             options.password = argv[++i];
+        } else if (arg === '--debug-only') {
+            options.debugOnly = true;
+        } else if (arg === '--csr-only') {
+            options.csrOnly = true;
+        } else if (arg === '--yes' || arg === '-y') {
+            options.yes = true;
+        } else if (arg === '--from-cer' && argv[i + 1]) {
+            options.fromCer = normalizeUserPath(argv[++i]);
+        } else if (arg === '--kind' && argv[i + 1]) {
+            options.kind = argv[++i];
+        } else if (arg === '--provision' && argv[i + 1]) {
+            options.provision = normalizeUserPath(argv[++i]);
+        } else if (arg === '--workdir' && argv[i + 1]) {
+            options.workdir = normalizeUserPath(argv[++i]);
+        } else if (arg === '--alias' && argv[i + 1]) {
+            options.alias = argv[++i];
+        } else if (arg === '--store-password' && argv[i + 1]) {
+            options.storePassword = argv[++i];
+        } else if (arg === '--key-password' && argv[i + 1]) {
+            options.keyPassword = argv[++i];
+        } else if (arg === '--p12-password' && argv[i + 1]) {
+            options.p12Password = argv[++i];
+        } else if (arg === '--cn' && argv[i + 1]) {
+            options.cn = argv[++i];
+        } else if (arg === '--email' && argv[i + 1]) {
+            options.email = argv[++i];
         }
     }
 

package/lib/node/wrapfullyDefaultPublicKey.js

@@ -0,0 +1,17 @@
+/**
+ * Default Makefully Wrapfully fleet public key (kid: makefully-wrapfully-1).
+ * Private key lives only on Wrapfully workers (WRAPFULLY_PRIVATE_KEY / cred.json).
+ * Safe to embed in clients — used only to wrap chore AES keys when encrypt: true.
+ */
+export const WRAPFULLY_DEFAULT_KID = 'makefully-wrapfully-1';
+
+export const WRAPFULLY_DEFAULT_PUBLIC_KEY = `-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArbQGAXiX+XtnsdS0yUPj
+dgM2Vt8lwDXPtLxzjYD45fr/NEOct0+ECsvr3jyIB/cVCjINpJJyKGEBvZk8woFj
+FgyodSWjJrc1UsomeOz6IcOArWu6GnkFo0jn8R0FN8LOhEl1xjqT7VPzF4jd7/P5
+4WBNeB+wjkY/XBmk5wsNLvGaREp8G4fFfMgDNPpTUy7RB8ezolTiWZH0KgiXZtM8
+yUXk5YBPxTwI28wCB6Om5RGmwozWc66k29qZQRv5d4GRMSM18lMKh3gkjptZRhRD
+D48bKDQwYPX8CWcpl/Q9qm2L0wtikjQWro1NsAreqa3r91wlrsYZ82stYIyKBYhW
+LwIDAQAB
+-----END PUBLIC KEY-----
+`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@makefully/adaptfully",
-    "version": "4.0.0",
+    "version": "4.2.0",
     "description": "Platform abstraction and Wrapfully deploy client for Makefully games",
     "type": "module",
     "main": "./lib/node/index.js",
@@ -17,6 +17,7 @@
     "files": [
         "bin",
         "lib",
+        "docs",
         "CHANGELOG.md",
         "LICENSE",
         "README.md"