@vibes.diy/api-svc 14.1.12 → 14.1.14
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 +29 -21
- package/intern/agent-assembly.js.map +1 -1
- package/intern/agent-dispatcher.js.map +1 -1
- package/intern/agent-instruction.d.ts +1 -1
- package/intern/agent-instruction.js +5 -2
- package/intern/agent-instruction.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-request-frame.d.ts +12 -0
- package/intern/agent-request-frame.js +47 -0
- package/intern/agent-request-frame.js.map +1 -0
- package/intern/agent-session-instruction.d.ts +2 -2
- package/intern/agent-session-instruction.js +3 -1
- package/intern/agent-session-instruction.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 +22 -1
- 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 +11 -52
- 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/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 +33 -10
- 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 +14 -14
- 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-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/get-app-by-fsid.js +19 -1
- package/public/get-app-by-fsid.js.map +1 -1
- package/public/llm-dispatch.d.ts +3 -2
- package/public/llm-dispatch.js +18 -10
- 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 +12 -49
- 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 +49 -0
- package/public/report-prompt-cache.js +257 -0
- package/public/report-prompt-cache.js.map +1 -0
- package/public/serv-entry-point.js +41 -16
- package/public/serv-entry-point.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
|
@@ -5,8 +5,12 @@ export interface TimelineEntry {
|
|
|
5
5
|
readonly fsId: string;
|
|
6
6
|
readonly created: Date;
|
|
7
7
|
readonly vfs: ReadonlyMap<string, string>;
|
|
8
|
+
readonly carried: readonly FileSystemItem[];
|
|
8
9
|
readonly seeded: boolean;
|
|
9
10
|
}
|
|
11
|
+
export declare const DERIVED_PREFIX = "/~~";
|
|
12
|
+
export declare function isAssetItem(i: FileSystemItem): boolean;
|
|
13
|
+
export declare function carriedItems(items: readonly FileSystemItem[]): FileSystemItem[];
|
|
10
14
|
export declare function resolveVfsFromFileSystem(vctx: VibesApiSQLCtx, items: FileSystemItem[]): Promise<ReadonlyMap<string, string>>;
|
|
11
15
|
export declare function loadVersionTimeline(vctx: VibesApiSQLCtx, chatId: string): Promise<Result<TimelineEntry[]>>;
|
|
12
16
|
export declare function resolveActiveReleaseBase(vctx: VibesApiSQLCtx, args: {
|
|
@@ -14,13 +18,16 @@ export declare function resolveActiveReleaseBase(vctx: VibesApiSQLCtx, args: {
|
|
|
14
18
|
readonly appSlug: string;
|
|
15
19
|
readonly timelineFsIds: readonly string[];
|
|
16
20
|
}): Promise<TimelineEntry | undefined>;
|
|
17
|
-
export
|
|
21
|
+
export type EditBaseSeed = Pick<TimelineEntry, "vfs" | "carried">;
|
|
22
|
+
export declare function resolveEditBaseSeed(vctx: VibesApiSQLCtx, args: {
|
|
18
23
|
readonly editBaseFsId: string | undefined;
|
|
19
24
|
readonly chainHeadFsId: string | undefined;
|
|
20
25
|
readonly chainHeadVfs: ReadonlyMap<string, string>;
|
|
26
|
+
readonly chainHeadCarried?: readonly FileSystemItem[];
|
|
21
27
|
readonly ownerHandle: string;
|
|
22
28
|
readonly appSlug: string;
|
|
23
|
-
}): Promise<
|
|
29
|
+
}): Promise<EditBaseSeed>;
|
|
30
|
+
export declare function resolveEditBaseSeedVfs(vctx: VibesApiSQLCtx, args: Parameters<typeof resolveEditBaseSeed>[1]): Promise<ReadonlyMap<string, string>>;
|
|
24
31
|
export interface SlotSources {
|
|
25
32
|
readonly original?: TimelineEntry;
|
|
26
33
|
readonly previous?: TimelineEntry;
|
|
@@ -13,10 +13,21 @@ function isSourceFile(fileName) {
|
|
|
13
13
|
return false;
|
|
14
14
|
return SOURCE_EXT.has(fileName.slice(dot).toLowerCase());
|
|
15
15
|
}
|
|
16
|
+
export const DERIVED_PREFIX = "/~~";
|
|
17
|
+
export function isAssetItem(i) {
|
|
18
|
+
if (i.fileName.startsWith(DERIVED_PREFIX))
|
|
19
|
+
return false;
|
|
20
|
+
if (i.kind === "asset")
|
|
21
|
+
return true;
|
|
22
|
+
return !isSourceFile(i.fileName);
|
|
23
|
+
}
|
|
24
|
+
export function carriedItems(items) {
|
|
25
|
+
return items.filter(isAssetItem);
|
|
26
|
+
}
|
|
16
27
|
export async function resolveVfsFromFileSystem(vctx, items) {
|
|
17
28
|
const vfs = new Map();
|
|
18
29
|
for (const item of items) {
|
|
19
|
-
if (!isSourceFile(item.fileName))
|
|
30
|
+
if (isAssetItem(item) || !isSourceFile(item.fileName))
|
|
20
31
|
continue;
|
|
21
32
|
const rFetch = await vctx.storage.fetch(item.assetURI);
|
|
22
33
|
if (isFetchErrResult(rFetch) || isFetchNotFoundResult(rFetch))
|
|
@@ -62,7 +73,7 @@ export async function loadVersionTimeline(vctx, chatId) {
|
|
|
62
73
|
for (const [fsId, meta] of ordered) {
|
|
63
74
|
const items = parseArray(meta.fileSystem, fileSystemItem);
|
|
64
75
|
const vfs = await resolveVfsFromFileSystem(vctx, items);
|
|
65
|
-
out.push({ fsId, created: meta.created, vfs, seeded: meta.seeded });
|
|
76
|
+
out.push({ fsId, created: meta.created, vfs, carried: carriedItems(items), seeded: meta.seeded });
|
|
66
77
|
}
|
|
67
78
|
return out;
|
|
68
79
|
});
|
|
@@ -74,8 +85,15 @@ export async function resolveActiveReleaseBase(vctx, args) {
|
|
|
74
85
|
return undefined;
|
|
75
86
|
if (args.timelineFsIds.includes(row.fsId))
|
|
76
87
|
return undefined;
|
|
77
|
-
const
|
|
78
|
-
|
|
88
|
+
const items = parseArray(row.fileSystem, fileSystemItem);
|
|
89
|
+
const vfs = await resolveVfsFromFileSystem(vctx, items);
|
|
90
|
+
return {
|
|
91
|
+
fsId: row.fsId,
|
|
92
|
+
created: new Date(row.created),
|
|
93
|
+
vfs,
|
|
94
|
+
carried: carriedItems(items),
|
|
95
|
+
seeded: true,
|
|
96
|
+
};
|
|
79
97
|
});
|
|
80
98
|
if (r.isErr()) {
|
|
81
99
|
ensureLogger(vctx.sthis, "resolveActiveReleaseBase")
|
|
@@ -88,9 +106,10 @@ export async function resolveActiveReleaseBase(vctx, args) {
|
|
|
88
106
|
}
|
|
89
107
|
return r.Ok();
|
|
90
108
|
}
|
|
91
|
-
export async function
|
|
109
|
+
export async function resolveEditBaseSeed(vctx, args) {
|
|
110
|
+
const chainHead = { vfs: args.chainHeadVfs, carried: args.chainHeadCarried ?? [] };
|
|
92
111
|
if (args.editBaseFsId === undefined || args.editBaseFsId === args.chainHeadFsId)
|
|
93
|
-
return
|
|
112
|
+
return chainHead;
|
|
94
113
|
const r = await exception2Result(async () => {
|
|
95
114
|
const row = await vctx.sql.db
|
|
96
115
|
.select({ fileSystem: vctx.sql.tables.apps.fileSystem })
|
|
@@ -100,19 +119,23 @@ export async function resolveEditBaseSeedVfs(vctx, args) {
|
|
|
100
119
|
.limit(1)
|
|
101
120
|
.then((rs) => rs[0]);
|
|
102
121
|
if (row === undefined)
|
|
103
|
-
return
|
|
104
|
-
|
|
122
|
+
return chainHead;
|
|
123
|
+
const items = parseArray(row.fileSystem, fileSystemItem);
|
|
124
|
+
return { vfs: await resolveVfsFromFileSystem(vctx, items), carried: carriedItems(items) };
|
|
105
125
|
});
|
|
106
126
|
if (r.isErr()) {
|
|
107
|
-
ensureLogger(vctx.sthis, "
|
|
127
|
+
ensureLogger(vctx.sthis, "resolveEditBaseSeed")
|
|
108
128
|
.Warn()
|
|
109
129
|
.Err(r)
|
|
110
130
|
.Str("editBaseFsId", args.editBaseFsId)
|
|
111
131
|
.Msg("edit-base seed resolve failed; falling back to chain head");
|
|
112
|
-
return
|
|
132
|
+
return chainHead;
|
|
113
133
|
}
|
|
114
134
|
return r.Ok();
|
|
115
135
|
}
|
|
136
|
+
export async function resolveEditBaseSeedVfs(vctx, args) {
|
|
137
|
+
return (await resolveEditBaseSeed(vctx, args)).vfs;
|
|
138
|
+
}
|
|
116
139
|
export function selectSlotSources(timeline) {
|
|
117
140
|
if (timeline.length === 0)
|
|
118
141
|
return {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-timeline.js","sourceRoot":"","sources":["../../jsr/intern/version-timeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC3G,OAAO,EAAU,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"version-timeline.js","sourceRoot":"","sources":["../../jsr/intern/version-timeline.ts"],"names":[],"mappings":"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"}
|
package/intern/write-apps.d.ts
CHANGED
|
@@ -4,13 +4,16 @@ import { AppHandleBinding, VibesApiSQLCtx } from "../types.js";
|
|
|
4
4
|
export declare function transformJSXToJS(code: string): string;
|
|
5
5
|
export declare function importsFromJS(js: string): string[];
|
|
6
6
|
export declare function isBareImportSpecifier(spec: string): boolean;
|
|
7
|
+
export interface ManifestFsEntry {
|
|
8
|
+
vibeFileItem: VibeFile & {
|
|
9
|
+
readonly kind?: "asset";
|
|
10
|
+
};
|
|
11
|
+
storage: Pick<StorageResult, "cid" | "getURL" | "size"> & Partial<StorageResult>;
|
|
12
|
+
}
|
|
7
13
|
export interface EnsureAppsOpts {
|
|
8
14
|
readonly env: Record<string, string>;
|
|
9
15
|
readonly mode: "dev" | "production";
|
|
10
16
|
readonly userId: string;
|
|
11
17
|
readonly runId?: string;
|
|
12
18
|
}
|
|
13
|
-
export declare function ensureApps(ctx: VibesApiSQLCtx, opts: EnsureAppsOpts, binding: AppHandleBinding, fs:
|
|
14
|
-
vibeFileItem: VibeFile;
|
|
15
|
-
storage: StorageResult;
|
|
16
|
-
}[]): Promise<Result<ResEnsureAppSlug>>;
|
|
19
|
+
export declare function ensureApps(ctx: VibesApiSQLCtx, opts: EnsureAppsOpts, binding: AppHandleBinding, fs: ManifestFsEntry[]): Promise<Result<ResEnsureAppSlug>>;
|
package/intern/write-apps.js
CHANGED
|
@@ -223,6 +223,9 @@ async function toFileSystemItems(ctx, fs, opts) {
|
|
|
223
223
|
if (f.vibeFileItem.entryPoint) {
|
|
224
224
|
ret.entryPoint = true;
|
|
225
225
|
}
|
|
226
|
+
if ("kind" in f.vibeFileItem && f.vibeFileItem.kind === "asset") {
|
|
227
|
+
ret.kind = "asset";
|
|
228
|
+
}
|
|
226
229
|
return { ...f, fsItem: ret };
|
|
227
230
|
});
|
|
228
231
|
let entryBundle;
|
package/intern/write-apps.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"write-apps.js","sourceRoot":"","sources":["../../jsr/intern/write-apps.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"write-apps.js","sourceRoot":"","sources":["../../jsr/intern/write-apps.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,eAAe,EAKf,8BAA8B,EAC9B,QAAQ,EACR,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACpG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAmE,KAAK,EAAE,MAAM,OAAO,CAAC;AAE/F,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAwB,MAAM,yBAAyB,CAAC;AAIpG,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAYtG,SAAS,SAAS,CAAC,IAAmB;IACpC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvG,CAAC;AACD,SAAS,SAAS,CAAC,IAAmB;IACpC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AAC7F,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,GAAmB,EACnB,MAAc,EACd,OAAe;IASf,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,EAAE;SAC3B,MAAM,CAAC;QACN,QAAQ,EAAE,GAAG,CAAQ,UAAU;QAC/B,MAAM,EAAE,GAAG,CAEV,iBAAiB,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,MAAM,OAAO,SAAS,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,OAAO;KACzG,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;SACzB,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACjD,IAAI,MAAM,CAAC,GAAG,EAAE,QAAQ,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;QACjE,OAAO,MAAM,CAAC,EAAE,CAAC;YACf,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE;gBACL,OAAO,EAAE,qDAAqD,GAAG,CAAC,MAAM,CAAC,mBAAmB,0DAA0D;gBACtJ,IAAI,EAAE,uBAAuB;aAC9B;SACqC,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;AAC7C,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,GAA2B,EAAE,EAAqB;IAE3E,MAAM,OAAO,GAAG;QACd,EAAE;aACC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;aAC9E,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpF,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;KAC1C;SACE,IAAI,EAAE;SACN,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAQ3C,OAAO,SAAS,CAAC,IAAI,EAAE;QACrB,UAAU,EAAE,CAAC,KAAK,CAAC;QACnB,UAAU,EAAE,WAAW;QACvB,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC,IAAI,CAAC;AACV,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,EAAU;IAEtC,MAAM,GAAG,GAAG,KAAK,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvE,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI;SACrB,MAAM,CACL,CAAC,CAAC,EAA0E,EAAE,CAC5E,CAAC,CAAC,IAAI,KAAK,mBAAmB;QAC9B,CAAC,CAAC,CAAC,IAAI,KAAK,wBAAwB,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC;QAC1D,CAAC,CAAC,IAAI,KAAK,sBAAsB,CACpC;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC;SAC3B,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC;IACrD,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;AAC/B,CAAC;AAUD,MAAM,eAAe,GAAG,yCAAyC,CAAC;AAUlE,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAChD,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC;AA8CD,KAAK,UAAU,sBAAsB,CACnC,GAAmB,EACnB,YAA2B,EAC3B,IAAgC;IAEhC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAClD,MAAM,GAAG,GAA6B,EAAE,CAAC;IAMzC,MAAM,OAAO,CAAC,GAAG,CACf,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAU9B,IAAI,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YACvC,KAAK,MAAM,GAAG,IAAI,uBAAuB,CAAE,IAAI,CAAC,YAA8B,CAAC,OAAO,CAAC,EAAE,CAAC;gBACxF,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACtB,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,KAAK,WAAW,IAAI,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAMtF,MAAM,SAAS,GAAG,WAAW,IAAI,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,WAAW,CAAC,OAAO,CAAC;YACvG,MAAM,MAAM,GAAG,SAAS;gBACtB,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC7B,CAAC,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,gBAAgB,CAAE,IAAI,CAAC,YAA8B,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3F,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;gBACnB,OAAO,CAAC,KAAK,CAAC,0CAA0C,IAAI,CAAC,YAAY,CAAC,QAAQ,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACvG,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;gBACjE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBACtC,OAAO;YACT,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,EAAE,CAAC;YAE1B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;YAC9D,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;gBACrB,OAAO,CAAC,KAAK,CAAC,0DAA0D,IAAI,CAAC,YAAY,CAAC,QAAQ,KAAK,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACzH,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;gBACjE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBACtC,OAAO;YACT,CAAC;YACD,QAAQ,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC5B,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC;oBAAE,OAAO;gBACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACvB,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;YAChE,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;gBACnB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,mCAAmC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;gBACnF,OAAO;YACT,CAAC;YACD,GAAG,CAAC,IAAI,CACN,MAAM,CAAC,EAAE,CAAC;gBACR,GAAG,IAAI,CAAC,MAAM;gBACd,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE;aACtE,CAAC,CACH,CAAC;YAEF,GAAG,CAAC,IAAI,CACN,MAAM,CAAC,EAAE,CAAC;gBACR,QAAQ,EAAE,oBAAoB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBACnD,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,GAAG;gBACxB,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM;gBAC5B,SAAS,EAAE;oBACT,IAAI,EAAE,aAAa;oBACnB,MAAM,EAAE,WAAW;oBACnB,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;iBACxC;gBACD,IAAI,EAAE,KAAK,CAAC,MAAM;aAEnB,CAAC,CACH,CAAC;QACJ,CAAC;aAAM,IAAI,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC9E,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,aAAa,CAAE,IAAI,CAAC,YAA8B,CAAC,OAAO,CAAC,CAAC,CAAC;YACrG,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;gBACrB,OAAO,CAAC,KAAK,CAAC,8CAA8C,IAAI,CAAC,YAAY,CAAC,QAAQ,KAAK,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC7G,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;gBACjC,OAAO;YACT,CAAC;YACD,QAAQ,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC5B,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC;oBAAE,OAAO;gBACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBACtB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACvB,CAAC;gBACD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YAGN,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QACnC,CAAC;IACH,CAAC,CAAC,CACH,CAAC;IACF,OAAO,GAAG,CAAC;AACb,CAAC;AASD,KAAK,UAAU,eAAe,CAC5B,GAAmB,EAKnB,OAA8B,EAC9B,IAAwB;IAYxB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC;QAC7B,OAAO,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,SAAS,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;KAClG,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;IAClE,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;QACnB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO;QACL,MAAM,CAAC,EAAE,CAAC;YACR,QAAQ,EAAE,iCAAiC;YAC3C,QAAQ,EAAE,4BAA4B;YACtC,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,GAAG;YACxB,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM;YAC5B,SAAS,EAAE;gBACT,IAAI,EAAE,YAAY;gBAClB,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;aACvE;YACD,IAAI,EAAE,OAAO,CAAC,MAAM;SACrB,CAAC;KACH,CAAC;AACJ,CAAC;AA0BD,KAAK,UAAU,iBAAiB,CAC9B,GAAmB,EACnB,UAAuB,EACvB,KAAyB;IAEzB,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACrC,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/E,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;QACjB,OAAO,CAAC,KAAK,CAAC,sCAAsC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAClE,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;IACtB,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACjC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9D,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;QACnB,OAAO,CAAC,KAAK,CAAC,6CAA6C,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC3E,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,OAAO;QACL,MAAM,CAAC,EAAE,CAAC;YACR,QAAQ,EAAE,8BAA8B;YACxC,QAAQ,EAAE,UAAU;YACpB,OAAO,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,GAAG;YACxB,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM;YAC5B,SAAS,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE;YACnC,IAAI,EAAE,GAAG,CAAC,MAAM;SACjB,CAAC;KACH,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,GAAmB,EACnB,EAAqB,EACrB,IAAwB;IAExB,MAAM,YAAY,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAChC,MAAM,GAAG,GAAmB;YAC1B,QAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,QAAQ;YACjC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG;YACtB,QAAQ,EACN,CAAC,CAAC,YAAY,CAAC,QAAQ;gBACvB,IAAI,CAAC,OAAO,CACV,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAChD;gBACD,0BAA0B;YAC5B,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM;YAC1B,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI;SACrB,CAAC;QAEF,IAAI,eAAe,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC;YACjE,GAAG,CAAC,SAAS,GAAG;gBACd,IAAI,EAAE,WAAW;gBACjB,kBAAkB,EAAE,mBAAmB;aACxC,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;YAC9B,GAAG,CAAC,UAAU,GAAG,IAAI,CAAC;QACxB,CAAC;QAMD,IAAI,MAAM,IAAI,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,YAAY,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAChE,GAAG,CAAC,IAAI,GAAG,OAAO,CAAC;QACrB,CAAC;QACD,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;IAeH,IAAI,WAAoC,CAAC;IACzC,IAAI,GAAG,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAClC,MAAM,YAAY,GAAsB,EAAE;aACvC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;aAC9C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,MAAM,EAAE,GAAG,CAAC,CAAC,YAA6B,CAAC;YAC3C,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,CAAC;QAClG,CAAC,CAAC,CAAC;QAML,MAAM,OAAO,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;YACnB,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,cAAc,GAAG,YAAY,CAAC,IAAI,CACtC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,KAAK,WAAW,IAAI,iBAAiB,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,OAAO,CAC7G,CAAC;YACF,IAAI,cAAc,EAAE,CAAC;gBACnB,WAAW,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YAClC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,4DAA4D,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAC7F,CAAC;IACH,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,EAAoB,CAAC;IAG5C,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAErC,MAAM,WAAW,GAAG,MAAM,sBAAsB,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;IAC1G,WAAW,CAAC,IAAI,CACd,GAAG,CAAC,MAAM,eAAe,CACvB,GAAG,EAEH,OAAO,EACP,IAAI,CACL,CAAC,CACH,CAAC;IACF,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IACtE,OAAO,WAAW,CAAC;AACrB,CAAC;AASD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,GAAmB,EACnB,IAAoB,EACpB,OAAyB,EACzB,EAAqB;IAGrB,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IA6BnD,MAAM,CAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QAChF,iBAAiB,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QACrD,IAAI,CAAC,KAAK,KAAK,SAAS;YACtB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;iBACP,MAAM,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;iBACtD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;iBACzB,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EACxD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,EACpE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,EAC1D,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAC1C,CACF;iBACA,KAAK,CAAC,CAAC,CAAC;iBACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,KAAK,KAAK,SAAS;YACtB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;iBACP,MAAM,EAAE;iBACR,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;iBACzB,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EACxD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,EACpE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAClC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAC3D,CACF;iBACA,KAAK,CAAC,CAAC,CAAC;iBACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QASxB,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE,CACnG,MAAM,CAAC,GAAG,CAAwC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAC5F;QAQD,gBAAgB,CAAC,GAAG,EAAE,CACpB,GAAG,CAAC,GAAG,CAAC,EAAE;aACP,MAAM,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aAC1C,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;aACzB,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EACxD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,EACpE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAC3D,CACF;aACA,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC7C,KAAK,CAAC,CAAC,CAAC;aACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrB;KACF,CAAC,CAAC;IACH,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC;QAC9C,OAAO,MAAM,CAAC,GAAG,CACf,wCAAwC,YAAY;aACjD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;aAC9B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC;aACjC,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QAEV,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAEvD,MAAM,GAAG,CAAC,GAAG,CAAC,EAAE;iBACb,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;iBAC3B,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;iBACxB,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,EAC1D,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAClC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EACxD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CACrE,CACF,CAAC;QACN,CAAC;QACD,OAAO,MAAM,CAAC,EAAE,CAAC;YACf,IAAI,EAAE,+BAA+B;YACrC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW;YAC5C,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;YAChC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI;YACJ,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,UAAU,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;SAGlD,CAAC,CAAC;IACL,CAAC;IAMD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;QAC5B,IAAI,8BAA8B,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3C,OAAO,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC,GAAG,CAAC,+CAA+C,MAAM,EAAE,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAMD,IAAI,SAAS,CAAC,KAAK,EAAE,EAAE,CAAC;QACtB,OAAO,MAAM,CAAC,GAAG,CAAC,+CAA+C,SAAS,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAC9F,CAAC;IACD,MAAM,QAAQ,GAAG,SAAS,CAAC,EAAE,EAAE,CAAC;IAChC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,iBAAiB,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC;IACxG,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7F,CAAC;IACD,MAAM,WAAW,GAAe,SAAS,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;IAOzE,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CACvC,oBAAoB,CAAC;QACnB,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE;QACd,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,OAAO;QACxB,GAAG,EAAE;YACH,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;YAChC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM;YAClC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW;YAC5C,IAAI;YACJ,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,UAAU,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YACjD,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,IAAI,CAAC,IAAI;YAGf,cAAc,EAAE,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM;YACpF,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SAClC;KACF,CAAC,CACH,CAAC;IACF,IAAI,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC;QAGjB,OAAO,MAAM,CAAC,GAAG,CAAC,gDAAgD,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IACtG,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAM7B,MAAM,SAAS,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,EAAE;aAC/B,MAAM,EAAE;aACR,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;aACzB,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EACxD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,EACpE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,EAC1D,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAC1C,CACF;aACA,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAC7C,KAAK,CAAC,CAAC,CAAC;aACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrB,MAAM,aAAa,GAAG,SAAS,EAAE,IAAI,IAAI,IAAI,CAAC;QAM9C,MAAM,GAAG,CAAC,GAAG,CAAC,EAAE;aACb,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC;aACrC,GAAG,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;aAC5B,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,EACpE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,EACtD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,aAAa,CAAC,CACtD,CACF,CAAC;QACJ,OAAO,MAAM,CAAC,EAAE,CAAC;YACf,IAAI,EAAE,+BAA+B;YACrC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;YAChC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW;YAC5C,IAAI,EAAE,CAAC,SAAS,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,CAAyB;YAC5D,IAAI,EAAE,aAAa;YACnB,GAAG,EAAE,CAAC,SAAS,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAA2B;YAC3D,UAAU,EAAE,CAAC,SAAS,EAAE,UAAU,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAqB;YAChG,UAAU,EAAE,QAAQ;YACpB,aAAa,EAAE,QAAQ;SACxB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC,EAAE,CAAC;QACf,IAAI,EAAE,+BAA+B;QACrC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,OAAO;QAChC,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,WAAW;QAC5C,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI;QACJ,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,UAAU,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACjD,UAAU,EAAE,QAAQ;QACpB,aAAa,EAAE,QAAQ;KACxB,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/api-svc",
|
|
3
|
-
"version": "14.1.
|
|
3
|
+
"version": "14.1.14",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./index.js",
|
|
@@ -28,27 +28,27 @@
|
|
|
28
28
|
"@adviser/cement": "~0.5.34",
|
|
29
29
|
"@adviser/scopey": "~0.0.4",
|
|
30
30
|
"@cf-wasm/quickjs": "~0.3.0",
|
|
31
|
-
"@cloudflare/workers-types": "~5.
|
|
32
|
-
"@libsql/client": "~0.
|
|
31
|
+
"@cloudflare/workers-types": "~5.20260906.1",
|
|
32
|
+
"@libsql/client": "~0.18.0",
|
|
33
33
|
"@neondatabase/serverless": "~1.1.0",
|
|
34
34
|
"@noble/hashes": "~2.3.0",
|
|
35
|
-
"@vibes.diy/api-pkg": "14.1.
|
|
36
|
-
"@vibes.diy/api-sql": "14.1.
|
|
37
|
-
"@vibes.diy/api-types": "14.1.
|
|
38
|
-
"@vibes.diy/call-ai-v2": "14.1.
|
|
39
|
-
"@vibes.diy/identity": "14.1.
|
|
40
|
-
"@vibes.diy/prompts": "14.1.
|
|
41
|
-
"@vibes.diy/vibe-db-explorer": "14.1.
|
|
42
|
-
"@vibes.diy/vibe-runtime": "14.1.
|
|
43
|
-
"@vibes.diy/vibe-types": "14.1.
|
|
35
|
+
"@vibes.diy/api-pkg": "14.1.14",
|
|
36
|
+
"@vibes.diy/api-sql": "14.1.14",
|
|
37
|
+
"@vibes.diy/api-types": "14.1.14",
|
|
38
|
+
"@vibes.diy/call-ai-v2": "14.1.14",
|
|
39
|
+
"@vibes.diy/identity": "14.1.14",
|
|
40
|
+
"@vibes.diy/prompts": "14.1.14",
|
|
41
|
+
"@vibes.diy/vibe-db-explorer": "14.1.14",
|
|
42
|
+
"@vibes.diy/vibe-runtime": "14.1.14",
|
|
43
|
+
"@vibes.diy/vibe-types": "14.1.14",
|
|
44
44
|
"acorn": "~8.17.0",
|
|
45
45
|
"arktype": "~2.2.3",
|
|
46
|
-
"call-ai": "14.1.
|
|
46
|
+
"call-ai": "14.1.14",
|
|
47
47
|
"charwise": "~3.0.1",
|
|
48
48
|
"cookie": "~2.0.1",
|
|
49
49
|
"csv-parse": "~7.0.2",
|
|
50
50
|
"drizzle-orm": "~0.45.2",
|
|
51
|
-
"jose": "~6.2.
|
|
51
|
+
"jose": "~6.2.12",
|
|
52
52
|
"mime": "~4.1.0",
|
|
53
53
|
"multiformats": "~14.0.5",
|
|
54
54
|
"parse5": "~8.0.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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"}
|
|
@@ -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":"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"}
|
|
@@ -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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"}
|