@vibes.diy/api-svc 2.0.0-dev-cli-e → 2.0.0-dev-cli-j
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/cf-serve.d.ts +1 -4
- package/cf-serve.js +10 -15
- package/cf-serve.js.map +1 -1
- package/check-auth.js +13 -3
- package/check-auth.js.map +1 -1
- package/create-handler.d.ts +5 -6
- package/create-handler.js +6 -32
- package/create-handler.js.map +1 -1
- package/index.d.ts +0 -1
- package/index.js +0 -1
- package/index.js.map +1 -1
- package/intern/ensure-application-chat-id.js +5 -5
- package/intern/ensure-application-chat-id.js.map +1 -1
- package/intern/ensure-chat-id.js +45 -33
- package/intern/ensure-chat-id.js.map +1 -1
- package/intern/ensure-slug-binding.d.ts +12 -26
- package/intern/ensure-slug-binding.js +125 -29
- package/intern/ensure-slug-binding.js.map +1 -1
- package/intern/get-model-defaults.d.ts +12 -0
- package/intern/get-model-defaults.js +90 -0
- package/intern/get-model-defaults.js.map +1 -0
- package/intern/get-slug-binding.d.ts +2 -3
- package/intern/get-slug-binding.js +13 -4
- package/intern/get-slug-binding.js.map +1 -1
- package/intern/grouped-vibe-import-map.d.ts +2 -0
- package/intern/grouped-vibe-import-map.js +2 -0
- package/intern/grouped-vibe-import-map.js.map +1 -1
- package/intern/render-vibe.d.ts +2 -2
- package/intern/render-vibe.js.map +1 -1
- package/intern/resend-prev-msg.js +5 -13
- package/intern/resend-prev-msg.js.map +1 -1
- package/intern/write-apps.d.ts +4 -5
- package/intern/write-apps.js +27 -18
- package/intern/write-apps.js.map +1 -1
- package/models.json +179 -0
- package/package.json +12 -9
- package/peers/s3.d.ts +1 -1
- package/public/ensure-app-settings.js +39 -12
- package/public/ensure-app-settings.js.map +1 -1
- package/public/ensure-app-slug-item.js +23 -47
- package/public/ensure-app-slug-item.js.map +1 -1
- package/public/ensure-user-settings.js +9 -8
- package/public/ensure-user-settings.js.map +1 -1
- package/public/get-chat-details.js +7 -5
- package/public/get-chat-details.js.map +1 -1
- package/public/invite-flow.js +59 -36
- package/public/invite-flow.js.map +1 -1
- package/public/list-models.d.ts +14 -0
- package/public/list-models.js +41 -0
- package/public/list-models.js.map +1 -0
- package/public/open-chat.js +2 -2
- package/public/open-chat.js.map +1 -1
- package/public/prompt-chat-section.d.ts +1 -1
- package/public/prompt-chat-section.js +40 -15
- package/public/prompt-chat-section.js.map +1 -1
- package/public/request-flow.js +65 -53
- package/public/request-flow.js.map +1 -1
- package/public/user-slug-bindings.d.ts +5 -0
- package/public/user-slug-bindings.js +144 -0
- package/public/user-slug-bindings.js.map +1 -0
- package/types.d.ts +37 -18
- package/types.js +27 -1
- package/types.js.map +1 -1
- package/usage-report/README.md +27 -0
- package/usage-report/inspect-db-report-template.d.ts +29 -0
- package/usage-report/inspect-db-report-template.js +379 -0
- package/usage-report/inspect-db-report-template.js.map +1 -0
- package/usage-report/inspect-db-report.d.ts +1 -0
- package/usage-report/inspect-db-report.js +264 -0
- package/usage-report/inspect-db-report.js.map +1 -0
- package/usage-report/inspect-db.d.ts +1 -0
- package/usage-report/inspect-db.js +226 -0
- package/usage-report/inspect-db.js.map +1 -0
- package/vibes-msg-evento.js +3 -1
- package/vibes-msg-evento.js.map +1 -1
- package/intern/ensure-storage.d.ts +0 -26
- package/intern/ensure-storage.js +0 -86
- package/intern/ensure-storage.js.map +0 -1
- package/intern/send-email.d.ts +0 -4
- package/intern/send-email.js +0 -55
- package/intern/send-email.js.map +0 -1
- package/intern/store-screenshot.d.ts +0 -17
- package/intern/store-screenshot.js +0 -36
- package/intern/store-screenshot.js.map +0 -1
- package/peers/sql.d.ts +0 -22
- package/peers/sql.js +0 -102
- package/peers/sql.js.map +0 -1
- package/sql/tables.d.ts +0 -1536
- package/sql/tables.js +0 -38
- package/sql/tables.js.map +0 -1
- package/sql/vibes-diy-api-schema-pg.d.ts +0 -1418
- package/sql/vibes-diy-api-schema-pg.js +0 -141
- package/sql/vibes-diy-api-schema-pg.js.map +0 -1
- package/sql/vibes-diy-api-schema-sqlite.d.ts +0 -1536
- package/sql/vibes-diy-api-schema-sqlite.js +0 -131
- package/sql/vibes-diy-api-schema-sqlite.js.map +0 -1
package/cf-serve.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Request as CFRequest, Response as CFResponse, ExecutionContext } from "@cloudflare/workers-types";
|
|
2
|
-
import { VibesSqlite } from "./create-handler.js";
|
|
3
2
|
import { WSSendProvider } from "./svc-ws-send-provider.js";
|
|
4
3
|
import { LLMRequest } from "@vibes.diy/call-ai-v2";
|
|
5
4
|
import { AppContext } from "@adviser/cement";
|
|
6
5
|
import { CfCacheIf } from "./types.js";
|
|
7
6
|
import { CFEnv } from "@vibes.diy/api-types";
|
|
8
7
|
import { SuperThis } from "@fireproof/core-types-base";
|
|
8
|
+
import { VibesSqlite } from "@vibes.diy/api-sql";
|
|
9
9
|
export interface CFInjectMutable {
|
|
10
10
|
sthis?: SuperThis;
|
|
11
11
|
appCtx: AppContext;
|
|
@@ -22,9 +22,6 @@ export interface CFInjectMutable {
|
|
|
22
22
|
llmRequest?: (prompt: LLMRequest) => Promise<Response>;
|
|
23
23
|
}
|
|
24
24
|
export type CFInject = Readonly<CFInjectMutable>;
|
|
25
|
-
export declare function cfDrizzle<T extends VibesSqlite>(env: CFEnv, ctxDrizzle?: T): {
|
|
26
|
-
db: T;
|
|
27
|
-
};
|
|
28
25
|
export declare function cfServeAppCtx(request: CFRequest, env: CFEnv, ctx: ExecutionContext & Omit<CFInject, "appCtx">): Promise<{
|
|
29
26
|
appCtx: AppContext;
|
|
30
27
|
vibesCtx: import("./types.js").VibesApiSQLCtx;
|
package/cf-serve.js
CHANGED
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
import { createAppContext, processRequest } from "./create-handler.js";
|
|
2
|
-
import { drizzle as drizzleD1 } from "drizzle-orm/d1";
|
|
3
|
-
import { drizzle as drizzleNeon } from "drizzle-orm/neon-serverless";
|
|
4
|
-
import { Pool } from "@neondatabase/serverless";
|
|
5
2
|
import { WSSendProvider } from "./svc-ws-send-provider.js";
|
|
6
3
|
import { vibesMsgEvento } from "./vibes-msg-evento.js";
|
|
7
4
|
import { Lazy, LoggerImpl, Result } from "@adviser/cement";
|
|
8
5
|
import { ensureSuperThis, hashObjectSync } from "@fireproof/core-runtime";
|
|
9
|
-
import {
|
|
6
|
+
import { cfDrizzle, createVibesApiTables, toDBFlavour } from "@vibes.diy/api-sql";
|
|
10
7
|
function netHashFn({ colo, country, continent, city, postalCode, latitude, longitude, timezone, region, regionCode, metroCode, }) {
|
|
11
8
|
return hashObjectSync({
|
|
12
9
|
colo,
|
|
@@ -22,27 +19,25 @@ function netHashFn({ colo, country, continent, city, postalCode, latitude, longi
|
|
|
22
19
|
metroCode,
|
|
23
20
|
});
|
|
24
21
|
}
|
|
25
|
-
export function cfDrizzle(env, ctxDrizzle) {
|
|
26
|
-
if (ctxDrizzle)
|
|
27
|
-
return { db: ctxDrizzle };
|
|
28
|
-
if (env.DB_FLAVOUR === "pg" && env.NEON_DATABASE_URL) {
|
|
29
|
-
return { db: drizzleNeon(new Pool({ connectionString: env.NEON_DATABASE_URL })) };
|
|
30
|
-
}
|
|
31
|
-
return { db: drizzleD1(env.DB) };
|
|
32
|
-
}
|
|
33
22
|
export async function cfServeAppCtx(request, env, ctx) {
|
|
34
23
|
const netHash = Lazy(() => netHashFn(request.cf));
|
|
35
24
|
const sthis = ctx.sthis ??
|
|
36
25
|
ensureSuperThis({
|
|
37
26
|
logger: new LoggerImpl(),
|
|
38
27
|
});
|
|
39
|
-
|
|
28
|
+
const drizzleDB = cfDrizzle(env, env.DB, ctx.drizzle).db;
|
|
40
29
|
return createAppContext({
|
|
41
30
|
sthis,
|
|
42
|
-
|
|
43
|
-
s3Api: new R2ToS3Api(env.FS_IDS_BUCKET, sthis),
|
|
31
|
+
db: drizzleDB,
|
|
44
32
|
connections: ctx.webSocket?.connections ?? new Set(),
|
|
45
33
|
cache: ctx.cache,
|
|
34
|
+
storageSystems: {
|
|
35
|
+
sql: {
|
|
36
|
+
flavour: toDBFlavour(env.DB_FLAVOUR),
|
|
37
|
+
db: drizzleDB,
|
|
38
|
+
assets: createVibesApiTables(toDBFlavour(env.DB_FLAVOUR)).assets,
|
|
39
|
+
},
|
|
40
|
+
},
|
|
46
41
|
postQueue: async (msg) => {
|
|
47
42
|
await env.VIBES_SERVICE.send(JSON.stringify(msg));
|
|
48
43
|
},
|
package/cf-serve.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cf-serve.js","sourceRoot":"","sources":["../jsr/cf-serve.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,gBAAgB,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"cf-serve.js","sourceRoot":"","sources":["../jsr/cf-serve.ts"],"names":[],"mappings":"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"}
|
package/check-auth.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { Result } from "@adviser/cement";
|
|
1
|
+
import { EventoResult, Result } from "@adviser/cement";
|
|
2
2
|
import { ClerkClaimSchema } from "@fireproof/core-types-base";
|
|
3
|
+
import { wrapMsgBase } from "./unwrap-msg-base.js";
|
|
3
4
|
export async function verifyExtractClaims(ctx, req) {
|
|
4
5
|
const tokenApi = ctx.tokenApi[req.auth.type];
|
|
5
6
|
if (!tokenApi) {
|
|
@@ -72,8 +73,17 @@ export function checkAuth(fn) {
|
|
|
72
73
|
return optAuth((async (ctx) => {
|
|
73
74
|
const payload = ctx.validated.payload;
|
|
74
75
|
if (!payload._auth) {
|
|
75
|
-
|
|
76
|
-
|
|
76
|
+
ctx.send.send(ctx, wrapMsgBase(ctx.validated, {
|
|
77
|
+
tid: ctx.validated.tid,
|
|
78
|
+
payload: {
|
|
79
|
+
type: "vibes.diy.res-error",
|
|
80
|
+
error: {
|
|
81
|
+
message: "Authentication required",
|
|
82
|
+
code: "authentication_required",
|
|
83
|
+
},
|
|
84
|
+
},
|
|
85
|
+
}));
|
|
86
|
+
return Result.Ok(EventoResult.Stop);
|
|
77
87
|
}
|
|
78
88
|
return fn(ctx);
|
|
79
89
|
}));
|
package/check-auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-auth.js","sourceRoot":"","sources":["../jsr/check-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,MAAM,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"check-auth.js","sourceRoot":"","sources":["../jsr/check-auth.ts"],"names":[],"mappings":"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"}
|
package/create-handler.d.ts
CHANGED
|
@@ -1,23 +1,22 @@
|
|
|
1
1
|
import { Result, AppContext, TriggerResult, EventoSendProvider, Logger } from "@adviser/cement";
|
|
2
|
-
import { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core";
|
|
3
|
-
import { ResultSet } from "@libsql/client";
|
|
4
|
-
import type { D1Result } from "@cloudflare/workers-types";
|
|
5
2
|
import { ResolveFunction } from "./npm-package-version.js";
|
|
6
3
|
import { LLMRequest } from "@vibes.diy/call-ai-v2";
|
|
7
4
|
import { WSSendProvider } from "./svc-ws-send-provider.js";
|
|
8
5
|
import { CfCacheIf, VibesApiSQLCtx } from "./types.js";
|
|
9
|
-
import { LLMHeaders, MsgBase
|
|
6
|
+
import { LLMHeaders, MsgBase } from "@vibes.diy/api-types";
|
|
7
|
+
import { CreateSQLPeerParams, VibesSqlite } from "@vibes.diy/api-sql";
|
|
10
8
|
import { SuperThis } from "@fireproof/core-types-base";
|
|
11
|
-
export type VibesSqlite = BaseSQLiteDatabase<"async", ResultSet | D1Result, Record<string, never>>;
|
|
12
9
|
export type BindPromise<T> = (promise: Promise<T>) => Promise<T>;
|
|
13
10
|
export interface CreateHandlerParams<T extends VibesSqlite> {
|
|
14
11
|
db: T;
|
|
15
|
-
s3Api: S3Api;
|
|
16
12
|
sthis: SuperThis;
|
|
17
13
|
logger?: Logger;
|
|
18
14
|
cache: CfCacheIf;
|
|
19
15
|
env: Record<string, string>;
|
|
20
16
|
connections: Set<WSSendProvider>;
|
|
17
|
+
storageSystems: {
|
|
18
|
+
sql: CreateSQLPeerParams;
|
|
19
|
+
};
|
|
21
20
|
postQueue: (msg: MsgBase) => Promise<void>;
|
|
22
21
|
netHash(): string;
|
|
23
22
|
fetchAsset(url: string): Promise<Result<ReadableStream<Uint8Array>>>;
|
package/create-handler.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { param, AppContext } from "@adviser/cement";
|
|
2
2
|
import { ensureLogger } from "@fireproof/core-runtime";
|
|
3
3
|
import { deviceIdCAFromEnv, getCloudPubkeyFromEnv, tokenApi } from "@fireproof/core-protocols-dashboard";
|
|
4
|
-
import { ensureStorage } from "./intern/ensure-storage.js";
|
|
5
4
|
import { defaultFetchPkgVersion } from "./npm-package-version.js";
|
|
6
5
|
import { vibesReqResEvento } from "./vibes-req-res-evento.js";
|
|
7
6
|
import { HTTPSendProvider } from "./svc-http-send-provider.js";
|
|
8
7
|
import { defaultLLMRequest } from "./default-llm-request.js";
|
|
9
|
-
import {
|
|
10
|
-
import { createVibesApiTables } from "
|
|
8
|
+
import { LLMEnforced, LLMHeaders } from "@vibes.diy/api-types";
|
|
9
|
+
import { createSQLPeer, createVibesApiTables } from "@vibes.diy/api-sql";
|
|
10
|
+
import { ensureStorage } from "@vibes.diy/api-pkg";
|
|
11
11
|
export async function createAppContext(params) {
|
|
12
12
|
const { sthis } = params;
|
|
13
13
|
sthis.env.sets(params.env);
|
|
@@ -22,7 +22,7 @@ export async function createAppContext(params) {
|
|
|
22
22
|
DB_FLAVOUR: "sqlite",
|
|
23
23
|
LLM_BACKEND_URL: param.REQUIRED,
|
|
24
24
|
LLM_BACKEND_API_KEY: param.REQUIRED,
|
|
25
|
-
LLM_BACKEND_MODEL: "anthropic/claude-sonnet-4",
|
|
25
|
+
LLM_BACKEND_MODEL: "anthropic/claude-sonnet-4.6",
|
|
26
26
|
WORKSPACE_NPM_URL: param.OPTIONAL,
|
|
27
27
|
PUBLIC_NPM_URL: param.OPTIONAL,
|
|
28
28
|
VIBES_DIY_STYLES_URL: param.OPTIONAL,
|
|
@@ -121,9 +121,6 @@ export async function createAppContext(params) {
|
|
|
121
121
|
},
|
|
122
122
|
},
|
|
123
123
|
llm: {
|
|
124
|
-
default: LLMDefault({
|
|
125
|
-
...(envVals.LLM_BACKEND_MODEL ? { model: envVals.LLM_BACKEND_MODEL } : {}),
|
|
126
|
-
}),
|
|
127
124
|
enforced: LLMEnforced({}),
|
|
128
125
|
headers: LLMHeaders({}),
|
|
129
126
|
},
|
|
@@ -151,36 +148,13 @@ export async function createAppContext(params) {
|
|
|
151
148
|
audience: "sandboxes.vibes.diy",
|
|
152
149
|
validFor: parseInt(envVals.CLOUD_SESSION_TOKEN_VALID_SEC ?? "600", 10) ?? 600,
|
|
153
150
|
},
|
|
154
|
-
sendEmail: async (rm) => {
|
|
155
|
-
const rRes = await exception2Result(() => fetch("https://api.resend.com/emails", {
|
|
156
|
-
method: "POST",
|
|
157
|
-
headers: {
|
|
158
|
-
Authorization: `Bearer ${envVals.RESEND_API_KEY}`,
|
|
159
|
-
"Content-Type": "application/json",
|
|
160
|
-
},
|
|
161
|
-
body: JSON.stringify({
|
|
162
|
-
...rm,
|
|
163
|
-
from: envVals.VIBES_DIY_FROM_EMAIL,
|
|
164
|
-
}),
|
|
165
|
-
}));
|
|
166
|
-
if (rRes.isErr()) {
|
|
167
|
-
return Result.Err(rRes);
|
|
168
|
-
}
|
|
169
|
-
const res = rRes.Ok();
|
|
170
|
-
if (!res.ok) {
|
|
171
|
-
return Result.Err(`Resend got an error: ${res.status}:${res.statusText}`);
|
|
172
|
-
}
|
|
173
|
-
const jsonTxt = await res.text();
|
|
174
|
-
const rJson = exception2Result(() => JSON.parse(jsonTxt));
|
|
175
|
-
return Result.Ok({ result: rJson.isOk() ? rJson.Ok() : jsonTxt });
|
|
176
|
-
},
|
|
177
151
|
postQueue: params.postQueue,
|
|
178
152
|
fetchAsset: params.fetchAsset,
|
|
179
153
|
tokenApi: await tokenApi(sthis, {
|
|
180
154
|
clockTolerance: 60,
|
|
181
155
|
deviceIdCA: rDeviceIdCA.Ok(),
|
|
182
156
|
}),
|
|
183
|
-
storage: ensureStorage(
|
|
157
|
+
storage: ensureStorage(createSQLPeer(params.storageSystems.sql)),
|
|
184
158
|
llmRequest: defaultLLMRequest(params.llmRequest, {
|
|
185
159
|
url: envVals.LLM_BACKEND_URL,
|
|
186
160
|
apiKey: envVals.LLM_BACKEND_API_KEY,
|
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,
|
|
1
|
+
{"version":3,"file":"create-handler.js","sourceRoot":"","sources":["../jsr/create-handler.ts"],"names":[],"mappings":"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"}
|
package/index.d.ts
CHANGED
|
@@ -2,7 +2,6 @@ export * from "./create-handler.js";
|
|
|
2
2
|
export * from "./entry-point-utils.js";
|
|
3
3
|
export { cfServe } from "./cf-serve.js";
|
|
4
4
|
export * from "./types.js";
|
|
5
|
-
export { storeScreenshot } from "./intern/store-screenshot.js";
|
|
6
5
|
export * from "./npm-package-version.js";
|
|
7
6
|
export * from "./intern/import-map.js";
|
|
8
7
|
export * from "./vibes-msg-evento.js";
|
package/index.js
CHANGED
|
@@ -2,7 +2,6 @@ export * from "./create-handler.js";
|
|
|
2
2
|
export * from "./entry-point-utils.js";
|
|
3
3
|
export { cfServe } from "./cf-serve.js";
|
|
4
4
|
export * from "./types.js";
|
|
5
|
-
export { storeScreenshot } from "./intern/store-screenshot.js";
|
|
6
5
|
export * from "./npm-package-version.js";
|
|
7
6
|
export * from "./intern/import-map.js";
|
|
8
7
|
export * from "./vibes-msg-evento.js";
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../jsr/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AAEvC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../jsr/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AAEvC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,eAAe,CAAC;AAC9B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,kCAAkC,CAAC;AACjD,cAAc,iCAAiC,CAAC;AAChD,cAAc,iBAAiB,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { and, eq } from "drizzle-orm/sql/expressions";
|
|
2
2
|
import { exception2Result, Result } from "@adviser/cement";
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
3
|
+
import { ensureLogger } from "@fireproof/core-runtime";
|
|
4
|
+
import { parseArrayWarning, PromptAndBlockMsgs } from "@vibes.diy/api-types";
|
|
5
5
|
export async function ensureApplicationChatId({ ctx, req, }) {
|
|
6
6
|
const { chatId } = req;
|
|
7
7
|
const appSlug = req.appSlug;
|
|
@@ -25,9 +25,9 @@ export async function ensureApplicationChatId({ ctx, req, }) {
|
|
|
25
25
|
if (!result) {
|
|
26
26
|
return Result.Err("No existing application chat found");
|
|
27
27
|
}
|
|
28
|
-
const blocks =
|
|
29
|
-
if (
|
|
30
|
-
|
|
28
|
+
const { filtered: blocks, warning: blocksWarning } = parseArrayWarning(result.ApplicationChats.blocks, PromptAndBlockMsgs);
|
|
29
|
+
if (blocksWarning.length > 0) {
|
|
30
|
+
ensureLogger(ctx.sthis, "ensureApplicationChatId").Warn().Any({ parseErrors: blocksWarning }).Msg("skip");
|
|
31
31
|
}
|
|
32
32
|
return Result.Ok({
|
|
33
33
|
appSlug: result.ApplicationChats.appSlug,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-application-chat-id.js","sourceRoot":"","sources":["../../jsr/intern/ensure-application-chat-id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ensure-application-chat-id.js","sourceRoot":"","sources":["../../jsr/intern/ensure-application-chat-id.ts"],"names":[],"mappings":"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"}
|
package/intern/ensure-chat-id.js
CHANGED
|
@@ -1,61 +1,73 @@
|
|
|
1
1
|
import { and, eq } from "drizzle-orm/sql/expressions";
|
|
2
2
|
import { exception2Result, Result } from "@adviser/cement";
|
|
3
|
-
import { ensureUserSlug, ensureAppSlug } from "./ensure-slug-binding.js";
|
|
3
|
+
import { ensureUserSlug, ensureAppSlug, getDefaultUserSlug, persistDefaultUserSlug } from "./ensure-slug-binding.js";
|
|
4
4
|
export async function ensureChatId(ctx, req) {
|
|
5
|
-
let appSlug;
|
|
6
|
-
let userSlug;
|
|
5
|
+
let appSlug = "";
|
|
6
|
+
let userSlug = "";
|
|
7
7
|
let chatId;
|
|
8
|
-
|
|
8
|
+
const userId = req._auth.verifiedAuth.claims.userId;
|
|
9
9
|
if (req.chatId) {
|
|
10
|
-
|
|
11
|
-
}
|
|
12
|
-
else {
|
|
13
|
-
if (req.userSlug && req.appSlug) {
|
|
14
|
-
condition = and(eq(ctx.sql.tables.chatContexts.userSlug, req.userSlug), eq(ctx.sql.tables.chatContexts.appSlug, req.appSlug));
|
|
15
|
-
}
|
|
16
|
-
if (req.appSlug) {
|
|
17
|
-
condition = eq(ctx.sql.tables.chatContexts.appSlug, req.appSlug);
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
if (condition) {
|
|
10
|
+
const reqChatId = req.chatId;
|
|
21
11
|
const rResult = await exception2Result(() => ctx.sql.db
|
|
22
12
|
.select()
|
|
23
13
|
.from(ctx.sql.tables.chatContexts)
|
|
24
|
-
.where(and(
|
|
14
|
+
.where(and(eq(ctx.sql.tables.chatContexts.chatId, reqChatId), eq(ctx.sql.tables.chatContexts.userId, userId))));
|
|
25
15
|
if (rResult.isErr()) {
|
|
26
16
|
return Result.Err(`Failed to query existing chat: ${rResult.Err().message}`);
|
|
27
17
|
}
|
|
28
18
|
const result = rResult.Ok();
|
|
29
19
|
if (result.length !== 1) {
|
|
30
|
-
return Result.Err(`
|
|
20
|
+
return Result.Err(`Chat ID ${req.chatId} not found`);
|
|
31
21
|
}
|
|
32
22
|
appSlug = result[0].appSlug;
|
|
33
23
|
userSlug = result[0].userSlug;
|
|
34
24
|
chatId = result[0].chatId;
|
|
35
25
|
}
|
|
36
26
|
else {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
return Result.Err(`Failed to ensure userSlug: ${resUser.Err().message}`);
|
|
27
|
+
if (req.userSlug) {
|
|
28
|
+
const resUser = await ensureUserSlug(ctx, req._auth.verifiedAuth.claims, { userId, userSlug: req.userSlug });
|
|
29
|
+
if (resUser.isErr())
|
|
30
|
+
return Result.Err(`Failed to ensure userSlug: ${resUser.Err().message}`);
|
|
31
|
+
userSlug = resUser.Ok().userSlug;
|
|
43
32
|
}
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
33
|
+
else {
|
|
34
|
+
const resDefault = await getDefaultUserSlug(ctx, userId);
|
|
35
|
+
if (resDefault.isErr())
|
|
36
|
+
return Result.Err(`Failed to get default userSlug: ${resDefault.Err().message}`);
|
|
37
|
+
const defaultBinding = resDefault.Ok();
|
|
38
|
+
if (defaultBinding) {
|
|
39
|
+
userSlug = defaultBinding.userSlug;
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
const resNew = await ensureUserSlug(ctx, req._auth.verifiedAuth.claims, { userId });
|
|
43
|
+
if (resNew.isErr())
|
|
44
|
+
return Result.Err(`Failed to ensure userSlug: ${resNew.Err().message}`);
|
|
45
|
+
userSlug = resNew.Ok().userSlug;
|
|
46
|
+
await persistDefaultUserSlug(ctx, userId, userSlug);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
if (req.appSlug) {
|
|
50
|
+
const reqAppSlug = req.appSlug;
|
|
51
|
+
const rResult = await exception2Result(() => ctx.sql.db
|
|
52
|
+
.select()
|
|
53
|
+
.from(ctx.sql.tables.chatContexts)
|
|
54
|
+
.where(and(eq(ctx.sql.tables.chatContexts.userId, userId), eq(ctx.sql.tables.chatContexts.userSlug, userSlug), eq(ctx.sql.tables.chatContexts.appSlug, reqAppSlug))));
|
|
55
|
+
if (rResult.isOk() && rResult.Ok().length === 1) {
|
|
56
|
+
const existing = rResult.Ok()[0];
|
|
57
|
+
appSlug = existing.appSlug;
|
|
58
|
+
chatId = existing.chatId;
|
|
59
|
+
}
|
|
52
60
|
}
|
|
53
|
-
appSlug = resApp.Ok().appSlug;
|
|
54
61
|
if (!chatId) {
|
|
62
|
+
const resApp = await ensureAppSlug(ctx, { userId, userSlug, appSlug: req.appSlug });
|
|
63
|
+
if (resApp.isErr()) {
|
|
64
|
+
return Result.Err(`Failed to ensure appSlug: ${resApp.Err().message}`);
|
|
65
|
+
}
|
|
66
|
+
appSlug = resApp.Ok().appSlug;
|
|
55
67
|
chatId = ctx.sthis.nextId(12).str;
|
|
56
68
|
await ctx.sql.db.insert(ctx.sql.tables.chatContexts).values({
|
|
57
69
|
chatId,
|
|
58
|
-
userId
|
|
70
|
+
userId,
|
|
59
71
|
appSlug,
|
|
60
72
|
userSlug,
|
|
61
73
|
created: new Date().toISOString(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-chat-id.js","sourceRoot":"","sources":["../../jsr/intern/ensure-chat-id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"ensure-chat-id.js","sourceRoot":"","sources":["../../jsr/intern/ensure-chat-id.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,32 +1,18 @@
|
|
|
1
1
|
import { Result } from "@adviser/cement";
|
|
2
|
-
import { VibesApiSQLCtx } from "../types.js";
|
|
3
|
-
import { AppSlugOptUserSlug, AppSlugUserSlug, NeedOneAppSlugUserSlug, OptAppSlugOptUserSlug, OptAppSlugUserSlug } from "@vibes.diy/api-types";
|
|
4
|
-
export
|
|
5
|
-
userId: string;
|
|
6
|
-
tenant: string;
|
|
7
|
-
appSlug: string;
|
|
8
|
-
ledger: string;
|
|
9
|
-
userSlug: string;
|
|
10
|
-
}
|
|
11
|
-
export type AppSlugBindingParam = NeedOneAppSlugUserSlug & {
|
|
2
|
+
import { AppSlugBinding, AppUserSlugBinding, UserSlugBinding, VibesApiSQLCtx } from "../types.js";
|
|
3
|
+
import { AppSlugOptUserSlug, AppSlugUserSlug, ClerkClaim, NeedOneAppSlugUserSlug, OptAppSlugOptUserSlug, OptAppSlugUserSlug } from "@vibes.diy/api-types";
|
|
4
|
+
export type AppSlugBindingParam = Partial<NeedOneAppSlugUserSlug> & {
|
|
12
5
|
userId: string;
|
|
6
|
+
claims: ClerkClaim;
|
|
13
7
|
};
|
|
14
|
-
export declare function
|
|
8
|
+
export declare function writeUserSlugBinding(ctx: VibesApiSQLCtx, userId: string, userSlug: string): Promise<Result<UserSlugBinding>>;
|
|
9
|
+
export declare function ensureUserSlug(ctx: VibesApiSQLCtx, claims: ClerkClaim, binding: (OptAppSlugOptUserSlug | OptAppSlugUserSlug | AppSlugOptUserSlug | AppSlugUserSlug) & {
|
|
15
10
|
userId: string;
|
|
16
|
-
}): Promise<Result<
|
|
17
|
-
userSlug: string;
|
|
18
|
-
tenant: string;
|
|
19
|
-
}>>;
|
|
11
|
+
}): Promise<Result<UserSlugBinding>>;
|
|
20
12
|
export declare function ensureAppSlug(ctx: VibesApiSQLCtx, binding: (OptAppSlugUserSlug | AppSlugUserSlug) & {
|
|
21
13
|
userId: string;
|
|
22
|
-
}): Promise<Result<
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
export declare function
|
|
27
|
-
appSlug: string;
|
|
28
|
-
ledger: string;
|
|
29
|
-
userSlug: string;
|
|
30
|
-
tenant: string;
|
|
31
|
-
userId: string;
|
|
32
|
-
}>>;
|
|
14
|
+
}): Promise<Result<AppSlugBinding>>;
|
|
15
|
+
export declare function getDefaultUserSlug(ctx: VibesApiSQLCtx, userId: string): Promise<Result<UserSlugBinding | undefined>>;
|
|
16
|
+
export declare function persistDefaultUserSlug(ctx: VibesApiSQLCtx, userId: string, userSlug: string): Promise<void>;
|
|
17
|
+
export declare function ensureSlugBinding(ctx: VibesApiSQLCtx, binding: AppSlugBindingParam): Promise<Result<AppUserSlugBinding>>;
|
|
18
|
+
export declare function toRFC2822_32ByteLength(slug: string): string;
|