chore: wip

Author: chrisbbreuer

storage/framework/core/cloud/src/cloud/security.ts

@@ -28,7 +28,7 @@ export class SecurityStack {
         cloudWatchMetricsEnabled: true,
         metricName: 'firewallMetric',
       },
-      rules: this.getFirewallRules(),
+      rules: this.getFirewallRules(scope),
     }
 
     this.firewall = new wafv2.CfnWebACL(scope, 'StacksWebFirewall', options)
@@ -51,7 +51,7 @@ export class SecurityStack {
     })
   }
 
-  getFirewallRules() {
+  getFirewallRules(scope: Construct): wafv2.CfnWebACL.RuleProperty[] {
     const rules: wafv2.CfnWebACL.RuleProperty[] = []
     const priorities = []
 
@@ -61,9 +61,9 @@ export class SecurityStack {
         name: 'CountryRule',
         priority: priorities.length,
         statement: {
-          geoMatchStatement: {
-            countryCodes: config.security.firewall.countryCodes,
-          },
+          // geoMatchStatement: {
+          //   countryCodes: config.security.firewall.countryCodes,
+          // },
         },
         action: {
           block: {},
@@ -77,7 +77,7 @@ export class SecurityStack {
     }
 
     if (config.security.firewall?.ipAddresses?.length) {
-      const ipSet = new wafv2.CfnIPSet(this, 'IpSet', {
+      const ipSet = new wafv2.CfnIPSet(scope, 'IpSet', {
         name: 'IpSet',
         description: 'IP Set',
         scope: 'CLOUDFRONT',

storage/framework/core/config/src/helpers.ts

@@ -1,4 +1,4 @@
-import type { AppConfig, CacheConfig, CdnConfig, ChatConfig, CliConfig, DatabaseConfig, DependenciesConfig, DnsConfig, EmailConfig, Events, GitConfig, HashingConfig, JobConfig, LibraryConfig, Model, NotificationConfig, PaymentConfig, QueueConfig, SearchEngineConfig, SecurityConfig, ServicesConfig, SmsConfig, StacksConfig, StorageConfig, UiConfig } from '@stacksjs/types'
+import type { AppConfig, CacheConfig, CdnConfig, ChatConfig, CliConfig, DatabaseConfig, DependenciesConfig, DnsConfig, EmailConfig, Events, GitConfig, HashingConfig, JobConfig, LibraryConfig, Model, NotificationConfig, PaymentConfig, QueueConfig, SearchEngineConfig, SecurityConfig, ServicesConfig, StacksConfig, StorageConfig, UiConfig } from '@stacksjs/types'
 import { createLocalTunnel } from '@stacksjs/tunnel'
 import { config } from '.'
 
@@ -235,7 +235,7 @@ export function defineServices(config: ServicesConfig) {
   return config
 }
 
-export function defineSms(config: SmsConfig) {
+export function defineSms(config: any) {
   return config
 }
 

storage/framework/core/index.ts

@@ -14,7 +14,6 @@ export * as cloud from './cloud/src'
 export * as collections from './collections/src'
 export * as config from './config/src'
 export * from './database/src'
-export * from './datetime/src'
 export * from './desktop/src'
 export * from './development/src'
 export * from './dns/src'
@@ -44,7 +43,6 @@ export * from './scheduler/src'
 export * from './search-engine/src'
 export * from './security/src'
 export * from './server/src'
-export * from './signals/src'
 export * from './slug/src'
 export * from './sms/src'
 export * from './storage/src'

storage/framework/core/utils/src/helpers.ts

@@ -1,25 +1,23 @@
 import type { AddressInfo } from 'node:net'
-
-// import { runAction } from '@stacksjs/actions'
 import { log, runCommand } from '@stacksjs/cli'
 import type { Result } from '@stacksjs/error-handling'
 import { err, handleError, ok } from '@stacksjs/error-handling'
 import { frameworkPath, projectPath } from '@stacksjs/path'
 import * as storage from '@stacksjs/storage'
-import type { CliOptions, Manifest, SyncSubprocess } from '@stacksjs/types'
+import type { CliOptions, Manifest, Subprocess } from '@stacksjs/types'
 import type { NpmScript } from '@stacksjs/enums'
 import { Action } from '@stacksjs/enums'
 import { parse } from 'yaml'
+import { app, ui } from '@stacksjs/config'
 
 // import { semver } from './versions'
-import { app, ui } from '@stacksjs/config'
 
 export async function packageManager() {
   const { packageManager } = await storage.readPackageJson(frameworkPath('package.json'))
   return packageManager
 }
 
-export async function initProject(): Promise<Result<SyncSubprocess, Error>> {
+export async function initProject(): Promise<Result<Subprocess, Error>> {
   if (app.env !== 'production')
     log.info('Project not yet initialized, generating application key...')
   else
@@ -131,10 +129,11 @@ export async function setEnvValue(key: string, value: string) {
 /**
  * Runs the specified NPM script in the package.json file.
  */
-export async function runNpmScript(script: NpmScript, options?: CliOptions): Promise<Result<SyncSubprocess, Error>> {
+export async function runNpmScript(script: NpmScript, options?: CliOptions): Promise<Result<Subprocess, Error>> {
   const { data: manifest } = await storage.readJsonFile('package.json', frameworkPath())
 
-  if (isManifest(manifest) && hasScript(manifest, script)) // simple, yet effective check to see if the script exists
+  // simple, yet effective check to see if the script exists
+  if (isManifest(manifest) && hasScript(manifest, script))
     return await runCommand(`bun --bun run ${script}`, options)
 
   return err(handleError(`The ${script} script does not exist in the package.json file.`))