diff --git a/dist/immich.js b/dist/immich.js index 00757e3..9baa255 100644 --- a/dist/immich.js +++ b/dist/immich.js @@ -40,16 +40,25 @@ class Immich { */ getShareByKey(key) { return tslib_1.__awaiter(this, void 0, void 0, function* () { + var _a; const res = ((yield this.request('/shared-links')) || []); const link = res.find(x => x.key === key); if (link) { - // Filter assets to exclude trashed assets - 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 { + if (link.type === 'ALBUM') { + // Fetch the assets from the album and populate the SharedLink assets array + const albumId = (_a = link.album) === null || _a === void 0 ? void 0 : _a.id; + if (albumId) { + const album = (yield this.request('/albums/' + encodeURIComponent(albumId))); + link.assets = album.assets || []; + } + } + // Filter assets to exclude trashed assets + link.assets = link.assets.filter(x => !x.isTrashed); return link; } } @@ -108,4 +117,4 @@ class Immich { } const immich = new Immich(); exports.default = immich; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1taWNoLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ltbWljaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtQ0FBaUU7QUFDakUsMERBQXlCO0FBQ3pCLG1DQUE2QjtBQUU3QixNQUFNLE1BQU07SUFDVjs7O09BR0c7SUFDRyxPQUFPLENBQUUsUUFBZ0I7O1lBQzdCLE1BQU0sR0FBRyxHQUFHLE1BQU0sS0FBSyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxHQUFHLE1BQU0sR0FBRyxRQUFRLEVBQUU7Z0JBQ2xFLE9BQU8sRUFBRTtvQkFDUCxXQUFXLEVBQUUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLElBQUksRUFBRTtpQkFDdkM7YUFDRixDQUFDLENBQUE7WUFDRixJQUFJLEdBQUcsQ0FBQyxNQUFNLEtBQUssR0FBRyxFQUFFLENBQUM7Z0JBQ3ZCLE1BQU0sV0FBVyxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtnQkFDekQsSUFBSSxXQUFXLENBQUMsUUFBUSxDQUFDLGtCQUFrQixDQUFDLEVBQUUsQ0FBQztvQkFDN0MsT0FBTyxHQUFHLENBQUMsSUFBSSxFQUFFLENBQUE7Z0JBQ25CLENBQUM7cUJBQU0sQ0FBQztvQkFDTixPQUFPLEdBQUcsQ0FBQTtnQkFDWixDQUFDO1lBQ0gsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLElBQUEsV0FBRyxFQUFDLG9CQUFvQixHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQTtnQkFDdEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFBO1lBQy9CLENBQUM7UUFDSCxDQUFDO0tBQUE7SUFFRDs7Ozs7O09BTUc7SUFDRyxhQUFhLENBQUUsR0FBVzs7WUFDOUIsTUFBTSxHQUFHLEdBQUcsQ0FBQyxDQUFBLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLENBQUMsS0FBSSxFQUFFLENBQWlCLENBQUE7WUFDdkUsTUFBTSxJQUFJLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLEtBQUssR0FBRyxDQUFDLENBQUE7WUFDekMsSUFBSSxJQUFJLEVBQUUsQ0FBQztnQkFDVCwwQ0FBMEM7Z0JBQzFDLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQTtnQkFDbkQsSUFBSSxJQUFJLENBQUMsU0FBUyxJQUFJLElBQUEsZUFBSyxFQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsR0FBRyxJQUFBLGVBQUssR0FBRSxFQUFFLENBQUM7b0JBQ3RELHdCQUF3QjtvQkFDeEIsSUFBQSxXQUFHLEVBQUMsZUFBZSxHQUFHLEdBQUcsQ0FBQyxDQUFBO2dCQUM1QixDQUFDO3FCQUFNLENBQUM7b0JBQ04sT0FBTyxJQUFJLENBQUE7Z0JBQ2IsQ0FBQztZQUNILENBQUM7UUFDSCxDQUFDO0tBQUE7SUFFRDs7Ozs7T0FLRztJQUNHLGNBQWMsQ0FBRSxLQUFZLEVBQUUsSUFBZ0I7O1lBQ2xELFFBQVEsS0FBSyxDQUFDLElBQUksRUFBRSxDQUFDO2dCQUNuQixLQUFLLGlCQUFTLENBQUMsS0FBSztvQkFDbEIsSUFBSSxHQUFHLElBQUksS0FBSyxpQkFBUyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsaUJBQVMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLGlCQUFTLENBQUMsUUFBUSxDQUFBO29CQUM5RSxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxHQUFHLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsR0FBRyxHQUFHLEdBQUcsSUFBSSxDQUFDLENBQUE7Z0JBQzdFLEtBQUssaUJBQVMsQ0FBQyxLQUFLO29CQUNsQixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxHQUFHLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsR0FBRyxpQkFBaUIsQ0FBQyxDQUFBO1lBQ3RGLENBQUM7UUFDSCxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNHLGNBQWMsQ0FBRSxLQUFZOztZQUNoQyxNQUFNLFdBQVcsR0FBRyxNQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUE7WUFDcEQsT0FBTyxXQUFXLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQTtRQUNoRCxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNILFFBQVEsQ0FBRSxHQUFXLEVBQUUsRUFBVSxFQUFFLElBQWdCO1FBQ2pELE9BQU8sVUFBVSxHQUFHLElBQUksRUFBRSxFQUFFLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFNBQVMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQzlELENBQUM7SUFFRDs7T0FFRztJQUNILFFBQVEsQ0FBRSxHQUFXLEVBQUUsRUFBVTtRQUMvQixPQUFPLFVBQVUsR0FBRyxJQUFJLEVBQUUsRUFBRSxDQUFBO0lBQzlCLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksQ0FBRSxFQUFVO1FBQ2QsT0FBTyxDQUFDLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxnRUFBZ0UsQ0FBQyxDQUFBO0lBQ3JGLENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssQ0FBRSxHQUFXO1FBQ2hCLE9BQU8sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQUE7SUFDaEMsQ0FBQztDQUNGO0FBRUQsTUFBTSxNQUFNLEdBQUcsSUFBSSxNQUFNLEVBQUUsQ0FBQTtBQUUzQixrQkFBZSxNQUFNLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBBc3NldCwgQXNzZXRUeXBlLCBJbWFnZVNpemUsIFNoYXJlZExpbmsgfSBmcm9tICcuL3R5cGVzJ1xuaW1wb3J0IGRheWpzIGZyb20gJ2RheWpzJ1xuaW1wb3J0IHsgbG9nIH0gZnJvbSAnLi9pbmRleCdcblxuY2xhc3MgSW1taWNoIHtcbiAgLyoqXG4gICAqIE1ha2UgYSByZXF1ZXN0IHRvIEltbWljaCBBUEkuIFdlJ3JlIG5vdCB1c2luZyB0aGUgU0RLIHRvIGxpbWl0XG4gICAqIHRoZSBwb3NzaWJsZSBhdHRhY2sgc3VyZmFjZSBvZiB0aGlzIGFwcC5cbiAgICovXG4gIGFzeW5jIHJlcXVlc3QgKGVuZHBvaW50OiBzdHJpbmcpIHtcbiAgICBjb25zdCByZXMgPSBhd2FpdCBmZXRjaChwcm9jZXNzLmVudi5JTU1JQ0hfVVJMICsgJy9hcGknICsgZW5kcG9pbnQsIHtcbiAgICAgIGhlYWRlcnM6IHtcbiAgICAgICAgJ3gtYXBpLWtleSc6IHByb2Nlc3MuZW52LkFQSV9LRVkgfHwgJydcbiAgICAgIH1cbiAgICB9KVxuICAgIGlmIChyZXMuc3RhdHVzID09PSAyMDApIHtcbiAgICAgIGNvbnN0IGNvbnRlbnRUeXBlID0gcmVzLmhlYWRlcnMuZ2V0KCdDb250ZW50LVR5cGUnKSB8fCAnJ1xuICAgICAgaWYgKGNvbnRlbnRUeXBlLmluY2x1ZGVzKCdhcHBsaWNhdGlvbi9qc29uJykpIHtcbiAgICAgICAgcmV0dXJuIHJlcy5qc29uKClcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHJldHVybiByZXNcbiAgICAgIH1cbiAgICB9IGVsc2Uge1xuICAgICAgbG9nKCdJbW1pY2ggQVBJIHN0YXR1cyAnICsgcmVzLnN0YXR1cylcbiAgICAgIGNvbnNvbGUubG9nKGF3YWl0IHJlcy50ZXh0KCkpXG4gICAgfVxuICB9XG5cbiAgLyoqXG4gICAqIFF1ZXJ5IEltbWljaCBmb3IgdGhlIFNoYXJlZExpbmsgbWV0YWRhdGEgZm9yIGEgZ2l2ZW4ga2V5LlxuICAgKiBUaGUga2V5IGlzIHdoYXQgaXMgcmV0dXJuZWQgaW4gdGhlIFVSTCB3aGVuIHlvdSBjcmVhdGUgYSBzaGFyZSBpbiBJbW1pY2guXG4gICAqXG4gICAqIEltbWljaCBkb2Vzbid0IGhhdmUgYSBtZXRob2QgdG8gcXVlcnkgYnkga2V5LCBzbyB0aGlzIG1ldGhvZCBnZXRzIGFsbFxuICAgKiBrbm93biBzaGFyZWQgbGlua3MsIGFuZCByZXR1cm5zIHRoZSBsaW5rIHdoaWNoIG1hdGNoZXMgdGhlIHByb3ZpZGVkIGtleS5cbiAgICovXG4gIGFzeW5jIGdldFNoYXJlQnlLZXkgKGtleTogc3RyaW5nKSB7XG4gICAgY29uc3QgcmVzID0gKGF3YWl0IHRoaXMucmVxdWVzdCgnL3NoYXJlZC1saW5rcycpIHx8IFtdKSBhcyBTaGFyZWRMaW5rW11cbiAgICBjb25zdCBsaW5rID0gcmVzLmZpbmQoeCA9PiB4LmtleSA9PT0ga2V5KVxuICAgIGlmIChsaW5rKSB7XG4gICAgICAvLyBGaWx0ZXIgYXNzZXRzIHRvIGV4Y2x1ZGUgdHJhc2hlZCBhc3NldHNcbiAgICAgIGxpbmsuYXNzZXRzID0gbGluay5hc3NldHMuZmlsdGVyKHggPT4gIXguaXNUcmFzaGVkKVxuICAgICAgaWYgKGxpbmsuZXhwaXJlc0F0ICYmIGRheWpzKGxpbmsuZXhwaXJlc0F0KSA8IGRheWpzKCkpIHtcbiAgICAgICAgLy8gVGhpcyBsaW5rIGhhcyBleHBpcmVkXG4gICAgICAgIGxvZygnRXhwaXJlZCBsaW5rICcgKyBrZXkpXG4gICAgICB9IGVsc2Uge1xuICAgICAgICByZXR1cm4gbGlua1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIC8qKlxuICAgKiBTdHJlYW0gYXNzZXQgYnVmZmVyIGRhdGEgZnJvbSBJbW1pY2guXG4gICAqXG4gICAqIEZvciBwaG90b3MsIHlvdSBjYW4gcmVxdWVzdCAndGh1bWJuYWlsJyBvciAnb3JpZ2luYWwnIHNpemUuXG4gICAqIEZvciB2aWRlb3MsIGl0IGlzIEltbWljaCdzIHN0cmVhbWluZyBxdWFsaXR5LCBub3QgdGhlIG9yaWdpbmFsIHF1YWxpdHkuXG4gICAqL1xuICBhc3luYyBnZXRBc3NldEJ1ZmZlciAoYXNzZXQ6IEFzc2V0LCBzaXplPzogSW1hZ2VTaXplKSB7XG4gICAgc3dpdGNoIChhc3NldC50eXBlKSB7XG4gICAgICBjYXNlIEFzc2V0VHlwZS5pbWFnZTpcbiAgICAgICAgc2l6ZSA9IHNpemUgPT09IEltYWdlU2l6ZS50aHVtYm5haWwgPyBJbWFnZVNpemUudGh1bWJuYWlsIDogSW1hZ2VTaXplLm9yaWdpbmFsXG4gICAgICAgIHJldHVybiB0aGlzLnJlcXVlc3QoJy9hc3NldHMvJyArIGVuY29kZVVSSUNvbXBvbmVudChhc3NldC5pZCkgKyAnLycgKyBzaXplKVxuICAgICAgY2FzZSBBc3NldFR5cGUudmlkZW86XG4gICAgICAgIHJldHVybiB0aGlzLnJlcXVlc3QoJy9hc3NldHMvJyArIGVuY29kZVVSSUNvbXBvbmVudChhc3NldC5pZCkgKyAnL3ZpZGVvL3BsYXliYWNrJylcbiAgICB9XG4gIH1cblxuICAvKipcbiAgICogR2V0IHRoZSBjb250ZW50LXR5cGUgb2YgYW4gSW1taWNoIGFzc2V0XG4gICAqL1xuICBhc3luYyBnZXRDb250ZW50VHlwZSAoYXNzZXQ6IEFzc2V0KSB7XG4gICAgY29uc3QgYXNzZXRCdWZmZXIgPSBhd2FpdCB0aGlzLmdldEFzc2V0QnVmZmVyKGFzc2V0KVxuICAgIHJldHVybiBhc3NldEJ1ZmZlci5oZWFkZXJzLmdldCgnQ29udGVudC1UeXBlJylcbiAgfVxuXG4gIC8qKlxuICAgKiBSZXR1cm4gdGhlIGltYWdlIGRhdGEgVVJMIGZvciBhIHBob3RvXG4gICAqL1xuICBwaG90b1VybCAoa2V5OiBzdHJpbmcsIGlkOiBzdHJpbmcsIHNpemU/OiBJbWFnZVNpemUpIHtcbiAgICByZXR1cm4gYC9waG90by8ke2tleX0vJHtpZH1gICsgKHNpemUgPyBgP3NpemU9JHtzaXplfWAgOiAnJylcbiAgfVxuXG4gIC8qKlxuICAgKiBSZXR1cm4gdGhlIHZpZGVvIGRhdGEgVVJMIGZvciBhIHZpZGVvXG4gICAqL1xuICB2aWRlb1VybCAoa2V5OiBzdHJpbmcsIGlkOiBzdHJpbmcpIHtcbiAgICByZXR1cm4gYC92aWRlby8ke2tleX0vJHtpZH1gXG4gIH1cblxuICAvKipcbiAgICogQ2hlY2sgaWYgYSBwcm92aWRlZCBJRCBtYXRjaGVzIHRoZSBJbW1pY2ggSUQgZm9ybWF0XG4gICAqL1xuICBpc0lkIChpZDogc3RyaW5nKSB7XG4gICAgcmV0dXJuICEhaWQubWF0Y2goL15bMC05YS1mXXs4fS1bMC05YS1mXXs0fS1bMC05YS1mXXs0fS1bMC05YS1mXXs0fS1bMC05YS1mXXsxMn0kLylcbiAgfVxuXG4gIC8qKlxuICAgKiBDaGVjayBpZiBhIHByb3ZpZGVkIGtleSBtYXRjaGVzIHRoZSBJbW1pY2ggc2hhcmVkLWxpbmsga2V5IGZvcm1hdFxuICAgKi9cbiAgaXNLZXkgKGtleTogc3RyaW5nKSB7XG4gICAgcmV0dXJuICEha2V5Lm1hdGNoKC9eW1xcdy1dKyQvKVxuICB9XG59XG5cbmNvbnN0IGltbWljaCA9IG5ldyBJbW1pY2goKVxuXG5leHBvcnQgZGVmYXVsdCBpbW1pY2hcbiJdfQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"immich.js","sourceRoot":"","sources":["../src/immich.ts"],"names":[],"mappings":";;;AAAA,mCAAwE;AACxE,0DAAyB;AACzB,mCAA6B;AAE7B,MAAM,MAAM;IACV;;;OAGG;IACG,OAAO,CAAE,QAAgB;;YAC7B,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,MAAM,GAAG,QAAQ,EAAE;gBAClE,OAAO,EAAE;oBACP,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE;iBACvC;aACF,CAAC,CAAA;YACF,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACvB,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAA;gBACzD,IAAI,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;oBAC7C,OAAO,GAAG,CAAC,IAAI,EAAE,CAAA;gBACnB,CAAC;qBAAM,CAAC;oBACN,OAAO,GAAG,CAAA;gBACZ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,IAAA,WAAG,EAAC,oBAAoB,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;gBACtC,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC;KAAA;IAED;;;;;;OAMG;IACG,aAAa,CAAE,GAAW;;;YAC9B,MAAM,GAAG,GAAG,CAAC,CAAA,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,KAAI,EAAE,CAAiB,CAAA;YACvE,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,CAAA;YACzC,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,IAAI,CAAC,SAAS,IAAI,IAAA,eAAK,EAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAA,eAAK,GAAE,EAAE,CAAC;oBACtD,wBAAwB;oBACxB,IAAA,WAAG,EAAC,eAAe,GAAG,GAAG,CAAC,CAAA;gBAC5B,CAAC;qBAAM,CAAC;oBACN,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBAC1B,2EAA2E;wBAC3E,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,EAAE,CAAA;wBAC9B,IAAI,OAAO,EAAE,CAAC;4BACZ,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAU,CAAA;4BACrF,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAA;wBAClC,CAAC;oBACH,CAAC;oBACD,0CAA0C;oBAC1C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;oBACnD,OAAO,IAAI,CAAA;gBACb,CAAC;YACH,CAAC;QACH,CAAC;KAAA;IAED;;;;;OAKG;IACG,cAAc,CAAE,KAAY,EAAE,IAAgB;;YAClD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;gBACnB,KAAK,iBAAS,CAAC,KAAK;oBAClB,IAAI,GAAG,IAAI,KAAK,iBAAS,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAS,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAS,CAAC,QAAQ,CAAA;oBAC9E,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAA;gBAC7E,KAAK,iBAAS,CAAC,KAAK;oBAClB,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,CAAA;YACtF,CAAC;QACH,CAAC;KAAA;IAED;;OAEG;IACG,cAAc,CAAE,KAAY;;YAChC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;YACpD,OAAO,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;QAChD,CAAC;KAAA;IAED;;OAEG;IACH,QAAQ,CAAE,GAAW,EAAE,EAAU,EAAE,IAAgB;QACjD,OAAO,UAAU,GAAG,IAAI,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAC9D,CAAC;IAED;;OAEG;IACH,QAAQ,CAAE,GAAW,EAAE,EAAU;QAC/B,OAAO,UAAU,GAAG,IAAI,EAAE,EAAE,CAAA;IAC9B,CAAC;IAED;;OAEG;IACH,IAAI,CAAE,EAAU;QACd,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,gEAAgE,CAAC,CAAA;IACrF,CAAC;IAED;;OAEG;IACH,KAAK,CAAE,GAAW;QAChB,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IAChC,CAAC;CACF;AAED,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA;AAE3B,kBAAe,MAAM,CAAA","sourcesContent":["import { Album, Asset, AssetType, ImageSize, SharedLink } from './types'\nimport dayjs from 'dayjs'\nimport { log } from './index'\n\nclass Immich {\n  /**\n   * Make a request to Immich API. We're not using the SDK to limit\n   * the possible attack surface of this app.\n   */\n  async request (endpoint: string) {\n    const res = await fetch(process.env.IMMICH_URL + '/api' + endpoint, {\n      headers: {\n        'x-api-key': process.env.API_KEY || ''\n      }\n    })\n    if (res.status === 200) {\n      const contentType = res.headers.get('Content-Type') || ''\n      if (contentType.includes('application/json')) {\n        return res.json()\n      } else {\n        return res\n      }\n    } else {\n      log('Immich API status ' + res.status)\n      console.log(await res.text())\n    }\n  }\n\n  /**\n   * Query Immich for the SharedLink metadata for a given key.\n   * The key is what is returned in the URL when you create a share in Immich.\n   *\n   * Immich doesn't have a method to query by key, so this method gets all\n   * known shared links, and returns the link which matches the provided key.\n   */\n  async getShareByKey (key: string) {\n    const res = (await this.request('/shared-links') || []) as SharedLink[]\n    const link = res.find(x => x.key === key)\n    if (link) {\n      if (link.expiresAt && dayjs(link.expiresAt) < dayjs()) {\n        // This link has expired\n        log('Expired link ' + key)\n      } else {\n        if (link.type === 'ALBUM') {\n          // Fetch the assets from the album and populate the SharedLink assets array\n          const albumId = link.album?.id\n          if (albumId) {\n            const album = (await this.request('/albums/' + encodeURIComponent(albumId))) as Album\n            link.assets = album.assets || []\n          }\n        }\n        // Filter assets to exclude trashed assets\n        link.assets = link.assets.filter(x => !x.isTrashed)\n        return link\n      }\n    }\n  }\n\n  /**\n   * Stream asset buffer data from Immich.\n   *\n   * For photos, you can request 'thumbnail' or 'original' size.\n   * For videos, it is Immich's streaming quality, not the original quality.\n   */\n  async getAssetBuffer (asset: Asset, size?: ImageSize) {\n    switch (asset.type) {\n      case AssetType.image:\n        size = size === ImageSize.thumbnail ? ImageSize.thumbnail : ImageSize.original\n        return this.request('/assets/' + encodeURIComponent(asset.id) + '/' + size)\n      case AssetType.video:\n        return this.request('/assets/' + encodeURIComponent(asset.id) + '/video/playback')\n    }\n  }\n\n  /**\n   * Get the content-type of an Immich asset\n   */\n  async getContentType (asset: Asset) {\n    const assetBuffer = await this.getAssetBuffer(asset)\n    return assetBuffer.headers.get('Content-Type')\n  }\n\n  /**\n   * Return the image data URL for a photo\n   */\n  photoUrl (key: string, id: string, size?: ImageSize) {\n    return `/photo/${key}/${id}` + (size ? `?size=${size}` : '')\n  }\n\n  /**\n   * Return the video data URL for a video\n   */\n  videoUrl (key: string, id: string) {\n    return `/video/${key}/${id}`\n  }\n\n  /**\n   * Check if a provided ID matches the Immich ID format\n   */\n  isId (id: string) {\n    return !!id.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)\n  }\n\n  /**\n   * Check if a provided key matches the Immich shared-link key format\n   */\n  isKey (key: string) {\n    return !!key.match(/^[\\w-]+$/)\n  }\n}\n\nconst immich = new Immich()\n\nexport default immich\n"]} \ No newline at end of file diff --git a/dist/types.js b/dist/types.js index a14bfb7..fdf5409 100644 --- a/dist/types.js +++ b/dist/types.js @@ -11,4 +11,4 @@ var ImageSize; ImageSize["thumbnail"] = "thumbnail"; ImageSize["original"] = "original"; })(ImageSize || (exports.ImageSize = ImageSize = {})); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsSUFBWSxTQUdYO0FBSEQsV0FBWSxTQUFTO0lBQ25CLDRCQUFlLENBQUE7SUFDZiw0QkFBZSxDQUFBO0FBQ2pCLENBQUMsRUFIVyxTQUFTLHlCQUFULFNBQVMsUUFHcEI7QUFjRCxJQUFZLFNBR1g7QUFIRCxXQUFZLFNBQVM7SUFDbkIsb0NBQXVCLENBQUE7SUFDdkIsa0NBQXFCLENBQUE7QUFDdkIsQ0FBQyxFQUhXLFNBQVMseUJBQVQsU0FBUyxRQUdwQiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBlbnVtIEFzc2V0VHlwZSB7XG4gIGltYWdlID0gJ0lNQUdFJyxcbiAgdmlkZW8gPSAnVklERU8nXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQXNzZXQge1xuICBpZDogc3RyaW5nO1xuICB0eXBlOiBBc3NldFR5cGU7XG4gIGlzVHJhc2hlZDogYm9vbGVhbjtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBTaGFyZWRMaW5rIHtcbiAga2V5OiBzdHJpbmc7XG4gIGFzc2V0czogQXNzZXRbXTtcbiAgZXhwaXJlc0F0OiBzdHJpbmcgfCBudWxsO1xufVxuXG5leHBvcnQgZW51bSBJbWFnZVNpemUge1xuICB0aHVtYm5haWwgPSAndGh1bWJuYWlsJyxcbiAgb3JpZ2luYWwgPSAnb3JpZ2luYWwnXG59XG4iXX0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdHlwZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsSUFBWSxTQUdYO0FBSEQsV0FBWSxTQUFTO0lBQ25CLDRCQUFlLENBQUE7SUFDZiw0QkFBZSxDQUFBO0FBQ2pCLENBQUMsRUFIVyxTQUFTLHlCQUFULFNBQVMsUUFHcEI7QUFzQkQsSUFBWSxTQUdYO0FBSEQsV0FBWSxTQUFTO0lBQ25CLG9DQUF1QixDQUFBO0lBQ3ZCLGtDQUFxQixDQUFBO0FBQ3ZCLENBQUMsRUFIVyxTQUFTLHlCQUFULFNBQVMsUUFHcEIiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZW51bSBBc3NldFR5cGUge1xuICBpbWFnZSA9ICdJTUFHRScsXG4gIHZpZGVvID0gJ1ZJREVPJ1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEFzc2V0IHtcbiAgaWQ6IHN0cmluZztcbiAgdHlwZTogQXNzZXRUeXBlO1xuICBpc1RyYXNoZWQ6IGJvb2xlYW47XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgU2hhcmVkTGluayB7XG4gIGtleTogc3RyaW5nO1xuICB0eXBlOiBzdHJpbmc7XG4gIGFzc2V0czogQXNzZXRbXTtcbiAgYWxidW0/OiB7XG4gICAgaWQ6IHN0cmluZztcbiAgfVxuICBleHBpcmVzQXQ6IHN0cmluZyB8IG51bGw7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQWxidW0ge1xuICBhc3NldHM6IEFzc2V0W11cbn1cblxuZXhwb3J0IGVudW0gSW1hZ2VTaXplIHtcbiAgdGh1bWJuYWlsID0gJ3RodW1ibmFpbCcsXG4gIG9yaWdpbmFsID0gJ29yaWdpbmFsJ1xufVxuIl19 \ No newline at end of file diff --git a/src/immich.ts b/src/immich.ts index 4879e03..3228dd9 100644 --- a/src/immich.ts +++ b/src/immich.ts @@ -1,4 +1,4 @@ -import { Asset, AssetType, ImageSize, SharedLink } from './types' +import { Album, Asset, AssetType, ImageSize, SharedLink } from './types' import dayjs from 'dayjs' import { log } from './index' @@ -37,12 +37,20 @@ class Immich { const res = (await this.request('/shared-links') || []) as SharedLink[] const link = res.find(x => x.key === key) if (link) { - // Filter assets to exclude trashed assets - link.assets = link.assets.filter(x => !x.isTrashed) if (link.expiresAt && dayjs(link.expiresAt) < dayjs()) { // This link has expired log('Expired link ' + key) } else { + if (link.type === 'ALBUM') { + // Fetch the assets from the album and populate the SharedLink assets array + const albumId = link.album?.id + if (albumId) { + const album = (await this.request('/albums/' + encodeURIComponent(albumId))) as Album + link.assets = album.assets || [] + } + } + // Filter assets to exclude trashed assets + link.assets = link.assets.filter(x => !x.isTrashed) return link } } diff --git a/src/types.ts b/src/types.ts index 2a0b4a9..ceadb0b 100644 --- a/src/types.ts +++ b/src/types.ts @@ -11,10 +11,18 @@ export interface Asset { export interface SharedLink { key: string; + type: string; assets: Asset[]; + album?: { + id: string; + } expiresAt: string | null; } +export interface Album { + assets: Asset[] +} + export enum ImageSize { thumbnail = 'thumbnail', original = 'original'