Merge pull request #6 from merge-upstream

built/download.js

@@ -29,7 +29,7 @@ export async function downloadUrl(url, path, settings = defaultDownloadConfig) {
             lookup: timeout,
             connect: timeout,
             secureConnect: timeout,
-            socket: timeout,
+            socket: timeout, // read timeout
             response: timeout,
             send: timeout,
             request: operationTimeout, // whole operation timeout

built/http.js

@@ -3,8 +3,8 @@ import * as https from 'node:https';
 import CacheableLookup from 'cacheable-lookup';
 import { HttpProxyAgent, HttpsProxyAgent } from 'hpagent';
 const cache = new CacheableLookup({
-    maxTtl: 3600,
-    errorTtl: 30,
+    maxTtl: 3600, // 1hours
+    errorTtl: 30, // 30secs
     lookup: false, // nativeのdns.lookupにfallbackしない
 });
 const _http = new http.Agent({

built/index.js

@@ -7,7 +7,7 @@ import { FILE_TYPE_BROWSERSAFE } from './const.js';
 import { convertToWebpStream, webpDefault, convertSharpToWebpStream } from './image-processor.js';
 import { detectType, isMimeImage } from './file-info.js';
 import sharp from 'sharp';
-import { sharpBmp } from 'sharp-read-bmp';
+import { sharpBmp } from '@misskey-dev/sharp-read-bmp';
 import { StatusError } from './status-error.js';
 import { defaultDownloadConfig, downloadUrl } from './download.js';
 import { getAgents } from './http.js';

package.json

@@ -1,6 +1,6 @@
 {
   "name": "misskey-media-proxy",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "The Media Proxy for Misskey",
   "main": "built/index.js",
   "packageManager": "[email protected]",
@@ -26,28 +26,28 @@
   },
   "homepage": "https://github.com/misskey-dev/media-proxy#readme",
   "devDependencies": {
-    "@swc/cli": "^0.1.62",
-    "@swc/core": "^1.3.86",
-    "@types/content-disposition": "^0.5.6",
-    "@types/node": "^20.6.3",
-    "@types/tmp": "^0.2.4",
-    "typescript": "^5.2.2"
+    "@swc/cli": "^0.1.63",
+    "@swc/core": "^1.3.104",
+    "@types/content-disposition": "^0.5.8",
+    "@types/node": "^20.11.5",
+    "@types/tmp": "^0.2.6",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
-    "@fastify/static": "^6.11.2",
+    "@fastify/static": "^6.12.0",
+    "@misskey-dev/sharp-read-bmp": "^1.1.1",
     "cacheable-lookup": "^7.0.0",
     "content-disposition": "^0.5.4",
-    "fastify": "^4.23.2",
-    "fastify-cli": "^5.8.0",
-    "file-type": "^18.5.0",
+    "fastify": "^4.25.2",
+    "fastify-cli": "^6.0.1",
+    "file-type": "^19.0.0",
     "got": "^13.0.0",
     "hpagent": "^1.2.0",
     "ip-cidr": "^3.1.0",
     "ipaddr.js": "^2.1.0",
     "is-svg": "^5.0.0",
     "private-ip": "^3.0.1",
     "sharp": "^0.32.6",
-    "sharp-read-bmp": "github:misskey-dev/sharp-read-bmp",
     "tmp": "^0.2.1"
   }
 }