High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(server): Postgres error pretty printing (#17204)
Brandon Weesd71c5602c398
diff --git a/server/package-lock.json b/server/package-lock.jsonindex bd27793d44..59074a2c6e 100644--- a/server/package-lock.json+++ b/server/package-lock.json@@ -7,6 +7,7 @@"": {"name": "immich","version": "1.130.3",+ "hasInstallScript": true,"license": "GNU Affero General Public License version 3","dependencies": {"@nestjs/bullmq": "^11.0.1",@@ -106,6 +107,7 @@"kysely-codegen": "^0.18.0","mock-fs": "^5.2.0","node-addon-api": "^8.3.0",+ "patch-package": "^8.0.0","pngjs": "^7.0.0","prettier": "^3.0.2","prettier-plugin-organize-imports": "^4.0.0",@@ -6617,6 +6619,13 @@"dev": true,"license": "Apache-2.0"},+ "node_modules/@yarnpkg/lockfile": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",+ "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",+ "dev": true,+ "license": "BSD-2-Clause"+ },"node_modules/abbrev": {"version": "1.1.1","resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",@@ -7083,6 +7092,16 @@"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==","license": "MIT"},+ "node_modules/at-least-node": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",+ "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",+ "dev": true,+ "license": "ISC",+ "engines": {+ "node": ">= 4.0.0"+ }+ },"node_modules/b4a": {"version": "1.6.7","resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",@@ -7526,6 +7545,25 @@"node": ">=8"}},+ "node_modules/call-bind": {+ "version": "1.0.8",+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",+ "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "call-bind-apply-helpers": "^1.0.0",+ "es-define-property": "^1.0.0",+ "get-intrinsic": "^1.2.4",+ "set-function-length": "^1.2.2"+ },+ "engines": {+ "node": ">= 0.4"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },"node_modules/call-bind-apply-helpers": {"version": "1.0.2","resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",@@ -8320,6 +8358,24 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/define-data-property": {+ "version": "1.1.4",+ "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",+ "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "es-define-property": "^1.0.0",+ "es-errors": "^1.3.0",+ "gopd": "^1.0.1"+ },+ "engines": {+ "node": ">= 0.4"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },"node_modules/delayed-stream": {"version": "1.0.0","resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",@@ -9617,6 +9673,16 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/find-yarn-workspace-root": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",+ "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",+ "dev": true,+ "license": "Apache-2.0",+ "dependencies": {+ "micromatch": "^4.0.2"+ }+ },"node_modules/find-up-simple": {"version": "1.0.1","resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.1.tgz",@@ -10328,6 +10394,19 @@"node": ">=8"}},+ "node_modules/has-property-descriptors": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",+ "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "es-define-property": "^1.0.0"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },"node_modules/has-symbols": {"version": "1.1.0","resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",@@ -10762,6 +10841,22 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/is-docker": {+ "version": "2.2.1",+ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",+ "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",+ "dev": true,+ "license": "MIT",+ "bin": {+ "is-docker": "cli.js"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/is-extglob": {"version": "2.1.1","resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",@@ -10869,6 +10964,19 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/is-wsl": {+ "version": "2.2.0",+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",+ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "is-docker": "^2.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },"node_modules/isarray": {"version": "1.0.0","resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",@@ -11098,6 +11206,26 @@"dev": true,"license": "MIT"},+ "node_modules/json-stable-stringify": {+ "version": "1.2.1",+ "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.1.tgz",+ "integrity": "sha512-Lp6HbbBgosLmJbjx0pBLbgvx68FaFU1sdkmBuckmhhJ88kL13OA51CDtR2yJB50eCNMH9wRqtQNNiAqQH4YXnA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "call-bind": "^1.0.8",+ "call-bound": "^1.0.3",+ "isarray": "^2.0.5",+ "jsonify": "^0.0.1",+ "object-keys": "^1.1.1"+ },+ "engines": {+ "node": ">= 0.4"+ },+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },"node_modules/json-stable-stringify-without-jsonify": {"version": "1.0.1","resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",@@ -11105,6 +11233,13 @@"dev": true,"license": "MIT"},+ "node_modules/json-stable-stringify/node_modules/isarray": {+ "version": "2.0.5",+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",+ "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",+ "dev": true,+ "license": "MIT"+ },"node_modules/json5": {"version": "2.2.3","resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",@@ -11137,6 +11272,16 @@"graceful-fs": "^4.1.6"}},+ "node_modules/jsonify": {+ "version": "0.0.1",+ "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",+ "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",+ "dev": true,+ "license": "Public Domain",+ "funding": {+ "url": "https://github.com/sponsors/ljharb"+ }+ },"node_modules/keyv": {"version": "4.5.4","resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",@@ -11147,6 +11292,16 @@"json-buffer": "3.0.1"}},+ "node_modules/klaw-sync": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",+ "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "graceful-fs": "^4.1.11"+ }+ },"node_modules/kysely": {"version": "0.27.6","resolved": "https://registry.npmjs.org/kysely/-/kysely-0.27.6.tgz",@@ -12330,6 +12485,16 @@"url": "https://github.com/sponsors/ljharb"}},+ "node_modules/object-keys": {+ "version": "1.1.1",+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">= 0.4"+ }+ },"node_modules/oidc-token-hash": {"version": "5.1.0","resolved": "https://registry.npmjs.org/oidc-token-hash/-/oidc-token-hash-5.1.0.tgz",@@ -12384,6 +12549,23 @@"url": "https://github.com/sponsors/sindresorhus"}},+ "node_modules/open": {+ "version": "7.4.2",+ "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",+ "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "is-docker": "^2.0.0",+ "is-wsl": "^2.1.1"+ },+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },"node_modules/openid-client": {"version": "5.7.1","resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.7.1.tgz",@@ -12575,6 +12757,105 @@"node": ">= 0.8"}},+ "node_modules/patch-package": {+ "version": "8.0.0",+ "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz",+ "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "@yarnpkg/lockfile": "^1.1.0",+ "chalk": "^4.1.2",+ "ci-info": "^3.7.0",+ "cross-spawn": "^7.0.3",+ "find-yarn-workspace-root": "^2.0.0",+ "fs-extra": "^9.0.0",+ "json-stable-stringify": "^1.0.2",+ "klaw-sync": "^6.0.0",+ "minimist": "^1.2.6",+ "open": "^7.4.2",+ "rimraf": "^2.6.3",+ "semver": "^7.5.3",+ "slash": "^2.0.0",+ "tmp": "^0.0.33",+ "yaml": "^2.2.2"+ },+ "bin": {+ "patch-package": "index.js"+ },+ "engines": {+ "node": ">=14",+ "npm": ">5"+ }+ },+ "node_modules/patch-package/node_modules/ci-info": {+ "version": "3.9.0",+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",+ "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",+ "dev": true,+ "funding": [+ {+ "type": "github",+ "url": "https://github.com/sponsors/sibiraj-s"+ }+ ],+ "license": "MIT",+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/patch-package/node_modules/fs-extra": {+ "version": "9.1.0",+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",+ "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "at-least-node": "^1.0.0",+ "graceful-fs": "^4.2.0",+ "jsonfile": "^6.0.1",+ "universalify": "^2.0.0"+ },+ "engines": {+ "node": ">=10"+ }+ },+ "node_modules/patch-package/node_modules/glob": {+ "version": "7.2.3",+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",+ "deprecated": "Glob versions prior to v9 are no longer supported",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "fs.realpath": "^1.0.0",+ "inflight": "^1.0.4",+ "inherits": "2",+ "minimatch": "^3.1.1",+ "once": "^1.3.0",+ "path-is-absolute": "^1.0.0"+ },+ "engines": {+ "node": "*"+ },+ "funding": {+ "url": "https://github.com/sponsors/isaacs"+ }+ },+ "node_modules/patch-package/node_modules/rimraf": {+ "version": "2.7.1",+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",+ "deprecated": "Rimraf versions prior to v4 are no longer supported",+ "dev": true,+ "license": "ISC",+ "dependencies": {+ "glob": "^7.1.3"+ },+ "bin": {+ "rimraf": "bin.js"+ }+ },"node_modules/path-exists": {"version": "4.0.0","resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",@@ -14283,6 +14564,24 @@"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==","license": "ISC"},+ "node_modules/set-function-length": {+ "version": "1.2.2",+ "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",+ "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",+ "dev": true,+ "license": "MIT",+ "dependencies": {+ "define-data-property": "^1.1.4",+ "es-errors": "^1.3.0",+ "function-bind": "^1.1.2",+ "get-intrinsic": "^1.2.4",+ "gopd": "^1.0.1",+ "has-property-descriptors": "^1.0.2"+ },+ "engines": {+ "node": ">= 0.4"+ }+ },"node_modules/setprototypeof": {"version": "1.2.0","resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",@@ -14562,6 +14861,16 @@"node": ">=18"}},+ "node_modules/slash": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",+ "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",+ "dev": true,+ "license": "MIT",+ "engines": {+ "node": ">=6"+ }+ },"node_modules/slice-source": {"version": "0.4.1","resolved": "https://registry.npmjs.org/slice-source/-/slice-source-0.4.1.tgz",diff --git a/server/package.json b/server/package.jsonindex 5125b5ae55..cc41a53db2 100644--- a/server/package.json+++ b/server/package.json@@ -32,7 +32,8 @@"kysely:codegen": "npx kysely-codegen --include-pattern=\"(public|vectors).*\" --dialect postgres --url postgres://postgres:postgres@localhost/immich --log-level debug --out-file=./src/db.d.ts","sync:open-api": "node ./dist/bin/sync-open-api.js","sync:sql": "node ./dist/bin/sync-sql.js",- "email:dev": "email dev -p 3050 --dir src/emails"+ "email:dev": "email dev -p 3050 --dir src/emails",+ "postinstall": "[[ \"$npm_config_global\" != \"true\" ]] && patch-package || true"},"dependencies": {"@nestjs/bullmq": "^11.0.1",@@ -132,6 +133,7 @@"kysely-codegen": "^0.18.0","mock-fs": "^5.2.0","node-addon-api": "^8.3.0",+ "patch-package": "^8.0.0","pngjs": "^7.0.0","prettier": "^3.0.2","prettier-plugin-organize-imports": "^4.0.0",diff --git a/server/patches/postgres+3.4.5.patch b/server/patches/postgres+3.4.5.patchnew file mode 100644index 0000000000..d879416978--- /dev/null+++ b/server/patches/postgres+3.4.5.patch@@ -0,0 +1,39 @@+diff --git a/node_modules/postgres/cf/src/connection.js b/node_modules/postgres/cf/src/connection.js+index ee8b1e6..d03b9dd 100644+--- a/node_modules/postgres/cf/src/connection.js++++ b/node_modules/postgres/cf/src/connection.js+@@ -387,6 +387,8 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose+ }++ function queryError(query, err) {++ if (!query || typeof query !== 'object') throw err+++ 'query' in err || 'parameters' in err || Object.defineProperties(err, {+ stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },+ query: { value: query.string, enumerable: options.debug },+diff --git a/node_modules/postgres/cjs/src/connection.js b/node_modules/postgres/cjs/src/connection.js+index f7f58d1..8a37571 100644+--- a/node_modules/postgres/cjs/src/connection.js++++ b/node_modules/postgres/cjs/src/connection.js+@@ -385,6 +385,8 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose+ }++ function queryError(query, err) {++ if (!query || typeof query !== 'object') throw err+++ 'query' in err || 'parameters' in err || Object.defineProperties(err, {+ stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },+ query: { value: query.string, enumerable: options.debug },+diff --git a/node_modules/postgres/src/connection.js b/node_modules/postgres/src/connection.js+index 97cc97e..58f5298 100644+--- a/node_modules/postgres/src/connection.js++++ b/node_modules/postgres/src/connection.js+@@ -385,6 +385,8 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose+ }++ function queryError(query, err) {++ if (!query || typeof query !== 'object') throw err+++ 'query' in err || 'parameters' in err || Object.defineProperties(err, {+ stack: { value: err.stack + query.origin.replace(/.*\n/, '\n'), enumerable: options.debug },+ query: { value: query.string, enumerable: options.debug },