change:slogen

xiangnanscu · xiangnanscu · commit 013f333cf2c3 · 2024-12-04T22:24:38.000+08:00
diff --git a/app.lua b/app.lua
@@ -113,7 +113,7 @@ end)
 router:get("/func", function(ctx)
   return function()
     ngx.header.content_type = 'text/plain; charset=utf-8'
-    ngx.say("function called2")
+    ngx.print("function called")
   end
 end)
 
@@ -127,4 +127,9 @@ router:get("/events", function(ctx)
   return ctx.cnt
 end)
 
+-- 12. ctx.response.body
+router:get("/response-body", function(ctx)
+  ctx.response.body = "response body"
+end)
+
 return router
diff --git a/index.ts b/index.ts
@@ -73,73 +73,6 @@ function emptyDir(dir) {
   )
 }
 
-const LINE =
-  /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm
-
-// Parser src into an Object
-function parseEnv(src) {
-  const obj = {}
-
-  // Convert buffer to string
-  let lines = src.toString()
-
-  // Convert line breaks to same format
-  lines = lines.replace(/\r\n?/gm, '\n')
-
-  let match
-  while ((match = LINE.exec(lines)) != null) {
-    const key = match[1]
-
-    // Default undefined or null to empty string
-    let value = match[2] || ''
-
-    // Remove whitespace
-    value = value.trim()
-
-    // Check if double quoted
-    const maybeQuote = value[0]
-
-    // Remove surrounding quotes
-    value = value.replace(/^(['"`])([\s\S]*)\1$/gm, '$2')
-
-    // Expand newlines if double quoted
-    if (maybeQuote === '"') {
-      value = value.replace(/\\n/g, '\n')
-      value = value.replace(/\\r/g, '\r')
-    }
-
-    // Add to object
-    obj[key] = value
-  }
-
-  return obj
-}
-const envContext = parseEnv(
-  fs.readFileSync(path.resolve(__dirname, '.env'), { encoding: 'utf8' })
-)
-
-const normalizeArgv = (argv) => {
-  const d = {}
-  for (const key in argv) {
-    d[key.replace(/-/g, '_').toUpperCase()] = argv[key]
-  }
-  if (d.PROD) {
-    d.NODE_ENV = 'production'
-  } else {
-    d.NODE_ENV = 'development'
-  }
-  d.HTTPS = d.HTTPS ?? true
-  if (d.HTTPS) {
-    d.VITE_HTTPS = 'on'
-  }
-  if (d.HOST) {
-    d.VITE_HOST = d.HOST
-  } else {
-    d.HOST = envContext.VITE_HOST
-    d.VITE_HOST = d.HOST
-  }
-  return d
-}
 
 async function init() {
   console.log()
@@ -169,7 +102,7 @@ async function init() {
     // all arguments are treated as booleans
     boolean: true
   })
-  const normalizedArgv = normalizeArgv(argv)
+  const normalizedArgv = argv
 
   // if any of the feature flags is set, we would skip the feature prompts
   const isFeatureFlagsUsed =
@@ -309,7 +242,6 @@ async function init() {
   render('.')
 
   // add dynamic scritps block
-  const HOST = normalizedArgv.HOST
   const packageJsonPath = path.resolve(root, 'package.json')
   const existingPkg = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
   const updatedPkg = sortDependencies(
@@ -320,7 +252,7 @@ async function init() {
       }
     })
   )
-  console.log({ argv, normalizedArgv, targetDir, projectName })
+  // console.log({ argv, normalizedArgv, targetDir, projectName })
   fs.writeFileSync(packageJsonPath, JSON.stringify(updatedPkg, null, 2) + '\n', 'utf-8')
 
   // An external data store for callbacks to share data
@@ -417,20 +349,22 @@ async function init() {
     })
   )
 
-  console.log(`\nDone. Now run:\n`)
+  console.log(`\nDone. to start the server, run:\n`)
   if (root !== cwd) {
     const cdProjectName = path.relative(cwd, root)
     console.log(
       `  ${bold(green(`cd ${cdProjectName.includes(' ') ? `"${cdProjectName}"` : cdProjectName}`))}`
     )
   }
-  console.log(`  ${bold(green(getCommand(packageManager, 'init-github')))}`)
-  console.log(`  ${bold(green(getCommand(packageManager, 'install')))}`)
+  // console.log(`  ${bold(green(getCommand(packageManager, 'init-github')))}`)
+  // console.log(`  ${bold(green(getCommand(packageManager, 'install')))}`)
   if (needsPrettier) {
-    console.log(`  ${bold(green(getCommand(packageManager, 'format')))}`)
+    // console.log(`  ${bold(green(getCommand(packageManager, 'format')))}`)
   }
-  console.log(`  ${bold(green(getCommand(packageManager, 'dev')))}`)
+  console.log(`  ${bold(green(getCommand(packageManager, 'start')))}`)
   console.log()
+  console.log(`to stop the server, run:\n`)
+  console.log(`  ${bold(green(getCommand(packageManager, 'stop')))}`)
 }
 
 init().catch((e) => {
diff --git a/lib/resty/router.lua b/lib/resty/router.lua
@@ -429,7 +429,11 @@ function Router:dispatch(path, method)
         return self:fail(ctx, err_or_okcode, errcode)
       elseif rawget(ctx, 'response') then
         local code = ctx.response.status or 200
-        return self:echo(ctx, ctx.response.body, code)
+        if ctx.response.body then
+          return self:echo(ctx, ctx.response.body, code)
+        else
+          return self:echo(ctx, 'no response', 500)
+        end
       else
         return self:echo(ctx, 'no response', 500)
       end
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-lua-resty-router-tmp",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "high performance router",
   "type": "module",
   "bin": {
diff --git a/template/lib/resty/router.lua b/template/lib/resty/router.lua
@@ -429,7 +429,11 @@ function Router:dispatch(path, method)
         return self:fail(ctx, err_or_okcode, errcode)
       elseif rawget(ctx, 'response') then
         local code = ctx.response.status or 200
-        return self:echo(ctx, ctx.response.body, code)
+        if ctx.response.body then
+          return self:echo(ctx, ctx.response.body, code)
+        else
+          return self:echo(ctx, 'no response', 500)
+        end
       else
         return self:echo(ctx, 'no response', 500)
       end
diff --git a/test.py b/test.py
@@ -25,6 +25,7 @@ def test_endpoint(
     expected_code: int = 200,
     expected_response: Optional[Union[str, dict, list]] = None,
     expected_content_type: Optional[str] = None,
+    expected_substring: Optional[str] = None,
 ) -> None:
     """
     Test a single endpoint
@@ -36,6 +37,7 @@ def test_endpoint(
         expected_response: Expected response content. Can be:
             - string: for substring matching
             - dict/list: for complete JSON matching
+        expected_substring: Expected substring in response content (optional)
         expected_content_type: Expected Content-Type (optional)
     """
     test_stats['total'] += 1
@@ -92,13 +94,13 @@ def test_endpoint(
         else:
             actual_text = response.text
             if isinstance(expected_response, str):
-                if expected_response in actual_text:
+                if expected_response == actual_text:
                     print(f"{GREEN}✓ Test passed{NC}")
                     test_stats['passed'] += 1
                 else:
                     print(f"{RED}✗ Response content mismatch{NC}")
-                    print(f"Expected: {expected_response}")
-                    print(f"Got: {actual_text}")
+                    print(f"Expected: {repr(expected_response)}")
+                    print(f"Got: {repr(actual_text)}")
                     test_stats['failed'] += 1
             else:
                 print(f"{RED}✗ Response type mismatch{NC}")
@@ -157,7 +159,7 @@ def run_tests():
     # 7. Test error handling
     test_endpoint("/error",
                  expected_code=500,
-                 expected_response="Test Error")
+                 expected_substring="Test Error")
     test_endpoint("/custom-error",
                  expected_code=500,
                  expected_response={"code": 400, "message": "Custom Error"},
@@ -189,6 +191,9 @@ def run_tests():
     test_endpoint("/add", expected_response=1)
     test_endpoint("/events", expected_response=1)
 
+    # 12. Test ctx.response.body
+    test_endpoint("/response-body", expected_response="response body")
+
 if __name__ == "__main__":
     try:
         run_tests()
diff --git a/utils/banner.cjs b/utils/banner.cjs
@@ -1,7 +1,14 @@
-const s = require('gradient-string')([
+const slogan = 'lua-resty-router - Elegant, performant and productive router for Openresty'
+const colorizedslogan = require('gradient-string')([
   { color: '#42d392', pos: 0 },
   { color: '#42d392', pos: 0.1 },
   { color: '#647eff', pos: 1 }
-])('lua-resty-router - Elegant, performant and productive router for Openresty')
+])(slogan)
 
-console.log(JSON.stringify(s))
+
+
+console.log(`
+const defaultBanner = '${slogan}'
+const gradientBanner = ${JSON.stringify(colorizedslogan)}
+export { defaultBanner, gradientBanner }
+  `)
diff --git a/utils/banners.ts b/utils/banners.ts
@@ -1,14 +1,3 @@
-const defaultBanner = 'Vue.js - The Progressive JavaScript Framework'
-
-// generated by the following code:
-//
-// require('gradient-string')([
-//   { color: '#42d392', pos: 0 },
-//   { color: '#42d392', pos: 0.1 },
-//   { color: '#647eff', pos: 1 }
-// ])('Vue.js - The Progressive JavaScript Framework'))
-//
-// Use the output directly here to keep the bundle small.
-const gradientBanner =
-"\u001b[38;2;66;211;146ml\u001b[39m\u001b[38;2;66;211;146mu\u001b[39m\u001b[38;2;66;211;146ma\u001b[39m\u001b[38;2;66;211;146m-\u001b[39m\u001b[38;2;66;211;146mr\u001b[39m\u001b[38;2;66;211;146me\u001b[39m\u001b[38;2;66;211;146ms\u001b[39m\u001b[38;2;67;209;148mt\u001b[39m\u001b[38;2;67;208;150my\u001b[39m\u001b[38;2;68;206;152m-\u001b[39m\u001b[38;2;68;205;154mr\u001b[39m\u001b[38;2;69;203;156mo\u001b[39m\u001b[38;2;70;202;158mu\u001b[39m\u001b[38;2;70;200;160mt\u001b[39m\u001b[38;2;71;199;162me\u001b[39m\u001b[38;2;71;197;164mr\u001b[39m \u001b[38;2;72;196;165m-\u001b[39m \u001b[38;2;73;194;167mH\u001b[39m\u001b[38;2;73;193;169mi\u001b[39m\u001b[38;2;74;191;171mg\u001b[39m\u001b[38;2;75;190;173mh\u001b[39m \u001b[38;2;75;188;175mp\u001b[39m\u001b[38;2;76;187;177me\u001b[39m\u001b[38;2;76;185;179mr\u001b[39m\u001b[38;2;77;184;181mf\u001b[39m\u001b[38;2;78;182;183mo\u001b[39m\u001b[38;2;78;181;185mr\u001b[39m\u001b[38;2;79;179;187mm\u001b[39m\u001b[38;2;79;178;189ma\u001b[39m\u001b[38;2;80;176;191mn\u001b[39m\u001b[38;2;81;175;193mc\u001b[39m\u001b[38;2;81;173;195me\u001b[39m \u001b[38;2;82;172;197ma\u001b[39m\u001b[38;2;82;170;199mn\u001b[39m\u001b[38;2;83;169;201md\u001b[39m \u001b[38;2;84;167;202mp\u001b[39m\u001b[38;2;84;165;204mr\u001b[39m\u001b[38;2;85;164;206mo\u001b[39m\u001b[38;2;85;162;208md\u001b[39m\u001b[38;2;86;161;210mu\u001b[39m\u001b[38;2;87;159;212mc\u001b[39m\u001b[38;2;87;158;214mt\u001b[39m\u001b[38;2;88;156;216mi\u001b[39m\u001b[38;2;88;155;218mv\u001b[39m\u001b[38;2;89;153;220me\u001b[39m \u001b[38;2;90;152;222mr\u001b[39m\u001b[38;2;90;150;224mo\u001b[39m\u001b[38;2;91;149;226mu\u001b[39m\u001b[38;2;92;147;228mt\u001b[39m\u001b[38;2;92;146;230me\u001b[39m\u001b[38;2;93;144;232mr\u001b[39m \u001b[38;2;93;143;234mf\u001b[39m\u001b[38;2;94;141;236mo\u001b[39m\u001b[38;2;95;140;237mr\u001b[39m \u001b[38;2;95;138;239mO\u001b[39m\u001b[38;2;96;137;241mp\u001b[39m\u001b[38;2;96;135;243me\u001b[39m\u001b[38;2;97;134;245mn\u001b[39m\u001b[38;2;98;132;247mr\u001b[39m\u001b[38;2;98;131;249me\u001b[39m\u001b[38;2;99;129;251ms\u001b[39m\u001b[38;2;99;128;253mt\u001b[39m\u001b[38;2;100;126;255my\u001b[39m"
-export { defaultBanner, gradientBanner }
+const defaultBanner = 'lua-resty-router - Elegant, performant and productive router for Openresty'
+const gradientBanner = "\u001b[38;2;66;211;146ml\u001b[39m\u001b[38;2;66;211;146mu\u001b[39m\u001b[38;2;66;211;146ma\u001b[39m\u001b[38;2;66;211;146m-\u001b[39m\u001b[38;2;66;211;146mr\u001b[39m\u001b[38;2;66;211;146me\u001b[39m\u001b[38;2;66;211;146ms\u001b[39m\u001b[38;2;66;211;146mt\u001b[39m\u001b[38;2;67;210;148my\u001b[39m\u001b[38;2;67;208;150m-\u001b[39m\u001b[38;2;68;207;152mr\u001b[39m\u001b[38;2;68;205;154mo\u001b[39m\u001b[38;2;69;204;155mu\u001b[39m\u001b[38;2;70;202;157mt\u001b[39m\u001b[38;2;70;201;159me\u001b[39m\u001b[38;2;71;199;161mr\u001b[39m \u001b[38;2;71;198;163m-\u001b[39m \u001b[38;2;72;196;165mE\u001b[39m\u001b[38;2;72;195;167ml\u001b[39m\u001b[38;2;73;193;169me\u001b[39m\u001b[38;2;74;192;170mg\u001b[39m\u001b[38;2;74;190;172ma\u001b[39m\u001b[38;2;75;189;174mn\u001b[39m\u001b[38;2;75;188;176mt\u001b[39m\u001b[38;2;76;186;178m,\u001b[39m \u001b[38;2;77;185;180mp\u001b[39m\u001b[38;2;77;183;182me\u001b[39m\u001b[38;2;78;182;184mr\u001b[39m\u001b[38;2;78;180;185mf\u001b[39m\u001b[38;2;79;179;187mo\u001b[39m\u001b[38;2;79;177;189mr\u001b[39m\u001b[38;2;80;176;191mm\u001b[39m\u001b[38;2;81;174;193ma\u001b[39m\u001b[38;2;81;173;195mn\u001b[39m\u001b[38;2;82;171;197mt\u001b[39m \u001b[38;2;82;170;199ma\u001b[39m\u001b[38;2;83;169;201mn\u001b[39m\u001b[38;2;84;167;202md\u001b[39m \u001b[38;2;84;166;204mp\u001b[39m\u001b[38;2;85;164;206mr\u001b[39m\u001b[38;2;85;163;208mo\u001b[39m\u001b[38;2;86;161;210md\u001b[39m\u001b[38;2;87;160;212mu\u001b[39m\u001b[38;2;87;158;214mc\u001b[39m\u001b[38;2;88;157;216mt\u001b[39m\u001b[38;2;88;155;217mi\u001b[39m\u001b[38;2;89;154;219mv\u001b[39m\u001b[38;2;89;152;221me\u001b[39m \u001b[38;2;90;151;223mr\u001b[39m\u001b[38;2;91;149;225mo\u001b[39m\u001b[38;2;91;148;227mu\u001b[39m\u001b[38;2;92;147;229mt\u001b[39m\u001b[38;2;92;145;231me\u001b[39m\u001b[38;2;93;144;232mr\u001b[39m \u001b[38;2;94;142;234mf\u001b[39m\u001b[38;2;94;141;236mo\u001b[39m\u001b[38;2;95;139;238mr\u001b[39m \u001b[38;2;95;138;240mO\u001b[39m\u001b[38;2;96;136;242mp\u001b[39m\u001b[38;2;96;135;244me\u001b[39m\u001b[38;2;97;133;246mn\u001b[39m\u001b[38;2;98;132;247mr\u001b[39m\u001b[38;2;98;130;249me\u001b[39m\u001b[38;2;99;129;251ms\u001b[39m\u001b[38;2;99;127;253mt\u001b[39m\u001b[38;2;100;126;255my\u001b[39m"
+export { defaultBanner, gradientBanner }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-lua-resty-router-tmp",`
`3`		`- "version": "0.3.0",`
	`3`	`+ "version": "0.4.0",`
`4`	`4`	`"description": "high performance router",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"bin": {`