kempo-server 1.6.1 → 1.6.3

package/tests/responseWrapper.node-test.js

@@ -3,72 +3,72 @@ import createResponseWrapper from '../src/responseWrapper.js';
 
 export default {
   'status and set/get headers and type': async ({pass, fail}) => {
-    try {
-      const res = createMockRes();
-      const w = createResponseWrapper(res);
-      w.status(201).set('X-Test', '1').type('json');
-      if(res.statusCode !== 201) return fail('status');
-      if(res.getHeader('X-Test') !== '1') return fail('set/get');
-      if(res.getHeader('Content-Type') !== 'application/json') return fail('type');
-      pass('status+headers+type');
-    } catch(e){ fail(e.message); }
+    const res = createMockRes();
+    const w = createResponseWrapper(res);
+    w.status(201).set('X-Test', '1').type('json');
+    
+    if(res.statusCode !== 201) return fail('status');
+    if(res.getHeader('X-Test') !== '1') return fail('set/get');
+    if(res.getHeader('Content-Type') !== 'application/json') return fail('type');
+    
+    pass('status+headers+type');
   },
   'json sends and prevents further changes': async ({pass, fail}) => {
-    try {
-      const res = createMockRes();
-      const w = createResponseWrapper(res);
-      w.json({a: 1});
-      if(!res.isEnded()) return fail('ended');
-      try { w.set('X', 'y'); fail('should not set after send'); } catch(_){ /* ok */ }
-      pass('json');
-    } catch(e){ fail(e.message); }
+    const res = createMockRes();
+    const w = createResponseWrapper(res);
+    w.json({a: 1});
+    
+    if(!res.isEnded()) return fail('ended');
+    
+    try { w.set('X', 'y'); fail('should not set after send'); } catch(_){ /* ok */ }
+    
+    pass('json');
   },
   'send handles string, object, buffer and null': async ({pass, fail}) => {
-    try {
-  const res1 = createMockRes();
-  createResponseWrapper(res1).send('hello');
-  // Content-Type defaults to text/html for string when not set
-  if(res1.getHeader('Content-Type') !== 'text/html') return fail('string content-type');
-      if(res1.getBody().toString() !== 'hello') return fail('string body');
+    const res1 = createMockRes();
+    createResponseWrapper(res1).send('hello');
+    // Content-Type defaults to text/html for string when not set
+    if(res1.getHeader('Content-Type') !== 'text/html') return fail('string content-type');
+    if(res1.getBody().toString() !== 'hello') return fail('string body');
 
-      const res2 = createMockRes();
-      createResponseWrapper(res2).send({a:1});
-      if(res2.getHeader('Content-Type') !== 'application/json') return fail('object content-type');
+    const res2 = createMockRes();
+    createResponseWrapper(res2).send({a:1});
+    if(res2.getHeader('Content-Type') !== 'application/json') return fail('object content-type');
 
-  const res3 = createMockRes();
-  const buf = Buffer.from('abc');
-  createResponseWrapper(res3).send(buf);
-  const body3 = res3.getBody().toString();
-  if(!body3.includes('"data"')) return fail('buffer equal');
+    const res3 = createMockRes();
+    const buf = Buffer.from('abc');
+    createResponseWrapper(res3).send(buf);
+    const body3 = res3.getBody().toString();
+    if(!body3.includes('"data"')) return fail('buffer equal');
 
-  const res4 = createMockRes();
-  createResponseWrapper(res4).send(null);
-  if(!res4.isEnded()) return fail('null ended');
-      pass('send variants');
-    } catch(e){ fail(e.message); }
+    const res4 = createMockRes();
+    createResponseWrapper(res4).send(null);
+    if(!res4.isEnded()) return fail('null ended');
+    
+    pass('send variants');
   },
   'html and text helpers': async ({pass, fail}) => {
-    try {
-      const r1 = createMockRes();
-      createResponseWrapper(r1).html('<h1>Ok</h1>');
-      if(r1.getHeader('Content-Type') !== 'text/html') return fail('html type');
+    const r1 = createMockRes();
+    createResponseWrapper(r1).html('<h1>Ok</h1>');
+    if(r1.getHeader('Content-Type') !== 'text/html') return fail('html type');
 
-      const r2 = createMockRes();
-      createResponseWrapper(r2).text('plain');
-      if(r2.getHeader('Content-Type') !== 'text/plain') return fail('text type');
-      pass('helpers');
-    } catch(e){ fail(e.message); }
+    const r2 = createMockRes();
+    createResponseWrapper(r2).text('plain');
+    if(r2.getHeader('Content-Type') !== 'text/plain') return fail('text type');
+    
+    pass('helpers');
   },
   'redirect and cookies': async ({pass, fail}) => {
-    try {
-      const r = createMockRes();
-      const w = createResponseWrapper(r);
-      w.cookie('a', 'b', {httpOnly: true, path: '/'});
-      const cookies = parseCookies(r.getHeader('Set-Cookie'));
-      if(!(cookies.length === 1 && cookies[0].includes('a=b'))) return fail('cookie added');
-      w.redirect('/next', 301);
-      if(!(r.statusCode === 301 && r.getHeader('Location') === '/next')) return fail('redirect');
-      pass('redirect+cookie');
-    } catch(e){ fail(e.message); }
+    const r = createMockRes();
+    const w = createResponseWrapper(r);
+    w.cookie('a', 'b', {httpOnly: true, path: '/'});
+    const cookies = parseCookies(r.getHeader('Set-Cookie'));
+    
+    if(!(cookies.length === 1 && cookies[0].includes('a=b'))) return fail('cookie added');
+    
+    w.redirect('/next', 301);
+    if(!(r.statusCode === 301 && r.getHeader('Location') === '/next')) return fail('redirect');
+    
+    pass('redirect+cookie');
   }
 };

package/tests/router-middleware.node-test.js

@@ -4,43 +4,55 @@ import router from '../src/router.js';
 
 export default {
   'built-in middleware can be configured on router': async ({pass, fail}) => {
-    try {
-      await withTempDir(async (dir) => {
-        await write(dir, '.config.json', JSON.stringify({
-          middleware: {
-            cors: {enabled: true, origin: '*', methods: ['GET'], headers: ['X']},
-            compression: {enabled: true, threshold: 1},
-            rateLimit: {enabled: true, maxRequests: 1, windowMs: 1000, message: 'Too many'},
-            security: {enabled: true, headers: {'X-Test':'1'}},
-            logging: {enabled: true, includeUserAgent: false, includeResponseTime: true}
-          }
-        }));
-  await write(dir, 'index.html', 'hello world');
-  const prev = process.cwd();
-  process.chdir(dir);
-  const flags = {root: '.', logging: 0, scan: false};
-  const handler = await router(flags, () => {});
-        const server = http.createServer(handler);
-        const port = randomPort();
-        await new Promise(r => server.listen(port, r));
-        await new Promise(r => setTimeout(r, 50));
-        try {
-          const {get} = await import('http');
-          const one = await new Promise((res)=>{
-            get(`http://localhost:${port}/index.html`, {headers: {'accept-encoding': 'gzip'}}, r =>{
-              const chunks = []; r.on('data', c => chunks.push(c)); r.on('end', ()=> res({r, body: Buffer.concat(chunks)}));
-            });
-          });
-          if(one.r.statusCode !== 200) return fail('first ok');
-          const two = await new Promise((res)=>{
-            get(`http://localhost:${port}/index.html`, r =>{
-              const chunks = []; r.on('data', c => chunks.push(c)); r.on('end', ()=> res({r, body: Buffer.concat(chunks)}));
-            });
-          });
-          if(two.r.statusCode !== 429) return fail('rate limited');
-        } finally { server.close(); process.chdir(prev); }
+    await withTempDir(async (dir) => {
+      await write(dir, '.config.json', JSON.stringify({
+        middleware: {
+          cors: {enabled: true, origin: '*', methods: ['GET'], headers: ['X']},
+          compression: {enabled: true, threshold: 1},
+          rateLimit: {enabled: true, maxRequests: 1, windowMs: 1000, message: 'Too many'},
+          security: {enabled: true, headers: {'X-Test':'1'}},
+          logging: {enabled: true, includeUserAgent: false, includeResponseTime: true}
+        }
+      }));
+      await write(dir, 'index.html', 'hello world');
+      const prev = process.cwd();
+      process.chdir(dir);
+      const flags = {root: '.', logging: 0, scan: false};
+      const handler = await router(flags, () => {});
+      const server = http.createServer(handler);
+      const port = randomPort();
+      await new Promise(r => server.listen(port, r));
+      await new Promise(r => setTimeout(r, 50));
+      
+      const {get} = await import('http');
+      const one = await new Promise((res)=>{
+        get(`http://localhost:${port}/index.html`, {headers: {'accept-encoding': 'gzip'}}, r =>{
+          const chunks = []; r.on('data', c => chunks.push(c)); r.on('end', ()=> res({r, body: Buffer.concat(chunks)}));
+        });
       });
-      pass('router middleware');
-    } catch(e){ fail(e.message); }
+      
+      if(one.r.statusCode !== 200) {
+        server.close();
+        process.chdir(prev);
+        return fail('first ok');
+      }
+      
+      const two = await new Promise((res)=>{
+        get(`http://localhost:${port}/index.html`, r =>{
+          const chunks = []; r.on('data', c => chunks.push(c)); r.on('end', ()=> res({r, body: Buffer.concat(chunks)}));
+        });
+      });
+      
+      if(two.r.statusCode !== 429) {
+        server.close();
+        process.chdir(prev);
+        return fail('rate limited');
+      }
+      
+      server.close();
+      process.chdir(prev);
+    });
+    
+    pass('router middleware');
   }
 };

package/tests/router.node-test.js

@@ -5,86 +5,104 @@ import router from '../src/router.js';
 import defaultConfig from '../src/defaultConfig.js';
 
 export default {
-  'serves static files and 404s unknown': async ({pass, fail, log}) => {
-    try {
-  await withTempDir(async (dir) => {
-    await write(dir, 'index.html', '<h1>Home</h1>');
-  const prev = process.cwd();
-  process.chdir(dir);
-  const flags = {root: '.', logging: 0, scan: false};
-  const logFn = () => {};
-  const handler = await router(flags, logFn);
-  const server = http.createServer(handler);
-        const port = randomPort();
-  await new Promise(r => server.listen(port, r));
-  await new Promise(r => setTimeout(r, 50));
-        try {
-          const ok = await httpGet(`http://localhost:${port}/index.html`);
-          log('ok status: ' + ok.res.statusCode);
-          if(ok.res.statusCode !== 200) throw new Error('static 200');
-          const miss = await httpGet(`http://localhost:${port}/nope`);
-          log('miss status: ' + miss.res.statusCode);
-          if(miss.res.statusCode !== 404) throw new Error('404');
-        } finally {
-          server.close();
+  'serves static files and 404s unknown': async ({pass, fail}) => {
+    await withTempDir(async (dir) => {
+      await write(dir, 'index.html', '<h1>Home</h1>');
+      const prev = process.cwd();
+      process.chdir(dir);
+      const flags = {root: '.', logging: 0, scan: false};
+      const logFn = () => {};
+      const handler = await router(flags, logFn);
+      const server = http.createServer(handler);
+      const port = randomPort();
+      await new Promise(r => server.listen(port, r));
+      await new Promise(r => setTimeout(r, 50));
+      
+      const ok = await httpGet(`http://localhost:${port}/index.html`);
+      if(ok.res.statusCode !== 200) {
+        server.close();
+        process.chdir(prev);
+        return fail('static 200');
+      }
+      
+      const miss = await httpGet(`http://localhost:${port}/nope`);
+      if(miss.res.statusCode !== 404) {
+        server.close();
+        process.chdir(prev);
+        return fail('404');
+      }
+      
+      server.close();
       process.chdir(prev);
-        }
-      });
-      pass('static + 404');
-    } catch(e){ fail(e.message); }
+    });
+    pass('static + 404');
   },
-  'rescan on 404 when enabled and not blacklisted': async ({pass, fail, log}) => {
-    try {
-  await withTempDir(async (dir) => {
-  const prev = process.cwd();
-  process.chdir(dir);
-  const flags = {root: '.', logging: 0, scan: true};
-  const handler = await router(flags, log);
-  const server = http.createServer(handler);
-        const port = randomPort();
-  await new Promise(r => server.listen(port, r));
-  await new Promise(r => setTimeout(r, 50));
-        try {
-          const miss1 = await httpGet(`http://localhost:${port}/late.html`);
-          log('first miss: ' + miss1.res.statusCode);
-          if(miss1.res.statusCode !== 404) throw new Error('first 404');
-          await write(dir, 'late.html', 'later');
-          const hit = await httpGet(`http://localhost:${port}/late.html`);
-          log('hit after rescan: ' + hit.res.statusCode);
-          if(hit.res.statusCode !== 200) throw new Error('served after rescan');
-    } finally { server.close(); process.chdir(prev); }
-      });
-      pass('rescan');
-    } catch(e){ fail(e.message); }
+  'rescan on 404 when enabled and not blacklisted': async ({pass, fail}) => {
+    await withTempDir(async (dir) => {
+      const prev = process.cwd();
+      process.chdir(dir);
+      const flags = {root: '.', logging: 0, scan: true};
+      const handler = await router(flags, log);
+      const server = http.createServer(handler);
+      const port = randomPort();
+      await new Promise(r => server.listen(port, r));
+      await new Promise(r => setTimeout(r, 50));
+      
+      const miss1 = await httpGet(`http://localhost:${port}/late.html`);
+      if(miss1.res.statusCode !== 404) {
+        server.close();
+        process.chdir(prev);
+        return fail('first 404');
+      }
+      
+      await write(dir, 'late.html', 'later');
+      const hit = await httpGet(`http://localhost:${port}/late.html`);
+      if(hit.res.statusCode !== 200) {
+        server.close();
+        process.chdir(prev);
+        return fail('served after rescan');
+      }
+      
+      server.close();
+      process.chdir(prev);
+    });
+    pass('rescan');
   },
-  'custom and wildcard routes serve mapped files': async ({pass, fail, log}) => {
-    try {
-  await withTempDir(async (dir) => {
-  const fileA = await write(dir, 'a.txt', 'A');
-  const fileB = await write(dir, 'b/1.txt', 'B1');
-  const prev = process.cwd();
-  process.chdir(dir);
-  const flags = {root: '.', logging: 0, scan: false};
-  const logFn = () => {};
-  // write config before init
-  await write(dir, '.config.json', JSON.stringify({
-    customRoutes: {'/a': fileA, 'b/*': path.join(dir, 'b/*')}
-  }));
-  const handler = await router(flags, logFn);
-  const server = http.createServer(handler);
-        const port = randomPort();
-  await new Promise(r => server.listen(port, r));
-  await new Promise(r => setTimeout(r, 50));
-        try {
-          const r1 = await httpGet(`http://localhost:${port}/a`);
-          log('custom status: ' + r1.res.statusCode);
-          if(r1.body.toString() !== 'A') throw new Error('custom route');
-          const r2 = await httpGet(`http://localhost:${port}/b/1.txt`);
-          log('wildcard status: ' + r2.res.statusCode);
-          if(r2.body.toString() !== 'B1') throw new Error('wildcard');
-    } finally { server.close(); process.chdir(prev); }
-      });
-      pass('custom+wildcard');
-    } catch(e){ fail(e.message); }
+  'custom and wildcard routes serve mapped files': async ({pass, fail}) => {
+    await withTempDir(async (dir) => {
+      const fileA = await write(dir, 'a.txt', 'A');
+      const fileB = await write(dir, 'b/1.txt', 'B1');
+      const prev = process.cwd();
+      process.chdir(dir);
+      const flags = {root: '.', logging: 0, scan: false};
+      const logFn = () => {};
+      // write config before init
+      await write(dir, '.config.json', JSON.stringify({
+        customRoutes: {'/a': fileA, 'b/*': path.join(dir, 'b/*')}
+      }));
+      const handler = await router(flags, logFn);
+      const server = http.createServer(handler);
+      const port = randomPort();
+      await new Promise(r => server.listen(port, r));
+      await new Promise(r => setTimeout(r, 50));
+      
+      const r1 = await httpGet(`http://localhost:${port}/a`);
+      if(r1.body.toString() !== 'A') {
+        server.close();
+        process.chdir(prev);
+        return fail('custom route');
+      }
+      
+      const r2 = await httpGet(`http://localhost:${port}/b/1.txt`);
+      if(r2.body.toString() !== 'B1') {
+        server.close();
+        process.chdir(prev);
+        return fail('wildcard');
+      }
+      
+      server.close();
+      process.chdir(prev);
+    });
+    pass('custom+wildcard');
   }
 };