@vibes.diy/api-svc 2.4.12 → 2.4.13
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 +12 -12
- package/create-handler.js +0 -10
- package/create-handler.js.map +1 -1
- package/intern/process-access-bindings.d.ts +12 -0
- package/intern/process-access-bindings.js +225 -0
- package/intern/process-access-bindings.js.map +1 -0
- package/models.json +1 -0
- package/package.json +11 -11
- package/public/access-function.js +3 -3
- package/public/access-function.js.map +1 -1
- package/public/app-documents-dm-eventos.d.ts +4 -0
- package/public/app-documents-dm-eventos.js +121 -0
- package/public/app-documents-dm-eventos.js.map +1 -0
- package/public/app-documents-query-filter.d.ts +6 -0
- package/public/app-documents-query-filter.js +33 -0
- package/public/app-documents-query-filter.js.map +1 -0
- package/public/app-documents-read-eventos.d.ts +6 -0
- package/public/app-documents-read-eventos.js +359 -0
- package/public/app-documents-read-eventos.js.map +1 -0
- package/public/app-documents-shared.d.ts +11 -0
- package/public/app-documents-shared.js +17 -0
- package/public/app-documents-shared.js.map +1 -0
- package/public/app-documents-write-eventos.d.ts +4 -0
- package/public/app-documents-write-eventos.js +405 -0
- package/public/app-documents-write-eventos.js.map +1 -0
- package/public/app-documents.d.ts +4 -15
- package/public/app-documents.js +4 -907
- package/public/app-documents.js.map +1 -1
- package/public/ensure-app-slug-item.js +9 -232
- package/public/ensure-app-slug-item.js.map +1 -1
- package/public/grant-reduce.d.ts +2 -2
- package/public/grant-reduce.js +5 -5
- package/public/grant-reduce.js.map +1 -1
- package/public/list-models.d.ts +1 -0
- package/public/prompt-chat-section.js +203 -49
- package/public/prompt-chat-section.js.map +1 -1
- package/public/who-am-i.js +2 -2
- package/public/who-am-i.js.map +1 -1
- package/types.d.ts +0 -8
- package/types.js.map +1 -1
- package/vibes-msg-evento.js +1 -2
- package/vibes-msg-evento.js.map +1 -1
- package/public/get-fp-cloud-token.d.ts +0 -3
- package/public/get-fp-cloud-token.js +0 -140
- package/public/get-fp-cloud-token.js.map +0 -1
package/README.md
CHANGED
|
@@ -78,7 +78,7 @@ interface MsgBase {
|
|
|
78
78
|
The server uses Evento (from `@adviser/cement`) for request routing. Handlers are registered in order:
|
|
79
79
|
|
|
80
80
|
1. **CORS preflight** - Handles OPTIONS requests
|
|
81
|
-
2. **servEntryPoint** - Serves deployed app HTML (hostname routing: `{appSlug}--{
|
|
81
|
+
2. **servEntryPoint** - Serves deployed app HTML (hostname routing: `{appSlug}--{userHandle}.{host}/~{fsId}~/`)
|
|
82
82
|
3. **Request logging** - Logs incoming POST/PUT requests, rejects other methods with 503
|
|
83
83
|
4. **ensureAppSlugItem** - App deployment handler
|
|
84
84
|
5. **ensureChatContext** - Chat session handler
|
|
@@ -237,26 +237,26 @@ Defined in `svc/sql/vibes-diy-api-schema.ts` using Drizzle ORM.
|
|
|
237
237
|
| Column | Type | Description |
|
|
238
238
|
|--------|------|-------------|
|
|
239
239
|
| `userId` | text | User identifier |
|
|
240
|
-
| `
|
|
240
|
+
| `userHandle` | text | Human-friendly user slug (unique) |
|
|
241
241
|
| `created` | text | ISO timestamp |
|
|
242
242
|
|
|
243
|
-
Primary key: `(
|
|
243
|
+
Primary key: `(userHandle, userId)`. Unique index on `userHandle`.
|
|
244
244
|
|
|
245
245
|
**AppSlugBindings** - Maps apps to slugs within a user's namespace
|
|
246
246
|
| Column | Type | Description |
|
|
247
247
|
|--------|------|-------------|
|
|
248
|
-
| `
|
|
248
|
+
| `userHandle` | text FK | References UserSlugBindings.userHandle |
|
|
249
249
|
| `appSlug` | text | Human-friendly app slug |
|
|
250
250
|
| `created` | text | ISO timestamp |
|
|
251
251
|
|
|
252
|
-
Primary key: `(appSlug,
|
|
252
|
+
Primary key: `(appSlug, userHandle)`.
|
|
253
253
|
|
|
254
254
|
**Apps** - Deployed app versions with filesystem and environment
|
|
255
255
|
| Column | Type | Description |
|
|
256
256
|
|--------|------|-------------|
|
|
257
257
|
| `appSlug` | text | App identifier |
|
|
258
258
|
| `userId` | text | Owner |
|
|
259
|
-
| `
|
|
259
|
+
| `userHandle` | text | Owner's slug |
|
|
260
260
|
| `releaseSeq` | int | Incremented on each deployment |
|
|
261
261
|
| `fsId` | text | CID of filesystem manifest |
|
|
262
262
|
| `env` | json | Environment variables (VibesEnv) |
|
|
@@ -393,7 +393,7 @@ The client uses `KeyedResolvOnce` for connection pooling - multiple `VibeDiyApi`
|
|
|
393
393
|
const res = await api.ensureAppSlug({
|
|
394
394
|
mode: "dev", // 'dev' or 'production'
|
|
395
395
|
appSlug: "my-app", // optional, server generates 3-word slug
|
|
396
|
-
|
|
396
|
+
userHandle: "my-user", // optional, server generates 3-word slug
|
|
397
397
|
env: { API_KEY: "..." }, // optional, passed to app runtime
|
|
398
398
|
fileSystem: [
|
|
399
399
|
{
|
|
@@ -407,8 +407,8 @@ const res = await api.ensureAppSlug({
|
|
|
407
407
|
});
|
|
408
408
|
|
|
409
409
|
if (res.isOk()) {
|
|
410
|
-
const { entryPointUrl, fsId,
|
|
411
|
-
// entryPointUrl -> https://{appSlug}--{
|
|
410
|
+
const { entryPointUrl, fsId, userHandle, appSlug, fileSystem } = res.Ok();
|
|
411
|
+
// entryPointUrl -> https://{appSlug}--{userHandle}.{hostnameBase}/~{fsId}~/
|
|
412
412
|
// e.g. https://my-app--my-user.vibes.app/~zABC123~/
|
|
413
413
|
// fsId -> CID of filesystem manifest
|
|
414
414
|
// fileSystem -> Array<FileSystemItem> with assetIds and transforms
|
|
@@ -486,7 +486,7 @@ pnpm test
|
|
|
486
486
|
Deployed apps are served via hostname-based routing:
|
|
487
487
|
|
|
488
488
|
```
|
|
489
|
-
https://{appSlug}--{
|
|
489
|
+
https://{appSlug}--{userHandle}.{hostnameBase}/~{fsId}~/
|
|
490
490
|
└────────────────────┘ └──────────┘ └──────┘
|
|
491
491
|
hostname base domain version path
|
|
492
492
|
```
|
|
@@ -495,13 +495,13 @@ Example: `https://my-app--fuzzy-purple-elephant.vibes.app/~z4PhNX7vuL~/`
|
|
|
495
495
|
|
|
496
496
|
The `extractHostToBindings()` function parses:
|
|
497
497
|
|
|
498
|
-
- Hostname pattern: `{appSlug}--{
|
|
498
|
+
- Hostname pattern: `{appSlug}--{userHandle}.{rest}`
|
|
499
499
|
- Path pattern: `/~{fsId}~/` (fsId starts with `z`, 8+ chars)
|
|
500
500
|
- If no fsId in path, serves latest production release
|
|
501
501
|
|
|
502
502
|
### Slug Generation
|
|
503
503
|
|
|
504
|
-
When `appSlug` or `
|
|
504
|
+
When `appSlug` or `userHandle` are not provided, the server generates 3-word slugs using the `random-words` package:
|
|
505
505
|
|
|
506
506
|
```typescript
|
|
507
507
|
generate({ exactly: 1, wordsPerString: 3, separator: "-" });
|
package/create-handler.js
CHANGED
|
@@ -32,7 +32,6 @@ export async function createAppContext(params) {
|
|
|
32
32
|
DEV_SERVER_HOST: param.OPTIONAL,
|
|
33
33
|
DEV_SERVER_PORT: param.OPTIONAL,
|
|
34
34
|
DEV: param.OPTIONAL,
|
|
35
|
-
FPCLOUD_URL: param.REQUIRED,
|
|
36
35
|
VIBES_SVC_HOSTNAME_BASE: param.OPTIONAL,
|
|
37
36
|
VIBES_SVC_PROTOCOL: "https",
|
|
38
37
|
VIBES_SVC_PORT: param.OPTIONAL,
|
|
@@ -49,7 +48,6 @@ export async function createAppContext(params) {
|
|
|
49
48
|
CLOUD_SESSION_TOKEN_PUBLIC: param.REQUIRED,
|
|
50
49
|
CLOUD_SESSION_TOKEN_SECRET: param.REQUIRED,
|
|
51
50
|
CLOUD_SESSION_TOKEN_ISSUER: param.REQUIRED,
|
|
52
|
-
CLOUD_SESSION_TOKEN_VALID_SEC: "600",
|
|
53
51
|
});
|
|
54
52
|
if (rEnvVals.isErr()) {
|
|
55
53
|
throw rEnvVals.Err();
|
|
@@ -152,14 +150,6 @@ export async function createAppContext(params) {
|
|
|
152
150
|
cache: params.cache,
|
|
153
151
|
},
|
|
154
152
|
}),
|
|
155
|
-
fpCloud: {
|
|
156
|
-
url: envVals.FPCLOUD_URL,
|
|
157
|
-
secretToken: envVals.CLOUD_SESSION_TOKEN_SECRET,
|
|
158
|
-
publicToken: envVals.CLOUD_SESSION_TOKEN_PUBLIC,
|
|
159
|
-
issuer: envVals.CLOUD_SESSION_TOKEN_ISSUER,
|
|
160
|
-
audience: "sandboxes.vibes.diy",
|
|
161
|
-
validFor: parseInt(envVals.CLOUD_SESSION_TOKEN_VALID_SEC ?? "600", 10) ?? 600,
|
|
162
|
-
},
|
|
163
153
|
postQueue: params.postQueue,
|
|
164
154
|
fetchAsset: params.fetchAsset,
|
|
165
155
|
tokenApi: await tokenApi(sthis, {
|
package/create-handler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-handler.js","sourceRoot":"","sources":["../jsr/create-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAE,UAAU,EAA6C,MAAM,iBAAiB,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AACzG,OAAO,EAAE,sBAAsB,EAAmB,MAAM,0BAA0B,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,OAAO,EAKL,WAAW,EACX,UAAU,GAIX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAuB,oBAAoB,EAA0B,MAAM,oBAAoB,CAAC;AAEtH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAkD9D,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,MAA8B;IAG9B,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAGzB,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAwC,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;QAC9B,qBAAqB,EAAE,KAAK,CAAC,QAAQ;QACrC,qBAAqB,EAAE,KAAK,CAAC,QAAQ;QACrC,iBAAiB,EAAE,KAAK,CAAC,QAAQ;QAEjC,wBAAwB,EAAE,IAAI;QAC9B,yBAAyB,EAAE,IAAI;QAC/B,oBAAoB,EAAE,IAAI;QAE1B,UAAU,EAAE,KAAK,CAAC,QAAQ;QAE1B,UAAU,EAAE,QAAQ;QAEpB,eAAe,EAAE,KAAK,CAAC,QAAQ;QAC/B,mBAAmB,EAAE,KAAK,CAAC,QAAQ;QACnC,iBAAiB,EAAE,6BAA6B;QAEhD,iBAAiB,EAAE,KAAK,CAAC,QAAQ;QACjC,cAAc,EAAE,KAAK,CAAC,QAAQ;QAE9B,iBAAiB,EAAE,KAAK,CAAC,QAAQ;QACjC,eAAe,EAAE,KAAK,CAAC,QAAQ;QAC/B,eAAe,EAAE,KAAK,CAAC,QAAQ;QAC/B,GAAG,EAAE,KAAK,CAAC,QAAQ;QAEnB,
|
|
1
|
+
{"version":3,"file":"create-handler.js","sourceRoot":"","sources":["../jsr/create-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Result } from "@adviser/cement";
|
|
2
|
+
import type { StorageResult, VibeFile } from "@vibes.diy/api-types";
|
|
3
|
+
import type { VibesApiSQLCtx } from "../types.js";
|
|
4
|
+
export interface ProcessAccessBindingsOpts {
|
|
5
|
+
readonly ownerHandle: string;
|
|
6
|
+
readonly appSlug: string;
|
|
7
|
+
readonly fullFileSystem: readonly {
|
|
8
|
+
readonly vibeFileItem: VibeFile;
|
|
9
|
+
readonly storage: StorageResult;
|
|
10
|
+
}[];
|
|
11
|
+
}
|
|
12
|
+
export declare function processAccessBindings(vctx: VibesApiSQLCtx, opts: ProcessAccessBindingsOpts): Promise<Result<void>>;
|
|
@@ -0,0 +1,225 @@
|
|
|
1
|
+
import { exception2Result } from "@adviser/cement";
|
|
2
|
+
import { and, eq, notInArray, sql } from "drizzle-orm";
|
|
3
|
+
import { extractExportSource } from "../public/access-function.js";
|
|
4
|
+
export async function processAccessBindings(vctx, opts) {
|
|
5
|
+
return exception2Result(async () => {
|
|
6
|
+
const { ownerHandle, appSlug, fullFileSystem } = opts;
|
|
7
|
+
const tAfb = vctx.sql.tables.accessFunctionBindings;
|
|
8
|
+
const accessJsEntry = fullFileSystem.find((e) => e.vibeFileItem.filename === "/access.js" || e.vibeFileItem.filename.endsWith("/access.js"));
|
|
9
|
+
if (accessJsEntry === undefined) {
|
|
10
|
+
await vctx.sql.db.delete(tAfb).where(and(eq(tAfb.ownerHandle, ownerHandle), eq(tAfb.appSlug, appSlug)));
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
const cid = accessJsEntry.storage.cid;
|
|
14
|
+
if (cid === undefined) {
|
|
15
|
+
console.error(`processAccessBindings: access.js has no CID for ${ownerHandle}/${appSlug}`);
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
const item = accessJsEntry.vibeFileItem;
|
|
19
|
+
const accessJsSource = item.type === "code-block" || item.type === "str-asset-block" ? item.content : undefined;
|
|
20
|
+
const exportNames = parseExportNames(accessJsSource);
|
|
21
|
+
const existingBindings = await vctx.sql.db
|
|
22
|
+
.select({ dbName: tAfb.dbName, accessFnCid: tAfb.accessFnCid })
|
|
23
|
+
.from(tAfb)
|
|
24
|
+
.where(and(eq(tAfb.ownerHandle, ownerHandle), eq(tAfb.appSlug, appSlug)));
|
|
25
|
+
const oldCids = new Map(existingBindings.map((b) => [b.dbName, b.accessFnCid]));
|
|
26
|
+
if (exportNames.length > 0) {
|
|
27
|
+
for (const dbName of exportNames) {
|
|
28
|
+
await vctx.sql.db
|
|
29
|
+
.insert(tAfb)
|
|
30
|
+
.values({
|
|
31
|
+
ownerHandle: ownerHandle,
|
|
32
|
+
appSlug,
|
|
33
|
+
dbName,
|
|
34
|
+
accessFnCid: cid,
|
|
35
|
+
accessFnAssetUri: accessJsEntry.storage.getURL,
|
|
36
|
+
updated: new Date().toISOString(),
|
|
37
|
+
})
|
|
38
|
+
.onConflictDoUpdate({
|
|
39
|
+
target: [tAfb.ownerHandle, tAfb.appSlug, tAfb.dbName],
|
|
40
|
+
set: {
|
|
41
|
+
accessFnCid: cid,
|
|
42
|
+
accessFnAssetUri: accessJsEntry.storage.getURL,
|
|
43
|
+
updated: new Date().toISOString(),
|
|
44
|
+
},
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
await vctx.sql.db
|
|
48
|
+
.delete(tAfb)
|
|
49
|
+
.where(and(eq(tAfb.ownerHandle, ownerHandle), eq(tAfb.appSlug, appSlug), notInArray(tAfb.dbName, exportNames)));
|
|
50
|
+
await backfillAccessFnOutputs(vctx, {
|
|
51
|
+
ownerHandle,
|
|
52
|
+
appSlug,
|
|
53
|
+
cid,
|
|
54
|
+
exportNames,
|
|
55
|
+
oldCids,
|
|
56
|
+
accessJsSource,
|
|
57
|
+
accessJsEntry,
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
await vctx.sql.db.delete(tAfb).where(and(eq(tAfb.ownerHandle, ownerHandle), eq(tAfb.appSlug, appSlug)));
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
function parseExportNames(source) {
|
|
66
|
+
if (source === undefined)
|
|
67
|
+
return [];
|
|
68
|
+
const exportNames = [];
|
|
69
|
+
const fnPattern = /export\s+function\s+(\w+)/g;
|
|
70
|
+
let match;
|
|
71
|
+
while ((match = fnPattern.exec(source)) !== null) {
|
|
72
|
+
const name = match[1];
|
|
73
|
+
if (name !== undefined && name !== "default") {
|
|
74
|
+
exportNames.push(name);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
const asPattern = /export\s*\{\s*\w+\s+as\s+["']([^"']+)["']\s*\}/g;
|
|
78
|
+
while ((match = asPattern.exec(source)) !== null) {
|
|
79
|
+
const name = match[1];
|
|
80
|
+
if (name !== undefined) {
|
|
81
|
+
exportNames.push(name);
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
const hasDefaultExport = /export\s+default\s+function/.test(source) ||
|
|
85
|
+
/export\s+default\s+\(/.test(source) ||
|
|
86
|
+
/export\s+default\s+\w+\s*=>/.test(source);
|
|
87
|
+
if (hasDefaultExport) {
|
|
88
|
+
exportNames.push("*");
|
|
89
|
+
}
|
|
90
|
+
return exportNames;
|
|
91
|
+
}
|
|
92
|
+
async function backfillAccessFnOutputs(vctx, opts) {
|
|
93
|
+
const invokeAccessFn = vctx.invokeAccessFn;
|
|
94
|
+
if (invokeAccessFn === undefined)
|
|
95
|
+
return;
|
|
96
|
+
const { ownerHandle, appSlug, cid, exportNames, oldCids } = opts;
|
|
97
|
+
const changedDbNames = exportNames.filter((name) => oldCids.get(name) !== cid);
|
|
98
|
+
if (changedDbNames.length === 0)
|
|
99
|
+
return;
|
|
100
|
+
let backfillSource = opts.accessJsSource;
|
|
101
|
+
if (backfillSource === undefined && opts.accessJsEntry.storage.getURL !== undefined) {
|
|
102
|
+
const rFetch = await vctx.storage.fetch(opts.accessJsEntry.storage.getURL);
|
|
103
|
+
if (rFetch.type === "fetch.ok") {
|
|
104
|
+
const reader = rFetch.data.getReader();
|
|
105
|
+
const chunks = [];
|
|
106
|
+
for (;;) {
|
|
107
|
+
const { done, value } = await reader.read();
|
|
108
|
+
if (done)
|
|
109
|
+
break;
|
|
110
|
+
if (value !== undefined)
|
|
111
|
+
chunks.push(value);
|
|
112
|
+
}
|
|
113
|
+
const totalLength = chunks.reduce((sum, c) => sum + c.length, 0);
|
|
114
|
+
const merged = new Uint8Array(totalLength);
|
|
115
|
+
let offset = 0;
|
|
116
|
+
for (const chunk of chunks) {
|
|
117
|
+
merged.set(chunk, offset);
|
|
118
|
+
offset += chunk.length;
|
|
119
|
+
}
|
|
120
|
+
backfillSource = new TextDecoder().decode(merged);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
if (backfillSource === undefined)
|
|
124
|
+
return;
|
|
125
|
+
const tDocs = vctx.sql.tables.appDocuments;
|
|
126
|
+
const tOutputs = vctx.sql.tables.accessFnOutputs;
|
|
127
|
+
const namedExportNames = exportNames.filter((n) => n !== "*");
|
|
128
|
+
const expandedDbNames = [];
|
|
129
|
+
for (const dbName of changedDbNames) {
|
|
130
|
+
if (dbName === "*") {
|
|
131
|
+
const distinctDbs = await vctx.sql.db
|
|
132
|
+
.selectDistinct({ dbName: tDocs.dbName })
|
|
133
|
+
.from(tDocs)
|
|
134
|
+
.where(and(eq(tDocs.ownerHandle, ownerHandle), eq(tDocs.appSlug, appSlug)));
|
|
135
|
+
for (const row of distinctDbs) {
|
|
136
|
+
if (!namedExportNames.includes(row.dbName)) {
|
|
137
|
+
expandedDbNames.push(row.dbName);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
expandedDbNames.push(dbName);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
for (const dbName of expandedDbNames) {
|
|
146
|
+
const t0 = Date.now();
|
|
147
|
+
let docsTotal = 0;
|
|
148
|
+
let docsUpserted = 0;
|
|
149
|
+
let docsForbiddenSkipped = 0;
|
|
150
|
+
let invokeErrors = 0;
|
|
151
|
+
let upsertErrors = 0;
|
|
152
|
+
const allRows = await vctx.sql.db
|
|
153
|
+
.select({ docId: tDocs.docId, data: tDocs.data, deleted: tDocs.deleted })
|
|
154
|
+
.from(tDocs)
|
|
155
|
+
.where(and(eq(tDocs.ownerHandle, ownerHandle), eq(tDocs.appSlug, appSlug), eq(tDocs.dbName, dbName)))
|
|
156
|
+
.orderBy(sql `${tDocs.docId}, ${tDocs.seq}`);
|
|
157
|
+
const latest = new Map();
|
|
158
|
+
for (const row of allRows) {
|
|
159
|
+
latest.set(row.docId, row);
|
|
160
|
+
}
|
|
161
|
+
const isWildcardExpanded = !namedExportNames.includes(dbName);
|
|
162
|
+
const dbSource = isWildcardExpanded ? extractExportSource(backfillSource, "*") : extractExportSource(backfillSource, dbName);
|
|
163
|
+
const effectiveSource = dbSource ?? backfillSource;
|
|
164
|
+
for (const [docId, row] of latest) {
|
|
165
|
+
if (row.deleted === 1)
|
|
166
|
+
continue;
|
|
167
|
+
docsTotal++;
|
|
168
|
+
const rInvoke = await exception2Result(() => invokeAccessFn({
|
|
169
|
+
cid,
|
|
170
|
+
doc: { ...row.data, _id: docId },
|
|
171
|
+
oldDoc: null,
|
|
172
|
+
user: null,
|
|
173
|
+
source: effectiveSource,
|
|
174
|
+
grantState: { members: {}, roleGrants: {}, userGrants: {} },
|
|
175
|
+
}));
|
|
176
|
+
if (rInvoke.isErr()) {
|
|
177
|
+
invokeErrors++;
|
|
178
|
+
console.warn(`backfill: access fn threw for ${ownerHandle}/${appSlug}/${dbName}/${docId}:`, rInvoke.Err());
|
|
179
|
+
continue;
|
|
180
|
+
}
|
|
181
|
+
const invokeResult = rInvoke.Ok();
|
|
182
|
+
if ("forbidden" in invokeResult) {
|
|
183
|
+
docsForbiddenSkipped++;
|
|
184
|
+
continue;
|
|
185
|
+
}
|
|
186
|
+
const accessResult = invokeResult;
|
|
187
|
+
const outputHasGrants = (accessResult.members !== undefined && Object.keys(accessResult.members).length > 0) ||
|
|
188
|
+
(accessResult.grant?.users !== undefined && Object.keys(accessResult.grant.users).length > 0) ||
|
|
189
|
+
(accessResult.grant?.roles !== undefined && Object.keys(accessResult.grant.roles).length > 0) ||
|
|
190
|
+
(accessResult.grant?.public !== undefined && accessResult.grant.public.length > 0)
|
|
191
|
+
? 1
|
|
192
|
+
: 0;
|
|
193
|
+
const rUpsert = await exception2Result(() => vctx.sql.db
|
|
194
|
+
.insert(tOutputs)
|
|
195
|
+
.values({
|
|
196
|
+
ownerHandle: ownerHandle,
|
|
197
|
+
appSlug,
|
|
198
|
+
dbName,
|
|
199
|
+
docId,
|
|
200
|
+
fnCid: cid,
|
|
201
|
+
output: JSON.stringify(accessResult),
|
|
202
|
+
hasGrants: outputHasGrants,
|
|
203
|
+
})
|
|
204
|
+
.onConflictDoUpdate({
|
|
205
|
+
target: [tOutputs.ownerHandle, tOutputs.appSlug, tOutputs.dbName, tOutputs.docId],
|
|
206
|
+
set: {
|
|
207
|
+
fnCid: cid,
|
|
208
|
+
output: JSON.stringify(accessResult),
|
|
209
|
+
hasGrants: outputHasGrants,
|
|
210
|
+
},
|
|
211
|
+
}));
|
|
212
|
+
if (rUpsert.isErr()) {
|
|
213
|
+
upsertErrors++;
|
|
214
|
+
console.warn(`backfill: output upsert failed for ${ownerHandle}/${appSlug}/${dbName}/${docId}:`, rUpsert.Err());
|
|
215
|
+
}
|
|
216
|
+
else {
|
|
217
|
+
docsUpserted++;
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
console.info(`backfill: ${ownerHandle}/${appSlug}/${dbName} cid=${cid.slice(0, 8)}` +
|
|
221
|
+
` total=${docsTotal} upserted=${docsUpserted} forbidden=${docsForbiddenSkipped}` +
|
|
222
|
+
` invokeErr=${invokeErrors} upsertErr=${upsertErrors} elapsed=${Date.now() - t0}ms`);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
//# sourceMappingURL=process-access-bindings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-access-bindings.js","sourceRoot":"","sources":["../../jsr/intern/process-access-bindings.ts"],"names":[],"mappings":"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"}
|
package/models.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/api-svc",
|
|
3
|
-
"version": "2.4.
|
|
3
|
+
"version": "2.4.13",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -25,18 +25,18 @@
|
|
|
25
25
|
"@libsql/client": "~0.17.3",
|
|
26
26
|
"@neondatabase/serverless": "~1.1.0",
|
|
27
27
|
"@noble/hashes": "~2.2.0",
|
|
28
|
-
"@vibes.diy/api-impl": "2.4.
|
|
29
|
-
"@vibes.diy/api-pkg": "2.4.
|
|
30
|
-
"@vibes.diy/api-sql": "2.4.
|
|
31
|
-
"@vibes.diy/api-types": "2.4.
|
|
32
|
-
"@vibes.diy/call-ai-v2": "2.4.
|
|
33
|
-
"@vibes.diy/prompts": "2.4.
|
|
34
|
-
"@vibes.diy/use-vibes-base": "2.4.
|
|
35
|
-
"@vibes.diy/vibe-db-explorer": "2.4.
|
|
36
|
-
"@vibes.diy/vibe-types": "2.4.
|
|
28
|
+
"@vibes.diy/api-impl": "2.4.13",
|
|
29
|
+
"@vibes.diy/api-pkg": "2.4.13",
|
|
30
|
+
"@vibes.diy/api-sql": "2.4.13",
|
|
31
|
+
"@vibes.diy/api-types": "2.4.13",
|
|
32
|
+
"@vibes.diy/call-ai-v2": "2.4.13",
|
|
33
|
+
"@vibes.diy/prompts": "2.4.13",
|
|
34
|
+
"@vibes.diy/use-vibes-base": "2.4.13",
|
|
35
|
+
"@vibes.diy/vibe-db-explorer": "2.4.13",
|
|
36
|
+
"@vibes.diy/vibe-types": "2.4.13",
|
|
37
37
|
"acorn": "~8.16.0",
|
|
38
38
|
"arktype": "~2.2.0",
|
|
39
|
-
"call-ai": "2.4.
|
|
39
|
+
"call-ai": "2.4.13",
|
|
40
40
|
"cookie": "~1.1.1",
|
|
41
41
|
"drizzle-orm": "~0.45.2",
|
|
42
42
|
"jose": "~6.2.2",
|
|
@@ -5,14 +5,14 @@ export function enforceAllowAnonymous(result, user) {
|
|
|
5
5
|
}
|
|
6
6
|
export function makeHelpers(user, grantState) {
|
|
7
7
|
const gs = grantState ?? { members: {}, roleGrants: {}, userGrants: {} };
|
|
8
|
-
function resolveChannels(
|
|
8
|
+
function resolveChannels(userHandle) {
|
|
9
9
|
const channels = new Set();
|
|
10
|
-
const direct = gs.userGrants[
|
|
10
|
+
const direct = gs.userGrants[userHandle];
|
|
11
11
|
if (direct)
|
|
12
12
|
for (const ch of direct)
|
|
13
13
|
channels.add(ch);
|
|
14
14
|
for (const [role, members] of Object.entries(gs.members)) {
|
|
15
|
-
if (members.includes(
|
|
15
|
+
if (members.includes(userHandle)) {
|
|
16
16
|
const roleChannels = gs.roleGrants[role];
|
|
17
17
|
if (roleChannels)
|
|
18
18
|
for (const ch of roleChannels)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-function.js","sourceRoot":"","sources":["../../jsr/public/access-function.ts"],"names":[],"mappings":"AA4BA,MAAM,UAAU,qBAAqB,CAAC,MAAwB,EAAE,IAAwB;IACtF,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;QAC5C,MAAM,IAAI,cAAc,CAAC,yBAAyB,CAAC,CAAC;IACtD,CAAC;AACH,CAAC;AAQD,MAAM,UAAU,WAAW,CAAC,IAAwB,EAAE,UAAuB;IAC3E,MAAM,EAAE,GAAe,UAAU,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;IAErF,SAAS,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"access-function.js","sourceRoot":"","sources":["../../jsr/public/access-function.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { EventoHandler } from "@adviser/cement";
|
|
2
|
+
import { MsgBase, ReqListDmThreads, ResListDmThreads, ReqMarkDmRead, ResMarkDmRead, VibesDiyError, W3CWebSocketEvent } from "@vibes.diy/api-types";
|
|
3
|
+
export declare const listDmThreadsEvento: EventoHandler<W3CWebSocketEvent, MsgBase<ReqListDmThreads>, ResListDmThreads | VibesDiyError>;
|
|
4
|
+
export declare const markDmReadEvento: EventoHandler<W3CWebSocketEvent, MsgBase<ReqMarkDmRead>, ResMarkDmRead | VibesDiyError>;
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
import { Result, Option, EventoResult } from "@adviser/cement";
|
|
2
|
+
import { reqListDmThreads, reqMarkDmRead, directChannelParticipants, } from "@vibes.diy/api-types";
|
|
3
|
+
import { unwrapMsgBase } from "../unwrap-msg-base.js";
|
|
4
|
+
import { checkAuth } from "../check-auth.js";
|
|
5
|
+
import { eq, and, inArray, sql } from "drizzle-orm";
|
|
6
|
+
import { max } from "drizzle-orm/sql";
|
|
7
|
+
import { type } from "arktype";
|
|
8
|
+
import { checkDirectChannelAccess } from "./db-acl-resolver.js";
|
|
9
|
+
export const listDmThreadsEvento = {
|
|
10
|
+
hash: "list-dm-threads",
|
|
11
|
+
validate: unwrapMsgBase(async (msg) => {
|
|
12
|
+
const ret = reqListDmThreads(msg.payload);
|
|
13
|
+
if (ret instanceof type.errors)
|
|
14
|
+
return Result.Ok(Option.None());
|
|
15
|
+
return Result.Ok(Option.Some({ ...msg, payload: ret }));
|
|
16
|
+
}),
|
|
17
|
+
handle: checkAuth(async (ctx) => {
|
|
18
|
+
const req = ctx.validated.payload;
|
|
19
|
+
const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
|
|
20
|
+
const userId = req._auth.verifiedAuth.claims.userId;
|
|
21
|
+
const t_usb = vctx.sql.tables.handleBinding;
|
|
22
|
+
const mySlugRows = await vctx.sql.db.select({ handle: t_usb.handle }).from(t_usb).where(eq(t_usb.userId, userId));
|
|
23
|
+
const myUserSlugs = mySlugRows.map((r) => r.handle);
|
|
24
|
+
if (myUserSlugs.length === 0) {
|
|
25
|
+
await ctx.send.send(ctx, { type: "vibes.diy.res-list-dm-threads", status: "ok", items: [] });
|
|
26
|
+
return Result.Ok(EventoResult.Continue);
|
|
27
|
+
}
|
|
28
|
+
const t_idx = vctx.sql.tables.directChannelIndex;
|
|
29
|
+
const channelRows = await vctx.sql.db
|
|
30
|
+
.select({ channelUserSlug: t_idx.channelHandle, ownerHandle: t_idx.handle })
|
|
31
|
+
.from(t_idx)
|
|
32
|
+
.where(inArray(t_idx.handle, myUserSlugs));
|
|
33
|
+
const t_docs = vctx.sql.tables.appDocuments;
|
|
34
|
+
const t_reads = vctx.sql.tables.directChannelReads;
|
|
35
|
+
const limit = req.pager?.limit ?? 50;
|
|
36
|
+
const channelSlugs = channelRows.map((r) => r.channelUserSlug);
|
|
37
|
+
const subq = vctx.sql.db
|
|
38
|
+
.select({ ownerHandle: t_docs.ownerHandle, maxSeq: max(t_docs.seq).as("maxSeq") })
|
|
39
|
+
.from(t_docs)
|
|
40
|
+
.where(and(inArray(t_docs.ownerHandle, channelSlugs), eq(t_docs.appSlug, "dm"), eq(t_docs.dbName, "messages"), eq(t_docs.deleted, 0)))
|
|
41
|
+
.groupBy(t_docs.ownerHandle)
|
|
42
|
+
.as("latest");
|
|
43
|
+
const latestDocs = await vctx.sql.db
|
|
44
|
+
.select()
|
|
45
|
+
.from(t_docs)
|
|
46
|
+
.innerJoin(subq, and(eq(t_docs.ownerHandle, subq.ownerHandle), eq(t_docs.seq, subq.maxSeq)));
|
|
47
|
+
const latestDocByChannel = new Map(latestDocs.map((row) => [row.AppDocuments.ownerHandle, row.AppDocuments]));
|
|
48
|
+
const readRows = await vctx.sql.db
|
|
49
|
+
.select({ channelUserSlug: t_reads.channelHandle, lastSeenSeq: t_reads.lastSeenSeq })
|
|
50
|
+
.from(t_reads)
|
|
51
|
+
.where(and(inArray(t_reads.channelHandle, channelSlugs), inArray(t_reads.handle, myUserSlugs)));
|
|
52
|
+
const lastSeenByChannel = new Map(readRows.map((r) => [r.channelUserSlug, r.lastSeenSeq]));
|
|
53
|
+
const items = channelRows.map(({ channelUserSlug, ownerHandle: mySlug }) => {
|
|
54
|
+
const otherUserSlug = (directChannelParticipants(channelUserSlug) ?? []).find((h) => h !== mySlug) ?? "";
|
|
55
|
+
const latestDoc = latestDocByChannel.get(channelUserSlug);
|
|
56
|
+
const latestSeq = latestDoc?.seq ?? 0;
|
|
57
|
+
const lastSeen = lastSeenByChannel.get(channelUserSlug) ?? 0;
|
|
58
|
+
const unreadCount = Math.max(0, latestSeq - lastSeen);
|
|
59
|
+
return {
|
|
60
|
+
channelUserSlug,
|
|
61
|
+
otherUserSlug,
|
|
62
|
+
latestSeq,
|
|
63
|
+
unreadCount,
|
|
64
|
+
latestMessage: latestDoc
|
|
65
|
+
? {
|
|
66
|
+
body: String(latestDoc.data.body ?? ""),
|
|
67
|
+
createdAt: latestDoc.created,
|
|
68
|
+
authorHandle: String(latestDoc.data.authorHandle ?? ""),
|
|
69
|
+
}
|
|
70
|
+
: undefined,
|
|
71
|
+
};
|
|
72
|
+
});
|
|
73
|
+
const sorted = items
|
|
74
|
+
.sort((a, b) => ((b.latestMessage?.createdAt ?? "") > (a.latestMessage?.createdAt ?? "") ? 1 : -1))
|
|
75
|
+
.slice(0, limit);
|
|
76
|
+
await ctx.send.send(ctx, { type: "vibes.diy.res-list-dm-threads", status: "ok", items: sorted });
|
|
77
|
+
return Result.Ok(EventoResult.Continue);
|
|
78
|
+
}),
|
|
79
|
+
};
|
|
80
|
+
export const markDmReadEvento = {
|
|
81
|
+
hash: "mark-dm-read",
|
|
82
|
+
validate: unwrapMsgBase(async (msg) => {
|
|
83
|
+
const ret = reqMarkDmRead(msg.payload);
|
|
84
|
+
if (ret instanceof type.errors)
|
|
85
|
+
return Result.Ok(Option.None());
|
|
86
|
+
return Result.Ok(Option.Some({ ...msg, payload: ret }));
|
|
87
|
+
}),
|
|
88
|
+
handle: checkAuth(async (ctx) => {
|
|
89
|
+
const req = ctx.validated.payload;
|
|
90
|
+
const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
|
|
91
|
+
const userId = req._auth.verifiedAuth.claims.userId;
|
|
92
|
+
const rAccess = await checkDirectChannelAccess(vctx, req.channelUserSlug, userId);
|
|
93
|
+
if (rAccess.isErr() || !rAccess.Ok()) {
|
|
94
|
+
await ctx.send.send(ctx, { type: "vibes.diy.res-error", error: { message: "Access denied" } });
|
|
95
|
+
return Result.Ok(EventoResult.Continue);
|
|
96
|
+
}
|
|
97
|
+
const participants = directChannelParticipants(req.channelUserSlug) ?? ["", ""];
|
|
98
|
+
const t_usb = vctx.sql.tables.handleBinding;
|
|
99
|
+
const slugRow = await vctx.sql.db
|
|
100
|
+
.select({ handle: t_usb.handle })
|
|
101
|
+
.from(t_usb)
|
|
102
|
+
.where(and(eq(t_usb.userId, userId), inArray(t_usb.handle, participants)))
|
|
103
|
+
.then((r) => r[0]);
|
|
104
|
+
if (!slugRow) {
|
|
105
|
+
await ctx.send.send(ctx, { type: "vibes.diy.res-error", error: { message: "Access denied" } });
|
|
106
|
+
return Result.Ok(EventoResult.Continue);
|
|
107
|
+
}
|
|
108
|
+
const myUserSlug = slugRow.handle;
|
|
109
|
+
const t_reads = vctx.sql.tables.directChannelReads;
|
|
110
|
+
await vctx.sql.db
|
|
111
|
+
.insert(t_reads)
|
|
112
|
+
.values({ channelHandle: req.channelUserSlug, handle: myUserSlug, lastSeenSeq: req.lastSeenSeq })
|
|
113
|
+
.onConflictDoUpdate({
|
|
114
|
+
target: [t_reads.channelHandle, t_reads.handle],
|
|
115
|
+
set: { lastSeenSeq: sql `MAX(${t_reads.lastSeenSeq}, ${req.lastSeenSeq})` },
|
|
116
|
+
});
|
|
117
|
+
await ctx.send.send(ctx, { type: "vibes.diy.res-mark-dm-read", status: "ok" });
|
|
118
|
+
return Result.Ok(EventoResult.Continue);
|
|
119
|
+
}),
|
|
120
|
+
};
|
|
121
|
+
//# sourceMappingURL=app-documents-dm-eventos.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app-documents-dm-eventos.js","sourceRoot":"","sources":["../../jsr/public/app-documents-dm-eventos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,EAAsC,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClH,OAAO,EAEL,gBAAgB,EAIhB,aAAa,EAOb,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAIhE,MAAM,CAAC,MAAM,mBAAmB,GAAkG;IAChI,IAAI,EAAE,iBAAiB;IACvB,QAAQ,EAAE,aAAa,CAAC,KAAK,EAAE,GAAY,EAAE,EAAE;QAC7C,MAAM,GAAG,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,GAAG,YAAY,IAAI,CAAC,MAAM;YAAE,OAAO,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAChE,OAAO,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC;IACF,MAAM,EAAE,SAAS,CACf,KAAK,EACH,GAA0H,EACvF,EAAE;QACrC,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC;QAClC,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,CAAiB,aAAa,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC;QAGpD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;QAC5C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAClH,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAEpD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,+BAA+B,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAA6B,CAAC,CAAC;YACxH,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;QAGD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC;QACjD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;aAClC,MAAM,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;aAC3E,IAAI,CAAC,KAAK,CAAC;aACX,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;QAE7C,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC;QACnD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC;QAErC,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;QAG/D,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE;aACrB,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;aACjF,IAAI,CAAC,MAAM,CAAC;aACZ,KAAK,CACJ,GAAG,CACD,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,EACzC,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,EACxB,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,EAC7B,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CACtB,CACF;aACA,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC;aAC3B,EAAE,CAAC,QAAQ,CAAC,CAAC;QAEhB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;aACjC,MAAM,EAAE;aACR,IAAI,CAAC,MAAM,CAAC;aACZ,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAE/F,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAG9G,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;aAC/B,MAAM,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,aAAa,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC;aACpF,IAAI,CAAC,OAAO,CAAC;aACb,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;QAClG,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAE3F,MAAM,KAAK,GAAmB,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,EAAE;YACzF,MAAM,aAAa,GAAG,CAAC,yBAAyB,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;YACzG,MAAM,SAAS,GAAG,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YAC1D,MAAM,SAAS,GAAG,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC;YACtC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAC,CAAC;YACtD,OAAO;gBACL,eAAe;gBACf,aAAa;gBACb,SAAS;gBACT,WAAW;gBACX,aAAa,EAAE,SAAS;oBACtB,CAAC,CAAC;wBACE,IAAI,EAAE,MAAM,CAAE,SAAS,CAAC,IAA2B,CAAC,IAAI,IAAI,EAAE,CAAC;wBAC/D,SAAS,EAAE,SAAS,CAAC,OAAO;wBAC5B,YAAY,EAAE,MAAM,CAAE,SAAS,CAAC,IAAmC,CAAC,YAAY,IAAI,EAAE,CAAC;qBACxF;oBACH,CAAC,CAAC,SAAS;aACd,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,KAAK;aACjB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,SAAS,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAClG,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QAEnB,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,+BAA+B,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAA6B,CAAC,CAAC;QAC5H,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC,CACF;CACF,CAAC;AAIF,MAAM,CAAC,MAAM,gBAAgB,GAA4F;IACvH,IAAI,EAAE,cAAc;IACpB,QAAQ,EAAE,aAAa,CAAC,KAAK,EAAE,GAAY,EAAE,EAAE;QAC7C,MAAM,GAAG,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,GAAG,YAAY,IAAI,CAAC,MAAM;YAAE,OAAO,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAChE,OAAO,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC;IACF,MAAM,EAAE,SAAS,CACf,KAAK,EACH,GAAoH,EACjF,EAAE;QACrC,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC;QAClC,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,CAAiB,aAAa,CAAC,CAAC;QAC/D,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC;QAGpD,MAAM,OAAO,GAAG,MAAM,wBAAwB,CAAC,IAAI,EAAE,GAAG,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAClF,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC;YACrC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,EAAqB,CAAC,CAAC;YAClH,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;QAGD,MAAM,YAAY,GAAG,yBAAyB,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAChF,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;aAC9B,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;aAChC,IAAI,CAAC,KAAK,CAAC;aACX,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;aACzE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,EAAqB,CAAC,CAAC;YAClH,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;QACD,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;QAElC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC;QACnD,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE;aACd,MAAM,CAAC,OAAO,CAAC;aACf,MAAM,CAAC,EAAE,aAAa,EAAE,GAAG,CAAC,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC;aAChG,kBAAkB,CAAC;YAClB,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC;YAE/C,GAAG,EAAE,EAAE,WAAW,EAAE,GAAG,CAAA,OAAO,OAAO,CAAC,WAAW,KAAK,GAAG,CAAC,WAAW,GAAG,EAAE;SAC3E,CAAC,CAAC;QAEL,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,4BAA4B,EAAE,MAAM,EAAE,IAAI,EAA0B,CAAC,CAAC;QACvG,OAAO,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC,CACF;CACF,CAAC"}
|