alepha 0.14.4 → 0.15.0
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/README.md +1 -4
- package/dist/api/audits/index.d.ts +619 -731
- package/dist/api/audits/index.d.ts.map +1 -1
- package/dist/api/files/index.d.ts +185 -298
- package/dist/api/files/index.d.ts.map +1 -1
- package/dist/api/files/index.js +0 -1
- package/dist/api/files/index.js.map +1 -1
- package/dist/api/jobs/index.d.ts +245 -356
- package/dist/api/jobs/index.d.ts.map +1 -1
- package/dist/api/notifications/index.d.ts +238 -350
- package/dist/api/notifications/index.d.ts.map +1 -1
- package/dist/api/parameters/index.d.ts +499 -611
- package/dist/api/parameters/index.d.ts.map +1 -1
- package/dist/api/users/index.browser.js +1 -2
- package/dist/api/users/index.browser.js.map +1 -1
- package/dist/api/users/index.d.ts +1697 -1804
- package/dist/api/users/index.d.ts.map +1 -1
- package/dist/api/users/index.js +178 -151
- package/dist/api/users/index.js.map +1 -1
- package/dist/api/verifications/index.d.ts +132 -132
- package/dist/api/verifications/index.d.ts.map +1 -1
- package/dist/batch/index.d.ts +122 -122
- package/dist/batch/index.d.ts.map +1 -1
- package/dist/batch/index.js +1 -2
- package/dist/batch/index.js.map +1 -1
- package/dist/bucket/index.d.ts +163 -163
- package/dist/bucket/index.d.ts.map +1 -1
- package/dist/cache/core/index.d.ts +46 -46
- package/dist/cache/core/index.d.ts.map +1 -1
- package/dist/cache/redis/index.d.ts.map +1 -1
- package/dist/cli/index.d.ts +302 -299
- package/dist/cli/index.d.ts.map +1 -1
- package/dist/cli/index.js +966 -564
- package/dist/cli/index.js.map +1 -1
- package/dist/command/index.d.ts +303 -299
- package/dist/command/index.d.ts.map +1 -1
- package/dist/command/index.js +11 -7
- package/dist/command/index.js.map +1 -1
- package/dist/core/index.browser.js +419 -99
- package/dist/core/index.browser.js.map +1 -1
- package/dist/core/index.d.ts +718 -625
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/index.js +420 -99
- package/dist/core/index.js.map +1 -1
- package/dist/core/index.native.js +419 -99
- package/dist/core/index.native.js.map +1 -1
- package/dist/datetime/index.d.ts +44 -44
- package/dist/datetime/index.d.ts.map +1 -1
- package/dist/datetime/index.js +4 -4
- package/dist/datetime/index.js.map +1 -1
- package/dist/email/index.d.ts +97 -50
- package/dist/email/index.d.ts.map +1 -1
- package/dist/email/index.js +129 -33
- package/dist/email/index.js.map +1 -1
- package/dist/fake/index.d.ts +7981 -14
- package/dist/fake/index.d.ts.map +1 -1
- package/dist/file/index.d.ts +523 -390
- package/dist/file/index.d.ts.map +1 -1
- package/dist/file/index.js +253 -1
- package/dist/file/index.js.map +1 -1
- package/dist/lock/core/index.d.ts +208 -208
- package/dist/lock/core/index.d.ts.map +1 -1
- package/dist/lock/redis/index.d.ts.map +1 -1
- package/dist/logger/index.d.ts +25 -26
- package/dist/logger/index.d.ts.map +1 -1
- package/dist/mcp/index.d.ts +197 -197
- package/dist/mcp/index.d.ts.map +1 -1
- package/dist/orm/chunk-DtkW-qnP.js +38 -0
- package/dist/orm/index.browser.js.map +1 -1
- package/dist/orm/index.bun.js +2814 -0
- package/dist/orm/index.bun.js.map +1 -0
- package/dist/orm/index.d.ts +1205 -1057
- package/dist/orm/index.d.ts.map +1 -1
- package/dist/orm/index.js +2056 -1753
- package/dist/orm/index.js.map +1 -1
- package/dist/queue/core/index.d.ts +248 -248
- package/dist/queue/core/index.d.ts.map +1 -1
- package/dist/queue/redis/index.d.ts.map +1 -1
- package/dist/redis/index.bun.js +285 -0
- package/dist/redis/index.bun.js.map +1 -0
- package/dist/redis/index.d.ts +118 -136
- package/dist/redis/index.d.ts.map +1 -1
- package/dist/redis/index.js +18 -38
- package/dist/redis/index.js.map +1 -1
- package/dist/retry/index.d.ts +69 -69
- package/dist/retry/index.d.ts.map +1 -1
- package/dist/router/index.d.ts +6 -6
- package/dist/router/index.d.ts.map +1 -1
- package/dist/scheduler/index.d.ts +25 -25
- package/dist/scheduler/index.d.ts.map +1 -1
- package/dist/security/index.browser.js +5 -1
- package/dist/security/index.browser.js.map +1 -1
- package/dist/security/index.d.ts +417 -254
- package/dist/security/index.d.ts.map +1 -1
- package/dist/security/index.js +386 -86
- package/dist/security/index.js.map +1 -1
- package/dist/server/auth/index.d.ts +277 -277
- package/dist/server/auth/index.d.ts.map +1 -1
- package/dist/server/auth/index.js +20 -20
- package/dist/server/auth/index.js.map +1 -1
- package/dist/server/cache/index.d.ts +60 -57
- package/dist/server/cache/index.d.ts.map +1 -1
- package/dist/server/cache/index.js +1 -1
- package/dist/server/cache/index.js.map +1 -1
- package/dist/server/compress/index.d.ts +3 -3
- package/dist/server/compress/index.d.ts.map +1 -1
- package/dist/server/cookies/index.d.ts +6 -6
- package/dist/server/cookies/index.d.ts.map +1 -1
- package/dist/server/cookies/index.js +3 -3
- package/dist/server/cookies/index.js.map +1 -1
- package/dist/server/core/index.d.ts +242 -150
- package/dist/server/core/index.d.ts.map +1 -1
- package/dist/server/core/index.js +288 -122
- package/dist/server/core/index.js.map +1 -1
- package/dist/server/cors/index.d.ts +11 -12
- package/dist/server/cors/index.d.ts.map +1 -1
- package/dist/server/health/index.d.ts +0 -1
- package/dist/server/health/index.d.ts.map +1 -1
- package/dist/server/helmet/index.d.ts +2 -2
- package/dist/server/helmet/index.d.ts.map +1 -1
- package/dist/server/links/index.browser.js.map +1 -1
- package/dist/server/links/index.d.ts +84 -85
- package/dist/server/links/index.d.ts.map +1 -1
- package/dist/server/links/index.js +1 -2
- package/dist/server/links/index.js.map +1 -1
- package/dist/server/metrics/index.d.ts.map +1 -1
- package/dist/server/multipart/index.d.ts +6 -6
- package/dist/server/multipart/index.d.ts.map +1 -1
- package/dist/server/proxy/index.d.ts +102 -103
- package/dist/server/proxy/index.d.ts.map +1 -1
- package/dist/server/rate-limit/index.d.ts +16 -16
- package/dist/server/rate-limit/index.d.ts.map +1 -1
- package/dist/server/static/index.d.ts +44 -44
- package/dist/server/static/index.d.ts.map +1 -1
- package/dist/server/swagger/index.d.ts +48 -49
- package/dist/server/swagger/index.d.ts.map +1 -1
- package/dist/server/swagger/index.js +1 -2
- package/dist/server/swagger/index.js.map +1 -1
- package/dist/sms/index.d.ts +13 -11
- package/dist/sms/index.d.ts.map +1 -1
- package/dist/sms/index.js +7 -7
- package/dist/sms/index.js.map +1 -1
- package/dist/thread/index.d.ts +71 -72
- package/dist/thread/index.d.ts.map +1 -1
- package/dist/topic/core/index.d.ts +318 -318
- package/dist/topic/core/index.d.ts.map +1 -1
- package/dist/topic/redis/index.d.ts +6 -6
- package/dist/topic/redis/index.d.ts.map +1 -1
- package/dist/vite/index.d.ts +5720 -159
- package/dist/vite/index.d.ts.map +1 -1
- package/dist/vite/index.js +41 -18
- package/dist/vite/index.js.map +1 -1
- package/dist/websocket/index.browser.js +6 -6
- package/dist/websocket/index.browser.js.map +1 -1
- package/dist/websocket/index.d.ts +247 -247
- package/dist/websocket/index.d.ts.map +1 -1
- package/dist/websocket/index.js +6 -6
- package/dist/websocket/index.js.map +1 -1
- package/package.json +9 -14
- package/src/api/files/controllers/AdminFileStatsController.ts +0 -1
- package/src/api/users/atoms/realmAuthSettingsAtom.ts +5 -0
- package/src/api/users/controllers/{UserRealmController.ts → RealmController.ts} +11 -11
- package/src/api/users/entities/users.ts +1 -1
- package/src/api/users/index.ts +8 -8
- package/src/api/users/primitives/{$userRealm.ts → $realm.ts} +17 -19
- package/src/api/users/providers/{UserRealmProvider.ts → RealmProvider.ts} +26 -30
- package/src/api/users/schemas/{userRealmConfigSchema.ts → realmConfigSchema.ts} +2 -2
- package/src/api/users/services/CredentialService.ts +7 -7
- package/src/api/users/services/IdentityService.ts +4 -4
- package/src/api/users/services/RegistrationService.spec.ts +25 -27
- package/src/api/users/services/RegistrationService.ts +38 -27
- package/src/api/users/services/SessionCrudService.ts +3 -3
- package/src/api/users/services/SessionService.spec.ts +3 -3
- package/src/api/users/services/SessionService.ts +28 -9
- package/src/api/users/services/UserService.ts +7 -7
- package/src/batch/providers/BatchProvider.ts +1 -2
- package/src/cli/apps/AlephaPackageBuilderCli.ts +38 -19
- package/src/cli/assets/apiHelloControllerTs.ts +18 -0
- package/src/cli/assets/apiIndexTs.ts +16 -0
- package/src/cli/assets/claudeMd.ts +303 -0
- package/src/cli/assets/mainBrowserTs.ts +2 -2
- package/src/cli/assets/mainServerTs.ts +24 -0
- package/src/cli/assets/webAppRouterTs.ts +15 -0
- package/src/cli/assets/webHelloComponentTsx.ts +16 -0
- package/src/cli/assets/webIndexTs.ts +16 -0
- package/src/cli/commands/build.ts +41 -21
- package/src/cli/commands/db.ts +21 -18
- package/src/cli/commands/deploy.ts +17 -5
- package/src/cli/commands/dev.ts +13 -17
- package/src/cli/commands/format.ts +8 -2
- package/src/cli/commands/init.ts +74 -29
- package/src/cli/commands/lint.ts +8 -2
- package/src/cli/commands/test.ts +8 -2
- package/src/cli/commands/typecheck.ts +5 -1
- package/src/cli/commands/verify.ts +4 -2
- package/src/cli/services/AlephaCliUtils.ts +39 -600
- package/src/cli/services/PackageManagerUtils.ts +301 -0
- package/src/cli/services/ProjectScaffolder.ts +306 -0
- package/src/command/helpers/Runner.ts +15 -3
- package/src/core/__tests__/Alepha-graph.spec.ts +4 -0
- package/src/core/index.shared.ts +1 -0
- package/src/core/index.ts +2 -0
- package/src/core/primitives/$hook.ts +6 -2
- package/src/core/primitives/$module.spec.ts +4 -0
- package/src/core/providers/AlsProvider.ts +1 -1
- package/src/core/providers/CodecManager.spec.ts +12 -6
- package/src/core/providers/CodecManager.ts +26 -6
- package/src/core/providers/EventManager.ts +169 -13
- package/src/core/providers/KeylessJsonSchemaCodec.spec.ts +621 -0
- package/src/core/providers/KeylessJsonSchemaCodec.ts +407 -0
- package/src/core/providers/StateManager.spec.ts +27 -16
- package/src/email/providers/LocalEmailProvider.spec.ts +111 -87
- package/src/email/providers/LocalEmailProvider.ts +52 -15
- package/src/email/providers/NodemailerEmailProvider.ts +167 -56
- package/src/file/errors/FileError.ts +7 -0
- package/src/file/index.ts +9 -1
- package/src/file/providers/MemoryFileSystemProvider.ts +393 -0
- package/src/orm/index.browser.ts +1 -19
- package/src/orm/index.bun.ts +77 -0
- package/src/orm/index.shared-server.ts +22 -0
- package/src/orm/index.shared.ts +15 -0
- package/src/orm/index.ts +19 -39
- package/src/orm/providers/drivers/BunPostgresProvider.ts +3 -5
- package/src/orm/providers/drivers/BunSqliteProvider.ts +1 -1
- package/src/orm/providers/drivers/CloudflareD1Provider.ts +4 -0
- package/src/orm/providers/drivers/DatabaseProvider.ts +4 -0
- package/src/orm/providers/drivers/PglitePostgresProvider.ts +4 -0
- package/src/orm/services/Repository.ts +8 -0
- package/src/redis/index.bun.ts +35 -0
- package/src/redis/providers/BunRedisProvider.ts +12 -43
- package/src/redis/providers/BunRedisSubscriberProvider.ts +2 -3
- package/src/redis/providers/NodeRedisProvider.ts +16 -34
- package/src/{server/security → security}/__tests__/BasicAuth.spec.ts +11 -11
- package/src/{server/security → security}/__tests__/ServerSecurityProvider-realm.spec.ts +21 -16
- package/src/{server/security/providers → security/__tests__}/ServerSecurityProvider.spec.ts +5 -5
- package/src/security/index.browser.ts +5 -0
- package/src/security/index.ts +90 -7
- package/src/security/primitives/{$realm.spec.ts → $issuer.spec.ts} +11 -11
- package/src/security/primitives/{$realm.ts → $issuer.ts} +20 -17
- package/src/security/primitives/$role.ts +5 -5
- package/src/security/primitives/$serviceAccount.spec.ts +5 -5
- package/src/security/primitives/$serviceAccount.ts +3 -3
- package/src/{server/security → security}/providers/ServerSecurityProvider.ts +5 -7
- package/src/server/auth/primitives/$auth.ts +10 -10
- package/src/server/auth/primitives/$authCredentials.ts +3 -3
- package/src/server/auth/primitives/$authGithub.ts +3 -3
- package/src/server/auth/primitives/$authGoogle.ts +3 -3
- package/src/server/auth/providers/ServerAuthProvider.ts +13 -13
- package/src/server/cache/providers/ServerCacheProvider.ts +1 -1
- package/src/server/cookies/providers/ServerCookiesProvider.ts +3 -3
- package/src/server/core/providers/NodeHttpServerProvider.ts +25 -6
- package/src/server/core/providers/ServerBodyParserProvider.ts +19 -23
- package/src/server/core/providers/ServerLoggerProvider.ts +23 -19
- package/src/server/core/providers/ServerProvider.ts +144 -21
- package/src/server/core/providers/ServerRouterProvider.ts +259 -115
- package/src/server/core/providers/ServerTimingProvider.ts +2 -2
- package/src/server/links/index.ts +1 -1
- package/src/server/links/providers/LinkProvider.ts +1 -1
- package/src/server/swagger/index.ts +1 -1
- package/src/sms/providers/LocalSmsProvider.spec.ts +153 -111
- package/src/sms/providers/LocalSmsProvider.ts +8 -7
- package/src/vite/helpers/boot.ts +28 -17
- package/src/vite/tasks/buildServer.ts +12 -1
- package/src/vite/tasks/devServer.ts +3 -1
- package/src/vite/tasks/generateCloudflare.ts +7 -0
- package/dist/server/security/index.browser.js +0 -13
- package/dist/server/security/index.browser.js.map +0 -1
- package/dist/server/security/index.d.ts +0 -173
- package/dist/server/security/index.d.ts.map +0 -1
- package/dist/server/security/index.js +0 -311
- package/dist/server/security/index.js.map +0 -1
- package/src/cli/assets/appRouterTs.ts +0 -9
- package/src/cli/assets/mainTs.ts +0 -13
- package/src/server/security/index.browser.ts +0 -10
- package/src/server/security/index.ts +0 -94
- /package/src/{server/security → security}/primitives/$basicAuth.ts +0 -0
- /package/src/{server/security → security}/providers/ServerBasicAuthProvider.ts +0 -0
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { $env, $hook, $inject, AlephaError, type Static, t } from "alepha";
|
|
2
2
|
import { $lock } from "alepha/lock";
|
|
3
3
|
import { $logger } from "alepha/logger";
|
|
4
|
-
import type { SQL as BunSQL } from "bun";
|
|
5
4
|
import { sql } from "drizzle-orm";
|
|
6
5
|
import type { BunSQLDatabase } from "drizzle-orm/bun-sql";
|
|
7
6
|
import type { PgDatabase } from "drizzle-orm/pg-core";
|
|
@@ -55,13 +54,13 @@ export class BunPostgresProvider extends DatabaseProvider {
|
|
|
55
54
|
protected readonly kit = $inject(DrizzleKitProvider);
|
|
56
55
|
protected readonly builder = $inject(PostgresModelBuilder);
|
|
57
56
|
|
|
58
|
-
protected client?:
|
|
57
|
+
protected client?: Bun.SQL;
|
|
59
58
|
protected bunDb?: BunSQLDatabase;
|
|
60
59
|
|
|
61
60
|
public readonly dialect = "postgresql";
|
|
62
61
|
|
|
63
62
|
public get name() {
|
|
64
|
-
return "
|
|
63
|
+
return "postgres";
|
|
65
64
|
}
|
|
66
65
|
|
|
67
66
|
/**
|
|
@@ -184,10 +183,9 @@ export class BunPostgresProvider extends DatabaseProvider {
|
|
|
184
183
|
}
|
|
185
184
|
|
|
186
185
|
const { drizzle } = await import("drizzle-orm/bun-sql");
|
|
187
|
-
const { SQL } = await import("bun");
|
|
188
186
|
|
|
189
187
|
// Create Bun SQL client
|
|
190
|
-
this.client = new SQL(this.url);
|
|
188
|
+
this.client = new Bun.SQL(this.url);
|
|
191
189
|
|
|
192
190
|
// Test connection
|
|
193
191
|
await this.client.unsafe("SELECT 1");
|
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
t,
|
|
12
12
|
} from "alepha";
|
|
13
13
|
import { type DateTime, DateTimeProvider } from "alepha/datetime";
|
|
14
|
+
import { $logger } from "alepha/logger";
|
|
14
15
|
import { asc, desc, isSQLWrapper, type SQL } from "drizzle-orm";
|
|
15
16
|
import type {
|
|
16
17
|
LockConfig,
|
|
@@ -62,6 +63,7 @@ export abstract class Repository<T extends TObject> {
|
|
|
62
63
|
public readonly entity: EntityPrimitive<T>;
|
|
63
64
|
public readonly provider: DatabaseProvider;
|
|
64
65
|
|
|
66
|
+
protected readonly log = $logger();
|
|
65
67
|
protected readonly relationManager = $inject(PgRelationManager);
|
|
66
68
|
protected readonly queryManager = $inject(QueryManager);
|
|
67
69
|
protected readonly dateTimeProvider = $inject(DateTimeProvider);
|
|
@@ -200,6 +202,12 @@ export abstract class Repository<T extends TObject> {
|
|
|
200
202
|
) => Promise<T>,
|
|
201
203
|
config?: PgTransactionConfig,
|
|
202
204
|
): Promise<T> {
|
|
205
|
+
if (this.provider.driver === "pglite") {
|
|
206
|
+
this.log.warn("Transactions are not supported with pglite driver");
|
|
207
|
+
return await transaction(null as any);
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
this.log.debug(`Starting transaction on table ${this.tableName}`);
|
|
203
211
|
return await this.db.transaction(transaction, config);
|
|
204
212
|
}
|
|
205
213
|
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { $module, type Alepha } from "alepha";
|
|
2
|
+
import { BunRedisProvider } from "./providers/BunRedisProvider.ts";
|
|
3
|
+
import { BunRedisSubscriberProvider } from "./providers/BunRedisSubscriberProvider.ts";
|
|
4
|
+
import { RedisProvider } from "./providers/RedisProvider.ts";
|
|
5
|
+
import { RedisSubscriberProvider } from "./providers/RedisSubscriberProvider.ts";
|
|
6
|
+
|
|
7
|
+
// ---------------------------------------------------------------------------------------------------------------------
|
|
8
|
+
|
|
9
|
+
export * from "./providers/BunRedisProvider.ts";
|
|
10
|
+
export * from "./providers/BunRedisSubscriberProvider.ts";
|
|
11
|
+
export * from "./providers/RedisProvider.ts";
|
|
12
|
+
export * from "./providers/RedisSubscriberProvider.ts";
|
|
13
|
+
|
|
14
|
+
// ---------------------------------------------------------------------------------------------------------------------
|
|
15
|
+
|
|
16
|
+
export const AlephaRedis = $module({
|
|
17
|
+
name: "alepha.redis",
|
|
18
|
+
services: [
|
|
19
|
+
BunRedisProvider,
|
|
20
|
+
BunRedisSubscriberProvider,
|
|
21
|
+
RedisProvider,
|
|
22
|
+
RedisSubscriberProvider,
|
|
23
|
+
],
|
|
24
|
+
register: (alepha: Alepha) => {
|
|
25
|
+
alepha
|
|
26
|
+
.with({
|
|
27
|
+
provide: RedisProvider,
|
|
28
|
+
use: BunRedisProvider,
|
|
29
|
+
})
|
|
30
|
+
.with({
|
|
31
|
+
provide: RedisSubscriberProvider,
|
|
32
|
+
use: BunRedisSubscriberProvider,
|
|
33
|
+
});
|
|
34
|
+
},
|
|
35
|
+
});
|
|
@@ -8,18 +8,13 @@ import {
|
|
|
8
8
|
t,
|
|
9
9
|
} from "alepha";
|
|
10
10
|
import { $logger } from "alepha/logger";
|
|
11
|
-
import type { RedisClient as BunRedisClient } from "bun";
|
|
12
11
|
import { RedisProvider, type RedisSetOptions } from "./RedisProvider.ts";
|
|
13
12
|
|
|
14
13
|
const envSchema = t.object({
|
|
15
|
-
REDIS_URL: t.
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
REDIS_URL: t.text({
|
|
15
|
+
default: "redis://localhost:6379",
|
|
16
|
+
description: "Redis connection URL",
|
|
18
17
|
}),
|
|
19
|
-
REDIS_HOST: t.text({
|
|
20
|
-
default: "localhost",
|
|
21
|
-
}),
|
|
22
|
-
REDIS_PASSWORD: t.optional(t.text()),
|
|
23
18
|
});
|
|
24
19
|
|
|
25
20
|
declare module "alepha" {
|
|
@@ -34,10 +29,8 @@ declare module "alepha" {
|
|
|
34
29
|
*
|
|
35
30
|
* @example
|
|
36
31
|
* ```ts
|
|
37
|
-
* // Set REDIS_URL environment variable
|
|
38
|
-
* // REDIS_URL=redis
|
|
39
|
-
*
|
|
40
|
-
* // Or configure via REDIS_HOST, REDIS_PORT, REDIS_PASSWORD
|
|
32
|
+
* // Set REDIS_URL environment variable (default: redis://localhost:6379)
|
|
33
|
+
* // REDIS_URL=redis://:password@myredis.example.com:6379
|
|
41
34
|
*
|
|
42
35
|
* // Or configure programmatically
|
|
43
36
|
* alepha.with({
|
|
@@ -50,9 +43,9 @@ export class BunRedisProvider extends RedisProvider {
|
|
|
50
43
|
protected readonly log = $logger();
|
|
51
44
|
protected readonly alepha = $inject(Alepha);
|
|
52
45
|
protected readonly env = $env(envSchema);
|
|
53
|
-
protected client?:
|
|
46
|
+
protected client?: Bun.RedisClient;
|
|
54
47
|
|
|
55
|
-
public get publisher():
|
|
48
|
+
public get publisher(): Bun.RedisClient {
|
|
56
49
|
if (!this.client?.connected) {
|
|
57
50
|
throw new AlephaError("Redis client is not ready");
|
|
58
51
|
}
|
|
@@ -79,7 +72,7 @@ export class BunRedisProvider extends RedisProvider {
|
|
|
79
72
|
*/
|
|
80
73
|
public override async connect(): Promise<void> {
|
|
81
74
|
// Check if we're running in Bun
|
|
82
|
-
if (
|
|
75
|
+
if (!this.alepha.isBun()) {
|
|
83
76
|
throw new AlephaError(
|
|
84
77
|
"BunRedisProvider requires the Bun runtime. Use NodeRedisProvider for Node.js.",
|
|
85
78
|
);
|
|
@@ -87,9 +80,7 @@ export class BunRedisProvider extends RedisProvider {
|
|
|
87
80
|
|
|
88
81
|
this.log.debug("Connecting...");
|
|
89
82
|
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
this.client = new RedisClient(this.getUrl(), {
|
|
83
|
+
this.client = new Bun.RedisClient(this.getUrl(), {
|
|
93
84
|
autoReconnect: true,
|
|
94
85
|
enableAutoPipelining: true,
|
|
95
86
|
});
|
|
@@ -124,14 +115,12 @@ export class BunRedisProvider extends RedisProvider {
|
|
|
124
115
|
/**
|
|
125
116
|
* Create a duplicate connection for pub/sub or other isolated operations.
|
|
126
117
|
*/
|
|
127
|
-
public async duplicate(): Promise<
|
|
118
|
+
public async duplicate(): Promise<Bun.RedisClient> {
|
|
128
119
|
if (typeof Bun === "undefined") {
|
|
129
120
|
throw new AlephaError("BunRedisProvider requires the Bun runtime.");
|
|
130
121
|
}
|
|
131
122
|
|
|
132
|
-
const
|
|
133
|
-
|
|
134
|
-
const client = new RedisClient(this.getUrl(), {
|
|
123
|
+
const client = new Bun.RedisClient(this.getUrl(), {
|
|
135
124
|
autoReconnect: true,
|
|
136
125
|
enableAutoPipelining: true,
|
|
137
126
|
});
|
|
@@ -279,26 +268,6 @@ export class BunRedisProvider extends RedisProvider {
|
|
|
279
268
|
* Get the Redis connection URL.
|
|
280
269
|
*/
|
|
281
270
|
protected getUrl(): string {
|
|
282
|
-
|
|
283
|
-
if (this.env.REDIS_URL) {
|
|
284
|
-
return this.env.REDIS_URL;
|
|
285
|
-
}
|
|
286
|
-
|
|
287
|
-
// Build URL from components
|
|
288
|
-
const url = new URL("redis://127.0.0.1:6379");
|
|
289
|
-
|
|
290
|
-
if (this.env.REDIS_PASSWORD) {
|
|
291
|
-
url.password = this.env.REDIS_PASSWORD;
|
|
292
|
-
}
|
|
293
|
-
|
|
294
|
-
if (this.env.REDIS_HOST) {
|
|
295
|
-
url.hostname = this.env.REDIS_HOST;
|
|
296
|
-
}
|
|
297
|
-
|
|
298
|
-
if (this.env.REDIS_PORT) {
|
|
299
|
-
url.port = String(this.env.REDIS_PORT);
|
|
300
|
-
}
|
|
301
|
-
|
|
302
|
-
return url.toString();
|
|
271
|
+
return this.env.REDIS_URL;
|
|
303
272
|
}
|
|
304
273
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { $hook, $inject, Alepha, AlephaError } from "alepha";
|
|
2
2
|
import { $logger } from "alepha/logger";
|
|
3
|
-
import type { RedisClient as BunRedisClient } from "bun";
|
|
4
3
|
import { BunRedisProvider } from "./BunRedisProvider.ts";
|
|
5
4
|
import {
|
|
6
5
|
RedisSubscriberProvider,
|
|
@@ -25,9 +24,9 @@ export class BunRedisSubscriberProvider extends RedisSubscriberProvider {
|
|
|
25
24
|
protected readonly log = $logger();
|
|
26
25
|
protected readonly alepha = $inject(Alepha);
|
|
27
26
|
protected readonly redisProvider = $inject(BunRedisProvider);
|
|
28
|
-
protected client?:
|
|
27
|
+
protected client?: Bun.RedisClient;
|
|
29
28
|
|
|
30
|
-
public get subscriber():
|
|
29
|
+
public get subscriber(): Bun.RedisClient {
|
|
31
30
|
if (!this.client?.connected) {
|
|
32
31
|
throw new AlephaError("Redis subscriber client is not ready");
|
|
33
32
|
}
|
|
@@ -4,19 +4,23 @@ import {
|
|
|
4
4
|
type RedisClientType,
|
|
5
5
|
type SetOptions,
|
|
6
6
|
} from "@redis/client";
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
$env,
|
|
9
|
+
$hook,
|
|
10
|
+
$inject,
|
|
11
|
+
Alepha,
|
|
12
|
+
AlephaError,
|
|
13
|
+
type Static,
|
|
14
|
+
t,
|
|
15
|
+
} from "alepha";
|
|
8
16
|
import { $logger } from "alepha/logger";
|
|
9
17
|
import { RedisProvider, type RedisSetOptions } from "./RedisProvider.ts";
|
|
10
18
|
|
|
11
19
|
const envSchema = t.object({
|
|
12
|
-
REDIS_URL: t.
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
}),
|
|
16
|
-
REDIS_HOST: t.text({
|
|
17
|
-
default: "localhost",
|
|
20
|
+
REDIS_URL: t.text({
|
|
21
|
+
default: "redis://localhost:6379",
|
|
22
|
+
description: "Redis connection URL",
|
|
18
23
|
}),
|
|
19
|
-
REDIS_PASSWORD: t.optional(t.text()),
|
|
20
24
|
});
|
|
21
25
|
|
|
22
26
|
declare module "alepha" {
|
|
@@ -39,10 +43,8 @@ export type NodeRedisClientOptions = Parameters<typeof createClient>[0];
|
|
|
39
43
|
*
|
|
40
44
|
* @example
|
|
41
45
|
* ```ts
|
|
42
|
-
* // Set REDIS_URL environment variable
|
|
43
|
-
* // REDIS_URL=redis
|
|
44
|
-
*
|
|
45
|
-
* // Or configure via REDIS_HOST, REDIS_PORT, REDIS_PASSWORD
|
|
46
|
+
* // Set REDIS_URL environment variable (default: redis://localhost:6379)
|
|
47
|
+
* // REDIS_URL=redis://:password@myredis.example.com:6379
|
|
46
48
|
*
|
|
47
49
|
* // Or configure programmatically
|
|
48
50
|
* alepha.with({
|
|
@@ -59,7 +61,7 @@ export class NodeRedisProvider extends RedisProvider {
|
|
|
59
61
|
|
|
60
62
|
public get publisher(): NodeRedisClient {
|
|
61
63
|
if (!this.client.isReady) {
|
|
62
|
-
throw new
|
|
64
|
+
throw new AlephaError("Redis client is not ready");
|
|
63
65
|
}
|
|
64
66
|
|
|
65
67
|
return this.client;
|
|
@@ -235,27 +237,7 @@ export class NodeRedisProvider extends RedisProvider {
|
|
|
235
237
|
* Get the Redis connection URL.
|
|
236
238
|
*/
|
|
237
239
|
protected getUrl(): string {
|
|
238
|
-
|
|
239
|
-
if (this.env.REDIS_URL) {
|
|
240
|
-
return this.env.REDIS_URL;
|
|
241
|
-
}
|
|
242
|
-
|
|
243
|
-
// Build URL from components
|
|
244
|
-
const url = new URL("redis://127.0.0.1:6379");
|
|
245
|
-
|
|
246
|
-
if (this.env.REDIS_PASSWORD) {
|
|
247
|
-
url.password = this.env.REDIS_PASSWORD;
|
|
248
|
-
}
|
|
249
|
-
|
|
250
|
-
if (this.env.REDIS_HOST) {
|
|
251
|
-
url.hostname = this.env.REDIS_HOST;
|
|
252
|
-
}
|
|
253
|
-
|
|
254
|
-
if (this.env.REDIS_PORT) {
|
|
255
|
-
url.port = String(this.env.REDIS_PORT);
|
|
256
|
-
}
|
|
257
|
-
|
|
258
|
-
return url.toString();
|
|
240
|
+
return this.env.REDIS_URL;
|
|
259
241
|
}
|
|
260
242
|
|
|
261
243
|
/**
|
|
@@ -3,7 +3,7 @@ import { $action, AlephaServer } from "alepha/server";
|
|
|
3
3
|
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
4
4
|
import {
|
|
5
5
|
$basicAuth,
|
|
6
|
-
|
|
6
|
+
AlephaSecurity,
|
|
7
7
|
ServerBasicAuthProvider,
|
|
8
8
|
} from "../index.ts";
|
|
9
9
|
|
|
@@ -58,7 +58,7 @@ describe("Basic Authentication", () => {
|
|
|
58
58
|
beforeEach(async () => {
|
|
59
59
|
alepha = Alepha.create()
|
|
60
60
|
.with(AlephaServer)
|
|
61
|
-
.with(
|
|
61
|
+
.with(AlephaSecurity)
|
|
62
62
|
.with(TestApp);
|
|
63
63
|
|
|
64
64
|
await alepha.start();
|
|
@@ -269,7 +269,7 @@ describe("Basic Authentication", () => {
|
|
|
269
269
|
|
|
270
270
|
const edgeAlepha = Alepha.create()
|
|
271
271
|
.with(AlephaServer)
|
|
272
|
-
.with(
|
|
272
|
+
.with(AlephaSecurity)
|
|
273
273
|
.with(EdgeCaseApp);
|
|
274
274
|
|
|
275
275
|
await edgeAlepha.start();
|
|
@@ -301,7 +301,7 @@ describe("Basic Authentication", () => {
|
|
|
301
301
|
|
|
302
302
|
const emptyAlepha = Alepha.create()
|
|
303
303
|
.with(AlephaServer)
|
|
304
|
-
.with(
|
|
304
|
+
.with(AlephaSecurity)
|
|
305
305
|
.with(EmptyPasswordApp);
|
|
306
306
|
|
|
307
307
|
await emptyAlepha.start();
|
|
@@ -333,7 +333,7 @@ describe("Basic Authentication", () => {
|
|
|
333
333
|
|
|
334
334
|
const specialAlepha = Alepha.create()
|
|
335
335
|
.with(AlephaServer)
|
|
336
|
-
.with(
|
|
336
|
+
.with(AlephaSecurity)
|
|
337
337
|
.with(SpecialCharsApp);
|
|
338
338
|
|
|
339
339
|
await specialAlepha.start();
|
|
@@ -365,7 +365,7 @@ describe("Basic Authentication", () => {
|
|
|
365
365
|
|
|
366
366
|
const unicodeAlepha = Alepha.create()
|
|
367
367
|
.with(AlephaServer)
|
|
368
|
-
.with(
|
|
368
|
+
.with(AlephaSecurity)
|
|
369
369
|
.with(UnicodeApp);
|
|
370
370
|
|
|
371
371
|
await unicodeAlepha.start();
|
|
@@ -397,7 +397,7 @@ describe("Basic Authentication", () => {
|
|
|
397
397
|
|
|
398
398
|
const unicodeAlepha = Alepha.create()
|
|
399
399
|
.with(AlephaServer)
|
|
400
|
-
.with(
|
|
400
|
+
.with(AlephaSecurity)
|
|
401
401
|
.with(UnicodeApp);
|
|
402
402
|
|
|
403
403
|
await unicodeAlepha.start();
|
|
@@ -434,7 +434,7 @@ describe("Basic Authentication", () => {
|
|
|
434
434
|
|
|
435
435
|
const longAlepha = Alepha.create()
|
|
436
436
|
.with(AlephaServer)
|
|
437
|
-
.with(
|
|
437
|
+
.with(AlephaSecurity)
|
|
438
438
|
.with(LongCredsApp);
|
|
439
439
|
|
|
440
440
|
await longAlepha.start();
|
|
@@ -466,7 +466,7 @@ describe("Basic Authentication", () => {
|
|
|
466
466
|
|
|
467
467
|
const emptyUserAlepha = Alepha.create()
|
|
468
468
|
.with(AlephaServer)
|
|
469
|
-
.with(
|
|
469
|
+
.with(AlephaSecurity)
|
|
470
470
|
.with(EmptyUsernameApp);
|
|
471
471
|
|
|
472
472
|
await emptyUserAlepha.start();
|
|
@@ -549,7 +549,7 @@ describe("Basic Authentication", () => {
|
|
|
549
549
|
|
|
550
550
|
const wsAlepha = Alepha.create()
|
|
551
551
|
.with(AlephaServer)
|
|
552
|
-
.with(
|
|
552
|
+
.with(AlephaSecurity)
|
|
553
553
|
.with(WhitespaceApp);
|
|
554
554
|
|
|
555
555
|
await wsAlepha.start();
|
|
@@ -582,7 +582,7 @@ describe("Basic Authentication", () => {
|
|
|
582
582
|
|
|
583
583
|
const wsAlepha = Alepha.create()
|
|
584
584
|
.with(AlephaServer)
|
|
585
|
-
.with(
|
|
585
|
+
.with(AlephaSecurity)
|
|
586
586
|
.with(WhitespaceApp);
|
|
587
587
|
|
|
588
588
|
await wsAlepha.start();
|
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
2
|
import { Alepha } from "alepha";
|
|
3
|
-
import {
|
|
4
|
-
|
|
3
|
+
import {
|
|
4
|
+
$action,
|
|
5
|
+
$route,
|
|
6
|
+
AlephaServer,
|
|
7
|
+
ForbiddenError,
|
|
8
|
+
ServerProvider,
|
|
9
|
+
} from "alepha/server";
|
|
5
10
|
import { describe, expect, it } from "vitest";
|
|
6
|
-
import {
|
|
11
|
+
import { $issuer, AlephaSecurity } from "../index.ts";
|
|
7
12
|
|
|
8
13
|
describe("ServerSecurityProvider - Realm Protection", () => {
|
|
9
14
|
it("should allow access when user belongs to the required realm", async () => {
|
|
10
15
|
class TestApp {
|
|
11
|
-
realmA = $
|
|
16
|
+
realmA = $issuer({
|
|
12
17
|
secret: "test-realm-a",
|
|
13
18
|
roles: [
|
|
14
19
|
{
|
|
@@ -18,7 +23,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
18
23
|
],
|
|
19
24
|
});
|
|
20
25
|
|
|
21
|
-
realmB = $
|
|
26
|
+
realmB = $issuer({
|
|
22
27
|
secret: "test-realm-b",
|
|
23
28
|
roles: [
|
|
24
29
|
{
|
|
@@ -43,7 +48,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
43
48
|
});
|
|
44
49
|
}
|
|
45
50
|
|
|
46
|
-
const alepha = Alepha.create().with(
|
|
51
|
+
const alepha = Alepha.create().with(AlephaServer).with(AlephaSecurity);
|
|
47
52
|
const app = alepha.inject(TestApp);
|
|
48
53
|
await alepha.start();
|
|
49
54
|
|
|
@@ -85,7 +90,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
85
90
|
|
|
86
91
|
it("should deny access when user does not belong to the required realm", async () => {
|
|
87
92
|
class TestApp {
|
|
88
|
-
realmA = $
|
|
93
|
+
realmA = $issuer({
|
|
89
94
|
secret: "test-realm-a",
|
|
90
95
|
roles: [
|
|
91
96
|
{
|
|
@@ -95,7 +100,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
95
100
|
],
|
|
96
101
|
});
|
|
97
102
|
|
|
98
|
-
realmB = $
|
|
103
|
+
realmB = $issuer({
|
|
99
104
|
secret: "test-realm-b",
|
|
100
105
|
roles: [
|
|
101
106
|
{
|
|
@@ -120,7 +125,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
120
125
|
});
|
|
121
126
|
}
|
|
122
127
|
|
|
123
|
-
const alepha = Alepha.create().with(
|
|
128
|
+
const alepha = Alepha.create().with(AlephaServer).with(AlephaSecurity);
|
|
124
129
|
const app = alepha.inject(TestApp);
|
|
125
130
|
await alepha.start();
|
|
126
131
|
|
|
@@ -172,7 +177,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
172
177
|
|
|
173
178
|
it("should work with actions when user has no realm attribute", async () => {
|
|
174
179
|
class TestApp {
|
|
175
|
-
realmA = $
|
|
180
|
+
realmA = $issuer({
|
|
176
181
|
secret: "test-realm-a",
|
|
177
182
|
roles: [
|
|
178
183
|
{
|
|
@@ -188,7 +193,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
188
193
|
});
|
|
189
194
|
}
|
|
190
195
|
|
|
191
|
-
const alepha = Alepha.create().with(
|
|
196
|
+
const alepha = Alepha.create().with(AlephaServer).with(AlephaSecurity);
|
|
192
197
|
const app = alepha.inject(TestApp);
|
|
193
198
|
await alepha.start();
|
|
194
199
|
|
|
@@ -215,7 +220,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
215
220
|
|
|
216
221
|
it("should combine realm and permission checks", async () => {
|
|
217
222
|
class TestApp {
|
|
218
|
-
realmA = $
|
|
223
|
+
realmA = $issuer({
|
|
219
224
|
secret: "test-realm-a",
|
|
220
225
|
roles: [
|
|
221
226
|
{
|
|
@@ -229,7 +234,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
229
234
|
],
|
|
230
235
|
});
|
|
231
236
|
|
|
232
|
-
realmB = $
|
|
237
|
+
realmB = $issuer({
|
|
233
238
|
secret: "test-realm-b",
|
|
234
239
|
});
|
|
235
240
|
|
|
@@ -248,7 +253,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
248
253
|
});
|
|
249
254
|
}
|
|
250
255
|
|
|
251
|
-
const alepha = Alepha.create().with(
|
|
256
|
+
const alepha = Alepha.create().with(AlephaServer).with(AlephaSecurity);
|
|
252
257
|
const app = alepha.inject(TestApp);
|
|
253
258
|
await alepha.start();
|
|
254
259
|
|
|
@@ -336,7 +341,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
336
341
|
|
|
337
342
|
it("should work with fetch requests when realm is valid", async () => {
|
|
338
343
|
class TestApp {
|
|
339
|
-
realmA = $
|
|
344
|
+
realmA = $issuer({
|
|
340
345
|
secret: "test-realm-a",
|
|
341
346
|
roles: [
|
|
342
347
|
{
|
|
@@ -352,7 +357,7 @@ describe("ServerSecurityProvider - Realm Protection", () => {
|
|
|
352
357
|
});
|
|
353
358
|
}
|
|
354
359
|
|
|
355
|
-
const alepha = Alepha.create().with(
|
|
360
|
+
const alepha = Alepha.create().with(AlephaServer).with(AlephaSecurity);
|
|
356
361
|
const app = alepha.inject(TestApp);
|
|
357
362
|
await alepha.start();
|
|
358
363
|
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
2
|
import { Alepha } from "alepha";
|
|
3
|
-
import { $realm } from "alepha/security";
|
|
4
3
|
import {
|
|
5
4
|
$action,
|
|
5
|
+
AlephaServer,
|
|
6
6
|
ForbiddenError,
|
|
7
7
|
HttpError,
|
|
8
8
|
ServerProvider,
|
|
9
9
|
UnauthorizedError,
|
|
10
10
|
} from "alepha/server";
|
|
11
11
|
import { describe, expect, it } from "vitest";
|
|
12
|
-
import {
|
|
12
|
+
import { $issuer, AlephaSecurity } from "../index.ts";
|
|
13
13
|
|
|
14
14
|
describe("ServerSecurityProvider", () => {
|
|
15
15
|
it("should protect action from unauthorized users", async () => {
|
|
@@ -19,7 +19,7 @@ describe("ServerSecurityProvider", () => {
|
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
-
const alepha = Alepha.create().with(
|
|
22
|
+
const alepha = Alepha.create().with(AlephaServer).with(AlephaSecurity);
|
|
23
23
|
const app = alepha.inject(TestApp);
|
|
24
24
|
await alepha.start();
|
|
25
25
|
|
|
@@ -62,7 +62,7 @@ describe("ServerSecurityProvider", () => {
|
|
|
62
62
|
group: "read",
|
|
63
63
|
handler: () => "USER",
|
|
64
64
|
});
|
|
65
|
-
|
|
65
|
+
issuer = $issuer({
|
|
66
66
|
secret: "test",
|
|
67
67
|
roles: [
|
|
68
68
|
{
|
|
@@ -77,7 +77,7 @@ describe("ServerSecurityProvider", () => {
|
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
const alepha = Alepha.create().with(
|
|
80
|
+
const alepha = Alepha.create().with(AlephaServer).with(AlephaSecurity);
|
|
81
81
|
const app = alepha.inject(TestApp);
|
|
82
82
|
await alepha.start();
|
|
83
83
|
|
|
@@ -11,3 +11,8 @@ export * from "./schemas/userAccountInfoSchema.ts";
|
|
|
11
11
|
export const AlephaSecurity = $module({
|
|
12
12
|
name: "alepha.security",
|
|
13
13
|
});
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* @deprecated Use `AlephaSecurity` instead. Server security providers are automatically registered when `AlephaServer` is available.
|
|
17
|
+
*/
|
|
18
|
+
export const AlephaServerSecurity = AlephaSecurity;
|