naro-cli 0.14.0 → 0.15.0

package/README.md

@@ -173,7 +173,7 @@ naro policy set posts --from-file policy.json
                                    Shorthand: writes the policies naro_select … naro_delete
 naro policy remove todos           Drop every policy on the table: back to deny (asks first)
 
-naro storage                       Naro Storage: on or off, limits, usage, buckets
+naro storage                       Naro Storage: on or off, limits, usage, today's operations, buckets
 naro storage enable                Turn it on: the project's R2 bucket, bound to the backend
 naro storage bucket create avatars --public --file-size-limit 5MiB --allowed-mime-types image/png,image/jpeg
 naro storage bucket update avatars --private | --file-size-limit none | --allowed-mime-types any
@@ -793,6 +793,20 @@ An `--update-check` you give replaces the default: without
 
 ## Release notes
 
+### 0.15.0
+
+- `naro storage` shows the Storage meter's day between `Used:` and `Buckets:`:
+  `Today (UTC):` has the write operations (R2 Class A) against the daily limit
+  and the reads, `Measured:` the bucket size R2 reported and when R2 measured
+  it (R2 reports the size 30–45 minutes late, and the meter reads it every 15
+  minutes). A `✗` line
+  says uploads are stopped, over the storage limit until objects are deleted
+  or over the day's write operations until 00:00 UTC (downloads still work);
+  a `⚠` line warns from 80% of the storage limit or of the day's write
+  operations. Before the meter has run for the UTC day nothing is added, and
+  `--json` prints `storage.today` and `storage.limits.dailyOps` as the
+  control plane answered.
+
 ### 0.14.0
 
 - `naro analytics` shows the project's Web Analytics from the terminal: the

package/dist/{chunk-U7AZSAFS.js → chunk-6WJ3QQ5Y.js}

@@ -294,9 +294,6 @@ function pathnameOf(url2) {
   }
 }
 
-// ../../packages/core/src/internal-auth.ts
-import { Buffer as Buffer2 } from "buffer";
-
 // ../../packages/core/src/migration-names.ts
 function normalizeMigrationName(name) {
   return name.trim().toLowerCase().replace(/\.sql$/, "").replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
@@ -15253,6 +15250,20 @@ function classifyNextVersion(raw, now) {
 // ../../packages/build/src/package-manager.ts
 import { access, readFile as readFile2 } from "fs/promises";
 import { join as join2 } from "path";
+function cacheEnv(dir) {
+  return {
+    npm_config_store_dir: dir,
+    npm_config_cache: dir,
+    YARN_CACHE_FOLDER: dir
+  };
+}
+function withSharedCache(spec, dir) {
+  return {
+    ...spec,
+    addArgs: (specs) => [...spec.addArgs(specs), ...spec.cacheArgs(dir)],
+    addEnv: { ...spec.addEnv, ...cacheEnv(dir) }
+  };
+}
 async function exists(path) {
   try {
     await access(path);
@@ -15706,7 +15717,7 @@ export default defineCloudflareConfig({});
 
 // ../../packages/build/src/vinext.ts
 var VINEXT_TOOLCHAIN = [
-  "vinext@1.0.0-beta.9",
+  "vinext@1.1.0",
   "@cloudflare/vite-plugin@1.54.7",
   "@vitejs/plugin-react@6.1.1",
   "@vitejs/plugin-rsc@0.5.34",
@@ -15722,7 +15733,7 @@ var VITE_CONFIG_NAMES = [
   "vite.config.mts",
   "vite.config.cts"
 ];
-var GENERATED_VITE_CONFIG = "vite.config.mjs";
+var GENERATED_VITE_CONFIG = "vite.config.js";
 var OUTPUT_DIR = "dist";
 var SERVER_DIR = "server";
 var CLIENT_DIR = "client";
@@ -15787,6 +15798,8 @@ async function createVinextBuildConfig(appRoot, deploymentId, writer = async (pa
 }
 var AUTO_FIXED_ISSUES = [/Missing "type": "module"/i];
 var ISSUE_LINE = /^\s*✗\s+(.+)$/;
+var PARTIAL_LINE = /^\s*~\s+(.+)$/;
+var BLOCKING_PARTIALS = [/^webpack\b/i];
 var ANSI_ESCAPE = /\u001B\[[0-9;]*m/g;
 var SUMMARY_LINE = /Overall:\s*(\d+)%\s*compatible\s*\(\s*(\d+)\s+supported,\s*(\d+)\s+partial,\s*(\d+)\s+issues?\s*\)/i;
 function parseVinextCheckReport(output) {
@@ -15798,12 +15811,18 @@ function parseVinextCheckReport(output) {
       plain.split("\n").map((line) => ISSUE_LINE.exec(line)?.[1]?.trim()).filter((line) => Boolean(line))
     )
   ];
+  const partialLines = [
+    ...new Set(
+      plain.split("\n").map((line) => PARTIAL_LINE.exec(line)?.[1]?.trim()).filter((line) => Boolean(line))
+    )
+  ];
   return {
     percent: Number(match[1]),
     supported: Number(match[2]),
     partial: Number(match[3]),
     issues: Number(match[4]),
-    issueLines
+    issueLines,
+    partialLines
   };
 }
 function vinextRouteFromCheck(report) {
@@ -15815,7 +15834,10 @@ function vinextRouteFromCheck(report) {
   const autoFixed = report.issueLines.filter(
     (line) => AUTO_FIXED_ISSUES.some((pattern) => pattern.test(line))
   );
-  const blocking = Math.max(0, report.issues - autoFixed.length);
+  const blockingPartials = report.partialLines.filter(
+    (line) => BLOCKING_PARTIALS.some((pattern) => pattern.test(line))
+  );
+  const blocking = Math.max(0, report.issues - autoFixed.length) + blockingPartials.length;
   if (blocking > 0)
     return {
       eligible: false,
@@ -17836,6 +17858,7 @@ function createVinextCloudflareStrategy(options) {
             // Not production: npm and classic Yarn read that as omit=dev and
             // would prune the project's devDependencies while adding ours.
             env: {
+              ...context.packageManager.addEnv,
               NODE_ENV: "development",
               NPM_CONFIG_USERCONFIG: context.packageManagerConfigPath
             },
@@ -18217,11 +18240,7 @@ var LocalBuildExecutor = class {
               env: {
                 NODE_ENV: "development",
                 NPM_CONFIG_USERCONFIG: packageManagerConfigPath,
-                ...cachePorts ? {
-                  npm_config_store_dir: pmCacheDir,
-                  npm_config_cache: pmCacheDir,
-                  YARN_CACHE_FOLDER: pmCacheDir
-                } : {}
+                ...cachePorts ? cacheEnv(pmCacheDir) : {}
               },
               timeoutMs: 10 * 6e4,
               stage: "INSTALLING",
@@ -18305,7 +18324,9 @@ var LocalBuildExecutor = class {
             identity,
             branch: input.branch,
             env: input.env ?? {},
-            packageManager,
+            // The toolchain add has to use the store the install linked
+            // node_modules from (withSharedCache).
+            packageManager: cachePorts ? withSharedCache(packageManager, pmCacheDir) : packageManager,
             packageManagerConfigPath,
             buildScript: resolved.buildScript,
             nextVersion: nextVersion ? `${String(nextVersion.major)}.${String(nextVersion.minor)}.${String(nextVersion.patch)}` : "unknown",
@@ -21109,6 +21130,12 @@ var CATALOG = {
     status: 507,
     message: () => "This project has used all of its storage. Delete objects to free space; uploads fail until then."
   },
+  // Storage 3-1d (design §6.4): like WRITE_QUOTA_EXCEEDED, a 429 that clears
+  // by itself at midnight; downloads, deletes and listings are not refused.
+  STORAGE_OPS_QUOTA_EXCEEDED: {
+    status: 429,
+    message: () => "This project has reached its daily storage operation limit. Downloads still work; uploads resume at 00:00 UTC."
+  },
   // R2 or its binding did not answer; the original error is logged, never sent.
   STORAGE_UNAVAILABLE: {
     status: 503,

package/dist/deploy.js

@@ -5,7 +5,7 @@ import {
   parseDotenv,
   readProjectEnv,
   slugify
-} from "./chunk-U7AZSAFS.js";
+} from "./chunk-6WJ3QQ5Y.js";
 import "./chunk-K3NQKI34.js";
 export {
   deployDirectory,

package/dist/index.js

@@ -83,7 +83,7 @@ import {
   toNaroError,
   unreadablePolicyComment,
   writeProjectLink
-} from "./chunk-U7AZSAFS.js";
+} from "./chunk-6WJ3QQ5Y.js";
 import "./chunk-K3NQKI34.js";
 
 // src/args.ts
@@ -5272,7 +5272,7 @@ function parseSize(text) {
     throw new NaroError("VALIDATION_FAILED", SIZE_MESSAGE);
   return bytes;
 }
-function binarySize(bytes) {
+function binarySize(bytes, decimals = 1) {
   const units = ["B", "KiB", "MiB", "GiB", "TiB"];
   let value = bytes;
   let unit = 0;
@@ -5280,7 +5280,7 @@ function binarySize(bytes) {
     value /= 1024;
     unit += 1;
   }
-  const shown = unit === 0 ? String(value) : String(Number(value.toFixed(1)));
+  const shown = unit === 0 ? String(value) : String(Number(value.toFixed(decimals)));
   return `${shown} ${units[unit] ?? "B"}`;
 }
 function count(n, noun) {
@@ -5308,6 +5308,51 @@ function bucketLine(bucket) {
   const line = `  ${cells.join("  ")}`;
   return bucket.deletingAt === null ? line : `${line}  (being removed: \`naro storage bucket remove ${name} --empty\` finishes it)`;
 }
+var WARN_PERCENT = 80;
+function utcClock(iso) {
+  const at = new Date(iso);
+  return Number.isNaN(at.getTime()) ? null : at.toISOString().slice(11, 16);
+}
+function warnedPercent(value, limit) {
+  if (limit === null || !(limit > 0)) return null;
+  const percent2 = Math.floor(value * 100 / limit);
+  return percent2 >= WARN_PERCENT ? percent2 : null;
+}
+function meterLines(info) {
+  const { today, limits } = info;
+  if (today === null) return [];
+  const reads = count(today.classBOps, "read");
+  const writes = today.classAOps.toLocaleString("en-US");
+  const dailyOps = limits.dailyOps?.toLocaleString("en-US") ?? null;
+  const lines = [
+    dailyOps === null ? `Today (UTC): ${writes} write operations, ${reads}` : `Today (UTC): ${writes} of ${dailyOps} write operations, ${reads}`
+  ];
+  if (today.measuredBytes === null)
+    lines.push("Measured:    not yet (the meter reads R2 every 15 minutes)");
+  else {
+    const time = today.measuredAt === null ? null : utcClock(today.measuredAt);
+    lines.push(
+      `Measured:    ${binarySize(today.measuredBytes, 2)} in R2${time === null ? "" : ` at ${time} UTC`}`
+    );
+  }
+  if (today.bytesBlocked)
+    lines.push(
+      today.measuredBytes === null ? `\u2717 Uploads are stopped: the bucket is at the storage limit of ${binarySize(limits.bytes)}. Delete objects; uploads reopen after the next measurement (usually within an hour).` : `\u2717 Uploads are stopped: R2 holds ${binarySize(today.measuredBytes, 2)} of ${binarySize(limits.bytes)}. Delete objects; uploads reopen after the next measurement (usually within an hour).`
+    );
+  if (today.opsBlocked)
+    lines.push(
+      dailyOps === null ? "\u2717 Uploads are stopped until 00:00 UTC: today's write operations are used. Downloads still work." : `\u2717 Uploads are stopped until 00:00 UTC: today's ${dailyOps} write operations are used. Downloads still work.`
+    );
+  const storage = today.bytesBlocked || today.measuredBytes === null ? null : warnedPercent(today.measuredBytes, limits.bytes);
+  if (storage !== null)
+    lines.push(`\u26A0 ${String(storage)}% of the storage limit is used.`);
+  const operations = today.opsBlocked ? null : warnedPercent(today.classAOps, limits.dailyOps);
+  if (operations !== null)
+    lines.push(
+      `\u26A0 ${String(operations)}% of today's write operations are used.`
+    );
+  return lines;
+}
 function storageLines(info) {
   if (!info.enabled)
     return [
@@ -5319,6 +5364,7 @@ function storageLines(info) {
     `Storage:     on (R2 bucket ${printable(info.bucket ?? "unknown")})`,
     `Limits:      ${binarySize(limits.bytes)} in all, ${binarySize(limits.objectBytes)} per object, ${binarySize(limits.singleUploadBytes)} per upload`,
     usage === null ? "Used:        not known yet: the backend is not ready (`naro backend` shows where it got to)" : `Used:        ${binarySize(usage.bytes)} in ${count(usage.objects, "object")}`,
+    ...meterLines(info),
     info.buckets.length === 0 ? "Buckets:     none yet (`naro storage bucket create <name>` makes one)" : `Buckets:     ${String(info.buckets.length)}`,
     ...info.buckets.map(bucketLine)
   ];
@@ -8328,7 +8374,7 @@ Usage:
                                      naro_insert, naro_update, naro_delete (shorthand for CREATE POLICY)
   naro policy remove <table>         Drop every policy on it: back to deny (asks first)
 
-  naro storage [status]              Naro Storage: on or off, limits, what is stored, the buckets
+  naro storage [status]              Naro Storage: on or off, limits, what is stored, today's operations, the buckets
   naro storage enable                Turn Storage on: the project's R2 bucket, bound to its backend
                                      (safe to re-run; applies a plan change's limits)
   naro storage bucket list           The buckets: public or private, objects, bytes, limits

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naro-cli",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "type": "module",
   "bin": {
     "naro": "./dist/index.js"
@@ -25,7 +25,7 @@
     "@opennextjs/cloudflare": "1.20.2",
     "@supabase/supabase-js": "2.112.3",
     "@vercel/frameworks": "3.34.0",
-    "vinext": "1.0.0-beta.9",
+    "vinext": "1.1.0",
     "wrangler": "4.124.0"
   },
   "devDependencies": {
@@ -34,11 +34,11 @@
     "typescript": "7.0.2",
     "vitest": "3.2.7",
     "naro-js": "0.3.0",
-    "@next-deploy/build": "0.1.0",
-    "@next-deploy/config": "0.1.0",
     "@next-deploy/core": "0.1.0",
+    "@next-deploy/data-core": "0.1.0",
     "@next-deploy/sdk": "0.1.0",
-    "@next-deploy/data-core": "0.1.0"
+    "@next-deploy/config": "0.1.0",
+    "@next-deploy/build": "0.1.0"
   },
   "scripts": {
     "build": "tsup && pnpm build:types",