@stacksjs/cloud 0.70.23 → 0.70.25

package/dist/src/cloud/index.d.ts

@@ -0,0 +1,15 @@
+import type { CloudConfig } from '@stacksjs/ts-cloud';
+import type { CloudOptions } from '../types';
+/**
+ * Cloud orchestrator using ts-cloud InfrastructureGenerator.
+ *
+ * This replaces the previous CDK-based Stack class. Infrastructure is now
+ * generated as CloudFormation templates via ts-cloud and deployed through
+ * the deploy module.
+ */
+export declare class Cloud {
+  props: CloudOptions;
+  constructor(cloudConfig: CloudConfig, props: CloudOptions);
+  generate(): string;
+  shouldDeployApi(): boolean;
+}

package/dist/{helpers.d.ts → src/helpers.d.ts}

@@ -1,8 +1,27 @@
-import type { CountryCode, RegisterDomainCommandOutput } from '@aws-sdk/client-route-53-domains';
 import type { Result } from '@stacksjs/error-handling';
-
-declare const appEnv: unknown;
 export declare function getSecurityGroupId(securityGroupName: string): Promise<Result<string | undefined, string>>;
+export declare function purchaseDomain(domain: string, options: PurchaseOptions): Result<Promise<{ OperationId: string }>, Error>;
+export declare function getJumpBoxInstanceId(name?: string): Promise<string | undefined>;
+export declare function deleteEc2Instance(id: string, stackName?: string): Promise<Result<string, string>>;
+export declare function deleteJumpBox(stackName?: string): Promise<Result<string, string>>;
+export declare function deleteIamUsers(): Promise<Result<string, string>>;
+export declare function deleteStacksBuckets(): Promise<Result<string, string | Error>>;
+export declare function deleteStacksFunctions(): Promise<Result<string, string>>;
+export declare function deleteLogGroups(): Promise<Result<string, Error>>;
+export declare function deleteParameterStore(): Promise<Result<string, string>>;
+export declare function deleteVpcs(): Promise<Result<string, Error>>;
+export declare function deleteCdkRemnants(): Promise<Result<string, Error>>;
+export declare function deleteSubnets(): Promise<Result<string, Error>>;
+export declare function hasBeenDeployed(): Promise<Result<boolean, Error>>;
+export declare function getJumpBoxInstanceProfileName(): Promise<Result<string | undefined, string>>;
+export declare function addJumpBox(stackName?: string): Promise<Result<string, string>>;
+export declare function getJumpBoxSecurityGroupName(): Promise<Result<string | undefined, string>>;
+export declare function getSecurityGroupFromInstanceId(instanceId: string): Promise<string | undefined>;
+export declare function isFirstDeployment(): Promise<boolean>;
+export declare function isFailedState(): Promise<boolean>;
+export declare function getOrCreateTimestamp(): Promise<string>;
+// get the CloudFront distribution ID of the current stack
+export declare function getCloudFrontDistributionId(): Promise<string>;
 export declare interface PurchaseOptions {
   domain: string
   years: number
@@ -15,7 +34,7 @@ export declare interface PurchaseOptions {
   adminAddressLine2: string
   adminCity: string
   adminState: string
-  adminCountry: CountryCode
+  adminCountry: string
   adminZip: string
   adminPhone: string
   adminEmail: string
@@ -26,7 +45,7 @@ export declare interface PurchaseOptions {
   techAddressLine2: string
   techCity: string
   techState: string
-  techCountry: CountryCode
+  techCountry: string
   techZip: string
   techPhone: string
   techEmail: string
@@ -37,36 +56,13 @@ export declare interface PurchaseOptions {
   registrantAddressLine2: string
   registrantCity: string
   registrantState: string
-  registrantCountry: CountryCode
+  registrantCountry: string
   registrantZip: string
   registrantPhone: string
   registrantEmail: string
   privacyAdmin: boolean
   privacyTech: boolean
   privacyRegistrant: boolean
-  contactType: ContactType
+  contactType: 'PERSON' | 'COMPANY' | 'ASSOCIATION' | 'PUBLIC_BODY' | 'RESELLER'
   verbose: boolean
 }
-export declare function purchaseDomain(domain: string, options: PurchaseOptions): Result<Promise<RegisterDomainCommandOutput>, Error>;
-export declare function getJumpBoxInstanceId(name?: string): Promise<string | undefined>;
-export declare function deleteEc2Instance(id: string, stackName?: string): Promise<Result<string, string>>;
-export declare function deleteJumpBox(stackName?: string): Promise<Result<string, string>>;
-export declare function deleteIamUsers(): Promise<Result<string, string>>;
-export declare function deleteStacksBuckets(): Promise<Result<string, string | Error>>;
-export declare function deleteStacksFunctions(): Promise<Result<string, string>>;
-export declare function deleteLogGroups(): Promise<Result<string, Error>>;
-export declare function deleteParameterStore(): Promise<Result<string, string>>;
-export declare function deleteVpcs(): Promise<Result<string, Error>>;
-export declare function deleteCdkRemnants(): Promise<Result<string, Error>>;
-export declare function deleteSubnets(): Promise<Result<string, Error>>;
-export declare function hasBeenDeployed(): Promise<Result<boolean, Error>>;
-export declare function getJumpBoxInstanceProfileName(): Promise<Result<string | undefined, string>>;
-export declare function addJumpBox(stackName?: string): Promise<Result<string, string>>;
-export declare function getJumpBoxSecurityGroupName(): Promise<Result<string | undefined, string>>;
-export declare function getSecurityGroupFromInstanceId(instanceId: string): Promise<string | undefined>;
-export declare function isFirstDeployment(): Promise<boolean>;
-export declare function isFailedState(): Promise<boolean>;
-export declare function getOrCreateTimestamp(): Promise<string>;
-export declare function getCloudFrontDistributionId(): Promise<string>;
-
-export { InstanceType }

package/dist/src/index.d.ts

@@ -0,0 +1,3 @@
+export type * from './types';
+export * from './cloud';
+export * from './helpers';

package/dist/{types.d.ts → src/types.d.ts}

@@ -1,7 +1,5 @@
 import type { AppEnvType } from '@stacksjs/types';
-import type { StackProps } from 'aws-cdk-lib';
-
-export declare interface CloudOptions extends StackProps {
+export declare interface CloudOptions {
   name: string
   env: {
     account: string
@@ -24,4 +22,4 @@ export declare interface NestedCloudProps {
   appName: string
   domain: string
   timestamp: string
-}
+}

package/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@stacksjs/cloud",
   "type": "module",
-  "version": "0.70.23",
+  "version": "0.70.25",
   "description": "The Stacks cloud/serverless integration & implementation.",
   "author": "Chris Breuer",
-  "contributors": ["Chris Breuer <chris@stacksjs.org>"],
+  "contributors": [
+    "Chris Breuer <chris@stacksjs.com>"
+  ],
   "license": "MIT",
   "funding": "https://github.com/sponsors/chrisbbreuer",
   "homepage": "https://github.com/stacksjs/stacks/tree/main/storage/framework/core/cloud#readme",
@@ -26,54 +28,40 @@
   ],
   "exports": {
     ".": {
+      "bun": "./src/index.ts",
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     },
     "./*": {
+      "bun": "./src/*",
       "import": "./dist/*"
     }
   },
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "files": ["README.md", "dist"],
+  "files": [
+    "README.md",
+    "dist"
+  ],
   "scripts": {
-    "bootstrap": "bunx --bun cdk bootstrap",
-    "deploy": "cd ../.. && bun run build && cd ../docs && bun run build && cd ../core/cloud && bunx --bun cdk deploy --require-approval never",
     "build": "bun build.ts",
-    "build-edge": "bun build ./src/edge/origin-request.ts --outfile ./dist/origin-request.js",
     "typecheck": "bun tsc --noEmit",
     "prepublishOnly": "bun run build"
   },
+  "dependencies": {
+    "@stacksjs/ts-cloud": "^0.2.15"
+  },
   "devDependencies": {
-    "@aws-sdk/client-bedrock": "^3.777.0",
-    "@aws-sdk/client-cloudformation": "^3.777.0",
-    "@aws-sdk/client-cloudfront": "^3.777.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.777.0",
-    "@aws-sdk/client-dynamodb": "3.777.0",
-    "@aws-sdk/client-ec2": "^3.779.0",
-    "@aws-sdk/client-efs": "^3.777.0",
-    "@aws-sdk/client-iam": "^3.777.0",
-    "@aws-sdk/client-lambda": "^3.777.0",
-    "@aws-sdk/client-route-53-domains": "^3.777.0",
-    "@aws-sdk/client-s3": "^3.779.0",
-    "@aws-sdk/client-ses": "^3.777.0",
-    "@aws-sdk/client-sesv2": "^3.779.0",
-    "@aws-sdk/client-ssm": "^3.777.0",
-    "@stacksjs/cli": "0.70.22",
-    "@stacksjs/config": "0.70.22",
-    "@stacksjs/development": "0.70.22",
-    "@stacksjs/dns": "0.70.22",
-    "@stacksjs/env": "0.70.22",
-    "@stacksjs/logging": "0.70.22",
-    "@stacksjs/path": "0.70.22",
-    "@stacksjs/router": "0.70.22",
-    "@stacksjs/storage": "0.70.22",
-    "@stacksjs/utils": "0.70.22",
-    "@stacksjs/validation": "0.70.22",
-    "aws-cdk": "^2.1006.0",
-    "aws-cdk-lib": "^2.187.0",
-    "aws4fetch": "^1.0.20",
-    "constructs": "^10.4.2",
-    "source-map-support": "^0.5.21"
+    "@stacksjs/cli": "0.70.23",
+    "@stacksjs/config": "0.70.23",
+    "better-dx": "^0.2.12",
+    "@stacksjs/dns": "0.70.23",
+    "@stacksjs/env": "0.70.23",
+    "@stacksjs/logging": "0.70.23",
+    "@stacksjs/path": "0.70.23",
+    "@stacksjs/router": "0.70.23",
+    "@stacksjs/storage": "0.70.23",
+    "@stacksjs/utils": "0.70.23",
+    "@stacksjs/validation": "0.70.23"
   }
 }

package/dist/ai.d.ts

@@ -1,20 +0,0 @@
-import type { Construct } from 'constructs';
-import type { NestedCloudProps } from '../types';
-
-export declare interface AiStackProps extends NestedCloudProps {}
-export declare class AiStack {
-  constructor(scope: Construct, props: AiStackProps) {
-    const bedrockAccessPolicy = new iam.PolicyStatement({
-      effect: iam.Effect.ALLOW,
-      actions: ['bedrock:InvokeModel', 'bedrock:InvokeModelWithResponseStream'],
-      resources: config.ai.models?.map((model: string) => `arn:aws:bedrock:us-east-1::foundation-model/${model}`),
-    })
-
-    const bedrockAccessRole = new iam.Role(scope, 'BedrockAccessRole', {
-      assumedBy: new iam.ServicePrincipal('ecs-tasks.amazonaws.com'),
-      managedPolicies: [iam.ManagedPolicy.fromAwsManagedPolicyName('service-role/AmazonECSTaskExecutionRolePolicy')],
-    })
-
-    bedrockAccessRole.addToPolicy(bedrockAccessPolicy)
-  }
-}

package/dist/cdn.d.ts

@@ -1,271 +0,0 @@
-import type { ApplicationLoadBalancer } from 'aws-cdk-lib/aws-elasticloadbalancingv2';
-import type { Construct } from 'constructs';
-import type { NestedCloudProps } from '../types';
-
-export declare interface CdnStackProps extends NestedCloudProps {
-  certificate: acm.Certificate
-  logBucket: s3.Bucket
-  publicBucket: s3.Bucket
-  docsBucket?: s3.Bucket
-  firewall: wafv2.CfnWebACL
-  originRequestFunction: lambda.Function
-  zone: route53.IHostedZone
-  webServer?: lambda.Function
-  webServerUrl?: lambda.FunctionUrl
-  lb?: ApplicationLoadBalancer
-}
-export declare class CdnStack {
-  mainDistribution: cloudfront.Distribution
-  docsDistribution: cloudfront.Distribution | undefined
-  cdnCachePolicy: cloudfront.CachePolicy
-  mainVanityUrl!: string
-  docsVanityUrl: string | undefined
-  realtimeLogConfig!: cloudfront.RealtimeLogConfig
-  props: CdnStackProps
-
-  constructor(scope: Construct, props: CdnStackProps) {
-    this.props = props
-
-    this.cdnCachePolicy = new cloudfront.CachePolicy(scope, 'CdnCachePolicy', {
-      comment: 'Stacks CDN Cache Policy',
-      cachePolicyName: `${props.slug}-${props.appEnv}-cdn-cache-policy`,
-      minTtl: config.cloud.cdn?.minTtl ? Duration.seconds(config.cloud.cdn.minTtl) : undefined,
-      defaultTtl: config.cloud.cdn?.defaultTtl ? Duration.seconds(config.cloud.cdn.defaultTtl) : undefined,
-      maxTtl: config.cloud.cdn?.maxTtl ? Duration.seconds(config.cloud.cdn.maxTtl) : undefined,
-      cookieBehavior: this.getCookieBehavior(config.cloud.cdn?.cookieBehavior),
-    })
-
-    const originAccessControl = new cloudfront.S3OriginAccessControl(scope, 'WebOAC', {
-      originAccessControlName: `${props.slug}-${props.appEnv}-web-oac-${props.timestamp}`,
-      description: 'Access from CloudFront to the frontend bucket.',
-      signing: cloudfront.Signing.SIGV4_NO_OVERRIDE,
-    })
-
-    if (config.app.docMode) {
-      this.mainDistribution = this.createDistribution(
-        scope,
-        props,
-        props.docsBucket as s3.Bucket,
-        this.createDocsOriginRequestFunction(scope),
-        props.domain,
-        'MainCdn',
-        originAccessControl,
-      )
-    }
-    else {
-      this.mainDistribution = this.createDistribution(
-        scope,
-        props,
-        props.publicBucket,
-        props.originRequestFunction,
-        props.domain,
-        'MainCdn',
-        originAccessControl,
-      )
-
-      if (props.docsBucket) {
-        this.docsDistribution = this.createDistribution(
-          scope,
-          props,
-          props.docsBucket,
-          this.createDocsOriginRequestFunction(scope),
-          `docs.${props.domain}`,
-          'DocsCdn',
-          originAccessControl,
-        )
-      }
-    }
-
-    this.createRoute53Records(scope, props)
-
-    this.createOutputs(scope, props)
-  }
-
-  createDistribution(
-    scope: Construct,
-    props: CdnStackProps,
-    sourceBucket: s3.Bucket,
-    originRequestFunction: lambda.Function,
-    domainName: string,
-    id: string,
-    originAccessControl: cloudfront.S3OriginAccessControl,
-  ): cloudfront.Distribution {
-    return new cloudfront.Distribution(scope, id, {
-      domainNames: [domainName],
-      defaultRootObject: 'index.html',
-      comment: `CDN for ${domainName}`,
-      certificate: props.certificate,
-      enableLogging: true,
-      logBucket: props.logBucket,
-      httpVersion: cloudfront.HttpVersion.HTTP2_AND_3,
-      priceClass: cloudfront.PriceClass.PRICE_CLASS_ALL,
-      enabled: true,
-      minimumProtocolVersion: cloudfront.SecurityPolicyProtocol.TLS_V1_2_2021,
-      webAclId: props.firewall.attrArn,
-      enableIpv6: true,
-      defaultBehavior: {
-        origin: new origins.S3StaticWebsiteOrigin(sourceBucket, {
-          originPath: '/',
-          originAccessControlId: originAccessControl.originAccessControlId,
-        }),
-        edgeLambdas: [
-          {
-            eventType: cloudfront.LambdaEdgeEventType.ORIGIN_REQUEST,
-            functionVersion: originRequestFunction.currentVersion,
-          },
-        ],
-        compress: config.cloud.cdn?.compress,
-        allowedMethods: this.allowedMethods(),
-        cachedMethods: this.cachedMethods(),
-        viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
-        cachePolicy: this.cdnCachePolicy,
-      },
-      errorResponses: [
-        {
-          httpStatus: 404,
-          responsePagePath: '/index.html',
-          responseHttpStatus: 200,
-          ttl: Duration.millis(0),
-        },
-        {
-          httpStatus: 403,
-          responsePagePath: '/index.html',
-          responseHttpStatus: 200,
-          ttl: Duration.millis(0),
-        },
-      ],
-    })
-  }
-
-  createRoute53Records(scope: Construct, props: CdnStackProps): void {
-    new route53.ARecord(scope, 'MainAliasRecord', {
-      recordName: props.domain,
-      zone: props.zone,
-      target: route53.RecordTarget.fromAlias(new targets.CloudFrontTarget(this.mainDistribution)),
-    })
-
-    if (this.docsDistribution) {
-      new route53.ARecord(scope, 'DocsAliasRecord', {
-        recordName: `docs.${props.domain}`,
-        zone: props.zone,
-        target: route53.RecordTarget.fromAlias(new targets.CloudFrontTarget(this.docsDistribution)),
-      })
-    }
-  }
-
-  createOutputs(scope: Construct, props: CdnStackProps): void {
-    new Output(scope, 'MainDistributionId', {
-      value: this.mainDistribution.distributionId,
-    })
-
-    new Output(scope, 'MainUrl', {
-      value: `https:
-      description: 'The URL of the deployed main application',
-    })
-
-    this.mainVanityUrl = `https:
-    new Output(scope, 'MainVanityUrl', {
-      value: this.mainVanityUrl,
-      description: 'The vanity URL of the deployed main application',
-    })
-
-    if (this.docsDistribution) {
-      new Output(scope, 'DocsDistributionId', {
-        value: this.docsDistribution.distributionId,
-      })
-
-      this.docsVanityUrl = `https:
-      new Output(scope, 'DocsAppVanityUrl', {
-        value: this.docsVanityUrl,
-        description: 'The vanity URL of the deployed docs application',
-      })
-    }
-  }
-
-  createDocsOriginRequestFunction(scope: Construct): lambda.Function {
-    const docsOriginRequestFunction = new lambda.Function(scope, 'DocsOriginRequestFunction', {
-      functionName: `${this.props.slug}-${this.props.appEnv}-docs-origin-request-function-${this.props.timestamp}`,
-      description: 'Custom origin request function for the docs',
-      runtime: lambda.Runtime.NODEJS_20_X,
-      handler: 'index.handler',
-      code: lambda.Code.fromInline(`
-        const config = {
-          suffix: '.html',
-        }
-
-        const regexSuffixless = /\\/[^/.]+$/
-        const regexTrailingSlash = /.+\\/$/
-
-        exports.handler = (event, context, callback) => {
-          const request = event.Records[0].cf.request;
-          const uri = request.uri;
-
-          if (uri === '/') {
-            request.uri = '/index.html';
-            callback(null, request);
-            return;
-          }
-
-          if (uri.match(regexSuffixless)) {
-            request.uri = uri + '.html';
-            callback(null, request);
-            return;
-          }
-
-          if (uri.match(regexTrailingSlash)) {
-            request.uri = uri.slice(0, -1) + '.html';
-            callback(null, request);
-            return;
-          }
-
-          callback(null, request);
-        };
-      `),
-    })
-
-    new lambda.CfnPermission(scope, 'DocsOriginRequestFunctionPermission', {
-      action: 'lambda:InvokeFunction',
-      principal: 'edgelambda.amazonaws.com',
-      functionName: docsOriginRequestFunction.functionName,
-    })
-
-    return docsOriginRequestFunction
-  }
-
-  getCookieBehavior(cookieBehavior: string | undefined): cloudfront.CacheCookieBehavior | undefined {
-    switch (cookieBehavior) {
-      case 'none':
-        return cloudfront.CacheCookieBehavior.none()
-      case 'all':
-        return cloudfront.CacheCookieBehavior.all()
-      case 'allowList':
-        return cloudfront.CacheCookieBehavior.allowList(...(config.cloud.cdn?.allowList.cookies || []))
-      default:
-        return undefined
-    }
-  }
-
-  allowedMethods(): cloudfront.AllowedMethods {
-    switch (config.cloud.cdn?.allowedMethods) {
-      case 'ALL':
-        return cloudfront.AllowedMethods.ALLOW_ALL
-      case 'GET_HEAD':
-        return cloudfront.AllowedMethods.ALLOW_GET_HEAD
-      case 'GET_HEAD_OPTIONS':
-        return cloudfront.AllowedMethods.ALLOW_GET_HEAD_OPTIONS
-      default:
-        return cloudfront.AllowedMethods.ALLOW_ALL
-    }
-  }
-
-  cachedMethods(): cloudfront.CachedMethods {
-    switch (config.cloud.cdn?.cachedMethods) {
-      case 'GET_HEAD':
-        return cloudfront.CachedMethods.CACHE_GET_HEAD
-      case 'GET_HEAD_OPTIONS':
-        return cloudfront.CachedMethods.CACHE_GET_HEAD_OPTIONS
-      default:
-        return cloudfront.CachedMethods.CACHE_GET_HEAD
-    }
-  }
-}

package/dist/cli.d.ts

@@ -1,12 +0,0 @@
-import type { Construct } from 'constructs';
-import type { NestedCloudProps } from '../types';
-
-export declare interface CliStackProps extends NestedCloudProps {}
-export declare class CliStack {
-  constructor(scope: Construct, props: CliStackProps) {
-    new Output(scope, 'CliSetupUrl', {
-      value: `https:
-      description: 'URL to trigger the CLI setup function',
-    })
-  }
-}