@neta-art/cohub-cli 10.17.1 → 10.19.0
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.
- package/README.md +6 -0
- package/dist/board-export-resources.d.ts +2 -0
- package/dist/board-export-resources.js +1 -0
- package/dist/board-export.d.ts +11 -2
- package/dist/board-export.js +181 -62
- package/dist/board-gpu/index.d.ts +32 -0
- package/dist/board-gpu/index.js +188 -0
- package/dist/board-gpu/page.js +70384 -0
- package/dist/board-gpu/protocol.d.ts +38 -0
- package/dist/board-gpu/protocol.js +1 -0
- package/dist/board-kernel/{getPo2TextureFromSource.js → FilterPipe.js} +251 -1
- package/dist/board-kernel/browserAll.js +1 -1
- package/dist/board-kernel/init.js +1 -251
- package/dist/board-kernel/webworkerAll.js +1 -1
- package/dist/board-kernel.d.ts +3 -3
- package/dist/board-kernel.js +6501 -414
- package/dist/board-media-export.d.ts +16 -0
- package/dist/board-media-export.js +147 -0
- package/dist/board-media.d.ts +2 -1
- package/dist/board-media.js +23 -0
- package/dist/board-simulate.d.ts +4 -0
- package/dist/board-simulate.js +34 -4
- package/dist/client.d.ts +1 -0
- package/dist/client.js +4 -1
- package/dist/commands/apps.js +25 -3
- package/dist/commands/boards/authoring.js +45 -3
- package/dist/commands/boards/examples.js +21 -5
- package/dist/commands/boards.js +10 -2
- package/dist/commands/space-displays.d.ts +1 -1
- package/dist/commands/space-displays.js +356 -85
- package/dist/commands/spaces.js +11 -2
- package/dist/host/runtime.d.ts +12 -2
- package/dist/host/runtime.js +155 -10
- package/dist/host/serve.js +49 -11
- package/dist/host/workspaces.d.ts +2 -0
- package/dist/host/workspaces.js +18 -0
- package/dist/index.js +1 -0
- package/dist/output.d.ts +1 -0
- package/dist/output.js +3 -0
- package/dist/runtime/cli-path.d.ts +5 -0
- package/dist/runtime/cli-path.js +27 -0
- package/dist/runtime/connection.d.ts +22 -4
- package/dist/runtime/connection.js +13 -3
- package/dist/runtime/harnesses/claude-approval.d.ts +31 -0
- package/dist/runtime/harnesses/claude-approval.js +119 -0
- package/dist/runtime/harnesses/claude.js +42 -3
- package/dist/runtime/harnesses/codex-approval.d.ts +25 -0
- package/dist/runtime/harnesses/codex-approval.js +69 -0
- package/dist/runtime/harnesses/codex.js +36 -5
- package/dist/runtime/harnesses/index.js +12 -3
- package/dist/runtime/harnesses/stream-json.d.ts +16 -2
- package/dist/runtime/harnesses/stream-json.js +26 -6
- package/dist/runtime/harnesses/types.d.ts +3 -1
- package/dist/runtime/instance.d.ts +1 -0
- package/dist/runtime/instance.js +1 -0
- package/dist/runtime/launch.js +2 -4
- package/dist/runtime/local-workspace.d.ts +15 -0
- package/dist/runtime/local-workspace.js +52 -0
- package/dist/runtime/model-catalog.js +7 -4
- package/dist/runtime/native/approvals.d.ts +18 -0
- package/dist/runtime/native/approvals.js +54 -0
- package/dist/runtime/native/codex-link.d.ts +7 -0
- package/dist/runtime/native/codex-link.js +40 -5
- package/dist/runtime/native/daemon.d.ts +5 -1
- package/dist/runtime/native/daemon.js +6 -1
- package/dist/runtime/native/execution.d.ts +2 -0
- package/dist/runtime/preferences.d.ts +7 -0
- package/dist/runtime/preferences.js +22 -0
- package/dist/runtime/presentation.d.ts +3 -0
- package/dist/runtime/presentation.js +2 -1
- package/dist/runtime/supervisor.js +92 -9
- package/dist/safe-remote-image.d.ts +4 -0
- package/dist/safe-remote-image.js +8 -0
- package/dist/space-files/transfer.js +3 -2
- package/dist/space-files/upload.d.ts +5 -2
- package/dist/space-files/upload.js +41 -1
- package/package.json +2 -2
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { type BoardMediaSpan, type BoardMediaState } from "@neta-art/cohub/board";
|
|
2
|
+
export declare function createBoardMediaFiles(spaceId: string, dir: string, signal?: AbortSignal): {
|
|
3
|
+
path(src: string, kind: "video" | "audio"): Promise<string>;
|
|
4
|
+
audible(src: string, kind: "video" | "audio"): Promise<boolean>;
|
|
5
|
+
};
|
|
6
|
+
export type BoardMediaFiles = ReturnType<typeof createBoardMediaFiles>;
|
|
7
|
+
export declare function createBoardVideoFrames(files: BoardMediaFiles, dir: string, options: {
|
|
8
|
+
fps: number;
|
|
9
|
+
signal?: AbortSignal;
|
|
10
|
+
}): {
|
|
11
|
+
frame(state: BoardMediaState, rate: number, edge: number): Promise<Uint8Array | null>;
|
|
12
|
+
};
|
|
13
|
+
export declare function boardAudioMix(spans: readonly BoardMediaSpan[], files: BoardMediaFiles, firstInput: number): Promise<{
|
|
14
|
+
inputs: string[];
|
|
15
|
+
filter: string;
|
|
16
|
+
} | null>;
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
import { execFile as execFileCallback } from "node:child_process";
|
|
2
|
+
import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { promisify } from "node:util";
|
|
5
|
+
import { parseBoardMediaSource } from "@neta-art/cohub/board";
|
|
6
|
+
import { createClient } from "./client.js";
|
|
7
|
+
import { downloadPublicAudio, downloadPublicVideo } from "./safe-remote-image.js";
|
|
8
|
+
const execFile = promisify(execFileCallback);
|
|
9
|
+
const CHUNK_SECONDS = 4;
|
|
10
|
+
const MAX_DECODE_FPS = 60;
|
|
11
|
+
async function ffmpeg(args, signal) {
|
|
12
|
+
try {
|
|
13
|
+
return await execFile("ffmpeg", ["-v", "error", ...args], { encoding: "utf8", maxBuffer: 2 * 1024 * 1024, signal });
|
|
14
|
+
}
|
|
15
|
+
catch (error) {
|
|
16
|
+
const cause = error;
|
|
17
|
+
if (cause.code === "ENOENT")
|
|
18
|
+
throw new Error("Exporting video and audio needs ffmpeg. Install ffmpeg and try again.");
|
|
19
|
+
throw new Error(`ffmpeg failed: ${(cause.stderr ?? cause.message ?? "unknown error").trim().split("\n").slice(-4).join("\n")}`);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
export function createBoardMediaFiles(spaceId, dir, signal) {
|
|
23
|
+
const files = new Map();
|
|
24
|
+
const audible = new Map();
|
|
25
|
+
const client = createClient();
|
|
26
|
+
return {
|
|
27
|
+
path(src, kind) {
|
|
28
|
+
let pending = files.get(src);
|
|
29
|
+
if (!pending) {
|
|
30
|
+
const path = join(dir, `media-${files.size}`);
|
|
31
|
+
pending = (async () => {
|
|
32
|
+
const source = parseBoardMediaSource(src);
|
|
33
|
+
if (!source)
|
|
34
|
+
throw new Error(`Invalid media source ${src}`);
|
|
35
|
+
const { bytes } = source.kind === "file"
|
|
36
|
+
? { bytes: new Uint8Array(await (await client.space(spaceId).files.download(source.value)).blob.arrayBuffer()) }
|
|
37
|
+
: await (kind === "video" ? downloadPublicVideo : downloadPublicAudio)(source.value);
|
|
38
|
+
await writeFile(path, bytes);
|
|
39
|
+
return path;
|
|
40
|
+
})();
|
|
41
|
+
files.set(src, pending);
|
|
42
|
+
}
|
|
43
|
+
return pending;
|
|
44
|
+
},
|
|
45
|
+
async audible(src, kind) {
|
|
46
|
+
let pending = audible.get(src);
|
|
47
|
+
if (!pending) {
|
|
48
|
+
pending = this.path(src, kind).then(async (path) => {
|
|
49
|
+
const { stdout } = await execFile("ffprobe", ["-v", "error", "-select_streams", "a", "-show_entries", "stream=index", "-of", "csv=p=0", path], { signal });
|
|
50
|
+
return stdout.trim().length > 0;
|
|
51
|
+
});
|
|
52
|
+
audible.set(src, pending);
|
|
53
|
+
}
|
|
54
|
+
return pending;
|
|
55
|
+
},
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
export function createBoardVideoFrames(files, dir, options) {
|
|
59
|
+
const chunks = new Map();
|
|
60
|
+
let decoded = 0;
|
|
61
|
+
function lookup(chunk, time, edge) {
|
|
62
|
+
if (!chunk || edge > chunk.edge)
|
|
63
|
+
return null;
|
|
64
|
+
const index = chunk.count === 1 ? (Math.abs(time - chunk.start) < 1 ? 0 : -1) : Math.round(((time - chunk.start) * chunk.fps) / 1000);
|
|
65
|
+
return index >= 0 && index < chunk.count ? join(chunk.dir, `${String(index + 1).padStart(5, "0")}.jpg`) : null;
|
|
66
|
+
}
|
|
67
|
+
async function decode(state, rate, edge) {
|
|
68
|
+
const path = await files.path(state.src, "video");
|
|
69
|
+
const previous = chunks.get(state.id);
|
|
70
|
+
if (previous)
|
|
71
|
+
await rm(previous.dir, { recursive: true, force: true });
|
|
72
|
+
const chunkDir = join(dir, `frames-${decoded++}`);
|
|
73
|
+
await mkdir(chunkDir);
|
|
74
|
+
const fps = rate > 0 ? Math.min(MAX_DECODE_FPS, Math.max(1, Math.ceil(options.fps * rate))) : 0;
|
|
75
|
+
const scale = `scale=w=${edge}:h=${edge}:force_original_aspect_ratio=decrease`;
|
|
76
|
+
await ffmpeg([
|
|
77
|
+
"-ss", (state.time / 1000).toFixed(3), "-i", path,
|
|
78
|
+
...(fps ? ["-t", String(CHUNK_SECONDS), "-vf", `fps=${fps},${scale}`] : ["-frames:v", "1", "-vf", scale]),
|
|
79
|
+
"-q:v", "3", join(chunkDir, "%05d.jpg"),
|
|
80
|
+
], options.signal);
|
|
81
|
+
const count = fps ? Math.max(1, Math.round(CHUNK_SECONDS * fps)) : 1;
|
|
82
|
+
const chunk = { src: state.src, start: state.time, fps: fps || 1, count, edge, dir: chunkDir };
|
|
83
|
+
chunks.set(state.id, chunk);
|
|
84
|
+
return chunk;
|
|
85
|
+
}
|
|
86
|
+
return {
|
|
87
|
+
async frame(state, rate, edge) {
|
|
88
|
+
const current = chunks.get(state.id);
|
|
89
|
+
let file = current?.src === state.src ? lookup(current, state.time, edge) : null;
|
|
90
|
+
if (!file)
|
|
91
|
+
file = lookup(await decode(state, rate, edge), state.time, edge);
|
|
92
|
+
return file ? new Uint8Array(await readFile(file).catch(() => Buffer.alloc(0))) : null;
|
|
93
|
+
},
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
function volumeExpression(span) {
|
|
97
|
+
const points = span.volume.map((point) => ({ t: (point.at - span.start) / 1000, v: point.value }));
|
|
98
|
+
if (points.every((point) => point.v === points[0]?.v))
|
|
99
|
+
return String(points[0]?.v ?? 1);
|
|
100
|
+
let expression = String(points.at(-1)?.v ?? 1);
|
|
101
|
+
for (let index = points.length - 2; index >= 0; index -= 1) {
|
|
102
|
+
const a = points[index];
|
|
103
|
+
const b = points[index + 1];
|
|
104
|
+
const slope = b.t > a.t ? (b.v - a.v) / (b.t - a.t) : 0;
|
|
105
|
+
expression = `if(lt(t,${b.t.toFixed(4)}),${a.v.toFixed(4)}+${slope.toFixed(6)}*(t-${a.t.toFixed(4)}),${expression})`;
|
|
106
|
+
}
|
|
107
|
+
return `'${expression}'`;
|
|
108
|
+
}
|
|
109
|
+
function tempo(rate) {
|
|
110
|
+
const stages = [];
|
|
111
|
+
let rest = rate;
|
|
112
|
+
while (rest > 2) {
|
|
113
|
+
stages.push("atempo=2");
|
|
114
|
+
rest /= 2;
|
|
115
|
+
}
|
|
116
|
+
while (rest < 0.5) {
|
|
117
|
+
stages.push("atempo=0.5");
|
|
118
|
+
rest /= 0.5;
|
|
119
|
+
}
|
|
120
|
+
if (Math.abs(rest - 1) > 1e-4)
|
|
121
|
+
stages.push(`atempo=${rest.toFixed(6)}`);
|
|
122
|
+
return stages;
|
|
123
|
+
}
|
|
124
|
+
export async function boardAudioMix(spans, files, firstInput) {
|
|
125
|
+
const inputs = [];
|
|
126
|
+
const chains = [];
|
|
127
|
+
for (const span of spans) {
|
|
128
|
+
if (!(await files.audible(span.src, span.kind)))
|
|
129
|
+
continue;
|
|
130
|
+
const index = firstInput + chains.length;
|
|
131
|
+
inputs.push("-i", await files.path(span.src, span.kind));
|
|
132
|
+
const length = ((span.end - span.start) * span.rate) / 1000;
|
|
133
|
+
const delay = Math.max(0, Math.round(span.start));
|
|
134
|
+
const filters = [
|
|
135
|
+
`atrim=start=${(span.from / 1000).toFixed(4)}:duration=${length.toFixed(4)}`,
|
|
136
|
+
"asetpts=PTS-STARTPTS",
|
|
137
|
+
...tempo(span.rate),
|
|
138
|
+
`volume=${volumeExpression(span)}:eval=frame`,
|
|
139
|
+
`adelay=${delay}:all=1`,
|
|
140
|
+
];
|
|
141
|
+
chains.push(`[${index}:a]${filters.join(",")}[a${chains.length}]`);
|
|
142
|
+
}
|
|
143
|
+
if (!chains.length)
|
|
144
|
+
return null;
|
|
145
|
+
const mixed = chains.map((_, index) => `[a${index}]`).join("");
|
|
146
|
+
return { inputs, filter: `${chains.join(";")};${mixed}amix=inputs=${chains.length}:duration=longest:dropout_transition=0:normalize=0[aout]` };
|
|
147
|
+
}
|
package/dist/board-media.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { type BoardDocument, type BoardMediaFileResolver } from "@neta-art/cohub/board";
|
|
1
|
+
import { type BoardDocument, type BoardItem, type BoardMediaFileResolver } from "@neta-art/cohub/board";
|
|
2
2
|
export declare function boardMediaFileResolver(spaceId: string): BoardMediaFileResolver;
|
|
3
3
|
export declare function settleBoardDocument(spaceId: string, document: BoardDocument): Promise<BoardDocument>;
|
|
4
4
|
export declare function settleBoardPatch<T extends Record<string, unknown>>(spaceId: string, patch: T, current: (ids: string[]) => Promise<Record<string, unknown> | null>): Promise<T>;
|
|
5
|
+
export declare function settleBoardMediaDurations(spaceId: string, document: BoardDocument, ids: readonly string[]): Promise<Record<string, BoardItem>>;
|
package/dist/board-media.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { execFile } from "node:child_process";
|
|
1
2
|
import { resolve } from "node:path";
|
|
3
|
+
import { promisify } from "node:util";
|
|
2
4
|
import { diffMergePatch, mergePatch, parseBoardItem, settleBoardMediaSizes, } from "@neta-art/cohub/board";
|
|
3
5
|
import { createClient } from "./client.js";
|
|
4
6
|
import { localMediaFacts } from "./local-media.js";
|
|
@@ -41,3 +43,24 @@ export async function settleBoardPatch(spaceId, patch, current) {
|
|
|
41
43
|
const adopted = Object.entries(settled).map(([id, item]) => [id, mergePatch(items[id], diffMergePatch(created[id], item))]);
|
|
42
44
|
return { ...patch, items: { ...items, ...Object.fromEntries(adopted) } };
|
|
43
45
|
}
|
|
46
|
+
const run = promisify(execFile);
|
|
47
|
+
export async function settleBoardMediaDurations(spaceId, document, ids) {
|
|
48
|
+
const local = process.env.COHUB_SPACE_ID === spaceId;
|
|
49
|
+
const settled = {};
|
|
50
|
+
for (const id of ids) {
|
|
51
|
+
const item = document.items[id];
|
|
52
|
+
if ((item?.type !== "video" && item?.type !== "audio") || item.props.snapshot?.durationMs)
|
|
53
|
+
continue;
|
|
54
|
+
const file = item.props.src.startsWith("http") ? null : resolve(WORKSPACE_ROOT, item.props.src);
|
|
55
|
+
const input = file && local && file.startsWith(`${WORKSPACE_ROOT}/`)
|
|
56
|
+
? file
|
|
57
|
+
: file ? (await createClient().space(spaceId).files.resolve(item.props.src, { purpose: "playback" }).catch(() => null))?.url : null;
|
|
58
|
+
const seconds = input
|
|
59
|
+
? Number((await run("ffprobe", ["-v", "error", "-show_entries", "format=duration", "-of", "csv=p=0", input], { timeout: 15_000 }).catch(() => ({ stdout: "" }))).stdout)
|
|
60
|
+
: Number.NaN;
|
|
61
|
+
if (!(seconds > 0))
|
|
62
|
+
throw new Error(`The length of ${id} is unknown; pass --duration.`);
|
|
63
|
+
settled[id] = { ...item, props: { ...item.props, snapshot: { ...item.props.snapshot, durationMs: Math.round(seconds * 1000) } } };
|
|
64
|
+
}
|
|
65
|
+
return settled;
|
|
66
|
+
}
|
package/dist/board-simulate.d.ts
CHANGED
package/dist/board-simulate.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { diffMergePatch } from "@neta-art/cohub/board";
|
|
2
|
-
import { loadBoardDocument, readSpaceFileBytes, resolveBundledFonts, runBoardExport } from "./board-export.js";
|
|
3
|
-
import {
|
|
2
|
+
import { gpuResources, loadBoardDocument, readSpaceFileBytes, resolveBundledFonts, runBoardExport } from "./board-export.js";
|
|
3
|
+
import { findBoardGpuBrowser, launchBoardGpuExporter } from "./board-gpu/index.js";
|
|
4
|
+
import { boardScriptAttachments, boardShaderParameters, checkBoardShader, createBoardScriptHarness, createNodeBoardRenderer } from "./board-kernel.js";
|
|
4
5
|
import { settleBoardDocument } from "./board-media.js";
|
|
5
6
|
import { parseBoardTime } from "./board-time.js";
|
|
6
7
|
import { createClient } from "./client.js";
|
|
@@ -99,6 +100,28 @@ async function run(harness, steps) {
|
|
|
99
100
|
await harness.select(step.select);
|
|
100
101
|
}
|
|
101
102
|
}
|
|
103
|
+
async function checkShaders(shaders, spaceId, document) {
|
|
104
|
+
const browser = findBoardGpuBrowser();
|
|
105
|
+
const exporter = browser ? await launchBoardGpuExporter(gpuResources(spaceId, document), { browser }).catch(() => null) : null;
|
|
106
|
+
if (exporter) {
|
|
107
|
+
try {
|
|
108
|
+
return { errors: await exporter.compile(shaders), compiled: true };
|
|
109
|
+
}
|
|
110
|
+
finally {
|
|
111
|
+
await exporter.close();
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
const errors = {};
|
|
115
|
+
for (const { id, shader, parameters } of shaders) {
|
|
116
|
+
try {
|
|
117
|
+
checkBoardShader(shader, boardShaderParameters(parameters), id);
|
|
118
|
+
}
|
|
119
|
+
catch (error) {
|
|
120
|
+
errors[id] = error instanceof Error ? error.message : String(error);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
return { errors, compiled: false };
|
|
124
|
+
}
|
|
102
125
|
export async function runBoardSimulation(options) {
|
|
103
126
|
const client = createClient();
|
|
104
127
|
const document = await settleBoardDocument(options.spaceId, (await loadBoardDocument(options.spaceId, options.target)).document);
|
|
@@ -114,16 +137,23 @@ export async function runBoardSimulation(options) {
|
|
|
114
137
|
await harness.flush();
|
|
115
138
|
const shown = options.image ? await harness.shown(options.image.scale) : null;
|
|
116
139
|
const errors = {};
|
|
117
|
-
|
|
118
|
-
|
|
140
|
+
const shaders = [];
|
|
141
|
+
for (const { id } of boardScriptAttachments(harness.document)) {
|
|
142
|
+
const message = harness.error(id);
|
|
143
|
+
const output = harness.output(id);
|
|
119
144
|
if (message)
|
|
120
145
|
errors[id] = message;
|
|
146
|
+
else if (output?.shader)
|
|
147
|
+
shaders.push({ id, shader: output.shader, ...(output.parameters ? { parameters: output.parameters } : {}) });
|
|
121
148
|
}
|
|
149
|
+
const checked = shaders.length ? await checkShaders(shaders, options.spaceId, harness.document) : null;
|
|
150
|
+
Object.assign(errors, checked?.errors);
|
|
122
151
|
const result = {
|
|
123
152
|
time: Math.round(harness.time),
|
|
124
153
|
commits: harness.commits.length,
|
|
125
154
|
changes: diffMergePatch(document, harness.document) ?? {},
|
|
126
155
|
errors,
|
|
156
|
+
...(checked ? { shaders: { count: shaders.length, compiled: checked.compiled } } : {}),
|
|
127
157
|
};
|
|
128
158
|
if (options.image && shown) {
|
|
129
159
|
const exported = await runBoardExport({
|
package/dist/client.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { CohubClient, CohubHttpClient } from "@neta-art/cohub";
|
|
2
2
|
export declare function createClient(): CohubHttpClient;
|
|
3
|
+
/** A scoped principal, so its requests stay on the API that enforces the scope. */
|
|
3
4
|
export declare function createClientWithAccessToken(token: string): CohubHttpClient;
|
|
4
5
|
export declare function createRealtimeClient(): CohubClient;
|
package/dist/client.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { CohubClient, CohubHttpClient, readRequestSourceFromEnv } from "@neta-art/cohub";
|
|
2
2
|
import { clearAuthSession, readAuthSession, resolveAccessToken } from "./auth.js";
|
|
3
|
+
import { resolveLocalWorkspace } from "./runtime/local-workspace.js";
|
|
3
4
|
const clientOptions = () => ({
|
|
4
5
|
getAccessToken: resolveAccessToken,
|
|
6
|
+
localWorkspace: resolveLocalWorkspace,
|
|
5
7
|
onUnauthorized: (context) => {
|
|
6
8
|
if (!process.env.COHUB_EXECUTION_TOKEN?.trim() && context.matchesRejectedToken(readAuthSession()?.accessToken ?? null))
|
|
7
9
|
clearAuthSession();
|
|
@@ -13,8 +15,9 @@ const clientOptions = () => ({
|
|
|
13
15
|
export function createClient() {
|
|
14
16
|
return new CohubHttpClient(clientOptions());
|
|
15
17
|
}
|
|
18
|
+
/** A scoped principal, so its requests stay on the API that enforces the scope. */
|
|
16
19
|
export function createClientWithAccessToken(token) {
|
|
17
|
-
return new CohubHttpClient({ ...clientOptions(), getAccessToken: () => token });
|
|
20
|
+
return new CohubHttpClient({ ...clientOptions(), getAccessToken: () => token, localWorkspace: undefined });
|
|
18
21
|
}
|
|
19
22
|
export function createRealtimeClient() {
|
|
20
23
|
return new CohubClient(clientOptions());
|
package/dist/commands/apps.js
CHANGED
|
@@ -191,10 +191,11 @@ function printApp(app) {
|
|
|
191
191
|
{ key: "publishedAt", label: "Published" },
|
|
192
192
|
]);
|
|
193
193
|
}
|
|
194
|
-
function
|
|
194
|
+
function printAppDetails(result) {
|
|
195
195
|
const lines = [
|
|
196
196
|
result.publicUrl ? `Public URL: ${result.publicUrl}` : null,
|
|
197
197
|
result.content?.url ? `Content URL: ${result.content.url}` : null,
|
|
198
|
+
typeof result.likeCount === "number" ? `Likes: ${result.likeCount}` : null,
|
|
198
199
|
].filter((line) => Boolean(line));
|
|
199
200
|
if (lines.length)
|
|
200
201
|
console.log(`\n${lines.join("\n")}`);
|
|
@@ -214,6 +215,7 @@ function printAppStats(stats) {
|
|
|
214
215
|
{ key: "views24h", label: "24h" },
|
|
215
216
|
{ key: "views7d", label: "7d" },
|
|
216
217
|
{ key: "views30d", label: "30d" },
|
|
218
|
+
...(stats.summary.totalLikes === undefined ? [] : [{ key: "totalLikes", label: "Likes" }]),
|
|
217
219
|
]);
|
|
218
220
|
if (stats.sources.length) {
|
|
219
221
|
console.log("");
|
|
@@ -308,7 +310,7 @@ export function registerApps(program) {
|
|
|
308
310
|
if (jsonRequested(opts))
|
|
309
311
|
return outJson(result);
|
|
310
312
|
printApp(result.app);
|
|
311
|
-
|
|
313
|
+
printAppDetails(result);
|
|
312
314
|
}
|
|
313
315
|
catch (e) {
|
|
314
316
|
handleHttp(e);
|
|
@@ -330,6 +332,26 @@ export function registerApps(program) {
|
|
|
330
332
|
handleHttp(e);
|
|
331
333
|
}
|
|
332
334
|
});
|
|
335
|
+
for (const liked of [true, false]) {
|
|
336
|
+
appsCmd
|
|
337
|
+
.command(`${liked ? "like" : "unlike"} <app>`)
|
|
338
|
+
.description(`${liked ? "Like" : "Unlike"} an app by id, URL, mention URI, or username/space/app`)
|
|
339
|
+
.option("--json", "Output as JSON")
|
|
340
|
+
.action(async (app, opts) => {
|
|
341
|
+
const client = createClient();
|
|
342
|
+
try {
|
|
343
|
+
const ref = parseAppRef(app);
|
|
344
|
+
const appId = "id" in ref ? ref.id : (await getAppByRef(client, app)).app.id;
|
|
345
|
+
const result = { appId, liked: await client.user.likes.set("app", appId, liked) };
|
|
346
|
+
if (jsonRequested(opts))
|
|
347
|
+
return outJson(result);
|
|
348
|
+
ok(result.liked ? "Liked" : "Unliked");
|
|
349
|
+
}
|
|
350
|
+
catch (e) {
|
|
351
|
+
handleHttp(e);
|
|
352
|
+
}
|
|
353
|
+
});
|
|
354
|
+
}
|
|
333
355
|
appsCmd
|
|
334
356
|
.command("download <app>")
|
|
335
357
|
.description("Download a published file or directory app")
|
|
@@ -391,7 +413,7 @@ export function registerApps(program) {
|
|
|
391
413
|
if (jsonRequested(opts))
|
|
392
414
|
return outJson(result);
|
|
393
415
|
printApp(result.app);
|
|
394
|
-
|
|
416
|
+
printAppDetails(result);
|
|
395
417
|
}
|
|
396
418
|
catch (e) {
|
|
397
419
|
handleHttp(e);
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { readBoardJsonObject } from "../../board-command-support.js";
|
|
2
2
|
import { loadBoardDocument, resolveBundledFonts } from "../../board-export.js";
|
|
3
|
-
import { settleBoardDocument } from "../../board-media.js";
|
|
4
|
-
import { boardFrameRegions, boardPathTrack, boardRegionStep, boardSequencePatch, buildBoardScene, createBoardAnimationSampler, createNodeBoardRenderer, inspectBoardItems, } from "../../board-kernel.js";
|
|
5
|
-
import { parseBoardTimes } from "../../board-time.js";
|
|
3
|
+
import { settleBoardDocument, settleBoardMediaDurations } from "../../board-media.js";
|
|
4
|
+
import { boardFrameRegions, boardPathTrack, boardPlacePatch, boardRegionStep, boardSequencePatch, buildBoardScene, createBoardAnimationSampler, createNodeBoardRenderer, inspectBoardItems, } from "../../board-kernel.js";
|
|
5
|
+
import { parseBoardTime, parseBoardTimes } from "../../board-time.js";
|
|
6
6
|
import { handleHttp, json as outJson, jsonRequested, table } from "../../output.js";
|
|
7
7
|
import { resolveSpace } from "../../space.js";
|
|
8
8
|
const DIRECTIONS = ["left", "right", "up", "down"];
|
|
@@ -97,6 +97,48 @@ Viewers step with N, the arrow keys and swipes; #focus=<frame>&present presents.
|
|
|
97
97
|
handleHttp(cause);
|
|
98
98
|
}
|
|
99
99
|
});
|
|
100
|
+
boards
|
|
101
|
+
.command("place <board>")
|
|
102
|
+
.description("Put items or animations on a timeline as clips; prints a patch for apply, does not write")
|
|
103
|
+
.requiredOption("--animation <id>", "Animation to place them in; created when missing")
|
|
104
|
+
.requiredOption("--targets <ids>", "Comma-separated item or animation ids, laid end to end")
|
|
105
|
+
.option("--at <time>", "Where the first one starts", "0")
|
|
106
|
+
.option("--duration <time>", "Length of each; defaults to what is left of the media or animation, else 3s")
|
|
107
|
+
.option("--from <time>", "Where media or an animation starts playing in its own time", "0")
|
|
108
|
+
.option("--rate <number>", "Playback speed of media and animations", "1")
|
|
109
|
+
.option("--together", "Start them all at --at instead of one after another")
|
|
110
|
+
.addHelpText("after", `
|
|
111
|
+
Each target is shown only during its clip (a visible track); video, audio and
|
|
112
|
+
animations also play (a props.time or time track), and sound in exports while
|
|
113
|
+
their time moves forward. Placing a target that is already on the timeline moves it.
|
|
114
|
+
cohub boards place cut.board --animation cut --targets intro,talk,outro | cohub boards apply cut.board -i -
|
|
115
|
+
cohub boards place cut.board --animation cut --targets music --at 0 --duration 30s --from 12s`)
|
|
116
|
+
.action(async (target, options) => {
|
|
117
|
+
try {
|
|
118
|
+
const targets = options.targets.split(",").map((id) => id.trim()).filter(Boolean);
|
|
119
|
+
if (!targets.length)
|
|
120
|
+
throw new Error("--targets needs at least one id.");
|
|
121
|
+
const rate = Number(options.rate);
|
|
122
|
+
if (!Number.isFinite(rate) || rate <= 0)
|
|
123
|
+
throw new Error("--rate must be a positive number.");
|
|
124
|
+
const spaceId = await resolveSpace(boards);
|
|
125
|
+
const { document: loaded } = await loadBoardDocument(spaceId, target);
|
|
126
|
+
const durations = options.duration ? {} : await settleBoardMediaDurations(spaceId, loaded, targets);
|
|
127
|
+
const document = { ...loaded, items: { ...loaded.items, ...durations } };
|
|
128
|
+
const patch = boardPlacePatch(document, options.animation, targets, {
|
|
129
|
+
at: parseBoardTime(options.at, "--at"),
|
|
130
|
+
from: parseBoardTime(options.from, "--from"),
|
|
131
|
+
rate,
|
|
132
|
+
...(options.duration ? { duration: parseBoardTime(options.duration, "--duration") } : {}),
|
|
133
|
+
together: options.together,
|
|
134
|
+
});
|
|
135
|
+
const items = Object.fromEntries(Object.entries(durations).map(([id, item]) => [id, { props: { snapshot: { durationMs: item.props.snapshot?.durationMs } } }]));
|
|
136
|
+
outJson(Object.keys(items).length ? { ...patch, items } : patch);
|
|
137
|
+
}
|
|
138
|
+
catch (cause) {
|
|
139
|
+
handleHttp(cause);
|
|
140
|
+
}
|
|
141
|
+
});
|
|
100
142
|
boards
|
|
101
143
|
.command("path <target>")
|
|
102
144
|
.description("Sample a polyline into a position track; does not write")
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { json } from "../../output.js";
|
|
2
|
-
import { BOARD_SCRIPT_DRAWING_EXAMPLE } from "../../board-kernel.js";
|
|
2
|
+
import { BOARD_SCRIPT_DRAWING_EXAMPLE, BOARD_SCRIPT_RAIN_EXAMPLE } from "../../board-kernel.js";
|
|
3
|
+
const MODULES = {
|
|
4
|
+
custom: BOARD_SCRIPT_DRAWING_EXAMPLE,
|
|
5
|
+
rain: BOARD_SCRIPT_RAIN_EXAMPLE,
|
|
6
|
+
};
|
|
3
7
|
/**
|
|
4
8
|
* Starter documents for `boards create -i` and patches for `boards apply -i`.
|
|
5
9
|
* Every example is a valid Board patch; `boards.test.ts` checks that.
|
|
@@ -73,20 +77,32 @@ export const BOARD_EXAMPLES = {
|
|
|
73
77
|
},
|
|
74
78
|
},
|
|
75
79
|
},
|
|
80
|
+
rain: {
|
|
81
|
+
description: "A Board script whose shader rains over the view and splashes on cards; use --module to print scripts/rain.js.",
|
|
82
|
+
value: {
|
|
83
|
+
board: { scripts: { rain: { src: "scripts/rain.js", params: { density: 0.7 } } } },
|
|
84
|
+
items: {
|
|
85
|
+
title: { type: "text", position: { x: 80, y: 40 }, props: { text: "Rainy day", fontSize: 48 } },
|
|
86
|
+
left: { type: "shape", position: { x: 80, y: 180 }, size: { width: 320, height: 180 }, style: { fill: "blue", fillOpacity: 0.16, radius: 16 }, props: { text: "Drops land on top" } },
|
|
87
|
+
right: { type: "shape", position: { x: 480, y: 300 }, size: { width: 280, height: 160 }, rotation: -6, style: { fill: "green", fillOpacity: 0.16, radius: 16 }, props: { text: "and bounce off edges" } },
|
|
88
|
+
},
|
|
89
|
+
},
|
|
90
|
+
},
|
|
76
91
|
};
|
|
77
92
|
export function registerBoardExampleCommands(boards) {
|
|
78
93
|
boards.command("examples [name]")
|
|
79
94
|
.description("Print a starter Board document or list the examples")
|
|
80
|
-
.option("--module",
|
|
95
|
+
.option("--module", `Print the example's JavaScript module (${Object.keys(MODULES).join(", ")})`)
|
|
81
96
|
.addHelpText("after", `
|
|
82
97
|
Examples are valid input for create and apply:
|
|
83
98
|
cohub boards examples lesson > lesson.json
|
|
84
99
|
cohub boards create lesson.board -i lesson.json`)
|
|
85
100
|
.action((name, options) => {
|
|
86
101
|
if (options.module) {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
102
|
+
const module = name ? MODULES[name] : undefined;
|
|
103
|
+
if (!module)
|
|
104
|
+
throw new Error(`--module needs one of these examples: ${Object.keys(MODULES).join(", ")}.`);
|
|
105
|
+
process.stdout.write(module);
|
|
90
106
|
return;
|
|
91
107
|
}
|
|
92
108
|
if (!name) {
|
package/dist/commands/boards.js
CHANGED
|
@@ -4,7 +4,7 @@ import { mkdir } from "node:fs/promises";
|
|
|
4
4
|
import { dirname } from "node:path";
|
|
5
5
|
import { BOARD_PRESET_NAMES, BOARD_SCHEMA_TARGETS, BOARD_SCRIPT_API, BOARD_THEME_IDS, boardJsonSchema, boardPresetTracks, boardSchemaOverview, isBoardPresetName, listBoardPresets, } from "@neta-art/cohub/board";
|
|
6
6
|
import { BOARD_CREATE_INPUT_MAX_BYTES, BOARD_TRANSACTION_INPUT_MAX_BYTES, parseBoardJsonObject, readBoardJsonObject, writeBoardOutput, } from "../board-command-support.js";
|
|
7
|
-
import { BOARD_EXPORT_IMAGE_MEMORY_MIB } from "../board-export-resources.js";
|
|
7
|
+
import { BOARD_EXPORT_IMAGE_MEMORY_MIB, BOARD_EXPORT_RENDERERS } from "../board-export-resources.js";
|
|
8
8
|
import { settleBoardPatch } from "../board-media.js";
|
|
9
9
|
import { formatBoardTime, parseBoardTime, parseBoardTimes } from "../board-time.js";
|
|
10
10
|
import { createClient, createRealtimeClient } from "../client.js";
|
|
@@ -166,6 +166,7 @@ function registerExportCommand(boards) {
|
|
|
166
166
|
.option("--fps <rate>", "Video frame rate; defaults to the --at step")
|
|
167
167
|
.option("--image-memory <mib>", "Decoded image memory budget in MiB", String(BOARD_EXPORT_IMAGE_MEMORY_MIB))
|
|
168
168
|
.option("--no-images", "Draw placeholders instead of downloading images")
|
|
169
|
+
.option("--renderer <renderer>", "auto draws in Node and uses local Chrome for shaders; canvas or gpu forces one", "auto")
|
|
169
170
|
.option("--force", "Replace existing output files"))
|
|
170
171
|
.addHelpText("after", `
|
|
171
172
|
Examples:
|
|
@@ -238,6 +239,7 @@ Examples:
|
|
|
238
239
|
output: out,
|
|
239
240
|
quality: parseNumber(options.quality ?? "0.92", "--quality", { min: 0, max: 1 }),
|
|
240
241
|
withImages: options.images !== false,
|
|
242
|
+
renderer: parseChoice(options.renderer, "--renderer", BOARD_EXPORT_RENDERERS),
|
|
241
243
|
});
|
|
242
244
|
if (jsonRequested(options))
|
|
243
245
|
return outJson({ file: out, ...result });
|
|
@@ -277,6 +279,7 @@ Examples:
|
|
|
277
279
|
format: parseExportFormat(options, out),
|
|
278
280
|
quality: parseNumber(options.quality ?? "0.92", "--quality", { min: 0, max: 1 }),
|
|
279
281
|
withImages: options.images !== false,
|
|
282
|
+
renderer: parseChoice(options.renderer, "--renderer", BOARD_EXPORT_RENDERERS),
|
|
280
283
|
});
|
|
281
284
|
if (!result)
|
|
282
285
|
return error("Nothing to export: the region contains no items.");
|
|
@@ -316,6 +319,9 @@ Steps are {"steps": [...]}, points in board coordinates, run on a virtual clock:
|
|
|
316
319
|
{"wait": "500ms"} {"tool": "draw"} {"tap": [x, y]} {"drag": [[x, y], ...], "pointerType": "pen"}
|
|
317
320
|
{"pointer": "down", "at": [x, y]} {"key": "Enter"} {"select": ["id"]}
|
|
318
321
|
|
|
322
|
+
Shaders are compiled with a local Chrome, Chromium or Edge when one is found, and
|
|
323
|
+
their errors join the scripts' errors.
|
|
324
|
+
|
|
319
325
|
Examples:
|
|
320
326
|
cohub boards simulate farm.board '{"steps":[{"wait":"2s"}]}' -o farm.png
|
|
321
327
|
cohub boards simulate farm.board -i steps.json --json`)
|
|
@@ -355,6 +361,8 @@ Examples:
|
|
|
355
361
|
ok(`Simulated ${formatBoardTime(result.time)}: ${result.commits} commit${result.commits === 1 ? "" : "s"}, ${changed} item${changed === 1 ? "" : "s"} changed (not saved)`);
|
|
356
362
|
for (const [id, message] of Object.entries(result.errors))
|
|
357
363
|
console.log(` ! ${id}: ${message.split("\n")[0]}`);
|
|
364
|
+
if (result.shaders && !result.shaders.compiled)
|
|
365
|
+
console.log(" Shaders were checked but not compiled; install Chrome, Chromium or Edge, or set COHUB_CHROME, to compile them.");
|
|
358
366
|
if (out && image)
|
|
359
367
|
console.log(` Rendered ${image.width}×${image.height} to ${out}`);
|
|
360
368
|
else if (out)
|
|
@@ -474,7 +482,7 @@ Times are milliseconds; 500ms, 12.5s and 2m also work on the command line.`);
|
|
|
474
482
|
.description("Merge a patch into the Board: fields merge, null deletes")
|
|
475
483
|
.option("-i, --input <file>", "Patch JSON; - for stdin")
|
|
476
484
|
.option("--replace", "Make the document equal to the input instead of merging")
|
|
477
|
-
.option("--cascade", "Also delete children and tracks of deleted items")
|
|
485
|
+
.option("--cascade", "Also delete children and tracks of deleted items, and tracks of deleted Board scripts")
|
|
478
486
|
.option("--dry-run", "Validate without writing")
|
|
479
487
|
.option("--base-version <n>", "Fail if the Board moved past this version")
|
|
480
488
|
.option("--mutation-id <id>", "Stable id; retries never apply twice"))
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type Command } from "commander";
|
|
2
2
|
export declare function registerSpaceDisplays(spacesCmd: Command): void;
|