@opra/http 1.24.3 → 1.25.1

package/http-context.d.ts

@@ -1,6 +1,6 @@
 import { HttpController, HttpMediaType, HttpOperation } from '@opra/common';
 import { ExecutionContext } from '@opra/core';
-import type { HttpAdapter } from './http-adapter';
+import type { HttpAdapter } from './http-adapter.js';
 import { MultipartReader } from './impl/multipart-reader.js';
 import type { HttpIncoming } from './interfaces/http-incoming.interface.js';
 import type { HttpOutgoing } from './interfaces/http-outgoing.interface.js';

package/http-handler.d.ts

@@ -1,6 +1,6 @@
 import { HttpOperationResponse, OpraException, OpraHttpError } from '@opra/common';
 import { AssetCache, kAssetCache } from '@opra/core';
-import type { HttpAdapter } from './http-adapter';
+import type { HttpAdapter } from './http-adapter.js';
 import { HttpContext } from './http-context.js';
 /**
  * @namespace

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,13 +1,13 @@
 {
   "name": "@opra/http",
-  "version": "1.24.3",
+  "version": "1.25.1",
   "description": "Opra Http Server Adapter",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
-    "@browsery/antlr4": "^4.13.3-r4",
-    "@browsery/http-parser": "^0.5.10-r2",
-    "@browsery/type-is": "^2.0.1",
+    "@browsery/antlr4": "^4.13.3-r5",
+    "@browsery/http-parser": "^0.5.10-r3",
+    "@browsery/type-is": "^2.0.2-r1",
     "@jsopen/objects": "^2.2.0",
     "accepts": "^1.3.8",
     "base64-stream": "^1.0.0",
@@ -24,21 +24,22 @@
     "iconv-lite": "^0.7.2",
     "mime-types": "^3.0.2",
     "node-events-async": "^1.5.2",
-    "power-tasks": "^1.14.1",
+    "power-tasks": "^1.14.2",
     "putil-varhelpers": "^1.7.0",
     "range-parser": "^1.2.1",
     "raw-body": "^3.0.2",
     "reflect-metadata": "^0.2.2",
     "super-fast-md5": "^1.0.3",
-    "toml": "^3.0.0",
+    "toml": "^4.1.1",
     "tslib": "^2.8.1",
+    "uid": "^2.0.2",
     "valgen": "^5.19.5",
     "vary": "^1.1.2",
     "yaml": "^2.8.3"
   },
   "peerDependencies": {
-    "@opra/common": "^1.24.3",
-    "@opra/core": "^1.24.3"
+    "@opra/common": "^1.25.1",
+    "@opra/core": "^1.25.1"
   },
   "optionalDependencies": {
     "express": "^4.0.0 || ^5.0.0",