nsbp-cli 0.2.18 → 0.2.20

package/README.md

@@ -147,7 +147,7 @@ node ./bin/nsbp.js --help  # Test CLI locally
 
 - **Package Name**: `nsbp-cli`
 - **Bin Command**: `nsbp` (install globally and run `nsbp --help`)
-- **Version**: `0.2.18`
+- **Version**: `0.2.20`
 - **Dependencies**: chalk, commander, fs-extra, inquirer
 - **Package Manager**: Uses pnpm (also compatible with npm)
 - **Node Version**: >=16.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nsbp-cli",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "description": "CLI tool for creating NSBP (Node React SSR by Webpack) projects",
   "main": "index.js",
   "homepage": "https://nsbp.erishen.cn/",

package/templates/basic/gitignore

@@ -0,0 +1,53 @@
+.DS_Store
+Thumbs.db
+
+# Dependencies
+node_modules
+package-lock.json
+yarn.lock
+pnpm-lock.yaml
+
+# Build outputs
+build
+dist
+public/js
+public/css
+public/client.*
+public/*.js
+public/*.js.map
+public/*.txt
+public/*.json
+.temp_cache
+
+# Environment variables
+.env
+.env.local
+.env.*.local
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Testing
+coverage
+.nyc_output
+
+# Development tools
+.serena
+.vscode
+.idea
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db

package/templates/basic/src/externals/window.d.ts

@@ -1,3 +1,13 @@
+interface ServerState {
+  photo?: {
+    data?: [number, number, string][]
+    menu?: Record<string, any> | Array<{ name: string; cover?: string; count?: number }>
+  }
+  query?: Record<string, any>
+}
+
 declare interface Window {
-  context: any
+  context: {
+    state: ServerState
+  }
 }

package/templates/basic/src/reducers/index.ts

@@ -4,15 +4,10 @@ import { REQUEST_QUERY } from '../store/constants'
 
 const queryReducer = (state = {}, action: any) => {
   const { type, query } = action
-  let newState = null
 
   switch (type) {
     case REQUEST_QUERY:
-      newState = {
-        ...query
-      }
-
-      return newState
+      return { ...query }
     default:
       return state
   }

package/templates/basic/src/reducers/photo.ts

@@ -1,22 +1,18 @@
 import { GET_PHOTO_MENU, GET_PHOTO_WIDTH_HEIGHT } from '../store/constants'
 
-export const photoReducer = (state = { data: [[0, 0]], menu: {} }, action: any) => {
+interface PhotoState {
+  data: [number, number, string][]
+  menu: Record<string, any> | Array<{ name: string; cover?: string; count?: number }>
+}
+
+export const photoReducer = (state: PhotoState = { data: [[0, 0]], menu: {} }, action: any) => {
   const { type, data, menu } = action
-  let newState = null
 
   switch (type) {
     case GET_PHOTO_MENU:
-      newState = Object.assign({}, state)
-
-      if (menu) newState.menu = menu
-
-      return newState
+      return { ...state, menu: menu !== undefined ? menu : state.menu }
     case GET_PHOTO_WIDTH_HEIGHT:
-      newState = Object.assign({}, state)
-
-      if (data) newState.data = data
-
-      return newState
+      return { ...state, data: data !== undefined ? data : state.data }
     default:
       return state
   }

package/templates/basic/src/server/index.ts

@@ -24,6 +24,7 @@ app.use((req, res) => {
   render(req, res)
 })
 
-app.listen(3001, () => {
-  // Server started successfully
+const PORT = process.env.PORT || 3001
+app.listen(PORT, () => {
+  console.log(`Server listening on port ${PORT}`)
 })

package/templates/basic/src/server/photo.ts

@@ -2,9 +2,6 @@
 import fs from "fs"
 import path from "path"
 import probe from 'probe-image-size'
-import { useCurrentFlag, outPhotoDic, outPhotoSep, outPhotoDicPath } from '../utils/config'
-
-const CURRENT_DIC = 'images'
 
 // 获取项目根目录（无论从哪个目录运行服务器）
 const getProjectRoot = () => {
@@ -67,12 +64,24 @@ export const getPhotoWH = (req: any, res: any) => {
     const dic = req.query.dic || ''
     const photosDicPath = getPhotosDicPath()
 
+    // 验证 dic 参数，只允许字母数字、下划线和短横线
+    if (dic && !/^[a-zA-Z0-9_-]+$/.test(dic)) {
+      return res.status(400).json({ error: 'Invalid directory name' })
+    }
+
     const fileList: any = []
     let photoPath = photosDicPath
     if (dic) {
       photoPath = path.join(photosDicPath, dic)
     }
 
+    // 确保路径在允许的目录内，防止路径遍历攻击
+    const resolvedPhotoPath = path.resolve(photoPath)
+    const resolvedPhotosDicPath = path.resolve(photosDicPath)
+    if (!resolvedPhotoPath.startsWith(resolvedPhotosDicPath)) {
+      return res.status(403).json({ error: 'Access denied' })
+    }
+
     const getFileList = (dir: string, list: string[]) => {
       const arr = fs.readdirSync(dir)
       arr.forEach((item) => {
@@ -99,12 +108,13 @@ export const getPhotoWH = (req: any, res: any) => {
 
     // 按前端期望的格式包装
     res.json({ data: whArr })
-  } catch (err) {
+  } catch (err: any) {
+    console.error('getPhotoWH error:', err)
     res.status(500).json({ error: 'Internal Server Error', details: err.message })
   }
 }
 
-export const getPhotoMenu = (req: any, res: any) => {
+export const getPhotoMenu = (_req: any, res: any) => {
   try {
     const photosDicPath = getPhotosDicPath()
 
@@ -112,7 +122,8 @@ export const getPhotoMenu = (req: any, res: any) => {
 
     // 按前端期望的格式包装
     res.json({ data: fileMenu })
-  } catch (err) {
+  } catch (err: any) {
+    console.error('getPhotoMenu error:', err)
     res.status(500).json({ error: 'Internal Server Error', details: err.message })
   }
 }

package/templates/basic/src/server/utils.tsx

@@ -1,10 +1,15 @@
-import React from 'react' //引入React以支持JSX的语法
-import { renderToString } from 'react-dom/server' //引入renderToString方法
-import { StaticRouter, Routes, Route, matchPath } from 'react-router-dom'
+import React from 'react'
+import { renderToString } from 'react-dom/server'
+import { StaticRouter, Route, matchPath } from 'react-router-dom'
+// @ts-ignore - Routes is available in react-router-dom v7 but not in types
+import { Routes } from 'react-router-dom'
 import routers from '../Routers'
+// @ts-ignore
 import { Provider } from 'react-redux'
+// @ts-ignore
 import getStore from '../store'
 import serialize from 'serialize-javascript'
+// @ts-ignore
 import { REQUEST_QUERY } from '../store/constants'
 import { Helmet } from 'react-helmet'
 import { ServerStyleSheet } from 'styled-components'
@@ -12,14 +17,9 @@ import Theme from '../component/Theme'
 import path from 'path'
 import { ChunkExtractor } from '@loadable/server'
 
-const removeCommentsAndSpacing = (str = '') =>
-  str.replace(/\/\*.*\*\//g, ' ').replace(/\s+/g, ' ')
-
-const removeSpacing = (str = '') => str.replace(/\s+/g, ' ')
-
 export const render = (req: any, res: any) => {
   const store = getStore()
-  const { path:reqPath, query, url } = req
+  const { path:reqPath, query } = req
   const matchRoutes: any = []
   const promises = []
 
@@ -30,21 +30,7 @@ export const render = (req: any, res: any) => {
   }
 
   routers.some((route) => {
-    matchPath({ path: route.path, end: true }, reqPath) ? matchRoutes.push(route) : ''
-  })
-
-  matchRoutes.forEach((item: any) => {
-    if (item?.loadData) {
-      const promise = new Promise((resolve, reject) => {
-        try {
-          store.dispatch(item?.loadData(resolve))
-        } catch (e) {
-          reject()
-        }
-      })
-
-      promises.push(promise)
-    }
+    matchPath(reqPath, route.path) ? matchRoutes.push(route) : ''
   })
 
   matchRoutes.forEach((item: any) => {
@@ -148,11 +134,14 @@ export const render = (req: any, res: any) => {
           `
 
         res.send(html)
-      } catch (e) {
+      } catch (e: any) {
+        console.error('SSR rendering error:', e)
         sheet.seal()
+        res.status(500).send('Internal Server Error')
       }
     })
-    .catch((e) => {
-      // Error handling
+    .catch((e: any) => {
+      console.error('Data loading error:', e)
+      res.status(500).send('Data loading failed')
     })
 }

package/templates/basic/src/utils/config.ts

@@ -1,7 +1,7 @@
+import path from 'path'
+
 export const useCurrentFlag = true // 是否使用当前目录环境
 
 export const outPhotoDic = 'Photos'
 
-export const outPhotoSep = '\\'
-
-export const outPhotoDicPath = `D:${outPhotoSep}${outPhotoDic}`
+export const outPhotoDicPath = path.join('D:', outPhotoDic)

package/templates/basic/src/utils/index.ts

@@ -1,31 +1,23 @@
-export const getLocationParams = (param: any) => {
-  let result = ''
-  if (param !== '') {
-    const href = window?.location?.href
-    if (href && href.indexOf('?') !== -1) {
-      const query = href.split('?')[1]
-      const queryArr = query.split('&')
+export const getLocationParams = (param: string) => {
+  if (typeof window === 'undefined') return ''
 
-      queryArr.forEach((item) => {
-        const itemArr = item.split('=')
-
-        if (param.toLowerCase() === itemArr[0].toLowerCase()) {
-          result = itemArr[1]
-          return false
-        }
-      })
-    }
+  try {
+    const url = new URL(window.location.href)
+    const value = url.searchParams.get(param)
+    return value || ''
+  } catch (e) {
+    console.error('Failed to parse URL:', e)
+    return ''
   }
-  return result
 }
 
 export const isSEO = () => {
   if (typeof window !== 'undefined') {
-    let seo: any = getLocationParams('seo')
+    const seo = getLocationParams('seo')
     if (seo !== '') {
-      seo = parseInt(seo, 10)
+      return parseInt(seo, 10)
     }
-    return seo
+    return 0
   }
   return 0
 }

package/templates/basic/tsconfig.json

@@ -1,17 +1,21 @@
 {
   "compilerOptions": {
-    "target": "esnext", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
-    "lib": ["es5", "es6", "dom"], /* Specify library files to be included in the compilation. */  "module": "esnext", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
-    "removeComments": false, /* Do not emit comments to output. @loadable/components 必须置为 false */
-    "jsx": "react", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    "sourceMap": true, /* Generates corresponding '.map' file. */
-    "outDir": "./build/", /* Redirect output structure to the directory. */
-    "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
-    "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
-    "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
-    "preserveConstEnums": true
+    "target": "esnext",
+    "lib": ["es5", "es6", "dom"],
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "removeComments": false,
+    "jsx": "react",
+    "sourceMap": true,
+    "outDir": "./build/",
+    "noImplicitAny": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "preserveConstEnums": true,
+    "skipLibCheck": true
   },
-  "include":[ 
+  "include":[
     "./src/**/*",
     "./src/externals/*.d.ts"
   ]