@steve31415/baselib 2.4.0 → 2.4.2

package/dist/deploy/deploy.js

@@ -263,8 +263,27 @@ export async function runDeploy(options) {
             if (!newRevision || newRevision === current.revision) {
                 throw new Error(`${service.name}: expected a new revision, got ${newRevision || 'none'}`);
             }
-            if (after.status?.latestReadyRevisionName !== newRevision) {
-                throw new Error(`${service.name}: revision ${newRevision} is not ready`);
+            // On a traffic-pinned service, `services update` can return before the
+            // 0%-traffic revision reports Ready — poll the revision itself.
+            let ready = false;
+            let lastCondition = '';
+            for (let attempt = 0; attempt < 60; attempt += 1) {
+                const revision = await mustJson(runner, 'gcloud', [
+                    'run', 'revisions', 'describe', newRevision,
+                    ...gcloudBase, '--region', config.region, '--format=json',
+                ]);
+                const condition = (revision.status?.conditions ?? []).find((c) => c.type === 'Ready');
+                if (condition?.status === 'True') {
+                    ready = true;
+                    break;
+                }
+                lastCondition = condition?.message ?? condition?.status ?? 'unknown';
+                if (condition?.status === 'False')
+                    break; // terminal failure — stop polling
+                await sleep(2000);
+            }
+            if (!ready) {
+                throw new Error(`${service.name}: revision ${newRevision} is not ready (${lastCondition})`);
             }
             await must(runner, 'gcloud', [
                 'run', 'services', 'update-traffic', service.name,
@@ -378,9 +397,11 @@ export async function runDeploy(options) {
             })),
             timingsMs: timer.timings,
         });
-        if (hold && !hold.heldShas.includes(sha)) {
+        if (hold) {
+            // A successful deploy clears any hold: either a different SHA shipped
+            // (the fix landed) or the operator deliberately overrode the hold.
             await clearHold(runner, holdUri);
-            log('cleared rollback hold (a newer build deployed successfully)');
+            log('cleared rollback hold');
         }
         log(`deployed ${sha.slice(0, 12)} (${record})`);
         log(`timings:\n${timer.table()}`);

package/dist/deploy/plan.js

@@ -141,7 +141,8 @@ export function releaseEntriesFrom(rows, prefix) {
         return [];
     return rows.flatMap((row) => {
         const r = row;
-        const url = r.url ?? '';
+        // `gcloud storage ls --json` appends `#<generation>` to object URLs.
+        const url = (r.url ?? '').replace(/#\d+$/, '');
         const name = url.slice(url.lastIndexOf('/') + 1);
         const sha = name.endsWith('.json') ? name.slice(0, -5) : '';
         if (!SHA40.test(sha) || !url.includes(prefix))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steve31415/baselib",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "Plasticine new-world shared platform library: logging, auth, service-to-service auth, db, HTTP, sync, app updates",
   "type": "module",
   "license": "MIT",