@opra/http 1.24.2 → 1.24.4

package/impl/http-outgoing.host.js

@@ -138,7 +138,7 @@ export class HttpOutgoingHost {
             this.setHeader('Content-Type', setCharset(ctype || 'txt', encoding));
         }
         // populate Content-Length
-        let len = 0;
+        let len;
         if (chunk !== undefined) {
             if (Buffer.isBuffer(chunk)) {
                 // get length of Buffer

package/impl/multipart-reader.js

@@ -1,4 +1,3 @@
-import { randomFillSync } from 'node:crypto';
 import fs from 'node:fs';
 import os from 'node:os';
 import nodePath from 'node:path';
@@ -7,6 +6,7 @@ import { BadRequestError } from '@opra/common';
 import busboy from 'busboy';
 import { EventEmitter } from 'events';
 import fsPromise from 'fs/promises';
+import { uid } from 'uid';
 import { isNotNullish } from 'valgen';
 export class MultipartReader extends EventEmitter {
     context;
@@ -52,7 +52,7 @@ export class MultipartReader extends EventEmitter {
             this.emit('item', item);
         });
         form.on('file', (field, file, info) => {
-            const saveTo = nodePath.posix.join(this.tempDirectory, `opra-${generateFileName()}`);
+            const saveTo = generateFileName(info, this.tempDirectory);
             file.pipe(fs.createWriteStream(saveTo));
             file.once('end', () => {
                 const item = {
@@ -197,13 +197,18 @@ export class MultipartReader extends EventEmitter {
         this._items.forEach(item => {
             if (item.kind !== 'file')
                 return;
-            promises.push(fsPromise.unlink(item.storedPath));
+            promises.push(fsPromise.unlink(item.storedPath).catch(() => { }));
         });
         return Promise.allSettled(promises);
     }
 }
-function generateFileName() {
-    const buf = Buffer.alloc(10);
-    return (new Date().toISOString().substring(0, 10).replace(/-/g, '') +
-        randomFillSync(buf).toString('hex'));
+function generateFileName(info, tempDirectory) {
+    let filename;
+    let prefix = '';
+    while (true) {
+        filename = nodePath.posix.join(tempDirectory, info.filename ? prefix + info.filename : 'opra-' + uid(12));
+        if (!fs.existsSync(filename))
+            return filename;
+        prefix = uid(6) + '-';
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/http",
-  "version": "1.24.2",
+  "version": "1.24.4",
   "description": "Opra Http Server Adapter",
   "author": "Panates",
   "license": "MIT",
@@ -23,8 +23,8 @@
     "fresh": "^0.5.2",
     "iconv-lite": "^0.7.2",
     "mime-types": "^3.0.2",
-    "node-events-async": "^1.5.0",
-    "power-tasks": "^1.11.1",
+    "node-events-async": "^1.5.2",
+    "power-tasks": "^1.14.2",
     "putil-varhelpers": "^1.7.0",
     "range-parser": "^1.2.1",
     "raw-body": "^3.0.2",
@@ -32,13 +32,14 @@
     "super-fast-md5": "^1.0.3",
     "toml": "^3.0.0",
     "tslib": "^2.8.1",
+    "uid": "^2.0.2",
     "valgen": "^5.19.5",
     "vary": "^1.1.2",
-    "yaml": "^2.8.2"
+    "yaml": "^2.8.3"
   },
   "peerDependencies": {
-    "@opra/common": "^1.24.2",
-    "@opra/core": "^1.24.2"
+    "@opra/common": "^1.24.4",
+    "@opra/core": "^1.24.4"
   },
   "optionalDependencies": {
     "express": "^4.0.0 || ^5.0.0",

package/utils/body-reader.js

@@ -102,6 +102,8 @@ export class BodyReader extends EventEmitter {
                             },
                         }, 413));
                     }
+                    else
+                        callback();
                 },
             });
             this.req.pipe(sizeStream);