Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita9f94b2

Browse files
author
Thomasr
committed
Fixed /api/npm/package/* endpoint response type
1 parent5609af5 commita9f94b2

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryController.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,23 @@ public Mono<ResponseEntity<Resource>> getNpmPackageAsset(String path) {
4040

4141
@NotNull
4242
privateMono<ResponseEntity<Resource>>forwardToNodeService(Stringpath,Stringprefix) {
43+
StringwithoutLeadingSlash =path.startsWith("/") ?path.substring(1) :path;
4344
returnsessionUserService.getVisitorOrgMemberCache().flatMap(orgMember ->organizationService.getOrgCommonSettings(orgMember.getOrgId()).flatMap(organizationCommonSettings -> {
4445
Map<String,Object>config =Map.of("npmRegistries",organizationCommonSettings.get("npmRegistries"),"workspaceId",orgMember.getOrgId());
4546
returnWebClientBuildHelper.builder()
4647
.systemProxy()
4748
.build()
4849
.post()
49-
.uri(nodeServerHelper.createUri(prefix +"/" +path))
50+
.uri(nodeServerHelper.createUri(prefix +"/" +withoutLeadingSlash))
5051
.contentType(MediaType.APPLICATION_JSON)
5152
.body(BodyInserters.fromValue(config))
5253
.retrieve().toEntity(Resource.class)
53-
.map(response ->ResponseEntity
54-
.status(response.getStatusCode())
55-
.headers(response.getHeaders())
56-
.body(response.getBody()));
54+
.map(response -> {
55+
returnResponseEntity
56+
.status(response.getStatusCode())
57+
.headers(response.getHeaders())
58+
.body(response.getBody());
59+
});
5760
}));
5861
}
5962
}

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/npm/PrivateNpmRegistryEndpoint.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public interface PrivateNpmRegistryEndpoint {
2121
summary ="Get NPM registry Metadata",
2222
description ="Retrieve the metadata of private NPM registry package."
2323
)
24-
// @GetMapping("/registry/{name}")
24+
@GetMapping("/registry/{name}")
2525
publicMono<ResponseEntity<Resource>>getNpmPackageMeta(@PathVariableStringname);
2626

2727
@Operation(
@@ -30,6 +30,6 @@ public interface PrivateNpmRegistryEndpoint {
3030
summary ="Get NPM registry asset",
3131
description ="Retrieve the asset of private NPM registry package."
3232
)
33-
// @GetMapping("/package/{path}")
33+
@GetMapping("/package/{*path}")
3434
publicMono<ResponseEntity<Resource>>getNpmPackageAsset(@PathVariableStringpath);
3535
}

‎server/node-service/src/controllers/npm.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import fs from "fs/promises";
33
import{spawn}from"child_process";
44
import{RequestasServerRequest,ResponseasServerResponse}from"express";
55
import{NpmRegistryService,NpmRegistryConfigEntry,NpmRegistryConfig}from"../services/npmRegistry";
6-
6+
import{defaultaspathlib}from'path';
77

88
typeRequestConfig={
99
workspaceId:string;
@@ -217,7 +217,7 @@ async function fetchPackageFileInner(request: ServerRequest, response: ServerRes
217217
logger.info(`Fetching tarball:${tarball}`);
218218
awaitfetchAndUnpackTarball(tarball,packageId,packageVersion,registry,baseDir);
219219
}catch(error){
220-
logger.error(`Error fetching package:${error}${(erroras{stack:string}).stack}`);
220+
logger.error(`Error fetching package:${error}${(errorasany)?.stack}`);
221221
returnresponse.status(500).send("Internal server error");
222222
}finally{
223223
PackageProcessingQueue.resolve(packageId);
@@ -232,7 +232,7 @@ async function fetchPackageFileInner(request: ServerRequest, response: ServerRes
232232
returnresponse.sendFile(`${packageBaseDir}/index.mjs`);
233233
}
234234

235-
returnresponse.sendFile(`${packageBaseDir}/${file}`);
235+
returnresponse.sendFile(pathlib.resolve(`${packageBaseDir}/${file}`));
236236
}catch(error){
237237
logger.error(`Error fetching package file:${error}${(erroras{stack:string})?.stack?.toString()}`);
238238
response.status(500).send("Internal server error");

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp