@zintrust/core 0.1.41 → 0.1.43

package/src/proxy/sqlserver/SqlServerProxyServer.js

@@ -1,23 +1,17 @@
-import { Env } from '../../config/env.js';
-import { Logger } from '../../config/logger.js';
-import { ErrorHandler } from '../ErrorHandler.js';
-import { createProxyServer } from '../ProxyServer.js';
-import { resolveBaseConfig, resolveBaseSigningConfig, verifyRequestSignature, } from '../ProxyServerUtils.js';
-import { RequestValidator } from '../RequestValidator.js';
-import { validateSqlPayload } from '../SqlPayloadValidator.js';
+import * as Deps from '../SqlProxyServerDeps.js';
 const resolveDatabaseConfig = (overrides = {}) => {
-    const dbHost = overrides.dbHost ?? Env.get('DB_HOST_MSSQL', Env.get('DB_HOST', '127.0.0.1'));
-    const dbPort = overrides.dbPort ?? Env.getInt('DB_PORT_MSSQL', 1433);
-    const dbName = overrides.dbName ?? Env.get('DB_DATABASE_MSSQL', 'zintrust');
-    const dbUser = overrides.dbUser ?? Env.get('DB_USERNAME_MSSQL', 'sa');
-    const dbPass = overrides.dbPass ?? Env.get('DB_PASSWORD_MSSQL', '');
-    const connectionLimit = overrides.connectionLimit ?? Env.getInt('SQLSERVER_PROXY_POOL_LIMIT', 10);
+    const dbHost = overrides.dbHost ?? Deps.Env.get('DB_HOST_MSSQL', Deps.Env.get('DB_HOST', '127.0.0.1'));
+    const dbPort = overrides.dbPort ?? Deps.Env.getInt('DB_PORT_MSSQL', 1433);
+    const dbName = overrides.dbName ?? Deps.Env.get('DB_DATABASE_MSSQL', 'zintrust');
+    const dbUser = overrides.dbUser ?? Deps.Env.get('DB_USERNAME_MSSQL', 'sa');
+    const dbPass = overrides.dbPass ?? Deps.Env.get('DB_PASSWORD_MSSQL', '');
+    const connectionLimit = overrides.connectionLimit ?? Deps.Env.getInt('SQLSERVER_PROXY_POOL_LIMIT', 10);
     return { dbHost, dbPort, dbName, dbUser, dbPass, connectionLimit };
 };
 const resolveConfig = (overrides = {}) => {
-    const proxyConfig = resolveBaseConfig(overrides, 'SQLSERVER');
+    const proxyConfig = Deps.resolveBaseConfig(overrides, 'SQLSERVER');
     const dbConfig = resolveDatabaseConfig(overrides);
-    const signingConfig = resolveBaseSigningConfig(overrides, 'SQLSERVER');
+    const signingConfig = Deps.resolveBaseSigningConfig(overrides, 'SQLSERVER');
     const poolConfig = {
         server: dbConfig.dbHost,
         port: dbConfig.dbPort,
@@ -45,10 +39,11 @@ const resolveConfig = (overrides = {}) => {
             require: signingConfig.requireSigning,
             windowMs: signingConfig.signingWindowMs,
         },
+        statements: Deps.loadStatementRegistry('SQLSERVER'),
     };
 };
 const validateQueryPayload = (payload) => {
-    const base = validateSqlPayload(payload);
+    const base = Deps.validateSqlPayload(payload);
     if (!base.valid) {
         return { valid: false, error: base.error };
     }
@@ -95,42 +90,82 @@ const handleEndpoint = (path, result) => {
             },
         };
     }
-    return ErrorHandler.toProxyError(404, 'NOT_FOUND', 'Unknown endpoint');
+    if (path === '/zin/sqlserver/statement') {
+        // Statement endpoint returns query-shaped response for non-mutating SQL.
+        return { status: 200, body: { rows, rowCount: rowsAffected[0] ?? 0 } };
+    }
+    return Deps.ErrorHandler.toProxyError(404, 'NOT_FOUND', 'Unknown endpoint');
+};
+const toMutatingStatementResponse = (result) => {
+    const rowsAffected = result['rowsAffected'];
+    return {
+        status: 200,
+        body: {
+            ok: true,
+            meta: { changes: rowsAffected[0] ?? 0 },
+        },
+    };
+};
+const handleStatementRequest = async (pool, statements, requestPath, payload) => {
+    const resolved = Deps.resolveStatementOrError(statements, payload);
+    if (!resolved.ok)
+        return resolved.response;
+    try {
+        const result = await executeQuery(pool, resolved.value.sql, resolved.value.params);
+        if (!resolved.value.mutating)
+            return handleEndpoint('/zin/sqlserver/statement', result);
+        return toMutatingStatementResponse(result);
+    }
+    catch (error) {
+        Deps.Logger.error('[SqlServerProxyServer] Statement execution failed', {
+            path: requestPath,
+            statementId: resolved.value.statementId,
+            mutating: resolved.value.mutating,
+            paramsCount: resolved.value.params.length,
+            error: error instanceof Error ? error.message : String(error),
+        });
+        return Deps.ErrorHandler.toProxyError(500, 'SQLSERVER_ERROR', String(error));
+    }
+};
+const handleSqlRequest = async (pool, requestPath, payload) => {
+    const sqlValidation = validateQueryPayload(payload);
+    if (!sqlValidation.valid) {
+        const error = sqlValidation.error ?? {
+            code: 'VALIDATION_ERROR',
+            message: 'Invalid SQL payload',
+        };
+        return Deps.ErrorHandler.toProxyError(400, error.code, error.message);
+    }
+    try {
+        const result = await executeQuery(pool, sqlValidation.sql ?? '', sqlValidation.params ?? []);
+        return handleEndpoint(requestPath, result);
+    }
+    catch (error) {
+        return Deps.ErrorHandler.toProxyError(500, 'SQLSERVER_ERROR', String(error));
+    }
 };
-const createBackend = (pool) => ({
+const handleProxyRequest = async (pool, statements, request) => {
+    const validationError = Deps.validateProxyRequest(request);
+    if (validationError !== null)
+        return validationError;
+    const parsed = Deps.parseJsonBody(request.body);
+    if ('status' in parsed)
+        return parsed;
+    if (request.path === '/zin/sqlserver/statement') {
+        return handleStatementRequest(pool, statements, request.path, parsed.value);
+    }
+    return handleSqlRequest(pool, request.path, parsed.value);
+};
+const createBackend = (pool, statements) => ({
     name: 'sqlserver',
-    handle: async (request) => {
-        const methodError = RequestValidator.requirePost(request.method);
-        if (methodError) {
-            return ErrorHandler.toProxyError(405, methodError.code, methodError.message);
-        }
-        const parsed = RequestValidator.parseJson(request.body);
-        if (!parsed.ok) {
-            return ErrorHandler.toProxyError(400, parsed.error.code, parsed.error.message);
-        }
-        const sqlValidation = validateQueryPayload(parsed.value);
-        if (!sqlValidation.valid) {
-            const error = sqlValidation.error ?? {
-                code: 'VALIDATION_ERROR',
-                message: 'Invalid SQL payload',
-            };
-            return ErrorHandler.toProxyError(400, error.code, error.message);
-        }
-        try {
-            const result = await executeQuery(pool, sqlValidation.sql ?? '', sqlValidation.params ?? []);
-            return handleEndpoint(request.path, result);
-        }
-        catch (error) {
-            return ErrorHandler.toProxyError(500, 'SQLSERVER_ERROR', String(error));
-        }
-    },
+    handle: async (request) => handleProxyRequest(pool, statements, request),
     health: async () => {
         try {
             await executeQuery(pool, 'SELECT 1', []);
             return { status: 200, body: { status: 'healthy' } };
         }
         catch (error) {
-            return ErrorHandler.toProxyError(503, 'UNHEALTHY', String(error));
+            return Deps.ErrorHandler.toProxyError(503, 'UNHEALTHY', String(error));
         }
     },
     shutdown: async () => {
@@ -142,20 +177,20 @@ export const SqlServerProxyServer = Object.freeze({
     async start(overrides = {}) {
         const config = resolveConfig(overrides);
         try {
-            Logger.info(`SQL Server proxy config: proxyHost=${config.host} proxyPort=${config.port} dbHost=${String(config.poolConfig['server'])} dbPort=${String(config.poolConfig['port'])} dbName=${String(config.poolConfig['database'])} dbUser=${String(config.poolConfig['user'])}`);
+            Deps.Logger.info(`SQL Server proxy config: proxyHost=${config.host} proxyPort=${config.port} dbHost=${String(config.poolConfig['server'])} dbPort=${String(config.poolConfig['port'])} dbName=${String(config.poolConfig['database'])} dbUser=${String(config.poolConfig['user'])}`);
         }
         catch {
             // noop - logging must not block startup
         }
         const pool = await createPool(config.poolConfig);
-        const backend = createBackend(pool);
-        const proxy = createProxyServer({
+        const backend = createBackend(pool, config.statements);
+        const proxy = Deps.createProxyServer({
             host: config.host,
             port: config.port,
             maxBodyBytes: config.maxBodyBytes,
             backend,
             verify: async (req, body) => {
-                const verified = await verifyRequestSignature(req, body, config, 'SqlServerProxyServer');
+                const verified = await Deps.verifyRequestSignature(req, body, config, 'SqlServerProxyServer');
                 if (!verified.ok && verified.error) {
                     return { ok: false, status: verified.error.status, message: verified.error.message };
                 }
@@ -163,6 +198,6 @@ export const SqlServerProxyServer = Object.freeze({
             },
         });
         await proxy.start();
-        Logger.info(`✓ SQL Server proxy listening on ${config.host}:${config.port}`);
+        Deps.Logger.info(`✓ SQL Server proxy listening on ${config.host}:${config.port}`);
     },
 });

package/src/proxy.d.ts

@@ -0,0 +1,4 @@
+export { ErrorHandler } from './proxy/ErrorHandler';
+export { RequestValidator } from './proxy/RequestValidator';
+export { SigningService } from './proxy/SigningService';
+//# sourceMappingURL=proxy.d.ts.map

package/src/proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}

package/src/proxy.js

@@ -0,0 +1,3 @@
+export { ErrorHandler } from './proxy/ErrorHandler.js';
+export { RequestValidator } from './proxy/RequestValidator.js';
+export { SigningService } from './proxy/SigningService.js';

package/src/runtime/RuntimeAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RuntimeAdapter.d.ts","sourceRoot":"","sources":["../../../src/runtime/RuntimeAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RuntimeAdapter.d.ts","sourceRoot":"","sources":["../../../src/runtime/RuntimeAdapter.ts"],"names":[],"mappings":"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"}

package/src/runtime/RuntimeAdapter.js

@@ -106,19 +106,37 @@ const createResponseData = () => ({
     headers: { 'content-type': 'application/json' },
     body: null,
 });
-const createMockRequest = (request, remoteAddress) => ({
-    method: request.method,
-    url: request.path,
-    headers: request.headers,
-    body: request.body ?? undefined,
-    remoteAddress,
-    socket: {
-        remoteAddress,
-    },
-    connection: {
+const createMockRequest = (request, remoteAddress) => {
+    const hasQuery = request.query !== undefined && request.query !== null && Object.keys(request.query).length > 0;
+    const queryString = (() => {
+        if (!hasQuery)
+            return '';
+        const params = new URLSearchParams();
+        for (const [key, rawValue] of Object.entries(request.query ?? {})) {
+            if (Array.isArray(rawValue)) {
+                for (const value of rawValue)
+                    params.append(key, value);
+                continue;
+            }
+            params.append(key, rawValue);
+        }
+        return params.toString();
+    })();
+    const url = queryString === '' ? request.path : `${request.path}?${queryString}`;
+    return {
+        method: request.method,
+        url,
+        headers: request.headers,
+        body: request.body ?? undefined,
         remoteAddress,
-    },
-});
+        socket: {
+            remoteAddress,
+        },
+        connection: {
+            remoteAddress,
+        },
+    };
+};
 const applyWriteHead = (responseData, statusCode, headers) => {
     responseData.statusCode = statusCode;
     if (headers) {

package/src/runtime/adapters/CloudflareAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CloudflareAdapter.d.ts","sourceRoot":"","sources":["../../../../src/runtime/adapters/CloudflareAdapter.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,aAAa,EAGb,cAAc,EACf,MAAM,yBAAyB,CAAC;AAGjC;;;;GAIG;AACH,eAAO,MAAM,iBAAiB;IAC5B;;OAEG;mBACY,aAAa,GAAG,cAAc;IAwD7C;;;OAGG;qBACc,OAAO;IAKxB;;;OAGG;qBACc,MAAM,GAAG,OAAO;EAIjC,CAAC;AAwJH;;;;GAIG;AACH,MAAM,WAAW,iBAAkB,SAAQ,OAAO;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACjC,EAAE,CAAC,EAAE;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;CACH"}
+{"version":3,"file":"CloudflareAdapter.d.ts","sourceRoot":"","sources":["../../../../src/runtime/adapters/CloudflareAdapter.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,aAAa,EAGb,cAAc,EACf,MAAM,yBAAyB,CAAC;AAGjC;;;;GAIG;AACH,eAAO,MAAM,iBAAiB;IAC5B;;OAEG;mBACY,aAAa,GAAG,cAAc;IAwD7C;;;OAGG;qBACc,OAAO;IAKxB;;;OAGG;qBACc,MAAM,GAAG,OAAO;EAIjC,CAAC;AAiKH;;;;GAIG;AACH,MAAM,WAAW,iBAAkB,SAAQ,OAAO;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IACjC,EAAE,CAAC,EAAE;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;CACH"}

package/src/runtime/adapters/CloudflareAdapter.js

@@ -2,6 +2,7 @@
  * Runtime adapter for Cloudflare Workers
  */
 import { appConfig } from '../../config/index.js';
+import { isUndefinedOrNull } from '../../helper/index.js';
 import { Cloudflare } from '../../config/cloudflare.js';
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
@@ -116,9 +117,6 @@ async function handleCloudflareRequest(adapter, config, logger, event) {
         return errorResponse.toResponse();
     }
 }
-/**
- * Parse Cloudflare request
- */
 function parseCloudflareRequest(event) {
     const url = new URL(event.url);
     const headers = {};
@@ -126,11 +124,24 @@ function parseCloudflareRequest(event) {
     event.headers.forEach((value, key) => {
         headers[key.toLowerCase()] = value;
     });
+    // Build query object manually to ensure it works
+    const query = {};
+    for (const [key, value] of url.searchParams.entries()) {
+        if (isUndefinedOrNull(query[key])) {
+            query[key] = value;
+        }
+        else if (Array.isArray(query[key])) {
+            query[key].push(value);
+        }
+        else {
+            query[key] = [query[key], value];
+        }
+    }
     return {
         method: event.method.toUpperCase(),
         path: url.pathname,
         headers,
-        query: Object.fromEntries(url.searchParams.entries()),
+        query,
         remoteAddr: headers['cf-connecting-ip']?.toString() || '0.0.0.0',
         signal: event.signal,
     };

package/src/scheduler/Schedule.d.ts

@@ -0,0 +1,36 @@
+import type { ISchedule, IScheduleBackoffPolicy } from './types';
+type CronOptions = {
+    timezone?: string;
+};
+type WithoutOverlappingOptions = {
+    provider?: string;
+    ttlMs?: number;
+    key?: string;
+};
+export type ScheduleBuilderApi = Readonly<{
+    everyMinute: () => ScheduleBuilderApi;
+    everyMinutes: (minutes: number) => ScheduleBuilderApi;
+    everyHour: () => ScheduleBuilderApi;
+    everyHours: (hours: number) => ScheduleBuilderApi;
+    intervalMs: (ms: number) => ScheduleBuilderApi;
+    cron: (expr: string, options?: CronOptions) => ScheduleBuilderApi;
+    timezone: (tz: string) => ScheduleBuilderApi;
+    jitterMs: (ms: number) => ScheduleBuilderApi;
+    backoff: (policy: IScheduleBackoffPolicy) => ScheduleBuilderApi;
+    leaderOnly: () => ScheduleBuilderApi;
+    runOnStart: () => ScheduleBuilderApi;
+    enabledWhen: (value: boolean) => ScheduleBuilderApi;
+    withoutOverlapping: (options?: WithoutOverlappingOptions) => ScheduleBuilderApi;
+    build: () => ISchedule;
+}>;
+export declare const Schedule: Readonly<{
+    define(name: string, handler: ISchedule["handler"]): ScheduleBuilderApi;
+}>;
+export declare const ScheduleBuilder: Readonly<{
+    create(input: {
+        name: string;
+        handler: ISchedule["handler"];
+    }): ScheduleBuilderApi;
+}>;
+export default Schedule;
+//# sourceMappingURL=Schedule.d.ts.map

package/src/scheduler/Schedule.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Schedule.d.ts","sourceRoot":"","sources":["../../../src/scheduler/Schedule.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1E,KAAK,WAAW,GAAG;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,KAAK,yBAAyB,GAAG;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CAAC;IACxC,WAAW,EAAE,MAAM,kBAAkB,CAAC;IACtC,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,kBAAkB,CAAC;IACtD,SAAS,EAAE,MAAM,kBAAkB,CAAC;IACpC,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,kBAAkB,CAAC;IAClD,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,kBAAkB,CAAC;IAC/C,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,kBAAkB,CAAC;IAClE,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,kBAAkB,CAAC;IAC7C,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,kBAAkB,CAAC;IAC7C,OAAO,EAAE,CAAC,MAAM,EAAE,sBAAsB,KAAK,kBAAkB,CAAC;IAChE,UAAU,EAAE,MAAM,kBAAkB,CAAC;IACrC,UAAU,EAAE,MAAM,kBAAkB,CAAC;IACrC,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,kBAAkB,CAAC;IACpD,kBAAkB,EAAE,CAAC,OAAO,CAAC,EAAE,yBAAyB,KAAK,kBAAkB,CAAC;IAChF,KAAK,EAAE,MAAM,SAAS,CAAC;CACxB,CAAC,CAAC;AA4HH,eAAO,MAAM,QAAQ;iBACN,MAAM,WAAW,SAAS,CAAC,SAAS,CAAC,GAAG,kBAAkB;EAGvE,CAAC;AAqFH,eAAO,MAAM,eAAe;kBACZ;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;KAAE,GAAG,kBAAkB;EAQlF,CAAC;AAEH,eAAe,QAAQ,CAAC"}

package/src/scheduler/Schedule.js

@@ -0,0 +1,197 @@
+import { Env } from '../config/env.js';
+import { Logger } from '../config/logger.js';
+import { ZintrustLang } from '../lang/lang.js';
+import { createAdvancedQueue } from '../tools/queue/AdvancedQueue.js';
+import { getLockProvider } from '../tools/queue/LockProvider.js';
+const toIntervalMs = (ms) => {
+    if (!Number.isFinite(ms) || ms <= 0)
+        return 0;
+    return Math.floor(ms);
+};
+const normalizeOptionalString = (value) => {
+    const s = typeof value === 'string' ? value.trim() : '';
+    return s.length > 0 ? s : undefined;
+};
+const toPositiveInt = (value) => {
+    const n = typeof value === 'number' ? value : Number(value);
+    if (!Number.isFinite(n) || n <= 0)
+        return undefined;
+    return Math.floor(n);
+};
+const resolveLockProvider = (providerName) => {
+    const name = providerName.trim().toLowerCase();
+    if (name.length === 0)
+        return undefined;
+    // Ensure provider is registered. createAdvancedQueue triggers lock-provider registration.
+    createAdvancedQueue({
+        name: ZintrustLang.CLI_LOCKS,
+        connection: undefined,
+        defaultDedupTtl: Env.getInt('SCHEDULE_OVERLAP_LOCK_TTL_MS', 300000),
+        lockProvider: name,
+    });
+    return getLockProvider(name);
+};
+const normalizeBackoffFactor = (factor) => {
+    if (factor === undefined)
+        return undefined;
+    return Number.isFinite(factor) ? factor : undefined;
+};
+const wrapWithoutOverlapping = (scheduleName, handler, options) => {
+    const providerName = (options.provider ?? 'memory').trim();
+    const lockKey = (options.key ?? `schedule:${scheduleName}`).trim();
+    const ttlMs = Env.getInt('SCHEDULE_OVERLAP_LOCK_TTL_MS', options.ttlMs ?? 300000);
+    const acquireTimeoutMs = Env.getInt('SCHEDULE_OVERLAP_LOCK_ACQUIRE_TIMEOUT_MS', 2000);
+    const withTimeout = async (promise, timeoutMs) => {
+        if (!Number.isFinite(timeoutMs) || timeoutMs <= 0)
+            return promise;
+        let timeoutId;
+        try {
+            return await Promise.race([
+                promise,
+                new Promise((_, reject) => {
+                    timeoutId = globalThis.setTimeout(() => {
+                        // eslint-disable-next-line no-restricted-syntax
+                        reject(new Error('Lock acquire timed out'));
+                    }, timeoutMs);
+                }),
+            ]);
+        }
+        finally {
+            if (timeoutId !== undefined)
+                globalThis.clearTimeout(timeoutId);
+        }
+    };
+    return async (kernel) => {
+        const provider = resolveLockProvider(providerName);
+        if (!provider) {
+            Logger.warn('Schedule withoutOverlapping requested but lock provider not available; running anyway', {
+                schedule: scheduleName,
+                provider: providerName,
+            });
+            await handler(kernel);
+            return;
+        }
+        let lock;
+        try {
+            lock = await withTimeout(provider.acquire(lockKey, { ttl: ttlMs }), acquireTimeoutMs);
+        }
+        catch (error) {
+            Logger.warn('Schedule lock acquire failed; running anyway', {
+                schedule: scheduleName,
+                provider: providerName,
+                timeoutMs: acquireTimeoutMs,
+                message: error instanceof Error ? error.message : String(error),
+            });
+            await handler(kernel);
+            return;
+        }
+        if (!lock.acquired) {
+            Logger.info(`Skipping overlapping run for schedule: ${scheduleName}`);
+            return;
+        }
+        try {
+            await handler(kernel);
+        }
+        finally {
+            try {
+                await provider.release(lock);
+            }
+            catch {
+                // best-effort
+            }
+        }
+    };
+};
+export const Schedule = Object.freeze({
+    define(name, handler) {
+        return ScheduleBuilder.create({ name, handler });
+    },
+});
+const createScheduleApi = (state) => {
+    const api = Object.freeze({
+        everyMinute: () => api.everyMinutes(1),
+        everyMinutes: (minutes) => {
+            const resolved = Math.max(1, Math.floor(minutes));
+            state.intervalMs = resolved * 60_000;
+            return api;
+        },
+        everyHour: () => api.everyHours(1),
+        everyHours: (hours) => {
+            const resolved = Math.max(1, Math.floor(hours));
+            state.intervalMs = resolved * 3_600_000;
+            return api;
+        },
+        intervalMs: (ms) => {
+            state.intervalMs = toIntervalMs(ms);
+            return api;
+        },
+        cron: (expr, options) => {
+            state.cron = normalizeOptionalString(expr);
+            if (options?.timezone !== undefined) {
+                state.timezone = normalizeOptionalString(options.timezone);
+            }
+            return api;
+        },
+        timezone: (tz) => {
+            state.timezone = normalizeOptionalString(tz);
+            return api;
+        },
+        jitterMs: (ms) => {
+            state.jitterMs = toPositiveInt(ms);
+            return api;
+        },
+        backoff: (policy) => {
+            state.backoff = {
+                initialMs: toPositiveInt(policy.initialMs) ?? 0,
+                maxMs: toPositiveInt(policy.maxMs) ?? 0,
+                factor: normalizeBackoffFactor(policy.factor),
+            };
+            return api;
+        },
+        leaderOnly: () => {
+            state.leaderOnly = true;
+            return api;
+        },
+        runOnStart: () => {
+            state.runOnStart = true;
+            return api;
+        },
+        enabledWhen: (value) => {
+            state.enabled = value;
+            return api;
+        },
+        withoutOverlapping: (options) => {
+            state.overlap = options ?? {};
+            return api;
+        },
+        build: () => {
+            const handler = state.overlap === undefined
+                ? state.handler
+                : wrapWithoutOverlapping(state.name, state.handler, state.overlap);
+            const schedule = {
+                name: state.name,
+                intervalMs: state.intervalMs,
+                cron: state.cron,
+                timezone: state.timezone,
+                jitterMs: state.jitterMs,
+                backoff: state.backoff,
+                leaderOnly: state.leaderOnly,
+                handler,
+                enabled: state.enabled,
+                runOnStart: state.runOnStart,
+            };
+            return schedule;
+        },
+    });
+    return api;
+};
+export const ScheduleBuilder = Object.freeze({
+    create(input) {
+        const state = {
+            name: input.name,
+            handler: input.handler,
+        };
+        return createScheduleApi(state);
+    },
+});
+export default Schedule;

package/src/scheduler/ScheduleHttpGateway.d.ts

@@ -0,0 +1,8 @@
+import type { IRouter } from '../routes/Router';
+export declare const ScheduleHttpGateway: Readonly<{
+    create(): {
+        registerRoutes: (router: IRouter) => void;
+    };
+}>;
+export default ScheduleHttpGateway;
+//# sourceMappingURL=ScheduleHttpGateway.d.ts.map

package/src/scheduler/ScheduleHttpGateway.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScheduleHttpGateway.d.ts","sourceRoot":"","sources":["../../../src/scheduler/ScheduleHttpGateway.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AA8QnD,eAAO,MAAM,mBAAmB;cACpB;QAAE,cAAc,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAA;KAAE;EAWvD,CAAC;AAEH,eAAe,mBAAmB,CAAC"}