@open-pencil/cloud 0.17.0-beta.5 → 0.17.0-beta.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/dist/client.d.ts +560 -93
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +1101 -186
- package/dist/client.js.map +1 -1
- package/dist/contract.d.ts +2 -2
- package/dist/contract.js +2 -2
- package/dist/contract2.js +390 -44
- package/dist/contract2.js.map +1 -1
- package/dist/email.d.ts +366 -3
- package/dist/email.d.ts.map +1 -1
- package/dist/email.js +1403 -556
- package/dist/email.js.map +1 -1
- package/dist/errors.js +16 -3
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +878 -37
- package/dist/index.d.ts.map +1 -1
- package/dist/index2.d.ts +12 -2
- package/dist/index2.d.ts.map +1 -1
- package/dist/listen.mjs +589 -128
- package/dist/listen.mjs.map +1 -1
- package/dist/runtime-cloudflare.d.ts +4 -0
- package/dist/runtime-cloudflare.d.ts.map +1 -1
- package/dist/runtime-cloudflare.js +8690 -6325
- package/dist/runtime-cloudflare.js.map +1 -1
- package/dist/runtime-node.d.mts +10098 -5401
- package/dist/runtime-node.d.mts.map +1 -1
- package/dist/server.d.ts +13807 -7638
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +11723 -9412
- package/dist/server.js.map +1 -1
- package/dist/server.mjs +10659 -8650
- package/dist/server.mjs.map +1 -1
- package/dist/server2.mjs +79 -57
- package/dist/server2.mjs.map +1 -1
- package/package.json +13 -4
- package/src/admin/api/routes.ts +263 -190
- package/src/admin/audit/service.ts +9 -1
- package/src/admin/bootstrap.ts +86 -0
- package/src/admin/documents/service.ts +119 -4
- package/src/admin/email/service.ts +2 -1
- package/src/admin/enrollment/email.ts +17 -3
- package/src/admin/enrollment/service.ts +71 -10
- package/src/admin/errors.ts +5 -0
- package/src/admin/index.ts +1 -0
- package/src/admin/reports/service.ts +9 -3
- package/src/admin/schema.ts +6 -5
- package/src/admin/users/service.ts +173 -16
- package/src/client/api.ts +29 -2
- package/src/client/comments.ts +205 -0
- package/src/client/device-authorization.ts +4 -20
- package/src/client/discovery.ts +4 -2
- package/src/client/files/archive.ts +60 -0
- package/src/client/files/checksum.ts +7 -0
- package/src/client/files/download.ts +122 -0
- package/src/client/files/images.ts +89 -0
- package/src/client/files/index.ts +15 -0
- package/src/client/files/objects.ts +173 -0
- package/src/client/files/save.ts +79 -0
- package/src/client/index.ts +3 -6
- package/src/client/portal/account.ts +20 -2
- package/src/client/portal/administration.ts +52 -5
- package/src/client/portal/request.ts +4 -2
- package/src/client/tour.ts +44 -0
- package/src/client/versions.ts +7 -1
- package/src/contract/account.ts +61 -11
- package/src/contract/admin/index.ts +48 -3
- package/src/contract/billing.ts +73 -4
- package/src/contract/comments.ts +223 -0
- package/src/contract/discovery.ts +47 -19
- package/src/contract/index.ts +10 -0
- package/src/contract/links.ts +5 -0
- package/src/contract/relay.ts +3 -1
- package/src/contract/services.ts +44 -4
- package/src/contract/workspaces.ts +5 -0
- package/src/email/locales/ar.json +28 -0
- package/src/email/locales/de.json +28 -0
- package/src/email/locales/es.json +28 -0
- package/src/email/locales/fr.json +28 -0
- package/src/email/locales/it.json +28 -0
- package/src/email/locales/ja.json +28 -0
- package/src/email/locales/pl.json +28 -0
- package/src/email/locales/pt-br.json +28 -0
- package/src/email/locales/ru.json +28 -0
- package/src/email/locales/zh-cn.json +28 -0
- package/src/email/messages.ts +35 -0
- package/src/email/render.ts +18 -0
- package/src/email/samples.ts +28 -1
- package/src/email/schema.ts +29 -3
- package/src/email/templates/BrandEmail.vue +3 -1
- package/src/email/templates/CommentNotification.vue +39 -0
- package/src/email/templates/EnrollmentInvitation.vue +53 -0
- package/src/email/templates/TwoStepChanged.vue +17 -2
- package/src/email/templates/brand.ts +6 -0
- package/src/errors/posthog.ts +28 -4
- package/src/runtime/cloudflare/email.ts +2 -0
- package/src/runtime/cloudflare/relay/index.ts +21 -6
- package/src/runtime/cloudflare/worker.ts +6 -0
- package/src/runtime/cloudflare/xml.ts +12 -0
- package/src/runtime/node/admin.ts +51 -47
- package/src/runtime/node/email/runtime.ts +1 -0
- package/src/runtime/node/email/transport.ts +1 -0
- package/src/runtime/node/server.ts +8 -2
- package/src/runtime/posthog/errors.ts +3 -1
- package/src/runtime/site/server.ts +4 -1
- package/src/server/account/actions.ts +3 -1
- package/src/server/account/deletion.ts +38 -4
- package/src/server/account/routes.ts +67 -46
- package/src/server/account/tokens.ts +3 -3
- package/src/server/api/router.ts +22 -7
- package/src/server/app/checks.ts +6 -1
- package/src/server/app/cors.ts +44 -0
- package/src/server/app/index.ts +76 -76
- package/src/server/app/routes.ts +14 -5
- package/src/server/app/services.ts +49 -15
- package/src/server/auth/access-control.ts +13 -8
- package/src/server/auth/account.ts +13 -12
- package/src/server/auth/activity.ts +7 -2
- package/src/server/auth/adapter.ts +16 -3
- package/src/server/auth/email.ts +29 -17
- package/src/server/auth/endpoints.ts +4 -0
- package/src/server/auth/factory.ts +83 -64
- package/src/server/auth/index.ts +1 -1
- package/src/server/auth/methods.ts +162 -0
- package/src/server/auth/mfa-assurance.ts +147 -10
- package/src/server/auth/rate-limit.ts +31 -0
- package/src/server/auth/runtime.ts +19 -5
- package/src/server/auth/social-providers.ts +70 -24
- package/src/server/billing/index.ts +2 -0
- package/src/server/billing/notify.ts +55 -0
- package/src/server/billing/seats.ts +17 -0
- package/src/server/billing/tokens.ts +1 -1
- package/src/server/cleanup/documents.ts +5 -2
- package/src/server/cleanup/revisions.ts +6 -3
- package/src/server/cleanup/uploads.ts +2 -1
- package/src/server/collaboration/relay/connection.ts +7 -2
- package/src/server/collaboration/relay/hub.ts +55 -24
- package/src/server/collaboration/routes.ts +8 -5
- package/src/server/comments/index.ts +9 -0
- package/src/server/comments/notify.ts +277 -0
- package/src/server/comments/routes.ts +352 -0
- package/src/server/comments/rows.ts +249 -0
- package/src/server/comments/service.ts +570 -0
- package/src/server/community/routes.ts +6 -6
- package/src/server/config/deployment.ts +19 -6
- package/src/server/config/index.ts +1 -1
- package/src/server/config/public.ts +19 -6
- package/src/server/config/schema.ts +14 -2
- package/src/server/config/toml/schema.ts +27 -4
- package/src/server/db/index.ts +2 -1
- package/src/server/db/migrate.ts +21 -1
- package/src/server/db/migrations/015_comments.ts +57 -0
- package/src/server/db/migrations/016_comment_notifications.ts +76 -0
- package/src/server/db/migrations/017_invitation_emails.ts +19 -0
- package/src/server/db/migrations/018_enrollment_source.ts +17 -0
- package/src/server/db/tables.ts +92 -2
- package/src/server/documents/access.ts +17 -0
- package/src/server/documents/images.ts +6 -1
- package/src/server/documents/routes.ts +12 -12
- package/src/server/documents/service.ts +19 -5
- package/src/server/documents/summary.ts +15 -0
- package/src/server/documents/versions/routes.ts +7 -8
- package/src/server/documents/versions/service.ts +5 -2
- package/src/server/email/service.ts +8 -2
- package/src/server/email/types.ts +1 -0
- package/src/server/errors/index.ts +48 -3
- package/src/server/index.ts +15 -1
- package/src/server/internal/routes.ts +8 -2
- package/src/server/internal/service.ts +10 -0
- package/src/server/invitations/budget.ts +3 -1
- package/src/server/invitations/index.ts +1 -0
- package/src/server/invitations/links.ts +6 -0
- package/src/server/pictures/service.ts +3 -1
- package/src/server/policy/workspace.ts +5 -2
- package/src/server/reports/routes.ts +2 -2
- package/src/server/reports/service.ts +3 -1
- package/src/server/services/routes.ts +2 -2
- package/src/server/sharing/capabilities/service.ts +1 -1
- package/src/server/sharing/document-routes.ts +3 -3
- package/src/server/sharing/invitations/service.ts +3 -4
- package/src/server/sharing/routes.ts +15 -15
- package/src/server/validation.ts +33 -25
- package/src/server/workspaces/members.ts +50 -12
- package/src/server/workspaces/repository.ts +23 -12
- package/src/server/workspaces/routes.ts +8 -8
- package/src/services/app.ts +30 -19
- package/src/services/config.ts +47 -8
- package/src/services/metering.ts +15 -27
- package/src/client/billing.ts +0 -80
package/src/services/metering.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ChatModel } from '#cloud/contract'
|
|
2
|
+
import { EventSourceParserStream } from 'eventsource-parser/stream'
|
|
2
3
|
import * as v from 'valibot'
|
|
3
4
|
|
|
4
5
|
export type TokenUsage = { inputTokens: number; outputTokens: number }
|
|
@@ -10,6 +11,12 @@ const usageSchema = v.object({
|
|
|
10
11
|
|
|
11
12
|
const usageBodySchema = v.pipe(v.string(), v.parseJson(), usageSchema)
|
|
12
13
|
|
|
14
|
+
/**
|
|
15
|
+
* The most an event may buffer before metering gives up, in characters. Stream events carry a
|
|
16
|
+
* small delta each, so only an upstream that never ends an event reaches it.
|
|
17
|
+
*/
|
|
18
|
+
const MAX_EVENT_CHARACTERS = 1024 * 1024
|
|
19
|
+
|
|
13
20
|
function usageOf(text: string): TokenUsage | null {
|
|
14
21
|
const parsed = v.safeParse(usageBodySchema, text)
|
|
15
22
|
if (!parsed.success) return null
|
|
@@ -33,36 +40,17 @@ export function creditsFor(model: ChatModel, usage: TokenUsage): number {
|
|
|
33
40
|
* event that carries one, which upstreams send when asked with `stream_options.include_usage`.
|
|
34
41
|
*/
|
|
35
42
|
export async function meteredUsage(
|
|
36
|
-
body: ReadableStream<Uint8Array
|
|
43
|
+
body: ReadableStream<Uint8Array<ArrayBuffer>>,
|
|
37
44
|
streamed: boolean
|
|
38
45
|
): Promise<TokenUsage | null> {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
const chunks = async function* () {
|
|
42
|
-
for (let next = await reader.read(); !next.done; next = await reader.read()) {
|
|
43
|
-
yield decoder.decode(next.value, { stream: true })
|
|
44
|
-
}
|
|
45
|
-
yield decoder.decode()
|
|
46
|
-
}
|
|
47
|
-
if (!streamed) {
|
|
48
|
-
let text = ''
|
|
49
|
-
for await (const chunk of chunks()) text += chunk
|
|
50
|
-
return usageOf(text)
|
|
51
|
-
}
|
|
46
|
+
if (!streamed) return usageOf(await new Response(body).text())
|
|
47
|
+
// Server-sent events, as OpenAI-compatible APIs stream them; `[DONE]` ends the stream.
|
|
52
48
|
let usage: TokenUsage | null = null
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
if (data
|
|
58
|
-
usage = usageOf(data) ?? usage
|
|
59
|
-
}
|
|
60
|
-
for await (const chunk of chunks()) {
|
|
61
|
-
pending += chunk
|
|
62
|
-
const parts = pending.split(/\r?\n/)
|
|
63
|
-
pending = parts.pop() ?? ''
|
|
64
|
-
for (const line of parts) read(line)
|
|
49
|
+
const events = body
|
|
50
|
+
.pipeThrough(new TextDecoderStream())
|
|
51
|
+
.pipeThrough(new EventSourceParserStream({ maxBufferSize: MAX_EVENT_CHARACTERS }))
|
|
52
|
+
for await (const event of events) {
|
|
53
|
+
if (event.data !== '[DONE]') usage = usageOf(event.data) ?? usage
|
|
65
54
|
}
|
|
66
|
-
read(pending)
|
|
67
55
|
return usage
|
|
68
56
|
}
|
package/src/client/billing.ts
DELETED
|
@@ -1,80 +0,0 @@
|
|
|
1
|
-
import type { CloudFetch } from '#cloud/client/discovery'
|
|
2
|
-
import { serviceJSON } from '#cloud/client/response'
|
|
3
|
-
import { cloudServicesFetch, type CloudServicesTokenSource } from '#cloud/client/services'
|
|
4
|
-
import {
|
|
5
|
-
billingAccountSchema,
|
|
6
|
-
billingCatalogSchema,
|
|
7
|
-
billingErrorSchema,
|
|
8
|
-
billingRedirectSchema,
|
|
9
|
-
type BillingAccount,
|
|
10
|
-
type BillingCatalog,
|
|
11
|
-
type BillingErrorCode,
|
|
12
|
-
type CheckoutRequest,
|
|
13
|
-
type CloudBillingAPI
|
|
14
|
-
} from '#cloud/contract'
|
|
15
|
-
import { hc } from 'hono/client'
|
|
16
|
-
import { withoutTrailingSlash } from 'ufo'
|
|
17
|
-
import * as v from 'valibot'
|
|
18
|
-
|
|
19
|
-
export class CloudBillingError extends Error {
|
|
20
|
-
override readonly name = 'CloudBillingError'
|
|
21
|
-
|
|
22
|
-
constructor(
|
|
23
|
-
readonly status: number,
|
|
24
|
-
readonly code?: BillingErrorCode
|
|
25
|
-
) {
|
|
26
|
-
super(`OpenPencil billing request failed with HTTP ${status}`)
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
const errorBodySchema = v.pipe(v.string(), v.parseJson(), billingErrorSchema)
|
|
31
|
-
|
|
32
|
-
function refused(status: number, body: string): CloudBillingError {
|
|
33
|
-
const error = v.safeParse(errorBodySchema, body)
|
|
34
|
-
return new CloudBillingError(status, error.success ? error.output.error.code : undefined)
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
export type CloudBillingClientOptions = {
|
|
38
|
-
/** The billing service's endpoint, as Cloud's discovery names it. */
|
|
39
|
-
endpoint: string
|
|
40
|
-
/** Billing tokens for the signed-in person, from `requestBillingToken`. */
|
|
41
|
-
tokens: CloudServicesTokenSource
|
|
42
|
-
fetch: CloudFetch
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
/**
|
|
46
|
-
* The billing a Cloud advertises: what it sells, the account's subscription, and where to buy or
|
|
47
|
-
* manage it. Checkout and the portal answer with the payment provider's page to open, so a token
|
|
48
|
-
* never travels in a URL.
|
|
49
|
-
*/
|
|
50
|
-
export function createCloudBillingClient(options: CloudBillingClientOptions) {
|
|
51
|
-
const endpoint = withoutTrailingSlash(options.endpoint)
|
|
52
|
-
// Answers are parsed rather than trusted: the service is deployed apart from this client.
|
|
53
|
-
const { v1 } = hc<CloudBillingAPI>(endpoint, {
|
|
54
|
-
fetch: cloudServicesFetch(options.tokens, options.fetch)
|
|
55
|
-
})
|
|
56
|
-
return {
|
|
57
|
-
async catalog(): Promise<BillingCatalog> {
|
|
58
|
-
return serviceJSON(await v1.catalog.$get(), billingCatalogSchema, refused)
|
|
59
|
-
},
|
|
60
|
-
async account(): Promise<BillingAccount> {
|
|
61
|
-
return serviceJSON(await v1.account.$get(), billingAccountSchema, refused)
|
|
62
|
-
},
|
|
63
|
-
/** The checkout page that buys `request` for the account. */
|
|
64
|
-
async checkout(request: CheckoutRequest): Promise<string> {
|
|
65
|
-
return (
|
|
66
|
-
await serviceJSON(
|
|
67
|
-
await v1.checkout.$post({ json: request }),
|
|
68
|
-
billingRedirectSchema,
|
|
69
|
-
refused
|
|
70
|
-
)
|
|
71
|
-
).url
|
|
72
|
-
},
|
|
73
|
-
/** The page where the account cancels, changes its card, and reads its invoices. */
|
|
74
|
-
async portal(): Promise<string> {
|
|
75
|
-
return (await serviceJSON(await v1.portal.$post(), billingRedirectSchema, refused)).url
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
export type CloudBillingClient = ReturnType<typeof createCloudBillingClient>
|