fix

Author: ije

server/npmrc.go

@@ -423,8 +423,8 @@ func (npmrc *NpmRC) installPackageContext(ctx context.Context, pkg npm.Package)
 	return
 }
 
-func (npmrc *NpmRC) installDependencies(wd string, pkgJson *npm.PackageJSON, npmMode bool, mark *set.Set[string]) {
-	_ = npmrc.installDependenciesContext(context.Background(), wd, pkgJson, npmMode, mark)
+func (npmrc *NpmRC) installDependencies(wd string, pkgJson *npm.PackageJSON, npmMode bool, mark *set.Set[string]) error {
+	return npmrc.installDependenciesContext(context.Background(), wd, pkgJson, npmMode, mark)
 }
 
 func (npmrc *NpmRC) installDependenciesContext(ctx context.Context, wd string, pkgJson *npm.PackageJSON, npmMode bool, mark *set.Set[string]) error {
@@ -454,8 +454,13 @@ func (npmrc *NpmRC) installDependenciesContext(ctx context.Context, wd string, p
 		}
 		errMu.Unlock()
 	}
+	getFirstErr := func() error {
+		errMu.Lock()
+		defer errMu.Unlock()
+		return firstErr
+	}
 	for name, version := range dependencies {
-		if ctx.Err() != nil || firstErr != nil {
+		if ctx.Err() != nil || getFirstErr() != nil {
 			break
 		}
 		wg.Add(1)
@@ -502,7 +507,14 @@ func (npmrc *NpmRC) installDependenciesContext(ctx context.Context, wd string, p
 				if strings.ContainsRune(name, '/') {
 					ensureDir(filepath.Dir(linkDir))
 				}
-				os.Symlink(filepath.Join(npmrc.StoreDir(), pkg.String(), "node_modules", pkg.Name), linkDir)
+				err = os.Symlink(filepath.Join(npmrc.StoreDir(), pkg.String(), "node_modules", pkg.Name), linkDir)
+				if err != nil && !os.IsExist(err) {
+					setErr(err)
+					return
+				}
+			} else if err != nil {
+				setErr(err)
+				return
 			}
 			// install dependencies recursively
 			if len(installed.Dependencies) > 0 || (len(installed.PeerDependencies) > 0 && npmMode) {

server/router.go

@@ -175,9 +175,17 @@ func esmRouter(esmStorage storage.Storage, logger *log.Logger) rex.Handle {
 				}
 				if len(output.Map) > 0 {
 					output.Code = fmt.Sprintf("%s//# sourceMappingURL=+%s", output.Code, path.Base(savePath)+".map")
-					go esmStorage.Put(savePath+".map", strings.NewReader(output.Map))
+					err = esmStorage.Put(savePath+".map", strings.NewReader(output.Map))
+					if err != nil {
+						logger.Errorf("storage.put(%s): %v", savePath+".map", err)
+						return rex.Err(500, "failed to store source map")
+					}
+				}
+				err = esmStorage.Put(savePath, strings.NewReader(output.Code))
+				if err != nil {
+					logger.Errorf("storage.put(%s): %v", savePath, err)
+					return rex.Err(500, "failed to store transformed code")
 				}
-				go esmStorage.Put(savePath, strings.NewReader(output.Code))
 				ctx.SetHeader("Cache-Control", ccMustRevalidate)
 				return output
 

server/unenv.go

@@ -76,7 +76,10 @@ func buildUnenvNodeRuntime() (err error) {
 	if err != nil {
 		return
 	}
-	npmrc.installDependencies(wd, pkgJson, false, nil)
+	err = npmrc.installDependencies(wd, pkgJson, false, nil)
+	if err != nil {
+		return err
+	}
 
 	endpoints := make([]esbuild.EntryPoint, 0, len(nodeBuiltinModules))
 	for name := range nodeBuiltinModules {