Implemented all plan to-dos end-to-end, including regeneration of staged bins, and verified with build + booter tests.

What changed
Fixed /bin generation for AsyncFunction execution in build pipeline:
Added appctl preamble wiring (p2p-suite.js) in packages/bare-os-coreutils/build.mjs.
Added a stripRunExport transform to remove trailing export { run } from generated /bin scripts.
Updated cut delimiter parsing in packages/bare-os-coreutils/src/cut.js:
Supports both -d X and attached -dX forms (including -d' ').
Validates -d argument presence and enforces single-character delimiter.
Improved uname -a output in packages/bare-os-coreutils/src/uname.js:
Better release/version derivation from env and /etc/os-release.
Uses env-backed machine architecture fallback instead of hardcoded unknown where available.
Added help aliases in packages/bare-os-coreutils/src/git-pear.js:
git-pear --help and git-pear -h now map to help output.
Reduced persistent invalid timer spam in packages/bare-os-booter/lib/bare-cron.js:
Added per-file parse-error dedupe/rate-limiting (first-seen, content-change, then hourly).
Added actionable invalid timer format hint in log message.
This commit is contained in:
Raven Scott
2026-04-27 07:59:00 -04:00
parent 21ad2f415b
commit db3aece34d
21 changed files with 900 additions and 72 deletions
+349
View File
@@ -87,6 +87,355 @@ function bareOsEmitRaw(ctx, chunk) {
return false
}
const BARE_P2P_SUITE_PREFIX = '[bare-p2p-v1]'
const BARE_P2P_SUITE_MAX_HISTORY = 2000
function bareP2pNowMs() {
return Date.now()
}
function bareP2pId(prefix) {
const rnd = Math.floor(Math.random() * 0x7fffffff)
return prefix + '-' + bareP2pNowMs().toString(36) + '-' + rnd.toString(36)
}
function bareP2pCommonExamples(argv0, rows) {
const out = []
for (const r of rows || []) out.push(' ' + argv0 + ' ' + r)
return out.join('\n')
}
function bareP2pHelpText(argv0, summary, usage, examples, seeAlso) {
const lines = []
lines.push('usage: ' + usage)
lines.push(summary)
lines.push('')
lines.push('common options: --help --json --quiet --summary --timeout MS --no-color')
if (examples && examples.length) {
lines.push('')
lines.push('examples:')
lines.push(bareP2pCommonExamples(argv0, examples))
}
if (seeAlso && seeAlso.length) {
lines.push('')
lines.push('see also: ' + seeAlso.join(', '))
}
lines.push('')
lines.push('troubleshooting: if peer data is empty, run `swarmtop` then `swarmdoctor`.')
return lines.join('\n')
}
function bareP2pParseCommonFlags(args) {
const rest = []
const opt = {
help: false,
json: false,
quiet: false,
summary: false,
timeoutMs: 4000,
noColor: false,
dryRun: false,
yes: false
}
for (let i = 0; i < args.length; i++) {
const a = String(args[i] || '')
if (a === '-h' || a === '--help') opt.help = true
else if (a === '--json') opt.json = true
else if (a === '--quiet') opt.quiet = true
else if (a === '--summary') opt.summary = true
else if (a === '--dry-run') opt.dryRun = true
else if (a === '--yes' || a === '-y') opt.yes = true
else if (a === '--no-color') opt.noColor = true
else if (a === '--timeout') {
const n = parseInt(args[i + 1] || '4000', 10)
if (Number.isFinite(n)) opt.timeoutMs = Math.max(250, Math.min(120000, n))
i++
} else rest.push(a)
}
return { opt, rest }
}
function bareP2pPrint(ctx, data, opt) {
if (opt && opt.quiet) return
if (opt && (opt.json || typeof data !== 'string')) {
ctx.console.log(typeof data === 'string' ? JSON.stringify({ message: data }) : JSON.stringify(data, null, 2))
return
}
ctx.console.log(String(data))
}
function bareP2pError(ctx, argv0, msg, next, opt) {
if (opt && opt.quiet) {
ctx.exitCode = 1
return
}
ctx.console.error(argv0 + ': ' + msg + (next ? ' · try: ' + next : ''))
ctx.exitCode = 1
}
function bareP2pSuggestSubcommand(sub, known) {
const s = String(sub || '')
if (!s) return ''
let best = ''
let bestScore = 1e9
for (const k of known || []) {
const kk = String(k || '')
const d = Math.abs(kk.length - s.length) + (kk[0] === s[0] ? 0 : 2)
if (d < bestScore) {
bestScore = d
best = kk
}
}
return bestScore <= 4 ? best : ''
}
function bareP2pFirstRunHint(ctx, app, hint) {
const env = ctx.env && typeof ctx.env === 'object' ? ctx.env : {}
if (env.BARE_P2P_NO_HINTS === '1' || env.BARE_P2P_NO_HINTS === 'true') return
const key = '__bare_p2p_hint_' + app
if (ctx[key]) return
ctx[key] = true
try {
ctx.console.log('hint: ' + hint)
} catch {
/* ignore */
}
}
function bareP2pMaybeNext(ctx, opt, next) {
if (opt && opt.quiet) return
if (next) ctx.console.log('next: ' + next)
}
function bareP2pHome(ctx) {
const env = ctx.env && typeof ctx.env === 'object' ? ctx.env : {}
const home = typeof env.HOME === 'string' && env.HOME ? env.HOME : '/home/guest'
return home
}
function bareP2pJoinPath(a, b) {
if (!a.endsWith('/')) return a + '/' + b
return a + b
}
function bareP2pDataDir(ctx) {
return bareP2pJoinPath(bareP2pHome(ctx), '.bare/p2p-suite')
}
function bareP2pDataFile(ctx, app) {
return bareP2pJoinPath(bareP2pDataDir(ctx), app + '.json')
}
async function bareP2pReadJson(ctx, path) {
try {
if (!ctx.vfs || typeof ctx.vfs.readFile !== 'function') return null
const b = await ctx.vfs.readFile(path)
if (!b) return null
const t = ctx.b4a.toString(b).trim()
if (!t) return null
return JSON.parse(t)
} catch {
return null
}
}
async function bareP2pWriteJson(ctx, path, obj) {
if (!ctx.vfs || typeof ctx.vfs.writeFile !== 'function') return false
const body = JSON.stringify(obj, null, 2) + '\n'
const b4 = ctx.b4a
const buf =
b4 && typeof b4.from === 'function'
? b4.from(body)
: new TextEncoder().encode(body)
try {
await ctx.vfs.writeFile(path, buf)
return true
} catch {
return false
}
}
function bareP2pDecodeEnvelope(line) {
const s = String(line || '')
if (!s.startsWith(BARE_P2P_SUITE_PREFIX)) return null
const payload = s.slice(BARE_P2P_SUITE_PREFIX.length).trim()
if (!payload) return null
try {
const obj = JSON.parse(payload)
if (!obj || typeof obj !== 'object') return null
return obj
} catch {
return null
}
}
function bareP2pEncodeEnvelope(app, kind, payload) {
return (
BARE_P2P_SUITE_PREFIX +
' ' +
JSON.stringify({
schema: 1,
suite: 'bare-p2p',
version: '1',
app,
kind,
tsMs: bareP2pNowMs(),
payload: payload || {}
})
)
}
function bareP2pSend(ctx, app, kind, payload) {
if (app === 'meshdrop' && typeof ctx.bareOsMeshdropSend === 'function') {
return ctx.bareOsMeshdropSend({
app,
kind,
payload: payload || {},
tsMs: bareP2pNowMs()
})
}
if (typeof ctx.bareOsChatSend !== 'function') {
return { ok: false, reason: 'bareOsChatSend unavailable' }
}
return ctx.bareOsChatSend(bareP2pEncodeEnvelope(app, kind, payload))
}
function bareP2pCollectFromHistory(ctx, app, limit) {
if (app === 'meshdrop' && typeof ctx.bareOsMeshdropHistory === 'function') {
let hist = []
try {
hist = ctx.bareOsMeshdropHistory(
Math.max(1, Math.min(BARE_P2P_SUITE_MAX_HISTORY, limit || 512))
)
} catch {
hist = []
}
if (!Array.isArray(hist)) return []
const out = []
for (const ev of hist) {
if (!ev || typeof ev !== 'object') continue
if (ev.app !== app) continue
out.push({
fromPeerKey: typeof ev.fromPeerKey === 'string' ? ev.fromPeerKey : '',
displayName: typeof ev.sender === 'string' ? ev.sender : '',
local: Boolean(ev.local),
receivedAtMs:
typeof ev.receivedAtMs === 'number' ? ev.receivedAtMs : bareP2pNowMs(),
packet: {
app,
kind: typeof ev.kind === 'string' ? ev.kind : 'unknown',
payload: ev.payload && typeof ev.payload === 'object' ? ev.payload : {}
}
})
}
return out
}
if (typeof ctx.bareOsChatHistory !== 'function') return []
let hist = []
try {
hist = ctx.bareOsChatHistory(
Math.max(1, Math.min(BARE_P2P_SUITE_MAX_HISTORY, limit || 512))
)
} catch {
hist = []
}
if (!Array.isArray(hist)) return []
const out = []
for (const ev of hist) {
if (!ev || typeof ev !== 'object') continue
const body = String(ev.body || '')
const decoded = bareP2pDecodeEnvelope(body)
if (!decoded || decoded.app !== app) continue
out.push({
fromPeerKey: typeof ev.fromPeerKey === 'string' ? ev.fromPeerKey : '',
displayName: typeof ev.displayName === 'string' ? ev.displayName : '',
local: Boolean(ev.local),
receivedAtMs:
typeof ev.receivedAtMs === 'number' ? ev.receivedAtMs : bareP2pNowMs(),
packet: decoded
})
}
return out
}
function bareP2pSubscribe(ctx, app, fn) {
if (app === 'meshdrop' && typeof ctx.bareOsMeshdropSubscribe === 'function') {
return ctx.bareOsMeshdropSubscribe((ev) => {
if (!ev || typeof ev !== 'object' || ev.app !== app) return
fn({
fromPeerKey: typeof ev.fromPeerKey === 'string' ? ev.fromPeerKey : '',
displayName: typeof ev.sender === 'string' ? ev.sender : '',
local: Boolean(ev.local),
receivedAtMs:
typeof ev.receivedAtMs === 'number' ? ev.receivedAtMs : bareP2pNowMs(),
packet: {
app,
kind: typeof ev.kind === 'string' ? ev.kind : 'unknown',
payload: ev.payload && typeof ev.payload === 'object' ? ev.payload : {}
}
})
})
}
if (typeof ctx.bareOsChatSubscribe !== 'function') return () => {}
return ctx.bareOsChatSubscribe((ev) => {
if (!ev || typeof ev !== 'object') return
const body = String(ev.body || '')
const decoded = bareP2pDecodeEnvelope(body)
if (!decoded || decoded.app !== app) return
fn({
fromPeerKey: typeof ev.fromPeerKey === 'string' ? ev.fromPeerKey : '',
displayName: typeof ev.displayName === 'string' ? ev.displayName : '',
local: Boolean(ev.local),
receivedAtMs:
typeof ev.receivedAtMs === 'number' ? ev.receivedAtMs : bareP2pNowMs(),
packet: decoded
})
})
}
async function bareP2pReadSwarmSnapshot(ctx) {
const out = {
atMs: bareP2pNowMs(),
peerCount: null,
topicCount: null,
peers: []
}
const snap = await bareP2pReadJson(ctx, '/proc/bare_os/swarm')
if (!snap || typeof snap !== 'object') return out
if (typeof snap.peerCount === 'number') out.peerCount = snap.peerCount
if (typeof snap.topicCount === 'number') out.topicCount = snap.topicCount
const peers = Array.isArray(snap.peers) ? snap.peers : []
const detailsRaw = await bareP2pReadJson(ctx, '/proc/bare_os/peer_details.json')
const details =
detailsRaw && typeof detailsRaw === 'object' && Array.isArray(detailsRaw.peers)
? detailsRaw.peers
: []
/** @type {Map<string, Record<string, unknown>>} */
const byKey = new Map()
for (const d of details) {
if (!d || typeof d !== 'object') continue
const rk = typeof d.remotePublicKey === 'string' ? d.remotePublicKey : ''
const pid = typeof d.peerId === 'string' ? d.peerId : ''
if (rk) byKey.set('k:' + rk, d)
if (pid) byKey.set('p:' + pid, d)
}
const merged = []
for (const p of peers) {
if (!p || typeof p !== 'object') continue
const rk = typeof p.remotePublicKey === 'string' ? p.remotePublicKey : ''
const pid = typeof p.peerId === 'string' ? p.peerId : ''
const d = (rk && byKey.get('k:' + rk)) || (pid && byKey.get('p:' + pid)) || null
merged.push(d && typeof d === 'object' ? { ...p, ...d } : p)
}
out.peers = merged.slice(0, 128)
return out
}
async function bareP2pReadProcJson(ctx, path) {
const v = await bareP2pReadJson(ctx, path)
return v && typeof v === 'object' ? v : {}
}
function bareOsAppctlConfigPath() {
return '/etc/bare-os/apps.registry.json'
}
+32 -11
View File
@@ -88,14 +88,42 @@ function bareOsEmitRaw(ctx, chunk) {
}
async function run(ctx, argv) {
let delim = '\t'
let delimChar = '\t'
let fieldsSpec = ''
let suppressNoDelim = false
const files = []
function decodeDelim(raw) {
if (raw === '\\t') return '\t'
if (raw === '\\n') return '\n'
if (raw === '\\0') return '\0'
return raw
}
for (let i = 1; i < argv.length; i++) {
const a = argv[i]
if (a === '-d') {
delim = argv[++i] || ''
const raw = argv[++i]
if (raw == null) {
ctx.console.error('cut: option -d requires an argument')
ctx.exitCode = 1
return
}
const parsed = decodeDelim(raw)
if (parsed.length !== 1) {
ctx.console.error('cut: delimiter must be a single character')
ctx.exitCode = 1
return
}
delimChar = parsed
continue
}
if (a.startsWith('-d') && a.length > 2) {
const parsed = decodeDelim(a.slice(2))
if (parsed.length !== 1) {
ctx.console.error('cut: delimiter must be a single character')
ctx.exitCode = 1
return
}
delimChar = parsed
continue
}
if (a === '-f') {
@@ -142,21 +170,14 @@ async function run(ctx, argv) {
return
}
const delimChar = delim === '\\t' ? '\t' : delim
async function cutLines(text) {
const lines = text.split(/\r?\n/)
for (const line of lines) {
if (line === '' && lines.length === 1) continue
if (
suppressNoDelim &&
delim !== '' &&
delimChar !== '' &&
!line.includes(delimChar)
) {
if (suppressNoDelim && !line.includes(delimChar)) {
continue
}
const cols = delim === '' ? [...line] : line.split(delimChar)
const cols = line.split(delimChar)
const out = []
for (const n of [...want].sort((a, b) => a - b)) {
out.push(cols[n - 1] != null ? cols[n - 1] : '')
+1 -1
View File
@@ -89,7 +89,7 @@ function bareOsEmitRaw(ctx, chunk) {
async function run(ctx, argv) {
const sub = argv[1]
if (sub === 'help' || sub === undefined) {
if (sub === 'help' || sub === '--help' || sub === '-h' || sub === undefined) {
ctx.console.log(`git-pear — Git-in-Pear helpers (gip-transport / gip-remote)
Remote form: git+pear://… (see Holepunch gip-transport + gip-remote).
-2
View File
@@ -223,5 +223,3 @@ ${topic ? 'Topic pin prefix: ' + topic.slice(0, 16) + '…' : 'Topic pin unset.'
ctx.exitCode = 1
}
}
export { run }
+19 -8
View File
@@ -130,24 +130,35 @@ async function run(ctx, argv) {
}
let name = 'BareOS'
let version = '0.1'
let release = e.BARE_OS_KERNEL_VERSION || e.BARE_OS_RELEASE || '0.1'
let version = e.BARE_OS_USERLAND_VERSION || e.BARE_OS_BUILD || 'bare-userland'
let prettyName = ''
const buf = await ctx.vfs.readFile('/etc/os-release')
if (buf) {
const t = ctx.b4a.toString(buf)
for (const line of t.split('\n')) {
const id = line.match(/^NAME=(.*)$/)
if (id) name = id[1].replace(/^"|"$/g, '')
const ver = line.match(/^VERSION=(.*)$/)
if (ver) version = ver[1].replace(/^"|"$/g, '')
const keyVal = /^([A-Z0-9_]+)=(.*)$/.exec(line.trim())
if (!keyVal) continue
const key = keyVal[1]
const value = keyVal[2].replace(/^"|"$/g, '')
if (key === 'NAME' && value) name = value
if (key === 'VERSION' && value) prettyName = value
if (key === 'PRETTY_NAME' && value) prettyName = value
if (key === 'VERSION_ID' && value && !e.BARE_OS_KERNEL_VERSION) release = value
}
}
if (prettyName && !e.BARE_OS_USERLAND_VERSION && !e.BARE_OS_BUILD) {
version = prettyName
}
const machine =
e.PROCESSOR_ARCHITECTURE || e.MACHINE || e.BARE_OS_ARCH || 'unknown'
const parts = []
if (wantS) parts.push(name)
if (wantN) parts.push(nodename)
if (wantR) parts.push(version)
if (wantM) parts.push('unknown')
if (wantV) parts.push('bare-userland')
if (wantR) parts.push(release)
if (wantM) parts.push(machine)
if (wantV) parts.push(version)
ctx.console.log(parts.join(' '))
}
+1 -1
View File
@@ -1,7 +1,7 @@
{
"schema": 2,
"profileId": "bare-os-posix-like",
"generatedAt": "2026-04-27T04:58:54.649Z",
"generatedAt": "2026-04-27T11:57:59.596Z",
"note": "Sparse POSIX Issue 7 coverage hints for /bin utilities. Omitted command names are not yet profiled here.",
"commandIndex": [
{
+1 -1
View File
@@ -1,6 +1,6 @@
{
"schema": 1,
"atMs": 1777265934648,
"atMs": 1777291079595,
"commands": [
"agent",
"appctl",
File diff suppressed because one or more lines are too long