@vibes.diy/api-svc 13.0.5 → 13.0.7
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/evento-handler-manifest.js +5 -5
- package/evento-handler-manifest.js.map +1 -1
- package/intern/read-anonymous-seed-docs.js +0 -1
- package/intern/read-anonymous-seed-docs.js.map +1 -1
- package/package.json +11 -11
- package/public/access-binding-resolver.js +1 -4
- package/public/access-binding-resolver.js.map +1 -1
- package/public/access-helpers.js.map +1 -1
- package/public/app-documents-broadcast.d.ts +0 -8
- package/public/app-documents-broadcast.js +1 -51
- package/public/app-documents-broadcast.js.map +1 -1
- package/public/app-documents-read-eventos.js +0 -1
- package/public/app-documents-read-eventos.js.map +1 -1
- package/public/app-documents-write-eventos.js +1 -8
- package/public/app-documents-write-eventos.js.map +1 -1
- package/public/app-documents.d.ts +2 -2
- package/public/app-documents.js +2 -2
- package/public/app-documents.js.map +1 -1
- package/public/dm-lane.d.ts +1 -0
- package/public/dm-lane.js +1 -0
- package/public/dm-lane.js.map +1 -1
- package/public/dm-read-eventos.d.ts +122 -0
- package/public/dm-read-eventos.js +30 -52
- package/public/dm-read-eventos.js.map +1 -1
- package/public/dm-sync-eventos.d.ts +2 -1
- package/public/dm-sync-eventos.js +8 -5
- package/public/dm-sync-eventos.js.map +1 -1
- package/public/dm-write-eventos.d.ts +10 -0
- package/public/dm-write-eventos.js +56 -6
- package/public/dm-write-eventos.js.map +1 -1
- package/public/ensure-user-settings.js +21 -2
- package/public/ensure-user-settings.js.map +1 -1
- package/public/platform-db-registry.d.ts +3 -3
- package/public/platform-db-registry.js +0 -11
- package/public/platform-db-registry.js.map +1 -1
- package/public/sync-eventos.d.ts +3 -1
- package/public/sync-eventos.js +50 -74
- package/public/sync-eventos.js.map +1 -1
- package/public/sync-pull-policy.d.ts +37 -0
- package/public/sync-pull-policy.js +61 -0
- package/public/sync-pull-policy.js.map +1 -0
- package/public/viewer-channel-resolver.d.ts +0 -1
- package/public/viewer-channel-resolver.js +4 -7
- package/public/viewer-channel-resolver.js.map +1 -1
- package/types.js.map +1 -1
- package/public/dm-access-fn.d.ts +0 -2
- package/public/dm-access-fn.js +0 -25
- package/public/dm-access-fn.js.map +0 -1
package/public/dm-lane.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dm-lane.js","sourceRoot":"","sources":["../../jsr/public/dm-lane.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,yBAAyB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAyBlD,MAAM,UAAU,sBAAsB,CAAC,WAAmB;IACxD,OAAO,eAAe,CAAC,WAAW,CAAC,CAAC;AACtC,CAAC;AAYD,MAAM,UAAU,MAAM,CACpB,UAA2C,EAC3C,QAAwF;IAExF,OAAO;QACL,GAAG,UAAU;QACb,MAAM,EAAE,CAAC,GAAuC,EAAE,EAAE,CAClD,sBAAsB,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC;KACrG,CAAC;AACJ,CAAC;AAmDD,MAAM,IAAI,GAAG,CAAC,MAAgB,EAAmB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;AAS5E,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAoB,EACpB,CAA8F;IAE9F,MAAM,YAAY,GAAG,yBAAyB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAG9D,IAAI,YAAY,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;IAQhD,MAAM,YAAY,GAAG,MAAM,0BAA0B,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;IACrF,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACjE,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;IACvG,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;AACpE,CAAC;AAWD,MAAM,UAAU,YAAY,CAAC,WAAmB,EAAE,YAAuC;IACvF,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,YAAY,CAAC;IAC5B,OAAO,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC;AACnG,CAAC"}
|
|
1
|
+
{"version":3,"file":"dm-lane.js","sourceRoot":"","sources":["../../jsr/public/dm-lane.ts"],"names":[],"mappings":"AAEA,OAAO,EAAW,yBAAyB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE3F,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAyBlD,MAAM,UAAU,sBAAsB,CAAC,WAAmB;IACxD,OAAO,eAAe,CAAC,WAAW,CAAC,CAAC;AACtC,CAAC;AAYD,MAAM,UAAU,MAAM,CACpB,UAA2C,EAC3C,QAAwF;IAExF,OAAO;QACL,GAAG,UAAU;QACb,MAAM,EAAE,CAAC,GAAuC,EAAE,EAAE,CAClD,sBAAsB,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC;KACrG,CAAC;AACJ,CAAC;AAmDD,MAAM,IAAI,GAAG,CAAC,MAAgB,EAAmB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;AAS5E,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,IAAoB,EACpB,CAA8F;IAE9F,MAAM,YAAY,GAAG,yBAAyB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAG9D,IAAI,YAAY,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;IACpD,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC;IAQhD,MAAM,YAAY,GAAG,MAAM,0BAA0B,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;IACrF,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACjE,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,MAAM,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC;IACvG,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;AACpE,CAAC;AAWD,MAAM,UAAU,YAAY,CAAC,WAAmB,EAAE,YAAuC;IACvF,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,YAAY,CAAC;IAC5B,OAAO,EAAE,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC;AACnG,CAAC;AA0BD,MAAM,CAAC,MAAM,qBAAqB,GAAG,+CAA+C,CAAC"}
|
|
@@ -89,3 +89,125 @@ export declare const dmSubscribeDocsHandle: (ctx: HandleTriggerCtx<{
|
|
|
89
89
|
type: "vibes.diy.res-subscribe-docs";
|
|
90
90
|
status: "ok";
|
|
91
91
|
} | VibesDiyError>) => Promise<Result<EventoResultType>>;
|
|
92
|
+
export declare const dmGetDocHandle: (ctx: HandleTriggerCtx<{
|
|
93
|
+
type: "MessageEvent";
|
|
94
|
+
event: {
|
|
95
|
+
data?: unknown;
|
|
96
|
+
origin?: string | null | undefined;
|
|
97
|
+
lastEventId?: string | undefined;
|
|
98
|
+
source?: unknown;
|
|
99
|
+
ports?: unknown;
|
|
100
|
+
};
|
|
101
|
+
} | {
|
|
102
|
+
type: "CloseEvent";
|
|
103
|
+
event: {
|
|
104
|
+
wasClean: boolean;
|
|
105
|
+
code: number;
|
|
106
|
+
reason: string;
|
|
107
|
+
};
|
|
108
|
+
} | {
|
|
109
|
+
type: "ErrorEvent";
|
|
110
|
+
event: {
|
|
111
|
+
message?: string | undefined;
|
|
112
|
+
filename?: string | undefined;
|
|
113
|
+
lineno?: number | undefined;
|
|
114
|
+
colno?: number | undefined;
|
|
115
|
+
error?: unknown;
|
|
116
|
+
};
|
|
117
|
+
}, MsgBase<{
|
|
118
|
+
type: "vibes.diy.req-get-doc";
|
|
119
|
+
auth?: {
|
|
120
|
+
type: "clerk" | "device-id" | "ucan";
|
|
121
|
+
token: string;
|
|
122
|
+
} | undefined;
|
|
123
|
+
ownerHandle: string;
|
|
124
|
+
appSlug: string;
|
|
125
|
+
dbName: string;
|
|
126
|
+
docId: string;
|
|
127
|
+
adminMode?: boolean | undefined;
|
|
128
|
+
}>, {
|
|
129
|
+
type: "vibes.diy.res-get-doc";
|
|
130
|
+
status: "ok";
|
|
131
|
+
id: string;
|
|
132
|
+
doc: Record<string, unknown>;
|
|
133
|
+
} | {
|
|
134
|
+
type: "vibes.diy.res-get-doc";
|
|
135
|
+
status: "not-found";
|
|
136
|
+
id: string;
|
|
137
|
+
} | VibesDiyError>) => Promise<Result<EventoResultType>>;
|
|
138
|
+
export declare const dmListDbNamesHandle: (ctx: HandleTriggerCtx<{
|
|
139
|
+
type: "MessageEvent";
|
|
140
|
+
event: {
|
|
141
|
+
data?: unknown;
|
|
142
|
+
origin?: string | null | undefined;
|
|
143
|
+
lastEventId?: string | undefined;
|
|
144
|
+
source?: unknown;
|
|
145
|
+
ports?: unknown;
|
|
146
|
+
};
|
|
147
|
+
} | {
|
|
148
|
+
type: "CloseEvent";
|
|
149
|
+
event: {
|
|
150
|
+
wasClean: boolean;
|
|
151
|
+
code: number;
|
|
152
|
+
reason: string;
|
|
153
|
+
};
|
|
154
|
+
} | {
|
|
155
|
+
type: "ErrorEvent";
|
|
156
|
+
event: {
|
|
157
|
+
message?: string | undefined;
|
|
158
|
+
filename?: string | undefined;
|
|
159
|
+
lineno?: number | undefined;
|
|
160
|
+
colno?: number | undefined;
|
|
161
|
+
error?: unknown;
|
|
162
|
+
};
|
|
163
|
+
}, MsgBase<{
|
|
164
|
+
type: "vibes.diy.req-list-db-names";
|
|
165
|
+
auth: {
|
|
166
|
+
type: "clerk" | "device-id" | "ucan";
|
|
167
|
+
token: string;
|
|
168
|
+
};
|
|
169
|
+
ownerHandle: string;
|
|
170
|
+
appSlug: string;
|
|
171
|
+
adminMode?: boolean | undefined;
|
|
172
|
+
}>, {
|
|
173
|
+
type: "vibes.diy.res-list-db-names";
|
|
174
|
+
status: "ok";
|
|
175
|
+
dbNames: string[];
|
|
176
|
+
} | VibesDiyError>) => Promise<Result<EventoResultType>>;
|
|
177
|
+
export declare const dmSubscribeViewerGrantsHandle: (ctx: HandleTriggerCtx<{
|
|
178
|
+
type: "MessageEvent";
|
|
179
|
+
event: {
|
|
180
|
+
data?: unknown;
|
|
181
|
+
origin?: string | null | undefined;
|
|
182
|
+
lastEventId?: string | undefined;
|
|
183
|
+
source?: unknown;
|
|
184
|
+
ports?: unknown;
|
|
185
|
+
};
|
|
186
|
+
} | {
|
|
187
|
+
type: "CloseEvent";
|
|
188
|
+
event: {
|
|
189
|
+
wasClean: boolean;
|
|
190
|
+
code: number;
|
|
191
|
+
reason: string;
|
|
192
|
+
};
|
|
193
|
+
} | {
|
|
194
|
+
type: "ErrorEvent";
|
|
195
|
+
event: {
|
|
196
|
+
message?: string | undefined;
|
|
197
|
+
filename?: string | undefined;
|
|
198
|
+
lineno?: number | undefined;
|
|
199
|
+
colno?: number | undefined;
|
|
200
|
+
error?: unknown;
|
|
201
|
+
};
|
|
202
|
+
}, MsgBase<{
|
|
203
|
+
type: "vibes.diy.req-subscribe-viewer-grants";
|
|
204
|
+
auth: {
|
|
205
|
+
type: "clerk" | "device-id" | "ucan";
|
|
206
|
+
token: string;
|
|
207
|
+
};
|
|
208
|
+
ownerHandle: string;
|
|
209
|
+
appSlug: string;
|
|
210
|
+
}>, {
|
|
211
|
+
type: "vibes.diy.res-subscribe-viewer-grants";
|
|
212
|
+
status: "ok";
|
|
213
|
+
} | VibesDiyError>) => Promise<Result<EventoResultType>>;
|
|
@@ -1,85 +1,51 @@
|
|
|
1
1
|
import { EventoResult, Result } from "@adviser/cement";
|
|
2
|
-
import {
|
|
3
|
-
import { optAuth } from "../check-auth.js";
|
|
4
|
-
import { decodeAccessOutputRows } from "./access-output-decoder.js";
|
|
2
|
+
import { checkAuth, optAuth } from "../check-auth.js";
|
|
5
3
|
import { applyQueryFilter } from "./app-documents-query-filter.js";
|
|
6
4
|
import { loadHeadDocs } from "./app-documents-head-query.js";
|
|
7
5
|
import { clientWsSend } from "./app-documents-shared.js";
|
|
8
|
-
import { filterDocsByChannel } from "./channel-read-filter.js";
|
|
9
6
|
import { mintFilesUrls } from "./files-url-mint.js";
|
|
10
|
-
import { normalizeChannels } from "./normalize-channels.js";
|
|
11
7
|
import { RESERVED_CHANNEL_PREFIX } from "./audience-channels.js";
|
|
12
8
|
import { sweepExpiredInterestKeys } from "./interest-channels.js";
|
|
13
|
-
import {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
const t = vctx.sql.tables.accessFnOutputs;
|
|
17
|
-
const rows = await vctx.sql.db
|
|
18
|
-
.select({ docId: t.docId, output: t.output, hasGrants: t.hasGrants })
|
|
19
|
-
.from(t)
|
|
20
|
-
.where(and(eq(t.ownerHandle, p.ownerHandle), eq(t.appSlug, p.appSlug), eq(t.dbName, p.dbName)));
|
|
21
|
-
return decodeAccessOutputRows(rows);
|
|
22
|
-
}
|
|
23
|
-
function dmViewerChannels(vctx, p) {
|
|
24
|
-
return resolveViewerChannels(vctx, {
|
|
25
|
-
ownerHandle: p.ownerHandle,
|
|
26
|
-
appSlug: p.appSlug,
|
|
27
|
-
dbName: p.dbName,
|
|
28
|
-
userId: p.userId,
|
|
29
|
-
isDm: true,
|
|
30
|
-
access: "none",
|
|
31
|
-
decodedOutputs: p.decodedOutputs,
|
|
32
|
-
derivation: "readable",
|
|
33
|
-
});
|
|
9
|
+
import { resolveDmParticipation } from "./dm-lane.js";
|
|
10
|
+
function dmChannelsFor(standing, channelSlug) {
|
|
11
|
+
return standing.ok ? [channelSlug] : [];
|
|
34
12
|
}
|
|
35
13
|
export const dmQueryDocsHandle = optAuth(async (ctx) => {
|
|
36
14
|
const req = ctx.validated.payload;
|
|
37
15
|
const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
|
|
38
16
|
const target = { ownerHandle: req.ownerHandle, appSlug: req.appSlug, dbName: req.dbName };
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
_id: row.docId,
|
|
42
|
-
...mintFilesUrls(row.data, { ...target, docId: row.docId, svc: vctx.params.vibes.svc }),
|
|
43
|
-
}));
|
|
44
|
-
const decodedOutputs = await dmStoredOutputs(vctx, target);
|
|
45
|
-
await runQueryReadInterleaveHookForTests();
|
|
46
|
-
const { userHandle, effectiveChannels, publicChannels } = await dmViewerChannels(vctx, {
|
|
47
|
-
...target,
|
|
17
|
+
const standing = await resolveDmParticipation(vctx, {
|
|
18
|
+
channelSlug: req.ownerHandle,
|
|
48
19
|
userId: req._auth?.verifiedAuth.claims.userId ?? null,
|
|
49
|
-
|
|
50
|
-
});
|
|
51
|
-
const channelFilteredDocs = filterDocsByChannel({
|
|
52
|
-
docs,
|
|
53
|
-
outputRows: decodedOutputs,
|
|
54
|
-
userHandle,
|
|
55
|
-
effectiveChannels,
|
|
56
|
-
publicChannels,
|
|
57
|
-
adminOverride: false,
|
|
58
|
-
requireOutput: true,
|
|
20
|
+
consent: false,
|
|
59
21
|
});
|
|
22
|
+
const docs = standing.ok
|
|
23
|
+
? (await loadHeadDocs(vctx, target)).map((row) => ({
|
|
24
|
+
_id: row.docId,
|
|
25
|
+
...mintFilesUrls(row.data, { ...target, docId: row.docId, svc: vctx.params.vibes.svc }),
|
|
26
|
+
}))
|
|
27
|
+
: [];
|
|
60
28
|
await ctx.send.send(ctx, {
|
|
61
29
|
type: "vibes.diy.res-query-docs",
|
|
62
30
|
status: "ok",
|
|
63
|
-
docs: applyQueryFilter(
|
|
31
|
+
docs: applyQueryFilter(docs, req.filter),
|
|
64
32
|
});
|
|
65
33
|
return Result.Ok(EventoResult.Continue);
|
|
66
34
|
});
|
|
67
35
|
export const dmSubscribeDocsHandle = optAuth(async (ctx) => {
|
|
68
36
|
const req = ctx.validated.payload;
|
|
69
37
|
const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
|
|
70
|
-
const target = { ownerHandle: req.ownerHandle, appSlug: req.appSlug, dbName: req.dbName };
|
|
71
38
|
const wsSend = clientWsSend(ctx);
|
|
72
39
|
const subscriptionKey = `${req.ownerHandle}/${req.appSlug}/${req.dbName}`;
|
|
73
40
|
for (const key of sweepExpiredInterestKeys(wsSend)) {
|
|
74
41
|
vctx.deregisterDocSubscription?.(key).catch((e) => console.error("interest lease deregistration error:", e));
|
|
75
42
|
}
|
|
76
|
-
const
|
|
77
|
-
|
|
78
|
-
...target,
|
|
43
|
+
const standing = await resolveDmParticipation(vctx, {
|
|
44
|
+
channelSlug: req.ownerHandle,
|
|
79
45
|
userId: req._auth?.verifiedAuth.claims.userId ?? null,
|
|
80
|
-
|
|
46
|
+
consent: false,
|
|
81
47
|
});
|
|
82
|
-
const channelKeys =
|
|
48
|
+
const channelKeys = dmChannelsFor(standing, req.ownerHandle).map((ch) => `${subscriptionKey}/${ch}`);
|
|
83
49
|
const virtualPrefix = `${subscriptionKey}/${RESERVED_CHANNEL_PREFIX}`;
|
|
84
50
|
const rederivedKeys = new Set(channelKeys);
|
|
85
51
|
for (const key of [...wsSend.subscribedDocKeys]) {
|
|
@@ -117,4 +83,16 @@ export const dmSubscribeDocsHandle = optAuth(async (ctx) => {
|
|
|
117
83
|
});
|
|
118
84
|
return Result.Ok(EventoResult.Continue);
|
|
119
85
|
});
|
|
86
|
+
export const dmGetDocHandle = optAuth(async (ctx) => {
|
|
87
|
+
await ctx.send.send(ctx, { type: "vibes.diy.res-error", error: { message: "Access denied" } });
|
|
88
|
+
return Result.Ok(EventoResult.Continue);
|
|
89
|
+
});
|
|
90
|
+
export const dmListDbNamesHandle = checkAuth(async (ctx) => {
|
|
91
|
+
await ctx.send.send(ctx, { type: "vibes.diy.res-error", error: { message: "Access denied" } });
|
|
92
|
+
return Result.Ok(EventoResult.Continue);
|
|
93
|
+
});
|
|
94
|
+
export const dmSubscribeViewerGrantsHandle = checkAuth(async (ctx) => {
|
|
95
|
+
await ctx.send.send(ctx, { type: "vibes.diy.res-error", error: { message: "Access denied" } });
|
|
96
|
+
return Result.Ok(EventoResult.Continue);
|
|
97
|
+
});
|
|
120
98
|
//# sourceMappingURL=dm-read-eventos.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dm-read-eventos.js","sourceRoot":"","sources":["../../jsr/public/dm-read-eventos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsC,MAAM,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"dm-read-eventos.js","sourceRoot":"","sources":["../../jsr/public/dm-read-eventos.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { EventoResultType, HandleTriggerCtx, Result } from "@adviser/cement";
|
|
2
|
-
import { MsgBase, VibesDiyError } from "@vibes.diy/api-types";
|
|
2
|
+
import { MsgBase, VibesDiyError, W3CWebSocketEvent } from "@vibes.diy/api-types";
|
|
3
|
+
export declare const dmSyncPullHandle: (ctx: HandleTriggerCtx<W3CWebSocketEvent, MsgBase<import("@vibes.diy/api-types").ReqSyncPull>, import("@vibes.diy/api-types").ResSyncPull | VibesDiyError>) => Promise<Result<EventoResultType>>;
|
|
3
4
|
export declare const dmSyncPushHandle: (ctx: HandleTriggerCtx<{
|
|
4
5
|
type: "MessageEvent";
|
|
5
6
|
event: {
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { EventoResult, Result } from "@adviser/cement";
|
|
2
2
|
import { optAuth } from "../check-auth.js";
|
|
3
3
|
import { clientWsSend } from "./app-documents-shared.js";
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
4
|
+
import { notifyDocChangedFanOut } from "./app-documents-broadcast.js";
|
|
5
|
+
import { emitDmWriteEffects } from "./dm-write-eventos.js";
|
|
6
|
+
import { syncPullHandler, tryPersist, tryTombstone } from "./sync-eventos.js";
|
|
7
|
+
import { dmSyncPullPolicy } from "./sync-pull-policy.js";
|
|
8
|
+
import { DM_LEGACY_SIDECAR_CID, dmDescriptor, resolveDmParticipation } from "./dm-lane.js";
|
|
9
|
+
export const dmSyncPullHandle = syncPullHandler(dmSyncPullPolicy);
|
|
8
10
|
export const dmSyncPushHandle = optAuth(async (ctx) => {
|
|
9
11
|
const req = ctx.validated.payload;
|
|
10
12
|
const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
|
|
@@ -52,7 +54,7 @@ export const dmSyncPushHandle = optAuth(async (ctx) => {
|
|
|
52
54
|
});
|
|
53
55
|
continue;
|
|
54
56
|
}
|
|
55
|
-
const persisted = await tryPersist(vctx, req, w, standing.userId, descriptor,
|
|
57
|
+
const persisted = await tryPersist(vctx, req, w, standing.userId, descriptor, DM_LEGACY_SIDECAR_CID);
|
|
56
58
|
if (!persisted)
|
|
57
59
|
continue;
|
|
58
60
|
accepted.push({ docId: persisted.docId, seq: persisted.seq, syncSeq: persisted.syncSeq });
|
|
@@ -65,6 +67,7 @@ export const dmSyncPushHandle = optAuth(async (ctx) => {
|
|
|
65
67
|
userId: standing.userId,
|
|
66
68
|
nextSeq: persisted.seq,
|
|
67
69
|
now,
|
|
70
|
+
participants: standing.participants,
|
|
68
71
|
});
|
|
69
72
|
notifyDocChangedFanOut(vctx, {
|
|
70
73
|
ownerHandle: req.ownerHandle,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dm-sync-eventos.js","sourceRoot":"","sources":["../../jsr/public/dm-sync-eventos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAsC,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAG3F,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dm-sync-eventos.js","sourceRoot":"","sources":["../../jsr/public/dm-sync-eventos.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { EventoResultType, HandleTriggerCtx, Result } from "@adviser/cement";
|
|
2
2
|
import { MsgBase, VibesDiyError } from "@vibes.diy/api-types";
|
|
3
|
+
import { VibesApiSQLCtx } from "../types.js";
|
|
3
4
|
export declare const dmPutDocHandle: (ctx: HandleTriggerCtx<{
|
|
4
5
|
type: "MessageEvent";
|
|
5
6
|
event: {
|
|
@@ -120,3 +121,12 @@ export declare const dmBroadcastEphemeralHandle: (ctx: HandleTriggerCtx<{
|
|
|
120
121
|
docId: string;
|
|
121
122
|
doc: Record<string, unknown>;
|
|
122
123
|
}>, never>) => Promise<Result<EventoResultType>>;
|
|
124
|
+
export interface DmWriteEffectsParams {
|
|
125
|
+
ownerHandle: string;
|
|
126
|
+
docId: string;
|
|
127
|
+
userId: string | null;
|
|
128
|
+
nextSeq: number;
|
|
129
|
+
now: string;
|
|
130
|
+
participants: readonly [string, string];
|
|
131
|
+
}
|
|
132
|
+
export declare function emitDmWriteEffects(vctx: VibesApiSQLCtx, p: DmWriteEffectsParams): Promise<void>;
|
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import { EventoResult, Result } from "@adviser/cement";
|
|
2
|
-
import { and, eq } from "drizzle-orm";
|
|
2
|
+
import { and, eq, inArray, sql } from "drizzle-orm";
|
|
3
3
|
import { checkAuth, optAuth } from "../check-auth.js";
|
|
4
4
|
import { clientWsSend } from "./app-documents-shared.js";
|
|
5
|
-
import {
|
|
5
|
+
import { notifyDocChangedFanOut } from "./app-documents-broadcast.js";
|
|
6
6
|
import { persistPutRevision } from "./app-documents-put-persist.js";
|
|
7
7
|
import { allocateAndInsertRevision, SeqConflictError } from "./seq-allocation.js";
|
|
8
8
|
import { bestEffortAppendDelete, bestEffortChannelChange } from "./sync-feed.js";
|
|
9
9
|
import { orThrow, syncChannelIndex } from "./access-fn-channel-index.js";
|
|
10
10
|
import { validateFilesUploads } from "./validate-files-uploads.js";
|
|
11
|
-
import {
|
|
12
|
-
import { dmDescriptor, resolveDmParticipation } from "./dm-lane.js";
|
|
11
|
+
import { DM_LEGACY_SIDECAR_CID, dmDescriptor, resolveDmParticipation } from "./dm-lane.js";
|
|
13
12
|
function refusal(denial) {
|
|
14
13
|
switch (denial) {
|
|
15
14
|
case "anonymous":
|
|
@@ -52,7 +51,7 @@ export const dmPutDocHandle = optAuth(async (ctx) => {
|
|
|
52
51
|
userId,
|
|
53
52
|
now,
|
|
54
53
|
accessResult: descriptor,
|
|
55
|
-
accessFnCid:
|
|
54
|
+
accessFnCid: DM_LEGACY_SIDECAR_CID,
|
|
56
55
|
});
|
|
57
56
|
}
|
|
58
57
|
catch (err) {
|
|
@@ -94,7 +93,14 @@ export const dmPutDocHandle = optAuth(async (ctx) => {
|
|
|
94
93
|
});
|
|
95
94
|
return Result.Ok(EventoResult.Continue);
|
|
96
95
|
}
|
|
97
|
-
await emitDmWriteEffects(vctx, {
|
|
96
|
+
await emitDmWriteEffects(vctx, {
|
|
97
|
+
ownerHandle: req.ownerHandle,
|
|
98
|
+
docId,
|
|
99
|
+
userId,
|
|
100
|
+
nextSeq,
|
|
101
|
+
now,
|
|
102
|
+
participants: standing.participants,
|
|
103
|
+
});
|
|
98
104
|
notifyDocChangedFanOut(vctx, {
|
|
99
105
|
ownerHandle: req.ownerHandle,
|
|
100
106
|
appSlug: req.appSlug,
|
|
@@ -210,4 +216,48 @@ export const dmBroadcastEphemeralHandle = optAuth(async (ctx) => {
|
|
|
210
216
|
})().catch((e) => console.error("dm ephemeral notify error:", e));
|
|
211
217
|
return Result.Ok(EventoResult.Continue);
|
|
212
218
|
});
|
|
219
|
+
export async function emitDmWriteEffects(vctx, p) {
|
|
220
|
+
const { ownerHandle, docId, userId, nextSeq, now, participants } = p;
|
|
221
|
+
const t_idx = vctx.sql.tables.directChannelIndex;
|
|
222
|
+
await vctx.sql.db
|
|
223
|
+
.insert(t_idx)
|
|
224
|
+
.values([
|
|
225
|
+
{ handle: participants[0], channelHandle: ownerHandle },
|
|
226
|
+
{ handle: participants[1], channelHandle: ownerHandle },
|
|
227
|
+
])
|
|
228
|
+
.onConflictDoNothing();
|
|
229
|
+
const t_usb = vctx.sql.tables.handleBinding;
|
|
230
|
+
const senderRow = await vctx.sql.db
|
|
231
|
+
.select({ handle: t_usb.handle })
|
|
232
|
+
.from(t_usb)
|
|
233
|
+
.where(and(eq(t_usb.userId, userId ?? ""), inArray(t_usb.handle, participants)))
|
|
234
|
+
.then((r) => r[0]);
|
|
235
|
+
const senderUserSlug = senderRow?.handle ?? "";
|
|
236
|
+
const recipientUserSlug = participants.find((h) => h !== senderUserSlug) ?? participants[1];
|
|
237
|
+
await vctx.postQueue({
|
|
238
|
+
payload: {
|
|
239
|
+
type: "vibes.diy.evt-dm-received",
|
|
240
|
+
senderUserId: userId ?? "",
|
|
241
|
+
senderUserSlug,
|
|
242
|
+
recipientUserSlug,
|
|
243
|
+
channelUserSlug: ownerHandle,
|
|
244
|
+
docId,
|
|
245
|
+
created: now,
|
|
246
|
+
},
|
|
247
|
+
tid: "queue-event",
|
|
248
|
+
src: "putDoc",
|
|
249
|
+
dst: "vibes-service",
|
|
250
|
+
ttl: 1,
|
|
251
|
+
});
|
|
252
|
+
if (senderUserSlug) {
|
|
253
|
+
const t_reads = vctx.sql.tables.directChannelReads;
|
|
254
|
+
await vctx.sql.db
|
|
255
|
+
.insert(t_reads)
|
|
256
|
+
.values({ channelHandle: ownerHandle, handle: senderUserSlug, lastSeenSeq: nextSeq })
|
|
257
|
+
.onConflictDoUpdate({
|
|
258
|
+
target: [t_reads.channelHandle, t_reads.handle],
|
|
259
|
+
set: { lastSeenSeq: sql `MAX(${t_reads.lastSeenSeq}, ${nextSeq})` },
|
|
260
|
+
});
|
|
261
|
+
}
|
|
262
|
+
}
|
|
213
263
|
//# sourceMappingURL=dm-write-eventos.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dm-write-eventos.js","sourceRoot":"","sources":["../../jsr/public/dm-write-eventos.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dm-write-eventos.js","sourceRoot":"","sources":["../../jsr/public/dm-write-eventos.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,15 @@ import { checkAuth } from "../check-auth.js";
|
|
|
6
6
|
import { migrateLegacyAvatar } from "./handle-settings.js";
|
|
7
7
|
import { eq } from "drizzle-orm/sql/expressions";
|
|
8
8
|
import { type } from "arktype";
|
|
9
|
+
let warnedGeoCountryMissing = false;
|
|
10
|
+
function warnGeoCountryMissingOnce(vctx) {
|
|
11
|
+
if (warnedGeoCountryMissing)
|
|
12
|
+
return;
|
|
13
|
+
warnedGeoCountryMissing = true;
|
|
14
|
+
ensureLogger(vctx.sthis, "ensureUserSettings")
|
|
15
|
+
.Warn()
|
|
16
|
+
.Msg("no edge country on this request — geoCountry unstamped, geo-gated lanes stay closed for these users");
|
|
17
|
+
}
|
|
9
18
|
export async function ensureUserSettings(vctx, req) {
|
|
10
19
|
const userId = req._auth.verifiedAuth.claims.userId;
|
|
11
20
|
const existing = await vctx.sql.db
|
|
@@ -28,7 +37,7 @@ export async function ensureUserSettings(vctx, req) {
|
|
|
28
37
|
if (settingsArrayWarning.length > 0) {
|
|
29
38
|
ensureLogger(vctx.sthis, "ensureUserSettings").Warn().Any({ parseErrors: settingsArrayWarning }).Msg("skip");
|
|
30
39
|
}
|
|
31
|
-
const requested = req.settings.filter((item) => item.type !== "egressStatus" && item.type !== "contactEmail");
|
|
40
|
+
const requested = req.settings.filter((item) => item.type !== "egressStatus" && item.type !== "contactEmail" && item.type !== "geoCountry");
|
|
32
41
|
const settingsSet = new Map([...settingsArray, ...requested].map((item) => [item.type, item]));
|
|
33
42
|
const claimsEmail = req._auth.verifiedAuth.claims.params?.email;
|
|
34
43
|
if (claimsEmail) {
|
|
@@ -38,6 +47,15 @@ export async function ensureUserSettings(vctx, req) {
|
|
|
38
47
|
settingsSet.set("contactEmail", { type: "contactEmail", email: claimsEmail, updatedAt: now });
|
|
39
48
|
}
|
|
40
49
|
}
|
|
50
|
+
if (!settingsSet.has("geoCountry")) {
|
|
51
|
+
const edgeCountry = vctx.analyticsCountry;
|
|
52
|
+
if (edgeCountry) {
|
|
53
|
+
settingsSet.set("geoCountry", { type: "geoCountry", country: edgeCountry, updatedAt: now });
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
warnGeoCountryMissingOnce(vctx);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
41
59
|
const { filtered: settings, warning: settingsWarning } = parseArrayWarning(Array.from(settingsSet.values()), userSettingItem);
|
|
42
60
|
if (settingsWarning.length > 0) {
|
|
43
61
|
ensureLogger(vctx.sthis, "ensureUserSettings").Warn().Any({ parseErrors: settingsWarning }).Msg("skip");
|
|
@@ -49,11 +67,12 @@ export async function ensureUserSettings(vctx, req) {
|
|
|
49
67
|
updated: now,
|
|
50
68
|
})
|
|
51
69
|
.where(eq(vctx.sql.tables.userSettings.userId, userId));
|
|
70
|
+
const wireSettings = settings.filter((item) => item.type !== "geoCountry");
|
|
52
71
|
await migrateLegacyAvatar(vctx, userId, settings);
|
|
53
72
|
return Result.Ok({
|
|
54
73
|
type: "vibes.diy.res-ensure-user-settings",
|
|
55
74
|
userId,
|
|
56
|
-
settings,
|
|
75
|
+
settings: wireSettings,
|
|
57
76
|
updated: now,
|
|
58
77
|
created: existing.created,
|
|
59
78
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensure-user-settings.js","sourceRoot":"","sources":["../../jsr/public/ensure-user-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,EAAsC,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClH,OAAO,EAEL,qBAAqB,EAIrB,iBAAiB,EACjB,eAAe,GAGhB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"ensure-user-settings.js","sourceRoot":"","sources":["../../jsr/public/ensure-user-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,12 +25,12 @@ export declare function listPlatformDbs(): readonly PlatformDbEntry[];
|
|
|
25
25
|
export declare function lookupPlatformDb(dbName: string): PlatformDbEntry | undefined;
|
|
26
26
|
export declare function platformBuiltinSourceForCid(cid: string): string | undefined;
|
|
27
27
|
export interface LegacyPlatformDbEntry {
|
|
28
|
-
readonly id: "media"
|
|
28
|
+
readonly id: "media";
|
|
29
29
|
readonly accessFnCid: string;
|
|
30
30
|
readonly accessFnSource: string;
|
|
31
31
|
readonly exportSelector: string;
|
|
32
32
|
readonly visibilityCeiling: false;
|
|
33
33
|
}
|
|
34
|
-
export declare const LEGACY_PLATFORM_DBS: ReadonlyMap<"media"
|
|
35
|
-
export declare function legacyPlatformDb(id: "media"
|
|
34
|
+
export declare const LEGACY_PLATFORM_DBS: ReadonlyMap<"media", LegacyPlatformDbEntry>;
|
|
35
|
+
export declare function legacyPlatformDb(id: "media"): LegacyPlatformDbEntry;
|
|
36
36
|
export declare function platformDbPinAllowed(entry: PlatformDbEntry, acl: DbAcl): boolean;
|
|
@@ -2,7 +2,6 @@ import { sha256 } from "@noble/hashes/sha2.js";
|
|
|
2
2
|
import { utf8ToBytes } from "@noble/hashes/utils.js";
|
|
3
3
|
import { base58btc } from "multiformats/bases/base58";
|
|
4
4
|
import { COMMENTS_DEFAULT_ACL, COMMENTS_OPEN_DEFAULT_ACL, } from "@vibes.diy/api-types";
|
|
5
|
-
import { DM_BUILTIN_CID, DM_BUILTIN_SOURCE } from "./dm-access-fn.js";
|
|
6
5
|
import { MEDIA_BUILTIN_CID, MEDIA_BUILTIN_SOURCE } from "./media-access-fn.js";
|
|
7
6
|
import { PLATFORM_COMMENTS_DESCRIPTOR, PLATFORM_COMMENTS_SOURCE } from "./platform-comments-access-fn.js";
|
|
8
7
|
export const PLATFORM_DB_PREFIX = "_";
|
|
@@ -62,16 +61,6 @@ export const LEGACY_PLATFORM_DBS = new Map([
|
|
|
62
61
|
visibilityCeiling: false,
|
|
63
62
|
},
|
|
64
63
|
],
|
|
65
|
-
[
|
|
66
|
-
"dm",
|
|
67
|
-
{
|
|
68
|
-
id: "dm",
|
|
69
|
-
accessFnCid: DM_BUILTIN_CID,
|
|
70
|
-
accessFnSource: DM_BUILTIN_SOURCE,
|
|
71
|
-
exportSelector: "messages",
|
|
72
|
-
visibilityCeiling: false,
|
|
73
|
-
},
|
|
74
|
-
],
|
|
75
64
|
]);
|
|
76
65
|
export function legacyPlatformDb(id) {
|
|
77
66
|
const entry = LEGACY_PLATFORM_DBS.get(id);
|