@vitnode/core 1.2.0-canary.52 → 1.2.0-canary.54
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/config/next.config.ts +3 -3
- package/dist/scripts/get-config.d.ts +2 -2
- package/dist/scripts/get-config.d.ts.map +1 -1
- package/dist/scripts/plugin.d.ts.map +1 -1
- package/dist/scripts/prepare-database.d.ts +0 -1
- package/dist/scripts/prepare-database.d.ts.map +1 -1
- package/dist/scripts/prepare-plugins-files.d.ts.map +1 -1
- package/dist/scripts/scripts.js +3 -3
- package/dist/scripts/shared/file-utils.d.ts.map +1 -1
- package/dist/src/api/adapters/cron/node-cron.adapter.d.ts +3 -0
- package/dist/src/api/adapters/cron/node-cron.adapter.d.ts.map +1 -0
- package/dist/src/api/adapters/cron/node-cron.adapter.js +11 -0
- package/dist/src/api/adapters/email/nodemailer.d.ts +1 -1
- package/dist/src/api/adapters/email/nodemailer.js +3 -3
- package/dist/src/api/adapters/email/resend.d.ts +1 -1
- package/dist/src/api/adapters/email/resend.js +2 -2
- package/dist/src/api/adapters/sso/discord.d.ts +1 -1
- package/dist/src/api/adapters/sso/discord.d.ts.map +1 -1
- package/dist/src/api/adapters/sso/discord.js +21 -21
- package/dist/src/api/adapters/sso/facebook.d.ts +1 -1
- package/dist/src/api/adapters/sso/facebook.d.ts.map +1 -1
- package/dist/src/api/adapters/sso/facebook.js +23 -23
- package/dist/src/api/adapters/sso/google.d.ts +1 -1
- package/dist/src/api/adapters/sso/google.d.ts.map +1 -1
- package/dist/src/api/adapters/sso/google.js +21 -21
- package/dist/src/api/config.d.ts +3 -3
- package/dist/src/api/config.d.ts.map +1 -1
- package/dist/src/api/config.js +30 -18
- package/dist/src/api/lib/check-plugin-id.js +8 -8
- package/dist/src/api/lib/cron.d.ts +18 -0
- package/dist/src/api/lib/cron.d.ts.map +1 -0
- package/dist/src/api/lib/cron.js +22 -0
- package/dist/src/api/lib/logger-middleware.d.ts +1 -1
- package/dist/src/api/lib/logger-middleware.js +9 -9
- package/dist/src/api/lib/module.d.ts +6 -3
- package/dist/src/api/lib/module.d.ts.map +1 -1
- package/dist/src/api/lib/module.js +3 -2
- package/dist/src/api/lib/plugin.d.ts +4 -2
- package/dist/src/api/lib/plugin.d.ts.map +1 -1
- package/dist/src/api/lib/plugin.js +9 -1
- package/dist/src/api/lib/route.d.ts +2 -2
- package/dist/src/api/lib/route.d.ts.map +1 -1
- package/dist/src/api/lib/route.js +1 -1
- package/dist/src/api/lib/with-pagination.d.ts +7 -7
- package/dist/src/api/lib/with-pagination.d.ts.map +1 -1
- package/dist/src/api/lib/with-pagination.js +37 -24
- package/dist/src/api/middlewares/captcha.middleware.d.ts +1 -1
- package/dist/src/api/middlewares/captcha.middleware.d.ts.map +1 -1
- package/dist/src/api/middlewares/captcha.middleware.js +14 -13
- package/dist/src/api/middlewares/cron-auth.middleware.d.ts +3 -0
- package/dist/src/api/middlewares/cron-auth.middleware.d.ts.map +1 -0
- package/dist/src/api/middlewares/cron-auth.middleware.js +19 -0
- package/dist/src/api/middlewares/global.middleware.d.ts +18 -12
- package/dist/src/api/middlewares/global.middleware.d.ts.map +1 -1
- package/dist/src/api/middlewares/global.middleware.js +46 -34
- package/dist/src/api/middlewares/rate-limiter.middleware.d.ts +3 -3
- package/dist/src/api/middlewares/rate-limiter.middleware.d.ts.map +1 -1
- package/dist/src/api/middlewares/rate-limiter.middleware.js +4 -4
- package/dist/src/api/models/device.d.ts +1 -1
- package/dist/src/api/models/device.d.ts.map +1 -1
- package/dist/src/api/models/device.js +13 -13
- package/dist/src/api/models/email.d.ts +15 -15
- package/dist/src/api/models/email.d.ts.map +1 -1
- package/dist/src/api/models/email.js +11 -10
- package/dist/src/api/models/password.js +9 -9
- package/dist/src/api/models/session-admin.d.ts +1 -1
- package/dist/src/api/models/session-admin.d.ts.map +1 -1
- package/dist/src/api/models/session-admin.js +19 -19
- package/dist/src/api/models/session.d.ts +1 -1
- package/dist/src/api/models/session.d.ts.map +1 -1
- package/dist/src/api/models/session.js +17 -17
- package/dist/src/api/models/sso.d.ts +1 -1
- package/dist/src/api/models/sso.d.ts.map +1 -1
- package/dist/src/api/models/sso.js +22 -25
- package/dist/src/api/models/user/get-user-by-id.d.ts +1 -1
- package/dist/src/api/models/user/get-user-by-id.d.ts.map +1 -1
- package/dist/src/api/models/user/get-user-by-id.js +1 -1
- package/dist/src/api/models/user/sign-in-with-passwords.d.ts +1 -1
- package/dist/src/api/models/user/sign-in-with-passwords.d.ts.map +1 -1
- package/dist/src/api/models/user/sign-in-with-passwords.js +1 -1
- package/dist/src/api/models/user/sign-up.d.ts +2 -2
- package/dist/src/api/models/user/sign-up.d.ts.map +1 -1
- package/dist/src/api/models/user/sign-up.js +11 -12
- package/dist/src/api/models/user.d.ts +1 -1
- package/dist/src/api/models/user.d.ts.map +1 -1
- package/dist/src/api/modules/admin/admin.module.d.ts +166 -4
- package/dist/src/api/modules/admin/admin.module.d.ts.map +1 -1
- package/dist/src/api/modules/admin/admin.module.js +7 -4
- package/dist/src/api/modules/admin/advanced/advanced.admin.module.d.ts +164 -0
- package/dist/src/api/modules/admin/advanced/advanced.admin.module.d.ts.map +1 -0
- package/dist/src/api/modules/admin/advanced/advanced.admin.module.js +11 -0
- package/dist/src/api/modules/admin/advanced/cron/cron.admin.module.d.ts +164 -0
- package/dist/src/api/modules/admin/advanced/cron/cron.admin.module.d.ts.map +1 -0
- package/dist/src/api/modules/admin/advanced/cron/cron.admin.module.js +12 -0
- package/dist/src/api/modules/admin/advanced/cron/routes/get.route.d.ts +98 -0
- package/dist/src/api/modules/admin/advanced/cron/routes/get.route.d.ts.map +1 -0
- package/dist/src/api/modules/admin/advanced/cron/routes/get.route.js +66 -0
- package/dist/src/api/modules/admin/advanced/cron/routes/run.route.d.ts +70 -0
- package/dist/src/api/modules/admin/advanced/cron/routes/run.route.d.ts.map +1 -0
- package/dist/src/api/modules/admin/advanced/cron/routes/run.route.js +95 -0
- package/dist/src/api/modules/admin/debug/debug.admin.module.d.ts +1 -1
- package/dist/src/api/modules/admin/debug/debug.admin.module.js +2 -2
- package/dist/src/api/modules/admin/debug/routes/logs.route.d.ts +2 -2
- package/dist/src/api/modules/admin/debug/routes/logs.route.js +17 -17
- package/dist/src/api/modules/admin/routes/session.route.d.ts +2 -2
- package/dist/src/api/modules/admin/routes/session.route.js +8 -8
- package/dist/src/api/modules/admin/users/routes/list.route.d.ts +2 -2
- package/dist/src/api/modules/admin/users/routes/list.route.js +13 -13
- package/dist/src/api/modules/admin/users/routes/users.route.d.ts +5 -5
- package/dist/src/api/modules/admin/users/routes/users.route.js +16 -16
- package/dist/src/api/modules/admin/users/users.admin.module.d.ts +1 -1
- package/dist/src/api/modules/admin/users/users.admin.module.js +2 -2
- package/dist/src/api/modules/cron/cron/clean.cron.d.ts +2 -0
- package/dist/src/api/modules/cron/cron/clean.cron.d.ts.map +1 -0
- package/dist/src/api/modules/cron/cron/clean.cron.js +24 -0
- package/dist/src/api/modules/cron/cron.module.d.ts +26 -0
- package/dist/src/api/modules/cron/cron.module.d.ts.map +1 -0
- package/dist/src/api/modules/cron/cron.module.js +14 -0
- package/dist/src/api/modules/cron/helpers/process-cron-jobs.d.ts +36 -0
- package/dist/src/api/modules/cron/helpers/process-cron-jobs.d.ts.map +1 -0
- package/dist/src/api/modules/cron/helpers/process-cron-jobs.js +72 -0
- package/dist/src/api/modules/cron/routes/cron.route.d.ts +27 -0
- package/dist/src/api/modules/cron/routes/cron.route.d.ts.map +1 -0
- package/dist/src/api/modules/cron/routes/cron.route.js +95 -0
- package/dist/src/api/modules/middleware/middleware.module.d.ts +1 -1
- package/dist/src/api/modules/middleware/middleware.module.js +2 -2
- package/dist/src/api/modules/middleware/route.d.ts +2 -2
- package/dist/src/api/modules/middleware/route.js +13 -13
- package/dist/src/api/modules/users/routes/change-password.route.d.ts +2 -2
- package/dist/src/api/modules/users/routes/change-password.route.js +14 -14
- package/dist/src/api/modules/users/routes/reset-passowrd.route.d.ts +2 -2
- package/dist/src/api/modules/users/routes/reset-passowrd.route.js +18 -18
- package/dist/src/api/modules/users/routes/session.route.d.ts +2 -2
- package/dist/src/api/modules/users/routes/session.route.js +7 -7
- package/dist/src/api/modules/users/routes/sign-in.route.d.ts +3 -3
- package/dist/src/api/modules/users/routes/sign-in.route.js +11 -11
- package/dist/src/api/modules/users/routes/sign-out.route.d.ts +2 -2
- package/dist/src/api/modules/users/routes/sign-out.route.js +8 -8
- package/dist/src/api/modules/users/routes/sign-up.route.d.ts +3 -3
- package/dist/src/api/modules/users/routes/sign-up.route.js +15 -15
- package/dist/src/api/modules/users/routes/test.route.d.ts +3 -3
- package/dist/src/api/modules/users/routes/test.route.js +10 -10
- package/dist/src/api/modules/users/sso/routes/callback.route.d.ts +2 -2
- package/dist/src/api/modules/users/sso/routes/callback.route.js +9 -9
- package/dist/src/api/modules/users/sso/routes/create-url.route.d.ts +2 -2
- package/dist/src/api/modules/users/sso/routes/create-url.route.js +7 -7
- package/dist/src/api/modules/users/sso/sso.module.d.ts +2 -2
- package/dist/src/api/modules/users/sso/sso.module.js +2 -2
- package/dist/src/api/modules/users/users.module.d.ts +12 -12
- package/dist/src/api/modules/users/users.module.js +2 -2
- package/dist/src/api/plugin.d.ts.map +1 -1
- package/dist/src/api/plugin.js +4 -2
- package/dist/src/app/login/page.d.ts +1 -1
- package/dist/src/app/login/page.js +2 -2
- package/dist/src/app/login/reset-password/page.d.ts +2 -2
- package/dist/src/app/login/reset-password/page.js +2 -2
- package/dist/src/app/register/page.d.ts +1 -1
- package/dist/src/app/register/page.js +2 -2
- package/dist/src/app_admin/core/advanced/cron/page.d.ts +11 -0
- package/dist/src/app_admin/core/advanced/cron/page.d.ts.map +1 -0
- package/dist/src/app_admin/core/advanced/cron/page.js +42 -0
- package/dist/src/app_admin/core/debug/page.d.ts +1 -1
- package/dist/src/app_admin/core/debug/page.js +8 -8
- package/dist/src/app_admin/core/users/page.d.ts +2 -2
- package/dist/src/app_admin/core/users/page.d.ts.map +1 -1
- package/dist/src/app_admin/core/users/page.js +7 -7
- package/dist/src/components/avatar.d.ts +1 -1
- package/dist/src/components/avatar.js +1 -1
- package/dist/src/components/confirm-action/confirm-action-alert-dialog.d.ts +2 -2
- package/dist/src/components/confirm-action/confirm-action-alert-dialog.js +5 -5
- package/dist/src/components/confirm-action/content.d.ts.map +1 -1
- package/dist/src/components/confirm-action/content.js +3 -4
- package/dist/src/components/date-format.js +8 -8
- package/dist/src/components/form/auto-form.d.ts +16 -16
- package/dist/src/components/form/auto-form.d.ts.map +1 -1
- package/dist/src/components/form/auto-form.js +13 -12
- package/dist/src/components/form/common/desc.js +1 -1
- package/dist/src/components/form/common/label.d.ts +1 -1
- package/dist/src/components/form/common/label.js +1 -1
- package/dist/src/components/form/fields/checkbox.d.ts +2 -2
- package/dist/src/components/form/fields/checkbox.d.ts.map +1 -1
- package/dist/src/components/form/fields/combobox-async.d.ts +3 -3
- package/dist/src/components/form/fields/combobox-async.d.ts.map +1 -1
- package/dist/src/components/form/fields/combobox-async.js +29 -23
- package/dist/src/components/form/fields/combobox.d.ts +3 -3
- package/dist/src/components/form/fields/combobox.d.ts.map +1 -1
- package/dist/src/components/form/fields/combobox.js +6 -7
- package/dist/src/components/form/fields/input.d.ts +2 -2
- package/dist/src/components/form/fields/input.d.ts.map +1 -1
- package/dist/src/components/form/fields/input.js +2 -2
- package/dist/src/components/form/fields/radio-group.d.ts +3 -3
- package/dist/src/components/form/fields/radio-group.d.ts.map +1 -1
- package/dist/src/components/form/fields/radio-group.js +0 -1
- package/dist/src/components/form/fields/select.d.ts +3 -3
- package/dist/src/components/form/fields/select.d.ts.map +1 -1
- package/dist/src/components/form/fields/select.js +2 -3
- package/dist/src/components/form/fields/switch.d.ts +2 -2
- package/dist/src/components/form/fields/switch.d.ts.map +1 -1
- package/dist/src/components/form/fields/textarea.d.ts +3 -3
- package/dist/src/components/form/fields/textarea.d.ts.map +1 -1
- package/dist/src/components/form/fields/textarea.js +1 -2
- package/dist/src/components/i18n-provider.d.ts +2 -2
- package/dist/src/components/i18n-provider.js +3 -3
- package/dist/src/components/logo-vitnode.d.ts.map +1 -1
- package/dist/src/components/logo-vitnode.js +8 -2
- package/dist/src/components/switchers/langs/{language-swietcher.d.ts → language-switcher.d.ts} +2 -2
- package/dist/src/components/switchers/langs/language-switcher.d.ts.map +1 -0
- package/dist/src/components/switchers/langs/{language-swietcher.js → language-switcher.js} +3 -3
- package/dist/src/components/switchers/themes/theme-switcher.js +4 -4
- package/dist/src/components/table/content.d.ts +1 -1
- package/dist/src/components/table/content.d.ts.map +1 -1
- package/dist/src/components/table/content.js +5 -5
- package/dist/src/components/table/data-table.d.ts +7 -7
- package/dist/src/components/table/data-table.d.ts.map +1 -1
- package/dist/src/components/table/data-table.js +22 -15
- package/dist/src/components/table/order-table-head.d.ts +4 -4
- package/dist/src/components/table/order-table-head.d.ts.map +1 -1
- package/dist/src/components/table/order-table-head.js +20 -9
- package/dist/src/components/table/pagination.js +19 -19
- package/dist/src/components/tiptap/extension.d.ts +4 -0
- package/dist/src/components/tiptap/extension.d.ts.map +1 -0
- package/dist/src/components/tiptap/extension.js +26 -0
- package/dist/src/components/tiptap/toolbar/actions/bold-action.d.ts +2 -0
- package/dist/src/components/tiptap/toolbar/actions/bold-action.d.ts.map +1 -0
- package/dist/src/components/tiptap/toolbar/actions/bold-action.js +39 -0
- package/dist/src/components/tiptap/toolbar/actions/headings-action.d.ts +2 -0
- package/dist/src/components/tiptap/toolbar/actions/headings-action.d.ts.map +1 -0
- package/dist/src/components/tiptap/toolbar/actions/headings-action.js +94 -0
- package/dist/src/components/tiptap/toolbar/actions/italic-action.d.ts +2 -0
- package/dist/src/components/tiptap/toolbar/actions/italic-action.d.ts.map +1 -0
- package/dist/src/components/tiptap/toolbar/actions/italic-action.js +38 -0
- package/dist/src/components/tiptap/toolbar/actions/list-action.d.ts +2 -0
- package/dist/src/components/tiptap/toolbar/actions/list-action.d.ts.map +1 -0
- package/dist/src/components/tiptap/toolbar/actions/list-action.js +60 -0
- package/dist/src/components/tiptap/toolbar/actions/text-format-more/text-format-more.d.ts +2 -0
- package/dist/src/components/tiptap/toolbar/actions/text-format-more/text-format-more.d.ts.map +1 -0
- package/dist/src/components/tiptap/toolbar/actions/text-format-more/text-format-more.js +59 -0
- package/dist/src/components/tiptap/toolbar/actions/underline-action.d.ts +2 -0
- package/dist/src/components/tiptap/toolbar/actions/underline-action.d.ts.map +1 -0
- package/dist/src/components/tiptap/toolbar/actions/underline-action.js +38 -0
- package/dist/src/components/tiptap/toolbar/actions/undo-redo-actions.d.ts +2 -0
- package/dist/src/components/tiptap/toolbar/actions/undo-redo-actions.d.ts.map +1 -0
- package/dist/src/components/tiptap/toolbar/actions/undo-redo-actions.js +63 -0
- package/dist/src/components/tiptap/toolbar/actions/utils/tooltip-shortcut.d.ts +4 -0
- package/dist/src/components/tiptap/toolbar/actions/utils/tooltip-shortcut.d.ts.map +1 -0
- package/dist/src/components/tiptap/toolbar/actions/utils/tooltip-shortcut.js +11 -0
- package/dist/src/components/tiptap/toolbar/tiptap-toolbar.d.ts +5 -0
- package/dist/src/components/tiptap/toolbar/tiptap-toolbar.d.ts.map +1 -0
- package/dist/src/components/tiptap/toolbar/tiptap-toolbar.js +35 -0
- package/dist/src/components/tiptap/toolbar/use-toolbar-editor.d.ts +9 -0
- package/dist/src/components/tiptap/toolbar/use-toolbar-editor.d.ts.map +1 -0
- package/dist/src/components/tiptap/toolbar/use-toolbar-editor.js +5 -0
- package/dist/src/components/ui/accordion.d.ts +2 -2
- package/dist/src/components/ui/accordion.d.ts.map +1 -1
- package/dist/src/components/ui/accordion.js +4 -5
- package/dist/src/components/ui/alert-dialog.d.ts +7 -7
- package/dist/src/components/ui/alert-dialog.d.ts.map +1 -1
- package/dist/src/components/ui/alert-dialog.js +12 -12
- package/dist/src/components/ui/alert.d.ts +5 -5
- package/dist/src/components/ui/alert.d.ts.map +1 -1
- package/dist/src/components/ui/alert.js +6 -7
- package/dist/src/components/ui/badge.d.ts +3 -3
- package/dist/src/components/ui/badge.d.ts.map +1 -1
- package/dist/src/components/ui/badge.js +7 -8
- package/dist/src/components/ui/button-client.d.ts +1 -1
- package/dist/src/components/ui/button-client.d.ts.map +1 -1
- package/dist/src/components/ui/button-client.js +10 -10
- package/dist/src/components/ui/button.d.ts +8 -8
- package/dist/src/components/ui/button.d.ts.map +1 -1
- package/dist/src/components/ui/button.js +14 -15
- package/dist/src/components/ui/card.d.ts +8 -8
- package/dist/src/components/ui/card.js +7 -7
- package/dist/src/components/ui/checkbox.d.ts +2 -2
- package/dist/src/components/ui/checkbox.d.ts.map +1 -1
- package/dist/src/components/ui/checkbox.js +2 -3
- package/dist/src/components/ui/collapsible.d.ts +1 -1
- package/dist/src/components/ui/collapsible.js +1 -1
- package/dist/src/components/ui/command.d.ts +4 -4
- package/dist/src/components/ui/command.d.ts.map +1 -1
- package/dist/src/components/ui/command.js +9 -10
- package/dist/src/components/ui/context-menu.d.ts +4 -4
- package/dist/src/components/ui/context-menu.d.ts.map +1 -1
- package/dist/src/components/ui/context-menu.js +7 -8
- package/dist/src/components/ui/dialog.d.ts +6 -6
- package/dist/src/components/ui/dialog.d.ts.map +1 -1
- package/dist/src/components/ui/dialog.js +16 -16
- package/dist/src/components/ui/drawer.d.ts +4 -4
- package/dist/src/components/ui/drawer.d.ts.map +1 -1
- package/dist/src/components/ui/drawer.js +7 -8
- package/dist/src/components/ui/dropdown-menu.d.ts +4 -4
- package/dist/src/components/ui/dropdown-menu.d.ts.map +1 -1
- package/dist/src/components/ui/dropdown-menu.js +8 -9
- package/dist/src/components/ui/editor-content.d.ts +4 -0
- package/dist/src/components/ui/editor-content.d.ts.map +1 -0
- package/dist/src/components/ui/editor-content.js +10 -0
- package/dist/src/components/ui/editor.d.ts +6 -0
- package/dist/src/components/ui/editor.d.ts.map +1 -0
- package/dist/src/components/ui/editor.js +35 -0
- package/dist/src/components/ui/form.d.ts +10 -10
- package/dist/src/components/ui/form.d.ts.map +1 -1
- package/dist/src/components/ui/form.js +15 -15
- package/dist/src/components/ui/header-content.js +1 -1
- package/dist/src/components/ui/hover-card.d.ts +2 -2
- package/dist/src/components/ui/hover-card.d.ts.map +1 -1
- package/dist/src/components/ui/hover-card.js +3 -4
- package/dist/src/components/ui/input-otp.d.ts +5 -5
- package/dist/src/components/ui/input-otp.d.ts.map +1 -1
- package/dist/src/components/ui/input-otp.js +6 -7
- package/dist/src/components/ui/input.d.ts +2 -2
- package/dist/src/components/ui/input.d.ts.map +1 -1
- package/dist/src/components/ui/input.js +1 -2
- package/dist/src/components/ui/label.d.ts +2 -2
- package/dist/src/components/ui/label.d.ts.map +1 -1
- package/dist/src/components/ui/label.js +2 -3
- package/dist/src/components/ui/loader.js +3 -3
- package/dist/src/components/ui/menubar.d.ts +4 -4
- package/dist/src/components/ui/menubar.d.ts.map +1 -1
- package/dist/src/components/ui/menubar.js +11 -12
- package/dist/src/components/ui/navigation-menu.d.ts +2 -2
- package/dist/src/components/ui/navigation-menu.d.ts.map +1 -1
- package/dist/src/components/ui/navigation-menu.js +10 -11
- package/dist/src/components/ui/popover.d.ts +2 -2
- package/dist/src/components/ui/popover.d.ts.map +1 -1
- package/dist/src/components/ui/popover.js +3 -4
- package/dist/src/components/ui/progress.d.ts +2 -2
- package/dist/src/components/ui/progress.d.ts.map +1 -1
- package/dist/src/components/ui/progress.js +2 -3
- package/dist/src/components/ui/radio-group.d.ts +2 -2
- package/dist/src/components/ui/radio-group.d.ts.map +1 -1
- package/dist/src/components/ui/radio-group.js +3 -4
- package/dist/src/components/ui/select.d.ts +3 -3
- package/dist/src/components/ui/select.d.ts.map +1 -1
- package/dist/src/components/ui/select.js +9 -10
- package/dist/src/components/ui/separator.d.ts +2 -2
- package/dist/src/components/ui/separator.d.ts.map +1 -1
- package/dist/src/components/ui/separator.js +3 -4
- package/dist/src/components/ui/sheet.d.ts +5 -5
- package/dist/src/components/ui/sheet.d.ts.map +1 -1
- package/dist/src/components/ui/sheet.js +8 -9
- package/dist/src/components/ui/sidebar.d.ts +31 -31
- package/dist/src/components/ui/sidebar.d.ts.map +1 -1
- package/dist/src/components/ui/sidebar.js +78 -80
- package/dist/src/components/ui/skeleton.d.ts +1 -1
- package/dist/src/components/ui/skeleton.js +1 -1
- package/dist/src/components/ui/slider.d.ts +2 -2
- package/dist/src/components/ui/slider.d.ts.map +1 -1
- package/dist/src/components/ui/slider.js +16 -8
- package/dist/src/components/ui/sonner.d.ts +1 -1
- package/dist/src/components/ui/sonner.d.ts.map +1 -1
- package/dist/src/components/ui/sonner.js +6 -6
- package/dist/src/components/ui/switch.d.ts +2 -2
- package/dist/src/components/ui/switch.d.ts.map +1 -1
- package/dist/src/components/ui/switch.js +3 -4
- package/dist/src/components/ui/table.d.ts +9 -9
- package/dist/src/components/ui/table.d.ts.map +1 -1
- package/dist/src/components/ui/table.js +8 -9
- package/dist/src/components/ui/tabs.d.ts +2 -2
- package/dist/src/components/ui/tabs.d.ts.map +1 -1
- package/dist/src/components/ui/tabs.js +4 -5
- package/dist/src/components/ui/textarea.d.ts +2 -2
- package/dist/src/components/ui/textarea.d.ts.map +1 -1
- package/dist/src/components/ui/textarea.js +1 -2
- package/dist/src/components/ui/toggle-group.d.ts +4 -4
- package/dist/src/components/ui/toggle-group.d.ts.map +1 -1
- package/dist/src/components/ui/toggle-group.js +6 -6
- package/dist/src/components/ui/toggle.d.ts +3 -3
- package/dist/src/components/ui/toggle.d.ts.map +1 -1
- package/dist/src/components/ui/toggle.js +8 -9
- package/dist/src/components/ui/tooltip.d.ts +6 -3
- package/dist/src/components/ui/tooltip.d.ts.map +1 -1
- package/dist/src/components/ui/tooltip.js +20 -5
- package/dist/src/config.js +2 -2
- package/dist/src/database/admins.js +10 -10
- package/dist/src/database/cron.d.ts +171 -0
- package/dist/src/database/cron.d.ts.map +1 -0
- package/dist/src/database/cron.js +22 -0
- package/dist/src/database/languages.js +7 -7
- package/dist/src/database/logs.js +9 -9
- package/dist/src/database/moderators.js +5 -5
- package/dist/src/database/roles.js +1 -1
- package/dist/src/database/sessions.js +6 -6
- package/dist/src/database/users.d.ts +2 -2
- package/dist/src/database/users.js +14 -14
- package/dist/src/drizzle.config.d.ts +2 -2
- package/dist/src/drizzle.config.d.ts.map +1 -1
- package/dist/src/drizzle.config.js +19 -12
- package/dist/src/emails/default-template.d.ts +3 -3
- package/dist/src/emails/default-template.d.ts.map +1 -1
- package/dist/src/emails/default-template.js +39 -38
- package/dist/src/emails/reset-password.d.ts +1 -1
- package/dist/src/emails/reset-password.d.ts.map +1 -1
- package/dist/src/emails/reset-password.js +51 -51
- package/dist/src/emails/ui/button.d.ts +2 -2
- package/dist/src/emails/ui/button.js +13 -13
- package/dist/src/emails/ui/card.d.ts +1 -1
- package/dist/src/emails/ui/card.js +6 -6
- package/dist/src/hooks/use-before-unload.js +3 -3
- package/dist/src/hooks/use-captcha.d.ts +2 -2
- package/dist/src/hooks/use-captcha.d.ts.map +1 -1
- package/dist/src/hooks/use-captcha.js +29 -37
- package/dist/src/hooks/use-mobile.d.ts.map +1 -1
- package/dist/src/hooks/use-mobile.js +3 -4
- package/dist/src/lib/api/get-middleware-api.js +4 -4
- package/dist/src/lib/api/get-next-cron-run-date.d.ts +2 -0
- package/dist/src/lib/api/get-next-cron-run-date.d.ts.map +1 -0
- package/dist/src/lib/api/get-next-cron-run-date.js +14 -0
- package/dist/src/lib/api/get-next-cron-run-date.test.d.ts +2 -0
- package/dist/src/lib/api/get-next-cron-run-date.test.d.ts.map +1 -0
- package/dist/src/lib/api/get-next-cron-run-date.test.js +55 -0
- package/dist/src/lib/api/get-session-admin-api.js +5 -5
- package/dist/src/lib/api/get-session-api.js +4 -4
- package/dist/src/lib/api/should-cron-job-run.d.ts +2 -0
- package/dist/src/lib/api/should-cron-job-run.d.ts.map +1 -0
- package/dist/src/lib/api/should-cron-job-run.js +16 -0
- package/dist/src/lib/api/should-cron-job-run.test.d.ts +2 -0
- package/dist/src/lib/api/should-cron-job-run.test.d.ts.map +1 -0
- package/dist/src/lib/api/should-cron-job-run.test.js +213 -0
- package/dist/src/lib/colors.js +28 -19
- package/dist/src/lib/colors.test.js +60 -60
- package/dist/src/lib/config.d.ts +1 -0
- package/dist/src/lib/config.d.ts.map +1 -1
- package/dist/src/lib/config.js +8 -6
- package/dist/src/lib/ctrl-or-command-character.d.ts +2 -0
- package/dist/src/lib/ctrl-or-command-character.d.ts.map +1 -0
- package/dist/src/lib/ctrl-or-command-character.js +9 -0
- package/dist/src/lib/fetcher/cookie-from-string-to-object.d.ts.map +1 -1
- package/dist/src/lib/fetcher/cookie-from-string-to-object.js +1 -1
- package/dist/src/lib/fetcher/cookie-from-string-to-object.test.js +27 -27
- package/dist/src/lib/fetcher/core.d.ts +5 -5
- package/dist/src/lib/fetcher/core.d.ts.map +1 -1
- package/dist/src/lib/fetcher/core.js +11 -10
- package/dist/src/lib/fetcher/helpers-server.d.ts +1 -1
- package/dist/src/lib/fetcher/helpers-server.js +1 -1
- package/dist/src/lib/fetcher/helpers.test.js +17 -17
- package/dist/src/lib/fetcher/types.d.ts +26 -26
- package/dist/src/lib/fetcher/types.d.ts.map +1 -1
- package/dist/src/lib/fetcher-client.d.ts +4 -4
- package/dist/src/lib/fetcher-client.d.ts.map +1 -1
- package/dist/src/lib/fetcher-client.js +3 -3
- package/dist/src/lib/fetcher.d.ts +5 -5
- package/dist/src/lib/fetcher.d.ts.map +1 -1
- package/dist/src/lib/fetcher.js +4 -4
- package/dist/src/lib/helpers/auto-form.d.ts +3 -3
- package/dist/src/lib/helpers/auto-form.d.ts.map +1 -1
- package/dist/src/lib/helpers/auto-form.js +16 -15
- package/dist/src/lib/helpers/auto-form.test.js +129 -129
- package/dist/src/lib/navigation.d.ts +3 -3
- package/dist/src/lib/navigation.d.ts.map +1 -1
- package/dist/src/lib/plugin.d.ts +3 -3
- package/dist/src/lib/special-characters.js +1 -1
- package/dist/src/lib/special-characters.test.js +36 -36
- package/dist/src/lib/utils.d.ts +1 -1
- package/dist/src/tests/setup.d.ts +1 -1
- package/dist/src/views/admin/layouts/admin-layout.d.ts +1 -1
- package/dist/src/views/admin/layouts/admin-layout.d.ts.map +1 -1
- package/dist/src/views/admin/layouts/admin-layout.js +5 -9
- package/dist/src/views/admin/layouts/sidebar/nav/item.d.ts.map +1 -1
- package/dist/src/views/admin/layouts/sidebar/nav/item.js +8 -12
- package/dist/src/views/admin/layouts/sidebar/nav/nav.d.ts +1 -1
- package/dist/src/views/admin/layouts/sidebar/nav/nav.d.ts.map +1 -1
- package/dist/src/views/admin/layouts/sidebar/nav/nav.js +23 -12
- package/dist/src/views/admin/layouts/sidebar/sidebar.d.ts +1 -1
- package/dist/src/views/admin/layouts/sidebar/sidebar.d.ts.map +1 -1
- package/dist/src/views/admin/layouts/sidebar/sidebar.js +1 -2
- package/dist/src/views/admin/layouts/sidebar/sign-out.js +1 -1
- package/dist/src/views/admin/layouts/user-bar/client.js +5 -5
- package/dist/src/views/admin/layouts/user-bar/user-bar.d.ts +1 -1
- package/dist/src/views/admin/layouts/user-bar/user-bar.d.ts.map +1 -1
- package/dist/src/views/admin/layouts/user-bar/user-bar.js +1 -1
- package/dist/src/views/admin/sign-in/sign-in-admin-view.js +1 -1
- package/dist/src/views/admin/views/core/advanced/cron/cron-table-view.d.ts +5 -0
- package/dist/src/views/admin/views/core/advanced/cron/cron-table-view.d.ts.map +1 -0
- package/dist/src/views/admin/views/core/advanced/cron/cron-table-view.js +97 -0
- package/dist/src/views/admin/views/core/advanced/cron/run-action/mutation-api.d.ts +4 -0
- package/dist/src/views/admin/views/core/advanced/cron/run-action/mutation-api.d.ts.map +1 -0
- package/dist/src/views/admin/views/core/advanced/cron/run-action/mutation-api.js +23 -0
- package/dist/src/views/admin/views/core/advanced/cron/run-action/run-action.d.ts +4 -0
- package/dist/src/views/admin/views/core/advanced/cron/run-action/run-action.d.ts.map +1 -0
- package/dist/src/views/admin/views/core/advanced/cron/run-action/run-action.js +37 -0
- package/dist/src/views/admin/views/core/dashboard/dashboard-admin-view.js +3 -3
- package/dist/src/views/admin/views/core/debug/actions/clear-cache/clear-cache.js +10 -10
- package/dist/src/views/admin/views/core/debug/actions/clear-cache/mutation-api.js +2 -2
- package/dist/src/views/admin/views/core/debug/system-logs/actions/more/content.d.ts +1 -1
- package/dist/src/views/admin/views/core/debug/system-logs/actions/more/content.d.ts.map +1 -1
- package/dist/src/views/admin/views/core/debug/system-logs/actions/more/content.js +15 -15
- package/dist/src/views/admin/views/core/debug/system-logs/actions/more/more.d.ts +1 -1
- package/dist/src/views/admin/views/core/debug/system-logs/actions/more/more.d.ts.map +1 -1
- package/dist/src/views/admin/views/core/debug/system-logs/actions/more/more.js +16 -25
- package/dist/src/views/admin/views/core/debug/system-logs/badges/badge-status.d.ts.map +1 -1
- package/dist/src/views/admin/views/core/debug/system-logs/badges/badge-status.js +7 -1
- package/dist/src/views/admin/views/core/debug/system-logs/badges/badge-type-log.d.ts +1 -1
- package/dist/src/views/admin/views/core/debug/system-logs/badges/badge-type-log.js +3 -3
- package/dist/src/views/admin/views/core/debug/system-logs/system-logs-view.js +25 -25
- package/dist/src/views/admin/views/core/test.d.ts.map +1 -1
- package/dist/src/views/admin/views/core/test.js +134 -124
- package/dist/src/views/admin/views/core/users/users-admin-view.d.ts.map +1 -1
- package/dist/src/views/admin/views/core/users/users-admin-view.js +13 -14
- package/dist/src/views/auth/password-reset/change-password-form/form.js +9 -9
- package/dist/src/views/auth/password-reset/change-password-form/mutation-api.d.ts +2 -2
- package/dist/src/views/auth/password-reset/change-password-form/mutation-api.js +5 -5
- package/dist/src/views/auth/password-reset/change-password-form/use-form.d.ts +2 -2
- package/dist/src/views/auth/password-reset/change-password-form/use-form.d.ts.map +1 -1
- package/dist/src/views/auth/password-reset/change-password-form/use-form.js +7 -7
- package/dist/src/views/auth/password-reset/form/form.d.ts +2 -2
- package/dist/src/views/auth/password-reset/form/form.d.ts.map +1 -1
- package/dist/src/views/auth/password-reset/form/form.js +15 -15
- package/dist/src/views/auth/password-reset/form/mutation-api.js +5 -5
- package/dist/src/views/auth/password-reset/form/use-form.d.ts +2 -2
- package/dist/src/views/auth/password-reset/form/use-form.js +7 -7
- package/dist/src/views/auth/password-reset/password-reset-view.js +4 -4
- package/dist/src/views/auth/sign-in/form/form.js +9 -9
- package/dist/src/views/auth/sign-in/form/mutation-api.d.ts +2 -2
- package/dist/src/views/auth/sign-in/form/mutation-api.d.ts.map +1 -1
- package/dist/src/views/auth/sign-in/form/mutation-api.js +10 -10
- package/dist/src/views/auth/sign-in/form/use-form.d.ts +2 -2
- package/dist/src/views/auth/sign-in/form/use-form.js +11 -11
- package/dist/src/views/auth/sign-in/sign-in-view.js +5 -5
- package/dist/src/views/auth/sign-up/components/password-input.d.ts +3 -3
- package/dist/src/views/auth/sign-up/components/password-input.d.ts.map +1 -1
- package/dist/src/views/auth/sign-up/components/password-input.js +9 -10
- package/dist/src/views/auth/sign-up/email-confirmation-view.js +4 -4
- package/dist/src/views/auth/sign-up/form/form.d.ts +2 -2
- package/dist/src/views/auth/sign-up/form/form.d.ts.map +1 -1
- package/dist/src/views/auth/sign-up/form/form.js +18 -18
- package/dist/src/views/auth/sign-up/form/mutation-api.d.ts +2 -2
- package/dist/src/views/auth/sign-up/form/mutation-api.d.ts.map +1 -1
- package/dist/src/views/auth/sign-up/form/mutation-api.js +6 -6
- package/dist/src/views/auth/sign-up/form/use-form.d.ts +2 -2
- package/dist/src/views/auth/sign-up/form/use-form.js +21 -21
- package/dist/src/views/auth/sign-up/sign-up-view.js +5 -5
- package/dist/src/views/auth/sign-up/wrapper.d.ts +1 -1
- package/dist/src/views/auth/sign-up/wrapper.d.ts.map +1 -1
- package/dist/src/views/auth/sign-up/wrapper.js +5 -8
- package/dist/src/views/auth/sso/buttons/client.js +4 -4
- package/dist/src/views/auth/sso/buttons/mutation-api.js +5 -5
- package/dist/src/views/auth/sso/buttons/sso-buttons.js +2 -2
- package/dist/src/views/auth/sso/callback/callback-sso-view.js +6 -6
- package/dist/src/views/auth/sso/callback/client/client.d.ts +1 -1
- package/dist/src/views/auth/sso/callback/client/client.d.ts.map +1 -1
- package/dist/src/views/auth/sso/callback/client/client.js +9 -9
- package/dist/src/views/auth/sso/callback/client/mutation-api.js +7 -7
- package/dist/src/views/error/back-button.js +1 -1
- package/dist/src/views/error/error-view.js +4 -4
- package/dist/src/views/error/global-error-view.d.ts +3 -3
- package/dist/src/views/error/global-error-view.d.ts.map +1 -1
- package/dist/src/views/error/global-error-view.js +36 -44
- package/dist/src/views/layouts/provider.d.ts +4 -4
- package/dist/src/views/layouts/provider.d.ts.map +1 -1
- package/dist/src/views/layouts/provider.js +3 -3
- package/dist/src/views/layouts/root-layout.d.ts +3 -3
- package/dist/src/views/layouts/root-layout.d.ts.map +1 -1
- package/dist/src/views/layouts/root-layout.js +1 -2
- package/dist/src/views/layouts/theme/header/header.d.ts +2 -2
- package/dist/src/views/layouts/theme/header/header.d.ts.map +1 -1
- package/dist/src/views/layouts/theme/header/header.js +2 -2
- package/dist/src/views/layouts/theme/header/user/auth/client.d.ts +1 -1
- package/dist/src/views/layouts/theme/header/user/auth/client.d.ts.map +1 -1
- package/dist/src/views/layouts/theme/header/user/auth/client.js +4 -4
- package/dist/src/views/layouts/theme/header/user/auth/log-out-mutation-api.js +8 -8
- package/dist/src/views/layouts/theme/header/user/user.js +4 -4
- package/dist/src/views/layouts/theme/layout.d.ts +2 -2
- package/dist/src/views/layouts/theme/layout.js +1 -1
- package/dist/src/vitnode.config.d.ts +18 -16
- package/dist/src/vitnode.config.d.ts.map +1 -1
- package/dist/src/vitnode.config.js +3 -2
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +32 -29
- package/src/app/login/page.tsx +5 -5
- package/src/app/login/reset-password/page.tsx +5 -5
- package/src/app/login/sso/[providerId]/page.tsx +1 -1
- package/src/app/register/page.tsx +5 -5
- package/src/app_admin/core/advanced/cron/page.tsx +41 -0
- package/src/app_admin/core/debug/page.tsx +14 -14
- package/src/app_admin/core/page.tsx +1 -1
- package/src/app_admin/core/test/page.tsx +1 -1
- package/src/app_admin/core/users/page.tsx +12 -13
- package/src/locales/en.json +43 -0
- package/src/tiptap.css +20 -0
- package/dist/src/components/switchers/langs/language-swietcher.d.ts.map +0 -1
|
@@ -1,48 +1,61 @@
|
|
|
1
1
|
import { z } from "@hono/zod-openapi";
|
|
2
2
|
import { and, asc, count, desc, gt, lt } from "drizzle-orm";
|
|
3
|
-
|
|
4
|
-
// Parse and validate pagination parameters
|
|
3
|
+
function parsePaginationParams(params) {
|
|
5
4
|
const cursor = params.query.cursor ? parseInt(params.query.cursor, 10) : undefined;
|
|
6
5
|
const first = params.query.first ? Math.min(parseInt(params.query.first, 10), 100) : undefined;
|
|
7
6
|
const last = params.query.last ? Math.min(parseInt(params.query.last, 10), 100) : undefined;
|
|
8
7
|
if (first !== undefined && last !== undefined) {
|
|
9
|
-
throw new Error(
|
|
8
|
+
throw new Error("Cannot specify both first and last");
|
|
10
9
|
}
|
|
11
10
|
if (first !== undefined && first < 0) {
|
|
12
|
-
throw new Error(
|
|
11
|
+
throw new Error("first must be positive");
|
|
13
12
|
}
|
|
14
13
|
if (last !== undefined && last < 0) {
|
|
15
|
-
throw new Error(
|
|
14
|
+
throw new Error("last must be positive");
|
|
16
15
|
}
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
where = where ? and(where, cursorWhere) : cursorWhere;
|
|
16
|
+
return {
|
|
17
|
+
cursor,
|
|
18
|
+
first,
|
|
19
|
+
last
|
|
20
|
+
};
|
|
21
|
+
}
|
|
22
|
+
function getOrderFn(isForward, order) {
|
|
23
|
+
if (isForward) {
|
|
24
|
+
return order === "asc" ? asc : desc;
|
|
27
25
|
}
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
return order === "asc" ? desc : asc;
|
|
27
|
+
}
|
|
28
|
+
function buildWhereWithCursor(baseWhere, cursor, isForward, order, table, primaryCursor) {
|
|
29
|
+
if (!cursor) return baseWhere;
|
|
30
|
+
const cursorFilter = isForward && order === "asc" || !isForward && order === "desc" ? gt : lt;
|
|
31
|
+
const cursorWhere = cursorFilter(table[primaryCursor.name], cursor);
|
|
32
|
+
return baseWhere ? and(baseWhere, cursorWhere) : cursorWhere;
|
|
33
|
+
}
|
|
34
|
+
async function fetchTotalCount(c, table, where) {
|
|
35
|
+
const [{ count: totalCount }] = await c.get("db").select({
|
|
30
36
|
count: count()
|
|
31
|
-
}).from(table).where(
|
|
32
|
-
|
|
37
|
+
}).from(table).where(where);
|
|
38
|
+
return totalCount;
|
|
39
|
+
}
|
|
40
|
+
export async function withPagination({ query, table, params, where: whereFromParams, primaryCursor, orderBy: orderByFromParams, c }) {
|
|
41
|
+
const { cursor, first, last } = parsePaginationParams(params);
|
|
42
|
+
const isForward = last === undefined;
|
|
43
|
+
const orderFn = getOrderFn(isForward, orderByFromParams.order);
|
|
44
|
+
const orderBy = orderFn(table[orderByFromParams.column.name]);
|
|
45
|
+
const where = buildWhereWithCursor(whereFromParams, cursor, isForward, orderByFromParams.order, table, primaryCursor);
|
|
46
|
+
const totalCount = await fetchTotalCount(c, table, whereFromParams);
|
|
33
47
|
const limit = (first ?? last ?? 50) + 1;
|
|
34
48
|
const edges = await query({
|
|
35
49
|
limit,
|
|
36
50
|
where,
|
|
37
51
|
orderBy
|
|
38
52
|
});
|
|
39
|
-
|
|
40
|
-
const hasMore = edges.length >
|
|
41
|
-
const slicedEdges = edges.slice(0,
|
|
53
|
+
const requested = first ?? last ?? edges.length;
|
|
54
|
+
const hasMore = edges.length > requested;
|
|
55
|
+
const slicedEdges = edges.slice(0, requested);
|
|
42
56
|
const finalEdges = isForward ? slicedEdges : slicedEdges.reverse();
|
|
43
|
-
// Prepare cursors
|
|
44
57
|
const startCursor = finalEdges[0]?.[primaryCursor.name] ?? null;
|
|
45
|
-
const endCursor = finalEdges
|
|
58
|
+
const endCursor = finalEdges.at(-1)?.[primaryCursor.name] ?? null;
|
|
46
59
|
return {
|
|
47
60
|
pageInfo: {
|
|
48
61
|
totalCount,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captcha.middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/middlewares/captcha.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"captcha.middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/middlewares/captcha.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAqE1C,eAAO,MAAM,iBAAiB,SACd,GAAG,OAAO,EAAE,MAAM,IAAI,kBA6BrC,CAAC"}
|
|
@@ -1,32 +1,33 @@
|
|
|
1
1
|
import { HTTPException } from "hono/http-exception";
|
|
2
2
|
const getResFromReCaptcha = async ({ token, userIp, captchaConfig })=>{
|
|
3
|
-
if (captchaConfig.type ===
|
|
4
|
-
const res = await fetch(
|
|
5
|
-
method:
|
|
3
|
+
if (captchaConfig.type === "cloudflare_turnstile") {
|
|
4
|
+
const res = await fetch("https://challenges.cloudflare.com/turnstile/v0/siteverify", {
|
|
5
|
+
method: "POST",
|
|
6
6
|
body: JSON.stringify({
|
|
7
7
|
secret: captchaConfig.secretKey,
|
|
8
8
|
response: token,
|
|
9
9
|
remoteip: userIp
|
|
10
10
|
}),
|
|
11
11
|
headers: {
|
|
12
|
-
|
|
12
|
+
"Content-Type": "application/json"
|
|
13
13
|
}
|
|
14
14
|
});
|
|
15
15
|
const data = await res.json();
|
|
16
16
|
return {
|
|
17
17
|
success: data.success,
|
|
18
18
|
score: data.success ? 1 : 0,
|
|
19
|
-
|
|
19
|
+
"error-codes": data["error-codes"]
|
|
20
20
|
};
|
|
21
|
-
}
|
|
21
|
+
}
|
|
22
|
+
if (captchaConfig.type === "recaptcha_v3") {
|
|
22
23
|
const res = await fetch(`https://www.google.com/recaptcha/api/siteverify?secret=${captchaConfig.secretKey}&response=${token}&remoteip=${userIp}`, {
|
|
23
|
-
method:
|
|
24
|
+
method: "POST"
|
|
24
25
|
});
|
|
25
26
|
const data = await res.json();
|
|
26
27
|
return {
|
|
27
28
|
success: data.success,
|
|
28
29
|
score: data.score ?? 0,
|
|
29
|
-
|
|
30
|
+
"error-codes": data["error-codes"]
|
|
30
31
|
};
|
|
31
32
|
}
|
|
32
33
|
return {
|
|
@@ -36,25 +37,25 @@ const getResFromReCaptcha = async ({ token, userIp, captchaConfig })=>{
|
|
|
36
37
|
};
|
|
37
38
|
export const captchaMiddleware = ()=>{
|
|
38
39
|
return async (c, next)=>{
|
|
39
|
-
const token = c.req.header(
|
|
40
|
-
const captchaConfig = c.get(
|
|
40
|
+
const token = c.req.header("x-vitnode-captcha-token");
|
|
41
|
+
const captchaConfig = c.get("core").captcha;
|
|
41
42
|
if (!captchaConfig) {
|
|
42
43
|
await next();
|
|
43
44
|
return;
|
|
44
45
|
}
|
|
45
46
|
if (!token) {
|
|
46
47
|
throw new HTTPException(400, {
|
|
47
|
-
message:
|
|
48
|
+
message: "Captcha token is required"
|
|
48
49
|
});
|
|
49
50
|
}
|
|
50
51
|
const res = await getResFromReCaptcha({
|
|
51
52
|
token,
|
|
52
|
-
userIp: c.get(
|
|
53
|
+
userIp: c.get("ipAddress"),
|
|
53
54
|
captchaConfig
|
|
54
55
|
});
|
|
55
56
|
if (!res.success || res.score < 0.5) {
|
|
56
57
|
throw new HTTPException(400, {
|
|
57
|
-
message:
|
|
58
|
+
message: "Captcha validation failed"
|
|
58
59
|
});
|
|
59
60
|
}
|
|
60
61
|
await next();
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cron-auth.middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/middlewares/cron-auth.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG1C,eAAO,MAAM,kBAAkB,SACf,GAAG,OAAO,EAAE,MAAM,IAAI,kBAerC,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { HTTPException } from "hono/http-exception";
|
|
2
|
+
export const cronAuthMiddleware = ()=>{
|
|
3
|
+
return async (c, next)=>{
|
|
4
|
+
const cronSecret = c.get("core").cronSecret;
|
|
5
|
+
if (!cronSecret) {
|
|
6
|
+
throw new HTTPException(403, {
|
|
7
|
+
message: "Cron access not configured"
|
|
8
|
+
});
|
|
9
|
+
}
|
|
10
|
+
const authHeader = c.req.header("authorization");
|
|
11
|
+
const providedSecret = authHeader?.replace("Bearer ", "");
|
|
12
|
+
if (providedSecret !== cronSecret) {
|
|
13
|
+
throw new HTTPException(403, {
|
|
14
|
+
message: "Invalid cron authorization"
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
await next();
|
|
18
|
+
};
|
|
19
|
+
};
|
|
@@ -1,8 +1,13 @@
|
|
|
1
|
-
import type { Context, Env, Next } from
|
|
2
|
-
import
|
|
3
|
-
import {
|
|
4
|
-
import type {
|
|
5
|
-
import { type LoggerMiddlewareType } from
|
|
1
|
+
import type { Context, Env, Next } from "hono";
|
|
2
|
+
import { type EmailModelSendArgs } from "../../api/models/email";
|
|
3
|
+
import type { VitNodeApiConfig, VitNodeConfig } from "../../vitnode.config";
|
|
4
|
+
import type { BuildCronReturn } from "../lib/cron";
|
|
5
|
+
import { type LoggerMiddlewareType } from "../lib/logger-middleware";
|
|
6
|
+
import type { SSOApiPlugin } from "../models/sso";
|
|
7
|
+
declare module "hono" {
|
|
8
|
+
interface ContextVariableMap extends EnvVariablesVitNode {
|
|
9
|
+
}
|
|
10
|
+
}
|
|
6
11
|
export interface EnvVitNode extends Env {
|
|
7
12
|
Variables: EnvVariablesVitNode;
|
|
8
13
|
}
|
|
@@ -32,8 +37,9 @@ export interface EnvVariablesVitNode {
|
|
|
32
37
|
deviceCookieName: string;
|
|
33
38
|
ssoAdapters: SSOApiPlugin[];
|
|
34
39
|
};
|
|
35
|
-
captcha?: Pick<VitNodeApiConfig,
|
|
36
|
-
|
|
40
|
+
captcha?: Pick<VitNodeApiConfig, "captcha">["captcha"];
|
|
41
|
+
cronSecret?: string;
|
|
42
|
+
email?: VitNodeApiConfig["email"];
|
|
37
43
|
metadata: {
|
|
38
44
|
shortTitle?: string;
|
|
39
45
|
title: string;
|
|
@@ -44,8 +50,12 @@ export interface EnvVariablesVitNode {
|
|
|
44
50
|
plugins: {
|
|
45
51
|
id: string;
|
|
46
52
|
}[];
|
|
53
|
+
cron: ({
|
|
54
|
+
pluginId: string;
|
|
55
|
+
module: string;
|
|
56
|
+
} & BuildCronReturn)[];
|
|
47
57
|
};
|
|
48
|
-
db: Pick<VitNodeApiConfig,
|
|
58
|
+
db: Pick<VitNodeApiConfig, "dbProvider">["dbProvider"];
|
|
49
59
|
email: {
|
|
50
60
|
send: (args: EmailModelSendArgs) => Promise<void>;
|
|
51
61
|
};
|
|
@@ -67,10 +77,6 @@ export interface EnvVariablesVitNode {
|
|
|
67
77
|
roleId: number;
|
|
68
78
|
};
|
|
69
79
|
}
|
|
70
|
-
declare module 'hono' {
|
|
71
|
-
interface ContextVariableMap extends EnvVariablesVitNode {
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
80
|
export declare const globalMiddleware: ({ authorization, metadata, email, dbProvider, captcha, plugins, pathToMessages, }: Pick<VitNodeApiConfig, "authorization" | "captcha" | "dbProvider" | "email" | "pathToMessages" | "plugins"> & Pick<VitNodeConfig, "metadata">) => (c: Context, next: Next) => Promise<void>;
|
|
75
81
|
export declare const pluginMiddleware: (pluginId: string) => (c: Context, next: Next) => Promise<void>;
|
|
76
82
|
export declare const globalAdminMiddleware: () => (c: Context, next: Next) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/middlewares/global.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"global.middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/middlewares/global.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG/C,OAAO,EAAc,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAIzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAU,kBAAmB,SAAQ,mBAAmB;KAAG;CAC5D;AAED,MAAM,WAAW,UAAW,SAAQ,GAAG;IACrC,SAAS,EAAE,mBAAmB,CAAC;CAChC;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,IAAI,GAAG;QACZ,IAAI,EAAE;YACJ,WAAW,EAAE,MAAM,CAAC;YACpB,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;YACtB,SAAS,EAAE,IAAI,CAAC;YAChB,KAAK,EAAE,MAAM,CAAC;YACd,aAAa,EAAE,OAAO,CAAC;YACvB,EAAE,EAAE,MAAM,CAAC;YACX,IAAI,EAAE,MAAM,CAAC;YACb,QAAQ,EAAE,MAAM,CAAC;YACjB,UAAU,EAAE,OAAO,CAAC;YACpB,MAAM,EAAE,MAAM,CAAC;SAChB,CAAC;KACH,CAAC;IACF,IAAI,EAAE;QACJ,aAAa,EAAE;YACb,kBAAkB,EAAE,MAAM,CAAC;YAC3B,eAAe,EAAE,MAAM,CAAC;YACxB,cAAc,EAAE,MAAM,CAAC;YACvB,UAAU,EAAE,MAAM,CAAC;YACnB,YAAY,EAAE,OAAO,CAAC;YACtB,mBAAmB,EAAE,MAAM,CAAC;YAC5B,gBAAgB,EAAE,MAAM,CAAC;YACzB,WAAW,EAAE,YAAY,EAAE,CAAC;SAC7B,CAAC;QACF,OAAO,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC;QACvD,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,KAAK,CAAC,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAClC,QAAQ,EAAE;YACR,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,KAAK,EAAE,MAAM,CAAC;SACf,CAAC;QACF,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QAC/D,OAAO,EAAE;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QAC1B,IAAI,EAAE,CAAC;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,GAAG,eAAe,CAAC,EAAE,CAAC;KAClE,CAAC;IACF,EAAE,EAAE,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,YAAY,CAAC,CAAC;IACvD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;KACnD,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,oBAAoB,CAAC;IAC1B,MAAM,EAAE;QACN,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;IACF,IAAI,EAAE,IAAI,GAAG;QACX,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;QACtB,SAAS,EAAE,IAAI,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,aAAa,EAAE,OAAO,CAAC;QACvB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,EAAE,OAAO,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,eAAO,MAAM,gBAAgB,GAAI,mFAQ9B,IAAI,CACL,gBAAgB,EACd,eAAe,GACf,SAAS,GACT,YAAY,GACZ,OAAO,GACP,gBAAgB,GAChB,SAAS,CACZ,GACC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,MAoCjB,GAAG,OAAO,EAAE,MAAM,IAAI,kBA0DrC,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,UAAU,MAAM,MACjC,GAAG,OAAO,EAAE,MAAM,IAAI,kBAMrC,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAClB,GAAG,OAAO,EAAE,MAAM,IAAI,kBASrC,CAAC"}
|
|
@@ -2,28 +2,40 @@ import { HTTPException } from "hono/http-exception";
|
|
|
2
2
|
import { EmailModel } from "../models/email.js";
|
|
3
3
|
import { SessionModel } from "../models/session.js";
|
|
4
4
|
import { SessionAdminModel } from "../models/session-admin.js";
|
|
5
|
+
import { CONFIG } from "../../lib/config.js";
|
|
5
6
|
import { loggerMiddleware } from "../lib/logger-middleware.js";
|
|
6
7
|
export const globalMiddleware = ({ authorization, metadata, email, dbProvider, captcha, plugins, pathToMessages })=>{
|
|
8
|
+
const pluginsMetadata = plugins.map((plugin)=>({
|
|
9
|
+
id: plugin.pluginId
|
|
10
|
+
}));
|
|
11
|
+
const cronMetadata = plugins.flatMap((plugin)=>plugin.cronJobs.map((cronJob)=>({
|
|
12
|
+
pluginId: plugin.pluginId,
|
|
13
|
+
module: cronJob.module,
|
|
14
|
+
name: cronJob.name,
|
|
15
|
+
schedule: cronJob.schedule,
|
|
16
|
+
handler: cronJob.handler,
|
|
17
|
+
description: cronJob.description
|
|
18
|
+
})));
|
|
19
|
+
const ipHeaderKeys = [
|
|
20
|
+
"x-forwarded-for",
|
|
21
|
+
"x-real-ip",
|
|
22
|
+
"cf-connecting-ip",
|
|
23
|
+
"x-client-ip",
|
|
24
|
+
"x-forwarded",
|
|
25
|
+
"x-cluster-client-ip",
|
|
26
|
+
"forwarded-for",
|
|
27
|
+
"forwarded",
|
|
28
|
+
"via",
|
|
29
|
+
"remote-addr",
|
|
30
|
+
"client-ip",
|
|
31
|
+
"ip",
|
|
32
|
+
"x-ip",
|
|
33
|
+
"true-client-ip",
|
|
34
|
+
"fastly-client-ip",
|
|
35
|
+
"x-fastly-client-ip"
|
|
36
|
+
];
|
|
37
|
+
// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: <needed>
|
|
7
38
|
return async (c, next)=>{
|
|
8
|
-
// Collect possible IP header keys in order of trust/preference
|
|
9
|
-
const ipHeaderKeys = [
|
|
10
|
-
'x-forwarded-for',
|
|
11
|
-
'x-real-ip',
|
|
12
|
-
'cf-connecting-ip',
|
|
13
|
-
'x-client-ip',
|
|
14
|
-
'x-forwarded',
|
|
15
|
-
'x-cluster-client-ip',
|
|
16
|
-
'forwarded-for',
|
|
17
|
-
'forwarded',
|
|
18
|
-
'via',
|
|
19
|
-
'remote-addr',
|
|
20
|
-
'client-ip',
|
|
21
|
-
'ip',
|
|
22
|
-
'x-ip',
|
|
23
|
-
'true-client-ip',
|
|
24
|
-
'fastly-client-ip',
|
|
25
|
-
'x-fastly-client-ip'
|
|
26
|
-
];
|
|
27
39
|
let ipAddress;
|
|
28
40
|
// Try to get IP from Hono's request header method first
|
|
29
41
|
for (const key of ipHeaderKeys){
|
|
@@ -44,38 +56,38 @@ export const globalMiddleware = ({ authorization, metadata, email, dbProvider, c
|
|
|
44
56
|
}
|
|
45
57
|
}
|
|
46
58
|
// Fallback to localhost if nothing found
|
|
47
|
-
c.set(
|
|
48
|
-
c.set(
|
|
49
|
-
c.set(
|
|
50
|
-
c.set(
|
|
59
|
+
c.set("ipAddress", ipAddress ?? "127.0.0.1");
|
|
60
|
+
c.set("db", dbProvider);
|
|
61
|
+
c.set("email", new EmailModel(c));
|
|
62
|
+
c.set("core", {
|
|
51
63
|
pathToMessages,
|
|
52
64
|
metadata,
|
|
53
65
|
email,
|
|
54
66
|
authorization: {
|
|
55
|
-
cookieName: authorization?.cookieName ??
|
|
67
|
+
cookieName: authorization?.cookieName ?? "vitnode_auth",
|
|
56
68
|
cookie_expires: authorization?.cookieExpires ?? 1000 * 60 * 60 * 24 * 90,
|
|
57
69
|
ssoAdapters: authorization?.ssoAdapters ?? [],
|
|
58
|
-
deviceCookieName: authorization?.deviceCookieName ??
|
|
70
|
+
deviceCookieName: authorization?.deviceCookieName ?? "vitnode_device",
|
|
59
71
|
deviceCookieExpires: authorization?.deviceCookieExpires ?? 1000 * 60 * 60 * 24 * 365,
|
|
60
|
-
adminCookieName: authorization?.adminCookieName ??
|
|
72
|
+
adminCookieName: authorization?.adminCookieName ?? "vitnode_auth_admin",
|
|
61
73
|
adminCookieExpires: authorization?.adminCookieExpires ?? 1000 * 60 * 60 * 24 * 1,
|
|
62
74
|
cookieSecure: authorization?.cookieSecure ?? true
|
|
63
75
|
},
|
|
64
76
|
captcha,
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
77
|
+
cronSecret: CONFIG.cronJobSecret,
|
|
78
|
+
plugins: pluginsMetadata,
|
|
79
|
+
cron: cronMetadata
|
|
68
80
|
});
|
|
69
81
|
const user = await new SessionModel(c).getUser();
|
|
70
|
-
c.set(
|
|
71
|
-
c.set(
|
|
72
|
-
c.set(
|
|
82
|
+
c.set("user", user);
|
|
83
|
+
c.set("admin", null);
|
|
84
|
+
c.set("log", loggerMiddleware(c));
|
|
73
85
|
await next();
|
|
74
86
|
};
|
|
75
87
|
};
|
|
76
88
|
export const pluginMiddleware = (pluginId)=>{
|
|
77
89
|
return async (c, next)=>{
|
|
78
|
-
c.set(
|
|
90
|
+
c.set("plugin", {
|
|
79
91
|
id: pluginId
|
|
80
92
|
});
|
|
81
93
|
await next();
|
|
@@ -85,7 +97,7 @@ export const globalAdminMiddleware = ()=>{
|
|
|
85
97
|
return async (c, next)=>{
|
|
86
98
|
const user = await new SessionAdminModel(c).getUser();
|
|
87
99
|
if (!user) throw new HTTPException(403);
|
|
88
|
-
c.set(
|
|
100
|
+
c.set("admin", {
|
|
89
101
|
user
|
|
90
102
|
});
|
|
91
103
|
await next();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Context, Next } from
|
|
2
|
-
import { type IRateLimiterOptions } from
|
|
3
|
-
export declare const rateLimiterMiddleware: (options?: Omit<IRateLimiterOptions, "keyPrefix">) => ((
|
|
1
|
+
import type { Context, Next } from "hono";
|
|
2
|
+
import { type IRateLimiterOptions } from "rate-limiter-flexible";
|
|
3
|
+
export declare const rateLimiterMiddleware: (options?: Omit<IRateLimiterOptions, "keyPrefix">) => ((_c: Context, next: Next) => Promise<void>) | ((c: Context, next: Next) => Promise<(Response & import("hono").TypedResponse<"Too Many Requests", 429, "text">) | undefined>);
|
|
4
4
|
//# sourceMappingURL=rate-limiter.middleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limiter.middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/middlewares/rate-limiter.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,EACL,KAAK,mBAAmB,EAGzB,MAAM,uBAAuB,CAAC;AAoB/B,eAAO,MAAM,qBAAqB,GAChC,UAAU,IAAI,CAAC,mBAAmB,EAAE,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"rate-limiter.middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/middlewares/rate-limiter.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,EACL,KAAK,mBAAmB,EAGzB,MAAM,uBAAuB,CAAC;AAoB/B,eAAO,MAAM,qBAAqB,GAChC,UAAU,IAAI,CAAC,mBAAmB,EAAE,WAAW,CAAC,WAI5B,OAAO,QAAQ,IAAI,2BAUtB,OAAO,QAAQ,IAAI,sGAWrC,CAAC"}
|
|
@@ -12,20 +12,20 @@ const createRateLimiter = ({ keyPrefix, ...options })=>{
|
|
|
12
12
|
export const rateLimiterMiddleware = (options)=>{
|
|
13
13
|
if (CONFIG.node_development) {
|
|
14
14
|
// In development, we disable the rate limiter for easier testing
|
|
15
|
-
return async (
|
|
15
|
+
return async (_c, next)=>{
|
|
16
16
|
await next();
|
|
17
17
|
};
|
|
18
18
|
}
|
|
19
19
|
const rateLimiter = createRateLimiter({
|
|
20
20
|
...options,
|
|
21
|
-
keyPrefix:
|
|
21
|
+
keyPrefix: "vitnode-api-rate-limiter"
|
|
22
22
|
});
|
|
23
23
|
return async (c, next)=>{
|
|
24
|
-
const key = c.get(
|
|
24
|
+
const key = c.get("ipAddress");
|
|
25
25
|
try {
|
|
26
26
|
await rateLimiter.consume(key);
|
|
27
27
|
} catch {
|
|
28
|
-
return c.text(
|
|
28
|
+
return c.text("Too Many Requests", 429);
|
|
29
29
|
}
|
|
30
30
|
await next();
|
|
31
31
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../../src/api/models/device.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"device.d.ts","sourceRoot":"","sources":["../../../../src/api/models/device.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAMpC,qBAAa,WAAW;gBACV,CAAC,EAAE,OAAO;IAGtB,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC;YAEhB,YAAY;IAkB1B,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,eAAe;IAiBjB,WAAW;;;;CAwClB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { randomBytes } from "crypto";
|
|
1
|
+
import { randomBytes } from "node:crypto";
|
|
2
2
|
import { eq } from "drizzle-orm";
|
|
3
3
|
import { getCookie, setCookie } from "hono/cookie";
|
|
4
4
|
import { core_sessions_known_devices } from "../../database/sessions.js";
|
|
@@ -9,10 +9,10 @@ export class DeviceModel {
|
|
|
9
9
|
}
|
|
10
10
|
c;
|
|
11
11
|
async createDevice() {
|
|
12
|
-
const publicId = randomBytes(16).toString(
|
|
13
|
-
const [device] = await this.c.get(
|
|
12
|
+
const publicId = randomBytes(16).toString("hex");
|
|
13
|
+
const [device] = await this.c.get("db").insert(core_sessions_known_devices).values({
|
|
14
14
|
publicId,
|
|
15
|
-
ipAddress: this.c.get(
|
|
15
|
+
ipAddress: this.c.get("ipAddress"),
|
|
16
16
|
userAgent: this.getUserAgent()
|
|
17
17
|
}).returning({
|
|
18
18
|
id: core_sessions_known_devices.id
|
|
@@ -24,29 +24,29 @@ export class DeviceModel {
|
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
26
|
getUserAgent() {
|
|
27
|
-
return this.c.req.header(
|
|
27
|
+
return this.c.req.header("User-Agent") ?? "node";
|
|
28
28
|
}
|
|
29
29
|
setCookieDevice(publicDeviceId) {
|
|
30
|
-
setCookie(this.c, this.c.get(
|
|
30
|
+
setCookie(this.c, this.c.get("core").authorization.deviceCookieName, publicDeviceId, {
|
|
31
31
|
httpOnly: true,
|
|
32
|
-
secure: this.c.get(
|
|
33
|
-
path:
|
|
32
|
+
secure: this.c.get("core").authorization.cookieSecure,
|
|
33
|
+
path: "/",
|
|
34
34
|
domain: CONFIG.web.hostname,
|
|
35
|
-
expires: new Date(Date.now() + this.c.get(
|
|
35
|
+
expires: new Date(Date.now() + this.c.get("core").authorization.deviceCookieExpires)
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
async getDeviceId() {
|
|
39
|
-
const deviceIdFromCookie = getCookie(this.c, this.c.get(
|
|
39
|
+
const deviceIdFromCookie = getCookie(this.c, this.c.get("core").authorization.deviceCookieName);
|
|
40
40
|
try {
|
|
41
41
|
if (deviceIdFromCookie) {
|
|
42
|
-
const [device] = await this.c.get(
|
|
42
|
+
const [device] = await this.c.get("db").select({
|
|
43
43
|
id: core_sessions_known_devices.id
|
|
44
44
|
}).from(core_sessions_known_devices).where(eq(core_sessions_known_devices.publicId, deviceIdFromCookie));
|
|
45
45
|
if (!device) {
|
|
46
46
|
return await this.createDevice();
|
|
47
47
|
}
|
|
48
|
-
await this.c.get(
|
|
49
|
-
ipAddress: this.c.get(
|
|
48
|
+
await this.c.get("db").update(core_sessions_known_devices).set({
|
|
49
|
+
ipAddress: this.c.get("ipAddress"),
|
|
50
50
|
userAgent: this.getUserAgent()
|
|
51
51
|
}).where(eq(core_sessions_known_devices.publicId, deviceIdFromCookie));
|
|
52
52
|
return {
|
|
@@ -1,16 +1,6 @@
|
|
|
1
|
-
import type { Context, ContextVariableMap } from
|
|
2
|
-
import type React from
|
|
3
|
-
import {
|
|
4
|
-
export interface EmailApiPlugin {
|
|
5
|
-
sendEmail: (args: {
|
|
6
|
-
html: string;
|
|
7
|
-
metadata: ContextVariableMap['core']['metadata'];
|
|
8
|
-
replyTo?: string;
|
|
9
|
-
subject: string;
|
|
10
|
-
text: string;
|
|
11
|
-
to: string;
|
|
12
|
-
}) => Promise<void>;
|
|
13
|
-
}
|
|
1
|
+
import type { Context, ContextVariableMap } from "hono";
|
|
2
|
+
import type React from "react";
|
|
3
|
+
import type { DefaultTemplateEmailProps } from "../../emails/default-template";
|
|
14
4
|
interface EmailModelSendArgsWithUser {
|
|
15
5
|
locale?: never;
|
|
16
6
|
to?: never;
|
|
@@ -27,12 +17,22 @@ interface EmailModelSendArgsWithEmail {
|
|
|
27
17
|
to: string;
|
|
28
18
|
user?: never;
|
|
29
19
|
}
|
|
20
|
+
export interface EmailApiPlugin {
|
|
21
|
+
sendEmail: (args: {
|
|
22
|
+
html: string;
|
|
23
|
+
metadata: ContextVariableMap["core"]["metadata"];
|
|
24
|
+
replyTo?: string;
|
|
25
|
+
subject: string;
|
|
26
|
+
text: string;
|
|
27
|
+
to: string;
|
|
28
|
+
}) => Promise<void>;
|
|
29
|
+
}
|
|
30
30
|
export type EmailModelSendArgs = {
|
|
31
|
-
content: (props: Omit<DefaultTemplateEmailProps,
|
|
31
|
+
content: (props: Omit<DefaultTemplateEmailProps, "children"> & Pick<EmailModelSendArgs, "user">) => React.ReactNode;
|
|
32
32
|
html?: string;
|
|
33
33
|
locale?: string;
|
|
34
34
|
replyTo?: string;
|
|
35
|
-
subject: ((props: Pick<DefaultTemplateEmailProps,
|
|
35
|
+
subject: ((props: Pick<DefaultTemplateEmailProps, "i18n">) => string) | string;
|
|
36
36
|
} & (EmailModelSendArgsWithEmail | EmailModelSendArgsWithUser);
|
|
37
37
|
export declare class EmailModel {
|
|
38
38
|
constructor(c: Context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../../../src/api/models/email.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../../../src/api/models/email.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAC;AAExD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAG/E,UAAU,0BAA0B;IAClC,MAAM,CAAC,EAAE,KAAK,CAAC;IACf,EAAE,CAAC,EAAE,KAAK,CAAC;IACX,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,EAAE,EAAE,MAAM,CAAC;QACX,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,UAAU,2BAA2B;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,KAAK,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,CAAC,IAAI,EAAE;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;QACjD,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;KACZ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACrB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,CACP,KAAK,EAAE,IAAI,CAAC,yBAAyB,EAAE,UAAU,CAAC,GAChD,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,KAC/B,KAAK,CAAC,SAAS,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EACH,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,yBAAyB,EAAE,MAAM,CAAC,KAAK,MAAM,CAAC,GAC5D,MAAM,CAAC;CACZ,GAAG,CAAC,2BAA2B,GAAG,0BAA0B,CAAC,CAAC;AAE/D,qBAAa,UAAU;gBACT,CAAC,EAAE,OAAO;IAItB,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC;IAExB,IAAI,CAAC,EACT,IAAI,EACJ,OAAO,EACP,OAAO,EACP,EAAE,EACF,IAAI,EACJ,OAAO,EACP,MAAM,EAAE,cAAc,GACvB,EAAE,kBAAkB;CAgFtB"}
|
|
@@ -7,17 +7,17 @@ export class EmailModel {
|
|
|
7
7
|
}
|
|
8
8
|
c;
|
|
9
9
|
async send({ html, replyTo, subject, to, user, content, locale: localeFromArgs }) {
|
|
10
|
-
const core = this.c.get(
|
|
10
|
+
const core = this.c.get("core");
|
|
11
11
|
const provider = core.email?.adapter;
|
|
12
12
|
if (!provider) {
|
|
13
13
|
throw new HTTPException(500, {
|
|
14
|
-
message:
|
|
14
|
+
message: "Email provider not found"
|
|
15
15
|
});
|
|
16
16
|
}
|
|
17
|
-
const locale = localeFromArgs ?? user?.language ??
|
|
17
|
+
const locale = localeFromArgs ?? user?.language ?? "en";
|
|
18
18
|
const pluginIds = [
|
|
19
|
-
|
|
20
|
-
...this.c.get(
|
|
19
|
+
"@vitnode/core",
|
|
20
|
+
...this.c.get("core").plugins.map((plugin)=>plugin.id)
|
|
21
21
|
];
|
|
22
22
|
const messagesPromises = pluginIds.map(async (pluginId)=>{
|
|
23
23
|
try {
|
|
@@ -29,7 +29,8 @@ export class EmailModel {
|
|
|
29
29
|
}
|
|
30
30
|
});
|
|
31
31
|
const allMessages = await Promise.all(messagesPromises);
|
|
32
|
-
const messages = allMessages.reduce(
|
|
32
|
+
const messages = allMessages.reduce(// biome-ignore lint/performance/noAccumulatingSpread: <needed>
|
|
33
|
+
(acc, curr)=>({
|
|
33
34
|
...acc,
|
|
34
35
|
...curr
|
|
35
36
|
}), {});
|
|
@@ -50,14 +51,14 @@ export class EmailModel {
|
|
|
50
51
|
const emailTo = user?.email ?? to;
|
|
51
52
|
if (!emailTo) {
|
|
52
53
|
throw new HTTPException(400, {
|
|
53
|
-
message:
|
|
54
|
+
message: "Email address is required"
|
|
54
55
|
});
|
|
55
56
|
}
|
|
56
57
|
try {
|
|
57
58
|
await provider.sendEmail({
|
|
58
59
|
html: await render(htmlContent),
|
|
59
60
|
to: emailTo,
|
|
60
|
-
subject: typeof subject ===
|
|
61
|
+
subject: typeof subject === "function" ? subject({
|
|
61
62
|
i18n: {
|
|
62
63
|
locale,
|
|
63
64
|
messages
|
|
@@ -70,8 +71,8 @@ export class EmailModel {
|
|
|
70
71
|
})
|
|
71
72
|
});
|
|
72
73
|
} catch (err) {
|
|
73
|
-
const error = err instanceof Error ? err : new Error(
|
|
74
|
-
await this.c.get(
|
|
74
|
+
const error = err instanceof Error ? err : new Error("Unknown error from email provider");
|
|
75
|
+
await this.c.get("log").error(`Failed to send email: ${error.message}`);
|
|
75
76
|
}
|
|
76
77
|
}
|
|
77
78
|
}
|