ugly-app 0.1.1069 → 0.1.1071

package/dist/cli/publish/assetUpload.d.ts

@@ -0,0 +1,26 @@
+import type { RemoteObject } from './staticSync.js';
+/** Compare bytes, not filename conventions. Multipart ETags are not MD5s. */
+export declare function unchangedUploadKeys(directory: string, remote: readonly RemoteObject[]): Promise<Set<string>>;
+export interface UploadFile {
+    key: string;
+    full: string;
+    bytes: number;
+}
+export interface UploadProgress {
+    total: number;
+    uploaded: number;
+    bytes: number;
+    totalBytes: number;
+    skipped: number;
+}
+export interface UploadOptions {
+    /** Four streams by default; capped to avoid API/memory pressure. */
+    concurrency?: number;
+    onProgress?: (progress: UploadProgress) => void;
+}
+/** Stop admitting new files on failure, and settle every active upload before returning. */
+export declare function uploadFiles(files: readonly UploadFile[], skipped: number, upload: (file: UploadFile) => Promise<void>, options?: UploadOptions): Promise<{
+    uploaded: number;
+    bytes: number;
+}>;
+//# sourceMappingURL=assetUpload.d.ts.map

package/dist/cli/publish/assetUpload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assetUpload.d.ts","sourceRoot":"","sources":["../../../src/cli/publish/assetUpload.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,6EAA6E;AAC7E,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,YAAY,EAAE,GAC9B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAuBtB;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf;AACD,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,IAAI,CAAC;CACjD;AAED,4FAA4F;AAC5F,wBAAsB,WAAW,CAC/B,KAAK,EAAE,SAAS,UAAU,EAAE,EAC5B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,EAC3C,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAgD9C"}

package/dist/cli/publish/assetUpload.js

@@ -0,0 +1,82 @@
+import { createReadStream, promises as fs } from 'node:fs';
+import path from 'node:path';
+import { createHash } from 'node:crypto';
+/** Compare bytes, not filename conventions. Multipart ETags are not MD5s. */
+export async function unchangedUploadKeys(directory, remote) {
+    const unchanged = new Set();
+    for (const object of remote) {
+        const etag = object.etag?.replace(/^"|"$/g, '').toLowerCase();
+        if (!etag || !/^[a-f0-9]{32}$/.test(etag) || object.size === undefined)
+            continue;
+        const file = path.resolve(directory, object.key);
+        const relative = path.relative(path.resolve(directory), file);
+        if (relative.startsWith('..') || path.isAbsolute(relative))
+            continue;
+        let stat;
+        try {
+            stat = await fs.stat(file);
+        }
+        catch (error) {
+            if (error.code === 'ENOENT')
+                continue;
+            throw error;
+        }
+        if (!stat.isFile() || stat.size !== object.size)
+            continue;
+        const hash = createHash('md5');
+        for await (const chunk of createReadStream(file))
+            hash.update(chunk);
+        if (hash.digest('hex') === etag)
+            unchanged.add(object.key);
+    }
+    return unchanged;
+}
+/** Stop admitting new files on failure, and settle every active upload before returning. */
+export async function uploadFiles(files, skipped, upload, options = {}) {
+    const concurrency = Math.max(1, Math.min(8, Math.floor(options.concurrency ?? 4) || 4));
+    const progress = {
+        total: files.length,
+        uploaded: 0,
+        bytes: 0,
+        totalBytes: files.reduce((sum, f) => sum + f.bytes, 0),
+        skipped,
+    };
+    const report = () => {
+        if (options.onProgress)
+            options.onProgress({ ...progress });
+        else
+            console.log(`[publish-assets] ${progress.uploaded}/${progress.total} files, ` +
+                `${(progress.bytes / 1048576).toFixed(1)}/${(progress.totalBytes / 1048576).toFixed(1)} MiB uploaded; ${skipped} unchanged`);
+    };
+    report();
+    const timer = setInterval(report, 10000);
+    timer.unref();
+    let next = 0;
+    let failed = false;
+    let failure;
+    try {
+        await Promise.all(Array.from({ length: Math.min(concurrency, files.length) }, async () => {
+            while (!failed && next < files.length) {
+                const file = files[next++];
+                try {
+                    await upload(file);
+                    progress.uploaded++;
+                    progress.bytes += file.bytes;
+                }
+                catch (error) {
+                    if (!failed)
+                        failure = error;
+                    failed = true;
+                }
+            }
+        }));
+        if (failed)
+            throw failure;
+        report();
+        return { uploaded: progress.uploaded, bytes: progress.bytes };
+    }
+    finally {
+        clearInterval(timer);
+    }
+}
+//# sourceMappingURL=assetUpload.js.map

package/dist/cli/publish/assetUpload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assetUpload.js","sourceRoot":"","sources":["../../../src/cli/publish/assetUpload.ts"],"names":[],"mappings":"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"}

package/dist/cli/publish/orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../src/cli/publish/orchestrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../src/cli/publish/orchestrator.ts"],"names":[],"mappings":"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"}

package/dist/cli/publish/orchestrator.js

@@ -39,9 +39,11 @@ import { PublishError } from './errors.js';
 import { projectPackageManager } from './packageManager.js';
 import { promises as dnsPromises } from 'node:dns';
 import { getFreshCloudflareCredentials } from '../auth/cloudflareOauth.js';
+import { unchangedUploadKeys } from './assetUpload.js';
+import { createUploadTokenProvider } from './uploadAuth.js';
 import { getNeonCredentials } from '../auth/credentials.js';
 import { importTs, disposeImportTs, readUglyAppConfig, readUglyAppConfigRaw, DEFAULT_STATIC_RETENTION_DAYS, } from '../uglyappConfig.js';
-import { DEFAULT_STATIC_DIR, isContentAddressedKey, runBuildStatic, scanStaticDir, STATIC_PREFIX, } from '../staticAssets.js';
+import { DEFAULT_STATIC_DIR, runBuildStatic, scanStaticDir, STATIC_PREFIX, } from '../staticAssets.js';
 import { ensureStaticDomain, fetchZoneName, staticHostFor, } from './staticDomain.js';
 import { createApiR2Ops, createS3R2Ops } from './staticOps.js';
 import { gcBuildPrefixes, syncStaticAssets } from './staticSync.js';
@@ -1745,16 +1747,17 @@ export async function runPublish(input) {
                     if (!state.neon || !state.cloudflare || !state.proxy) {
                         throw new Error('workers-deploy: missing upstream provisioning state');
                     }
-                    const cloudflareToken = await getSecret(`cloudflare:token:${input.projectId}`);
+                    let cloudflareToken = await getSecret(`cloudflare:token:${input.projectId}`);
                     if (!cloudflareToken) {
                         throw new Error('workers-deploy: missing cloudflare:token secret');
                     }
-                    // Content-addressed keys already in the bucket. A CDN-hosted bundle
-                    // keeps the SAME keys across deploys (that's the point), so without
-                    // this the r2-upload pass below re-PUTs the whole bundle every time
-                    // even though nothing changed. `builds/{buildId}/…` keys are new
-                    // each deploy and are never in this set.
-                    const alreadyPresentStatic = new Set();
+                    const getUploadToken = createUploadTokenProvider(cloudflareToken, state.cloudflare.accountId, async (token) => {
+                        await setSecret(`cloudflare:token:${input.projectId}`, token);
+                        cloudflareToken = token;
+                    });
+                    cloudflareToken = await getUploadToken();
+                    const r2UploadDir = path.join(input.projectPath, 'dist/worker/r2-upload');
+                    let alreadyPresentStatic = new Set();
                     // Escape hatch: re-PUT every static object even though the key is
                     // already there. Needed when the OBJECT METADATA has to change —
                     // content-addressed keys mean the bytes are right, so presence alone
@@ -1777,26 +1780,16 @@ export async function runPublish(input) {
                             })
                             : createApiR2Ops({
                                 token: cloudflareToken,
+                                getToken: getUploadToken,
                                 accountId: state.cloudflare.accountId,
                                 bucket: state.cloudflare.bucket,
                             });
-                        for (const o of await probe.list(STATIC_PREFIX)) {
-                            // ⚠️ PRESENCE SKIPS CONTENT-ADDRESSED KEYS ONLY. Their md5
-                            // fragment pins the bytes (`staticKeyFor`), so an existing key
-                            // is provably the same object. A STABLE key — the character
-                            // kit's `anims/*.fbx`, UGMs, anything `staticKeyFor` never
-                            // named — keeps one name across byte changes, and skipping it
-                            // on presence meant a replaced FBX never reached the CDN
-                            // (found when a new T-Pose deployed "successfully" and the CDN
-                            // kept serving the old one). Stable keys re-PUT every deploy;
-                            // that is the price of a key that does not name its bytes.
-                            if (isContentAddressedKey(o.key))
-                                alreadyPresentStatic.add(o.key);
-                        }
+                        alreadyPresentStatic = await unchangedUploadKeys(r2UploadDir, await probe.list(STATIC_PREFIX));
                     }
-                    catch {
-                        // Listing is an optimisation. If it fails, upload everything —
-                        // slower, still correct.
+                    catch (error) {
+                        // Listing/hashing is an optimisation; fail safely by uploading.
+                        if (!forceStatic)
+                            console.warn(`[publish-assets] Cannot compare remote assets; uploading all: ${error.message}`);
                     }
                     const scriptBody = await fs.readFile(path.join(input.projectPath, 'dist/worker/worker.js'), 'utf-8');
                     // Upload the SPA assets to R2 BEFORE the Worker script lands
@@ -1804,7 +1797,6 @@ export async function runPublish(input) {
                     // /{buildId}/* directly from R2. The build:workers step
                     // staged everything under `dist/worker/r2-upload/` with
                     // paths that mirror their R2 keys exactly.
-                    const r2UploadDir = path.join(input.projectPath, 'dist/worker/r2-upload');
                     // Upload assets to R2. Preferred path: the Cloudflare REST object
                     // API authenticated with the same Bearer token (no S3 keys, fully
                     // non-interactive). If a project still has captured S3 keys (legacy
@@ -1848,6 +1840,7 @@ export async function runPublish(input) {
                     else {
                         r2Result = await cloudflare.uploadR2AssetsViaApi({
                             token: cloudflareToken,
+                            getToken: getUploadToken,
                             accountId: state.cloudflare.accountId,
                             bucket: state.cloudflare.bucket,
                             r2UploadDir,
@@ -1859,6 +1852,7 @@ export async function runPublish(input) {
                         console.log(`[publish-orchestrator] uploaded ${r2Result.uploaded} asset(s) ` +
                             `(${(r2Result.bytes / 1024).toFixed(1)} KB) to R2 ${state.cloudflare.bucket}`);
                     }
+                    cloudflareToken = await getUploadToken();
                     // ── Content-addressed static assets ─────────────────────────
                     // These do NOT go through the Worker. The bucket gets its own
                     // custom domain so Cloudflare's CDN serves them directly: a Worker
@@ -1878,6 +1872,7 @@ export async function runPublish(input) {
                         })
                         : createApiR2Ops({
                             token: cloudflareToken,
+                            getToken: getUploadToken,
                             accountId: state.cloudflare.accountId,
                             bucket: state.cloudflare.bucket,
                         });