@wooksjs/http-proxy 0.4.2 → 0.4.3

package/dist/index.cjs

@@ -2,7 +2,7 @@
 
 var nodeFetchNative = require('node-fetch-native');
 var eventHttp = require('@wooksjs/event-http');
-var crypto = require('crypto');
+var eventCore = require('@wooksjs/event-core');
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -101,238 +101,6 @@ function applyProxyControls(records, controls, additionalBlockers) {
     return result;
 }
 
-/**
- * Use existing event context
- *
- * !Must be called syncronously while context is reachable
- *
- * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
- */
-function useEventContext(expectedTypes) {
-    {
-        throw new Error('Event context does not exist. Use event context synchronously within the runtime of the event.');
-    }
-}
-
-function useEventId() {
-    const { store } = useEventContext();
-    const { init } = store('event');
-    const getId = () => init('id', () => crypto.randomUUID());
-    return { getId };
-}
-
-class ProstoLogger {
-    constructor(options, topic = '') {
-        this.options = options;
-        this.topic = topic;
-        this.messages = [];
-        this.mappedLevels = new Map();
-        if (options === null || options === void 0 ? void 0 : options.levels) {
-            this.levels = options === null || options === void 0 ? void 0 : options.levels;
-            this.levels.forEach((type, level) => this.mappedLevels.set(type, level));
-        }
-        else {
-            this.levels = defaultLevels;
-            this.mappedLevels = defaultMappedLevels;
-        }
-    }
-    pushMessage(level, args, topic = '') {
-        var _a, _b, _c, _d, _e, _f;
-        if (typeof ((_a = this.options) === null || _a === void 0 ? void 0 : _a.level) === 'number' && level > this.options.level)
-            return;
-        if ((_b = this.options) === null || _b === void 0 ? void 0 : _b.parent)
-            return this.options.parent.pushMessage(level, args, topic);
-        const message = {
-            topic,
-            level,
-            type: this.levels[level] || '',
-            messages: args
-                .filter(a => (!(a instanceof Error) && !a.stack))
-                .map(a => textTypes.includes((typeof a)) ? String(a) : a instanceof Error ? `[Error]: ${a.message}` : safeStringify(a)),
-            timestamp: new Date(),
-        };
-        for (const a of args) {
-            if (a instanceof Error && a.stack) {
-                message.stack = message.stack || [];
-                message.stack.push(...(a.stack.split('\n')));
-            }
-        }
-        const mappedMessage = ((_c = this.options) === null || _c === void 0 ? void 0 : _c.mapper) ? this.options.mapper(message) : message;
-        if (typeof ((_d = this.options) === null || _d === void 0 ? void 0 : _d.persistLevel) === 'number' && level <= this.options.persistLevel) {
-            this.messages.push(mappedMessage);
-        }
-        if ((_e = this.options) === null || _e === void 0 ? void 0 : _e.transports) {
-            (_f = this.options) === null || _f === void 0 ? void 0 : _f.transports.forEach(t => {
-                if (typeof t === 'function') {
-                    void t(mappedMessage);
-                }
-                else {
-                    void t.handler(mappedMessage);
-                }
-            });
-        }
-    }
-    fatal(...args) {
-        this.pushMessage(this.mappedLevels.get('fatal') || 0, args, this.topic);
-    }
-    error(...args) {
-        this.pushMessage(this.mappedLevels.get('error') || 1, args, this.topic);
-    }
-    warn(...args) {
-        this.pushMessage(this.mappedLevels.get('warn') || 2, args, this.topic);
-    }
-    log(...args) {
-        this.pushMessage(this.mappedLevels.get('log') || 3, args, this.topic);
-    }
-    info(...args) {
-        this.pushMessage(this.mappedLevels.get('info') || 4, args, this.topic);
-    }
-    debug(...args) {
-        this.pushMessage(this.mappedLevels.get('debug') || 5, args, this.topic);
-    }
-    trace(...args) {
-        this.pushMessage(this.mappedLevels.get('trace') || 6, args, this.topic);
-    }
-    createTopic(topic, level) {
-        return new ProstoLogger({
-            ...(this.options || {}),
-            level,
-            parent: this,
-        }, topic);
-    }
-    getOptions() {
-        return { ...(this.options || {}) };
-    }
-    getMessages() {
-        var _a;
-        if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.parent)
-            return this.options.parent.getMessages();
-        return this.messages;
-    }
-    clear() {
-        this.messages = [];
-    }
-}
-const textTypes = ['string', 'number', 'boolean'];
-const defaultLevels = [
-    'fatal',
-    'error',
-    'warn',
-    'log',
-    'info',
-    'debug',
-    'trace',
-];
-const defaultMappedLevels = new Map();
-defaultLevels.forEach((type, level) => defaultMappedLevels.set(type, level));
-function safeStringify(obj) {
-    const objType = getObjType(obj);
-    try {
-        return objType + ' ' + JSON.stringify(obj);
-    }
-    catch (e) {
-        return `[${typeof obj} ${objType}] (failed to stringify)`;
-    }
-}
-function getObjType(obj) {
-    var _a, _b;
-    return typeof obj === 'object' ? (_b = (_a = Object.getPrototypeOf(obj)) === null || _a === void 0 ? void 0 : _a.constructor) === null || _b === void 0 ? void 0 : _b.name : '';
-}
-
-function createConsoleTransort(opts) {
-    return (message) => {
-        if (typeof (opts === null || opts === void 0 ? void 0 : opts.level) === 'undefined' || message.level <= (opts === null || opts === void 0 ? void 0 : opts.level)) {
-            const formatted = (opts === null || opts === void 0 ? void 0 : opts.format) ? opts.format(message) : message;
-            switch (message.level) {
-                case 0:
-                case 1:
-                    console.error(formatted);
-                    break;
-                case 2:
-                    console.warn(formatted);
-                    break;
-                case 3:
-                    console.log(formatted);
-                    break;
-                case 4:
-                    console.info(formatted);
-                    break;
-                case 5:
-                    console.debug(formatted);
-                    break;
-                case 6:
-                    if (opts === null || opts === void 0 ? void 0 : opts.trace) {
-                        console.trace(formatted);
-                    }
-                    else {
-                        console.debug(formatted);
-                    }
-                    break;
-                default:
-                    console.log(formatted);
-            }
-        }
-    };
-}
-const coloredConsole = (m) => {
-    let color = '';
-    switch (m.level) {
-        case 0:
-        case 1:
-            color = '';
-            break;
-        case 2:
-            color = '';
-            break;
-        case 3:
-            color = '';
-            break;
-        case 4:
-            color = '' + '';
-            break;
-        case 5:
-            color = '' + '';
-            break;
-        case 6:
-            color = '' + '';
-            break;
-    }
-    const topic = m.topic ? `[${m.topic}]` : '';
-    const type = (m.type && !skipTypes.includes(m.type)) ? `[${m.type.padEnd(5).toUpperCase()}]` : '';
-    const time = m.timestamp.toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '');
-    const stack = m.stack ? `\n${'' + ''}${m.stack.join('\n')}` : '';
-    return `${color}${topic}${type}[${time}] ${m.messages.join('\n')}${stack}${''}`;
-};
-const skipTypes = ['log', 'info', 'warn', 'error'];
-
-class EventLogger extends ProstoLogger {
-    constructor(eventId, opts) {
-        const _opts = opts || {
-            level: 4,
-        };
-        if (!_opts.mapper) {
-            _opts.mapper = (msg) => (Object.assign(Object.assign({}, msg), { eventId }));
-        }
-        if (!_opts.transports) {
-            _opts.transports = [
-                createConsoleTransort({
-                    format: coloredConsole,
-                }),
-            ];
-        }
-        super(_opts, (opts === null || opts === void 0 ? void 0 : opts.topic) || 'event');
-    }
-}
-
-function useEventLogger(topic) {
-    const { getId } = useEventId();
-    const { store, getCtx } = useEventContext();
-    const { init } = store('event');
-    const ctx = getCtx();
-    const get = () => init('logger', () => { var _a; return new EventLogger(getId(), (_a = ctx.options) === null || _a === void 0 ? void 0 : _a.eventLogger); });
-    return topic ? get().createTopic(topic) : get();
-}
-
 const reqHeadersToBlock = [
     'connection',
     'accept-encoding',
@@ -350,7 +118,7 @@ function useProxy() {
     const { setHeader, headers: getSetHeaders } = eventHttp.useSetHeaders();
     const { getCtx } = eventHttp.useHttpContext();
     const { req } = getCtx().event;
-    const logger = useEventLogger('http-proxy');
+    const logger = eventCore.useEventLogger('http-proxy');
     const setHeadersObject = getSetHeaders();
     return function proxy(target, opts) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { fetch } from 'node-fetch-native';
 import { useStatus, useSetHeaders, useHttpContext } from '@wooksjs/event-http';
-import { randomUUID } from 'crypto';
+import { useEventLogger } from '@wooksjs/event-core';
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -99,238 +99,6 @@ function applyProxyControls(records, controls, additionalBlockers) {
     return result;
 }
 
-/**
- * Use existing event context
- *
- * !Must be called syncronously while context is reachable
- *
- * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
- */
-function useEventContext(expectedTypes) {
-    {
-        throw new Error('Event context does not exist. Use event context synchronously within the runtime of the event.');
-    }
-}
-
-function useEventId() {
-    const { store } = useEventContext();
-    const { init } = store('event');
-    const getId = () => init('id', () => randomUUID());
-    return { getId };
-}
-
-class ProstoLogger {
-    constructor(options, topic = '') {
-        this.options = options;
-        this.topic = topic;
-        this.messages = [];
-        this.mappedLevels = new Map();
-        if (options === null || options === void 0 ? void 0 : options.levels) {
-            this.levels = options === null || options === void 0 ? void 0 : options.levels;
-            this.levels.forEach((type, level) => this.mappedLevels.set(type, level));
-        }
-        else {
-            this.levels = defaultLevels;
-            this.mappedLevels = defaultMappedLevels;
-        }
-    }
-    pushMessage(level, args, topic = '') {
-        var _a, _b, _c, _d, _e, _f;
-        if (typeof ((_a = this.options) === null || _a === void 0 ? void 0 : _a.level) === 'number' && level > this.options.level)
-            return;
-        if ((_b = this.options) === null || _b === void 0 ? void 0 : _b.parent)
-            return this.options.parent.pushMessage(level, args, topic);
-        const message = {
-            topic,
-            level,
-            type: this.levels[level] || '',
-            messages: args
-                .filter(a => (!(a instanceof Error) && !a.stack))
-                .map(a => textTypes.includes((typeof a)) ? String(a) : a instanceof Error ? `[Error]: ${a.message}` : safeStringify(a)),
-            timestamp: new Date(),
-        };
-        for (const a of args) {
-            if (a instanceof Error && a.stack) {
-                message.stack = message.stack || [];
-                message.stack.push(...(a.stack.split('\n')));
-            }
-        }
-        const mappedMessage = ((_c = this.options) === null || _c === void 0 ? void 0 : _c.mapper) ? this.options.mapper(message) : message;
-        if (typeof ((_d = this.options) === null || _d === void 0 ? void 0 : _d.persistLevel) === 'number' && level <= this.options.persistLevel) {
-            this.messages.push(mappedMessage);
-        }
-        if ((_e = this.options) === null || _e === void 0 ? void 0 : _e.transports) {
-            (_f = this.options) === null || _f === void 0 ? void 0 : _f.transports.forEach(t => {
-                if (typeof t === 'function') {
-                    void t(mappedMessage);
-                }
-                else {
-                    void t.handler(mappedMessage);
-                }
-            });
-        }
-    }
-    fatal(...args) {
-        this.pushMessage(this.mappedLevels.get('fatal') || 0, args, this.topic);
-    }
-    error(...args) {
-        this.pushMessage(this.mappedLevels.get('error') || 1, args, this.topic);
-    }
-    warn(...args) {
-        this.pushMessage(this.mappedLevels.get('warn') || 2, args, this.topic);
-    }
-    log(...args) {
-        this.pushMessage(this.mappedLevels.get('log') || 3, args, this.topic);
-    }
-    info(...args) {
-        this.pushMessage(this.mappedLevels.get('info') || 4, args, this.topic);
-    }
-    debug(...args) {
-        this.pushMessage(this.mappedLevels.get('debug') || 5, args, this.topic);
-    }
-    trace(...args) {
-        this.pushMessage(this.mappedLevels.get('trace') || 6, args, this.topic);
-    }
-    createTopic(topic, level) {
-        return new ProstoLogger({
-            ...(this.options || {}),
-            level,
-            parent: this,
-        }, topic);
-    }
-    getOptions() {
-        return { ...(this.options || {}) };
-    }
-    getMessages() {
-        var _a;
-        if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.parent)
-            return this.options.parent.getMessages();
-        return this.messages;
-    }
-    clear() {
-        this.messages = [];
-    }
-}
-const textTypes = ['string', 'number', 'boolean'];
-const defaultLevels = [
-    'fatal',
-    'error',
-    'warn',
-    'log',
-    'info',
-    'debug',
-    'trace',
-];
-const defaultMappedLevels = new Map();
-defaultLevels.forEach((type, level) => defaultMappedLevels.set(type, level));
-function safeStringify(obj) {
-    const objType = getObjType(obj);
-    try {
-        return objType + ' ' + JSON.stringify(obj);
-    }
-    catch (e) {
-        return `[${typeof obj} ${objType}] (failed to stringify)`;
-    }
-}
-function getObjType(obj) {
-    var _a, _b;
-    return typeof obj === 'object' ? (_b = (_a = Object.getPrototypeOf(obj)) === null || _a === void 0 ? void 0 : _a.constructor) === null || _b === void 0 ? void 0 : _b.name : '';
-}
-
-function createConsoleTransort(opts) {
-    return (message) => {
-        if (typeof (opts === null || opts === void 0 ? void 0 : opts.level) === 'undefined' || message.level <= (opts === null || opts === void 0 ? void 0 : opts.level)) {
-            const formatted = (opts === null || opts === void 0 ? void 0 : opts.format) ? opts.format(message) : message;
-            switch (message.level) {
-                case 0:
-                case 1:
-                    console.error(formatted);
-                    break;
-                case 2:
-                    console.warn(formatted);
-                    break;
-                case 3:
-                    console.log(formatted);
-                    break;
-                case 4:
-                    console.info(formatted);
-                    break;
-                case 5:
-                    console.debug(formatted);
-                    break;
-                case 6:
-                    if (opts === null || opts === void 0 ? void 0 : opts.trace) {
-                        console.trace(formatted);
-                    }
-                    else {
-                        console.debug(formatted);
-                    }
-                    break;
-                default:
-                    console.log(formatted);
-            }
-        }
-    };
-}
-const coloredConsole = (m) => {
-    let color = '';
-    switch (m.level) {
-        case 0:
-        case 1:
-            color = '';
-            break;
-        case 2:
-            color = '';
-            break;
-        case 3:
-            color = '';
-            break;
-        case 4:
-            color = '' + '';
-            break;
-        case 5:
-            color = '' + '';
-            break;
-        case 6:
-            color = '' + '';
-            break;
-    }
-    const topic = m.topic ? `[${m.topic}]` : '';
-    const type = (m.type && !skipTypes.includes(m.type)) ? `[${m.type.padEnd(5).toUpperCase()}]` : '';
-    const time = m.timestamp.toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '');
-    const stack = m.stack ? `\n${'' + ''}${m.stack.join('\n')}` : '';
-    return `${color}${topic}${type}[${time}] ${m.messages.join('\n')}${stack}${''}`;
-};
-const skipTypes = ['log', 'info', 'warn', 'error'];
-
-class EventLogger extends ProstoLogger {
-    constructor(eventId, opts) {
-        const _opts = opts || {
-            level: 4,
-        };
-        if (!_opts.mapper) {
-            _opts.mapper = (msg) => (Object.assign(Object.assign({}, msg), { eventId }));
-        }
-        if (!_opts.transports) {
-            _opts.transports = [
-                createConsoleTransort({
-                    format: coloredConsole,
-                }),
-            ];
-        }
-        super(_opts, (opts === null || opts === void 0 ? void 0 : opts.topic) || 'event');
-    }
-}
-
-function useEventLogger(topic) {
-    const { getId } = useEventId();
-    const { store, getCtx } = useEventContext();
-    const { init } = store('event');
-    const ctx = getCtx();
-    const get = () => init('logger', () => { var _a; return new EventLogger(getId(), (_a = ctx.options) === null || _a === void 0 ? void 0 : _a.eventLogger); });
-    return topic ? get().createTopic(topic) : get();
-}
-
 const reqHeadersToBlock = [
     'connection',
     'accept-encoding',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/http-proxy",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Proxy Wooks composable",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -31,7 +31,8 @@
     "url": "https://github.com/wooksjs/wooksjs/issues"
   },
   "peerDependencies": {
-    "@wooksjs/event-http": "0.4.2"
+    "@wooksjs/event-http": "0.4.3",
+    "@wooksjs/event-core": "0.4.3"
   },
   "dependencies": {
     "node-fetch-native": "^1.0.1"