@windrun-huaiin/backend-core 13.0.0 → 14.1.0

package/dist/lib/upstash/redis-structures.mjs

@@ -1,195 +1,159 @@
 import { __awaiter } from '../../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.mjs';
-import { getRedis } from '../upstash-config.mjs';
+import { withRedis } from '../upstash-config.mjs';
 
 /**
  * Set a plain string value with optional TTL (seconds).
  */
 const setString = (key, value, ttlSec) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return false;
-    }
-    if (ttlSec && ttlSec > 0) {
-        yield redis.set(key, value, { ex: ttlSec });
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        if (ttlSec && ttlSec > 0) {
+            yield redis.set(key, value, { ex: ttlSec });
+            return true;
+        }
+        yield redis.set(key, value);
         return true;
-    }
-    yield redis.set(key, value);
-    return true;
+    })).then((result) => result !== null && result !== void 0 ? result : false);
 });
 /**
  * Get a plain string value. Returns null if Redis is unavailable or key missing.
  */
 const getString = (key) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.get(key);
+    return withRedis((redis) => redis.get(key));
 });
 /**
  * Store an object as JSON string with optional TTL (seconds).
  */
 const setJson = (key, value, ttlSec) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return false;
-    }
-    const payload = JSON.stringify(value);
-    if (ttlSec && ttlSec > 0) {
-        yield redis.set(key, payload, { ex: ttlSec });
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const payload = JSON.stringify(value);
+        if (ttlSec && ttlSec > 0) {
+            yield redis.set(key, payload, { ex: ttlSec });
+            return true;
+        }
+        yield redis.set(key, payload);
         return true;
-    }
-    yield redis.set(key, payload);
-    return true;
+    })).then((result) => result !== null && result !== void 0 ? result : false);
 });
 /**
  * Get an object stored as JSON string. Returns null if missing or invalid JSON.
  */
 const getJson = (key) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    const payload = yield redis.get(key);
-    if (!payload) {
-        return null;
-    }
-    try {
-        return JSON.parse(payload);
-    }
-    catch (_a) {
-        return null;
-    }
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const payload = yield redis.get(key);
+        if (!payload) {
+            return null;
+        }
+        try {
+            return JSON.parse(payload);
+        }
+        catch (_a) {
+            return null;
+        }
+    }));
 });
 /**
  * Delete a key. Returns false if Redis is unavailable.
  */
 const deleteKey = (key) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return false;
-    }
-    const deleted = yield redis.del(key);
-    return deleted > 0;
+    const result = yield withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const deleted = yield redis.del(key);
+        return deleted > 0;
+    }));
+    return result !== null && result !== void 0 ? result : false;
 });
 /**
  * Set a hash field value.
  */
 const setHashField = (key, field, value) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return false;
-    }
-    const result = yield redis.hset(key, { [field]: value });
-    return result > 0;
+    const result = yield withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const changed = yield redis.hset(key, { [field]: value });
+        return changed > 0;
+    }));
+    return result !== null && result !== void 0 ? result : false;
 });
 /**
  * Get a hash field value.
  */
 const getHashField = (key, field) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.hget(key, field);
+    return withRedis((redis) => redis.hget(key, field));
 });
 /**
  * Store a hash field as JSON string.
  */
 const setHashJson = (key, field, value) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return false;
-    }
-    const payload = JSON.stringify(value);
-    const result = yield redis.hset(key, { [field]: payload });
-    return result > 0;
+    const result = yield withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const payload = JSON.stringify(value);
+        const changed = yield redis.hset(key, { [field]: payload });
+        return changed > 0;
+    }));
+    return result !== null && result !== void 0 ? result : false;
 });
 /**
  * Get a hash field stored as JSON string.
  */
 const getHashJson = (key, field) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    const payload = yield redis.hget(key, field);
-    if (!payload) {
-        return null;
-    }
-    try {
-        return JSON.parse(payload);
-    }
-    catch (_a) {
-        return null;
-    }
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const payload = yield redis.hget(key, field);
+        if (!payload) {
+            return null;
+        }
+        try {
+            return JSON.parse(payload);
+        }
+        catch (_a) {
+            return null;
+        }
+    }));
 });
 /**
  * Get all hash fields.
  */
 const getHashAll = (key) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    const result = yield redis.hgetall(key);
-    return result !== null && result !== void 0 ? result : {};
+    return withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const result = yield redis.hgetall(key);
+        return result !== null && result !== void 0 ? result : {};
+    }));
 });
 /**
  * Remove a hash field.
  */
 const deleteHashField = (key, field) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return false;
-    }
-    const removed = yield redis.hdel(key, field);
-    return removed > 0;
+    const result = yield withRedis((redis) => __awaiter(void 0, void 0, void 0, function* () {
+        const removed = yield redis.hdel(key, field);
+        return removed > 0;
+    }));
+    return result !== null && result !== void 0 ? result : false;
 });
 /**
  * Push values to a list. Returns list length or null if Redis is unavailable.
  */
 const pushList = (key_1, values_1, ...args_1) => __awaiter(void 0, [key_1, values_1, ...args_1], void 0, function* (key, values, direction = 'right') {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    if (values.length === 0) {
-        return redis.llen(key);
-    }
-    return direction === 'left'
-        ? redis.lpush(key, ...values)
-        : redis.rpush(key, ...values);
+    return withRedis((redis) => {
+        if (values.length === 0) {
+            return redis.llen(key);
+        }
+        return direction === 'left'
+            ? redis.lpush(key, ...values)
+            : redis.rpush(key, ...values);
+    });
 });
 /**
  * Pop a value from a list.
  */
 const popList = (key_1, ...args_1) => __awaiter(void 0, [key_1, ...args_1], void 0, function* (key, direction = 'right') {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    return direction === 'left' ? redis.lpop(key) : redis.rpop(key);
+    return withRedis((redis) => direction === 'left' ? redis.lpop(key) : redis.rpop(key));
 });
 /**
  * Get a range from a list.
  */
 const rangeList = (key_1, ...args_1) => __awaiter(void 0, [key_1, ...args_1], void 0, function* (key, start = 0, stop = -1) {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.lrange(key, start, stop);
+    return withRedis((redis) => redis.lrange(key, start, stop));
 });
 /**
  * Get list length.
  */
 const listLength = (key) => __awaiter(void 0, void 0, void 0, function* () {
-    const redis = getRedis();
-    if (!redis) {
-        return null;
-    }
-    return redis.llen(key);
+    return withRedis((redis) => redis.llen(key));
 });
 
 export { deleteHashField, deleteKey, getHashAll, getHashField, getHashJson, getJson, getString, listLength, popList, pushList, rangeList, setHashField, setHashJson, setJson, setString };

package/dist/lib/upstash-config.d.ts

@@ -1,11 +1,19 @@
 import { Redis } from '@upstash/redis';
 import { Client as QstashClient } from '@upstash/qstash';
 /**
- * Get the Upstash Redis client. Returns null when required env vars are missing.
+ * Get the Upstash Redis client. Returns null when required env vars are missing/invalid.
+ *
+ * Singleton semantics:
+ * - read-through cached instance only
  */
 export declare const getRedis: () => Redis | null;
 /**
  * Get the Upstash QStash client. Returns null when required env vars are missing.
+ *
+ * Singleton semantics:
+ * - read-through cached instance only
  */
 export declare const getQstash: () => QstashClient | null;
+export declare const withRedis: <T>(fn: (redis: Redis) => Promise<T> | T) => Promise<T | null>;
+export declare const withQstash: <T>(fn: (qstash: QstashClient) => Promise<T> | T) => Promise<T | null>;
 //# sourceMappingURL=upstash-config.d.ts.map

package/dist/lib/upstash-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upstash-config.d.ts","sourceRoot":"","sources":["../../src/lib/upstash-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAOzD;;GAEG;AACH,eAAO,MAAM,QAAQ,QAAO,KAAK,GAAG,IAoBnC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,QAAO,YAAY,GAAG,IAiB3C,CAAC"}
+{"version":3,"file":"upstash-config.d.ts","sourceRoot":"","sources":["../../src/lib/upstash-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAoIzD;;;;;GAKG;AACH,eAAO,MAAM,QAAQ,QAAO,KAAK,GAAG,IAEnC,CAAC;AAsDF;;;;;GAKG;AACH,eAAO,MAAM,SAAS,QAAO,YAAY,GAAG,IAE3C,CAAC;AAyCF,eAAO,MAAM,SAAS,GAAU,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAMzF,CAAC;AAEF,eAAO,MAAM,UAAU,GAAU,CAAC,EAChC,IAAI,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,KAC3C,OAAO,CAAC,CAAC,GAAG,IAAI,CAMlB,CAAC"}

package/dist/lib/upstash-config.js

@@ -1,53 +1,247 @@
 'use strict';
 
-var nodejs = require('../node_modules/.pnpm/@upstash_redis@1.36.1/node_modules/@upstash/redis/nodejs.js');
-var chunkRQPZUJXG = require('../node_modules/.pnpm/@upstash_qstash@2.8.4/node_modules/@upstash/qstash/chunk-RQPZUJXG.js');
+var tslib_es6 = require('../node_modules/.pnpm/@rollup_plugin-typescript@12.1.4_rollup@4.46.2_tslib@2.8.1_typescript@5.9.3/node_modules/tslib/tslib.es6.js');
+var nodejs = require('../node_modules/.pnpm/@upstash_redis@1.37.0/node_modules/@upstash/redis/nodejs.js');
+var chunk35B33QW3 = require('../node_modules/.pnpm/@upstash_qstash@2.10.1/node_modules/@upstash/qstash/chunk-35B33QW3.js');
 
 let cachedRedis = null;
 let cachedQstash = null;
-let redisInitAttempted = false;
-let qstashInitAttempted = false;
+let redisInitPromise = null;
+let qstashInitPromise = null;
+let redisWarnedMissingEnv = false;
+let redisWarnedInvalidEnv = false;
+let redisWarnedInitError = false;
+let redisWarnedHealthCheck = false;
+let redisWarnedHealthSchedule = false;
+let qstashWarnedMissingEnv = false;
+let qstashWarnedInitError = false;
+let qstashWarnedHealthCheck = false;
+let qstashWarnedHealthSchedule = false;
+let redisHealthTimer = null;
+let qstashHealthTimer = null;
+const isNonEmpty = (value) => typeof value === 'string' && value.trim().length > 0;
+const isValidUrl = (value) => {
+    try {
+        const parsed = new URL(value);
+        return parsed.protocol === 'http:' || parsed.protocol === 'https:';
+    }
+    catch (_a) {
+        return false;
+    }
+};
+const parseMinutes = (value, fallback) => {
+    if (!isNonEmpty(value)) {
+        return fallback;
+    }
+    const minutes = Number(value);
+    if (!Number.isFinite(minutes) || minutes <= 0) {
+        return fallback;
+    }
+    return minutes;
+};
+const getRedisHealthIntervalMinutes = () => parseMinutes(process.env.UPSTASH_REDIS_HEALTHCHECK_INTERVAL_MINUTES, 10);
+const getQstashHealthIntervalMinutes = () => parseMinutes(process.env.UPSTASH_QSTASH_HEALTHCHECK_INTERVAL_MINUTES, 10);
+const getQstashHealthcheckUrl = () => { var _a; return (_a = process.env.UPSTASH_QSTASH_HEALTHCHECK_URL) !== null && _a !== void 0 ? _a : 'https://qstash.upstash.io/v2/topics'; };
+const scheduleRedisHealthCheck = () => {
+    if (redisHealthTimer || !cachedRedis) {
+        return;
+    }
+    const delayMs = getRedisHealthIntervalMinutes() * 60000;
+    redisHealthTimer = setTimeout(() => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        redisHealthTimer = null;
+        if (!cachedRedis) {
+            return;
+        }
+        try {
+            yield cachedRedis.ping();
+        }
+        catch (error) {
+            cachedRedis = null;
+            if (!redisWarnedHealthCheck) {
+                redisWarnedHealthCheck = true;
+                const message = error instanceof Error ? error.message : String(error);
+                console.warn(`[Upstash Config] Redis health check failed: ${message}`);
+            }
+        }
+        finally {
+            try {
+                scheduleRedisHealthCheck();
+            }
+            catch (error) {
+                if (!redisWarnedHealthSchedule) {
+                    redisWarnedHealthSchedule = true;
+                    const message = error instanceof Error ? error.message : String(error);
+                    console.warn(`[Upstash Config] Redis health check schedule failed: ${message}`);
+                }
+            }
+        }
+    }), delayMs);
+};
+const checkQstashHealth = (token) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+    const response = yield fetch(getQstashHealthcheckUrl(), {
+        method: 'GET',
+        headers: {
+            Authorization: `Bearer ${token}`,
+        },
+        cache: 'no-store',
+    });
+    if (!response.ok) {
+        throw new Error(`HTTP ${response.status}`);
+    }
+});
+const scheduleQstashHealthCheck = (token) => {
+    if (qstashHealthTimer || !cachedQstash) {
+        return;
+    }
+    const delayMs = getQstashHealthIntervalMinutes() * 60000;
+    qstashHealthTimer = setTimeout(() => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        qstashHealthTimer = null;
+        if (!cachedQstash) {
+            return;
+        }
+        try {
+            yield checkQstashHealth(token);
+        }
+        catch (error) {
+            cachedQstash = null;
+            if (!qstashWarnedHealthCheck) {
+                qstashWarnedHealthCheck = true;
+                const message = error instanceof Error ? error.message : String(error);
+                console.warn(`[Upstash Config] QStash health check failed: ${message}`);
+            }
+        }
+        finally {
+            try {
+                scheduleQstashHealthCheck(token);
+            }
+            catch (error) {
+                if (!qstashWarnedHealthSchedule) {
+                    qstashWarnedHealthSchedule = true;
+                    const message = error instanceof Error ? error.message : String(error);
+                    console.warn(`[Upstash Config] QStash health check schedule failed: ${message}`);
+                }
+            }
+        }
+    }), delayMs);
+};
 /**
- * Get the Upstash Redis client. Returns null when required env vars are missing.
+ * Get the Upstash Redis client. Returns null when required env vars are missing/invalid.
+ *
+ * Singleton semantics:
+ * - read-through cached instance only
  */
 const getRedis = () => {
+    return cachedRedis;
+};
+const ensureRedis = () => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
     if (cachedRedis) {
         return cachedRedis;
     }
-    if (redisInitAttempted) {
-        return null;
-    }
-    redisInitAttempted = true;
-    const { UPSTASH_REDIS_REST_URL, UPSTASH_REDIS_REST_TOKEN } = process.env;
-    if (!UPSTASH_REDIS_REST_URL || !UPSTASH_REDIS_REST_TOKEN) {
-        console.warn('[Upstash Config] Redis Missed configration UPSTASH_REDIS_REST_URL or UPSTASH_REDIS_REST_TOKEN, then disabled');
-        return null;
+    if (redisInitPromise) {
+        return redisInitPromise;
     }
-    cachedRedis = new nodejs.Redis({
-        url: UPSTASH_REDIS_REST_URL,
-        token: UPSTASH_REDIS_REST_TOKEN,
-    });
-    return cachedRedis;
-};
+    redisInitPromise = (() => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        const { UPSTASH_REDIS_REST_URL, UPSTASH_REDIS_REST_TOKEN } = process.env;
+        if (!isNonEmpty(UPSTASH_REDIS_REST_URL) || !isNonEmpty(UPSTASH_REDIS_REST_TOKEN)) {
+            if (!redisWarnedMissingEnv) {
+                redisWarnedMissingEnv = true;
+                console.warn('[Upstash Config] Redis disabled: missing UPSTASH_REDIS_REST_URL or UPSTASH_REDIS_REST_TOKEN');
+            }
+            return null;
+        }
+        if (!isValidUrl(UPSTASH_REDIS_REST_URL)) {
+            if (!redisWarnedInvalidEnv) {
+                redisWarnedInvalidEnv = true;
+                console.warn('[Upstash Config] Redis disabled: UPSTASH_REDIS_REST_URL is not a valid URL');
+            }
+            return null;
+        }
+        try {
+            const client = new nodejs.Redis({
+                url: UPSTASH_REDIS_REST_URL,
+                token: UPSTASH_REDIS_REST_TOKEN,
+            });
+            yield client.ping();
+            cachedRedis = client;
+            scheduleRedisHealthCheck();
+            return cachedRedis;
+        }
+        catch (error) {
+            if (!redisWarnedInitError) {
+                redisWarnedInitError = true;
+                const message = error instanceof Error ? error.message : String(error);
+                console.warn(`[Upstash Config] Redis init failed: ${message}`);
+            }
+            return null;
+        }
+        finally {
+            redisInitPromise = null;
+        }
+    }))();
+    return redisInitPromise;
+});
 /**
  * Get the Upstash QStash client. Returns null when required env vars are missing.
+ *
+ * Singleton semantics:
+ * - read-through cached instance only
  */
 const getQstash = () => {
+    return cachedQstash;
+};
+const ensureQstash = () => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
     if (cachedQstash) {
         return cachedQstash;
     }
-    if (qstashInitAttempted) {
+    if (qstashInitPromise) {
+        return qstashInitPromise;
+    }
+    qstashInitPromise = (() => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        const { QSTASH_TOKEN } = process.env;
+        if (!isNonEmpty(QSTASH_TOKEN)) {
+            if (!qstashWarnedMissingEnv) {
+                qstashWarnedMissingEnv = true;
+                console.warn('[Upstash Config] QStash disabled: missing QSTASH_TOKEN');
+            }
+            return null;
+        }
+        try {
+            const client = new chunk35B33QW3.Client({ token: QSTASH_TOKEN });
+            yield checkQstashHealth(QSTASH_TOKEN);
+            cachedQstash = client;
+            scheduleQstashHealthCheck(QSTASH_TOKEN);
+            return cachedQstash;
+        }
+        catch (error) {
+            if (!qstashWarnedInitError) {
+                qstashWarnedInitError = true;
+                const message = error instanceof Error ? error.message : String(error);
+                console.warn(`[Upstash Config] QStash init failed: ${message}`);
+            }
+            return null;
+        }
+        finally {
+            qstashInitPromise = null;
+        }
+    }))();
+    return qstashInitPromise;
+});
+const withRedis = (fn) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+    const redis = yield ensureRedis();
+    if (!redis) {
         return null;
     }
-    qstashInitAttempted = true;
-    const { QSTASH_TOKEN } = process.env;
-    if (!QSTASH_TOKEN) {
-        console.warn('[Upstash Config] QStash Missed configration QSTASH_TOKEN, then disabled');
+    return fn(redis);
+});
+const withQstash = (fn) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+    const qstash = yield ensureQstash();
+    if (!qstash) {
         return null;
     }
-    cachedQstash = new chunkRQPZUJXG.Client({ token: QSTASH_TOKEN });
-    return cachedQstash;
-};
+    return fn(qstash);
+});
 
 exports.getQstash = getQstash;
 exports.getRedis = getRedis;
+exports.withQstash = withQstash;
+exports.withRedis = withRedis;