@vibes.diy/api-svc 2.4.5 → 2.4.8
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 +2 -2
- package/asset-grant.js.map +1 -1
- package/cf-serve.js +2 -2
- package/cf-serve.js.map +1 -1
- package/create-handler.d.ts +1 -1
- package/create-handler.js.map +1 -1
- package/intern/append-turn-to-chat.d.ts +1 -1
- package/intern/append-turn-to-chat.js +4 -4
- package/intern/append-turn-to-chat.js.map +1 -1
- package/intern/bump-app-recency.d.ts +1 -1
- package/intern/bump-app-recency.js +1 -1
- package/intern/bump-app-recency.js.map +1 -1
- package/intern/ensure-app-metadata.d.ts +1 -1
- package/intern/ensure-app-metadata.js +6 -6
- package/intern/ensure-app-metadata.js.map +1 -1
- package/intern/ensure-application-chat-id.d.ts +1 -1
- package/intern/ensure-application-chat-id.js +9 -9
- package/intern/ensure-application-chat-id.js.map +1 -1
- package/intern/ensure-chat-id.d.ts +1 -1
- package/intern/ensure-chat-id.js +21 -21
- package/intern/ensure-chat-id.js.map +1 -1
- package/intern/ensure-push-seeded-chat.d.ts +1 -1
- package/intern/ensure-push-seeded-chat.js +4 -4
- package/intern/ensure-push-seeded-chat.js.map +1 -1
- package/intern/ensure-slug-binding.d.ts +7 -7
- package/intern/ensure-slug-binding.js +53 -53
- package/intern/ensure-slug-binding.js.map +1 -1
- package/intern/get-model-defaults.d.ts +2 -2
- package/intern/get-model-defaults.js +6 -6
- package/intern/get-model-defaults.js.map +1 -1
- package/intern/get-slug-binding.d.ts +3 -3
- package/intern/get-slug-binding.js +6 -6
- package/intern/get-slug-binding.js.map +1 -1
- package/intern/get-vibe-route-hints.d.ts +1 -1
- package/intern/get-vibe-route-hints.js +5 -5
- package/intern/get-vibe-route-hints.js.map +1 -1
- package/intern/render-db-explorer.d.ts +1 -1
- package/intern/render-vibe.d.ts +2 -2
- package/intern/render-vibe.js +5 -5
- package/intern/render-vibe.js.map +1 -1
- package/intern/write-apps.d.ts +2 -2
- package/intern/write-apps.js +7 -7
- package/intern/write-apps.js.map +1 -1
- package/package.json +11 -11
- package/public/access-function.d.ts +8 -0
- package/public/access-function.js +28 -0
- package/public/access-function.js.map +1 -0
- package/public/access-helpers.d.ts +2 -2
- package/public/access-helpers.js +9 -9
- package/public/access-helpers.js.map +1 -1
- package/public/app-documents.js +71 -71
- package/public/app-documents.js.map +1 -1
- package/public/asset-upload-grant.js +2 -2
- package/public/asset-upload-grant.js.map +1 -1
- package/public/convert-image-evt.d.ts +1 -1
- package/public/convert-image-evt.js +3 -3
- package/public/convert-image-evt.js.map +1 -1
- package/public/db-acl-resolver.d.ts +1 -1
- package/public/db-acl-resolver.js +6 -6
- package/public/db-acl-resolver.js.map +1 -1
- package/public/ensure-app-settings.js +17 -17
- package/public/ensure-app-settings.js.map +1 -1
- package/public/ensure-app-slug-item.js +8 -8
- package/public/ensure-app-slug-item.js.map +1 -1
- package/public/files-asset.d.ts +1 -1
- package/public/files-asset.js +8 -8
- package/public/files-asset.js.map +1 -1
- package/public/files-url-mint.d.ts +1 -1
- package/public/files-url-mint.js +2 -2
- package/public/files-url-mint.js.map +1 -1
- package/public/fork-app.js +21 -21
- package/public/fork-app.js.map +1 -1
- package/public/get-app-by-fsid.js +17 -17
- package/public/get-app-by-fsid.js.map +1 -1
- package/public/get-chat-details.js +5 -5
- package/public/get-chat-details.js.map +1 -1
- package/public/get-fp-cloud-token.js +5 -5
- package/public/get-fp-cloud-token.js.map +1 -1
- package/public/get-user-avatar.d.ts +2 -2
- package/public/get-user-avatar.js +8 -8
- package/public/get-user-avatar.js.map +1 -1
- package/public/invite-flow.d.ts +1 -1
- package/public/invite-flow.js +23 -18
- package/public/invite-flow.js.map +1 -1
- package/public/list-application-chats.js +3 -3
- package/public/list-application-chats.js.map +1 -1
- package/public/list-members.js +7 -7
- package/public/list-members.js.map +1 -1
- package/public/list-memberships.js +14 -14
- package/public/list-memberships.js.map +1 -1
- package/public/list-recent-vibes.js +9 -9
- package/public/list-recent-vibes.js.map +1 -1
- package/public/list-user-slug-app-slug.js +15 -15
- package/public/list-user-slug-app-slug.js.map +1 -1
- package/public/open-chat.js +2 -2
- package/public/open-chat.js.map +1 -1
- package/public/pin-recent-vibe.js +7 -7
- package/public/pin-recent-vibe.js.map +1 -1
- package/public/prompt-chat-section.d.ts +1 -1
- package/public/prompt-chat-section.js +14 -14
- package/public/prompt-chat-section.js.map +1 -1
- package/public/put-asset.js +1 -1
- package/public/put-asset.js.map +1 -1
- package/public/report-active-members.js +5 -5
- package/public/report-active-members.js.map +1 -1
- package/public/report-campaign-health.d.ts +5 -1
- package/public/report-campaign-health.js +46 -7
- package/public/report-campaign-health.js.map +1 -1
- package/public/report-growth-memberships.js +7 -7
- package/public/report-growth-memberships.js.map +1 -1
- package/public/report-top-vibes-by-members.js +4 -4
- package/public/report-top-vibes-by-members.js.map +1 -1
- package/public/request-flow.d.ts +3 -3
- package/public/request-flow.js +44 -44
- package/public/request-flow.js.map +1 -1
- package/public/serv-entry-point.js +4 -4
- package/public/serv-entry-point.js.map +1 -1
- package/public/set-mode-fsid.js +5 -5
- package/public/set-mode-fsid.js.map +1 -1
- package/public/store-and-audit-asset.d.ts +1 -1
- package/public/store-and-audit-asset.js +1 -1
- package/public/store-and-audit-asset.js.map +1 -1
- package/public/user-slug-bindings.d.ts +4 -4
- package/public/user-slug-bindings.js +42 -36
- package/public/user-slug-bindings.js.map +1 -1
- package/public/who-am-i.js +10 -10
- package/public/who-am-i.js.map +1 -1
- package/types.d.ts +10 -10
- package/types.js +8 -8
- package/types.js.map +1 -1
- package/usage-report/admin-db.js +1 -1
- package/usage-report/inspect-db-report-template.d.ts +1 -1
- package/usage-report/inspect-db-report-template.js +4 -4
- package/usage-report/inspect-db-report-template.js.map +1 -1
- package/usage-report/inspect-db-report.js +15 -15
- package/usage-report/inspect-db-report.js.map +1 -1
- package/vibes-msg-evento.js +2 -2
- package/vibes-msg-evento.js.map +1 -1
|
@@ -3,6 +3,6 @@ import { DbAcl, DbAclSubject } from "@vibes.diy/api-types";
|
|
|
3
3
|
import { VibesApiSQLCtx } from "../types.js";
|
|
4
4
|
import { DocAccessLevel } from "./access-helpers.js";
|
|
5
5
|
export declare function inGroup(level: DocAccessLevel, group: DbAclSubject): boolean;
|
|
6
|
-
export declare function resolveDbAcl(vctx: VibesApiSQLCtx,
|
|
6
|
+
export declare function resolveDbAcl(vctx: VibesApiSQLCtx, ownerHandle: string, appSlug: string, dbName: string): Promise<Result<DbAcl | undefined>>;
|
|
7
7
|
export declare function checkDirectChannelAccess(vctx: VibesApiSQLCtx, channelUserSlug: string, userId: string): Promise<Result<boolean>>;
|
|
8
8
|
export declare function aclAllows(acl: DbAcl | undefined, cap: "read" | "write" | "delete", access: DocAccessLevel): boolean;
|
|
@@ -17,11 +17,11 @@ export function inGroup(level, group) {
|
|
|
17
17
|
return level === "editor" || level === "viewer";
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
-
export async function resolveDbAcl(vctx,
|
|
20
|
+
export async function resolveDbAcl(vctx, ownerHandle, appSlug, dbName) {
|
|
21
21
|
const rSettings = await ensureAppSettings(vctx, {
|
|
22
22
|
type: "vibes.diy.req-ensure-app-settings",
|
|
23
23
|
appSlug,
|
|
24
|
-
|
|
24
|
+
ownerHandle,
|
|
25
25
|
env: [],
|
|
26
26
|
});
|
|
27
27
|
if (rSettings.isErr())
|
|
@@ -37,12 +37,12 @@ export async function checkDirectChannelAccess(vctx, channelUserSlug, userId) {
|
|
|
37
37
|
const participants = directChannelParticipants(channelUserSlug);
|
|
38
38
|
if (!participants)
|
|
39
39
|
return Result.Ok(false);
|
|
40
|
-
const [
|
|
41
|
-
const t = vctx.sql.tables.
|
|
40
|
+
const [ownerHandleA, ownerHandleB] = participants;
|
|
41
|
+
const t = vctx.sql.tables.handleBinding;
|
|
42
42
|
const matches = await vctx.sql.db
|
|
43
|
-
.select({
|
|
43
|
+
.select({ handle: t.handle })
|
|
44
44
|
.from(t)
|
|
45
|
-
.where(and(eq(t.userId, userId), inArray(t.
|
|
45
|
+
.where(and(eq(t.userId, userId), inArray(t.handle, [ownerHandleA, ownerHandleB])));
|
|
46
46
|
return Result.Ok(matches.length > 0);
|
|
47
47
|
}
|
|
48
48
|
export function aclAllows(acl, cap, access) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-acl-resolver.js","sourceRoot":"","sources":["../../jsr/public/db-acl-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAuB,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAE9H,OAAO,EAAkB,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAO/C,MAAM,UAAU,OAAO,CAAC,KAAqB,EAAE,KAAmB;IAChE,IAAI,KAAK,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IACnC,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,WAAW,CAAC;QAC3E,KAAK,SAAS;YACZ,OAAO,KAAK,KAAK,QAAQ,CAAC;QAC5B,KAAK,YAAY;YACf,OAAO,KAAK,KAAK,WAAW,CAAC;QAC/B,KAAK,SAAS;YACZ,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,QAAQ,CAAC;IACpD,CAAC;AACH,CAAC;AAeD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,IAAoB,EACpB,
|
|
1
|
+
{"version":3,"file":"db-acl-resolver.js","sourceRoot":"","sources":["../../jsr/public/db-acl-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,7 @@ export function buildEnsureEntryResult(entries) {
|
|
|
68
68
|
const MODEL_DEFAULTS_TIMEOUT_MS = 3000;
|
|
69
69
|
async function withModelDefaults(vctx, res) {
|
|
70
70
|
const timeout = new Promise((resolve) => setTimeout(() => resolve("timeout"), MODEL_DEFAULTS_TIMEOUT_MS));
|
|
71
|
-
const raced = await Promise.race([getModelDefaults(vctx, { appSlug: res.appSlug,
|
|
71
|
+
const raced = await Promise.race([getModelDefaults(vctx, { appSlug: res.appSlug, ownerHandle: res.ownerHandle }), timeout]);
|
|
72
72
|
if (raced === "timeout") {
|
|
73
73
|
ensureLogger(vctx.sthis, "ensureAppSettings").Warn().Msg("withModelDefaults timed out, returning res without defaults");
|
|
74
74
|
return res;
|
|
@@ -89,7 +89,7 @@ async function postIconGen(vctx, args) {
|
|
|
89
89
|
await vctx.postQueue({
|
|
90
90
|
payload: {
|
|
91
91
|
type: "vibes.diy.evt-icon-gen",
|
|
92
|
-
|
|
92
|
+
ownerHandle: args.ownerHandle,
|
|
93
93
|
appSlug: args.appSlug,
|
|
94
94
|
...(args.force ? { force: true } : {}),
|
|
95
95
|
},
|
|
@@ -115,10 +115,10 @@ function recentlyRegenerated(entries) {
|
|
|
115
115
|
export async function ensureAppSettings(vctx, req, userId) {
|
|
116
116
|
const rPrev = await exception2Result(() => vctx.sql.db
|
|
117
117
|
.select()
|
|
118
|
-
.from(vctx.sql.tables.
|
|
119
|
-
.innerJoin(vctx.sql.tables.appSlugBinding, eq(vctx.sql.tables.appSlugBinding.
|
|
120
|
-
.leftJoin(vctx.sql.tables.appSettings, and(eq(vctx.sql.tables.appSettings.userId, vctx.sql.tables.
|
|
121
|
-
.where(and(eq(vctx.sql.tables.appSlugBinding.
|
|
118
|
+
.from(vctx.sql.tables.handleBinding)
|
|
119
|
+
.innerJoin(vctx.sql.tables.appSlugBinding, eq(vctx.sql.tables.appSlugBinding.ownerHandle, vctx.sql.tables.handleBinding.handle))
|
|
120
|
+
.leftJoin(vctx.sql.tables.appSettings, and(eq(vctx.sql.tables.appSettings.userId, vctx.sql.tables.handleBinding.userId), eq(vctx.sql.tables.appSettings.appSlug, req.appSlug), eq(vctx.sql.tables.appSettings.ownerHandle, vctx.sql.tables.handleBinding.handle)))
|
|
121
|
+
.where(and(eq(vctx.sql.tables.appSlugBinding.ownerHandle, req.ownerHandle), eq(vctx.sql.tables.appSlugBinding.appSlug, req.appSlug)))
|
|
122
122
|
.limit(1)
|
|
123
123
|
.then((r) => r[0]));
|
|
124
124
|
if (rPrev.isErr()) {
|
|
@@ -133,8 +133,8 @@ export async function ensureAppSettings(vctx, req, userId) {
|
|
|
133
133
|
userId: "------",
|
|
134
134
|
appSlug: req.appSlug,
|
|
135
135
|
ledger: req.appSlug,
|
|
136
|
-
|
|
137
|
-
tenant: req.
|
|
136
|
+
ownerHandle: req.ownerHandle,
|
|
137
|
+
tenant: req.ownerHandle,
|
|
138
138
|
error: "not-found",
|
|
139
139
|
settings: buildEnsureEntryResult([]),
|
|
140
140
|
updated: now,
|
|
@@ -150,7 +150,7 @@ export async function ensureAppSettings(vctx, req, userId) {
|
|
|
150
150
|
userId: record.UserSlugBindings.userId,
|
|
151
151
|
appSlug: req.appSlug,
|
|
152
152
|
ledger: record.AppSlugBindings.ledger,
|
|
153
|
-
|
|
153
|
+
ownerHandle: req.ownerHandle,
|
|
154
154
|
tenant: record.UserSlugBindings.tenant,
|
|
155
155
|
settings: buildEnsureEntryResult(settings || []),
|
|
156
156
|
updated: record.AppSettings?.updated ?? now,
|
|
@@ -162,7 +162,7 @@ export async function ensureAppSettings(vctx, req, userId) {
|
|
|
162
162
|
updated: now,
|
|
163
163
|
created: now,
|
|
164
164
|
userId: record.UserSlugBindings.userId,
|
|
165
|
-
|
|
165
|
+
ownerHandle: record.UserSlugBindings.handle,
|
|
166
166
|
appSlug: record.AppSlugBindings.appSlug,
|
|
167
167
|
};
|
|
168
168
|
const { filtered: settings, warning: settingsWarning2 } = parseArrayWarning(record.AppSettings.settings || [], ActiveEntry);
|
|
@@ -174,7 +174,7 @@ export async function ensureAppSettings(vctx, req, userId) {
|
|
|
174
174
|
userId,
|
|
175
175
|
appSlug: req.appSlug,
|
|
176
176
|
ledger: record.AppSlugBindings.ledger,
|
|
177
|
-
|
|
177
|
+
ownerHandle: req.ownerHandle,
|
|
178
178
|
tenant: record.UserSlugBindings.tenant,
|
|
179
179
|
error: undefined,
|
|
180
180
|
settings: buildEnsureEntryResult(settings),
|
|
@@ -200,7 +200,7 @@ export async function ensureAppSettings(vctx, req, userId) {
|
|
|
200
200
|
const drained = await approveAllPendingRequests(vctx, {
|
|
201
201
|
userId: res.userId,
|
|
202
202
|
appSlug: res.appSlug,
|
|
203
|
-
|
|
203
|
+
ownerHandle: res.ownerHandle,
|
|
204
204
|
}, nextAutoAcceptRole);
|
|
205
205
|
if (drained.isErr()) {
|
|
206
206
|
res.error = drained.Err().message;
|
|
@@ -220,12 +220,12 @@ export async function ensureAppSettings(vctx, req, userId) {
|
|
|
220
220
|
description: req.iconDescription,
|
|
221
221
|
}));
|
|
222
222
|
if (!res.error) {
|
|
223
|
-
await postIconGen(vctx, {
|
|
223
|
+
await postIconGen(vctx, { ownerHandle: res.ownerHandle, appSlug: res.appSlug, force: false });
|
|
224
224
|
}
|
|
225
225
|
break;
|
|
226
226
|
case isReqEnsureAppSettingsIconRegen(req):
|
|
227
227
|
if (!recentlyRegenerated(settings)) {
|
|
228
|
-
await postIconGen(vctx, {
|
|
228
|
+
await postIconGen(vctx, { ownerHandle: res.ownerHandle, appSlug: res.appSlug, force: true });
|
|
229
229
|
}
|
|
230
230
|
break;
|
|
231
231
|
case isReqEnsureAppSettingsSkills(req):
|
|
@@ -336,13 +336,13 @@ async function sqlUpdateSettings(vctx, res, settings) {
|
|
|
336
336
|
.values({
|
|
337
337
|
userId: res.userId,
|
|
338
338
|
appSlug: res.appSlug,
|
|
339
|
-
|
|
339
|
+
ownerHandle: res.ownerHandle,
|
|
340
340
|
settings,
|
|
341
341
|
updated: now,
|
|
342
342
|
created: res.created,
|
|
343
343
|
})
|
|
344
344
|
.onConflictDoUpdate({
|
|
345
|
-
target: [vctx.sql.tables.appSettings.userId, vctx.sql.tables.appSettings.
|
|
345
|
+
target: [vctx.sql.tables.appSettings.userId, vctx.sql.tables.appSettings.ownerHandle, vctx.sql.tables.appSettings.appSlug],
|
|
346
346
|
set: {
|
|
347
347
|
settings: res.settings.entries,
|
|
348
348
|
updated: now,
|
|
@@ -351,7 +351,7 @@ async function sqlUpdateSettings(vctx, res, settings) {
|
|
|
351
351
|
await vctx.postQueue({
|
|
352
352
|
payload: {
|
|
353
353
|
type: "vibes.diy.evt-app-setting",
|
|
354
|
-
|
|
354
|
+
ownerHandle: res.ownerHandle,
|
|
355
355
|
appSlug: res.appSlug,
|
|
356
356
|
settings,
|
|
357
357
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-app-settings.js","sourceRoot":"","sources":["../../jsr/public/ensure-app-settings.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ensure-app-settings.js","sourceRoot":"","sources":["../../jsr/public/ensure-app-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ export async function ensureAppSlugItem(vctx, req, opts) {
|
|
|
30
30
|
claims: req._auth.verifiedAuth.claims,
|
|
31
31
|
userId: req._auth.verifiedAuth.claims.userId,
|
|
32
32
|
appSlug: req.appSlug,
|
|
33
|
-
|
|
33
|
+
ownerHandle: req.ownerHandle,
|
|
34
34
|
});
|
|
35
35
|
if (rAppSlugBinding.isErr()) {
|
|
36
36
|
return Result.Err(rAppSlugBinding);
|
|
@@ -77,7 +77,7 @@ export async function ensureAppSlugItem(vctx, req, opts) {
|
|
|
77
77
|
const entryPointUrl = calcEntryPointUrl({
|
|
78
78
|
...vctx.params.vibes.svc,
|
|
79
79
|
bindings: {
|
|
80
|
-
|
|
80
|
+
ownerHandle: ensured.ownerHandle,
|
|
81
81
|
appSlug: ensured.appSlug,
|
|
82
82
|
fsId: ensured.fsId,
|
|
83
83
|
},
|
|
@@ -86,7 +86,7 @@ export async function ensureAppSlugItem(vctx, req, opts) {
|
|
|
86
86
|
await vctx.postQueue({
|
|
87
87
|
payload: {
|
|
88
88
|
type: "vibes.diy.evt-new-fs-id",
|
|
89
|
-
|
|
89
|
+
ownerHandle: ensured.ownerHandle,
|
|
90
90
|
appSlug: ensured.appSlug,
|
|
91
91
|
fsId: ensured.fsId,
|
|
92
92
|
vibeUrl: entryPointUrl,
|
|
@@ -103,30 +103,30 @@ export async function ensureAppSlugItem(vctx, req, opts) {
|
|
|
103
103
|
if (metadataPrompt) {
|
|
104
104
|
const rMetadata = await ensureAppMetadata(vctx, {
|
|
105
105
|
userId: req._auth.verifiedAuth.claims.userId,
|
|
106
|
-
|
|
106
|
+
ownerHandle: ensured.ownerHandle,
|
|
107
107
|
appSlug: ensured.appSlug,
|
|
108
108
|
prompt: metadataPrompt,
|
|
109
109
|
src: "ensureAppSlugItem",
|
|
110
110
|
});
|
|
111
111
|
if (rMetadata.isErr()) {
|
|
112
|
-
console.warn(`ensureAppSlugItem: ensureAppMetadata failed for ${ensured.
|
|
112
|
+
console.warn(`ensureAppSlugItem: ensureAppMetadata failed for ${ensured.ownerHandle}/${ensured.appSlug}:`, rMetadata.Err());
|
|
113
113
|
}
|
|
114
114
|
}
|
|
115
115
|
const rSeed = await ensurePushSeededChat(vctx, {
|
|
116
116
|
userId: req._auth.verifiedAuth.claims.userId,
|
|
117
|
-
|
|
117
|
+
ownerHandle: ensured.ownerHandle,
|
|
118
118
|
appSlug: ensured.appSlug,
|
|
119
119
|
fsId: ensured.fsId,
|
|
120
120
|
mode: req.mode,
|
|
121
121
|
fileSystem: req.fileSystem,
|
|
122
122
|
});
|
|
123
123
|
if (rSeed.isErr()) {
|
|
124
|
-
console.warn(`ensureAppSlugItem: ensurePushSeededChat failed for ${ensured.
|
|
124
|
+
console.warn(`ensureAppSlugItem: ensurePushSeededChat failed for ${ensured.ownerHandle}/${ensured.appSlug}:`, rSeed.Err());
|
|
125
125
|
}
|
|
126
126
|
return Result.Ok({
|
|
127
127
|
type: "vibes.diy.res-ensure-app-slug",
|
|
128
128
|
appSlug: ensured.appSlug,
|
|
129
|
-
|
|
129
|
+
ownerHandle: ensured.ownerHandle,
|
|
130
130
|
mode: req.mode,
|
|
131
131
|
fsId: ensured.fsId,
|
|
132
132
|
env: req.env ?? {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-app-slug-item.js","sourceRoot":"","sources":["../../jsr/public/ensure-app-slug-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,MAAM,EAGN,YAAY,EACZ,iBAAiB,EACjB,QAAQ,GACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,uBAAuB,EACvB,oBAAoB,EACpB,eAAe,EAEf,gBAAgB,GASjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,aAAa,IAAI,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEvE,OAAO,EAAE,SAAS,IAAI,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAM5D,SAAS,0BAA0B,CAAC,UAA+B;IACjE,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACnD,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAC;IACjC,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxE,OAAO,gDAAgD,SAAS,CAAC,QAAQ,OAAO,SAAS,EAAE,CAAC;AAC9F,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,IAAoB,EACpB,GAA0C,EAC1C,IAA+B;IAG/B,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IACxE,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,MAAM,CAAC,EAAE,CAAC;YACf,IAAI,EAAE,qBAAqB;YAC3B,KAAK,EAAE;gBACL,OAAO,EAAE,6FAA6F;gBACtG,IAAI,EAAE,kBAAkB;aACzB;SACgC,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,eAAe,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE;QACpD,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM;QACrC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM;QAC5C,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,
|
|
1
|
+
{"version":3,"file":"ensure-app-slug-item.js","sourceRoot":"","sources":["../../jsr/public/ensure-app-slug-item.ts"],"names":[],"mappings":"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"}
|
package/public/files-asset.d.ts
CHANGED
package/public/files-asset.js
CHANGED
|
@@ -50,7 +50,7 @@ export const filesAsset = {
|
|
|
50
50
|
if (!pathMatch)
|
|
51
51
|
return Promise.resolve(Result.Ok(Option.None()));
|
|
52
52
|
return Promise.resolve(Result.Ok(Option.Some({
|
|
53
|
-
|
|
53
|
+
ownerHandle: decodeURIComponent(pathMatch[1]).toLowerCase(),
|
|
54
54
|
appSlug: decodeURIComponent(pathMatch[2]).toLowerCase(),
|
|
55
55
|
dbName: decodeURIComponent(pathMatch[3]),
|
|
56
56
|
docId: decodeURIComponent(pathMatch[4]),
|
|
@@ -62,7 +62,7 @@ export const filesAsset = {
|
|
|
62
62
|
},
|
|
63
63
|
handle: async (ctx) => {
|
|
64
64
|
const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
|
|
65
|
-
const {
|
|
65
|
+
const { ownerHandle, appSlug, dbName, docId, key, cookie, ifNoneMatch, origin } = ctx.validated;
|
|
66
66
|
const corsHeaders = credentialedCors(origin);
|
|
67
67
|
let userId;
|
|
68
68
|
if (cookie) {
|
|
@@ -71,8 +71,8 @@ export const filesAsset = {
|
|
|
71
71
|
userId = rVerified.Ok().userId;
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
|
-
const access = userId ? await checkDocAccess(vctx, userId, appSlug,
|
|
75
|
-
const rAcl = await resolveDbAcl(vctx,
|
|
74
|
+
const access = userId ? await checkDocAccess(vctx, userId, appSlug, ownerHandle) : "none";
|
|
75
|
+
const rAcl = await resolveDbAcl(vctx, ownerHandle, appSlug, dbName);
|
|
76
76
|
if (rAcl.isErr()) {
|
|
77
77
|
return sendErr(ctx, 403, "Access denied");
|
|
78
78
|
}
|
|
@@ -86,7 +86,7 @@ export const filesAsset = {
|
|
|
86
86
|
allowed = true;
|
|
87
87
|
}
|
|
88
88
|
else {
|
|
89
|
-
isPublic = await isPublicReadable(vctx, appSlug,
|
|
89
|
+
isPublic = await isPublicReadable(vctx, appSlug, ownerHandle);
|
|
90
90
|
allowed = isPublic;
|
|
91
91
|
}
|
|
92
92
|
if (!allowed) {
|
|
@@ -96,7 +96,7 @@ export const filesAsset = {
|
|
|
96
96
|
const rRow = await exception2Result(() => vctx.sql.db
|
|
97
97
|
.select()
|
|
98
98
|
.from(t)
|
|
99
|
-
.where(and(eq(t.
|
|
99
|
+
.where(and(eq(t.ownerHandle, ownerHandle), eq(t.appSlug, appSlug), eq(t.dbName, dbName), eq(t.docId, docId)))
|
|
100
100
|
.orderBy(desc(t.seq))
|
|
101
101
|
.limit(1)
|
|
102
102
|
.then((r) => r[0]));
|
|
@@ -117,7 +117,7 @@ export const filesAsset = {
|
|
|
117
117
|
const rUpload = await exception2Result(() => vctx.sql.db
|
|
118
118
|
.select({
|
|
119
119
|
assetURI: uploadsT.assetURI,
|
|
120
|
-
|
|
120
|
+
ownerHandle: uploadsT.ownerHandle,
|
|
121
121
|
appSlug: uploadsT.appSlug,
|
|
122
122
|
mimeType: uploadsT.mimeType,
|
|
123
123
|
cid: uploadsT.cid,
|
|
@@ -133,7 +133,7 @@ export const filesAsset = {
|
|
|
133
133
|
if (!upload) {
|
|
134
134
|
return sendErr(ctx, 404, `Upload ${meta.uploadId} not found`);
|
|
135
135
|
}
|
|
136
|
-
if (upload.
|
|
136
|
+
if (upload.ownerHandle !== ownerHandle || upload.appSlug !== appSlug) {
|
|
137
137
|
return sendErr(ctx, 403, "Access denied");
|
|
138
138
|
}
|
|
139
139
|
const etag = quoteEtag(upload.cid);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files-asset.js","sourceRoot":"","sources":["../../jsr/public/files-asset.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"files-asset.js","sourceRoot":"","sources":["../../jsr/public/files-asset.ts"],"names":[],"mappings":"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"}
|
package/public/files-url-mint.js
CHANGED
|
@@ -6,13 +6,13 @@ export function isFileMeta(v) {
|
|
|
6
6
|
return typeof m.uploadId === "string" && typeof m.type === "string" && typeof m.size === "number";
|
|
7
7
|
}
|
|
8
8
|
export function buildFileUrl(ctx, key, uploadId) {
|
|
9
|
-
const { svc,
|
|
9
|
+
const { svc, ownerHandle, appSlug, dbName, docId } = ctx;
|
|
10
10
|
const hostname = `assets.${svc.hostnameBase.replace(/^\./, "")}`;
|
|
11
11
|
const buri = BuildURI.from(`http://template`).protocol(svc.protocol).hostname(hostname);
|
|
12
12
|
if (svc.port && svc.port !== "80" && svc.port !== "443") {
|
|
13
13
|
buri.port(svc.port);
|
|
14
14
|
}
|
|
15
|
-
buri.pathname(`/_files/${encodeURIComponent(
|
|
15
|
+
buri.pathname(`/_files/${encodeURIComponent(ownerHandle)}/${encodeURIComponent(appSlug)}/${encodeURIComponent(dbName)}/${encodeURIComponent(docId)}/${encodeURIComponent(key)}`);
|
|
16
16
|
buri.setParam("v", uploadId);
|
|
17
17
|
return buri.toString();
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files-url-mint.js","sourceRoot":"","sources":["../../jsr/public/files-url-mint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAoC3C,MAAM,UAAU,UAAU,CAAC,CAAU;IACnC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,CAAC,GAAG,CAA4B,CAAC;IACvC,OAAO,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;AACpG,CAAC;AASD,MAAM,UAAU,YAAY,CAAC,GAAoB,EAAE,GAAW,EAAE,QAAgB;IAC9E,MAAM,EAAE,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"files-url-mint.js","sourceRoot":"","sources":["../../jsr/public/files-url-mint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAoC3C,MAAM,UAAU,UAAU,CAAC,CAAU;IACnC,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,CAAC,GAAG,CAA4B,CAAC;IACvC,OAAO,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;AACpG,CAAC;AASD,MAAM,UAAU,YAAY,CAAC,GAAoB,EAAE,GAAW,EAAE,QAAgB;IAC9E,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC;IACzD,MAAM,QAAQ,GAAG,UAAU,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC;IACjE,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACxF,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,GAAG,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IACD,IAAI,CAAC,QAAQ,CACX,WAAW,kBAAkB,CAAC,WAAW,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,IAAI,kBAAkB,CAAC,KAAK,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAClK,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC7B,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC;AAMD,MAAM,UAAU,aAAa,CAAoC,GAAM,EAAE,GAAoB;IAC3F,MAAM,KAAK,GAAG,GAAG,CAAC,MAA6C,CAAC;IAChE,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,GAAG,CAAC;IACpD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC;IAElC,MAAM,IAAI,GAAuC,EAAE,CAAC;IACpD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AAClC,CAAC"}
|