@fungi.computer/oyster 0.11.0 → 0.12.1
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 +70 -10
- package/dist/app-builds.d.ts +2 -0
- package/dist/app-builds.js +17 -6
- package/dist/authorization.d.ts +1 -1
- package/dist/build/artifact-writer.d.ts +11 -2
- package/dist/build/artifact-writer.js +42 -24
- package/dist/build/candidate-cli.mjs +33 -19
- package/dist/build/content-objects.d.ts +29 -14
- package/dist/build/content-objects.js +57 -19
- package/dist/build/local-build.js +7 -1
- package/dist/build/submission-contract.d.ts +1 -1
- package/dist/build/submission-contract.js +5 -5
- package/dist/build-egress.d.ts +8 -7
- package/dist/build-egress.js +4 -3
- package/dist/build.d.ts +1 -1
- package/dist/hello-app-script.d.ts +2 -0
- package/dist/hello-app-script.js +1 -0
- package/dist/install-release-cli.d.ts +2 -1
- package/dist/install-release-cli.js +18 -10
- package/dist/installation-client.d.ts +1 -0
- package/dist/installation-operations.d.ts +2 -0
- package/dist/installation-operations.js +1 -0
- package/dist/pack.d.ts +5 -2
- package/dist/pack.js +3 -1
- package/dist/standalone/agents.d.ts +6 -2
- package/dist/standalone/agents.js +21 -4
- package/dist/standalone/computer-egress.d.ts +5 -3
- package/dist/standalone/computer-egress.js +1 -1
- package/dist/standalone/hello-app.d.ts +10 -0
- package/dist/standalone/hello-app.js +81 -0
- package/dist/standalone/install-apps-cli.d.ts +2 -1
- package/dist/standalone/install-apps-cli.js +36 -14
- package/dist/standalone/instance.js +2 -2
- package/dist/standalone/local-desktop.d.ts +11 -0
- package/dist/standalone/local-desktop.js +75 -0
- package/dist/standalone/registry.d.ts +2 -0
- package/dist/standalone/sign-in-link.d.ts +9 -0
- package/dist/standalone/sign-in-link.js +49 -0
- package/dist/standalone/try-cli.d.ts +52 -0
- package/dist/standalone/try-cli.js +427 -0
- package/dist/standalone/worker.js +1 -1
- package/dist/webhook-abuse.d.ts +7 -1
- package/dist/webhook-abuse.js +8 -2
- package/dist/workers.d.ts +7 -2
- package/dist/workers.js +1 -1
- package/docs/api/authorization.md +56 -11
- package/docs/api/build-contract.md +52 -10
- package/docs/api/build.md +16 -2
- package/docs/api/host.md +1 -0
- package/docs/api/pack.md +179 -3
- package/docs/site/agent-quickstart.mdx +8 -0
- package/package.json +13 -8
|
@@ -1,2 +1,3 @@
|
|
|
1
|
+
import { Cli } from "@fungi.computer/lantern";
|
|
1
2
|
export declare const installReleaseUsage = "Usage: oyster install <directory|release.json> [--installation-id <name>]";
|
|
2
|
-
export declare function installReleaseCommand(args: readonly string[]): Promise<void>;
|
|
3
|
+
export declare function installReleaseCommand(args: readonly string[], ui?: Cli): Promise<void>;
|
|
@@ -3,9 +3,12 @@ import { stat } from "node:fs/promises";
|
|
|
3
3
|
import { basename, dirname, resolve } from "node:path";
|
|
4
4
|
import process from "node:process";
|
|
5
5
|
import { parseArgs } from "node:util";
|
|
6
|
+
import { Cli } from "@fungi.computer/lantern";
|
|
6
7
|
import { installRelease } from "./pack.js";
|
|
7
8
|
export const installReleaseUsage = "Usage: oyster install <directory|release.json> [--installation-id <name>]";
|
|
8
|
-
export async function installReleaseCommand(args
|
|
9
|
+
export async function installReleaseCommand(args,
|
|
10
|
+
// Progress goes to stderr so stdout stays the installation result.
|
|
11
|
+
ui = new Cli({ brand: "fungi", output: process.stderr })) {
|
|
9
12
|
const { values, positionals } = parseArgs({
|
|
10
13
|
args: [...args],
|
|
11
14
|
allowPositionals: true,
|
|
@@ -33,14 +36,19 @@ export async function installReleaseCommand(args) {
|
|
|
33
36
|
if (!info.isDirectory() &&
|
|
34
37
|
(!info.isFile() || basename(path) !== "release.json"))
|
|
35
38
|
throw new Error("Expected a Release directory or release.json");
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
ui.welcome("Oyster: install a Release");
|
|
40
|
+
const body = await ui.task(`Installing ${basename(path)}`, async () => {
|
|
41
|
+
const response = await installRelease({
|
|
42
|
+
directory: info.isDirectory() ? path : dirname(path),
|
|
43
|
+
url,
|
|
44
|
+
key,
|
|
45
|
+
installationId: values["installation-id"],
|
|
46
|
+
});
|
|
47
|
+
const text = await response.text();
|
|
48
|
+
if (!response.ok)
|
|
49
|
+
throw new Error("Installation failed (" + String(response.status) + "): " + text);
|
|
50
|
+
return text;
|
|
41
51
|
});
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
throw new Error("Installation failed (" + String(response.status) + "): " + body);
|
|
45
|
-
process.stdout.write(body + "\n");
|
|
52
|
+
process.stdout.write(body.trim() + "\n");
|
|
53
|
+
ui.outro(`Open ${url}/ to use it.`);
|
|
46
54
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Release } from "@fungi.computer/puffball";
|
|
2
2
|
import { type InstallationOperation } from "./installation-operations.js";
|
|
3
|
+
/** An installation operation that has finished: it is no longer pending. */
|
|
3
4
|
export type InstallationCompletion = Exclude<InstallationOperation, {
|
|
4
5
|
state: "pending";
|
|
5
6
|
}>;
|
|
@@ -127,6 +127,7 @@ declare const installationOutcomeSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
127
127
|
}, z.core.$strict>], "state">;
|
|
128
128
|
export type InstallationOutcome = z.output<typeof installationOutcomeSchema>;
|
|
129
129
|
/** One wire contract for admission and subsequent authoritative observation. */
|
|
130
|
+
/** Parses the owner's answer about one installation request: pending, installed, refused or unconfirmed. */
|
|
130
131
|
export declare const installationOperationSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
131
132
|
state: z.ZodLiteral<"pending">;
|
|
132
133
|
requestId: z.ZodString;
|
|
@@ -323,6 +324,7 @@ export declare const installationOperationSchema: z.ZodDiscriminatedUnion<[z.Zod
|
|
|
323
324
|
};
|
|
324
325
|
}, unknown>>;
|
|
325
326
|
}, z.core.$strict>], "state">;
|
|
327
|
+
/** The owner's answer about one installation request. */
|
|
326
328
|
export type InstallationOperation = z.output<typeof installationOperationSchema>;
|
|
327
329
|
declare const installationAdmissionSchema: z.ZodObject<{
|
|
328
330
|
requestId: z.ZodString;
|
|
@@ -76,6 +76,7 @@ const terminalOperationSchema = z.discriminatedUnion("state", [
|
|
|
76
76
|
unconfirmedSchema.extend(identity),
|
|
77
77
|
]);
|
|
78
78
|
/** One wire contract for admission and subsequent authoritative observation. */
|
|
79
|
+
/** Parses the owner's answer about one installation request: pending, installed, refused or unconfirmed. */
|
|
79
80
|
export const installationOperationSchema = z.discriminatedUnion("state", [
|
|
80
81
|
pendingOperationSchema,
|
|
81
82
|
successReferenceSchema
|
package/dist/pack.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { type InstallationObservationBudget } from "./installation-client.js";
|
|
1
|
+
import { type InstallationCompletion, type InstallationObservationBudget } from "./installation-client.js";
|
|
2
2
|
import { type ArtifactRef, type Release } from "@fungi.computer/puffball";
|
|
3
3
|
import { type AppPublisherCoreConfigInput } from "./build.js";
|
|
4
4
|
import type { InstallationOperation } from "./installation-operations.js";
|
|
5
|
-
export { InstallationObservationError } from "./installation-client.js";
|
|
5
|
+
export { InstallationObservationError, type InstallationCompletion, } from "./installation-client.js";
|
|
6
|
+
export { installationOperationSchema, type InstallationOperation, } from "./installation-operations.js";
|
|
6
7
|
/** One committed repository and its canonical App build recipe. */
|
|
7
8
|
export type PackOptions = Readonly<{
|
|
8
9
|
/** The App's ID, `app_<name>`. */
|
|
@@ -72,6 +73,8 @@ export declare function installRelease(input: Readonly<{
|
|
|
72
73
|
installationId?: string;
|
|
73
74
|
/** Report owner-correlated admission without shortening the completion wait. */
|
|
74
75
|
onAdmitted?: (operation: InstallationOperation) => void;
|
|
76
|
+
/** Runs once with the completed operation, before the response is made. */
|
|
77
|
+
onCompleted?: (operation: InstallationCompletion) => Promise<void>;
|
|
75
78
|
}> & InstallationObservationBudget): Promise<Response>;
|
|
76
79
|
/** Project one exact first-party commit's editable source, `git push` it to
|
|
77
80
|
* an Oyster's own template for that App, and claim the pushed head, so
|
package/dist/pack.js
CHANGED
|
@@ -10,7 +10,8 @@ import { commitPreparedCandidate, createAppCandidatePreparer, createArtifactsSou
|
|
|
10
10
|
import { templateSeedClaimSchema, } from "./source/template-seed.js";
|
|
11
11
|
import { pushTemplateSource } from "./source/template-push.js";
|
|
12
12
|
import { sha256 } from "./release.js";
|
|
13
|
-
export { InstallationObservationError } from "./installation-client.js";
|
|
13
|
+
export { InstallationObservationError, } from "./installation-client.js";
|
|
14
|
+
export { installationOperationSchema, } from "./installation-operations.js";
|
|
14
15
|
async function filesUnder(directory) {
|
|
15
16
|
const entries = await readdir(directory, {
|
|
16
17
|
recursive: true,
|
|
@@ -127,6 +128,7 @@ export async function installRelease(input) {
|
|
|
127
128
|
if (input.onAdmitted !== undefined)
|
|
128
129
|
installation = { ...installation, onAdmitted: input.onAdmitted };
|
|
129
130
|
const operation = await installOnOyster(installation);
|
|
131
|
+
await input.onCompleted?.(operation);
|
|
130
132
|
return completedInstallationResponse(operation);
|
|
131
133
|
}
|
|
132
134
|
/** Project one exact first-party commit's editable source, `git push` it to
|
|
@@ -31,7 +31,7 @@ import type { Avatar } from "@fungi.computer/sprite/avatar";
|
|
|
31
31
|
import type { InvocationFrame } from "../invocation.js";
|
|
32
32
|
import type { OysterJson } from "../host.js";
|
|
33
33
|
import { type FleetMessage } from "@fungi.computer/shiitake/fleet";
|
|
34
|
-
import { type AppToolPolicy } from "../apps/index.js";
|
|
34
|
+
import { type AppToolPolicy, type Installation } from "../apps/index.js";
|
|
35
35
|
import { type OysterHost } from "../host.js";
|
|
36
36
|
import { type TenantScope, type TenantId, type TenantPrincipal } from "../tenant.js";
|
|
37
37
|
import type { ReadonlyTenancy } from "../tenancy/index.js";
|
|
@@ -542,6 +542,10 @@ export declare const agentFrameMethods: {
|
|
|
542
542
|
readonly visited: true;
|
|
543
543
|
};
|
|
544
544
|
requiredOperations: () => string[];
|
|
545
|
+
requestedResource: (raw: readonly unknown[]) => {
|
|
546
|
+
kind: string;
|
|
547
|
+
id: string;
|
|
548
|
+
};
|
|
545
549
|
};
|
|
546
550
|
};
|
|
547
551
|
AGENTS: {
|
|
@@ -716,5 +720,5 @@ export declare const agentFrameMethods: {
|
|
|
716
720
|
};
|
|
717
721
|
};
|
|
718
722
|
/** Provider effects are admitted by the originating Instance's live frame. */
|
|
719
|
-
export declare function dispatchAgentBinding(env: StandaloneAgentsEnv, scope: TenantScope, frame: InvocationFrame, props: FrameBindingProps, method: string, args: readonly unknown[]): Promise<OysterJson>;
|
|
723
|
+
export declare function dispatchAgentBinding(env: StandaloneAgentsEnv, scope: TenantScope, frame: InvocationFrame, props: FrameBindingProps, method: string, args: readonly unknown[], admitted: Installation): Promise<OysterJson>;
|
|
720
724
|
export {};
|
|
@@ -55,9 +55,9 @@ import { readAgentSchedulePage, controlAgentSchedule, } from "@fungi.computer/sh
|
|
|
55
55
|
import { agentScheduleTargetSchema } from "@fungi.computer/shiitake-extensions/schedules";
|
|
56
56
|
import { createAgentAvatarStore, } from "../agent-avatars.js";
|
|
57
57
|
import { agentIds, createAgentDirectory, createFleetSessions, commandSettlementSchema, DirectoryError, } from "@fungi.computer/shiitake/fleet";
|
|
58
|
-
import { appToolPolicySchema } from "../apps/index.js";
|
|
58
|
+
import { appToolPolicySchema, } from "../apps/index.js";
|
|
59
59
|
import { oysterPrincipalId } from "../host.js";
|
|
60
|
-
import { oysterPrincipalIsOwner } from "../authorization.js";
|
|
60
|
+
import { agentCeiling, oysterPrincipalIsOwner } from "../authorization.js";
|
|
61
61
|
import { defaultTenant, tenantIdSchema, tenantScope, } from "../tenant.js";
|
|
62
62
|
import { createCodemodeSandbox } from "@fungi.computer/mycelium/workers";
|
|
63
63
|
import { forageDiscoveryInstructions } from "@fungi.computer/mycelium/effect";
|
|
@@ -2128,6 +2128,10 @@ export const agentFrameMethods = {
|
|
|
2128
2128
|
decodeArgs: (raw) => agentBindingArgs.INBOX.visit.parse(raw),
|
|
2129
2129
|
decodeResult: decodeInboxVisit,
|
|
2130
2130
|
requiredOperations: () => ["visit"],
|
|
2131
|
+
requestedResource: (raw) => ({
|
|
2132
|
+
kind: "agent",
|
|
2133
|
+
id: agentBindingArgs.INBOX.visit.parse(raw)[0].agentId,
|
|
2134
|
+
}),
|
|
2131
2135
|
},
|
|
2132
2136
|
},
|
|
2133
2137
|
AGENTS: {
|
|
@@ -2187,7 +2191,7 @@ export const agentFrameMethods = {
|
|
|
2187
2191
|
},
|
|
2188
2192
|
};
|
|
2189
2193
|
/** Provider effects are admitted by the originating Instance's live frame. */
|
|
2190
|
-
export async function dispatchAgentBinding(env, scope, frame, props, method, args) {
|
|
2194
|
+
export async function dispatchAgentBinding(env, scope, frame, props, method, args, admitted) {
|
|
2191
2195
|
frame.signal.throwIfAborted();
|
|
2192
2196
|
if (frame.facts.selection.owner.kind !== "installation")
|
|
2193
2197
|
throw new AppInstanceError("revoked");
|
|
@@ -2196,8 +2200,21 @@ export async function dispatchAgentBinding(env, scope, frame, props, method, arg
|
|
|
2196
2200
|
let result;
|
|
2197
2201
|
if (props.binding === "INBOX" && method === "page") {
|
|
2198
2202
|
agentBindingArgs.INBOX.page.parse(args);
|
|
2203
|
+
const read = admitted.authority.approvedGrants.find((grant) => grant.capability === "agent.read");
|
|
2204
|
+
if (read === undefined)
|
|
2205
|
+
throw new AppInstanceError("binding_not_granted");
|
|
2206
|
+
const ceiling = agentCeiling(read.resources);
|
|
2199
2207
|
const inbox = await standaloneAgents(env, scope).inbox();
|
|
2200
|
-
result =
|
|
2208
|
+
result =
|
|
2209
|
+
ceiling === "all"
|
|
2210
|
+
? { items: inbox.items, next: null, cursor: inbox.revision }
|
|
2211
|
+
: {
|
|
2212
|
+
items: inbox.items.filter((item) => "agentId" in item && ceiling.has(item.agentId)),
|
|
2213
|
+
next: null,
|
|
2214
|
+
// The global revision also moves for Agents outside the selection;
|
|
2215
|
+
// with no scoped change stream, a narrowed App sees neither it nor their rows.
|
|
2216
|
+
cursor: 0,
|
|
2217
|
+
};
|
|
2201
2218
|
}
|
|
2202
2219
|
else if (props.binding === "INBOX" && method === "visit") {
|
|
2203
2220
|
const [input] = agentBindingArgs.INBOX.visit.parse(args);
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type BuildGitEvent } from "../build-egress.js";
|
|
2
|
+
import type { ContentObjectOwner } from "../build/content-objects.js";
|
|
2
3
|
import type { CandidateObject, CandidateObjectMediaType, TeamAppCandidateManifest } from "../build-contract.js";
|
|
3
4
|
import { type GitDoorTarget } from "../git.js";
|
|
4
5
|
/** Loopback props the ComputerDO sets; a guest cannot choose them. */
|
|
@@ -13,12 +14,13 @@ export type OysterComputerBuildPort = Readonly<{
|
|
|
13
14
|
admitBuild(jobId: string): Promise<Readonly<{
|
|
14
15
|
credentialId: string;
|
|
15
16
|
}> | null>;
|
|
16
|
-
/** One object upload for a live job's grant,
|
|
17
|
+
/** One object upload for a live job's grant, its size bound and owner. */
|
|
17
18
|
admitObject(jobId: string, grant: string): Promise<Readonly<{
|
|
18
19
|
maxObjectBytes: number;
|
|
20
|
+
owner: ContentObjectOwner;
|
|
19
21
|
}> | null>;
|
|
20
|
-
/** Stream one admitted object into the host's Release store. */
|
|
21
|
-
storeObject(object: CandidateObject, body: ReadableStream<Uint8Array> | null, mediaType: CandidateObjectMediaType): Promise<"stored" | "refused">;
|
|
22
|
+
/** Stream one admitted object into the host's Release store, in its owner's namespace. */
|
|
23
|
+
storeObject(object: CandidateObject, body: ReadableStream<Uint8Array> | null, mediaType: CandidateObjectMediaType, owner: ContentObjectOwner): Promise<"stored" | "refused">;
|
|
22
24
|
submitCandidate(jobId: string, manifest: TeamAppCandidateManifest, grant: string, credentialId: string): Promise<Response>;
|
|
23
25
|
record(event: BuildGitEvent): Promise<void>;
|
|
24
26
|
}>;
|
|
@@ -74,7 +74,7 @@ export async function serveOysterComputerEgress(request, options) {
|
|
|
74
74
|
response = await createBuildEgress({
|
|
75
75
|
admitBuild: (jobId) => options.build.admitBuild(jobId),
|
|
76
76
|
admitObject: (jobId, grant) => options.build.admitObject(jobId, grant),
|
|
77
|
-
storeObject: (object, body, mediaType) => options.build.storeObject(object, body, mediaType),
|
|
77
|
+
storeObject: (object, body, mediaType, admitted) => options.build.storeObject(object, body, mediaType, admitted.owner),
|
|
78
78
|
submitCandidate: (jobId, manifest, grant, credentialId) => options.build.submitCandidate(jobId, manifest, grant, credentialId),
|
|
79
79
|
record: (event) => options.build.record(event),
|
|
80
80
|
}).fetch(request, url);
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare const helloPage = "<!doctype html>\n<title>Hello</title>\n<h1>Hello from my first Oyster App</h1>\n<script type=\"module\" src=\"./main.js\"></script>\n";
|
|
2
|
+
/** Pack the Hello App kept at `<directory>/hello-app` and install it as
|
|
3
|
+
* `hello`; answers the HTTP status (201 new, 200 when already installed).
|
|
4
|
+
* The first call writes and commits the source; later calls pack its current
|
|
5
|
+
* `HEAD`, so a committed edit followed by `oyster try` shows the change. */
|
|
6
|
+
export declare function installHelloApp(input: Readonly<{
|
|
7
|
+
directory: string;
|
|
8
|
+
url: string;
|
|
9
|
+
key: string;
|
|
10
|
+
}>): Promise<number>;
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
// The starter Hello App for a local Oyster: a one-page bundled-html App,
|
|
2
|
+
// committed to git, packed into a Release and installed as `hello`. The
|
|
3
|
+
// quick start and `oyster try` install the same App through this module;
|
|
4
|
+
// `try` keeps its source at `<project>/hello-app` for the person to edit.
|
|
5
|
+
import { execFileSync } from "node:child_process";
|
|
6
|
+
import { access, mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
|
|
7
|
+
import { tmpdir } from "node:os";
|
|
8
|
+
import { join } from "node:path";
|
|
9
|
+
import { helloAppScript } from "#hello-app-script";
|
|
10
|
+
import { installRelease, packRelease } from "../pack.js";
|
|
11
|
+
const manifest = {
|
|
12
|
+
name: "hello-app",
|
|
13
|
+
private: true,
|
|
14
|
+
fungi: { app: { displayName: "Hello", icon: "fungi", capabilities: [] } },
|
|
15
|
+
};
|
|
16
|
+
// The script announces the page to Oyster; without it the window never opens.
|
|
17
|
+
export const helloPage = '<!doctype html>\n<title>Hello</title>\n<h1>Hello from my first Oyster App</h1>\n<script type="module" src="./main.js"></script>\n';
|
|
18
|
+
const exists = (path) => access(path).then(() => true, () => false);
|
|
19
|
+
const git = (directory, args) => execFileSync("git", [
|
|
20
|
+
"-C",
|
|
21
|
+
directory,
|
|
22
|
+
"-c",
|
|
23
|
+
"user.name=Oyster",
|
|
24
|
+
"-c",
|
|
25
|
+
"user.email=oyster@example.invalid",
|
|
26
|
+
...args,
|
|
27
|
+
], { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }).trim();
|
|
28
|
+
// Write `hello-app/` under `directory` and commit it; answers the commit.
|
|
29
|
+
async function writeHelloApp(directory) {
|
|
30
|
+
const source = join(directory, "hello-app");
|
|
31
|
+
await mkdir(join(source, "bundle"), { recursive: true });
|
|
32
|
+
await writeFile(join(source, "package.json"), JSON.stringify(manifest, null, 2) + "\n");
|
|
33
|
+
await writeFile(join(source, "bundle", "index.html"), helloPage);
|
|
34
|
+
await writeFile(join(source, "bundle", "main.js"), helloAppScript);
|
|
35
|
+
git(source, ["init", "-q"]);
|
|
36
|
+
git(source, ["add", "."]);
|
|
37
|
+
git(source, ["commit", "-qm", "Hello App"]);
|
|
38
|
+
return git(source, ["rev-parse", "HEAD"]);
|
|
39
|
+
}
|
|
40
|
+
/** Pack the Hello App kept at `<directory>/hello-app` and install it as
|
|
41
|
+
* `hello`; answers the HTTP status (201 new, 200 when already installed).
|
|
42
|
+
* The first call writes and commits the source; later calls pack its current
|
|
43
|
+
* `HEAD`, so a committed edit followed by `oyster try` shows the change. */
|
|
44
|
+
export async function installHelloApp(input) {
|
|
45
|
+
const source = join(input.directory, "hello-app");
|
|
46
|
+
const commit = (await exists(join(source, ".git")))
|
|
47
|
+
? git(source, ["rev-parse", "HEAD"])
|
|
48
|
+
: await writeHelloApp(input.directory);
|
|
49
|
+
const scratch = await mkdtemp(join(tmpdir(), "oyster-hello-"));
|
|
50
|
+
try {
|
|
51
|
+
await packRelease({
|
|
52
|
+
appId: "app_hello",
|
|
53
|
+
sourceDirectory: source,
|
|
54
|
+
sourceRevision: `git:${commit}`,
|
|
55
|
+
recipe: {
|
|
56
|
+
kind: "bundled-html",
|
|
57
|
+
entry: "bundle/index.html",
|
|
58
|
+
assets: {
|
|
59
|
+
maxManifestBytes: 65_536,
|
|
60
|
+
maxObjects: 16,
|
|
61
|
+
maxObjectBytes: 1_048_576,
|
|
62
|
+
maxTotalBytes: 4_194_304,
|
|
63
|
+
},
|
|
64
|
+
assetBase: "./",
|
|
65
|
+
backend: null,
|
|
66
|
+
maxOutputBytes: 4_194_304,
|
|
67
|
+
},
|
|
68
|
+
outDirectory: join(scratch, "release"),
|
|
69
|
+
});
|
|
70
|
+
const response = await installRelease({
|
|
71
|
+
directory: join(scratch, "release"),
|
|
72
|
+
url: input.url,
|
|
73
|
+
key: input.key,
|
|
74
|
+
installationId: "hello",
|
|
75
|
+
});
|
|
76
|
+
return response.status;
|
|
77
|
+
}
|
|
78
|
+
finally {
|
|
79
|
+
await rm(scratch, { recursive: true, force: true });
|
|
80
|
+
}
|
|
81
|
+
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
+
import { Cli } from "@fungi.computer/lantern";
|
|
2
3
|
import { installStandaloneAppSet } from "./app-set.js";
|
|
3
|
-
export declare function installApps(args: readonly string[], install?: typeof installStandaloneAppSet): Promise<void>;
|
|
4
|
+
export declare function installApps(args: readonly string[], install?: typeof installStandaloneAppSet, ui?: Cli): Promise<void>;
|
|
4
5
|
export declare function runInstallAppsCli(args?: readonly string[]): Promise<void>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
// `oyster install-apps`: seed, build on the Oyster's own Computer, and install
|
|
2
|
+
// `oyster try` starts a local Oyster; `oyster install-apps`: seed, build on the Oyster's own Computer, and install
|
|
3
3
|
// the seven starter Apps (Tourtois, Bonsai, Shed, Inkcap, Trellis, Prints,
|
|
4
4
|
// and Grove). Each comes from its own public repository by default,
|
|
5
5
|
// or from a Botanical checkout with `--from <directory>`.
|
|
@@ -13,6 +13,8 @@ import { tmpdir } from "node:os";
|
|
|
13
13
|
import { join, resolve } from "node:path";
|
|
14
14
|
import process from "node:process";
|
|
15
15
|
import { parseArgs } from "node:util";
|
|
16
|
+
import { Cli } from "@fungi.computer/lantern";
|
|
17
|
+
import { createTryCli, reportTryFailure, tryOyster, tryUsage, } from "./try-cli.js";
|
|
16
18
|
import { installReleaseCommand, installReleaseUsage, } from "../install-release-cli.js";
|
|
17
19
|
import { defaultStarterBuildConcurrency, installStandaloneAppSet, } from "./app-set.js";
|
|
18
20
|
/** The starter Apps' public source repositories. */
|
|
@@ -74,9 +76,14 @@ function timingTable(results) {
|
|
|
74
76
|
"upload",
|
|
75
77
|
"install",
|
|
76
78
|
];
|
|
77
|
-
|
|
79
|
+
const table = [header, ...rows];
|
|
80
|
+
const widths = header.map((_, column) => Math.max(...table.map((row) => row[column]?.length ?? 0)));
|
|
81
|
+
return table.map((row) => row
|
|
82
|
+
.map((cell, column) => cell.padEnd(widths[column] ?? 0))
|
|
83
|
+
.join(" ")
|
|
84
|
+
.trimEnd());
|
|
78
85
|
}
|
|
79
|
-
export async function installApps(args, install = installStandaloneAppSet) {
|
|
86
|
+
export async function installApps(args, install = installStandaloneAppSet, ui = new Cli({ brand: "fungi" })) {
|
|
80
87
|
const { values } = parseArgs({
|
|
81
88
|
args: [...args],
|
|
82
89
|
options: {
|
|
@@ -93,6 +100,7 @@ export async function installApps(args, install = installStandaloneAppSet) {
|
|
|
93
100
|
process.stdout.write(helpText);
|
|
94
101
|
return;
|
|
95
102
|
}
|
|
103
|
+
ui.welcome("Oyster: install the starter Apps");
|
|
96
104
|
const url = process.env.OYSTER_URL;
|
|
97
105
|
const key = process.env.OYSTER_OWNER_KEY;
|
|
98
106
|
if (!url || !key)
|
|
@@ -126,18 +134,23 @@ export async function installApps(args, install = installStandaloneAppSet) {
|
|
|
126
134
|
url,
|
|
127
135
|
key,
|
|
128
136
|
concurrency,
|
|
137
|
+
// Builds run side by side, so each report is its own line, not a spinner.
|
|
129
138
|
report: (message) => {
|
|
130
|
-
|
|
139
|
+
ui.step(message);
|
|
131
140
|
},
|
|
132
141
|
});
|
|
133
142
|
const elapsed = performance.now() - started;
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
143
|
+
if (installed.length > 0)
|
|
144
|
+
ui.note("Build timings", timingTable(installed));
|
|
145
|
+
ui.note("Apps", [
|
|
146
|
+
...installed.map((app) => `${app.installationId} installed`),
|
|
147
|
+
...failed.map((app) => `${app.installationId} failed: ${app.reason}`),
|
|
148
|
+
]);
|
|
149
|
+
const summary = `Installed ${String(installed.length)} Apps; failed ${String(failed.length)} in ${seconds(elapsed)}.`;
|
|
150
|
+
if (failed.length > 0)
|
|
151
|
+
ui.warn(summary, `Fix the failed Apps above and run oyster install-apps again.`);
|
|
152
|
+
else
|
|
153
|
+
ui.outro(`${summary} Open ${url}/ to use the installed Apps.`);
|
|
141
154
|
if (values.timings !== undefined)
|
|
142
155
|
await writeFile(values.timings, JSON.stringify({
|
|
143
156
|
concurrency,
|
|
@@ -159,15 +172,24 @@ export async function installApps(args, install = installStandaloneAppSet) {
|
|
|
159
172
|
export async function runInstallAppsCli(args = process.argv.slice(2)) {
|
|
160
173
|
const [command, ...rest] = args;
|
|
161
174
|
if (command === "--help" || command === "-h") {
|
|
162
|
-
process.stdout.write(usage + "\n" + installReleaseUsage + "\n");
|
|
175
|
+
process.stdout.write(tryUsage + "\n" + usage + "\n" + installReleaseUsage + "\n");
|
|
163
176
|
}
|
|
164
|
-
else if (command !== "
|
|
177
|
+
else if (command !== "try" &&
|
|
178
|
+
command !== "install-apps" &&
|
|
179
|
+
command !== "install") {
|
|
165
180
|
process.stderr.write(`${usage}\n`);
|
|
166
181
|
process.exitCode = 2;
|
|
167
182
|
}
|
|
183
|
+
else if (command === "try") {
|
|
184
|
+
const ui = createTryCli(rest);
|
|
185
|
+
await tryOyster(rest, undefined, ui).catch((cause) => {
|
|
186
|
+
reportTryFailure(cause, ui);
|
|
187
|
+
process.exitCode = 1;
|
|
188
|
+
});
|
|
189
|
+
}
|
|
168
190
|
else
|
|
169
191
|
await (command === "install" ? installReleaseCommand(rest) : installApps(rest)).catch((cause) => {
|
|
170
|
-
process.stderr.
|
|
192
|
+
new Cli({ brand: "fungi", output: process.stderr }).problem(cause instanceof Error ? cause.message : String(cause), `Run \`oyster ${command} --help\` for the options.`);
|
|
171
193
|
process.exitCode = 1;
|
|
172
194
|
});
|
|
173
195
|
}
|
|
@@ -38,11 +38,11 @@ export const standaloneBindings = {
|
|
|
38
38
|
},
|
|
39
39
|
INBOX: {
|
|
40
40
|
methods: agentFrameMethods.INBOX,
|
|
41
|
-
dispatch: (context, frame, props, method, args) => dispatchAgentBinding(context.env, context.scope(), frame, props, method, args),
|
|
41
|
+
dispatch: (context, frame, props, method, args, admitted) => dispatchAgentBinding(context.env, context.scope(), frame, props, method, args, admitted),
|
|
42
42
|
},
|
|
43
43
|
AGENTS: {
|
|
44
44
|
methods: agentFrameMethods.AGENTS,
|
|
45
|
-
dispatch: (context, frame, props, method, args) => dispatchAgentBinding(context.env, context.scope(), frame, props, method, args),
|
|
45
|
+
dispatch: (context, frame, props, method, args, admitted) => dispatchAgentBinding(context.env, context.scope(), frame, props, method, args, admitted),
|
|
46
46
|
},
|
|
47
47
|
/** The emit commits to the delivery owner; Workflows libraries receive it afterwards. */
|
|
48
48
|
EVENTS: eventsBindingFor(async (context) => {
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/** Whether the Oyster already has an installation with this id. */
|
|
2
|
+
export declare function isInstalled(input: Readonly<{
|
|
3
|
+
url: string;
|
|
4
|
+
key: string;
|
|
5
|
+
installationId: string;
|
|
6
|
+
}>): Promise<boolean>;
|
|
7
|
+
/** Build Tourtois from source on this machine and install it as `tourtois`. */
|
|
8
|
+
export declare function installLocalDesktop(input: Readonly<{
|
|
9
|
+
url: string;
|
|
10
|
+
key: string;
|
|
11
|
+
}>): Promise<void>;
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
// The Tourtois desktop for a local Oyster. The standalone Oyster builds its
|
|
2
|
+
// starter Apps on its own Computer, which a laptop does not have, so `oyster
|
|
3
|
+
// try` builds Tourtois here from its public source with the ordinary local
|
|
4
|
+
// packer and installs it as the home installation, approving its shell the
|
|
5
|
+
// same way `install-apps` does.
|
|
6
|
+
import { execFileSync } from "node:child_process";
|
|
7
|
+
import { mkdtemp, realpath, rm } from "node:fs/promises";
|
|
8
|
+
import { tmpdir } from "node:os";
|
|
9
|
+
import { join } from "node:path";
|
|
10
|
+
import * as Schema from "effect/Schema";
|
|
11
|
+
import * as z from "zod";
|
|
12
|
+
import { installRelease, packRelease } from "../pack.js";
|
|
13
|
+
import { appBuildRecipe, readBuildManifest } from "../build/workspace-build.js";
|
|
14
|
+
import { approveChosenDashboard } from "./dashboard-approval.js";
|
|
15
|
+
const tourtoisRepository = "https://github.com/fungi-computer/tourtois.git";
|
|
16
|
+
const installationRowsSchema = z.array(z.object({ installationId: z.string() }).loose());
|
|
17
|
+
const git = (cwd, args) => execFileSync("git", [...args], {
|
|
18
|
+
cwd,
|
|
19
|
+
encoding: "utf8",
|
|
20
|
+
stdio: ["ignore", "pipe", "pipe"],
|
|
21
|
+
}).trim();
|
|
22
|
+
/** Whether the Oyster already has an installation with this id. */
|
|
23
|
+
export async function isInstalled(input) {
|
|
24
|
+
const response = await fetch(new URL("/api/installations", input.url), {
|
|
25
|
+
headers: { Authorization: `Bearer ${input.key}` },
|
|
26
|
+
});
|
|
27
|
+
if (!response.ok)
|
|
28
|
+
return false;
|
|
29
|
+
const rows = installationRowsSchema.parse(await response.json());
|
|
30
|
+
return rows.some((row) => row.installationId === input.installationId);
|
|
31
|
+
}
|
|
32
|
+
/** Build Tourtois from source on this machine and install it as `tourtois`. */
|
|
33
|
+
export async function installLocalDesktop(input) {
|
|
34
|
+
const scratch = await realpath(await mkdtemp(join(tmpdir(), "oyster-tourtois-")));
|
|
35
|
+
try {
|
|
36
|
+
const source = join(scratch, "tourtois");
|
|
37
|
+
git(scratch, ["clone", "--quiet", "--depth=1", tourtoisRepository, source]);
|
|
38
|
+
const commit = git(source, ["rev-parse", "HEAD"]);
|
|
39
|
+
const release = join(scratch, "release");
|
|
40
|
+
await packRelease({
|
|
41
|
+
appId: "app_tourtois",
|
|
42
|
+
sourceDirectory: source,
|
|
43
|
+
sourceRevision: `git:${commit}`,
|
|
44
|
+
recipe: appBuildRecipe(readBuildManifest(git(source, ["show", `${commit}:package.json`])), ""),
|
|
45
|
+
outDirectory: release,
|
|
46
|
+
});
|
|
47
|
+
const owner = (method, path, body) => {
|
|
48
|
+
const headers = new Headers({
|
|
49
|
+
Authorization: `Bearer ${input.key}`,
|
|
50
|
+
Accept: "application/json",
|
|
51
|
+
});
|
|
52
|
+
const init = { method, headers };
|
|
53
|
+
if (body !== undefined) {
|
|
54
|
+
headers.set("Content-Type", "application/json");
|
|
55
|
+
init.body = JSON.stringify(body);
|
|
56
|
+
}
|
|
57
|
+
return fetch(new URL(path, input.url), init);
|
|
58
|
+
};
|
|
59
|
+
const response = await installRelease({
|
|
60
|
+
directory: release,
|
|
61
|
+
url: input.url,
|
|
62
|
+
key: input.key,
|
|
63
|
+
installationId: "tourtois",
|
|
64
|
+
onCompleted: async (operation) => {
|
|
65
|
+
if (operation.state === "succeeded")
|
|
66
|
+
await approveChosenDashboard(operation, owner);
|
|
67
|
+
},
|
|
68
|
+
});
|
|
69
|
+
if (!response.ok)
|
|
70
|
+
throw new Error(`Tourtois install failed (${String(response.status)})`);
|
|
71
|
+
}
|
|
72
|
+
finally {
|
|
73
|
+
await rm(scratch, { recursive: true, force: true });
|
|
74
|
+
}
|
|
75
|
+
}
|
|
@@ -8,6 +8,7 @@ import { type CloudflareArtifactsOptions } from "@fungi.computer/burrow/cloudfla
|
|
|
8
8
|
import { type OysterBuildStartResult, type OysterBuildView } from "../app-builds.js";
|
|
9
9
|
import type { TeamAppCandidateManifest } from "../build-contract.js";
|
|
10
10
|
import type { BuildGitEvent } from "../build-egress.js";
|
|
11
|
+
import type { ContentObjectOwner } from "../build/content-objects.js";
|
|
11
12
|
import { type StandaloneTenancyEnv } from "./tenancy.js";
|
|
12
13
|
import type { ComputerDO } from "./computer.js";
|
|
13
14
|
import type { ComputerEnv } from "@fungi.computer/computer";
|
|
@@ -280,6 +281,7 @@ export declare abstract class StandaloneRegistry extends OysterRegistry implemen
|
|
|
280
281
|
/** The egress: may this Computer's live job upload one object, how large? */
|
|
281
282
|
admitBuildObject(jobId: string, computerObjectId: string, grant: string): Promise<Readonly<{
|
|
282
283
|
maxObjectBytes: number;
|
|
284
|
+
owner: ContentObjectOwner;
|
|
283
285
|
}> | null>;
|
|
284
286
|
/** The egress: a live job's candidate manifest; its objects are stored. */
|
|
285
287
|
submitBuildCandidate(jobId: string, manifest: TeamAppCandidateManifest, grant: string, credentialId: string): Promise<Response>;
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export type SignInLink = Readonly<{
|
|
2
|
+
url: string;
|
|
3
|
+
close: () => void;
|
|
4
|
+
}>;
|
|
5
|
+
/** Serve one single-use page that signs the owner in to `oysterUrl`. */
|
|
6
|
+
export declare function startSignInLink(input: Readonly<{
|
|
7
|
+
oysterUrl: string;
|
|
8
|
+
key: string;
|
|
9
|
+
}>): Promise<SignInLink>;
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
// A one-time sign-in link for `oyster try`. The owner key never goes in a URL:
|
|
2
|
+
// the link opens a page served by this process that posts the key to the local
|
|
3
|
+
// Oyster's own /login form, then the server forgets the link.
|
|
4
|
+
import { randomBytes } from "node:crypto";
|
|
5
|
+
import { createServer } from "node:http";
|
|
6
|
+
import * as z from "zod";
|
|
7
|
+
const addressSchema = z.object({ port: z.number() });
|
|
8
|
+
const lifetimeMs = 10 * 60_000;
|
|
9
|
+
const escapeAttribute = (text) => text.replace(/[&"<>]/gu, (character) => `&#${String(character.codePointAt(0))};`);
|
|
10
|
+
/** Serve one single-use page that signs the owner in to `oysterUrl`. */
|
|
11
|
+
export async function startSignInLink(input) {
|
|
12
|
+
const nonce = Array.from(randomBytes(18), (byte) => byte.toString(16).padStart(2, "0")).join("");
|
|
13
|
+
let used = false;
|
|
14
|
+
const page = `<!doctype html><meta charset="utf-8"><meta name="referrer" content="no-referrer"><title>Signing in to Oyster</title>` +
|
|
15
|
+
`<form method="post" action="${escapeAttribute(new URL("/login", input.oysterUrl).href)}">` +
|
|
16
|
+
`<input type="hidden" name="key" value="${escapeAttribute(input.key)}"></form>` +
|
|
17
|
+
`<p>Signing in to Oyster...</p><script>document.forms[0].submit()</script>`;
|
|
18
|
+
const server = createServer((request, response) => {
|
|
19
|
+
if (used || request.method !== "GET" || request.url !== `/${nonce}`) {
|
|
20
|
+
response.writeHead(404, { "Cache-Control": "no-store" }).end("Not found");
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
used = true;
|
|
24
|
+
response
|
|
25
|
+
.writeHead(200, {
|
|
26
|
+
"Content-Type": "text/html; charset=utf-8",
|
|
27
|
+
"Cache-Control": "no-store",
|
|
28
|
+
"Referrer-Policy": "no-referrer",
|
|
29
|
+
})
|
|
30
|
+
.end(page);
|
|
31
|
+
setTimeout(() => {
|
|
32
|
+
server.close();
|
|
33
|
+
}, 1_000).unref();
|
|
34
|
+
});
|
|
35
|
+
await new Promise((done, fail) => {
|
|
36
|
+
server.once("error", fail);
|
|
37
|
+
server.listen(0, "127.0.0.1", done);
|
|
38
|
+
});
|
|
39
|
+
setTimeout(() => {
|
|
40
|
+
server.close();
|
|
41
|
+
}, lifetimeMs).unref();
|
|
42
|
+
const { port } = addressSchema.parse(server.address());
|
|
43
|
+
return {
|
|
44
|
+
url: `http://127.0.0.1:${String(port)}/${nonce}`,
|
|
45
|
+
close: () => {
|
|
46
|
+
server.close();
|
|
47
|
+
},
|
|
48
|
+
};
|
|
49
|
+
}
|