@researchdatabox/redbox-core 5.0.4 → 5.1.0-beta.12568

package/dist/services/BrandingLogoService.d.ts

@@ -12,6 +12,7 @@ export declare namespace Services {
         private pruneExpiredEntries;
         private setCache;
         private getFromCache;
+        private scheduleSupersededFaviconCleanup;
         private isStorageNotFoundError;
         private isLegacyGridFsObjectId;
         private extForContentType;
@@ -59,7 +60,11 @@ export declare namespace Services {
             updatedAt: string;
         }>;
         getBinary(id: string): Buffer | null;
-        getBinaryAsync(id: string): Promise<Buffer | null>;
+        getBinaryAsync(id: string, expectedSha256?: string): Promise<Buffer | null>;
+        getCurrentFaviconBinary(branding: string): Promise<{
+            buffer: Buffer;
+            favicon: Record<string, unknown>;
+        } | null>;
         private getLegacyGridFsBinary;
     }
 }

package/dist/services/BrandingLogoService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BrandingLogoService.d.ts","sourceRoot":"","sources":["../../src/services/BrandingLogoService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAK1D;;;;GAIG;AAEH,yBAAiB,QAAQ,CAAC;IACxB,MACa,YAAa,SAAQ,YAAY,CAAC,IAAI,CAAC,OAAO;QACzD,iEAAiE;QACjE,OAAO,CAAC,WAAW,CAA4D;QAE/E,OAAO,CAAC,aAAa;QASrB,OAAO,CAAC,mBAAmB;QAS3B,OAAO,CAAC,QAAQ;QAKhB,OAAO,CAAC,YAAY;QAUpB,OAAO,CAAC,sBAAsB;QAc9B,OAAO,CAAC,sBAAsB;QAI9B,OAAO,CAAC,iBAAiB;QAWzB,OAAO,CAAC,cAAc;QAKtB,OAAO,CAAC,iBAAiB;QAKzB,WAAW,IAAI,MAAM;QAIrB,kBAAkB,IAAI,MAAM;QAI5B,mBAAmB,cAIhB;QAEH,0BAA0B,cAKvB;QAEH,0BAA0B;QAC1B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO;QAMjC,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC;YAAE,EAAE,EAAE,OAAO,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,eAAe,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;YAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;SAAE,CAAC;QA8CvP,OAAO,CAAC,IAAI,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAC;SAAE,GAAG,OAAO,CAAC;YAC3G,IAAI,EAAE,MAAM,CAAC;YACb,QAAQ,EAAE,MAAM,CAAC;YACjB,UAAU,EAAE,MAAM,CAAC;YACnB,WAAW,EAAE,MAAM,CAAC;YACpB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;QAwBI,UAAU,CAAC,IAAI,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAC;SAAE,GAAG,OAAO,CAAC;YAC9G,IAAI,EAAE,MAAM,CAAC;YACb,QAAQ,EAAE,MAAM,CAAC;YACjB,UAAU,EAAE,MAAM,CAAC;YACnB,WAAW,EAAE,MAAM,CAAC;YACpB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;QA4BF,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;QAI9B,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;gBAoB1C,qBAAqB;KA6BpC;CACF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,mBAAmB,EAAE,QAAQ,CAAC,YAAY,CAAC;CAChD"}
+{"version":3,"file":"BrandingLogoService.d.ts","sourceRoot":"","sources":["../../src/services/BrandingLogoService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAK1D;;;;GAIG;AAEH,yBAAiB,QAAQ,CAAC;IACxB,MACa,YAAa,SAAQ,YAAY,CAAC,IAAI,CAAC,OAAO;QACzD,iEAAiE;QACjE,OAAO,CAAC,WAAW,CAA4E;QAE/F,OAAO,CAAC,aAAa;QASrB,OAAO,CAAC,mBAAmB;QAS3B,OAAO,CAAC,QAAQ;QAMhB,OAAO,CAAC,YAAY;QAcpB,OAAO,CAAC,gCAAgC;QAoBxC,OAAO,CAAC,sBAAsB;QAc9B,OAAO,CAAC,sBAAsB;QAI9B,OAAO,CAAC,iBAAiB;QAWzB,OAAO,CAAC,cAAc;QAKtB,OAAO,CAAC,iBAAiB;QAKzB,WAAW,IAAI,MAAM;QAIrB,kBAAkB,IAAI,MAAM;QAI5B,mBAAmB,cAIhB;QAEH,0BAA0B,cAKvB;QAEH,0BAA0B;QAC1B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO;QAMjC,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC;YAAE,EAAE,EAAE,OAAO,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,eAAe,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;YAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;SAAE,CAAC;QA8CvP,OAAO,CAAC,IAAI,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAC;SAAE,GAAG,OAAO,CAAC;YAC3G,IAAI,EAAE,MAAM,CAAC;YACb,QAAQ,EAAE,MAAM,CAAC;YACjB,UAAU,EAAE,MAAM,CAAC;YACnB,WAAW,EAAE,MAAM,CAAC;YACpB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;QAwBI,UAAU,CAAC,IAAI,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAC;SAAE,GAAG,OAAO,CAAC;YAC9G,IAAI,EAAE,MAAM,CAAC;YACb,QAAQ,EAAE,MAAM,CAAC;YACjB,UAAU,EAAE,MAAM,CAAC;YACnB,WAAW,EAAE,MAAM,CAAC;YACpB,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;QA0CF,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;QAI9B,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;QAyB3E,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;YACvD,MAAM,EAAE,MAAM,CAAC;YACf,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SAClC,GAAG,IAAI,CAAC;gBAuBK,qBAAqB;KA6BpC;CACF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,mBAAmB,EAAE,QAAQ,CAAC,YAAY,CAAC;CAChD"}

package/dist/services/BrandingLogoService.js

@@ -41,10 +41,11 @@ var Services;
             }
         }
         setCache(id, buffer) {
-            this._binaryById[id] = { buffer, storedAt: Date.now() };
+            const sha256 = crypto_1.default.createHash('sha256').update(buffer).digest('hex');
+            this._binaryById[id] = { buffer, sha256, storedAt: Date.now() };
             this.pruneExpiredEntries();
         }
-        getFromCache(id) {
+        getFromCache(id, expectedSha256) {
             const entry = this._binaryById[id];
             if (!entry)
                 return null;
@@ -52,8 +53,32 @@ var Services;
                 delete this._binaryById[id];
                 return null;
             }
+            if (expectedSha256 && entry.sha256 !== expectedSha256) {
+                delete this._binaryById[id];
+                return null;
+            }
             return entry.buffer;
         }
+        scheduleSupersededFaviconCleanup(brandId, storageKey) {
+            const cleanupTimer = setTimeout(async () => {
+                try {
+                    const currentBrand = await BrandingConfig.findOne({ id: brandId });
+                    if (_.get(currentBrand, 'favicon.storageKey') === storageKey) {
+                        return;
+                    }
+                    const disk = StorageManagerService.primaryDisk();
+                    const retainedBytes = Buffer.from(await disk.getBytes(storageKey));
+                    await disk.delete(storageKey);
+                    // Keep a fresh in-process copy for another full TTL so a request that
+                    // captured the superseded metadata before cleanup can still complete.
+                    this.setCache(storageKey, retainedBytes);
+                }
+                catch (error) {
+                    sails.log.warn(`BrandingLogoService failed to remove superseded favicon ${storageKey}:`, error);
+                }
+            }, this.getCacheTtlMs());
+            cleanupTimer.unref?.();
+        }
         isStorageNotFoundError(err) {
             if (!err || typeof err !== 'object') {
                 return false;
@@ -83,9 +108,9 @@ var Services;
             const ext = this.extForContentType(contentType);
             return `${branding}/${portal}/images/logo.${ext}`;
         }
-        faviconStorageKey(branding, portal, contentType) {
+        faviconStorageKey(branding, portal, contentType, sha256) {
             const ext = this.extForContentType(contentType);
-            return `${branding}/${portal}/images/favicon.${ext}`;
+            return `${branding}/${portal}/images/favicon-${sha256}-${crypto_1.default.randomUUID()}.${ext}`;
         }
         getMaxBytes() {
             return _.get(sails, 'config.branding.logoMaxBytes', 512 * 1024);
@@ -182,7 +207,7 @@ var Services;
             if (!ok)
                 throw new Error('favicon-invalid: ' + errorList.join(','));
             const resolvedContentType = finalContentType ?? opts.contentType;
-            const storageKey = this.faviconStorageKey(opts.branding, opts.portal, resolvedContentType);
+            const storageKey = this.faviconStorageKey(opts.branding, opts.portal, resolvedContentType, sha256);
             await StorageManagerService.primaryDisk().put(storageKey, sanitizedBuffer, { contentType: resolvedContentType });
             this.setCache(storageKey, sanitizedBuffer);
             const meta = {
@@ -192,19 +217,40 @@ var Services;
                 contentType: resolvedContentType,
                 updatedAt: new Date().toISOString(),
             };
-            await BrandingConfig.update({ id: brand.id }, { favicon: meta });
+            try {
+                await BrandingConfig.update({ id: brand.id }, { favicon: meta });
+            }
+            catch (error) {
+                try {
+                    await StorageManagerService.primaryDisk().delete(storageKey);
+                    delete this._binaryById[storageKey];
+                }
+                catch (cleanupError) {
+                    sails.log.warn(`BrandingLogoService failed to remove unreferenced favicon ${storageKey}:`, cleanupError);
+                }
+                throw error;
+            }
+            const previousStorageKey = _.get(brand, 'favicon.storageKey');
+            if (previousStorageKey && previousStorageKey !== storageKey) {
+                this.scheduleSupersededFaviconCleanup(brand.id, previousStorageKey);
+            }
             return { hash: sha256, gridFsId: storageKey, storageKey, contentType: resolvedContentType, updatedAt: meta.updatedAt };
         }
         getBinary(id) {
             return this.getFromCache(id);
         }
-        async getBinaryAsync(id) {
-            const mem = this.getFromCache(id);
+        async getBinaryAsync(id, expectedSha256) {
+            const mem = this.getFromCache(id, expectedSha256);
             if (mem)
                 return mem;
             try {
                 const bytes = await StorageManagerService.primaryDisk().getBytes(id);
                 const buf = Buffer.from(bytes);
+                const actualSha256 = crypto_1.default.createHash('sha256').update(buf).digest('hex');
+                if (expectedSha256 && actualSha256 !== expectedSha256) {
+                    sails.log.warn(`BrandingLogoService.getBinaryAsync hash mismatch for ${id}`);
+                    return null;
+                }
                 this.setCache(id, buf);
                 return buf;
             }
@@ -218,6 +264,28 @@ var Services;
                 return null;
             }
         }
+        async getCurrentFaviconBinary(branding) {
+            let failedStorageId = null;
+            for (let attempt = 0; attempt < 2; attempt += 1) {
+                const brand = await BrandingConfig.findOne({ name: branding });
+                const favicon = brand?.favicon;
+                const storageId = typeof favicon?.storageKey === 'string'
+                    ? favicon.storageKey
+                    : typeof favicon?.gridFsId === 'string'
+                        ? favicon.gridFsId
+                        : null;
+                if (!favicon || !storageId || storageId === failedStorageId) {
+                    return null;
+                }
+                const expectedSha256 = typeof favicon.sha256 === 'string' ? favicon.sha256 : undefined;
+                const buffer = await this.getBinaryAsync(storageId, expectedSha256);
+                if (buffer) {
+                    return { buffer, favicon };
+                }
+                failedStorageId = storageId;
+            }
+            return null;
+        }
         async getLegacyGridFsBinary(id) {
             const datastores = sails.config?.datastores;
             const url = datastores?.mongodb?.url;
@@ -254,4 +322,4 @@ var Services;
     ], BrandingLogo);
     Services.BrandingLogo = BrandingLogo;
 })(Services || (exports.Services = Services = {}));
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BrandingLogoService.js","sourceRoot":"","sources":["../../src/services/BrandingLogoService.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAA0D;AAC1D,sGAAyF;AACzF,oDAA4B;AAC5B,qCAA8D;AAE9D;;;;GAIG;AAEH,IAAiB,QAAQ,CA8QxB;AA9QD,WAAiB,QAAQ;IAEvB,IAAa,YAAY,GAAzB,MAAa,YAAa,SAAQ,sBAAY,CAAC,IAAI,CAAC,OAAO;QACzD,iEAAiE;QACzD,WAAW,GAAyD,EAAE,CAAC;QAEvE,aAAa;YACnB,MAAM,yBAAyB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;YACtD,MAAM,UAAU,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,gCAAgC,EAAE,yBAAyB,CAAC,CAAC;YAC7F,IAAI,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;gBACrD,OAAO,UAAU,CAAC;YACpB,CAAC;YACD,OAAO,yBAAyB,CAAC;QACnC,CAAC;QAEO,mBAAmB,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;YAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YACjC,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC3D,IAAI,GAAG,GAAG,KAAK,CAAC,QAAQ,GAAG,GAAG,EAAE,CAAC;oBAC/B,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC;QAEO,QAAQ,CAAC,EAAU,EAAE,MAAc;YACzC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YACxD,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC7B,CAAC;QAEO,YAAY,CAAC,EAAU;YAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YACnC,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YACxB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACvD,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBAC5B,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,KAAK,CAAC,MAAM,CAAC;QACtB,CAAC;QAEO,sBAAsB,CAAC,GAAY;YACzC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACpC,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,YAAY,GAAG,GAAgF,CAAC;YACtG,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;YAC1D,OAAO,YAAY,CAAC,IAAI,KAAK,QAAQ;mBAChC,YAAY,CAAC,MAAM,KAAK,GAAG;mBAC3B,YAAY,CAAC,UAAU,KAAK,GAAG;mBAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;mBAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QAEO,sBAAsB,CAAC,EAAU;YACvC,OAAO,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC;QAEO,iBAAiB,CAAC,WAAmB;YAC3C,QAAQ,WAAW,EAAE,CAAC;gBACpB,KAAK,WAAW,CAAC,CAAC,OAAO,KAAK,CAAC;gBAC/B,KAAK,YAAY,CAAC,CAAC,OAAO,KAAK,CAAC;gBAChC,KAAK,eAAe,CAAC,CAAC,OAAO,KAAK,CAAC;gBACnC,KAAK,cAAc,CAAC;gBACpB,KAAK,0BAA0B,CAAC,CAAC,OAAO,KAAK,CAAC;gBAC9C,OAAO,CAAC,CAAC,OAAO,KAAK,CAAC;YACxB,CAAC;QACH,CAAC;QAEO,cAAc,CAAC,QAAgB,EAAE,MAAc,EAAE,WAAmB;YAC1E,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAChD,OAAO,GAAG,QAAQ,IAAI,MAAM,gBAAgB,GAAG,EAAE,CAAC;QACpD,CAAC;QAEO,iBAAiB,CAAC,QAAgB,EAAE,MAAc,EAAE,WAAmB;YAC7E,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAChD,OAAO,GAAG,QAAQ,IAAI,MAAM,mBAAmB,GAAG,EAAE,CAAC;QACvD,CAAC;QAED,WAAW;YACT,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,8BAA8B,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC;QAClE,CAAC;QAED,kBAAkB;YAChB,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,iCAAiC,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC;QACrE,CAAC;QAED,mBAAmB,GAAG,IAAI,GAAG,CAAC;YAC5B,WAAW;YACX,YAAY;YACZ,eAAe;SAChB,CAAC,CAAC;QAEH,0BAA0B,GAAG,IAAI,GAAG,CAAC;YACnC,WAAW;YACX,eAAe;YACf,cAAc;YACd,0BAA0B;SAC3B,CAAC,CAAC;QAEH,0BAA0B;QAC1B,KAAK,CAAC,GAAW,EAAE,EAAU;YAC3B,IAAI,EAAE,KAAK,eAAe;gBAAE,OAAO,IAAI,CAAC;YACxC,MAAM,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;YACvD,OAAO,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC;QAED,KAAK,CAAC,mBAAmB,CAAC,OAAe,EAAE,WAAmB,EAAE,IAAmD;YACjH,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC,mBAAmB,CAAC;YAC1D,MAAM,GAAG,GAAG,IAAI,EAAE,QAAQ,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAEjD,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;YACzC,CAAC;YAED,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAClE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACrB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;YACzC,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC9B,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAClC,CAAC;YACD,IAAI,OAAO,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBACzB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC3B,CAAC;YAED,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;YACzC,CAAC;YAED,IAAI,SAAS,GAAG,OAAO,CAAC;YACxB,IAAI,OAAO,GAAG,WAAW,CAAC;YAC1B,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC;gBACrC,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACrC,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;gBACvD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;oBACjB,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBAC/D,CAAC;gBACD,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBACjE,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBAClD,OAAO,GAAG,eAAe,CAAC;YAC5B,CAAC;YACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;YACzC,CAAC;YACD,MAAM,MAAM,GAAG,gBAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3E,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC;QAC/F,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,IAAoF;YAOhG,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAClD,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACpI,MAAM,SAAS,GAAG,MAAM,IAAI,EAAE,CAAC;YAC/B,IAAI,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAEjE,MAAM,mBAAmB,GAAG,gBAAgB,IAAI,IAAI,CAAC,WAAW,CAAC;YACjE,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;YAExF,MAAM,qBAAqB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,eAAgB,EAAE,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAC,CAAC;YAElH,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,eAAgB,CAAC,CAAC;YAC5C,MAAM,IAAI,GAAG;gBACX,QAAQ,EAAE,UAAU;gBACpB,UAAU;gBACV,MAAM;gBACN,WAAW,EAAE,mBAAmB;gBAChC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CAAC;YACF,MAAM,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9D,OAAO,EAAE,IAAI,EAAE,MAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,mBAAmB,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;QAC1H,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,IAAoF;YAOnG,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC,KAAK;gBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAClD,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAC9F,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,WAAW,EAChB,EAAE,OAAO,EAAE,IAAI,CAAC,0BAA0B,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAClF,CAAC;YACF,MAAM,SAAS,GAAG,MAAM,IAAI,EAAE,CAAC;YAC/B,IAAI,CAAC,EAAE;gBAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAEpE,MAAM,mBAAmB,GAAG,gBAAgB,IAAI,IAAI,CAAC,WAAW,CAAC;YACjE,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;YAE3F,MAAM,qBAAqB,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,UAAU,EAAE,eAAgB,EAAE,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAC,CAAC;YAElH,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,eAAgB,CAAC,CAAC;YAC5C,MAAM,IAAI,GAAG;gBACX,QAAQ,EAAE,UAAU;gBACpB,UAAU;gBACV,MAAM;gBACN,WAAW,EAAE,mBAAmB;gBAChC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CAAC;YACF,MAAM,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACjE,OAAO,EAAE,IAAI,EAAE,MAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,mBAAmB,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;QAC1H,CAAC;QAED,SAAS,CAAC,EAAU;YAClB,OAAO,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC;QAED,KAAK,CAAC,cAAc,CAAC,EAAU;YAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAClC,IAAI,GAAG;gBAAE,OAAO,GAAG,CAAC;YAEpB,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,MAAM,qBAAqB,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACrE,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/B,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBACvB,OAAO,GAAG,CAAC;YACb,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC;oBACxC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,yDAAyD,EAAE,KAAK,CAAC,CAAC;gBACnF,CAAC;gBACD,IAAI,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,EAAE,CAAC;oBACpC,OAAO,IAAI,CAAC,qBAAqB,CAAC,EAAE,CAAC,CAAC;gBACxC,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAEO,KAAK,CAAC,qBAAqB,CAAC,EAAU;YAC5C,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,EAAE,UAA0D,CAAC;YAC5F,MAAM,GAAG,GAAG,UAAU,EAAE,OAAO,EAAE,GAAG,CAAC;YACrC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,qBAAW,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,sBAAY,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;gBACnE,MAAM,MAAM,GAAa,EAAE,CAAC;gBAC5B,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC1C,MAAM,CAAC,kBAAkB,CAAC,IAAI,kBAAQ,CAAC,EAAE,CAAC,CAAC;yBACxC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;yBAC9D,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;yBACnB,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBACxB,CAAC,CAAC,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAClC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBACvB,OAAO,GAAG,CAAC;YACb,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC;oBACxC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,wDAAwD,EAAE,KAAK,CAAC,CAAC;gBAClF,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;oBAAS,CAAC;gBACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACvB,CAAC;QACH,CAAC;KACF,CAAA;IA3QY,YAAY;QADxB,2DAAuB;OACX,YAAY,CA2QxB;IA3QY,qBAAY,eA2QxB,CAAA;AACH,CAAC,EA9QgB,QAAQ,wBAAR,QAAQ,QA8QxB"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BrandingLogoService.js","sourceRoot":"","sources":["../../src/services/BrandingLogoService.ts"],"names":[],"mappings":"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"}

package/dist/services/BrandingService.d.ts

@@ -1,6 +1,54 @@
 import { Observable } from 'rxjs';
 import { Services as services } from '../CoreService';
 import { BrandingModel } from '../model/storage/BrandingModel';
+import { type BrandingTypefaceSlot, type BrandingTypefaceState } from '../model/BrandingTypeface';
+/** Canonical Admin configuration response (design.md section 5.3). */
+export interface BrandingVersionEntry {
+    id: string;
+    /** Owning brand ID (compatibility projection for history consumers). */
+    branding?: string;
+    version: number;
+    hash: string;
+    dateCreated: string;
+    actorId?: string;
+    actorDisplayName?: string;
+    restoredFromVersion?: number;
+    variables: Record<string, string>;
+    typeface: BrandingTypefaceState;
+}
+export interface BrandingHealthWarning {
+    code: string;
+    slot?: BrandingTypefaceSlot;
+    sha256?: string;
+}
+export interface BrandingAdminState {
+    branding: {
+        id: string;
+        name: string;
+    };
+    active: {
+        version: number;
+        hash: string;
+        variables: Record<string, string>;
+        typeface: BrandingTypefaceState;
+    };
+    draft: {
+        revision: number;
+        variables: Record<string, string>;
+        typeface: BrandingTypefaceState;
+        dirty: {
+            colours: boolean;
+            typeface: boolean;
+        };
+    };
+    versions: BrandingVersionEntry[];
+    limits: {
+        faceMaxBytes: number;
+        familyMaxBytes: number;
+        historyMaxVersions: number;
+    };
+    healthWarnings: BrandingHealthWarning[];
+}
 export declare namespace Services {
     /**
      * Branding related functions...
@@ -22,19 +70,94 @@ export declare namespace Services {
         getBrandingFromDB(name: string): Promise<BrandingModel>;
         getAvailable: () => string[];
         getBrandAndPortalPath(req: Sails.ReqParamProvider): string;
+        getFaviconUrl(req: Sails.ReqParamProvider): string;
         getRootContext(): string;
         getFullPath(req: Sails.ReqParamProvider): string;
         getBrandNameFromReq(req: Sails.ReqParamProvider): string;
         getBrandFromReq(req: Sails.ReqParamProvider): BrandingModel;
         getPortalFromReq(req: Sails.ReqParamProvider): string;
-        /** Save draft variables after whitelist + contrast validation */
+        private readHistoryMaxVersions;
+        private snapshotKey;
+        private brandCounters;
+        private conflictError;
+        private codedError;
+        private isUniqueViolation;
+        private extractActor;
+        private loadBrandOrThrow;
+        private draftTypefaceOf;
+        private listHistoriesAsc;
+        private activeHistoryRow;
+        private maxHistoryVersion;
+        private publicationIdentity;
+        /** Newest-first version entries shared by getAdminState and listVersions. */
+        private buildVersionEntries;
+        /**
+         * Canonical Admin-state response builder (design.md section 5.3).
+         *
+         * Every response includes advisory active-face health, including mutations,
+         * because the Admin UI replaces its canonical state with each response.
+         */
+        getAdminState(branding: string): Promise<BrandingAdminState>;
+        /** Retained versions newest-first (no storage health reads). */
+        listVersions(branding: string): Promise<BrandingVersionEntry[]>;
+        /**
+         * Advisory active-asset health; config retrieval never fails on storage errors.
+         * Missing objects are reported via a cheap existence probe; only faces that
+         * exist pay for a full read plus hash verification (corruption check).
+         */
+        private activeHealthWarnings;
+        private requireDraftRevision;
+        private requireCounters;
+        private conditionalDraftUpdate;
+        /** Save colour draft; typeface draft is preserved untouched. */
         saveDraft(input: {
             branding: string;
             variables: Record<string, string>;
+            expectedDraftRevision?: number;
+            actor?: unknown;
+        }): Promise<BrandingAdminState>;
+        /** Stage one uploaded face and apply a single-slot draft mutation. */
+        uploadTypefaceFace(input: {
+            branding: string;
+            slot: string;
+            bytes: Buffer;
+            originalFilename?: string;
+            expectedDraftRevision?: number;
+            actor?: unknown;
+        }): Promise<BrandingAdminState>;
+        /** Remove one draft face; the active typeface is untouched. */
+        removeTypefaceFace(input: {
+            branding: string;
+            slot: string;
+            expectedDraftRevision?: number;
+            actor?: unknown;
+        }): Promise<BrandingAdminState>;
+        /** Set the draft typeface to Default Typography; draft colours are preserved. */
+        useDefaultTypography(input: {
+            branding: string;
+            expectedDraftRevision?: number;
             actor?: unknown;
-        }): Promise<BrandingModel | null>;
-        /** Generate preview token storing compiled CSS in CacheEntry */
-        preview(branding: string, portal: string): Promise<{
+        }): Promise<BrandingAdminState>;
+        /** Copy only the active typeface into the draft; draft colours are preserved. */
+        revertTypefaceDraft(input: {
+            branding: string;
+            expectedDraftRevision?: number;
+            actor?: unknown;
+        }): Promise<BrandingAdminState>;
+        private previewUrl;
+        /** Generate preview CSS for an exact draft revision (non-mutating). */
+        preview(branding: string, portal: string, expectedDraftRevision?: number): Promise<{
+            token: string;
+            url: string;
+            hash: string;
+            revision: number;
+        }>;
+        /** Preview a retained version without mutating the draft. */
+        previewVersion(input: {
+            branding: string;
+            portal: string;
+            versionId: string;
+        }): Promise<{
             token: string;
             url: string;
             hash: string;
@@ -45,21 +168,60 @@ export declare namespace Services {
             branding: string;
             portal: string;
             hash: string;
+            revision?: number;
+            versionId?: string;
         }>;
-        /** Publish current draft (variables) -> CSS, bump version, persist hash, history */
-        publish(branding: string, portal: string, _actor: unknown, opts?: {
+        private buildPublishSnapshot;
+        private persistPublication;
+        /** Publish the draft atomically; unchanged publishes are idempotent. */
+        publish(branding: string, portal: string, actor: unknown, opts?: {
             expectedVersion?: number;
+            expectedDraftRevision?: number;
         }): Promise<{
+            state: BrandingAdminState;
             version: number;
             hash: string;
             idempotent?: boolean;
         }>;
-        /** Rollback to a previous published version via history id */
-        rollback(historyId: string, _actor: unknown): Promise<{
+        /** Restore a retained version as a new monotonically increasing version. */
+        restore(input: {
+            branding: string;
+            versionId: string;
+            expectedVersion?: number;
+            expectedDraftRevision?: number;
+            actor?: unknown;
+        }): Promise<{
+            state: BrandingAdminState;
+            version: number;
+            hash: string;
+        }>;
+        /**
+         * Deprecated one-major-release alias with restore semantics.
+         * Kept only for the compatibility route; new code must call restore.
+         */
+        rollback(versionId: string, actor: unknown, opts?: {
+            branding?: string;
+            expectedVersion?: number;
+            expectedDraftRevision?: number;
+        }): Promise<{
+            state: BrandingAdminState;
             version: number;
             hash: string;
-            branding: BrandingModel | null;
         }>;
+        /** Retain only the newest configured history rows after a durable transition. */
+        private pruneHistories;
+        /**
+         * Remove an ambiguous non-transactional attempt once a later publication
+         * has committed the same snapshot. Such rows can sit above the active
+         * version when an update response is lost and must not consume retention.
+         */
+        private pruneSupersededAmbiguousHistories;
+        /** Regular-face public URL for an active custom typeface, else null. */
+        getActiveTypefaceFontInfo(brandingName: string): {
+            regularUrl: string;
+        } | null;
+        /** True when the resolved brand has an active custom typeface with a Regular face. */
+        hasActiveCustomTypeface(brandingName: string): boolean;
         /** Refresh a single branding record in the in-memory cache (this.brandings & availableBrandings) */
         refreshBrandingCache(id: string): Promise<BrandingModel | null>;
     }

package/dist/services/BrandingService.d.ts.map

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