@push.rocks/smartregistry 2.3.0 → 2.4.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.
Files changed (32) hide show
  1. package/dist_ts/00_commitinfo_data.js +1 -1
  2. package/dist_ts/classes.smartregistry.d.ts +33 -2
  3. package/dist_ts/classes.smartregistry.js +38 -5
  4. package/dist_ts/core/classes.authmanager.d.ts +30 -80
  5. package/dist_ts/core/classes.authmanager.js +63 -337
  6. package/dist_ts/core/classes.defaultauthprovider.d.ts +78 -0
  7. package/dist_ts/core/classes.defaultauthprovider.js +311 -0
  8. package/dist_ts/core/classes.registrystorage.d.ts +70 -4
  9. package/dist_ts/core/classes.registrystorage.js +165 -5
  10. package/dist_ts/core/index.d.ts +3 -0
  11. package/dist_ts/core/index.js +7 -2
  12. package/dist_ts/core/interfaces.auth.d.ts +83 -0
  13. package/dist_ts/core/interfaces.auth.js +2 -0
  14. package/dist_ts/core/interfaces.core.d.ts +35 -0
  15. package/dist_ts/core/interfaces.storage.d.ts +120 -0
  16. package/dist_ts/core/interfaces.storage.js +2 -0
  17. package/dist_ts/upstream/classes.baseupstream.d.ts +2 -2
  18. package/dist_ts/upstream/classes.baseupstream.js +16 -14
  19. package/dist_ts/upstream/classes.upstreamcache.d.ts +69 -22
  20. package/dist_ts/upstream/classes.upstreamcache.js +207 -50
  21. package/package.json +1 -1
  22. package/ts/00_commitinfo_data.ts +1 -1
  23. package/ts/classes.smartregistry.ts +39 -4
  24. package/ts/core/classes.authmanager.ts +74 -412
  25. package/ts/core/classes.defaultauthprovider.ts +393 -0
  26. package/ts/core/classes.registrystorage.ts +199 -5
  27. package/ts/core/index.ts +8 -1
  28. package/ts/core/interfaces.auth.ts +91 -0
  29. package/ts/core/interfaces.core.ts +39 -0
  30. package/ts/core/interfaces.storage.ts +130 -0
  31. package/ts/upstream/classes.baseupstream.ts +20 -15
  32. package/ts/upstream/classes.upstreamcache.ts +256 -53
@@ -0,0 +1,120 @@
1
+ import type { TRegistryProtocol } from './interfaces.core.js';
2
+ /**
3
+ * Actor information from request context
4
+ */
5
+ export interface IStorageActor {
6
+ userId?: string;
7
+ tokenId?: string;
8
+ ip?: string;
9
+ userAgent?: string;
10
+ orgId?: string;
11
+ sessionId?: string;
12
+ }
13
+ /**
14
+ * Metadata about the storage operation
15
+ */
16
+ export interface IStorageMetadata {
17
+ /** Content type of the object */
18
+ contentType?: string;
19
+ /** Size in bytes */
20
+ size?: number;
21
+ /** Content digest (e.g., sha256:abc123) */
22
+ digest?: string;
23
+ /** Package/artifact name */
24
+ packageName?: string;
25
+ /** Version */
26
+ version?: string;
27
+ }
28
+ /**
29
+ * Context passed to storage hooks
30
+ */
31
+ export interface IStorageHookContext {
32
+ /** Type of operation */
33
+ operation: 'put' | 'delete' | 'get';
34
+ /** Storage key/path */
35
+ key: string;
36
+ /** Protocol that triggered this operation */
37
+ protocol: TRegistryProtocol;
38
+ /** Actor who performed the operation (if known) */
39
+ actor?: IStorageActor;
40
+ /** Metadata about the object */
41
+ metadata?: IStorageMetadata;
42
+ /** Timestamp of the operation */
43
+ timestamp: Date;
44
+ }
45
+ /**
46
+ * Result from a beforePut hook that can modify the operation
47
+ */
48
+ export interface IBeforePutResult {
49
+ /** Whether to allow the operation */
50
+ allowed: boolean;
51
+ /** Optional reason for rejection */
52
+ reason?: string;
53
+ /** Optional modified metadata */
54
+ metadata?: IStorageMetadata;
55
+ }
56
+ /**
57
+ * Result from a beforeDelete hook
58
+ */
59
+ export interface IBeforeDeleteResult {
60
+ /** Whether to allow the operation */
61
+ allowed: boolean;
62
+ /** Optional reason for rejection */
63
+ reason?: string;
64
+ }
65
+ /**
66
+ * Storage event hooks for quota tracking, audit logging, cache invalidation, etc.
67
+ *
68
+ * @example
69
+ * ```typescript
70
+ * const quotaHooks: IStorageHooks = {
71
+ * async beforePut(context) {
72
+ * const quota = await getQuota(context.actor?.orgId);
73
+ * const currentUsage = await getUsage(context.actor?.orgId);
74
+ * if (currentUsage + (context.metadata?.size || 0) > quota) {
75
+ * return { allowed: false, reason: 'Quota exceeded' };
76
+ * }
77
+ * return { allowed: true };
78
+ * },
79
+ *
80
+ * async afterPut(context) {
81
+ * await updateUsage(context.actor?.orgId, context.metadata?.size || 0);
82
+ * await auditLog('storage.put', context);
83
+ * },
84
+ *
85
+ * async afterDelete(context) {
86
+ * await invalidateCache(context.key);
87
+ * }
88
+ * };
89
+ * ```
90
+ */
91
+ export interface IStorageHooks {
92
+ /**
93
+ * Called before storing an object.
94
+ * Return { allowed: false } to reject the operation.
95
+ * Use for quota checks, virus scanning, validation, etc.
96
+ */
97
+ beforePut?(context: IStorageHookContext): Promise<IBeforePutResult>;
98
+ /**
99
+ * Called after successfully storing an object.
100
+ * Use for quota tracking, audit logging, notifications, etc.
101
+ */
102
+ afterPut?(context: IStorageHookContext): Promise<void>;
103
+ /**
104
+ * Called before deleting an object.
105
+ * Return { allowed: false } to reject the operation.
106
+ * Use for preventing deletion of protected resources.
107
+ */
108
+ beforeDelete?(context: IStorageHookContext): Promise<IBeforeDeleteResult>;
109
+ /**
110
+ * Called after successfully deleting an object.
111
+ * Use for quota updates, audit logging, cache invalidation, etc.
112
+ */
113
+ afterDelete?(context: IStorageHookContext): Promise<void>;
114
+ /**
115
+ * Called after reading an object.
116
+ * Use for access logging, analytics, etc.
117
+ * Note: This is called even for cache hits.
118
+ */
119
+ afterGet?(context: IStorageHookContext): Promise<void>;
120
+ }
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5zdG9yYWdlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vdHMvY29yZS9pbnRlcmZhY2VzLnN0b3JhZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
@@ -54,11 +54,11 @@ export declare abstract class BaseUpstream {
54
54
  /**
55
55
  * Invalidate cache for a resource pattern.
56
56
  */
57
- invalidateCache(pattern: RegExp): number;
57
+ invalidateCache(pattern: RegExp): Promise<number>;
58
58
  /**
59
59
  * Clear all cache entries.
60
60
  */
61
- clearCache(): void;
61
+ clearCache(): Promise<void>;
62
62
  /**
63
63
  * Stop the upstream (cleanup resources).
64
64
  */
@@ -79,8 +79,15 @@ export class BaseUpstream {
79
79
  if (!this.config.enabled) {
80
80
  return null;
81
81
  }
82
+ // Get applicable upstreams sorted by priority
83
+ const applicableUpstreams = this.getApplicableUpstreams(context.resource);
84
+ if (applicableUpstreams.length === 0) {
85
+ return null;
86
+ }
87
+ // Use the first applicable upstream's URL for cache key
88
+ const primaryUpstreamUrl = applicableUpstreams[0]?.url;
82
89
  // Check cache first
83
- const cached = this.cache.get(context);
90
+ const cached = await this.cache.get(context, primaryUpstreamUrl);
84
91
  if (cached && !cached.stale) {
85
92
  return {
86
93
  success: true,
@@ -93,7 +100,7 @@ export class BaseUpstream {
93
100
  };
94
101
  }
95
102
  // Check for negative cache (recent 404)
96
- if (this.cache.hasNegative(context)) {
103
+ if (await this.cache.hasNegative(context, primaryUpstreamUrl)) {
97
104
  return {
98
105
  success: false,
99
106
  status: 404,
@@ -103,11 +110,6 @@ export class BaseUpstream {
103
110
  latencyMs: 0,
104
111
  };
105
112
  }
106
- // Get applicable upstreams sorted by priority
107
- const applicableUpstreams = this.getApplicableUpstreams(context.resource);
108
- if (applicableUpstreams.length === 0) {
109
- return null;
110
- }
111
113
  // If we have stale cache, return it immediately and revalidate in background
112
114
  if (cached?.stale && this.cacheConfig.staleWhileRevalidate) {
113
115
  // Fire and forget revalidation
@@ -132,11 +134,11 @@ export class BaseUpstream {
132
134
  const result = await withCircuitBreaker(breaker, () => this.fetchFromUpstream(upstream, context));
133
135
  // Cache successful responses
134
136
  if (result.success && result.body) {
135
- this.cache.set(context, Buffer.isBuffer(result.body) ? result.body : Buffer.from(JSON.stringify(result.body)), result.headers['content-type'] || 'application/octet-stream', result.headers, upstream.id);
137
+ await this.cache.set(context, Buffer.isBuffer(result.body) ? result.body : Buffer.from(JSON.stringify(result.body)), result.headers['content-type'] || 'application/octet-stream', result.headers, upstream.id, upstream.url);
136
138
  }
137
139
  // Cache 404 responses
138
140
  if (result.status === 404) {
139
- this.cache.setNegative(context, upstream.id);
141
+ await this.cache.setNegative(context, upstream.id, upstream.url);
140
142
  }
141
143
  return result;
142
144
  }
@@ -160,14 +162,14 @@ export class BaseUpstream {
160
162
  /**
161
163
  * Invalidate cache for a resource pattern.
162
164
  */
163
- invalidateCache(pattern) {
165
+ async invalidateCache(pattern) {
164
166
  return this.cache.invalidatePattern(pattern);
165
167
  }
166
168
  /**
167
169
  * Clear all cache entries.
168
170
  */
169
- clearCache() {
170
- this.cache.clear();
171
+ async clearCache() {
172
+ await this.cache.clear();
171
173
  }
172
174
  /**
173
175
  * Stop the upstream (cleanup resources).
@@ -392,7 +394,7 @@ export class BaseUpstream {
392
394
  try {
393
395
  const result = await withCircuitBreaker(breaker, () => this.fetchFromUpstream(upstream, context));
394
396
  if (result.success && result.body) {
395
- this.cache.set(context, Buffer.isBuffer(result.body) ? result.body : Buffer.from(JSON.stringify(result.body)), result.headers['content-type'] || 'application/octet-stream', result.headers, upstream.id);
397
+ await this.cache.set(context, Buffer.isBuffer(result.body) ? result.body : Buffer.from(JSON.stringify(result.body)), result.headers['content-type'] || 'application/octet-stream', result.headers, upstream.id, upstream.url);
396
398
  return; // Successfully revalidated
397
399
  }
398
400
  }
@@ -406,4 +408,4 @@ export class BaseUpstream {
406
408
  }
407
409
  }
408
410
  }
409
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.baseupstream.js","sourceRoot":"","sources":["../../ts/upstream/classes.baseupstream.ts"],"names":[],"mappings":"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"}
411
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.baseupstream.js","sourceRoot":"","sources":["../../ts/upstream/classes.baseupstream.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import type { ICacheEntry, IUpstreamCacheConfig, IUpstreamFetchContext } from './interfaces.upstream.js';
2
+ import type { IStorageBackend } from '../core/interfaces.core.js';
2
3
  /**
3
- * In-memory cache for upstream responses.
4
+ * S3-backed upstream cache with in-memory hot layer.
4
5
  *
5
6
  * Features:
6
7
  * - TTL-based expiration
@@ -8,58 +9,76 @@ import type { ICacheEntry, IUpstreamCacheConfig, IUpstreamFetchContext } from '.
8
9
  * - Negative caching (404s)
9
10
  * - Content-type aware caching
10
11
  * - ETag support for conditional requests
12
+ * - Multi-upstream support via URL-based cache paths
13
+ * - Persistent S3 storage with in-memory hot layer
11
14
  *
12
- * Note: This is an in-memory implementation. For production with persistence,
13
- * extend this class to use RegistryStorage for S3-backed caching.
15
+ * Cache paths are structured as:
16
+ * cache/{escaped-upstream-url}/{protocol}:{method}:{path}
17
+ *
18
+ * @example
19
+ * ```typescript
20
+ * // In-memory only (default)
21
+ * const cache = new UpstreamCache(config);
22
+ *
23
+ * // With S3 persistence
24
+ * const cache = new UpstreamCache(config, 10000, storage);
25
+ * ```
14
26
  */
15
27
  export declare class UpstreamCache {
16
- /** Cache storage */
17
- private readonly cache;
28
+ /** In-memory hot cache */
29
+ private readonly memoryCache;
18
30
  /** Configuration */
19
31
  private readonly config;
20
- /** Maximum cache entries (prevents memory bloat) */
21
- private readonly maxEntries;
32
+ /** Maximum in-memory cache entries */
33
+ private readonly maxMemoryEntries;
34
+ /** S3 storage backend (optional) */
35
+ private readonly storage?;
22
36
  /** Cleanup interval handle */
23
37
  private cleanupInterval;
24
- constructor(config?: Partial<IUpstreamCacheConfig>, maxEntries?: number);
38
+ constructor(config?: Partial<IUpstreamCacheConfig>, maxMemoryEntries?: number, storage?: IStorageBackend);
25
39
  /**
26
40
  * Check if caching is enabled.
27
41
  */
28
42
  isEnabled(): boolean;
43
+ /**
44
+ * Check if S3 storage is configured.
45
+ */
46
+ hasStorage(): boolean;
29
47
  /**
30
48
  * Get cached entry for a request context.
49
+ * Checks memory first, then falls back to S3.
31
50
  * Returns null if not found or expired (unless stale-while-revalidate).
32
51
  */
33
- get(context: IUpstreamFetchContext): ICacheEntry | null;
52
+ get(context: IUpstreamFetchContext, upstreamUrl?: string): Promise<ICacheEntry | null>;
34
53
  /**
35
- * Store a response in the cache.
54
+ * Store a response in the cache (memory and optionally S3).
36
55
  */
37
- set(context: IUpstreamFetchContext, data: Buffer, contentType: string, headers: Record<string, string>, upstreamId: string, options?: ICacheSetOptions): void;
56
+ set(context: IUpstreamFetchContext, data: Buffer, contentType: string, headers: Record<string, string>, upstreamId: string, upstreamUrl: string, options?: ICacheSetOptions): Promise<void>;
38
57
  /**
39
58
  * Store a negative cache entry (404 response).
40
59
  */
41
- setNegative(context: IUpstreamFetchContext, upstreamId: string): void;
60
+ setNegative(context: IUpstreamFetchContext, upstreamId: string, upstreamUrl: string): Promise<void>;
42
61
  /**
43
62
  * Check if there's a negative cache entry for this context.
44
63
  */
45
- hasNegative(context: IUpstreamFetchContext): boolean;
64
+ hasNegative(context: IUpstreamFetchContext, upstreamUrl?: string): Promise<boolean>;
46
65
  /**
47
66
  * Invalidate a specific cache entry.
48
67
  */
49
- invalidate(context: IUpstreamFetchContext): boolean;
68
+ invalidate(context: IUpstreamFetchContext, upstreamUrl?: string): Promise<boolean>;
50
69
  /**
51
70
  * Invalidate all entries matching a pattern.
52
71
  * Useful for invalidating all versions of a package.
53
72
  */
54
- invalidatePattern(pattern: RegExp): number;
73
+ invalidatePattern(pattern: RegExp): Promise<number>;
55
74
  /**
56
75
  * Invalidate all entries from a specific upstream.
57
76
  */
58
- invalidateUpstream(upstreamId: string): number;
77
+ invalidateUpstream(upstreamId: string): Promise<number>;
59
78
  /**
60
- * Clear all cache entries.
79
+ * Clear all cache entries (memory and S3).
61
80
  */
62
- clear(): void;
81
+ clear(): Promise<void>;
63
82
  /**
64
83
  * Get cache statistics.
65
84
  */
@@ -68,8 +87,34 @@ export declare class UpstreamCache {
68
87
  * Stop the cache and cleanup.
69
88
  */
70
89
  stop(): void;
90
+ /**
91
+ * Build storage path for a cache key.
92
+ * Escapes upstream URL for safe use in S3 paths.
93
+ */
94
+ private buildStoragePath;
95
+ /**
96
+ * Build storage path for cache metadata.
97
+ */
98
+ private buildMetadataPath;
99
+ /**
100
+ * Load a cache entry from S3 storage.
101
+ */
102
+ private loadFromStorage;
103
+ /**
104
+ * Save a cache entry to S3 storage.
105
+ */
106
+ private saveToStorage;
107
+ /**
108
+ * Delete a cache entry from S3 storage.
109
+ */
110
+ private deleteFromStorage;
111
+ /**
112
+ * Escape a URL for safe use in storage paths.
113
+ */
114
+ private escapeUrl;
71
115
  /**
72
116
  * Build a unique cache key for a request context.
117
+ * Includes escaped upstream URL for multi-upstream support.
73
118
  */
74
119
  private buildCacheKey;
75
120
  /**
@@ -89,7 +134,7 @@ export declare class UpstreamCache {
89
134
  */
90
135
  private startCleanup;
91
136
  /**
92
- * Remove all expired entries.
137
+ * Remove all expired entries from memory cache.
93
138
  */
94
139
  private cleanup;
95
140
  }
@@ -106,7 +151,7 @@ export interface ICacheSetOptions {
106
151
  * Cache statistics.
107
152
  */
108
153
  export interface ICacheStats {
109
- /** Total number of cached entries */
154
+ /** Total number of cached entries in memory */
110
155
  totalEntries: number;
111
156
  /** Number of fresh (non-expired) entries */
112
157
  freshEntries: number;
@@ -114,10 +159,12 @@ export interface ICacheStats {
114
159
  staleEntries: number;
115
160
  /** Number of negative cache entries */
116
161
  negativeEntries: number;
117
- /** Total size of cached data in bytes */
162
+ /** Total size of cached data in bytes (memory only) */
118
163
  totalSizeBytes: number;
119
- /** Maximum allowed entries */
164
+ /** Maximum allowed memory entries */
120
165
  maxEntries: number;
121
166
  /** Whether caching is enabled */
122
167
  enabled: boolean;
168
+ /** Whether S3 storage is configured */
169
+ hasStorage: boolean;
123
170
  }