From ffe26f1806869fac5c21b8f988bac95b8e7fa2ca Mon Sep 17 00:00:00 2001 From: Alan Grainger Date: Wed, 30 Oct 2024 14:43:26 +0100 Subject: [PATCH] Updated logging --- dist/immich.js | 4 +++- dist/index.js | 18 ++++++++++-------- src/immich.ts | 2 ++ src/index.ts | 2 +- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dist/immich.js b/dist/immich.js index 07e3148..0a77462 100644 --- a/dist/immich.js +++ b/dist/immich.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); const tslib_1 = require("tslib"); const types_1 = require("./types"); const dayjs_1 = tslib_1.__importDefault(require("dayjs")); +const index_1 = require("./index"); class Immich { /** * Make a request to Immich API. We're not using the SDK to limit @@ -42,6 +43,7 @@ class Immich { link.assets = link.assets.filter(x => !x.isTrashed); if (link.expiresAt && (0, dayjs_1.default)(link.expiresAt) < (0, dayjs_1.default)()) { // This link has expired + (0, index_1.log)('Expired link ' + key); } else { return link; @@ -102,4 +104,4 @@ class Immich { } const immich = new Immich(); exports.default = immich; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1taWNoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ltbWljaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtQ0FBaUU7QUFDakUsMERBQXlCO0FBRXpCLE1BQU0sTUFBTTtJQUNWOzs7T0FHRztJQUNHLE9BQU8sQ0FBRSxRQUFnQjs7WUFDN0IsTUFBTSxHQUFHLEdBQUcsTUFBTSxLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEdBQUcsTUFBTSxHQUFHLFFBQVEsRUFBRTtnQkFDbEUsT0FBTyxFQUFFO29CQUNQLFdBQVcsRUFBRSxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sSUFBSSxFQUFFO2lCQUN2QzthQUNGLENBQUMsQ0FBQTtZQUNGLElBQUksR0FBRyxDQUFDLE1BQU0sS0FBSyxHQUFHLEVBQUUsQ0FBQztnQkFDdkIsTUFBTSxXQUFXLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLElBQUksRUFBRSxDQUFBO2dCQUN6RCxJQUFJLFdBQVcsQ0FBQyxRQUFRLENBQUMsa0JBQWtCLENBQUMsRUFBRSxDQUFDO29CQUM3QyxPQUFPLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtnQkFDbkIsQ0FBQztxQkFBTSxDQUFDO29CQUNOLE9BQU8sR0FBRyxDQUFBO2dCQUNaLENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztLQUFBO0lBRUQ7Ozs7OztPQU1HO0lBQ0csYUFBYSxDQUFFLEdBQVc7O1lBQzlCLE1BQU0sR0FBRyxHQUFHLENBQUMsQ0FBQSxNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLEtBQUksRUFBRSxDQUFpQixDQUFBO1lBQ3ZFLE1BQU0sSUFBSSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxLQUFLLEdBQUcsQ0FBQyxDQUFBO1lBQ3pDLElBQUksSUFBSSxFQUFFLENBQUM7Z0JBQ1QsMENBQTBDO2dCQUMxQyxJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUE7Z0JBQ25ELElBQUksSUFBSSxDQUFDLFNBQVMsSUFBSSxJQUFBLGVBQUssRUFBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsSUFBQSxlQUFLLEdBQUUsRUFBRSxDQUFDO29CQUN0RCx3QkFBd0I7Z0JBQzFCLENBQUM7cUJBQU0sQ0FBQztvQkFDTixPQUFPLElBQUksQ0FBQTtnQkFDYixDQUFDO1lBQ0gsQ0FBQztRQUNILENBQUM7S0FBQTtJQUVEOzs7OztPQUtHO0lBQ0csY0FBYyxDQUFFLEtBQVksRUFBRSxJQUFnQjs7WUFDbEQsUUFBUSxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ25CLEtBQUssaUJBQVMsQ0FBQyxLQUFLO29CQUNsQixJQUFJLEdBQUcsSUFBSSxLQUFLLGlCQUFTLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxpQkFBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsaUJBQVMsQ0FBQyxRQUFRLENBQUE7b0JBQzlFLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsa0JBQWtCLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEdBQUcsR0FBRyxJQUFJLENBQUMsQ0FBQTtnQkFDN0UsS0FBSyxpQkFBUyxDQUFDLEtBQUs7b0JBQ2xCLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsa0JBQWtCLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxHQUFHLGlCQUFpQixDQUFDLENBQUE7WUFDdEYsQ0FBQztRQUNILENBQUM7S0FBQTtJQUVEOztPQUVHO0lBQ0csY0FBYyxDQUFFLEtBQVk7O1lBQ2hDLE1BQU0sV0FBVyxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtZQUNwRCxPQUFPLFdBQVcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFBO1FBQ2hELENBQUM7S0FBQTtJQUVEOztPQUVHO0lBQ0gsUUFBUSxDQUFFLEdBQVcsRUFBRSxFQUFVLEVBQUUsSUFBZ0I7UUFDakQsT0FBTyxVQUFVLEdBQUcsSUFBSSxFQUFFLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDOUQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsUUFBUSxDQUFFLEdBQVcsRUFBRSxFQUFVO1FBQy9CLE9BQU8sVUFBVSxHQUFHLElBQUksRUFBRSxFQUFFLENBQUE7SUFDOUIsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSSxDQUFFLEVBQVU7UUFDZCxPQUFPLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLGdFQUFnRSxDQUFDLENBQUE7SUFDckYsQ0FBQztJQUVEOztPQUVHO0lBQ0gsS0FBSyxDQUFFLEdBQVc7UUFDaEIsT0FBTyxDQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUNoQyxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFJLE1BQU0sRUFBRSxDQUFBO0FBRTNCLGtCQUFlLE1BQU0sQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFzc2V0LCBBc3NldFR5cGUsIEltYWdlU2l6ZSwgU2hhcmVkTGluayB9IGZyb20gJy4vdHlwZXMnXG5pbXBvcnQgZGF5anMgZnJvbSAnZGF5anMnXG5cbmNsYXNzIEltbWljaCB7XG4gIC8qKlxuICAgKiBNYWtlIGEgcmVxdWVzdCB0byBJbW1pY2ggQVBJLiBXZSdyZSBub3QgdXNpbmcgdGhlIFNESyB0byBsaW1pdFxuICAgKiB0aGUgcG9zc2libGUgYXR0YWNrIHN1cmZhY2Ugb2YgdGhpcyBhcHAuXG4gICAqL1xuICBhc3luYyByZXF1ZXN0IChlbmRwb2ludDogc3RyaW5nKSB7XG4gICAgY29uc3QgcmVzID0gYXdhaXQgZmV0Y2gocHJvY2Vzcy5lbnYuSU1NSUNIX1VSTCArICcvYXBpJyArIGVuZHBvaW50LCB7XG4gICAgICBoZWFkZXJzOiB7XG4gICAgICAgICd4LWFwaS1rZXknOiBwcm9jZXNzLmVudi5BUElfS0VZIHx8ICcnXG4gICAgICB9XG4gICAgfSlcbiAgICBpZiAocmVzLnN0YXR1cyA9PT0gMjAwKSB7XG4gICAgICBjb25zdCBjb250ZW50VHlwZSA9IHJlcy5oZWFkZXJzLmdldCgnQ29udGVudC1UeXBlJykgfHwgJydcbiAgICAgIGlmIChjb250ZW50VHlwZS5pbmNsdWRlcygnYXBwbGljYXRpb24vanNvbicpKSB7XG4gICAgICAgIHJldHVybiByZXMuanNvbigpXG4gICAgICB9IGVsc2Uge1xuICAgICAgICByZXR1cm4gcmVzXG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgLyoqXG4gICAqIFF1ZXJ5IEltbWljaCBmb3IgdGhlIFNoYXJlZExpbmsgbWV0YWRhdGEgZm9yIGEgZ2l2ZW4ga2V5LlxuICAgKiBUaGUga2V5IGlzIHdoYXQgaXMgcmV0dXJuZWQgaW4gdGhlIFVSTCB3aGVuIHlvdSBjcmVhdGUgYSBzaGFyZSBpbiBJbW1pY2guXG4gICAqXG4gICAqIEltbWljaCBkb2Vzbid0IGhhdmUgYSBtZXRob2QgdG8gcXVlcnkgYnkga2V5LCBzbyB0aGlzIG1ldGhvZCBnZXRzIGFsbFxuICAgKiBrbm93biBzaGFyZWQgbGlua3MsIGFuZCByZXR1cm5zIHRoZSBsaW5rIHdoaWNoIG1hdGNoZXMgdGhlIHByb3ZpZGVkIGtleS5cbiAgICovXG4gIGFzeW5jIGdldFNoYXJlQnlLZXkgKGtleTogc3RyaW5nKSB7XG4gICAgY29uc3QgcmVzID0gKGF3YWl0IHRoaXMucmVxdWVzdCgnL3NoYXJlZC1saW5rcycpIHx8IFtdKSBhcyBTaGFyZWRMaW5rW11cbiAgICBjb25zdCBsaW5rID0gcmVzLmZpbmQoeCA9PiB4LmtleSA9PT0ga2V5KVxuICAgIGlmIChsaW5rKSB7XG4gICAgICAvLyBGaWx0ZXIgYXNzZXRzIHRvIGV4Y2x1ZGUgdHJhc2hlZCBhc3NldHNcbiAgICAgIGxpbmsuYXNzZXRzID0gbGluay5hc3NldHMuZmlsdGVyKHggPT4gIXguaXNUcmFzaGVkKVxuICAgICAgaWYgKGxpbmsuZXhwaXJlc0F0ICYmIGRheWpzKGxpbmsuZXhwaXJlc0F0KSA8IGRheWpzKCkpIHtcbiAgICAgICAgLy8gVGhpcyBsaW5rIGhhcyBleHBpcmVkXG4gICAgICB9IGVsc2Uge1xuICAgICAgICByZXR1cm4gbGlua1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIC8qKlxuICAgKiBTdHJlYW0gYXNzZXQgYnVmZmVyIGRhdGEgZnJvbSBJbW1pY2guXG4gICAqXG4gICAqIEZvciBwaG90b3MsIHlvdSBjYW4gcmVxdWVzdCAndGh1bWJuYWlsJyBvciAnb3JpZ2luYWwnIHNpemUuXG4gICAqIEZvciB2aWRlb3MsIGl0IGlzIEltbWljaCdzIHN0cmVhbWluZyBxdWFsaXR5LCBub3QgdGhlIG9yaWdpbmFsIHF1YWxpdHkuXG4gICAqL1xuICBhc3luYyBnZXRBc3NldEJ1ZmZlciAoYXNzZXQ6IEFzc2V0LCBzaXplPzogSW1hZ2VTaXplKSB7XG4gICAgc3dpdGNoIChhc3NldC50eXBlKSB7XG4gICAgICBjYXNlIEFzc2V0VHlwZS5pbWFnZTpcbiAgICAgICAgc2l6ZSA9IHNpemUgPT09IEltYWdlU2l6ZS50aHVtYm5haWwgPyBJbWFnZVNpemUudGh1bWJuYWlsIDogSW1hZ2VTaXplLm9yaWdpbmFsXG4gICAgICAgIHJldHVybiB0aGlzLnJlcXVlc3QoJy9hc3NldHMvJyArIGVuY29kZVVSSUNvbXBvbmVudChhc3NldC5pZCkgKyAnLycgKyBzaXplKVxuICAgICAgY2FzZSBBc3NldFR5cGUudmlkZW86XG4gICAgICAgIHJldHVybiB0aGlzLnJlcXVlc3QoJy9hc3NldHMvJyArIGVuY29kZVVSSUNvbXBvbmVudChhc3NldC5pZCkgKyAnL3ZpZGVvL3BsYXliYWNrJylcbiAgICB9XG4gIH1cblxuICAvKipcbiAgICogR2V0IHRoZSBjb250ZW50LXR5cGUgb2YgYW4gSW1taWNoIGFzc2V0XG4gICAqL1xuICBhc3luYyBnZXRDb250ZW50VHlwZSAoYXNzZXQ6IEFzc2V0KSB7XG4gICAgY29uc3QgYXNzZXRCdWZmZXIgPSBhd2FpdCB0aGlzLmdldEFzc2V0QnVmZmVyKGFzc2V0KVxuICAgIHJldHVybiBhc3NldEJ1ZmZlci5oZWFkZXJzLmdldCgnQ29udGVudC1UeXBlJylcbiAgfVxuXG4gIC8qKlxuICAgKiBSZXR1cm4gdGhlIGltYWdlIGRhdGEgVVJMIGZvciBhIHBob3RvXG4gICAqL1xuICBwaG90b1VybCAoa2V5OiBzdHJpbmcsIGlkOiBzdHJpbmcsIHNpemU/OiBJbWFnZVNpemUpIHtcbiAgICByZXR1cm4gYC9waG90by8ke2tleX0vJHtpZH1gICsgKHNpemUgPyBgP3NpemU9JHtzaXplfWAgOiAnJylcbiAgfVxuXG4gIC8qKlxuICAgKiBSZXR1cm4gdGhlIHZpZGVvIGRhdGEgVVJMIGZvciBhIHZpZGVvXG4gICAqL1xuICB2aWRlb1VybCAoa2V5OiBzdHJpbmcsIGlkOiBzdHJpbmcpIHtcbiAgICByZXR1cm4gYC92aWRlby8ke2tleX0vJHtpZH1gXG4gIH1cblxuICAvKipcbiAgICogQ2hlY2sgaWYgYSBwcm92aWRlZCBJRCBtYXRjaGVzIHRoZSBJbW1pY2ggSUQgZm9ybWF0XG4gICAqL1xuICBpc0lkIChpZDogc3RyaW5nKSB7XG4gICAgcmV0dXJuICEhaWQubWF0Y2goL15bMC05YS1mXXs4fS1bMC05YS1mXXs0fS1bMC05YS1mXXs0fS1bMC05YS1mXXs0fS1bMC05YS1mXXsxMn0kLylcbiAgfVxuXG4gIC8qKlxuICAgKiBDaGVjayBpZiBhIHByb3ZpZGVkIGtleSBtYXRjaGVzIHRoZSBJbW1pY2ggc2hhcmVkLWxpbmsga2V5IGZvcm1hdFxuICAgKi9cbiAgaXNLZXkgKGtleTogc3RyaW5nKSB7XG4gICAgcmV0dXJuICEha2V5Lm1hdGNoKC9eW1xcdy1dKyQvKVxuICB9XG59XG5cbmNvbnN0IGltbWljaCA9IG5ldyBJbW1pY2goKVxuXG5leHBvcnQgZGVmYXVsdCBpbW1pY2hcbiJdfQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1taWNoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ltbWljaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtQ0FBaUU7QUFDakUsMERBQXlCO0FBQ3pCLG1DQUE2QjtBQUU3QixNQUFNLE1BQU07SUFDVjs7O09BR0c7SUFDRyxPQUFPLENBQUUsUUFBZ0I7O1lBQzdCLE1BQU0sR0FBRyxHQUFHLE1BQU0sS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxHQUFHLE1BQU0sR0FBRyxRQUFRLEVBQUU7Z0JBQ2xFLE9BQU8sRUFBRTtvQkFDUCxXQUFXLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLElBQUksRUFBRTtpQkFDdkM7YUFDRixDQUFDLENBQUE7WUFDRixJQUFJLEdBQUcsQ0FBQyxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUM7Z0JBQ3ZCLE1BQU0sV0FBVyxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtnQkFDekQsSUFBSSxXQUFXLENBQUMsUUFBUSxDQUFDLGtCQUFrQixDQUFDLEVBQUUsQ0FBQztvQkFDN0MsT0FBTyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUE7Z0JBQ25CLENBQUM7cUJBQU0sQ0FBQztvQkFDTixPQUFPLEdBQUcsQ0FBQTtnQkFDWixDQUFDO1lBQ0gsQ0FBQztRQUNILENBQUM7S0FBQTtJQUVEOzs7Ozs7T0FNRztJQUNHLGFBQWEsQ0FBRSxHQUFXOztZQUM5QixNQUFNLEdBQUcsR0FBRyxDQUFDLENBQUEsTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQyxLQUFJLEVBQUUsQ0FBaUIsQ0FBQTtZQUN2RSxNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEdBQUcsS0FBSyxHQUFHLENBQUMsQ0FBQTtZQUN6QyxJQUFJLElBQUksRUFBRSxDQUFDO2dCQUNULDBDQUEwQztnQkFDMUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFBO2dCQUNuRCxJQUFJLElBQUksQ0FBQyxTQUFTLElBQUksSUFBQSxlQUFLLEVBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLElBQUEsZUFBSyxHQUFFLEVBQUUsQ0FBQztvQkFDdEQsd0JBQXdCO29CQUN4QixJQUFBLFdBQUcsRUFBQyxlQUFlLEdBQUcsR0FBRyxDQUFDLENBQUE7Z0JBQzVCLENBQUM7cUJBQU0sQ0FBQztvQkFDTixPQUFPLElBQUksQ0FBQTtnQkFDYixDQUFDO1lBQ0gsQ0FBQztRQUNILENBQUM7S0FBQTtJQUVEOzs7OztPQUtHO0lBQ0csY0FBYyxDQUFFLEtBQVksRUFBRSxJQUFnQjs7WUFDbEQsUUFBUSxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ25CLEtBQUssaUJBQVMsQ0FBQyxLQUFLO29CQUNsQixJQUFJLEdBQUcsSUFBSSxLQUFLLGlCQUFTLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxpQkFBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsaUJBQVMsQ0FBQyxRQUFRLENBQUE7b0JBQzlFLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsa0JBQWtCLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEdBQUcsR0FBRyxJQUFJLENBQUMsQ0FBQTtnQkFDN0UsS0FBSyxpQkFBUyxDQUFDLEtBQUs7b0JBQ2xCLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLEdBQUcsa0JBQWtCLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxHQUFHLGlCQUFpQixDQUFDLENBQUE7WUFDdEYsQ0FBQztRQUNILENBQUM7S0FBQTtJQUVEOztPQUVHO0lBQ0csY0FBYyxDQUFFLEtBQVk7O1lBQ2hDLE1BQU0sV0FBVyxHQUFHLE1BQU0sSUFBSSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtZQUNwRCxPQUFPLFdBQVcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxDQUFBO1FBQ2hELENBQUM7S0FBQTtJQUVEOztPQUVHO0lBQ0gsUUFBUSxDQUFFLEdBQVcsRUFBRSxFQUFVLEVBQUUsSUFBZ0I7UUFDakQsT0FBTyxVQUFVLEdBQUcsSUFBSSxFQUFFLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDOUQsQ0FBQztJQUVEOztPQUVHO0lBQ0gsUUFBUSxDQUFFLEdBQVcsRUFBRSxFQUFVO1FBQy9CLE9BQU8sVUFBVSxHQUFHLElBQUksRUFBRSxFQUFFLENBQUE7SUFDOUIsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSSxDQUFFLEVBQVU7UUFDZCxPQUFPLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLGdFQUFnRSxDQUFDLENBQUE7SUFDckYsQ0FBQztJQUVEOztPQUVHO0lBQ0gsS0FBSyxDQUFFLEdBQVc7UUFDaEIsT0FBTyxDQUFDLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBQTtJQUNoQyxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE1BQU0sR0FBRyxJQUFJLE1BQU0sRUFBRSxDQUFBO0FBRTNCLGtCQUFlLE1BQU0sQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFzc2V0LCBBc3NldFR5cGUsIEltYWdlU2l6ZSwgU2hhcmVkTGluayB9IGZyb20gJy4vdHlwZXMnXG5pbXBvcnQgZGF5anMgZnJvbSAnZGF5anMnXG5pbXBvcnQgeyBsb2cgfSBmcm9tICcuL2luZGV4J1xuXG5jbGFzcyBJbW1pY2gge1xuICAvKipcbiAgICogTWFrZSBhIHJlcXVlc3QgdG8gSW1taWNoIEFQSS4gV2UncmUgbm90IHVzaW5nIHRoZSBTREsgdG8gbGltaXRcbiAgICogdGhlIHBvc3NpYmxlIGF0dGFjayBzdXJmYWNlIG9mIHRoaXMgYXBwLlxuICAgKi9cbiAgYXN5bmMgcmVxdWVzdCAoZW5kcG9pbnQ6IHN0cmluZykge1xuICAgIGNvbnN0IHJlcyA9IGF3YWl0IGZldGNoKHByb2Nlc3MuZW52LklNTUlDSF9VUkwgKyAnL2FwaScgKyBlbmRwb2ludCwge1xuICAgICAgaGVhZGVyczoge1xuICAgICAgICAneC1hcGkta2V5JzogcHJvY2Vzcy5lbnYuQVBJX0tFWSB8fCAnJ1xuICAgICAgfVxuICAgIH0pXG4gICAgaWYgKHJlcy5zdGF0dXMgPT09IDIwMCkge1xuICAgICAgY29uc3QgY29udGVudFR5cGUgPSByZXMuaGVhZGVycy5nZXQoJ0NvbnRlbnQtVHlwZScpIHx8ICcnXG4gICAgICBpZiAoY29udGVudFR5cGUuaW5jbHVkZXMoJ2FwcGxpY2F0aW9uL2pzb24nKSkge1xuICAgICAgICByZXR1cm4gcmVzLmpzb24oKVxuICAgICAgfSBlbHNlIHtcbiAgICAgICAgcmV0dXJuIHJlc1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIC8qKlxuICAgKiBRdWVyeSBJbW1pY2ggZm9yIHRoZSBTaGFyZWRMaW5rIG1ldGFkYXRhIGZvciBhIGdpdmVuIGtleS5cbiAgICogVGhlIGtleSBpcyB3aGF0IGlzIHJldHVybmVkIGluIHRoZSBVUkwgd2hlbiB5b3UgY3JlYXRlIGEgc2hhcmUgaW4gSW1taWNoLlxuICAgKlxuICAgKiBJbW1pY2ggZG9lc24ndCBoYXZlIGEgbWV0aG9kIHRvIHF1ZXJ5IGJ5IGtleSwgc28gdGhpcyBtZXRob2QgZ2V0cyBhbGxcbiAgICoga25vd24gc2hhcmVkIGxpbmtzLCBhbmQgcmV0dXJucyB0aGUgbGluayB3aGljaCBtYXRjaGVzIHRoZSBwcm92aWRlZCBrZXkuXG4gICAqL1xuICBhc3luYyBnZXRTaGFyZUJ5S2V5IChrZXk6IHN0cmluZykge1xuICAgIGNvbnN0IHJlcyA9IChhd2FpdCB0aGlzLnJlcXVlc3QoJy9zaGFyZWQtbGlua3MnKSB8fCBbXSkgYXMgU2hhcmVkTGlua1tdXG4gICAgY29uc3QgbGluayA9IHJlcy5maW5kKHggPT4geC5rZXkgPT09IGtleSlcbiAgICBpZiAobGluaykge1xuICAgICAgLy8gRmlsdGVyIGFzc2V0cyB0byBleGNsdWRlIHRyYXNoZWQgYXNzZXRzXG4gICAgICBsaW5rLmFzc2V0cyA9IGxpbmsuYXNzZXRzLmZpbHRlcih4ID0+ICF4LmlzVHJhc2hlZClcbiAgICAgIGlmIChsaW5rLmV4cGlyZXNBdCAmJiBkYXlqcyhsaW5rLmV4cGlyZXNBdCkgPCBkYXlqcygpKSB7XG4gICAgICAgIC8vIFRoaXMgbGluayBoYXMgZXhwaXJlZFxuICAgICAgICBsb2coJ0V4cGlyZWQgbGluayAnICsga2V5KVxuICAgICAgfSBlbHNlIHtcbiAgICAgICAgcmV0dXJuIGxpbmtcbiAgICAgIH1cbiAgICB9XG4gIH1cblxuICAvKipcbiAgICogU3RyZWFtIGFzc2V0IGJ1ZmZlciBkYXRhIGZyb20gSW1taWNoLlxuICAgKlxuICAgKiBGb3IgcGhvdG9zLCB5b3UgY2FuIHJlcXVlc3QgJ3RodW1ibmFpbCcgb3IgJ29yaWdpbmFsJyBzaXplLlxuICAgKiBGb3IgdmlkZW9zLCBpdCBpcyBJbW1pY2gncyBzdHJlYW1pbmcgcXVhbGl0eSwgbm90IHRoZSBvcmlnaW5hbCBxdWFsaXR5LlxuICAgKi9cbiAgYXN5bmMgZ2V0QXNzZXRCdWZmZXIgKGFzc2V0OiBBc3NldCwgc2l6ZT86IEltYWdlU2l6ZSkge1xuICAgIHN3aXRjaCAoYXNzZXQudHlwZSkge1xuICAgICAgY2FzZSBBc3NldFR5cGUuaW1hZ2U6XG4gICAgICAgIHNpemUgPSBzaXplID09PSBJbWFnZVNpemUudGh1bWJuYWlsID8gSW1hZ2VTaXplLnRodW1ibmFpbCA6IEltYWdlU2l6ZS5vcmlnaW5hbFxuICAgICAgICByZXR1cm4gdGhpcy5yZXF1ZXN0KCcvYXNzZXRzLycgKyBlbmNvZGVVUklDb21wb25lbnQoYXNzZXQuaWQpICsgJy8nICsgc2l6ZSlcbiAgICAgIGNhc2UgQXNzZXRUeXBlLnZpZGVvOlxuICAgICAgICByZXR1cm4gdGhpcy5yZXF1ZXN0KCcvYXNzZXRzLycgKyBlbmNvZGVVUklDb21wb25lbnQoYXNzZXQuaWQpICsgJy92aWRlby9wbGF5YmFjaycpXG4gICAgfVxuICB9XG5cbiAgLyoqXG4gICAqIEdldCB0aGUgY29udGVudC10eXBlIG9mIGFuIEltbWljaCBhc3NldFxuICAgKi9cbiAgYXN5bmMgZ2V0Q29udGVudFR5cGUgKGFzc2V0OiBBc3NldCkge1xuICAgIGNvbnN0IGFzc2V0QnVmZmVyID0gYXdhaXQgdGhpcy5nZXRBc3NldEJ1ZmZlcihhc3NldClcbiAgICByZXR1cm4gYXNzZXRCdWZmZXIuaGVhZGVycy5nZXQoJ0NvbnRlbnQtVHlwZScpXG4gIH1cblxuICAvKipcbiAgICogUmV0dXJuIHRoZSBpbWFnZSBkYXRhIFVSTCBmb3IgYSBwaG90b1xuICAgKi9cbiAgcGhvdG9VcmwgKGtleTogc3RyaW5nLCBpZDogc3RyaW5nLCBzaXplPzogSW1hZ2VTaXplKSB7XG4gICAgcmV0dXJuIGAvcGhvdG8vJHtrZXl9LyR7aWR9YCArIChzaXplID8gYD9zaXplPSR7c2l6ZX1gIDogJycpXG4gIH1cblxuICAvKipcbiAgICogUmV0dXJuIHRoZSB2aWRlbyBkYXRhIFVSTCBmb3IgYSB2aWRlb1xuICAgKi9cbiAgdmlkZW9VcmwgKGtleTogc3RyaW5nLCBpZDogc3RyaW5nKSB7XG4gICAgcmV0dXJuIGAvdmlkZW8vJHtrZXl9LyR7aWR9YFxuICB9XG5cbiAgLyoqXG4gICAqIENoZWNrIGlmIGEgcHJvdmlkZWQgSUQgbWF0Y2hlcyB0aGUgSW1taWNoIElEIGZvcm1hdFxuICAgKi9cbiAgaXNJZCAoaWQ6IHN0cmluZykge1xuICAgIHJldHVybiAhIWlkLm1hdGNoKC9eWzAtOWEtZl17OH0tWzAtOWEtZl17NH0tWzAtOWEtZl17NH0tWzAtOWEtZl17NH0tWzAtOWEtZl17MTJ9JC8pXG4gIH1cblxuICAvKipcbiAgICogQ2hlY2sgaWYgYSBwcm92aWRlZCBrZXkgbWF0Y2hlcyB0aGUgSW1taWNoIHNoYXJlZC1saW5rIGtleSBmb3JtYXRcbiAgICovXG4gIGlzS2V5IChrZXk6IHN0cmluZykge1xuICAgIHJldHVybiAhIWtleS5tYXRjaCgvXltcXHctXSskLylcbiAgfVxufVxuXG5jb25zdCBpbW1pY2ggPSBuZXcgSW1taWNoKClcblxuZXhwb3J0IGRlZmF1bHQgaW1taWNoXG4iXX0= \ No newline at end of file diff --git a/dist/index.js b/dist/index.js index 19272a0..a5ee77b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1,5 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +exports.log = void 0; const tslib_1 = require("tslib"); const express_1 = tslib_1.__importDefault(require("express")); const immich_1 = tslib_1.__importDefault(require("./immich")); @@ -15,25 +16,26 @@ const getSize = (req) => { return ((_a = req === null || req === void 0 ? void 0 : req.query) === null || _a === void 0 ? void 0 : _a.size) === 'thumbnail' ? types_1.ImageSize.thumbnail : types_1.ImageSize.original; }; const log = (message) => console.log((0, dayjs_1.default)().format() + ' ' + message); +exports.log = log; app.get('/share/:key', (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, function* () { res.set('Cache-Control', 'public, max-age=' + process.env.CACHE_AGE); if (!immich_1.default.isKey(req.params.key)) { - log('Invalid share key ' + req.params.key); + (0, exports.log)('Invalid share key ' + req.params.key); res.status(404).send(); } else { const sharedLink = yield immich_1.default.getShareByKey(req.params.key); if (!sharedLink) { - log('Unknown share key ' + req.params.key); + (0, exports.log)('Unknown share key ' + req.params.key); res.status(404).send(); } else if (!sharedLink.assets.length) { - log('No assets for key ' + req.params.key); + (0, exports.log)('No assets for key ' + req.params.key); res.status(404).send(); } else if (sharedLink.assets.length === 1) { // This is an individual item (not a gallery) - log('Serving link ' + req.params.key); + (0, exports.log)('Serving link ' + req.params.key); const asset = sharedLink.assets[0]; if (asset.type === types_1.AssetType.image) { // For photos, output the image directly @@ -46,7 +48,7 @@ app.get('/share/:key', (req, res) => tslib_1.__awaiter(void 0, void 0, void 0, f } else { // Multiple images - render as a gallery - log('Serving link ' + req.params.key); + (0, exports.log)('Serving link ' + req.params.key); yield render_1.default.gallery(res, sharedLink); } } @@ -68,15 +70,15 @@ app.get('/:type(photo|video)/:key/:id', (req, res) => tslib_1.__awaiter(void 0, } } } - log('No asset found for ' + req.path); + (0, exports.log)('No asset found for ' + req.path); res.status(404).send(); })); // Send a 404 for all other unmatched routes app.get('*', (req, res) => { - log('Invalid route ' + req.path); + (0, exports.log)('Invalid route ' + req.path); res.status(404).send(); }); app.listen(3000, () => { console.log((0, dayjs_1.default)().format() + ' Server started'); }); -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import express from 'express'\nimport immich from './immich'\nimport render from './render'\nimport dayjs from 'dayjs'\nimport { AssetType, ImageSize } from './types'\nimport { Request } from 'express-serve-static-core'\n\nrequire('dotenv').config()\n\nconst app = express()\napp.set('view engine', 'ejs')\napp.use(express.static('public'))\n\nconst getSize = (req: Request) => {\n  return req?.query?.size === 'thumbnail' ? ImageSize.thumbnail : ImageSize.original\n}\n\nconst log = (message: string) => console.log(dayjs().format() + ' ' + message)\n\napp.get('/share/:key', async (req, res) => {\n  res.set('Cache-Control', 'public, max-age=' + process.env.CACHE_AGE)\n  if (!immich.isKey(req.params.key)) {\n    log('Invalid share key ' + req.params.key)\n    res.status(404).send()\n  } else {\n    const sharedLink = await immich.getShareByKey(req.params.key)\n    if (!sharedLink) {\n      log('Unknown share key ' + req.params.key)\n      res.status(404).send()\n    } else if (!sharedLink.assets.length) {\n      log('No assets for key ' + req.params.key)\n      res.status(404).send()\n    } else if (sharedLink.assets.length === 1) {\n      // This is an individual item (not a gallery)\n      log('Serving link ' + req.params.key)\n      const asset = sharedLink.assets[0]\n      if (asset.type === AssetType.image) {\n        // For photos, output the image directly\n        await render.assetBuffer(res, sharedLink.assets[0], getSize(req))\n      } else if (asset.type === AssetType.video) {\n        // For videos, show the video as a web player\n        await render.gallery(res, sharedLink, 1)\n      }\n    } else {\n      // Multiple images - render as a gallery\n      log('Serving link ' + req.params.key)\n      await render.gallery(res, sharedLink)\n    }\n  }\n})\n\n// Output the buffer data for an photo or video\napp.get('/:type(photo|video)/:key/:id', async (req, res) => {\n  res.set('Cache-Control', 'public, max-age=' + process.env.CACHE_AGE)\n  // Check for valid key and ID\n  if (immich.isKey(req.params.key) && immich.isId(req.params.id)) {\n    // Check if the key is a valid share link\n    const sharedLink = await immich.getShareByKey(req.params.key)\n    if (sharedLink?.assets.length) {\n      // Check that the requested asset exists in this share\n      const asset = sharedLink.assets.find(x => x.id === req.params.id)\n      if (asset) {\n        asset.type = req.params.type === 'video' ? AssetType.video : AssetType.image\n        render.assetBuffer(res, asset, getSize(req)).then()\n        return\n      }\n    }\n  }\n  log('No asset found for ' + req.path)\n  res.status(404).send()\n})\n\n// Send a 404 for all other unmatched routes\napp.get('*', (req, res) => {\n  log('Invalid route ' + req.path)\n  res.status(404).send()\n})\n\napp.listen(3000, () => {\n  console.log(dayjs().format() + ' Server started')\n})\n"]} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import express from 'express'\nimport immich from './immich'\nimport render from './render'\nimport dayjs from 'dayjs'\nimport { AssetType, ImageSize } from './types'\nimport { Request } from 'express-serve-static-core'\n\nrequire('dotenv').config()\n\nconst app = express()\napp.set('view engine', 'ejs')\napp.use(express.static('public'))\n\nconst getSize = (req: Request) => {\n  return req?.query?.size === 'thumbnail' ? ImageSize.thumbnail : ImageSize.original\n}\n\nexport const log = (message: string) => console.log(dayjs().format() + ' ' + message)\n\napp.get('/share/:key', async (req, res) => {\n  res.set('Cache-Control', 'public, max-age=' + process.env.CACHE_AGE)\n  if (!immich.isKey(req.params.key)) {\n    log('Invalid share key ' + req.params.key)\n    res.status(404).send()\n  } else {\n    const sharedLink = await immich.getShareByKey(req.params.key)\n    if (!sharedLink) {\n      log('Unknown share key ' + req.params.key)\n      res.status(404).send()\n    } else if (!sharedLink.assets.length) {\n      log('No assets for key ' + req.params.key)\n      res.status(404).send()\n    } else if (sharedLink.assets.length === 1) {\n      // This is an individual item (not a gallery)\n      log('Serving link ' + req.params.key)\n      const asset = sharedLink.assets[0]\n      if (asset.type === AssetType.image) {\n        // For photos, output the image directly\n        await render.assetBuffer(res, sharedLink.assets[0], getSize(req))\n      } else if (asset.type === AssetType.video) {\n        // For videos, show the video as a web player\n        await render.gallery(res, sharedLink, 1)\n      }\n    } else {\n      // Multiple images - render as a gallery\n      log('Serving link ' + req.params.key)\n      await render.gallery(res, sharedLink)\n    }\n  }\n})\n\n// Output the buffer data for an photo or video\napp.get('/:type(photo|video)/:key/:id', async (req, res) => {\n  res.set('Cache-Control', 'public, max-age=' + process.env.CACHE_AGE)\n  // Check for valid key and ID\n  if (immich.isKey(req.params.key) && immich.isId(req.params.id)) {\n    // Check if the key is a valid share link\n    const sharedLink = await immich.getShareByKey(req.params.key)\n    if (sharedLink?.assets.length) {\n      // Check that the requested asset exists in this share\n      const asset = sharedLink.assets.find(x => x.id === req.params.id)\n      if (asset) {\n        asset.type = req.params.type === 'video' ? AssetType.video : AssetType.image\n        render.assetBuffer(res, asset, getSize(req)).then()\n        return\n      }\n    }\n  }\n  log('No asset found for ' + req.path)\n  res.status(404).send()\n})\n\n// Send a 404 for all other unmatched routes\napp.get('*', (req, res) => {\n  log('Invalid route ' + req.path)\n  res.status(404).send()\n})\n\napp.listen(3000, () => {\n  console.log(dayjs().format() + ' Server started')\n})\n"]} \ No newline at end of file diff --git a/src/immich.ts b/src/immich.ts index 3e3d4a2..82207f6 100644 --- a/src/immich.ts +++ b/src/immich.ts @@ -1,5 +1,6 @@ import { Asset, AssetType, ImageSize, SharedLink } from './types' import dayjs from 'dayjs' +import { log } from './index' class Immich { /** @@ -37,6 +38,7 @@ class Immich { link.assets = link.assets.filter(x => !x.isTrashed) if (link.expiresAt && dayjs(link.expiresAt) < dayjs()) { // This link has expired + log('Expired link ' + key) } else { return link } diff --git a/src/index.ts b/src/index.ts index c245a77..d72d12f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -15,7 +15,7 @@ const getSize = (req: Request) => { return req?.query?.size === 'thumbnail' ? ImageSize.thumbnail : ImageSize.original } -const log = (message: string) => console.log(dayjs().format() + ' ' + message) +export const log = (message: string) => console.log(dayjs().format() + ' ' + message) app.get('/share/:key', async (req, res) => { res.set('Cache-Control', 'public, max-age=' + process.env.CACHE_AGE)