@smpx/koa-request 0.2.6 → 0.3.0

package/Request.js

@@ -37,6 +37,7 @@ const COOKIEID_COOKIE = 'id';
 const COOKIE_PARAM_PREFIX = '_ck_';
 const USER_TOKEN_COOKIE = 'utok';
 const FLASH_COOKIE = 'flash';
+const VIEWPORT_WIDTH_COOKIE = 'vw';
 // these cookies are httpOnly, should not be readable from js
 const SENSITIVE_COOKIES = [USER_TOKEN_COOKIE, COOKIEID_COOKIE, SESSIONID_COOKIE];
 
@@ -240,6 +241,18 @@ class Request {
 		return paramValue;
 	}
 
+	/**
+	 * Get parameter as a string (from query or body)
+	 * @param {string} key
+	 * @param {number} defaultValue
+	 * @returns {number}
+	 */
+	paramStr(key, defaultValue = '') {
+		const value = this.param(key, null);
+		if (value === null) return defaultValue;
+		return String(value);
+	}
+
 	/**
 	 * Get parameter as an integer (from query or body)
 	 * @param {string} key
@@ -272,6 +285,7 @@ class Request {
 		if (value === null) return defaultValue;
 
 		if (
+			value === false ||
 			value === 0 ||
 			value === '0' ||
 			value === 'false' ||
@@ -564,6 +578,7 @@ class Request {
 				case 'Firefox': return 'Firefox Mobile';
 				case 'Safari': return 'Safari Mobile';
 				case 'Mobile Safari': return 'Safari Mobile';
+				default: return browserName;
 			}
 		}
 
@@ -742,9 +757,21 @@ class Request {
 			return false;
 		}
 
-		if (!this._isMobileWeb) {
-			const ua = this.parseUserAgent();
-			this._isMobileWeb = (ua && ua.device && ua.device.type === 'mobile') || false;
+		if (this._isMobileWeb == null) {
+			const secHeader = this.ctx.headers['sec-ch-ua-mobile'];
+			if (secHeader) {
+				this._isMobileWeb = secHeader === '?1';
+			}
+			else {
+				const vwCookie = this.cookie(VIEWPORT_WIDTH_COOKIE);
+				if (vwCookie) {
+					this._isMobileWeb = Number(vwCookie) <= 750;
+				}
+				else {
+					const ua = this.parseUserAgent();
+					this._isMobileWeb = (ua && ua.device && ua.device.type === 'mobile') || false;
+				}
+			}
 		}
 		return this._isMobileWeb;
 	}
@@ -753,6 +780,10 @@ class Request {
 		return this.isMobileApp() || this.isMobileWeb();
 	}
 
+	isAPI() {
+		return false;
+	}
+
 	platform() {
 		if (!this._platform) {
 			if (this.isMobileApp()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smpx/koa-request",
-  "version": "0.2.6",
+  "version": "0.3.0",
   "description": "Handle basic tasks for koajs",
   "main": "index.js",
   "types": "index.d.ts",
@@ -30,12 +30,12 @@
   },
   "homepage": "https://github.com/smartprix/koa-request#readme",
   "dependencies": {
-    "ip": "^1.1.5",
+    "ip": "^1.1.8",
     "koa-basic-auth": "^4.0.0",
-    "koa-body": "^4.2.0",
+    "koa-body": "^5.0.0",
     "koa-send": "^5.0.1",
-    "koa2-ratelimit": "^0.9.1",
-    "maxmind": "^4.3.3",
+    "koa2-ratelimit": "^1.1.1",
+    "maxmind": "^4.3.6",
     "tar": "^6.1.11",
     "ua-parser-js": "^1.0.2"
   },

package/staticPaths.js

@@ -13,19 +13,18 @@ function getMiddleware(options) {
 	}
 
 	return async (ctx, next) => {
+		if (options.disabled) {
+			await next();
+			return;
+		}
+
 		if (options.path === '/') {
 			// root requires special handling to check if extension denotes a static path
-			const matches = ctx.path.match(/^\/(.*)\.(jpg|jpeg|gif|png|ico|css|js|json|ttf|otf|eot|woff|svg|svgz|xml|html|txt|ogg|ogv|mp4|rss|atom|zip|tgz|gz|rar|bz2|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf)$/);
+			const matches = ctx.path.match(/^\/(.*)\.(jpg|jpeg|gif|png|webp|avif|jxl|ico|css|js|mjs|json|ttf|otf|eot|woff|woff2|svg|svgz|xml|html|txt|ogg|ogv|mp4|av1|webm|rss|atom|zip|tgz|gz|rar|bz2|doc|xls|exe|ppt|tar|mid|midi|wav|bmp|rtf)$/);
 			if (!matches) {
 				await next();
 				return;
 			}
-
-			// skip the current path
-			if (options.skip && options.skip(ctx)) {
-				await next();
-				return;
-			}
 		}
 
 		// return if request path is not static
@@ -34,6 +33,12 @@ function getMiddleware(options) {
 			return;
 		}
 
+		// skip the current path
+		if (options.skip && options.skip(ctx)) {
+			await next();
+			return;
+		}
+
 		// only GET or GET like methods are allowed
 		if (!['get', 'head', 'options'].includes(ctx.method.toLowerCase())) {
 			ctx.body = 'Method Not Allowed';