@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,7 +3,7 @@ import { type VibeFile } from "@vibes.diy/api-types";
|
|
|
3
3
|
import type { VibesApiSQLCtx } from "../types.js";
|
|
4
4
|
export interface EnsurePushSeededChatOpts {
|
|
5
5
|
readonly userId: string;
|
|
6
|
-
readonly
|
|
6
|
+
readonly ownerHandle: string;
|
|
7
7
|
readonly appSlug: string;
|
|
8
8
|
readonly fsId?: string;
|
|
9
9
|
readonly mode: "dev" | "production";
|
|
@@ -26,7 +26,7 @@ export async function ensurePushSeededChat(vctx, opts) {
|
|
|
26
26
|
const rExisting = await exception2Result(() => vctx.sql.db
|
|
27
27
|
.select({ chatId: vctx.sql.tables.chatContexts.chatId })
|
|
28
28
|
.from(vctx.sql.tables.chatContexts)
|
|
29
|
-
.where(and(eq(vctx.sql.tables.chatContexts.userId, opts.userId), eq(vctx.sql.tables.chatContexts.
|
|
29
|
+
.where(and(eq(vctx.sql.tables.chatContexts.userId, opts.userId), eq(vctx.sql.tables.chatContexts.ownerHandle, opts.ownerHandle), eq(vctx.sql.tables.chatContexts.appSlug, opts.appSlug)))
|
|
30
30
|
.limit(1));
|
|
31
31
|
if (rExisting.isErr())
|
|
32
32
|
return Result.Err(`Failed to look up chatContexts: ${rExisting.Err().message}`);
|
|
@@ -67,7 +67,7 @@ export async function ensurePushSeededChat(vctx, opts) {
|
|
|
67
67
|
chatId,
|
|
68
68
|
userId: opts.userId,
|
|
69
69
|
appSlug: opts.appSlug,
|
|
70
|
-
|
|
70
|
+
ownerHandle: opts.ownerHandle,
|
|
71
71
|
created: now.toISOString(),
|
|
72
72
|
}));
|
|
73
73
|
if (rCtx.isErr())
|
|
@@ -76,7 +76,7 @@ export async function ensurePushSeededChat(vctx, opts) {
|
|
|
76
76
|
if (opts.fsId) {
|
|
77
77
|
const fsRef = {
|
|
78
78
|
appSlug: opts.appSlug,
|
|
79
|
-
|
|
79
|
+
ownerHandle: opts.ownerHandle,
|
|
80
80
|
mode: opts.mode,
|
|
81
81
|
fsId: opts.fsId,
|
|
82
82
|
};
|
|
@@ -113,7 +113,7 @@ export async function ensurePushSeededChat(vctx, opts) {
|
|
|
113
113
|
? {
|
|
114
114
|
fsRef: {
|
|
115
115
|
appSlug: opts.appSlug,
|
|
116
|
-
|
|
116
|
+
ownerHandle: opts.ownerHandle,
|
|
117
117
|
mode: opts.mode,
|
|
118
118
|
fsId: opts.fsId,
|
|
119
119
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-push-seeded-chat.js","sourceRoot":"","sources":["../../jsr/intern/ensure-push-seeded-chat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAiB,MAAM,sBAAsB,CAAC;AAGtE,OAAO,EAAE,eAAe,EAAiB,MAAM,wBAAwB,CAAC;AAOxE,SAAS,eAAe,CAAC,QAAgB;IACvC,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,GAAG,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1B,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAClD,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,KAAK;QAAE,OAAO,GAAG,CAAC;IAC/C,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,GAAG,CAAC;IAC7C,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,GAAG,CAAC;IAClF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,UAAU,CAAC,IAAc;IAChC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC7C,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IACvD,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;AAC9F,CAAC;AAwDD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,IAAoB,EACpB,IAA8B;IAE9B,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CAC5C,IAAI,CAAC,GAAG,CAAC,EAAE;SACR,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;SACvD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;SAClC,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EACpD,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"ensure-push-seeded-chat.js","sourceRoot":"","sources":["../../jsr/intern/ensure-push-seeded-chat.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { Result } from "@adviser/cement";
|
|
2
|
-
import { AppSlugBinding,
|
|
2
|
+
import { AppSlugBinding, AppHandleBinding, HandleBinding, VibesApiSQLCtx } from "../types.js";
|
|
3
3
|
import { AppSlugOptUserSlug, AppSlugUserSlug, ClerkClaim, NeedOneAppSlugUserSlug, OptAppSlugOptUserSlug, OptAppSlugUserSlug } from "@vibes.diy/api-types";
|
|
4
4
|
export type AppSlugBindingParam = Partial<NeedOneAppSlugUserSlug> & {
|
|
5
5
|
userId: string;
|
|
6
6
|
claims: ClerkClaim;
|
|
7
7
|
};
|
|
8
|
-
export declare function
|
|
8
|
+
export declare function writeHandleBinding(ctx: VibesApiSQLCtx, userId: string, ownerHandle: string): Promise<Result<HandleBinding>>;
|
|
9
9
|
export declare function ensureUserSlug(ctx: VibesApiSQLCtx, claims: ClerkClaim, binding: (OptAppSlugOptUserSlug | OptAppSlugUserSlug | AppSlugOptUserSlug | AppSlugUserSlug) & {
|
|
10
10
|
userId: string;
|
|
11
|
-
}): Promise<Result<
|
|
12
|
-
export declare function writeAppSlugBinding(ctx: VibesApiSQLCtx, userId: string,
|
|
11
|
+
}): Promise<Result<HandleBinding>>;
|
|
12
|
+
export declare function writeAppSlugBinding(ctx: VibesApiSQLCtx, userId: string, ownerHandle: string, appSlug: string): Promise<Result<AppSlugBinding>>;
|
|
13
13
|
export declare function ensureAppSlug(ctx: VibesApiSQLCtx, binding: (OptAppSlugUserSlug | AppSlugUserSlug) & {
|
|
14
14
|
userId: string;
|
|
15
15
|
preferredPairs?: {
|
|
@@ -19,7 +19,7 @@ export declare function ensureAppSlug(ctx: VibesApiSQLCtx, binding: (OptAppSlugU
|
|
|
19
19
|
}): Promise<Result<AppSlugBinding & {
|
|
20
20
|
chosenTitle?: string;
|
|
21
21
|
}>>;
|
|
22
|
-
export declare function getDefaultUserSlug(ctx: VibesApiSQLCtx, userId: string): Promise<Result<
|
|
23
|
-
export declare function persistDefaultUserSlug(ctx: VibesApiSQLCtx, userId: string,
|
|
24
|
-
export declare function ensureSlugBinding(ctx: VibesApiSQLCtx, binding: AppSlugBindingParam): Promise<Result<
|
|
22
|
+
export declare function getDefaultUserSlug(ctx: VibesApiSQLCtx, userId: string): Promise<Result<HandleBinding | undefined>>;
|
|
23
|
+
export declare function persistDefaultUserSlug(ctx: VibesApiSQLCtx, userId: string, ownerHandle: string): Promise<void>;
|
|
24
|
+
export declare function ensureSlugBinding(ctx: VibesApiSQLCtx, binding: AppSlugBindingParam): Promise<Result<AppHandleBinding>>;
|
|
25
25
|
export declare function toRFC2822_32ByteLength(slug: string): string;
|
|
@@ -2,54 +2,54 @@ import { exception2Result, Result } from "@adviser/cement";
|
|
|
2
2
|
import { generate } from "random-words";
|
|
3
3
|
import { and, eq } from "drizzle-orm/sql/expressions";
|
|
4
4
|
import { sql } from "drizzle-orm/sql";
|
|
5
|
-
import {
|
|
5
|
+
import { isUserSettingDefaultHandle, userSettingItem, parseArrayWarning, } from "@vibes.diy/api-types";
|
|
6
6
|
import { ensureLogger } from "@fireproof/core-runtime";
|
|
7
|
-
export async function
|
|
7
|
+
export async function writeHandleBinding(ctx, userId, ownerHandle) {
|
|
8
8
|
return exception2Result(async () => {
|
|
9
9
|
const existing = await ctx.sql.db
|
|
10
10
|
.select()
|
|
11
|
-
.from(ctx.sql.tables.
|
|
12
|
-
.where(eq(ctx.sql.tables.
|
|
13
|
-
const owned = existing.find((e) => e.
|
|
11
|
+
.from(ctx.sql.tables.handleBinding)
|
|
12
|
+
.where(eq(ctx.sql.tables.handleBinding.userId, userId));
|
|
13
|
+
const owned = existing.find((e) => e.handle === ownerHandle);
|
|
14
14
|
if (owned) {
|
|
15
15
|
return Result.Ok({
|
|
16
16
|
type: "vibes.diy-user-slug-binding",
|
|
17
17
|
userId,
|
|
18
|
-
|
|
18
|
+
ownerHandle: owned.handle,
|
|
19
19
|
tenant: owned.tenant,
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
22
|
if (existing.length >= ctx.params.maxUserSlugPerUserId) {
|
|
23
|
-
return Result.Err("maximum
|
|
23
|
+
return Result.Err("maximum ownerHandle bindings reached for this userId");
|
|
24
24
|
}
|
|
25
25
|
const tenant = ctx.sthis.nextId(12).str;
|
|
26
26
|
await ctx.sql.db
|
|
27
|
-
.insert(ctx.sql.tables.
|
|
27
|
+
.insert(ctx.sql.tables.handleBinding)
|
|
28
28
|
.values({
|
|
29
29
|
userId,
|
|
30
30
|
tenant,
|
|
31
|
-
|
|
31
|
+
handle: ownerHandle,
|
|
32
32
|
created: new Date().toISOString(),
|
|
33
33
|
})
|
|
34
34
|
.onConflictDoNothing();
|
|
35
35
|
const owner = await ctx.sql.db
|
|
36
36
|
.select()
|
|
37
|
-
.from(ctx.sql.tables.
|
|
38
|
-
.where(eq(ctx.sql.tables.
|
|
37
|
+
.from(ctx.sql.tables.handleBinding)
|
|
38
|
+
.where(eq(ctx.sql.tables.handleBinding.handle, ownerHandle))
|
|
39
39
|
.limit(1)
|
|
40
40
|
.then((r) => r[0]);
|
|
41
41
|
if (!owner || owner.userId !== userId) {
|
|
42
|
-
return Result.Err(`
|
|
42
|
+
return Result.Err(`ownerHandle "${ownerHandle}" is owned by another user`);
|
|
43
43
|
}
|
|
44
44
|
return Result.Ok({
|
|
45
45
|
type: "vibes.diy-user-slug-binding",
|
|
46
46
|
userId,
|
|
47
|
-
|
|
47
|
+
ownerHandle,
|
|
48
48
|
tenant: owner.tenant,
|
|
49
49
|
});
|
|
50
50
|
});
|
|
51
51
|
}
|
|
52
|
-
function
|
|
52
|
+
function ownerHandleFromClaims(claims) {
|
|
53
53
|
const result = [];
|
|
54
54
|
if (claims.params.nick) {
|
|
55
55
|
result.push(claims.params.nick);
|
|
@@ -73,27 +73,27 @@ function userSlugFromClaims(claims) {
|
|
|
73
73
|
}
|
|
74
74
|
export async function ensureUserSlug(ctx, claims, binding) {
|
|
75
75
|
return exception2Result(async () => {
|
|
76
|
-
if (!binding.
|
|
76
|
+
if (!binding.ownerHandle) {
|
|
77
77
|
const existingForUser = await ctx.sql.db
|
|
78
78
|
.select()
|
|
79
|
-
.from(ctx.sql.tables.
|
|
80
|
-
.where(eq(ctx.sql.tables.
|
|
79
|
+
.from(ctx.sql.tables.handleBinding)
|
|
80
|
+
.where(eq(ctx.sql.tables.handleBinding.userId, binding.userId));
|
|
81
81
|
if (existingForUser.length >= ctx.params.maxUserSlugPerUserId) {
|
|
82
|
-
return Result.Err("maximum
|
|
82
|
+
return Result.Err("maximum ownerHandle bindings reached for this userId");
|
|
83
83
|
}
|
|
84
|
-
const
|
|
85
|
-
...
|
|
84
|
+
const ownerHandleCandidates = [
|
|
85
|
+
...ownerHandleFromClaims(claims),
|
|
86
86
|
...new Array(5).fill(0).map(() => generate({ exactly: 1, wordsPerString: 3, separator: "-" })[0]),
|
|
87
87
|
];
|
|
88
|
-
for (const tryUserSlug of
|
|
88
|
+
for (const tryUserSlug of ownerHandleCandidates) {
|
|
89
89
|
const sanitizedUserSlug = toRFC2822_32ByteLength(tryUserSlug);
|
|
90
90
|
if (!sanitizedUserSlug) {
|
|
91
91
|
continue;
|
|
92
92
|
}
|
|
93
93
|
const existing = await ctx.sql.db
|
|
94
94
|
.select()
|
|
95
|
-
.from(ctx.sql.tables.
|
|
96
|
-
.where(eq(ctx.sql.tables.
|
|
95
|
+
.from(ctx.sql.tables.handleBinding)
|
|
96
|
+
.where(eq(ctx.sql.tables.handleBinding.handle, sanitizedUserSlug))
|
|
97
97
|
.limit(1)
|
|
98
98
|
.then((r) => r[0]);
|
|
99
99
|
if (existing) {
|
|
@@ -101,43 +101,43 @@ export async function ensureUserSlug(ctx, claims, binding) {
|
|
|
101
101
|
return Result.Ok({
|
|
102
102
|
type: "vibes.diy-user-slug-binding",
|
|
103
103
|
userId: binding.userId,
|
|
104
|
-
|
|
104
|
+
ownerHandle: existing.handle,
|
|
105
105
|
tenant: existing.tenant,
|
|
106
106
|
});
|
|
107
107
|
}
|
|
108
108
|
continue;
|
|
109
109
|
}
|
|
110
|
-
const rWrite = await
|
|
110
|
+
const rWrite = await writeHandleBinding(ctx, binding.userId, sanitizedUserSlug);
|
|
111
111
|
if (rWrite.isOk())
|
|
112
112
|
return rWrite;
|
|
113
113
|
}
|
|
114
|
-
return Result.Err("could not generate unique
|
|
114
|
+
return Result.Err("could not generate unique ownerHandle after attempts");
|
|
115
115
|
}
|
|
116
|
-
const sanitizedUserSlug = toRFC2822_32ByteLength(binding.
|
|
116
|
+
const sanitizedUserSlug = toRFC2822_32ByteLength(binding.ownerHandle);
|
|
117
117
|
const existing = await ctx.sql.db
|
|
118
118
|
.select()
|
|
119
|
-
.from(ctx.sql.tables.
|
|
120
|
-
.where(and(eq(ctx.sql.tables.
|
|
119
|
+
.from(ctx.sql.tables.handleBinding)
|
|
120
|
+
.where(and(eq(ctx.sql.tables.handleBinding.userId, binding.userId), eq(ctx.sql.tables.handleBinding.handle, sanitizedUserSlug)))
|
|
121
121
|
.limit(1)
|
|
122
122
|
.then((r) => r[0]);
|
|
123
123
|
if (!existing) {
|
|
124
|
-
return
|
|
124
|
+
return writeHandleBinding(ctx, binding.userId, sanitizedUserSlug);
|
|
125
125
|
}
|
|
126
126
|
return Result.Ok({
|
|
127
127
|
type: "vibes.diy-user-slug-binding",
|
|
128
128
|
userId: binding.userId,
|
|
129
|
-
|
|
129
|
+
ownerHandle: existing.handle,
|
|
130
130
|
tenant: existing.tenant,
|
|
131
131
|
});
|
|
132
132
|
});
|
|
133
133
|
}
|
|
134
|
-
export async function writeAppSlugBinding(ctx, userId,
|
|
134
|
+
export async function writeAppSlugBinding(ctx, userId, ownerHandle, appSlug) {
|
|
135
135
|
return exception2Result(async () => {
|
|
136
136
|
const [{ count }] = await ctx.sql.db
|
|
137
137
|
.select({ count: sql `count(*)` })
|
|
138
|
-
.from(ctx.sql.tables.
|
|
139
|
-
.innerJoin(ctx.sql.tables.appSlugBinding, eq(ctx.sql.tables.
|
|
140
|
-
.where(eq(ctx.sql.tables.
|
|
138
|
+
.from(ctx.sql.tables.handleBinding)
|
|
139
|
+
.innerJoin(ctx.sql.tables.appSlugBinding, eq(ctx.sql.tables.handleBinding.handle, ctx.sql.tables.appSlugBinding.ownerHandle))
|
|
140
|
+
.where(eq(ctx.sql.tables.handleBinding.userId, userId));
|
|
141
141
|
if (count >= ctx.params.maxAppSlugPerUserId) {
|
|
142
142
|
return Result.Err("maximum appSlug bindings reached for this userId");
|
|
143
143
|
}
|
|
@@ -145,7 +145,7 @@ export async function writeAppSlugBinding(ctx, userId, userSlug, appSlug) {
|
|
|
145
145
|
const now = new Date().toISOString();
|
|
146
146
|
await ctx.sql.db.insert(ctx.sql.tables.appSlugBinding).values({
|
|
147
147
|
appSlug,
|
|
148
|
-
|
|
148
|
+
ownerHandle,
|
|
149
149
|
ledger,
|
|
150
150
|
created: now,
|
|
151
151
|
updated: now,
|
|
@@ -163,9 +163,9 @@ export async function ensureAppSlug(ctx, binding) {
|
|
|
163
163
|
if (!binding.appSlug) {
|
|
164
164
|
const [{ count }] = await ctx.sql.db
|
|
165
165
|
.select({ count: sql `count(*)` })
|
|
166
|
-
.from(ctx.sql.tables.
|
|
167
|
-
.innerJoin(ctx.sql.tables.appSlugBinding, eq(ctx.sql.tables.
|
|
168
|
-
.where(eq(ctx.sql.tables.
|
|
166
|
+
.from(ctx.sql.tables.handleBinding)
|
|
167
|
+
.innerJoin(ctx.sql.tables.appSlugBinding, eq(ctx.sql.tables.handleBinding.handle, ctx.sql.tables.appSlugBinding.ownerHandle))
|
|
168
|
+
.where(eq(ctx.sql.tables.handleBinding.userId, binding.userId));
|
|
169
169
|
if (count >= ctx.params.maxAppSlugPerUserId) {
|
|
170
170
|
return Result.Err("maximum appSlug bindings reached for this userId");
|
|
171
171
|
}
|
|
@@ -196,14 +196,14 @@ export async function ensureAppSlug(ctx, binding) {
|
|
|
196
196
|
attemptErrors.push({ slug: sanitized, reason: "collision" });
|
|
197
197
|
continue;
|
|
198
198
|
}
|
|
199
|
-
const rWrite = await writeAppSlugBinding(ctx, binding.userId, binding.
|
|
199
|
+
const rWrite = await writeAppSlugBinding(ctx, binding.userId, binding.ownerHandle, sanitized);
|
|
200
200
|
if (rWrite.isOk())
|
|
201
201
|
return Result.Ok({ ...rWrite.Ok(), chosenTitle: candidate.title });
|
|
202
202
|
attemptErrors.push({ slug: sanitized, reason: `write-err: ${rWrite.Err().message}` });
|
|
203
203
|
}
|
|
204
204
|
ensureLogger(ctx.sthis, "ensureAppSlug")
|
|
205
205
|
.Error()
|
|
206
|
-
.Any({ userId: binding.userId,
|
|
206
|
+
.Any({ userId: binding.userId, ownerHandle: binding.ownerHandle, attempts: attemptErrors })
|
|
207
207
|
.Msg("all candidates failed");
|
|
208
208
|
return Result.Err("could not generate unique appSlug after attempts");
|
|
209
209
|
}
|
|
@@ -212,12 +212,12 @@ export async function ensureAppSlug(ctx, binding) {
|
|
|
212
212
|
const existing = await ctx.sql.db
|
|
213
213
|
.select()
|
|
214
214
|
.from(ctx.sql.tables.appSlugBinding)
|
|
215
|
-
.innerJoin(ctx.sql.tables.
|
|
216
|
-
.where(and(eq(ctx.sql.tables.appSlugBinding.appSlug, sanitizedAppSlug), eq(ctx.sql.tables.appSlugBinding.
|
|
215
|
+
.innerJoin(ctx.sql.tables.handleBinding, eq(ctx.sql.tables.appSlugBinding.ownerHandle, ctx.sql.tables.handleBinding.handle))
|
|
216
|
+
.where(and(eq(ctx.sql.tables.appSlugBinding.appSlug, sanitizedAppSlug), eq(ctx.sql.tables.appSlugBinding.ownerHandle, binding.ownerHandle)))
|
|
217
217
|
.limit(1)
|
|
218
218
|
.then((r) => r[0]);
|
|
219
219
|
if (!existing) {
|
|
220
|
-
return writeAppSlugBinding(ctx, binding.userId, binding.
|
|
220
|
+
return writeAppSlugBinding(ctx, binding.userId, binding.ownerHandle, sanitizedAppSlug);
|
|
221
221
|
}
|
|
222
222
|
return Result.Ok({
|
|
223
223
|
type: "vibes.diy-app-slug-binding",
|
|
@@ -242,23 +242,23 @@ export async function getDefaultUserSlug(ctx, userId) {
|
|
|
242
242
|
if (parsedWarning.length > 0) {
|
|
243
243
|
ensureLogger(ctx.sthis, "getDefaultUserSlug").Warn().Any({ parseErrors: parsedWarning }).Msg("skip");
|
|
244
244
|
}
|
|
245
|
-
const def = parsedSettings.filter(
|
|
245
|
+
const def = parsedSettings.filter(isUserSettingDefaultHandle)[0];
|
|
246
246
|
if (!def)
|
|
247
247
|
return Result.Ok(undefined);
|
|
248
248
|
const binding = await ctx.sql.db
|
|
249
249
|
.select()
|
|
250
|
-
.from(ctx.sql.tables.
|
|
251
|
-
.where(and(eq(ctx.sql.tables.
|
|
250
|
+
.from(ctx.sql.tables.handleBinding)
|
|
251
|
+
.where(and(eq(ctx.sql.tables.handleBinding.userId, userId), eq(ctx.sql.tables.handleBinding.handle, def.ownerHandle)))
|
|
252
252
|
.limit(1)
|
|
253
253
|
.then((r) => r[0]);
|
|
254
254
|
if (!binding)
|
|
255
255
|
return Result.Ok(undefined);
|
|
256
|
-
return Result.Ok({ type: "vibes.diy-user-slug-binding", userId,
|
|
256
|
+
return Result.Ok({ type: "vibes.diy-user-slug-binding", userId, ownerHandle: binding.handle, tenant: binding.tenant });
|
|
257
257
|
});
|
|
258
258
|
}
|
|
259
|
-
export async function persistDefaultUserSlug(ctx, userId,
|
|
259
|
+
export async function persistDefaultUserSlug(ctx, userId, ownerHandle) {
|
|
260
260
|
const now = new Date().toISOString();
|
|
261
|
-
const newSetting = { type: "
|
|
261
|
+
const newSetting = { type: "defaultHandle", ownerHandle };
|
|
262
262
|
const existing = await ctx.sql.db
|
|
263
263
|
.select()
|
|
264
264
|
.from(ctx.sql.tables.userSettings)
|
|
@@ -273,7 +273,7 @@ export async function persistDefaultUserSlug(ctx, userId, userSlug) {
|
|
|
273
273
|
if (currentWarning.length > 0) {
|
|
274
274
|
ensureLogger(ctx.sthis, "persistDefaultUserSlug").Warn().Any({ parseErrors: currentWarning }).Msg("skip");
|
|
275
275
|
}
|
|
276
|
-
const current = currentParsed.filter((s) => s.type !== "
|
|
276
|
+
const current = currentParsed.filter((s) => s.type !== "defaultHandle");
|
|
277
277
|
await ctx.sql.db
|
|
278
278
|
.update(ctx.sql.tables.userSettings)
|
|
279
279
|
.set({ settings: [...current, newSetting], updated: now })
|
|
@@ -287,14 +287,14 @@ export async function ensureSlugBinding(ctx, binding) {
|
|
|
287
287
|
}
|
|
288
288
|
const rAppSlug = await ensureAppSlug(ctx, {
|
|
289
289
|
...binding,
|
|
290
|
-
|
|
290
|
+
ownerHandle: rUserSlug.Ok().ownerHandle,
|
|
291
291
|
});
|
|
292
292
|
if (rAppSlug.isErr()) {
|
|
293
293
|
return Result.Err(rAppSlug);
|
|
294
294
|
}
|
|
295
295
|
return Result.Ok({
|
|
296
296
|
type: "vibes.diy-app-user-slug-binding",
|
|
297
|
-
|
|
297
|
+
ownerHandle: rUserSlug.Ok(),
|
|
298
298
|
appSlug: rAppSlug.Ok(),
|
|
299
299
|
});
|
|
300
300
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-slug-binding.js","sourceRoot":"","sources":["../../jsr/intern/ensure-slug-binding.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ensure-slug-binding.js","sourceRoot":"","sources":["../../jsr/intern/ensure-slug-binding.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export interface ModelDefaults {
|
|
|
7
7
|
img: AIParams;
|
|
8
8
|
"img-edit"?: AIParams;
|
|
9
9
|
}
|
|
10
|
-
export declare function getModelDefaults(ctx: VibesApiSQLCtx, { appSlug,
|
|
10
|
+
export declare function getModelDefaults(ctx: VibesApiSQLCtx, { appSlug, ownerHandle }: {
|
|
11
11
|
appSlug?: string;
|
|
12
|
-
|
|
12
|
+
ownerHandle?: string;
|
|
13
13
|
}): Promise<Result<ModelDefaults>>;
|
|
@@ -22,16 +22,16 @@ async function loadPreSelectedDefaults(ctx) {
|
|
|
22
22
|
}
|
|
23
23
|
return Result.Ok(defaults);
|
|
24
24
|
}
|
|
25
|
-
export async function getModelDefaults(ctx, { appSlug,
|
|
25
|
+
export async function getModelDefaults(ctx, { appSlug, ownerHandle }) {
|
|
26
26
|
const rDefaults = await loadPreSelectedDefaults(ctx);
|
|
27
27
|
if (rDefaults.isErr())
|
|
28
28
|
return Result.Err(rDefaults);
|
|
29
29
|
const result = { ...rDefaults.Ok() };
|
|
30
|
-
if (
|
|
30
|
+
if (ownerHandle) {
|
|
31
31
|
const rBinding = await exception2Result(() => ctx.sql.db
|
|
32
32
|
.select()
|
|
33
|
-
.from(ctx.sql.tables.
|
|
34
|
-
.where(eq(ctx.sql.tables.
|
|
33
|
+
.from(ctx.sql.tables.handleBinding)
|
|
34
|
+
.where(eq(ctx.sql.tables.handleBinding.handle, ownerHandle))
|
|
35
35
|
.limit(1)
|
|
36
36
|
.then((r) => r[0]));
|
|
37
37
|
if (rBinding.isErr())
|
|
@@ -64,11 +64,11 @@ export async function getModelDefaults(ctx, { appSlug, userSlug }) {
|
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
|
-
if (appSlug &&
|
|
67
|
+
if (appSlug && ownerHandle) {
|
|
68
68
|
const rApp = await exception2Result(() => ctx.sql.db
|
|
69
69
|
.select()
|
|
70
70
|
.from(ctx.sql.tables.appSettings)
|
|
71
|
-
.where(and(eq(ctx.sql.tables.appSettings.appSlug, appSlug), eq(ctx.sql.tables.appSettings.
|
|
71
|
+
.where(and(eq(ctx.sql.tables.appSettings.appSlug, appSlug), eq(ctx.sql.tables.appSettings.ownerHandle, ownerHandle)))
|
|
72
72
|
.limit(1)
|
|
73
73
|
.then((r) => r[0]));
|
|
74
74
|
if (rApp.isErr())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-model-defaults.js","sourceRoot":"","sources":["../../jsr/intern/get-model-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAEL,WAAW,EACX,uBAAuB,EACvB,wBAAwB,EACxB,uBAAuB,EACvB,0BAA0B,EAE1B,eAAe,EACf,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,KAAK,UAAU,uBAAuB,CAAC,GAAmB;IACxD,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,OAAO,CAAC,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC;IAInC,MAAM,cAAc,GAAsB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,EAAuC,CAAC;IACzD,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,KAAK;YAAE,OAAO,MAAM,CAAC,GAAG,CAAC,yCAAyC,KAAK,EAAE,CAAC,CAAC;QAChF,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAqB,CAAC;IACxD,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IACxE,IAAI,OAAO,EAAE,CAAC;QACZ,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAqB,CAAC;IAC/D,CAAC;IACD,OAAO,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;AAC7B,CAAC;AAoBD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,GAAmB,EACnB,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"get-model-defaults.js","sourceRoot":"","sources":["../../jsr/intern/get-model-defaults.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Result } from "@adviser/cement";
|
|
2
|
-
import {
|
|
2
|
+
import { AppHandleBinding, VibesApiSQLCtx } from "../types.js";
|
|
3
3
|
export interface GetSlugBinding {
|
|
4
|
-
|
|
4
|
+
ownerHandle: string;
|
|
5
5
|
appSlug: string;
|
|
6
6
|
}
|
|
7
|
-
export declare function getSlugBinding(ctx: VibesApiSQLCtx, binding: GetSlugBinding): Promise<Result<
|
|
7
|
+
export declare function getSlugBinding(ctx: VibesApiSQLCtx, binding: GetSlugBinding): Promise<Result<AppHandleBinding>>;
|
|
@@ -3,9 +3,9 @@ import { eq, and } from "drizzle-orm/sql/expressions";
|
|
|
3
3
|
export async function getSlugBinding(ctx, binding) {
|
|
4
4
|
const r = await exception2Result(() => ctx.sql.db
|
|
5
5
|
.select()
|
|
6
|
-
.from(ctx.sql.tables.
|
|
7
|
-
.innerJoin(ctx.sql.tables.appSlugBinding, eq(ctx.sql.tables.appSlugBinding.
|
|
8
|
-
.where(and(eq(ctx.sql.tables.
|
|
6
|
+
.from(ctx.sql.tables.handleBinding)
|
|
7
|
+
.innerJoin(ctx.sql.tables.appSlugBinding, eq(ctx.sql.tables.appSlugBinding.ownerHandle, ctx.sql.tables.handleBinding.handle))
|
|
8
|
+
.where(and(eq(ctx.sql.tables.handleBinding.handle, binding.ownerHandle), eq(ctx.sql.tables.appSlugBinding.appSlug, binding.appSlug)))
|
|
9
9
|
.limit(1)
|
|
10
10
|
.then((r) => r[0]));
|
|
11
11
|
if (r.isErr()) {
|
|
@@ -13,14 +13,14 @@ export async function getSlugBinding(ctx, binding) {
|
|
|
13
13
|
}
|
|
14
14
|
const sql = r.Ok();
|
|
15
15
|
if (!sql) {
|
|
16
|
-
return Result.Err(`appSlug/
|
|
16
|
+
return Result.Err(`appSlug/ownerHandle not found ${binding.appSlug}:${binding.ownerHandle} not found`);
|
|
17
17
|
}
|
|
18
18
|
return Result.Ok({
|
|
19
19
|
type: "vibes.diy-app-user-slug-binding",
|
|
20
|
-
|
|
20
|
+
ownerHandle: {
|
|
21
21
|
type: "vibes.diy-user-slug-binding",
|
|
22
22
|
userId: sql.UserSlugBindings.userId,
|
|
23
|
-
|
|
23
|
+
ownerHandle: sql.UserSlugBindings.handle,
|
|
24
24
|
tenant: sql.UserSlugBindings.tenant,
|
|
25
25
|
},
|
|
26
26
|
appSlug: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-slug-binding.js","sourceRoot":"","sources":["../../jsr/intern/get-slug-binding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAQtD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAmB,EAAE,OAAuB;IAC/E,MAAM,CAAC,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CACpC,GAAG,CAAC,GAAG,CAAC,EAAE;SACP,MAAM,EAAE;SACR,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"get-slug-binding.js","sourceRoot":"","sources":["../../jsr/intern/get-slug-binding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,6BAA6B,CAAC;AAQtD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAmB,EAAE,OAAuB;IAC/E,MAAM,CAAC,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CACpC,GAAG,CAAC,GAAG,CAAC,EAAE;SACP,MAAM,EAAE;SACR,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC;SAClC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;SAC5H,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,EAC5D,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAC3D,CACF;SACA,KAAK,CAAC,CAAC,CAAC;SACR,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrB,CAAC;IACF,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QACd,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;IACnB,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,MAAM,CAAC,GAAG,CAAC,iCAAiC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,WAAW,YAAY,CAAC,CAAC;IACzG,CAAC;IACD,OAAO,MAAM,CAAC,EAAE,CAAC;QACf,IAAI,EAAE,iCAAiC;QACvC,WAAW,EAAE;YACX,IAAI,EAAE,6BAA6B;YACnC,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;YACnC,WAAW,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;YACxC,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;SACpC;QACD,OAAO,EAAE;YACP,IAAI,EAAE,4BAA4B;YAClC,MAAM,EAAE,GAAG,CAAC,gBAAgB,CAAC,MAAM;YACnC,OAAO,EAAE,GAAG,CAAC,eAAe,CAAC,OAAO;YACpC,MAAM,EAAE,GAAG,CAAC,eAAe,CAAC,MAAM;SACnC;KAKF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -17,12 +17,12 @@ export function deriveIsWorldReadable(rawSettings) {
|
|
|
17
17
|
}
|
|
18
18
|
export function parseVibePathname(pathname) {
|
|
19
19
|
const parts = pathname.split("/");
|
|
20
|
-
const
|
|
20
|
+
const ownerHandle = parts[2];
|
|
21
21
|
const appSlug = parts[3];
|
|
22
|
-
if (parts[1] !== "vibe" ||
|
|
22
|
+
if (parts[1] !== "vibe" || ownerHandle === undefined || ownerHandle === "" || appSlug === undefined || appSlug === "") {
|
|
23
23
|
return undefined;
|
|
24
24
|
}
|
|
25
|
-
return {
|
|
25
|
+
return { ownerHandle, appSlug };
|
|
26
26
|
}
|
|
27
27
|
export function vibePathnameHasFsId(pathname) {
|
|
28
28
|
const parts = pathname.split("/");
|
|
@@ -36,8 +36,8 @@ export async function getVibeRouteHints(ctx, slugs) {
|
|
|
36
36
|
settings: ctx.sql.tables.appSettings.settings,
|
|
37
37
|
})
|
|
38
38
|
.from(ctx.sql.tables.apps)
|
|
39
|
-
.leftJoin(ctx.sql.tables.appSettings, and(eq(ctx.sql.tables.appSettings.userId, ctx.sql.tables.apps.userId), eq(ctx.sql.tables.appSettings.
|
|
40
|
-
.where(and(eq(ctx.sql.tables.apps.
|
|
39
|
+
.leftJoin(ctx.sql.tables.appSettings, and(eq(ctx.sql.tables.appSettings.userId, ctx.sql.tables.apps.userId), eq(ctx.sql.tables.appSettings.ownerHandle, ctx.sql.tables.apps.ownerHandle), eq(ctx.sql.tables.appSettings.appSlug, ctx.sql.tables.apps.appSlug)))
|
|
40
|
+
.where(and(eq(ctx.sql.tables.apps.ownerHandle, slugs.ownerHandle), eq(ctx.sql.tables.apps.appSlug, slugs.appSlug), eq(ctx.sql.tables.apps.mode, "production")))
|
|
41
41
|
.orderBy(desc(ctx.sql.tables.apps.releaseSeq))
|
|
42
42
|
.limit(1)
|
|
43
43
|
.then((r) => r[0]);
|