Fixed /api/npm/package/* endpoint response type

Thomasr · Thomasr · commit a9f94b2bf9d4 · 2024-10-04T14:20:29.000-04:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryController.java
@@ -40,20 +40,23 @@ public Mono<ResponseEntity<Resource>> getNpmPackageAsset(String path) {
 
     @NotNull
     private Mono<ResponseEntity<Resource>> forwardToNodeService(String path, String prefix) {
+        String withoutLeadingSlash = path.startsWith("/") ? path.substring(1) : path;
         return sessionUserService.getVisitorOrgMemberCache().flatMap(orgMember -> organizationService.getOrgCommonSettings(orgMember.getOrgId()).flatMap(organizationCommonSettings -> {
             Map<String, Object> config = Map.of("npmRegistries", organizationCommonSettings.get("npmRegistries"), "workspaceId", orgMember.getOrgId());
             return WebClientBuildHelper.builder()
                     .systemProxy()
                     .build()
                     .post()
-                    .uri(nodeServerHelper.createUri(prefix + "/" + path))
+                    .uri(nodeServerHelper.createUri(prefix + "/" + withoutLeadingSlash))
                     .contentType(MediaType.APPLICATION_JSON)
                     .body(BodyInserters.fromValue(config))
                     .retrieve().toEntity(Resource.class)
-                    .map(response -> ResponseEntity
-                            .status(response.getStatusCode())
-                            .headers(response.getHeaders())
-                            .body(response.getBody()));
+                    .map(response -> {
+                        return ResponseEntity
+                                .status(response.getStatusCode())
+                                .headers(response.getHeaders())
+                                .body(response.getBody());
+                    });
         }));
     }
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryEndpoint.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryEndpoint.java
@@ -21,7 +21,7 @@ public interface PrivateNpmRegistryEndpoint {
             summary = "Get NPM registry Metadata",
             description = "Retrieve the metadata of private NPM registry package."
     )
-//    @GetMapping("/registry/{name}")
+    @GetMapping("/registry/{name}")
     public Mono<ResponseEntity<Resource>> getNpmPackageMeta(@PathVariable String name);
 
     @Operation(
@@ -30,6 +30,6 @@ public interface PrivateNpmRegistryEndpoint {
             summary = "Get NPM registry asset",
             description = "Retrieve the asset of private NPM registry package."
     )
-//    @GetMapping("/package/{path}")
+    @GetMapping("/package/{*path}")
     public Mono<ResponseEntity<Resource>> getNpmPackageAsset(@PathVariable String path);
 }
diff --git a/server/node-service/src/controllers/npm.ts b/server/node-service/src/controllers/npm.ts
@@ -3,7 +3,7 @@ import fs from "fs/promises";
 import { spawn } from "child_process";
 import { Request as ServerRequest, Response as ServerResponse } from "express";
 import { NpmRegistryService, NpmRegistryConfigEntry, NpmRegistryConfig } from "../services/npmRegistry";
-
+import {default as pathlib} from 'path';
 
 type RequestConfig = {
     workspaceId: string;
@@ -217,7 +217,7 @@ async function fetchPackageFileInner(request: ServerRequest, response: ServerRes
                 logger.info(`Fetching tarball: ${tarball}`);
                 await fetchAndUnpackTarball(tarball, packageId, packageVersion, registry, baseDir);
             } catch (error) {
-                logger.error(`Error fetching package: ${error} ${(error as {stack: string}).stack}`);
+                logger.error(`Error fetching package: ${error} ${(error as any)?.stack}`);
                 return response.status(500).send("Internal server error");
             } finally {
                 PackageProcessingQueue.resolve(packageId);
@@ -232,7 +232,7 @@ async function fetchPackageFileInner(request: ServerRequest, response: ServerRes
             return response.sendFile(`${packageBaseDir}/index.mjs`);
         }
     
-        return response.sendFile(`${packageBaseDir}/${file}`);
+        return response.sendFile(pathlib.resolve(`${packageBaseDir}/${file}`));
     } catch (error) {
         logger.error(`Error fetching package file: ${error} ${(error as {stack: string})?.stack?.toString()}`);
         response.status(500).send("Internal server error");

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public interface PrivateNpmRegistryEndpoint {`
`21`	`21`	`summary = "Get NPM registry Metadata",`
`22`	`22`	`description = "Retrieve the metadata of private NPM registry package."`
`23`	`23`	`)`
`24`		`-// @GetMapping("/registry/{name}")`
	`24`	`+ @GetMapping("/registry/{name}")`
`25`	`25`	`public Mono<ResponseEntity<Resource>> getNpmPackageMeta(@PathVariable String name);`
`26`	`26`
`27`	`27`	`@Operation(`
`@@ -30,6 +30,6 @@ public interface PrivateNpmRegistryEndpoint {`
`30`	`30`	`summary = "Get NPM registry asset",`
`31`	`31`	`description = "Retrieve the asset of private NPM registry package."`
`32`	`32`	`)`
`33`		`-// @GetMapping("/package/{path}")`
	`33`	`+ @GetMapping("/package/{*path}")`
`34`	`34`	`public Mono<ResponseEntity<Resource>> getNpmPackageAsset(@PathVariable String path);`
`35`	`35`	`}`