@zintrust/core 0.4.76 → 0.4.79

package/src/runtime/plugins/trace-runtime.js

@@ -4,16 +4,60 @@ const fallbackTraceConfig = Object.freeze({
 const fallbackTraceStorage = Object.freeze({
     resolveStorage: (_db) => undefined,
 });
+const fallbackRegisterTraceDashboard = (_router, _options) => undefined;
 const fallbackRegisterTraceRoutes = (_router, _storage, _options) => undefined;
-const systemTraceModule = await import('../../../packages/trace/src/index.js')
-    .then((module) => module)
-    .catch(() => undefined);
+const fallbackCaptureTraceException = (_error, _context) => undefined;
+let systemTraceModule;
+let didAttemptSystemTraceLoad = false;
+let pendingSystemTraceLoad;
+const loadSystemTraceModule = async () => {
+    if (systemTraceModule !== undefined)
+        return systemTraceModule;
+    if (didAttemptSystemTraceLoad && pendingSystemTraceLoad === undefined)
+        return undefined;
+    if (pendingSystemTraceLoad !== undefined)
+        return pendingSystemTraceLoad;
+    pendingSystemTraceLoad = import('@zintrust/trace')
+        .then((module) => {
+        systemTraceModule = module;
+        return systemTraceModule;
+    })
+        .catch(() => undefined)
+        .finally(() => {
+        didAttemptSystemTraceLoad = true;
+        pendingSystemTraceLoad = undefined;
+    });
+    return pendingSystemTraceLoad;
+};
 export const isAvailable = () => systemTraceModule !== undefined;
-export const TraceConfig = systemTraceModule?.TraceConfig ?? fallbackTraceConfig;
-export const TraceStorage = systemTraceModule?.TraceStorage ?? fallbackTraceStorage;
-export const registerTraceRoutes = systemTraceModule?.registerTraceRoutes ?? fallbackRegisterTraceRoutes;
+export const TraceConfig = Object.freeze({
+    merge(overrides) {
+        return (systemTraceModule?.TraceConfig ?? fallbackTraceConfig).merge(overrides);
+    },
+});
+export const TraceStorage = Object.freeze({
+    resolveStorage(db) {
+        return (systemTraceModule?.TraceStorage ?? fallbackTraceStorage).resolveStorage(db);
+    },
+});
+export const registerTraceDashboard = (router, options) => {
+    (systemTraceModule?.registerTraceDashboard ?? fallbackRegisterTraceDashboard)(router, options);
+};
+export const registerTraceRoutes = (router, storage, options) => {
+    (systemTraceModule?.registerTraceRoutes ?? fallbackRegisterTraceRoutes)(router, storage, options);
+};
+export const captureTraceException = (error, context) => {
+    if (systemTraceModule?.captureTraceException !== undefined) {
+        systemTraceModule.captureTraceException(error, context);
+        return;
+    }
+    void loadSystemTraceModule().then((module) => {
+        (module?.captureTraceException ?? fallbackCaptureTraceException)(error, context);
+    });
+};
 export const ensureSystemTraceRegistered = async () => {
-    if (!isAvailable())
+    const module = await loadSystemTraceModule();
+    if (module === undefined)
         return;
     await import('../../../packages/trace/src/register.js').catch(() => undefined);
 };

package/src/templates/project/basic/tsconfig.json.tpl

@@ -1,6 +1,5 @@
 {
   "compilerOptions": {
-    "ignoreDeprecations": "6.0",
     "baseUrl": ".",
     "outDir": "./dist",
     "rootDir": "./",
@@ -17,17 +16,17 @@
       "@routes/*": ["./routes/*"],
       "@database/*": ["./database/*"],
 
-      "@tools/*": ["app/Tools/*"],
-      "@httpClient/*": ["app/Tools/http/*"],
-      "@templates": ["app/Tools/templates/index.ts"],
-      "@templates/*": ["app/Tools/templates/*"],
-      "@mail/*": ["app/Tools/mail/*"],
-      "@storage": ["app/Tools/storage/index.ts"],
-      "@storage/*": ["app/Tools/storage/*"],
-      "@drivers/*": ["app/Tools/storage/drivers/*"],
-      "@notification/*": ["app/Tools/notification/*"],
-      "@broadcast/*": ["app/Tools/broadcast/*"],
-      "@queue/*": ["app/Tools/queue/*"]
+      "@tools/*": ["./app/Tools/*"],
+      "@httpClient/*": ["./app/Tools/http/*"],
+      "@templates": ["./app/Tools/templates/index.ts"],
+      "@templates/*": ["./app/Tools/templates/*"],
+      "@mail/*": ["./app/Tools/mail/*"],
+      "@storage": ["./app/Tools/storage/index.ts"],
+      "@storage/*": ["./app/Tools/storage/*"],
+      "@drivers/*": ["./app/Tools/storage/drivers/*"],
+      "@notification/*": ["./app/Tools/notification/*"],
+      "@broadcast/*": ["./app/Tools/broadcast/*"],
+      "@queue/*": ["./app/Tools/queue/*"]
     }
   },
   "include": ["src/**/*", "app/**/*", "routes/**/*", "database/**/*"],

package/src/tools/queue/Queue.d.ts

@@ -1,4 +1,3 @@
-import { resolveDeduplicationLockKey } from './DeduplicationKey';
 export type QueueMessage<T = unknown> = {
     id: string;
     payload: T;
@@ -53,7 +52,6 @@ export interface BullMQPayload {
  * Uses singleton RedisKeys for consistent key management
  */
 export declare const resolveLockPrefix: () => string;
-export { resolveDeduplicationLockKey };
 export declare const Queue: Readonly<{
     register(name: string, driver: IQueueDriver): void;
     reset(): void;
@@ -65,4 +63,5 @@ export declare const Queue: Readonly<{
     drain(queue: string, driverName?: string): Promise<void>;
 }>;
 export default Queue;
+export { resolveDeduplicationLockKey } from './DeduplicationKey';
 //# sourceMappingURL=Queue.d.ts.map

package/src/tools/queue/Queue.d.ts.map

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

package/src/tools/queue/Queue.js

@@ -4,7 +4,6 @@ import { SystemTraceBridge } from '../../trace/SystemTraceBridge.js';
 import { Env } from '../../config/env.js';
 import { Logger } from '../../config/logger.js';
 import { ErrorFactory } from '../../exceptions/ZintrustError.js';
-import { resolveDeduplicationLockKey } from './DeduplicationKey.js';
 import { JobStateTracker } from './JobStateTracker.js';
 import { QueueTracing } from './QueueTracing.js';
 import { RedisKeys } from '../redis/RedisKeyManager.js';
@@ -43,7 +42,6 @@ const resolveRequestedJobId = (payload) => {
 const resolveRequestedUniqueId = (payload) => {
     return normalizeRequestedId(payload?.uniqueId);
 };
-export { resolveDeduplicationLockKey };
 const resolveMaxAttempts = (payload) => {
     if (typeof payload?.attempts !== 'number' || !Number.isFinite(payload.attempts))
         return undefined;
@@ -215,3 +213,4 @@ export const Queue = Object.freeze({
     },
 });
 export default Queue;
+export { resolveDeduplicationLockKey } from './DeduplicationKey.js';

package/src/trace/SystemTraceBridge.js

@@ -2,7 +2,7 @@ let cachedModule;
 let loadPromise = null;
 const importSystemTrace = async () => {
     try {
-        return (await import('../../packages/trace/src/index.js'));
+        return (await import('@zintrust/trace'));
     }
     catch {
         return null;

package/src/zintrust.plugins.js

@@ -7,7 +7,7 @@
  *
  */
 import * as TraceRuntime from './runtime/plugins/trace-runtime.js';
-globalThis.__zintrust_trace_plugin_requested__ = true;
-globalThis.__zintrust_trace_runtime__ = TraceRuntime;
+globalThis.__zintrust_system_trace_plugin_requested__ = true;
+globalThis.__zintrust_system_trace_runtime__ = TraceRuntime;
 export const __zintrustGeneratedPluginStub = 'zintrust.plugins.ts';
 export default {};

package/src/zintrust.plugins.wg.js

@@ -4,7 +4,7 @@
  * It allows optional runtime plugin imports to resolve in CI/scaffolded setups.
  */
 import * as TraceRuntime from './runtime/plugins/trace-runtime.js';
-globalThis.__zintrust_trace_plugin_requested__ = true;
-globalThis.__zintrust_trace_runtime__ = TraceRuntime;
+globalThis.__zintrust_system_trace_plugin_requested__ = true;
+globalThis.__zintrust_system_trace_runtime__ = TraceRuntime;
 export const __zintrustGeneratedPluginStub = 'zintrust.plugins.wg.ts';
 export default {};