npm - @awsless/cli - Versions diffs - 0.0.46-local.46 → 0.0.46-local.48 - Mend

@awsless/cli 0.0.46-local.46 → 0.0.46-local.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/bin.js CHANGED Viewed

@@ -152830,8 +152830,7 @@ var createAuthAdmin = (props) => {
     describePool(id) {
       const pool = getPool(id);
       return {
-        groups: pool.groups,
-        password: pool.password
+        groups: pool.groups
       };
     },
     async listUsers(id) {
@@ -153542,9 +153541,14 @@ for (const name in env) {
 	process.env[name] ??= env[name]
 }
-const { createBundle } = await import(${JSON.stringify(runtime)})
+const runtime = await import(${JSON.stringify(runtime)})
-export default createBundle({
+// The local dev worker tags console output with the active route. A
+// lazy accessor instead of a re-export, since a static re-export would
+// hoist the runtime import above the env application.
+export const getCurrentRoute = () => runtime.getCurrentRoute?.()
+export default runtime.createBundle({
 ${entries2.join(`
 `)}
 })
@@ -166622,11 +166626,37 @@ class WorkerError extends Error {
   }
 }
 var WORKER_ENTRY = `import { createServer } from 'node:http'
+import { format } from 'node:util'
 let handler
+let getCurrentRoute = () => undefined
+// Console output is tagged with the active bundle route (invisible
+// \\x1f markers), so the dev cli can attribute every log line to the
+// function that wrote it - accurate even under concurrent requests,
+// since the route comes from the bundle's async context.
+const patchConsole = (method, stream) => {
+	console[method] = (...args) => {
+		const route = getCurrentRoute() ?? ''
+		const text = format(...args)
+		for (const line of text.split('\\n')) {
+			stream.write('\\x1f' + route + '\\x1f' + line + '\\n')
+		}
+	}
+}
+patchConsole('log', process.stdout)
+patchConsole('info', process.stdout)
+patchConsole('debug', process.stdout)
+patchConsole('warn', process.stderr)
+patchConsole('error', process.stderr)
 try {
-	handler = (await import('./files/index.mjs')).default
+	const bundle = await import('./files/index.mjs')
+	handler = bundle.default
+	getCurrentRoute = bundle.getCurrentRoute ?? getCurrentRoute
 } catch (error) {
 	// Keep module load failures readable, instead of node dumping the
 	// whole minified line that threw.
@@ -166716,12 +166746,25 @@ var createBundleWorker = (props) => {
       }
     });
     const capture = (stream2) => (chunk3) => {
-      process[stream2].write(chunk3);
       for (const raw of chunk3.toString().split(`
 `)) {
-        const line = stripAnsi2(raw);
-        if (line.trim() !== "") {
-          props.onOutput?.(line, stream2);
+        if (raw === "") {
+          continue;
+        }
+        let line = raw;
+        let route;
+        if (raw.startsWith("\x1F")) {
+          const end = raw.indexOf("\x1F", 1);
+          if (end > 0) {
+            route = raw.slice(1, end) || undefined;
+            line = raw.slice(end + 1);
+          }
+        }
+        process[stream2].write((route ? `[${route}] ` : "") + line + `
+`);
+        const clean = stripAnsi2(line);
+        if (clean.trim() !== "") {
+          props.onOutput?.(clean, stream2, route);
         }
       }
     };
@@ -166832,6 +166875,7 @@ var dashboardHtml = `<!doctype html>
 	}
 	.logs .line { display: flex; gap: 8px; padding: 1px 0; }
 	.logs .time { color: var(--muted); flex-shrink: 0; }
+	.logs .route { color: var(--accent); max-width: 220px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 	.logs .text { white-space: pre-wrap; word-break: break-word; }
 	.logs .line.error .text { color: var(--bad); }
 	.config-form { display: flex; flex-direction: column; gap: 8px; max-width: 520px; }
@@ -166999,6 +167043,15 @@ var dashboardHtml = `<!doctype html>
 		cursor: pointer;
 	}
 	button.primary:disabled { opacity: 0.5; cursor: wait; }
+	button.secondary {
+		background: var(--panel);
+		color: var(--text);
+		border: 1px solid var(--border);
+		border-radius: 6px;
+		padding: 6px 16px;
+		font: inherit;
+		cursor: pointer;
+	}
 	pre.result {
 		background: var(--panel);
 		border: 1px solid var(--border);
@@ -167067,7 +167120,7 @@ const GROUPS = [
 	['config', 'Config'],
 	['auth', 'Auth'],
 	['email', 'Emails'],
-	['worker', 'Worker'],
+	['worker', 'Logs'],
 	['route', 'Routes'],
 ]
@@ -167185,11 +167238,23 @@ window.addEventListener('popstate', applyLocation)
 // Detail panels
 const invokePanel = (main, r) => {
+	// The last payload survives reloads & panel switches, so a hand
+	// crafted event never gets lost. The envelope only prefills the
+	// first visit.
+	const storageKey = 'invoke-payload:' + r.kind + ':' + (r.stack ?? '-') + ':' + r.id
 	const placeholder = JSON.stringify(r.envelope ?? {}, null, 2)
-	const input = $('textarea', { value: placeholder, spellcheck: false })
+	const input = $('textarea', { value: localStorage.getItem(storageKey) ?? placeholder, spellcheck: false })
 	const status = $('span', { className: 'status' })
 	const result = $('pre', { className: 'result', hidden: true })
 	const run = $('button', { className: 'primary', textContent: r.kind === 'topic' ? 'Publish' : 'Invoke' })
+	const reset = $('button', { className: 'secondary', textContent: 'Reset' })
+	input.oninput = () => localStorage.setItem(storageKey, input.value)
+	reset.onclick = () => {
+		localStorage.removeItem(storageKey)
+		input.value = placeholder
+	}
 	run.onclick = async () => {
 		run.disabled = true
@@ -167215,9 +167280,14 @@ const invokePanel = (main, r) => {
 	main.append(
 		input,
-		$('div', { className: 'actions' }, [run, status]),
+		$('div', { className: 'actions' }, [run, reset, status]),
 		result,
 	)
+	// The resource's own console output, filtered from the worker feed.
+	if (r.routeKey) {
+		cleanupPanel = attachLogFeed(main, 'worker', r.routeKey)
+	}
 }
 const pubsubPanel = (main, r) => {
@@ -167341,8 +167411,10 @@ const rpcPanel = (main, r) => {
 // A terminal-style view streaming a resource's live event channel,
 // like the dev server output of a site. The bus replays the recent
 // lines, so the boot output shows even when the panel opens later.
-const attachLogFeed = (main, channel) => {
-	main.append($('h3', {}, 'Logs'))
+const attachLogFeed = (main, channel, route, title = 'Logs') => {
+	if (title) {
+		main.append($('h3', {}, title))
+	}
 	const feed = $('div', { className: 'logs' }, $('p', { className: 'empty' }, 'Waiting for output...'))
 	main.append(feed)
@@ -167352,9 +167424,16 @@ const attachLogFeed = (main, channel) => {
 	source.onmessage = message => {
 		const data = JSON.parse(message.data)
+		// A route filter shows only the lines of one resource, like the
+		// function panel showing its own console output.
+		if (route && data.route !== route) {
+			return
+		}
 		feed.querySelector('.empty')?.remove()
 		feed.append($('div', { className: 'line' + (data.error ? ' error' : '') }, [
 			$('span', { className: 'time' }, new Date(data.date).toLocaleTimeString()),
+			!route && data.route ? $('span', { className: 'route' }, data.route) : '',
 			$('span', { className: 'text' }, data.line),
 		]))
@@ -167839,6 +167918,10 @@ const renderResource = main => {
 	if (r.kind === 'store') return storePanel(main, r)
 	if (r.kind === 'config') return configPanel(main)
 	if (r.kind === 'auth') return authPanel(main, r)
+	if (r.kind === 'worker') {
+		cleanupPanel = attachLogFeed(main, 'worker')
+		return
+	}
 	if (r.kind === 'route' || r.kind === 'site') {
 		const url = r.url ?? r.detail
 		main.append($('p', {}, $('a', { href: url, target: '_blank', style: 'color: var(--accent)' }, url)))
@@ -167872,6 +167955,13 @@ const renderList = main => {
 		return emailPanel(main)
 	}
+	// The worker page streams the bundle worker output directly,
+	// instead of listing its single resource.
+	if (view.kind === 'worker') {
+		cleanupPanel = attachLogFeed(main, 'worker', undefined, null)
+		return
+	}
 	const matches = r => {
 		if (filter.stack && r.stack !== filter.stack) return false
 		if (!filter.query) return true
@@ -167959,7 +168049,7 @@ const render = () => {
 		const button = $('button', { className: view.kind === kind ? 'active' : '' }, [
 			icon(kind),
 			title,
-			kind === 'email' ? '' : $('span', { className: 'count' }, String(count)),
+			kind === 'email' || kind === 'worker' ? '' : $('span', { className: 'count' }, String(count)),
 		])
 		button.onclick = () => selectKind(kind)
 		nav.append(button)
@@ -168634,14 +168724,14 @@ var startDev = async (props) => {
     workspace = await loadWorkspace3(directories.root);
     await buildAll();
   });
-  const emitWorkerLine = (line, error3 = false) => {
-    dev.events.emit("worker", { date: Date.now(), line, error: error3 });
+  const emitWorkerLine = (line, error3 = false, route) => {
+    dev.events.emit("worker", { date: Date.now(), line, error: error3, route });
   };
   const worker = createBundleWorker({
     buildDir,
     env: env4,
     functionName: bundleName,
-    onOutput: (line, stream2) => emitWorkerLine(line, stream2 === "stderr")
+    onOutput: (line, stream2, route) => emitWorkerLine(line, stream2 === "stderr", route)
   });
   dev.resources.push({
     kind: "worker",
@@ -168729,7 +168819,7 @@ var startDev = async (props) => {
         const detail = error3 instanceof Error ? error3.stack ?? error3.message : String(error3);
         process.stderr.write(`Route ${routeKey} failed: ${detail}
 `);
-        emitWorkerLine(`Route ${routeKey} failed: ${detail}`, true);
+        emitWorkerLine(`Route ${routeKey} failed: ${detail}`, true, routeKey);
       }
     }));
   }

package/dist/handlers/bundle.js CHANGED Viewed

@@ -406,6 +406,7 @@ var topicHandler = (event, routes) => {
 };
 // src/feature/bundle/server/handle.ts
+import { getCurrentRoute as getCurrentRoute2 } from "awsless";
 var createBundle = (handlers) => {
   const routes = Object.keys(handlers);
   setBundleRoutes(routes);
@@ -504,5 +505,6 @@ var createBundle = (handlers) => {
   };
 };
 export {
+  getCurrentRoute2 as getCurrentRoute,
   createBundle
 };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/cli",
-  "version": "0.0.46-local.46",
+  "version": "0.0.46-local.48",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -43,14 +43,14 @@
   },
   "peerDependencies": {
     "@awsless/big-float": "^0.1.7",
-    "@awsless/dynamodb": "^0.3.22",
     "@awsless/duration": "^0.0.4",
+    "@awsless/json": "^0.0.11",
+    "@awsless/dynamodb": "^0.3.22",
     "@awsless/s3": "^0.0.22",
-    "@awsless/lambda": "^0.0.47",
     "@awsless/weak-cache": "^0.0.1",
-    "@awsless/json": "^0.0.11",
-    "@awsless/validate": "^0.1.7",
-    "awsless": "^0.0.15-local.11"
+    "@awsless/lambda": "^0.0.47",
+    "awsless": "^0.0.15-local.12",
+    "@awsless/validate": "^0.1.8"
   },
   "devDependencies": {
     "@aws-sdk/client-cloudformation": "^3.369.0",
@@ -120,25 +120,25 @@
     "zip-a-folder": "^3.1.6",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
-    "@awsless/clui": "^0.0.9",
     "@awsless/big-float": "^0.1.7",
+    "@awsless/clui": "^0.0.9",
+    "@awsless/cloudwatch": "^0.0.1",
     "@awsless/duration": "^0.0.4",
-    "@awsless/lambda": "^0.0.47",
     "@awsless/dynamodb": "^0.3.22",
-    "@awsless/open-search": "^0.0.26",
     "@awsless/iot": "^0.0.5",
-    "@awsless/cloudwatch": "^0.0.1",
     "@awsless/json": "^0.0.11",
     "@awsless/redis": "^0.1.13",
-    "@awsless/s3": "^0.0.22",
-    "@awsless/sqs": "^0.0.24",
+    "@awsless/lambda": "^0.0.47",
     "@awsless/size": "^0.0.2",
+    "@awsless/s3": "^0.0.22",
+    "@awsless/open-search": "^0.0.26",
     "@awsless/scheduler": "^0.0.5",
+    "@awsless/sqs": "^0.0.24",
     "@awsless/sns": "^0.0.11",
-    "@awsless/validate": "^0.1.7",
-    "awsless": "^0.0.15-local.11",
+    "awsless": "^0.0.15-local.12",
+    "@awsless/ssm": "^0.0.8",
     "@awsless/weak-cache": "^0.0.1",
-    "@awsless/ssm": "^0.0.8"
+    "@awsless/validate": "^0.1.8"
   },
   "scripts": {
     "test": "bun cli/build-handlers.ts && pnpm vitest",