sst 2.23.1 → 2.23.2

package/cli/commands/update.js

@@ -1,18 +1,9 @@
-const PACKAGE_MATCH = [
-    "sst",
-    "astro-sst",
-    "aws-cdk",
-    "@aws-cdk",
-    "constructs",
-    "svelte-kit-sst",
-    "solid-start-sst",
-];
+const PACKAGE_MATCH = ["aws-cdk", "@aws-cdk"];
 const FIELDS = ["dependencies", "devDependencies"];
 export const update = (program) => program.command("update [version]", "Update your SST and CDK packages", (yargs) => yargs.positional("version", {
     type: "string",
     describe: "Optionally specify a version to update to",
 }), async (args) => {
-    const { green, yellow } = await import("colorette");
     const fs = await import("fs/promises");
     const path = await import("path");
     const { fetch } = await import("undici");
@@ -41,33 +32,33 @@ export const update = (program) => program.command("update [version]", "Update y
     const metadata = await fetch(`https://registry.npmjs.org/sst/${args.version || "latest"}`).then((resp) => resp.json());
     const results = new Map();
     const tasks = files.map(async (file) => {
-        const data = await fs
-            .readFile(file)
-            .then((x) => x.toString())
-            .then(JSON.parse);
+        const data = await fs.readFile(file).then((x) => x.toString());
+        // Note: preserve ending new line characters in package.json
+        const tailingNewline = data.match(/\r?\n$/)?.[0];
+        const json = JSON.parse(data);
         for (const field of FIELDS) {
-            const deps = data[field];
-            if (!deps)
-                continue;
-            for (const [pkg, existing] of Object.entries(deps)) {
-                if (!PACKAGE_MATCH.some((x) => pkg.startsWith(x)))
-                    continue;
+            const deps = json[field];
+            for (const [pkg, existing] of Object.entries(deps || {})) {
                 const desired = (() => {
-                    // Both sst and astro-sst should be sharing the same version
                     if ([
                         "sst",
                         "astro-sst",
                         "svelte-kit-sst",
                         "solid-start-sst",
-                    ].includes(pkg))
+                    ].includes(pkg)) {
                         return metadata.version;
-                    if (pkg === "constructs")
+                    }
+                    else if (pkg === "constructs") {
                         return metadata.dependencies.constructs;
-                    if (pkg.endsWith("alpha"))
-                        return metadata.dependencies["@aws-cdk/aws-apigatewayv2-alpha"];
-                    return metadata.dependencies["aws-cdk-lib"];
+                    }
+                    else if (pkg.startsWith("aws-cdk") ||
+                        pkg.startsWith("@aws-cdk")) {
+                        return pkg.endsWith("alpha")
+                            ? metadata.dependencies["@aws-cdk/aws-apigatewayv2-alpha"]
+                            : metadata.dependencies["aws-cdk-lib"];
+                    }
                 })();
-                if (existing === desired)
+                if (!desired || existing === desired)
                     continue;
                 let arr = results.get(file);
                 if (!arr) {
@@ -79,7 +70,7 @@ export const update = (program) => program.command("update [version]", "Update y
             }
         }
         if (results.has(file)) {
-            await fs.writeFile(file, JSON.stringify(data, null, 2));
+            await fs.writeFile(file, `${JSON.stringify(json, null, 2)}${tailingNewline ?? ""}`);
         }
     });
     await Promise.all(tasks);

package/constructs/Function.js

@@ -23,6 +23,7 @@ import { Effect, PolicyStatement } from "aws-cdk-lib/aws-iam";
 import { StringParameter } from "aws-cdk-lib/aws-ssm";
 import { Platform } from "aws-cdk-lib/aws-ecr-assets";
 import { useBootstrap } from "../bootstrap.js";
+import { Colors } from "../cli/colors.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 const supportedRuntimes = {
     container: CDKRuntime.FROM_IMAGE,
@@ -223,6 +224,8 @@ export class Function extends CDKFunction {
                 logRetentionRetryOptions: logRetention && { maxRetries: 100 },
             });
             useDeferredTasks().add(async () => {
+                if (props.runtime === "container")
+                    Colors.line(`➜  Building the container image for the "${this.node.id}" function...`);
                 // Build function
                 const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
                 if (result.type === "error") {

package/constructs/Job.js

@@ -3,6 +3,7 @@ import path from "path";
 import fs from "fs/promises";
 import { Construct } from "constructs";
 import { Duration as CdkDuration } from "aws-cdk-lib/core";
+import { Platform } from "aws-cdk-lib/aws-ecr-assets";
 import { PolicyStatement, Effect } from "aws-cdk-lib/aws-iam";
 import { AssetCode, Code, Runtime, Function as CdkFunction, } from "aws-cdk-lib/aws-lambda";
 import { Project, LinuxBuildImage, BuildSpec, ComputeType, } from "aws-cdk-lib/aws-codebuild";
@@ -15,7 +16,7 @@ import { bindEnvironment, bindPermissions, getReferencedSecrets, } from "./util/
 import { useDeferredTasks } from "./deferred_task.js";
 import { useProject } from "../project.js";
 import { useRuntimeHandlers } from "../runtime/handlers.js";
-import { Platform } from "aws-cdk-lib/aws-ecr-assets";
+import { Colors } from "../cli/colors.js";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 /////////////////////
 // Construct
@@ -194,6 +195,8 @@ export class Job extends Construct {
     buildCodeBuildProjectCode() {
         const { handler, architecture, runtime, container } = this.props;
         useDeferredTasks().add(async () => {
+            if (runtime === "container")
+                Colors.line(`➜  Building the container image for the "${this.node.id}" job...`);
             // Build function
             const result = await useRuntimeHandlers().build(this.node.addr, "deploy");
             if (result.type === "error") {

package/constructs/Service.d.ts

@@ -22,6 +22,11 @@ export interface ServiceProps {
      * @default "."
      */
     path?: string;
+    /**
+     * Path to Dockerfile relative to the defined "path".
+     * @default "Dockerfile"
+     */
+    file?: string;
     /**
      * The amount of cpu allocated.
      * @default "0.25 vCPU"

package/constructs/Service.js

@@ -188,10 +188,16 @@ export class Service extends Construct {
         Object.entries(props?.environment || {}).map(([key, value]) => this.addEnvironmentForService(key, value));
         useDeferredTasks().add(async () => {
             if (!app.isRunningSSTTest()) {
-                Colors.line(`➜  Building container image for the "${this.node.id}" service`);
+                Colors.line(`➜  Building the container image for the "${this.node.id}" service...`);
                 // Build app
-                let dockerfile = "Dockerfile";
-                if (!(await existsAsync(path.join(this.props.path, dockerfile)))) {
+                let dockerfile;
+                if (this.props.file) {
+                    dockerfile = this.props.file;
+                }
+                else if (await existsAsync(path.join(this.props.path, "Dockerfile"))) {
+                    dockerfile = "Dockerfile";
+                }
+                else {
                     await this.createNixpacksBuilder();
                     dockerfile = await this.runNixpacksBuild();
                 }
@@ -328,10 +334,16 @@ export class Service extends Construct {
     // Bundle Cluster
     /////////////////////
     validateServiceExists() {
-        const { path: servicePath } = this.props;
+        const { path: servicePath, file } = this.props;
         if (!fs.existsSync(servicePath)) {
             throw new Error(`No service found at "${path.resolve(servicePath)}"`);
         }
+        if (file) {
+            const dockerfilePath = path.join(servicePath, file);
+            if (!fs.existsSync(dockerfilePath)) {
+                throw new Error(`No Dockerfile found at "${dockerfilePath}". Make sure to set the "file" property to the path of the Dockerfile relative to "${servicePath}".`);
+            }
+        }
     }
     validateMemoryAndCpu() {
         const { memory, cpu } = this.props;

package/package.json

@@ -1,7 +1,7 @@
 {
   "sideEffects": false,
   "name": "sst",
-  "version": "2.23.1",
+  "version": "2.23.2",
   "bin": {
     "sst": "cli/sst.js"
   },

package/runtime/handlers/java.js

@@ -17,7 +17,7 @@ export const useJavaHandler = Context.memo(async () => {
     const handlers = useRuntimeHandlers();
     const processes = new Map();
     const sources = new Map();
-    const handlerName = process.platform === "win32" ? `handler.exe` : `handler`;
+    const runningBuilds = new Map();
     handlers.register({
         shouldBuild: (input) => {
             if (!input.file.endsWith(".java"))
@@ -68,13 +68,26 @@ export const useJavaHandler = Context.memo(async () => {
             const buildTask = input.props.java?.buildTask || "build";
             const outputDir = input.props.java?.buildOutputDir || "distributions";
             sources.set(input.functionID, srcPath);
-            try {
+            async function build() {
+                // build
                 await execAsync(`${buildBinary} ${buildTask} -Dorg.gradle.logging.level=${process.env.DEBUG ? "debug" : "lifecycle"}`, {
                     cwd: srcPath,
                 });
+                // unzip
                 const buildOutput = path.join(srcPath, "build", outputDir);
                 const zip = (await fs.readdir(buildOutput)).find((f) => f.endsWith(".zip"));
-                new AdmZip(path.join(buildOutput, zip)).extractAllTo(input.out);
+                await new Promise((resolve, reject) => {
+                    const zipper = new AdmZip(path.join(buildOutput, zip));
+                    zipper.extractAllToAsync(input.out, false, false, (err) => err ? reject(err) : resolve(undefined));
+                });
+            }
+            try {
+                // Run gradle build once per directory. Otherwise they'll interfere
+                // with one another
+                const buildPromise = runningBuilds.get(buildBinary) ?? build();
+                runningBuilds.set(buildBinary, buildPromise);
+                await buildPromise;
+                runningBuilds.delete(buildBinary);
                 return {
                     type: "success",
                     handler: input.props.handler,

package/sst.mjs

@@ -5522,7 +5522,7 @@ var init_java = __esm({
       const handlers = useRuntimeHandlers();
       const processes = /* @__PURE__ */ new Map();
       const sources = /* @__PURE__ */ new Map();
-      const handlerName = process.platform === "win32" ? `handler.exe` : `handler`;
+      const runningBuilds = /* @__PURE__ */ new Map();
       handlers.register({
         shouldBuild: (input) => {
           if (!input.file.endsWith(".java"))
@@ -5579,7 +5579,7 @@ var init_java = __esm({
           const buildTask = input.props.java?.buildTask || "build";
           const outputDir = input.props.java?.buildOutputDir || "distributions";
           sources.set(input.functionID, srcPath);
-          try {
+          async function build2() {
             await execAsync(
               `${buildBinary} ${buildTask} -Dorg.gradle.logging.level=${process.env.DEBUG ? "debug" : "lifecycle"}`,
               {
@@ -5590,7 +5590,21 @@ var init_java = __esm({
             const zip = (await fs13.readdir(buildOutput)).find(
               (f) => f.endsWith(".zip")
             );
-            new AdmZip(path15.join(buildOutput, zip)).extractAllTo(input.out);
+            await new Promise((resolve2, reject) => {
+              const zipper = new AdmZip(path15.join(buildOutput, zip));
+              zipper.extractAllToAsync(
+                input.out,
+                false,
+                false,
+                (err) => err ? reject(err) : resolve2(void 0)
+              );
+            });
+          }
+          try {
+            const buildPromise = runningBuilds.get(buildBinary) ?? build2();
+            runningBuilds.set(buildBinary, buildPromise);
+            await buildPromise;
+            runningBuilds.delete(buildBinary);
             return {
               type: "success",
               handler: input.props.handler
@@ -8838,15 +8852,6 @@ function secrets(program2) {
 }
 
 // src/cli/commands/update.ts
-var PACKAGE_MATCH = [
-  "sst",
-  "astro-sst",
-  "aws-cdk",
-  "@aws-cdk",
-  "constructs",
-  "svelte-kit-sst",
-  "solid-start-sst"
-];
 var FIELDS = ["dependencies", "devDependencies"];
 var update = (program2) => program2.command(
   "update [version]",
@@ -8856,7 +8861,6 @@ var update = (program2) => program2.command(
     describe: "Optionally specify a version to update to"
   }),
   async (args) => {
-    const { green, yellow } = await import("colorette");
     const fs19 = await import("fs/promises");
     const path22 = await import("path");
     const { fetch } = await import("undici");
@@ -8886,29 +8890,27 @@ var update = (program2) => program2.command(
     ).then((resp) => resp.json());
     const results = /* @__PURE__ */ new Map();
     const tasks = files.map(async (file) => {
-      const data2 = await fs19.readFile(file).then((x) => x.toString()).then(JSON.parse);
+      const data2 = await fs19.readFile(file).then((x) => x.toString());
+      const tailingNewline = data2.match(/\r?\n$/)?.[0];
+      const json = JSON.parse(data2);
       for (const field of FIELDS) {
-        const deps = data2[field];
-        if (!deps)
-          continue;
-        for (const [pkg, existing] of Object.entries(deps)) {
-          if (!PACKAGE_MATCH.some((x) => pkg.startsWith(x)))
-            continue;
+        const deps = json[field];
+        for (const [pkg, existing] of Object.entries(deps || {})) {
           const desired = (() => {
             if ([
               "sst",
               "astro-sst",
               "svelte-kit-sst",
               "solid-start-sst"
-            ].includes(pkg))
+            ].includes(pkg)) {
               return metadata3.version;
-            if (pkg === "constructs")
+            } else if (pkg === "constructs") {
               return metadata3.dependencies.constructs;
-            if (pkg.endsWith("alpha"))
-              return metadata3.dependencies["@aws-cdk/aws-apigatewayv2-alpha"];
-            return metadata3.dependencies["aws-cdk-lib"];
+            } else if (pkg.startsWith("aws-cdk") || pkg.startsWith("@aws-cdk")) {
+              return pkg.endsWith("alpha") ? metadata3.dependencies["@aws-cdk/aws-apigatewayv2-alpha"] : metadata3.dependencies["aws-cdk-lib"];
+            }
           })();
-          if (existing === desired)
+          if (!desired || existing === desired)
             continue;
           let arr = results.get(file);
           if (!arr) {
@@ -8920,7 +8922,10 @@ var update = (program2) => program2.command(
         }
       }
       if (results.has(file)) {
-        await fs19.writeFile(file, JSON.stringify(data2, null, 2));
+        await fs19.writeFile(
+          file,
+          `${JSON.stringify(json, null, 2)}${tailingNewline ?? ""}`
+        );
       }
     });
     await Promise.all(tasks);