edge.libx.js 0.0.7 → 0.1.0

package/build/helpers/RequestInfo.d.ts

@@ -0,0 +1,30 @@
+import { IRequest } from 'itty-router';
+export interface IRequestInfo {
+    deviceType: any;
+    clientIP: any;
+    ip: any;
+    country: any;
+    region: any;
+    city: any;
+    'cf.tlsClientAuth': any;
+    'cf.tlsExportedAuthenticator': any;
+    'device.vendor': any;
+    'device.model': any;
+    'device.type': any;
+    'browser.name': any;
+    'browser.version': any;
+    'browser.major': any;
+    'engine.name': any;
+    'engine.version': any;
+    'os.name': any;
+    'os.version': any;
+    'cpu.architecture': any;
+}
+export declare class RequestInfo {
+    options?: Partial<ModuleOptions>;
+    constructor(options?: Partial<ModuleOptions>);
+    static process(request: IRequest): Promise<IRequestInfo>;
+    private static getDeviceType;
+}
+export declare class ModuleOptions {
+}

package/build/helpers/RequestInfo.js

@@ -0,0 +1,67 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleOptions = exports.RequestInfo = void 0;
+const edge_1 = require("@vercel/edge");
+const essentials_js_1 = require("libx.js/build/bundles/essentials.js");
+const ua_parser_js_1 = __importDefault(require("ua-parser-js"));
+class RequestInfo {
+    constructor(options) {
+        this.options = options;
+        essentials_js_1.libx.log.v('RequestInfo:ctor: ');
+        this.options = Object.assign(Object.assign({}, new ModuleOptions()), options);
+    }
+    static process(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const reqCf = Object.assign({}, request.cf);
+            const clientIP = request.headers.get('CF-Connecting-IP');
+            const device = request.headers.get('CF-Device-Type');
+            const ip = request.headers.get('x-real-ip');
+            const country = request.headers.get('X-Vercel-IP-Country');
+            const region = request.headers.get('X-Vercel-IP-Country-Region');
+            let city = request.headers.get('X-Vercel-IP-City');
+            const userAgent = request.headers.get('User-Agent') || '';
+            let parser = new ua_parser_js_1.default(userAgent);
+            if (city == null)
+                city = (0, edge_1.geolocation)(request).city;
+            reqCf.tlsClientAuth = JSON.stringify(reqCf.tlsClientAuth);
+            reqCf.tlsExportedAuthenticator = JSON.stringify(reqCf.tlsExportedAuthenticator);
+            let parsed = parser.getResult();
+            delete parsed.ua;
+            let ret = Object.assign(Object.assign({ clientIP, cf: reqCf, device,
+                ip,
+                country,
+                region,
+                city }, parsed), { deviceType: this.getDeviceType(userAgent) });
+            ret = essentials_js_1.libx.flatterObjectToDotNotation(ret);
+            return ret;
+        });
+    }
+    static getDeviceType(ua) {
+        if (/mobile/i.test(ua)) {
+            return 'Mobile';
+        }
+        else if (/tablet/i.test(ua)) {
+            return 'Tablet';
+        }
+        else {
+            return 'Desktop';
+        }
+    }
+}
+exports.RequestInfo = RequestInfo;
+class ModuleOptions {
+}
+exports.ModuleOptions = ModuleOptions;
+//# sourceMappingURL=RequestInfo.js.map

package/build/helpers/RequestInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RequestInfo.js","sourceRoot":"","sources":["../../src/helpers/RequestInfo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uCAA2C;AAE3C,uEAA2D;AAC3D,gEAAoC;AAwBpC,MAAa,WAAW;IACpB,YAA0B,OAAgC;QAAhC,YAAO,GAAP,OAAO,CAAyB;QACtD,oBAAI,CAAC,GAAG,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,mCAAQ,IAAI,aAAa,EAAE,GAAK,OAAO,CAAE,CAAC;IAC1D,CAAC;IAEM,MAAM,CAAO,OAAO,CAAC,OAAiB;;YACzC,MAAM,KAAK,qBAAQ,OAAO,CAAC,EAAE,CAAE,CAAC;YAEhC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YACzD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YACrD,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YAC3D,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;YACjE,IAAI,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YACnD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YAC1D,IAAI,MAAM,GAAG,IAAI,sBAAQ,CAAC,SAAS,CAAC,CAAC;YAErC,IAAI,IAAI,IAAI,IAAI;gBAAE,IAAI,GAAG,IAAA,kBAAW,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC;YAEnD,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;YAC1D,KAAK,CAAC,wBAAwB,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAEhF,IAAI,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;YAChC,OAAO,MAAM,CAAC,EAAE,CAAC;YACjB,IAAI,GAAG,iCACH,QAAQ,EACR,EAAE,EAAE,KAAK,EACT,MAAM;gBACN,EAAE;gBACF,OAAO;gBACP,MAAM;gBACN,IAAI,IACD,MAAM,KACT,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,GAC5C,CAAC;YAEF,GAAG,GAAG,oBAAI,CAAC,0BAA0B,CAAC,GAAG,CAAC,CAAC;YAE3C,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAEO,MAAM,CAAC,aAAa,CAAC,EAAU;QACnC,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACrB,OAAO,QAAQ,CAAC;QACpB,CAAC;aAAM,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YAC5B,OAAO,QAAQ,CAAC;QACpB,CAAC;aAAM,CAAC;YACJ,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;CACJ;AAnDD,kCAmDC;AAED,MAAa,aAAa;CAAG;AAA7B,sCAA6B","sourcesContent":["import { geolocation } from '@vercel/edge';\nimport { IRequest } from 'itty-router';\nimport { libx } from 'libx.js/build/bundles/essentials.js';\nimport UAParser from 'ua-parser-js';\n\nexport interface IRequestInfo {\n    deviceType;\n    clientIP;\n    ip;\n    country;\n    region;\n    city;\n    'cf.tlsClientAuth';\n    'cf.tlsExportedAuthenticator';\n    'device.vendor';\n    'device.model';\n    'device.type';\n    'browser.name';\n    'browser.version';\n    'browser.major';\n    'engine.name';\n    'engine.version';\n    'os.name';\n    'os.version';\n    'cpu.architecture';\n}\n\nexport class RequestInfo {\n    public constructor(public options?: Partial<ModuleOptions>) {\n        libx.log.v('RequestInfo:ctor: ');\n        this.options = { ...new ModuleOptions(), ...options };\n    }\n\n    public static async process(request: IRequest): Promise<IRequestInfo> {\n        const reqCf = { ...request.cf };\n\n        const clientIP = request.headers.get('CF-Connecting-IP');\n        const device = request.headers.get('CF-Device-Type');\n        const ip = request.headers.get('x-real-ip');\n        const country = request.headers.get('X-Vercel-IP-Country');\n        const region = request.headers.get('X-Vercel-IP-Country-Region');\n        let city = request.headers.get('X-Vercel-IP-City');\n        const userAgent = request.headers.get('User-Agent') || '';\n        let parser = new UAParser(userAgent);\n\n        if (city == null) city = geolocation(request).city;\n\n        reqCf.tlsClientAuth = JSON.stringify(reqCf.tlsClientAuth);\n        reqCf.tlsExportedAuthenticator = JSON.stringify(reqCf.tlsExportedAuthenticator);\n\n        let parsed = parser.getResult();\n        delete parsed.ua;\n        let ret = {\n            clientIP,\n            cf: reqCf,\n            device,\n            ip,\n            country,\n            region,\n            city,\n            ...parsed,\n            deviceType: this.getDeviceType(userAgent),\n        };\n\n        ret = libx.flatterObjectToDotNotation(ret);\n\n        return ret;\n    }\n\n    private static getDeviceType(ua: string) {\n        if (/mobile/i.test(ua)) {\n            return 'Mobile';\n        } else if (/tablet/i.test(ua)) {\n            return 'Tablet';\n        } else {\n            return 'Desktop';\n        }\n    }\n}\n\nexport class ModuleOptions {}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "edge.libx.js",
-    "version": "0.0.7",
+    "version": "0.1.0",
     "main": "build/main.js",
     "license": "MIT",
     "author": "Elya Livshitz",

package/src/helpers/RequestInfo.ts

@@ -0,0 +1,81 @@
+import { geolocation } from '@vercel/edge';
+import { IRequest } from 'itty-router';
+import { libx } from 'libx.js/build/bundles/essentials.js';
+import UAParser from 'ua-parser-js';
+
+export interface IRequestInfo {
+    deviceType;
+    clientIP;
+    ip;
+    country;
+    region;
+    city;
+    'cf.tlsClientAuth';
+    'cf.tlsExportedAuthenticator';
+    'device.vendor';
+    'device.model';
+    'device.type';
+    'browser.name';
+    'browser.version';
+    'browser.major';
+    'engine.name';
+    'engine.version';
+    'os.name';
+    'os.version';
+    'cpu.architecture';
+}
+
+export class RequestInfo {
+    public constructor(public options?: Partial<ModuleOptions>) {
+        libx.log.v('RequestInfo:ctor: ');
+        this.options = { ...new ModuleOptions(), ...options };
+    }
+
+    public static async process(request: IRequest): Promise<IRequestInfo> {
+        const reqCf = { ...request.cf };
+
+        const clientIP = request.headers.get('CF-Connecting-IP');
+        const device = request.headers.get('CF-Device-Type');
+        const ip = request.headers.get('x-real-ip');
+        const country = request.headers.get('X-Vercel-IP-Country');
+        const region = request.headers.get('X-Vercel-IP-Country-Region');
+        let city = request.headers.get('X-Vercel-IP-City');
+        const userAgent = request.headers.get('User-Agent') || '';
+        let parser = new UAParser(userAgent);
+
+        if (city == null) city = geolocation(request).city;
+
+        reqCf.tlsClientAuth = JSON.stringify(reqCf.tlsClientAuth);
+        reqCf.tlsExportedAuthenticator = JSON.stringify(reqCf.tlsExportedAuthenticator);
+
+        let parsed = parser.getResult();
+        delete parsed.ua;
+        let ret = {
+            clientIP,
+            cf: reqCf,
+            device,
+            ip,
+            country,
+            region,
+            city,
+            ...parsed,
+            deviceType: this.getDeviceType(userAgent),
+        };
+
+        ret = libx.flatterObjectToDotNotation(ret);
+
+        return ret;
+    }
+
+    private static getDeviceType(ua: string) {
+        if (/mobile/i.test(ua)) {
+            return 'Mobile';
+        } else if (/tablet/i.test(ua)) {
+            return 'Tablet';
+        } else {
+            return 'Desktop';
+        }
+    }
+}
+
+export class ModuleOptions {}