@sitepong/fastnode 0.3.0 → 0.3.2

package/dist/cli/index.d.cts

@@ -1,7 +1,7 @@
 import { Command } from 'commander';
-import { A as AppStoreConnectClient } from '../index-DrmS802s.cjs';
-import '../enums-yXNVh3UI.cjs';
-import '../apple-session-jUzBrql5.cjs';
+import { A as AppStoreConnectClient } from '../index-HWWl6HEL.cjs';
+import '../enums-BlpayMTx.cjs';
+import '../apple-session-D6x7Jo3D.cjs';
 
 declare function resolveClientFromEnv(): Promise<AppStoreConnectClient>;
 

package/dist/cli/index.d.ts

@@ -1,7 +1,7 @@
 import { Command } from 'commander';
-import { A as AppStoreConnectClient } from '../index-lsuS2R1T.js';
-import '../enums-yXNVh3UI.js';
-import '../apple-session-jUzBrql5.js';
+import { A as AppStoreConnectClient } from '../index-SyCMBpNN.js';
+import '../enums-BlpayMTx.js';
+import '../apple-session-D6x7Jo3D.js';
 
 declare function resolveClientFromEnv(): Promise<AppStoreConnectClient>;
 

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 import * as x509 from '@peculiar/x509';
 import { randomUUID, createHash, webcrypto, randomBytes, pbkdf2Sync, createCipheriv, createDecipheriv } from 'crypto';
 import { spawn, execFile, execFileSync } from 'child_process';
-import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, copyFileSync, mkdtempSync, rmSync, chmodSync } from 'fs';
+import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, chmodSync, unlinkSync, copyFileSync, mkdtempSync, rmSync } from 'fs';
 import { join, extname, resolve, basename, relative } from 'path';
 import { homedir, tmpdir } from 'os';
 import { promisify } from 'util';
@@ -1755,20 +1755,6 @@ var init_srp = __esm({
     };
   }
 });
-
-// src/client/apple-session.ts
-var apple_session_exports = {};
-__export(apple_session_exports, {
-  ProgramLicenseAgreementError: () => ProgramLicenseAgreementError,
-  appleJson: () => appleJson,
-  beginLogin: () => beginLogin,
-  checkPortalResponse: () => checkPortalResponse,
-  fetchServiceKey: () => fetchServiceKey,
-  loginWithAppleId: () => loginWithAppleId,
-  requestSmsCode: () => requestSmsCode,
-  serviceKeyFromLocation: () => serviceKeyFromLocation,
-  submitTwoFactorCode: () => submitTwoFactorCode
-});
 async function appleJson(res, what) {
   const text = await res.text();
   try {
@@ -6975,6 +6961,90 @@ var init_app_asset_library_placements = __esm({
   }
 });
 
+// src/client/session-store.ts
+var session_store_exports = {};
+__export(session_store_exports, {
+  clearAppleSession: () => clearAppleSession,
+  lastAppleId: () => lastAppleId,
+  loadAppleSession: () => loadAppleSession,
+  saveAppleSession: () => saveAppleSession,
+  sessionDir: () => sessionDir,
+  signInWithAppleId: () => signInWithAppleId
+});
+function sessionDir() {
+  return process.env.FASTNODE_SESSION_DIR || join(homedir(), ".fastnode", "sessions");
+}
+function fileFor(email) {
+  const key = createHash("sha256").update(email.trim().toLowerCase()).digest("hex").slice(0, 16);
+  return join(sessionDir(), `${key}.json`);
+}
+function ensureDir() {
+  const dir = sessionDir();
+  if (!existsSync(dir)) mkdirSync(dir, { recursive: true, mode: 448 });
+  chmodSync(dir, 448);
+}
+function saveAppleSession(session) {
+  ensureDir();
+  const stored = { email: session.userEmail, savedAt: (/* @__PURE__ */ new Date()).toISOString(), session };
+  const path = fileFor(session.userEmail);
+  writeFileSync(path, JSON.stringify(stored), { mode: 384 });
+  chmodSync(path, 384);
+  writeFileSync(join(sessionDir(), "last-apple-id"), session.userEmail, { mode: 384 });
+}
+function clearAppleSession(email) {
+  const path = fileFor(email);
+  if (existsSync(path)) unlinkSync(path);
+}
+function lastAppleId() {
+  try {
+    return readFileSync(join(sessionDir(), "last-apple-id"), "utf8").trim() || null;
+  } catch {
+    return null;
+  }
+}
+async function loadAppleSession(email, fetchImpl = fetch) {
+  const path = fileFor(email);
+  if (!existsSync(path)) return null;
+  let stored;
+  try {
+    stored = JSON.parse(readFileSync(path, "utf8"));
+  } catch {
+    return null;
+  }
+  const cookie = Object.entries(stored.session.cookies).map(([k, v]) => `${k}=${v}`).join("; ");
+  try {
+    const res = await fetchImpl(OLYMPUS_SESSION2, { headers: { Cookie: cookie, Accept: "application/json" } });
+    if (!res.ok) {
+      clearAppleSession(email);
+      return null;
+    }
+  } catch {
+    return null;
+  }
+  return stored.session;
+}
+async function signInWithAppleId(options) {
+  const email = options.email || lastAppleId() || await options.askEmail();
+  if (!options.fresh) {
+    const saved = await loadAppleSession(email);
+    if (saved) {
+      options.onLog?.(`Using saved Apple ID session for ${email}`);
+      return saved;
+    }
+  }
+  const password = await options.askPassword(email);
+  const session = await loginWithAppleId({ email, password, onLog: options.onLog });
+  saveAppleSession(session);
+  return session;
+}
+var OLYMPUS_SESSION2;
+var init_session_store = __esm({
+  "src/client/session-store.ts"() {
+    init_apple_session();
+    OLYMPUS_SESSION2 = "https://appstoreconnect.apple.com/olympus/v1/session";
+  }
+});
+
 // src/client/portal.ts
 function pickUniqueKeyName(base, taken) {
   if (!taken.has(base)) return base;
@@ -7742,6 +7812,7 @@ var init_iris = __esm({
       session;
       cookieStr;
       buildHeaders() {
+        this.cookieStr = Object.entries(this.session.cookies).map(([k, v]) => `${k}=${v}`).join("; ");
         return {
           Cookie: this.cookieStr,
           Accept: "application/vnd.api+json, application/json, text/plain, */*",
@@ -8052,8 +8123,14 @@ __export(client_exports, {
   TokenManager: () => TokenManager,
   beginLogin: () => beginLogin,
   checkPortalResponse: () => checkPortalResponse,
+  clearAppleSession: () => clearAppleSession,
+  lastAppleId: () => lastAppleId,
+  loadAppleSession: () => loadAppleSession,
   loginWithAppleId: () => loginWithAppleId,
   requestSmsCode: () => requestSmsCode,
+  saveAppleSession: () => saveAppleSession,
+  sessionDir: () => sessionDir,
+  signInWithAppleId: () => signInWithAppleId,
   submitTwoFactorCode: () => submitTwoFactorCode
 });
 var AppStoreConnectClient;
@@ -8101,6 +8178,7 @@ var init_client = __esm({
     init_auth();
     init_request();
     init_apple_session();
+    init_session_store();
     init_portal();
     init_iris();
     AppStoreConnectClient = class {
@@ -9351,6 +9429,41 @@ var init_options = __esm({
   }
 });
 
+// src/client/providers.ts
+function cookieHeader(session) {
+  return Object.entries(session.cookies).map(([k, v]) => `${k}=${v}`).join("; ");
+}
+function absorbCookies(session, res) {
+  for (const raw of res.headers.getSetCookie?.() ?? []) {
+    const m = raw.match(/^([^=]+)=([^;]*)/);
+    if (m) session.cookies[m[1]] = m[2];
+  }
+}
+async function listProviders(session) {
+  const res = await fetch(OLYMPUS_SESSION3, { headers: { Cookie: cookieHeader(session), Accept: "application/json" } });
+  absorbCookies(session, res);
+  const info = await res.json().catch(() => null);
+  const pick = (p) => p?.providerId != null ? { providerId: Number(p.providerId), name: String(p.name ?? p.providerId) } : null;
+  const providers = (info?.availableProviders ?? []).map(pick).filter((p) => !!p);
+  return { current: pick(info?.provider), providers };
+}
+async function switchProvider(session, providerId) {
+  const res = await fetch(OLYMPUS_SESSION3, {
+    method: "POST",
+    headers: { Cookie: cookieHeader(session), "Content-Type": "application/json", Accept: "application/json" },
+    body: JSON.stringify({ provider: { providerId } })
+  });
+  absorbCookies(session, res);
+  if (res.ok) session.teamId = String(providerId);
+  return res.ok;
+}
+var OLYMPUS_SESSION3;
+var init_providers = __esm({
+  "src/client/providers.ts"() {
+    OLYMPUS_SESSION3 = "https://appstoreconnect.apple.com/olympus/v1/session";
+  }
+});
+
 // src/privacy/index.ts
 var privacy_exports = {};
 __export(privacy_exports, {
@@ -9386,15 +9499,6 @@ async function iris(session, method, path, body) {
   }
   return { status: res.status, body: parsed, text };
 }
-function cookieHeader(session) {
-  return Object.entries(session.cookies).map(([k, v]) => `${k}=${v}`).join("; ");
-}
-function absorbCookies(session, res) {
-  for (const raw of res.headers.getSetCookie?.() ?? []) {
-    const m = raw.match(/^([^=]+)=([^;]*)/);
-    if (m) session.cookies[m[1]] = m[2];
-  }
-}
 function fail(what, r) {
   const detail = r.body?.errors?.map((e) => e.detail ?? e.title).join("; ") || r.text.slice(0, 300);
   throw new Error(`${what} failed (HTTP ${r.status}): ${detail}`);
@@ -9402,20 +9506,10 @@ function fail(what, r) {
 async function selectProviderForApp(session, appId, onLog) {
   const owns = async () => (await iris(session, "GET", `/apps/${appId}?fields[apps]=name`)).status === 200;
   if (await owns()) return;
-  const res = await fetch(OLYMPUS_SESSION2, { headers: { Cookie: cookieHeader(session), Accept: "application/json" } });
-  absorbCookies(session, res);
-  const info = await res.json().catch(() => null);
-  const providers = info?.availableProviders ?? [];
+  const { providers } = await listProviders(session);
   for (const p of providers) {
-    const sw = await fetch(OLYMPUS_SESSION2, {
-      method: "POST",
-      headers: { Cookie: cookieHeader(session), "Content-Type": "application/json", Accept: "application/json" },
-      body: JSON.stringify({ provider: { providerId: p.providerId } })
-    });
-    absorbCookies(session, sw);
-    if (sw.ok && await owns()) {
+    if (await switchProvider(session, p.providerId) && await owns()) {
       onLog?.(`Switched to team "${p.name}"`);
-      session.teamId = String(p.providerId);
       return;
     }
   }
@@ -9506,11 +9600,11 @@ function validateUsages(usages) {
     if (linked && unlinked) throw new Error(`${u.category} cannot be both linked and not linked to the user.`);
   }
 }
-var IRIS_BASE2, OLYMPUS_SESSION2, DATA_USAGE_CATEGORIES, DATA_USAGE_PURPOSES, DATA_PROTECTIONS;
+var IRIS_BASE2, DATA_USAGE_CATEGORIES, DATA_USAGE_PURPOSES, DATA_PROTECTIONS;
 var init_privacy = __esm({
   "src/privacy/index.ts"() {
+    init_providers();
     IRIS_BASE2 = "https://appstoreconnect.apple.com/iris/v1";
-    OLYMPUS_SESSION2 = "https://appstoreconnect.apple.com/olympus/v1/session";
     DATA_USAGE_CATEGORIES = [
       "PAYMENT_INFORMATION",
       "CREDIT_AND_FRAUD",
@@ -9939,14 +10033,18 @@ function createLanesCommand() {
   });
 }
 function createPrivacyCommand() {
-  return new Command("privacy").description("Upload App Privacy details (nutrition labels) to App Store Connect").requiredOption("--app-id <id>", "App Store Connect app id (numeric Apple ID)").requiredOption("-j, --json-path <path>", "Fastlane-format app_privacy_details.json").option("-u, --username <email>", "Apple ID", process.env.FASTNODE_USER ?? process.env.FASTLANE_USER).option("--skip-publish", "Save the answers without publishing them", false).action(async (opts) => {
-    const { loginWithAppleId: loginWithAppleId2 } = await Promise.resolve().then(() => (init_apple_session(), apple_session_exports));
+  return new Command("privacy").description("Upload App Privacy details (nutrition labels) to App Store Connect").requiredOption("--app-id <id>", "App Store Connect app id (numeric Apple ID)").requiredOption("-j, --json-path <path>", "Fastlane-format app_privacy_details.json").option("-u, --username <email>", "Apple ID (defaults to the last one signed in)", process.env.FASTNODE_USER ?? process.env.FASTLANE_USER).option("--fresh-login", "Ignore the saved Apple ID session and sign in again", false).option("--skip-publish", "Save the answers without publishing them", false).action(async (opts) => {
+    const { signInWithAppleId: signInWithAppleId2, saveAppleSession: saveAppleSession2 } = await Promise.resolve().then(() => (init_session_store(), session_store_exports));
     const { uploadAppPrivacyDetails: uploadAppPrivacyDetails2, validateUsages: validateUsages2 } = await Promise.resolve().then(() => (init_privacy(), privacy_exports));
     const usages = JSON.parse(readFileSync(opts.jsonPath, "utf8"));
     validateUsages2(usages);
-    const email = opts.username || await ask("Apple ID: ");
-    const password = process.env.FASTNODE_PASSWORD ?? process.env.FASTLANE_PASSWORD ?? await ask(`Password for ${email}: `, true);
-    const session = await loginWithAppleId2({ email, password, onLog: (m) => console.log(m) });
+    const session = await signInWithAppleId2({
+      email: opts.username,
+      askEmail: () => ask("Apple ID: "),
+      askPassword: async (email) => process.env.FASTNODE_PASSWORD ?? process.env.FASTLANE_PASSWORD ?? await ask(`Password for ${email}: `, true),
+      fresh: opts.freshLogin,
+      onLog: (m) => console.log(m)
+    });
     const result = await uploadAppPrivacyDetails2({
       session,
       appId: opts.appId,
@@ -9954,6 +10052,7 @@ function createPrivacyCommand() {
       skipPublish: opts.skipPublish,
       onLog: (m) => console.log(m)
     });
+    saveAppleSession2(session);
     console.log(`Done: ${result.created} answers${result.published ? ", published" : ""}.`);
   });
 }
@@ -9976,12 +10075,16 @@ function ask(question, secret = false) {
   });
 }
 function createRejectionsCommand() {
-  return new Command("rejections").description("Show App Review's Resolution Center messages and rejection reasons").requiredOption("--app-id <ids...>", "App Store Connect app id(s) (numeric Apple ID)").option("-u, --username <email>", "Apple ID", process.env.FASTNODE_USER ?? process.env.FASTLANE_USER).option("--all", "Include resolved submissions, not just ones awaiting you", false).option("--json", "Print JSON instead of text", false).action(async (opts) => {
-    const { loginWithAppleId: loginWithAppleId2 } = await Promise.resolve().then(() => (init_apple_session(), apple_session_exports));
+  return new Command("rejections").description("Show App Review's Resolution Center messages and rejection reasons").requiredOption("--app-id <ids...>", "App Store Connect app id(s) (numeric Apple ID)").option("-u, --username <email>", "Apple ID (defaults to the last one signed in)", process.env.FASTNODE_USER ?? process.env.FASTLANE_USER).option("--fresh-login", "Ignore the saved Apple ID session and sign in again", false).option("--all", "Include resolved submissions, not just ones awaiting you", false).option("--json", "Print JSON instead of text", false).action(async (opts) => {
+    const { signInWithAppleId: signInWithAppleId2, saveAppleSession: saveAppleSession2 } = await Promise.resolve().then(() => (init_session_store(), session_store_exports));
     const { getReviewFeedback: getReviewFeedback2 } = await Promise.resolve().then(() => (init_review(), review_exports));
-    const email = opts.username || await ask2("Apple ID: ");
-    const password = process.env.FASTNODE_PASSWORD ?? process.env.FASTLANE_PASSWORD ?? await ask2(`Password for ${email}: `, true);
-    const session = await loginWithAppleId2({ email, password, onLog: (m) => console.error(m) });
+    const session = await signInWithAppleId2({
+      email: opts.username,
+      askEmail: () => ask2("Apple ID: "),
+      askPassword: async (email) => process.env.FASTNODE_PASSWORD ?? process.env.FASTLANE_PASSWORD ?? await ask2(`Password for ${email}: `, true),
+      fresh: opts.freshLogin,
+      onLog: (m) => console.error(m)
+    });
     const all = {};
     for (const appId of opts.appId) {
       const feedback = await getReviewFeedback2(session, appId, { onlyOpen: !opts.all, onLog: (m) => console.error(m) });
@@ -10004,6 +10107,7 @@ Submission ${s.submissionId} \u2014 ${s.state} (submitted ${s.submittedDate ?? "
         }
       }
     }
+    saveAppleSession2(session);
     if (opts.json) console.log(JSON.stringify(all, null, 2));
   });
 }