@vibes.diy/api-svc 14.1.13 → 14.1.15
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/asset-grant.js +3 -0
- package/asset-grant.js.map +1 -1
- package/billing.d.ts +1 -0
- package/billing.js +8 -1
- package/billing.js.map +1 -1
- package/create-handler.js +4 -1
- package/create-handler.js.map +1 -1
- package/evento-handler-manifest.js +2 -0
- package/evento-handler-manifest.js.map +1 -1
- package/intern/agent-assembly.js +6 -5
- package/intern/agent-assembly.js.map +1 -1
- package/intern/agent-dispatcher.js.map +1 -1
- package/intern/agent-lane-flag.d.ts +0 -7
- package/intern/agent-lane-flag.js +0 -3
- package/intern/agent-lane-flag.js.map +1 -1
- package/intern/agent-session-runtime.d.ts +1 -0
- package/intern/agent-session-runtime.js +16 -7
- package/intern/agent-session-runtime.js.map +1 -1
- package/intern/agent-session-store.d.ts +9 -0
- package/intern/agent-session-store.js +16 -1
- package/intern/agent-session-store.js.map +1 -1
- package/intern/agent-session.d.ts +2 -0
- package/intern/agent-session.js +20 -0
- package/intern/agent-session.js.map +1 -1
- package/intern/agent-turn.d.ts +1 -2
- package/intern/agent-turn.js +1 -2
- package/intern/agent-turn.js.map +1 -1
- package/intern/asset-sniff.d.ts +22 -0
- package/intern/asset-sniff.js +154 -0
- package/intern/asset-sniff.js.map +1 -0
- package/intern/autumn-plan.js.map +1 -1
- package/intern/kyc.d.ts +25 -0
- package/intern/kyc.js +97 -0
- package/intern/kyc.js.map +1 -0
- package/intern/llm-tool-loop.d.ts +0 -11
- package/intern/llm-tool-loop.js +1 -47
- package/intern/llm-tool-loop.js.map +1 -1
- package/intern/manifest-assets-line.d.ts +2 -0
- package/intern/manifest-assets-line.js +12 -0
- package/intern/manifest-assets-line.js.map +1 -0
- package/intern/open-turn-store.d.ts +9 -0
- package/intern/open-turn-store.js +30 -0
- package/intern/open-turn-store.js.map +1 -1
- package/intern/process-access-bindings.d.ts +3 -5
- package/intern/process-access-bindings.js.map +1 -1
- package/intern/process-backend-bindings.d.ts +3 -5
- package/intern/process-backend-bindings.js.map +1 -1
- package/intern/prompt-assembly.js +4 -0
- package/intern/prompt-assembly.js.map +1 -1
- package/intern/resolve-owned-asset-ref.d.ts +14 -0
- package/intern/resolve-owned-asset-ref.js +19 -0
- package/intern/resolve-owned-asset-ref.js.map +1 -0
- package/intern/resolve-servable-asset.d.ts +40 -0
- package/intern/resolve-servable-asset.js +108 -0
- package/intern/resolve-servable-asset.js.map +1 -0
- package/intern/runtime-model.d.ts +2 -0
- package/intern/runtime-model.js +7 -0
- package/intern/runtime-model.js.map +1 -1
- package/intern/turn-terminal.d.ts +0 -31
- package/intern/turn-terminal.js +0 -0
- package/intern/turn-terminal.js.map +1 -1
- package/intern/version-timeline.d.ts +9 -2
- package/intern/version-timeline.js +30 -11
- package/intern/version-timeline.js.map +1 -1
- package/intern/write-apps.d.ts +7 -4
- package/intern/write-apps.js +3 -0
- package/intern/write-apps.js.map +1 -1
- package/package.json +11 -11
- package/public/asset-original.d.ts +7 -0
- package/public/asset-original.js +140 -0
- package/public/asset-original.js.map +1 -0
- package/public/asset-safety-status.d.ts +3 -0
- package/public/asset-safety-status.js +107 -0
- package/public/asset-safety-status.js.map +1 -0
- package/public/asset-session.d.ts +1 -0
- package/public/asset-session.js +15 -0
- package/public/asset-session.js.map +1 -1
- package/public/asset-upload-grant.js +13 -0
- package/public/asset-upload-grant.js.map +1 -1
- package/public/cid-asset.js +29 -5
- package/public/cid-asset.js.map +1 -1
- package/public/ensure-app-slug-item.d.ts +2 -1
- package/public/ensure-app-slug-item.js +59 -11
- package/public/ensure-app-slug-item.js.map +1 -1
- package/public/ensure-user-settings.js +1 -1
- package/public/ensure-user-settings.js.map +1 -1
- package/public/files-asset.js +33 -26
- package/public/files-asset.js.map +1 -1
- package/public/fork-app.js +1 -1
- package/public/fork-app.js.map +1 -1
- package/public/fs-prompt.js +7 -2
- package/public/fs-prompt.js.map +1 -1
- package/public/llm-dispatch.d.ts +3 -2
- package/public/llm-dispatch.js +8 -5
- package/public/llm-dispatch.js.map +1 -1
- package/public/open-chat.js +21 -12
- package/public/open-chat.js.map +1 -1
- package/public/prompt-chat-section.js +4 -43
- package/public/prompt-chat-section.js.map +1 -1
- package/public/put-asset.d.ts +1 -0
- package/public/put-asset.js +55 -4
- package/public/put-asset.js.map +1 -1
- package/public/report-prompt-cache.d.ts +19 -0
- package/public/report-prompt-cache.js +63 -4
- package/public/report-prompt-cache.js.map +1 -1
- package/public/serv-entry-point.js +41 -16
- package/public/serv-entry-point.js.map +1 -1
- package/public/store-and-audit-asset.js +63 -0
- package/public/store-and-audit-asset.js.map +1 -1
- package/public/stream-assembly.d.ts +3 -2
- package/public/stream-assembly.js +2 -1
- package/public/stream-assembly.js.map +1 -1
- package/public/viewer-capabilities.d.ts +3 -0
- package/public/viewer-capabilities.js.map +1 -1
- package/public/who-am-i.js +5 -4
- package/public/who-am-i.js.map +1 -1
- package/vibes-req-res-evento.js +2 -1
- package/vibes-req-res-evento.js.map +1 -1
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import { Result, Option, EventoResult, URI, exception2Result, } from "@adviser/cement";
|
|
2
|
+
import { ASSET_EXTENSION_MIME, isFetchErrResult, isFetchNotFoundResult, isFetchOkResult, } from "@vibes.diy/api-types";
|
|
3
|
+
import { ensureLogger } from "@vibes.diy/identity";
|
|
4
|
+
import { and, eq } from "drizzle-orm";
|
|
5
|
+
import { requireKyc } from "../intern/kyc.js";
|
|
6
|
+
import { extractAssetSessionCookie } from "./asset-session.js";
|
|
7
|
+
import { resolveDeveloperAccess } from "./developer-grants.js";
|
|
8
|
+
const ORIGINAL_PATH_RE = /^\/assets\/original\/([^/?]+)\/?$/;
|
|
9
|
+
function downloadBasename(cid, mimeType) {
|
|
10
|
+
if (mimeType === null)
|
|
11
|
+
return cid;
|
|
12
|
+
const mime = mimeType.split(";")[0].trim().toLowerCase();
|
|
13
|
+
for (const [ext, m] of ASSET_EXTENSION_MIME) {
|
|
14
|
+
if (m === mime)
|
|
15
|
+
return `${cid}${ext}`;
|
|
16
|
+
}
|
|
17
|
+
return cid;
|
|
18
|
+
}
|
|
19
|
+
function logAssetOriginal(vctx, args) {
|
|
20
|
+
ensureLogger(vctx.sthis, "assetOriginal")
|
|
21
|
+
.Info()
|
|
22
|
+
.Str("op", "asset-original")
|
|
23
|
+
.Str("cid", args.cid)
|
|
24
|
+
.Str("actingUserId", args.actingUserId)
|
|
25
|
+
.Str("ownerHandle", args.ownerHandle)
|
|
26
|
+
.Str("appSlug", args.appSlug)
|
|
27
|
+
.Msg("original asset download");
|
|
28
|
+
}
|
|
29
|
+
export const assetOriginal = {
|
|
30
|
+
hash: "asset-original",
|
|
31
|
+
validate: (ctx) => {
|
|
32
|
+
const { request: req } = ctx;
|
|
33
|
+
if (!req)
|
|
34
|
+
return Promise.resolve(Result.Ok(Option.None()));
|
|
35
|
+
if (req.method !== "GET" && req.method !== "HEAD") {
|
|
36
|
+
return Promise.resolve(Result.Ok(Option.None()));
|
|
37
|
+
}
|
|
38
|
+
const match = ORIGINAL_PATH_RE.exec(URI.from(req.url).pathname);
|
|
39
|
+
if (match === null)
|
|
40
|
+
return Promise.resolve(Result.Ok(Option.None()));
|
|
41
|
+
return Promise.resolve(Result.Ok(Option.Some({
|
|
42
|
+
cid: decodeURIComponent(match[1]),
|
|
43
|
+
cookie: extractAssetSessionCookie(req),
|
|
44
|
+
})));
|
|
45
|
+
},
|
|
46
|
+
handle: async (ctx) => {
|
|
47
|
+
const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
|
|
48
|
+
const { cid, cookie } = ctx.validated;
|
|
49
|
+
if (cookie === undefined) {
|
|
50
|
+
return sendErr(ctx, 401, "Authentication required");
|
|
51
|
+
}
|
|
52
|
+
const rVerified = await vctx.assetSessionSigner.verify(cookie);
|
|
53
|
+
if (rVerified.isErr()) {
|
|
54
|
+
return sendErr(ctx, 401, "Authentication required");
|
|
55
|
+
}
|
|
56
|
+
const userId = rVerified.Ok().userId;
|
|
57
|
+
const t = vctx.sql.tables.assetUploads;
|
|
58
|
+
const rRows = await exception2Result(() => vctx.sql.db
|
|
59
|
+
.select({ cid: t.cid, assetURI: t.assetURI, ownerHandle: t.ownerHandle, appSlug: t.appSlug, mimeType: t.mimeType })
|
|
60
|
+
.from(t)
|
|
61
|
+
.where(eq(t.cid, cid)));
|
|
62
|
+
if (rRows.isErr()) {
|
|
63
|
+
return sendErr(ctx, 500, `asset lookup failed: ${rRows.Err().message}`);
|
|
64
|
+
}
|
|
65
|
+
const rows = rRows.Ok();
|
|
66
|
+
if (rows.length === 0) {
|
|
67
|
+
return sendErr(ctx, 404, "Not found");
|
|
68
|
+
}
|
|
69
|
+
let row;
|
|
70
|
+
const seen = new Set();
|
|
71
|
+
for (const candidate of rows) {
|
|
72
|
+
const key = `${candidate.ownerHandle}/${candidate.appSlug}`;
|
|
73
|
+
if (seen.has(key))
|
|
74
|
+
continue;
|
|
75
|
+
seen.add(key);
|
|
76
|
+
const rAuthority = await exception2Result(() => hasWriteAuthority(vctx, userId, candidate.ownerHandle, candidate.appSlug));
|
|
77
|
+
if (rAuthority.isErr()) {
|
|
78
|
+
return sendErr(ctx, 500, `authority lookup failed: ${rAuthority.Err().message}`);
|
|
79
|
+
}
|
|
80
|
+
if (rAuthority.Ok() === true) {
|
|
81
|
+
row = candidate;
|
|
82
|
+
break;
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
if (row === undefined) {
|
|
86
|
+
return sendErr(ctx, 404, "Not found");
|
|
87
|
+
}
|
|
88
|
+
const rKyc = await requireKyc(vctx, userId, "card");
|
|
89
|
+
if (rKyc.isErr()) {
|
|
90
|
+
if (rKyc.Err().message.startsWith("kyc-required")) {
|
|
91
|
+
return sendErr(ctx, 403, "Add a card to download original files.", "kyc-required");
|
|
92
|
+
}
|
|
93
|
+
return sendErr(ctx, 500, `kyc check failed: ${rKyc.Err().message}`);
|
|
94
|
+
}
|
|
95
|
+
const rAsset = await vctx.storage.fetch(row.assetURI);
|
|
96
|
+
if (isFetchNotFoundResult(rAsset)) {
|
|
97
|
+
return sendErr(ctx, 404, "Not found");
|
|
98
|
+
}
|
|
99
|
+
if (isFetchErrResult(rAsset)) {
|
|
100
|
+
return sendErr(ctx, 500, rAsset.error.message);
|
|
101
|
+
}
|
|
102
|
+
if (!isFetchOkResult(rAsset)) {
|
|
103
|
+
return sendErr(ctx, 500, `Unexpected fetch result for ${row.assetURI}`);
|
|
104
|
+
}
|
|
105
|
+
logAssetOriginal(vctx, { cid: row.cid, actingUserId: userId, ownerHandle: row.ownerHandle, appSlug: row.appSlug });
|
|
106
|
+
ctx.send.send(ctx, {
|
|
107
|
+
type: "http.Response.Body",
|
|
108
|
+
status: 200,
|
|
109
|
+
headers: {
|
|
110
|
+
"Content-Type": row.mimeType ?? "application/octet-stream",
|
|
111
|
+
"Content-Disposition": `attachment; filename="${downloadBasename(row.cid, row.mimeType ?? null)}"`,
|
|
112
|
+
"Cache-Control": "private, no-store",
|
|
113
|
+
},
|
|
114
|
+
body: rAsset.data,
|
|
115
|
+
});
|
|
116
|
+
return Result.Ok(EventoResult.Stop);
|
|
117
|
+
},
|
|
118
|
+
};
|
|
119
|
+
async function hasWriteAuthority(vctx, userId, ownerHandle, appSlug) {
|
|
120
|
+
const hb = vctx.sql.tables.handleBinding;
|
|
121
|
+
const ownerRow = await vctx.sql.db
|
|
122
|
+
.select({ userId: hb.userId })
|
|
123
|
+
.from(hb)
|
|
124
|
+
.where(and(eq(hb.handle, ownerHandle), eq(hb.userId, userId)))
|
|
125
|
+
.limit(1)
|
|
126
|
+
.then((r) => r[0]);
|
|
127
|
+
if (ownerRow !== undefined)
|
|
128
|
+
return true;
|
|
129
|
+
const dev = await resolveDeveloperAccess(vctx, { ownerHandle, appSlug, callerUserId: userId });
|
|
130
|
+
return dev !== null;
|
|
131
|
+
}
|
|
132
|
+
function sendErr(ctx, status, message, code) {
|
|
133
|
+
ctx.send.send(ctx, {
|
|
134
|
+
type: "http.Response.JSON",
|
|
135
|
+
status,
|
|
136
|
+
json: { type: "error", message, ...(code === undefined ? {} : { code }) },
|
|
137
|
+
});
|
|
138
|
+
return Result.Ok(EventoResult.Stop);
|
|
139
|
+
}
|
|
140
|
+
//# sourceMappingURL=asset-original.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"asset-original.js","sourceRoot":"","sources":["../../jsr/public/asset-original.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import { EventoHandler } from "@adviser/cement";
|
|
2
|
+
import { MsgBase, ReqAssetSafetyStatus, ResAssetSafetyStatus, VibesDiyError, W3CWebSocketEvent } from "@vibes.diy/api-types";
|
|
3
|
+
export declare const assetSafetyStatusEvento: EventoHandler<W3CWebSocketEvent, MsgBase<ReqAssetSafetyStatus>, ResAssetSafetyStatus | VibesDiyError>;
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { EventoResult, Option, Result, exception2Result } from "@adviser/cement";
|
|
2
|
+
import { reqAssetSafetyStatus, fileSystemItem, parseArray, } from "@vibes.diy/api-types";
|
|
3
|
+
import { type } from "arktype";
|
|
4
|
+
import { and, eq, inArray } from "drizzle-orm";
|
|
5
|
+
import { unwrapMsgBase } from "../unwrap-msg-base.js";
|
|
6
|
+
import { checkAuth } from "../check-auth.js";
|
|
7
|
+
import { resolveDeveloperAccess } from "./developer-grants.js";
|
|
8
|
+
import { isAssetItem } from "../intern/version-timeline.js";
|
|
9
|
+
const MAX_CIDS = 200;
|
|
10
|
+
const VERDICTS = ["pending", "low", "high", "error"];
|
|
11
|
+
export const assetSafetyStatusEvento = {
|
|
12
|
+
hash: "asset-safety-status",
|
|
13
|
+
validate: unwrapMsgBase(async (msg) => {
|
|
14
|
+
const ret = reqAssetSafetyStatus(msg.payload);
|
|
15
|
+
if (ret instanceof type.errors) {
|
|
16
|
+
return Result.Ok(Option.None());
|
|
17
|
+
}
|
|
18
|
+
return Result.Ok(Option.Some({ ...msg, payload: ret }));
|
|
19
|
+
}),
|
|
20
|
+
handle: checkAuth(async (ctx) => {
|
|
21
|
+
const req = ctx.validated.payload;
|
|
22
|
+
const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
|
|
23
|
+
const callerUserId = req._auth.verifiedAuth.claims.userId;
|
|
24
|
+
const empty = async () => {
|
|
25
|
+
await ctx.send.send(ctx, {
|
|
26
|
+
type: "vibes.diy.res-asset-safety-status",
|
|
27
|
+
ownerHandle: req.ownerHandle,
|
|
28
|
+
appSlug: req.appSlug,
|
|
29
|
+
verdicts: {},
|
|
30
|
+
});
|
|
31
|
+
return Result.Ok(EventoResult.Continue);
|
|
32
|
+
};
|
|
33
|
+
const cids = Array.from(new Set(req.cids.filter((c) => c.length > 0))).slice(0, MAX_CIDS);
|
|
34
|
+
if (cids.length === 0)
|
|
35
|
+
return empty();
|
|
36
|
+
const rOwner = await exception2Result(() => vctx.sql.db
|
|
37
|
+
.select({ userId: vctx.sql.tables.handleBinding.userId })
|
|
38
|
+
.from(vctx.sql.tables.handleBinding)
|
|
39
|
+
.where(eq(vctx.sql.tables.handleBinding.handle, req.ownerHandle))
|
|
40
|
+
.limit(1)
|
|
41
|
+
.then((rows) => rows[0]));
|
|
42
|
+
if (rOwner.isErr()) {
|
|
43
|
+
return sendError(ctx, rOwner.Err().message);
|
|
44
|
+
}
|
|
45
|
+
const isOwner = rOwner.Ok()?.userId === callerUserId;
|
|
46
|
+
if (!isOwner) {
|
|
47
|
+
const dev = await exception2Result(() => resolveDeveloperAccess(vctx, { ownerHandle: req.ownerHandle, appSlug: req.appSlug, callerUserId }));
|
|
48
|
+
if (dev.isErr()) {
|
|
49
|
+
return sendError(ctx, dev.Err().message);
|
|
50
|
+
}
|
|
51
|
+
if (dev.Ok() === null)
|
|
52
|
+
return empty();
|
|
53
|
+
}
|
|
54
|
+
const a = vctx.sql.tables.apps;
|
|
55
|
+
const rRelease = await exception2Result(() => vctx.sql.db
|
|
56
|
+
.select({ fileSystem: a.fileSystem, mode: a.mode, created: a.created, releaseSeq: a.releaseSeq })
|
|
57
|
+
.from(a)
|
|
58
|
+
.where(and(eq(a.ownerHandle, req.ownerHandle), eq(a.appSlug, req.appSlug))));
|
|
59
|
+
if (rRelease.isErr()) {
|
|
60
|
+
return sendError(ctx, rRelease.Err().message);
|
|
61
|
+
}
|
|
62
|
+
const releaseRows = rRelease.Ok();
|
|
63
|
+
const latestByMode = new Map();
|
|
64
|
+
for (const row of releaseRows) {
|
|
65
|
+
const cur = latestByMode.get(row.mode);
|
|
66
|
+
const newer = cur === undefined || row.created > cur.created || (row.created === cur.created && row.releaseSeq > cur.releaseSeq);
|
|
67
|
+
if (newer)
|
|
68
|
+
latestByMode.set(row.mode, row);
|
|
69
|
+
}
|
|
70
|
+
const carried = new Set();
|
|
71
|
+
for (const row of latestByMode.values()) {
|
|
72
|
+
for (const item of parseArray(row.fileSystem, fileSystemItem)) {
|
|
73
|
+
if (isAssetItem(item))
|
|
74
|
+
carried.add(item.assetId);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
const owned = cids.filter((c) => carried.has(c));
|
|
78
|
+
if (owned.length === 0)
|
|
79
|
+
return empty();
|
|
80
|
+
const s = vctx.sql.tables.assetSafety;
|
|
81
|
+
const rRows = await exception2Result(() => vctx.sql.db.select({ cid: s.cid, verdict: s.verdict }).from(s).where(inArray(s.cid, owned)));
|
|
82
|
+
if (rRows.isErr()) {
|
|
83
|
+
return sendError(ctx, rRows.Err().message);
|
|
84
|
+
}
|
|
85
|
+
const verdicts = {};
|
|
86
|
+
for (const row of rRows.Ok()) {
|
|
87
|
+
const verdict = VERDICTS.find((v) => v === row.verdict);
|
|
88
|
+
if (verdict !== undefined)
|
|
89
|
+
verdicts[row.cid] = verdict;
|
|
90
|
+
}
|
|
91
|
+
await ctx.send.send(ctx, {
|
|
92
|
+
type: "vibes.diy.res-asset-safety-status",
|
|
93
|
+
ownerHandle: req.ownerHandle,
|
|
94
|
+
appSlug: req.appSlug,
|
|
95
|
+
verdicts,
|
|
96
|
+
});
|
|
97
|
+
return Result.Ok(EventoResult.Continue);
|
|
98
|
+
}),
|
|
99
|
+
};
|
|
100
|
+
async function sendError(ctx, message) {
|
|
101
|
+
await ctx.send.send(ctx, {
|
|
102
|
+
type: "vibes.diy.res-error",
|
|
103
|
+
error: { message: `asset-safety read failed: ${message}`, code: "asset-safety-status-unavailable" },
|
|
104
|
+
});
|
|
105
|
+
return Result.Ok(EventoResult.Stop);
|
|
106
|
+
}
|
|
107
|
+
//# sourceMappingURL=asset-safety-status.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"asset-safety-status.js","sourceRoot":"","sources":["../../jsr/public/asset-safety-status.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,4 +13,5 @@ export declare const authBridgePreflight: EventoHandler<Request, {
|
|
|
13
13
|
}, unknown>;
|
|
14
14
|
export declare const authLogout: EventoHandler<Request, AuthLogoutValidated, unknown>;
|
|
15
15
|
export declare const ASSET_SESSION_COOKIE_NAME = "vibes-asset-session";
|
|
16
|
+
export declare function extractAssetSessionCookie(req: Request): string | undefined;
|
|
16
17
|
export {};
|
package/public/asset-session.js
CHANGED
|
@@ -130,4 +130,19 @@ function sendErr(ctx, status, message, origin) {
|
|
|
130
130
|
return Result.Ok(EventoResult.Stop);
|
|
131
131
|
}
|
|
132
132
|
export const ASSET_SESSION_COOKIE_NAME = COOKIE_NAME;
|
|
133
|
+
export function extractAssetSessionCookie(req) {
|
|
134
|
+
const header = req.headers.get("Cookie") ?? req.headers.get("cookie");
|
|
135
|
+
if (!header)
|
|
136
|
+
return undefined;
|
|
137
|
+
for (const pair of header.split(";")) {
|
|
138
|
+
const trimmed = pair.trim();
|
|
139
|
+
const eq = trimmed.indexOf("=");
|
|
140
|
+
if (eq <= 0)
|
|
141
|
+
continue;
|
|
142
|
+
if (trimmed.slice(0, eq) === COOKIE_NAME) {
|
|
143
|
+
return trimmed.slice(eq + 1);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
return undefined;
|
|
147
|
+
}
|
|
133
148
|
//# sourceMappingURL=asset-session.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-session.js","sourceRoot":"","sources":["../../jsr/public/asset-session.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"asset-session.js","sourceRoot":"","sources":["../../jsr/public/asset-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EAGN,MAAM,EACN,YAAY,EACZ,GAAG,GACJ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAqBlE,MAAM,WAAW,GAAG,qBAAqB,CAAC;AAC1C,MAAM,WAAW,GAAG,IAAI,CAAC;AACzB,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B,MAAM,YAAY,GAAG,sDAAsD,CAAC;AAc5E,MAAM,CAAC,MAAM,WAAW,GAA0D;IAChF,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,CAAC,GAA+D,EAAE,EAAE;QAC5E,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;QAC7B,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACpF,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,CAAC,QAAQ,KAAK,gBAAgB;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACxF,MAAM,MAAM,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAI5E,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC;QACpD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,IAAI,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9F,CAAC;IAuBD,MAAM,EAAE,KAAK,EAAE,GAA6D,EAAqC,EAAE;QACjH,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,CAAiB,aAAa,CAAC,CAAC;QAC/D,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC;QACpD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,oCAAoC,EAAE,MAAM,CAAC,CAAC;QACzE,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,CAAC,CAAC;QAC3D,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAE1C,MAAM,aAAa,GAAG,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,GAAG,WAAW,CAAC,GAAG,GAAG,GAAG,iBAAiB,CAAC;QACpF,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC;QACjE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,MAAM,CAAC,CAAC;QACnG,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACpB,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,uBAAuB,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;QACnF,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;QAC/B,MAAM,SAAS,GAAG,GAAG,WAAW,IAAI,KAAK,KAAK,YAAY,aAAa,MAAM,EAAE,CAAC;QAChF,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACvB,IAAI,EAAE,oBAAoB;YAC1B,MAAM,EAAE,GAAG;YACX,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,4BAA4B,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;YAC5E,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,YAAY,EAAE,SAAS;gBACvB,GAAG,uBAAuB,CAAC,MAAM,CAAC;aACnC;SAC6B,CAAC,CAAC;QAClC,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;CACF,CAAC;AAQF,MAAM,CAAC,MAAM,mBAAmB,GAAwD;IACtF,IAAI,EAAE,uBAAuB;IAC7B,QAAQ,EAAE,CAAC,GAA6D,EAAE,EAAE;QAC1E,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;QAC7B,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACvF,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,CAAC,QAAQ,KAAK,gBAAgB,IAAI,GAAG,CAAC,QAAQ,KAAK,eAAe,EAAE,CAAC;YAC1E,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACnD,CAAC;QACD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC5E,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,GAA2D,EAAqC,EAAE;QAC/G,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC;QACjC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACvB,IAAI,EAAE,oBAAoB;YAC1B,MAAM,EAAE,GAAG;YACX,IAAI,EAAE,EAAE;YACR,OAAO,EAAE;gBACP,cAAc,EAAE,YAAY;gBAC5B,6BAA6B,EAAE,MAAM,IAAI,GAAG;gBAC5C,kCAAkC,EAAE,MAAM;gBAC1C,8BAA8B,EAAE,cAAc;gBAC9C,8BAA8B,EAAE,6CAA6C;gBAC7E,wBAAwB,EAAE,OAAO;gBACjC,IAAI,EAAE,QAAQ;aACf;SAC6B,CAAC,CAAC;QAClC,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;CACF,CAAC;AAEF,SAAS,uBAAuB,CAAC,MAAc;IAC7C,OAAO;QACL,6BAA6B,EAAE,MAAM,IAAI,GAAG;QAC5C,kCAAkC,EAAE,MAAM;QAC1C,IAAI,EAAE,QAAQ;KACf,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAyD;IAC9E,IAAI,EAAE,aAAa;IACnB,QAAQ,EAAE,CAAC,GAA8D,EAAE,EAAE;QAC3E,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;QAC7B,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACpF,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,CAAC,QAAQ,KAAK,eAAe;YAAE,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACvF,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC5E,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,GAA4D,EAAqC,EAAE;QAChH,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC;QACjC,MAAM,SAAS,GAAG,GAAG,WAAW,MAAM,YAAY,aAAa,CAAC;QAChE,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACvB,IAAI,EAAE,oBAAoB;YAC1B,MAAM,EAAE,GAAG;YACX,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,2BAA2B,EAAE,CAAC;YAC3D,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,YAAY,EAAE,SAAS;gBACvB,GAAG,uBAAuB,CAAC,MAAM,CAAC;aACnC;SAC6B,CAAC,CAAC;QAClC,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;CACF,CAAC;AAEF,SAAS,OAAO,CACd,GAAgD,EAChD,MAAc,EACd,OAAe,EACf,MAAc;IAEd,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;QACjB,IAAI,EAAE,oBAAoB;QAC1B,MAAM;QACN,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QAChD,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,GAAG,uBAAuB,CAAC,MAAM,CAAC;SACnC;KAC6B,CAAC,CAAC;IAClC,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,WAAW,CAAC;AAUrD,MAAM,UAAU,yBAAyB,CAAC,GAAY;IACpD,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtE,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,EAAE,IAAI,CAAC;YAAE,SAAS;QACtB,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,WAAW,EAAE,CAAC;YACzC,OAAO,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -3,6 +3,8 @@ import { isReqAssetUploadGrant, } from "@vibes.diy/api-types";
|
|
|
3
3
|
import { checkAuth } from "../check-auth.js";
|
|
4
4
|
import { unwrapMsgBase } from "../unwrap-msg-base.js";
|
|
5
5
|
import { appAdmitsSignedInWrites, canWrite, checkDocAccess } from "./access-helpers.js";
|
|
6
|
+
import { isGatedMime } from "../intern/asset-sniff.js";
|
|
7
|
+
import { requireKyc } from "../intern/kyc.js";
|
|
6
8
|
const GRANT_TTL_SEC = 60;
|
|
7
9
|
function buildUploadUrl(vctx) {
|
|
8
10
|
const base = vctx.params.vibes.env.VIBES_DIY_PUBLIC_BASE_URL;
|
|
@@ -31,6 +33,16 @@ export const assetUploadGrantEvento = {
|
|
|
31
33
|
});
|
|
32
34
|
return Result.Ok(EventoResult.Continue);
|
|
33
35
|
}
|
|
36
|
+
if ((req.purpose === "files" || req.purpose === "bundle") && req.mimeType !== undefined && isGatedMime(req.mimeType)) {
|
|
37
|
+
const rKyc = await requireKyc(vctx, userId, "card");
|
|
38
|
+
if (rKyc.isErr()) {
|
|
39
|
+
await ctx.send.send(ctx, {
|
|
40
|
+
type: "vibes.diy.res-error",
|
|
41
|
+
error: { code: "kyc-required", message: "Add a card to upload files that aren't images." },
|
|
42
|
+
});
|
|
43
|
+
return Result.Ok(EventoResult.Continue);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
34
46
|
const jti = vctx.sthis.timeOrderedNextId().str;
|
|
35
47
|
const rSigned = await vctx.assetGrantSigner.sign({
|
|
36
48
|
jti,
|
|
@@ -38,6 +50,7 @@ export const assetUploadGrantEvento = {
|
|
|
38
50
|
ownerHandle: req.ownerHandle,
|
|
39
51
|
appSlug: req.appSlug,
|
|
40
52
|
...(req.mimeType !== undefined ? { mimeType: req.mimeType } : {}),
|
|
53
|
+
...(req.purpose !== undefined ? { purpose: req.purpose } : {}),
|
|
41
54
|
}, GRANT_TTL_SEC);
|
|
42
55
|
if (rSigned.isErr()) {
|
|
43
56
|
await ctx.send.send(ctx, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-upload-grant.js","sourceRoot":"","sources":["../../jsr/public/asset-upload-grant.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAsC,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClH,OAAO,EAOL,qBAAqB,GAEtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"asset-upload-grant.js","sourceRoot":"","sources":["../../jsr/public/asset-upload-grant.ts"],"names":[],"mappings":"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"}
|
package/public/cid-asset.js
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import { Result, Option, EventoResult, URI, } from "@adviser/cement";
|
|
2
2
|
import { isFetchErrResult, isFetchNotFoundResult, isFetchOkResult, } from "@vibes.diy/api-types";
|
|
3
|
+
import { dataUriBody, isInlineServable, resolveServableAsset } from "../intern/resolve-servable-asset.js";
|
|
4
|
+
function cidOf(url) {
|
|
5
|
+
if (!url.includes("://"))
|
|
6
|
+
return url;
|
|
7
|
+
const last = url.slice(url.lastIndexOf("/") + 1);
|
|
8
|
+
return last === "" ? url : last;
|
|
9
|
+
}
|
|
3
10
|
export const cidAsset = {
|
|
4
11
|
hash: "cid-asset",
|
|
5
12
|
validate: (ctx) => {
|
|
@@ -17,7 +24,27 @@ export const cidAsset = {
|
|
|
17
24
|
},
|
|
18
25
|
handle: async (ctx) => {
|
|
19
26
|
const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
|
|
20
|
-
const
|
|
27
|
+
const servable = await resolveServableAsset(vctx, {
|
|
28
|
+
cid: cidOf(ctx.validated.url),
|
|
29
|
+
assetURI: ctx.validated.url,
|
|
30
|
+
mime: ctx.validated.mime,
|
|
31
|
+
mimeSource: "caller",
|
|
32
|
+
});
|
|
33
|
+
const gateHeaders = {
|
|
34
|
+
"Content-Type": servable.mime,
|
|
35
|
+
"Cache-Control": servable.cacheControl,
|
|
36
|
+
...(servable.state === "disabled" ? {} : { ETag: servable.etag }),
|
|
37
|
+
};
|
|
38
|
+
if (isInlineServable(servable)) {
|
|
39
|
+
ctx.send.send(ctx, {
|
|
40
|
+
type: "http.Response.Body",
|
|
41
|
+
status: 200,
|
|
42
|
+
headers: gateHeaders,
|
|
43
|
+
body: dataUriBody(servable.uri),
|
|
44
|
+
});
|
|
45
|
+
return Result.Ok(EventoResult.Stop);
|
|
46
|
+
}
|
|
47
|
+
const rAsset = await vctx.storage.fetch(servable.uri);
|
|
21
48
|
switch (true) {
|
|
22
49
|
case isFetchErrResult(rAsset):
|
|
23
50
|
ctx.send.send(ctx, {
|
|
@@ -43,10 +70,7 @@ export const cidAsset = {
|
|
|
43
70
|
ctx.send.send(ctx, {
|
|
44
71
|
type: "http.Response.Body",
|
|
45
72
|
status: 200,
|
|
46
|
-
headers:
|
|
47
|
-
"Content-Type": ctx.validated.mime,
|
|
48
|
-
"Cache-Control": "public, max-age=31536000, immutable",
|
|
49
|
-
},
|
|
73
|
+
headers: gateHeaders,
|
|
50
74
|
body: rAsset.data,
|
|
51
75
|
});
|
|
52
76
|
break;
|
package/public/cid-asset.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cid-asset.js","sourceRoot":"","sources":["../../jsr/public/cid-asset.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EAGN,MAAM,EACN,YAAY,EACZ,GAAG,GACJ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAGL,gBAAgB,EAChB,qBAAqB,EACrB,eAAe,GAChB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"cid-asset.js","sourceRoot":"","sources":["../../jsr/public/cid-asset.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EventoHandler, Result } from "@adviser/cement";
|
|
2
|
-
import { MsgBase, ReqEnsureAppSlug, ReqWithVerifiedAuth, ResEnsureAppSlug, StorageProgressInfo, VibesDiyError, W3CWebSocketEvent } from "@vibes.diy/api-types";
|
|
2
|
+
import { MsgBase, ReqEnsureAppSlug, ReqWithVerifiedAuth, ResEnsureAppSlug, StorageProgressInfo, type FileSystemItem, VibesDiyError, W3CWebSocketEvent } from "@vibes.diy/api-types";
|
|
3
3
|
import { VibesApiSQLCtx } from "../types.js";
|
|
4
4
|
export declare function clearVersionLockOnExplicitRelease(vctx: VibesApiSQLCtx, req: {
|
|
5
5
|
readonly ownerHandle: string;
|
|
@@ -8,6 +8,7 @@ export declare function clearVersionLockOnExplicitRelease(vctx: VibesApiSQLCtx,
|
|
|
8
8
|
export interface EnsureAppSlugItemOptions {
|
|
9
9
|
readonly onProgress?: (info: StorageProgressInfo) => void;
|
|
10
10
|
readonly advanceSeededChat?: boolean;
|
|
11
|
+
readonly carried?: readonly FileSystemItem[];
|
|
11
12
|
}
|
|
12
13
|
export declare function ensureAppSlugItem(vctx: VibesApiSQLCtx, req: ReqWithVerifiedAuth<ReqEnsureAppSlug>, opts?: EnsureAppSlugItemOptions): Promise<Result<ResEnsureAppSlug>>;
|
|
13
14
|
export declare const ensureAppSlugItemEvento: EventoHandler<W3CWebSocketEvent, MsgBase<ReqEnsureAppSlug>, ResEnsureAppSlug | VibesDiyError>;
|
|
@@ -18,6 +18,10 @@ import { processAccessBindings } from "../intern/process-access-bindings.js";
|
|
|
18
18
|
import { stampReleaseChips } from "./chip-stamp.js";
|
|
19
19
|
import { selectReleaseByFsId } from "./select-app.js";
|
|
20
20
|
import { processBackendBindings } from "../intern/process-backend-bindings.js";
|
|
21
|
+
import { resolveOwnedAssetRef } from "../intern/resolve-owned-asset-ref.js";
|
|
22
|
+
import { DERIVED_PREFIX } from "../intern/version-timeline.js";
|
|
23
|
+
import { isGatedMime } from "../intern/asset-sniff.js";
|
|
24
|
+
import { requireKyc } from "../intern/kyc.js";
|
|
21
25
|
import { parseBackendConfig } from "@vibes.diy/vibe-runtime/parse-backend-config.js";
|
|
22
26
|
function derivePromptFromFileSystem(fileSystem) {
|
|
23
27
|
const codeBlock = fileSystem.find(isVibeCodeBlock);
|
|
@@ -116,19 +120,42 @@ export async function ensureAppSlugItem(vctx, req, opts) {
|
|
|
116
120
|
}
|
|
117
121
|
}
|
|
118
122
|
}
|
|
119
|
-
const
|
|
120
|
-
|
|
123
|
+
const slots = new Array(req.fileSystem.length);
|
|
124
|
+
const toStore = [];
|
|
125
|
+
for (const [idx, fsItem] of req.fileSystem.entries()) {
|
|
121
126
|
switch (fsItem.type) {
|
|
122
127
|
case "code-block":
|
|
123
128
|
case "str-asset-block":
|
|
124
129
|
case "uint8-asset-block":
|
|
125
|
-
{
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
});
|
|
130
|
+
toStore.push({ idx, fsItem, data: fsItem.content });
|
|
131
|
+
break;
|
|
132
|
+
case "cid-ref": {
|
|
133
|
+
if (fsItem.filename.startsWith(DERIVED_PREFIX)) {
|
|
134
|
+
return Result.Err(new Error(`reserved-prefix: ${fsItem.filename}`));
|
|
130
135
|
}
|
|
136
|
+
const rRef = await resolveOwnedAssetRef(vctx, {
|
|
137
|
+
cid: fsItem.cid,
|
|
138
|
+
userId: callerUserId,
|
|
139
|
+
ownerHandle: appHandleBinding.ownerHandle.ownerHandle,
|
|
140
|
+
appSlug: appHandleBinding.appSlug.appSlug,
|
|
141
|
+
});
|
|
142
|
+
if (rRef.isErr())
|
|
143
|
+
return Result.Err(rRef.Err());
|
|
144
|
+
const ref = rRef.Ok();
|
|
145
|
+
const servedMime = ref.mimeType ?? fsItem.mimetype;
|
|
146
|
+
if (servedMime === undefined ||
|
|
147
|
+
isGatedMime(servedMime) ||
|
|
148
|
+
(fsItem.mimetype !== undefined && isGatedMime(fsItem.mimetype))) {
|
|
149
|
+
const rKyc = await requireKyc(vctx, callerUserId, "card");
|
|
150
|
+
if (rKyc.isErr())
|
|
151
|
+
return Result.Err(rKyc.Err());
|
|
152
|
+
}
|
|
153
|
+
slots[idx] = {
|
|
154
|
+
vibeFileItem: { ...fsItem, mimetype: servedMime, kind: "asset" },
|
|
155
|
+
storage: { cid: ref.cid, getURL: ref.assetURI, size: ref.size },
|
|
156
|
+
};
|
|
131
157
|
break;
|
|
158
|
+
}
|
|
132
159
|
case "uint8-asset-ref":
|
|
133
160
|
case "code-ref":
|
|
134
161
|
case "str-asset-ref":
|
|
@@ -136,14 +163,35 @@ export async function ensureAppSlugItem(vctx, req, opts) {
|
|
|
136
163
|
return Result.Err(`unsupported file system item type: ${fsItem.type}`);
|
|
137
164
|
}
|
|
138
165
|
}
|
|
139
|
-
const rStorageResults = await vctx.storage.ensure({ onProgress: opts?.onProgress }, ...
|
|
166
|
+
const rStorageResults = await vctx.storage.ensure({ onProgress: opts?.onProgress }, ...toStore.map((op) => uint8array2stream(to_uint8(op.data))));
|
|
140
167
|
if (rStorageResults.some((r) => r.isErr())) {
|
|
141
168
|
return Result.Err(`failed to store one or more assets: ${rStorageResults.map((r) => (r.isErr() ? r.Err().message : "ok")).join(", ")}`);
|
|
142
169
|
}
|
|
143
|
-
|
|
144
|
-
vibeFileItem:
|
|
145
|
-
|
|
170
|
+
rStorageResults.forEach((op, i) => {
|
|
171
|
+
slots[toStore[i].idx] = { vibeFileItem: toStore[i].fsItem, storage: op.Ok() };
|
|
172
|
+
});
|
|
173
|
+
const fromWire = [];
|
|
174
|
+
for (const slot of slots) {
|
|
175
|
+
if (slot === undefined) {
|
|
176
|
+
return Result.Err("manifest slot left empty");
|
|
177
|
+
}
|
|
178
|
+
fromWire.push(slot);
|
|
179
|
+
}
|
|
180
|
+
const wireNames = new Set(fromWire.map((s) => s.vibeFileItem.filename));
|
|
181
|
+
const carried = (opts?.carried ?? [])
|
|
182
|
+
.filter((c) => !wireNames.has(c.fileName))
|
|
183
|
+
.map((c) => ({
|
|
184
|
+
vibeFileItem: {
|
|
185
|
+
type: "cid-ref",
|
|
186
|
+
filename: c.fileName,
|
|
187
|
+
mimetype: c.mimeType,
|
|
188
|
+
cid: c.assetId,
|
|
189
|
+
size: c.size,
|
|
190
|
+
kind: "asset",
|
|
191
|
+
},
|
|
192
|
+
storage: { cid: c.assetId, getURL: c.assetURI, size: c.size },
|
|
146
193
|
}));
|
|
194
|
+
const fullFileSystem = [...fromWire, ...carried];
|
|
147
195
|
const seedPosture = req.seedPosture !== undefined && appHandleBinding.appSlug.justCreated === true && req.mode === "production"
|
|
148
196
|
? req.seedPosture
|
|
149
197
|
: undefined;
|