Merge pull request #2045 from aeternity/update-mdw

Update middleware to 1.97.1
aeternity · Feb 24, 2025 · 11287f7 · 11287f7
2 parents 8a9d0bc + 9ff9965
commit 11287f7
Show file tree

Hide file tree

Showing 8 changed files with 250 additions and 5,163 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
 
   middleware:
     # TODO: use upstream after solving https://github.com/aeternity/ae_mdw/issues/1758
-    image: davidyuk/temp:mdw-dev-mode-1.81.0
+    image: davidyuk/temp:mdw-dev-mode-1.97.1-oas-fix
     ports: [4000:4000, 4001:4001, 4013:3013, 4014:3014, 4313:3313]
     volumes:
       - ./docker/middleware.yaml:/home/aeternity/aeternity.yaml

diff --git a/package.json b/package.json
@@ -28,8 +28,7 @@
     "build:es": "babel src --config-file ./babel.esm.config.js --out-dir es --extensions .ts --source-maps true",
     "build:api:node": "autorest tooling/autorest/node.yaml && node tooling/autorest/postprocessing.js node",
     "build:api:compiler": "node tooling/autorest/compiler-prepare.js && autorest tooling/autorest/compiler.yaml && node tooling/autorest/postprocessing.js compiler",
-    "rem:build:api:middleware": "node tooling/autorest/middleware-prepare.js",
-    "build:api:middleware": "autorest tooling/autorest/middleware.yaml && node tooling/autorest/postprocessing.js middleware",
+    "build:api:middleware": "node tooling/autorest/middleware-prepare.js && autorest tooling/autorest/middleware.yaml && node tooling/autorest/postprocessing.js middleware",
     "build:generate": "tsx tooling/generate-schema.ts",
     "build": "run-p build:api:* build:assets build:generate && run-p build:dist build:es build:types",
     "docs:examples": "node tooling/docs/examples-to-md.js examples/node/*.js",

diff --git a/src/utils/MiddlewarePage.ts b/src/utils/MiddlewarePage.ts
@@ -2,8 +2,8 @@
 import type Middleware from '../Middleware.js';
 import { BaseError } from './errors.js';
 
-export interface MiddlewareRawPage {
-  data: unknown[];
+interface MiddlewareRawPage<T = unknown> {
+  data: T[];
   next: string | null;
   prev: string | null;
 }
@@ -40,8 +40,8 @@ export class MiddlewarePage<Item> {
 
   readonly #middleware: Middleware;
 
-  constructor(rawPage: MiddlewareRawPage, middleware: Middleware) {
-    this.data = rawPage.data as Item[];
+  constructor(rawPage: MiddlewareRawPage<Item>, middleware: Middleware) {
+    this.data = rawPage.data;
     this.nextPath = rawPage.next;
     this.prevPath = rawPage.prev;
     this.#middleware = middleware;