@utiliread/http 1.11.0 → 1.13.1

package/.vscode/settings.json

@@ -1,3 +1,3 @@
-{
-    "typescript.tsdk": "node_modules\\typescript\\lib"
+{
+    "typescript.tsdk": "node_modules\\typescript\\lib"
 }

package/dist/cjs/events.js

@@ -1,89 +1,23 @@
 "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 __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultEventHub = exports.HttpEvent = void 0;
-var HttpEvent = /** @class */ (function () {
-    function HttpEvent() {
-    }
-    return HttpEvent;
-}());
-exports.HttpEvent = HttpEvent;
-var DefaultEventHub = /** @class */ (function () {
-    function DefaultEventHub() {
-        this.subscribers = [];
-    }
-    DefaultEventHub.prototype.publish = function (event) {
-        return __awaiter(this, void 0, void 0, function () {
-            var subscribers, _i, subscribers_1, subscriber;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        subscribers = this.subscribers.slice();
-                        _i = 0, subscribers_1 = subscribers;
-                        _a.label = 1;
-                    case 1:
-                        if (!(_i < subscribers_1.length)) return [3 /*break*/, 4];
-                        subscriber = subscribers_1[_i];
-                        return [4 /*yield*/, Promise.resolve(subscriber(event))];
-                    case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3:
-                        _i++;
-                        return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
+exports.events = void 0;
+var http_builder_1 = require("./http-builder");
+function events(action, configure) {
+    return function () {
+        var params = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            params[_i] = arguments[_i];
+        }
+        var builder = action.apply(void 0, params);
+        var events = configure.apply(void 0, params);
+        if (events.sent) {
+            builder.onSent(events.sent);
+        }
+        if (builder instanceof http_builder_1.HttpBuilderOfT && events.received) {
+            builder.onReceived(events.received);
+        }
+        return builder;
     };
-    DefaultEventHub.prototype.subscribe = function (callback) {
-        var subscribers = this.subscribers;
-        subscribers.push(callback);
-        return {
-            dispose: function () {
-                var index = subscribers.indexOf(callback);
-                if (index !== -1) {
-                    subscribers.splice(index, 1);
-                }
-            },
-        };
-    };
-    return DefaultEventHub;
-}());
-exports.DefaultEventHub = DefaultEventHub;
+}
+exports.events = events;
 //# sourceMappingURL=events.js.map

package/dist/cjs/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/events.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA;IAAA;IAQA,CAAC;IAAD,gBAAC;AAAD,CAAC,AARD,IAQC;AARY,8BAAS;AAetB;IAAA;QACU,gBAAW,GAAiB,EAAE,CAAC;IAqBzC,CAAC;IAnBO,iCAAO,GAAb,UAAc,KAAgB;;;;;;wBACtB,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;8BACT,EAAX,2BAAW;;;6BAAX,CAAA,yBAAW,CAAA;wBAAzB,UAAU;wBACnB,qBAAM,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAA;;wBAAxC,SAAwC,CAAC;;;wBADlB,IAAW,CAAA;;;;;;KAGrC;IAED,mCAAS,GAAT,UAAU,QAAoB;QAC5B,IAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3B,OAAO;YACL,OAAO,EAAE;gBACP,IAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC5C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;oBAChB,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;iBAC9B;YACH,CAAC;SACF,CAAC;IACJ,CAAC;IACH,sBAAC;AAAD,CAAC,AAtBD,IAsBC;AAtBY,0CAAe"}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/events.ts"],"names":[],"mappings":";;;AAAA,+CAAsE;AAuBtE,SAAgB,MAAM,CAClB,MAA2B,EAC3B,SAAkD;IAEpD,OAAO;QAAU,gBAAY;aAAZ,UAAY,EAAZ,qBAAY,EAAZ,IAAY;YAAZ,2BAAY;;QAC3B,IAAM,OAAO,GAAG,MAAM,eAAI,MAAM,CAAC,CAAC;QAClC,IAAM,MAAM,GAAG,SAAS,eAAI,MAAM,CAAC,CAAC;QACpC,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC7B;QACD,IAAI,OAAO,YAAY,6BAAc,IAAI,MAAM,CAAC,QAAQ,EAAE;YACxD,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACrC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;AACJ,CAAC;AAfD,wBAeC"}

package/dist/cjs/index.js

@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TimeoutError = exports.HttpError = exports.HttpBuilderOfT = exports.HttpBuilder = exports.HttpResponseOfT = exports.HttpResponse = exports.QueryString = exports.Http = void 0;
+exports.events = exports.TimeoutError = exports.HttpError = exports.HttpBuilderOfT = exports.HttpBuilder = exports.HttpResponseOfT = exports.HttpResponse = exports.QueryString = exports.Http = void 0;
 var http_1 = require("./http");
 Object.defineProperty(exports, "Http", { enumerable: true, get: function () { return http_1.Http; } });
 var query_string_1 = require("./query-string");
@@ -25,5 +25,7 @@ var http_error_1 = require("./http-error");
 Object.defineProperty(exports, "HttpError", { enumerable: true, get: function () { return http_error_1.HttpError; } });
 var timeout_error_1 = require("./timeout-error");
 Object.defineProperty(exports, "TimeoutError", { enumerable: true, get: function () { return timeout_error_1.TimeoutError; } });
+var events_1 = require("./events");
+Object.defineProperty(exports, "events", { enumerable: true, get: function () { return events_1.events; } });
 __exportStar(require("./helpers"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AAQb,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,iDAAgE;AAAvD,6GAAA,YAAY,OAAA;AAAE,gHAAA,eAAe,OAAA;AACtC,+CAA6D;AAApD,2GAAA,WAAW,OAAA;AAAE,8GAAA,cAAc,OAAA;AACpC,2CAAyC;AAAhC,uGAAA,SAAS,OAAA;AAClB,iDAA+C;AAAtC,6GAAA,YAAY,OAAA;AACrB,4CAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AAQb,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AACpB,iDAAgE;AAAvD,6GAAA,YAAY,OAAA;AAAE,gHAAA,eAAe,OAAA;AACtC,+CAAsE;AAA7D,2GAAA,WAAW,OAAA;AAAE,8GAAA,cAAc,OAAA;AACpC,2CAAyC;AAAhC,uGAAA,SAAS,OAAA;AAClB,iDAA+C;AAAtC,6GAAA,YAAY,OAAA;AACrB,mCAAkC;AAAzB,gGAAA,MAAM,OAAA;AACf,4CAA0B"}

package/dist/cjs/msgpack.js

@@ -59,6 +59,23 @@ var msgpack_1 = require("@utiliread/msgpack");
 var http_builder_1 = require("./http-builder");
 var msgpack_2 = require("@msgpack/msgpack");
 var mapping_1 = require("./mapping");
+http_builder_1.HttpBuilder.prototype.expectMessagePack = function (typeOrMapper) {
+    var _this = this;
+    this.message.headers.set("Accept", "application/x-msgpack");
+    return this.useHandler(function (response) { return __awaiter(_this, void 0, void 0, function () {
+        var itemFactory, decoded;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    itemFactory = (0, mapping_1.getMapper)(msgpack_1.deserialize, typeOrMapper);
+                    return [4 /*yield*/, (0, msgpack_2.decodeAsync)(response.body)];
+                case 1:
+                    decoded = _a.sent();
+                    return [2 /*return*/, itemFactory(decoded)];
+            }
+        });
+    }); });
+};
 http_builder_1.HttpBuilder.prototype.expectMessagePackArray = function (typeOrMapper) {
     var _this = this;
     this.message.headers.set("Accept", "application/x-msgpack");

package/dist/cjs/msgpack.js.map

@@ -1 +1 @@
-{"version":3,"file":"msgpack.js","sourceRoot":"","sources":["../../src/msgpack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAiD;AACjD,+CAA6C;AAC7C,4CAAqD;AACrD,qCAAoD;AAepD,0BAAW,CAAC,SAAS,CAAC,sBAAsB,GAAG,UAE7C,YAA8B;IAFe,iBAa9C;IATC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC,UAAU,CAAC,UAAO,QAAQ;;;;;;oBAC9B,KAAK,GAAQ,EAAE,CAAC;oBAChB,WAAW,GAAG,IAAA,mBAAS,EAAC,qBAAW,EAAE,YAAY,CAAC,CAAC;;;;oBAChC,KAAA,cAAA,IAAA,2BAAiB,EAAC,QAAQ,CAAC,IAAK,CAAC,CAAA;;;;;oBAAzC,IAAI,WAAA,CAAA;oBACnB,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;yBAEhC,sBAAO,KAAK,EAAC;;;SACd,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,0BAAW,CAAC,SAAS,CAAC,sBAAsB,GAAG,UAE7C,YAA8B;IAE9B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAE5D,SAAgB,OAAO,CAAC,QAAkB;;;;;;;wBAClC,WAAW,GAAG,IAAA,mBAAS,EAAC,qBAAW,EAAE,YAAY,CAAC,CAAC;;;;wBAChC,KAAA,cAAA,IAAA,2BAAiB,EAAC,QAAQ,CAAC,IAAK,CAAC,CAAA;;;;;wBAAzC,IAAI,WAAA,CAAA;qDACb,WAAW,CAAC,IAAI,CAAC;4BAAvB,gCAAuB;;wBAAvB,SAAuB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;KAE3B;IAED,OAAO,IAAI,CAAC,UAAU,CAAC,UAAC,QAAQ,IAAK,OAAA,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAlC,CAAkC,CAAC,CAAC;AAC3E,CAAC,CAAC"}
+{"version":3,"file":"msgpack.js","sourceRoot":"","sources":["../../src/msgpack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAiD;AACjD,+CAA6C;AAC7C,4CAAkE;AAClE,qCAAoD;AAkBpD,0BAAW,CAAC,SAAS,CAAC,iBAAiB,GAAG,UAExC,YAA8B;IAFU,iBAUzC;IANC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC,UAAU,CAAC,UAAO,QAAQ;;;;;oBAC9B,WAAW,GAAG,IAAA,mBAAS,EAAC,qBAAW,EAAE,YAAY,CAAC,CAAC;oBACzC,qBAAM,IAAA,qBAAW,EAAC,QAAQ,CAAC,IAAK,CAAC,EAAA;;oBAA3C,OAAO,GAAG,SAAiC;oBACjD,sBAAO,WAAW,CAAC,OAAO,CAAC,EAAC;;;SAC7B,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,0BAAW,CAAC,SAAS,CAAC,sBAAsB,GAAG,UAE7C,YAA8B;IAFe,iBAa9C;IATC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC,UAAU,CAAC,UAAO,QAAQ;;;;;;oBAC9B,KAAK,GAAQ,EAAE,CAAC;oBAChB,WAAW,GAAG,IAAA,mBAAS,EAAC,qBAAW,EAAE,YAAY,CAAC,CAAC;;;;oBAChC,KAAA,cAAA,IAAA,2BAAiB,EAAC,QAAQ,CAAC,IAAK,CAAC,CAAA;;;;;oBAAzC,IAAI,WAAA,CAAA;oBACnB,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;yBAEhC,sBAAO,KAAK,EAAC;;;SACd,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,0BAAW,CAAC,SAAS,CAAC,sBAAsB,GAAG,UAE7C,YAA8B;IAE9B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAE5D,SAAgB,OAAO,CAAC,QAAkB;;;;;;;wBAClC,WAAW,GAAG,IAAA,mBAAS,EAAC,qBAAW,EAAE,YAAY,CAAC,CAAC;;;;wBAChC,KAAA,cAAA,IAAA,2BAAiB,EAAC,QAAQ,CAAC,IAAK,CAAC,CAAA;;;;;wBAAzC,IAAI,WAAA,CAAA;qDACb,WAAW,CAAC,IAAI,CAAC;4BAAvB,gCAAuB;;wBAAvB,SAAuB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;KAE3B;IAED,OAAO,IAAI,CAAC,UAAU,CAAC,UAAC,QAAQ,IAAK,OAAA,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAlC,CAAkC,CAAC,CAAC;AAC3E,CAAC,CAAC"}

package/dist/esm/events.d.ts

@@ -1,25 +1,11 @@
-import { HttpMethod } from "./http-builder";
+import { HttpBuilder, HttpBuilderOfT, Message } from "./http-builder";
 import { HttpResponse } from "./http-response";
-declare type CallbackFn = (event: HttpEvent) => void | Promise<void>;
-export declare class HttpEvent {
-    hook: "sent" | "received";
-    method: HttpMethod;
-    url: string;
-    reducer: Function;
-    params: any[];
-    response: HttpResponse;
-    value?: any;
+interface Events {
+    sent: (response: HttpResponse, request: Message) => void | Promise<void>;
 }
-export interface EventHub {
-    publish(event: HttpEvent): Promise<void>;
-    subscribe(callback: CallbackFn): Subscription;
-}
-export declare class DefaultEventHub implements EventHub {
-    private subscribers;
-    publish(event: HttpEvent): Promise<void>;
-    subscribe(callback: CallbackFn): Subscription;
-}
-export interface Subscription {
-    dispose(): void;
+interface EventsOfT<T> extends Events {
+    received: (response: HttpResponse, request: Message, value: T) => void | Promise<void>;
 }
+export declare function events<B extends HttpBuilder, P extends any[]>(action: (...params: P) => B, configure: (...params: P) => Partial<Events>): (...params: P) => B;
+export declare function events<B extends HttpBuilderOfT<T>, P extends any[], T>(action: (...params: P) => B, configure: (...params: P) => Partial<EventsOfT<T>>): (...params: P) => B;
 export {};

package/dist/esm/events.js

@@ -1,86 +1,19 @@
-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 __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var HttpEvent = /** @class */ (function () {
-    function HttpEvent() {
-    }
-    return HttpEvent;
-}());
-export { HttpEvent };
-var DefaultEventHub = /** @class */ (function () {
-    function DefaultEventHub() {
-        this.subscribers = [];
-    }
-    DefaultEventHub.prototype.publish = function (event) {
-        return __awaiter(this, void 0, void 0, function () {
-            var subscribers, _i, subscribers_1, subscriber;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        subscribers = this.subscribers.slice();
-                        _i = 0, subscribers_1 = subscribers;
-                        _a.label = 1;
-                    case 1:
-                        if (!(_i < subscribers_1.length)) return [3 /*break*/, 4];
-                        subscriber = subscribers_1[_i];
-                        return [4 /*yield*/, Promise.resolve(subscriber(event))];
-                    case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3:
-                        _i++;
-                        return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
+import { HttpBuilderOfT } from "./http-builder";
+export function events(action, configure) {
+    return function () {
+        var params = [];
+        for (var _i = 0; _i < arguments.length; _i++) {
+            params[_i] = arguments[_i];
+        }
+        var builder = action.apply(void 0, params);
+        var events = configure.apply(void 0, params);
+        if (events.sent) {
+            builder.onSent(events.sent);
+        }
+        if (builder instanceof HttpBuilderOfT && events.received) {
+            builder.onReceived(events.received);
+        }
+        return builder;
     };
-    DefaultEventHub.prototype.subscribe = function (callback) {
-        var subscribers = this.subscribers;
-        subscribers.push(callback);
-        return {
-            dispose: function () {
-                var index = subscribers.indexOf(callback);
-                if (index !== -1) {
-                    subscribers.splice(index, 1);
-                }
-            },
-        };
-    };
-    return DefaultEventHub;
-}());
-export { DefaultEventHub };
+}
 //# sourceMappingURL=events.js.map

package/dist/esm/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/events.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA;IAAA;IAQA,CAAC;IAAD,gBAAC;AAAD,CAAC,AARD,IAQC;;AAOD;IAAA;QACU,gBAAW,GAAiB,EAAE,CAAC;IAqBzC,CAAC;IAnBO,iCAAO,GAAb,UAAc,KAAgB;;;;;;wBACtB,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;8BACT,EAAX,2BAAW;;;6BAAX,CAAA,yBAAW,CAAA;wBAAzB,UAAU;wBACnB,qBAAM,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAA;;wBAAxC,SAAwC,CAAC;;;wBADlB,IAAW,CAAA;;;;;;KAGrC;IAED,mCAAS,GAAT,UAAU,QAAoB;QAC5B,IAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3B,OAAO;YACL,OAAO,EAAE;gBACP,IAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC5C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;oBAChB,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;iBAC9B;YACH,CAAC;SACF,CAAC;IACJ,CAAC;IACH,sBAAC;AAAD,CAAC,AAtBD,IAsBC"}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../../src/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,cAAc,EAAW,MAAM,gBAAgB,CAAC;AAuBtE,MAAM,UAAU,MAAM,CAClB,MAA2B,EAC3B,SAAkD;IAEpD,OAAO;QAAU,gBAAY;aAAZ,UAAY,EAAZ,qBAAY,EAAZ,IAAY;YAAZ,2BAAY;;QAC3B,IAAM,OAAO,GAAG,MAAM,eAAI,MAAM,CAAC,CAAC;QAClC,IAAM,MAAM,GAAG,SAAS,eAAI,MAAM,CAAC,CAAC;QACpC,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC7B;QACD,IAAI,OAAO,YAAY,cAAc,IAAI,MAAM,CAAC,QAAQ,EAAE;YACxD,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACrC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;AACJ,CAAC"}

package/dist/esm/index.d.ts

@@ -3,9 +3,10 @@ export { Page, PaginationResult, InfinitePage, InfinitePaginationResult, } from
 export { ProblemDetails } from "./problem-details";
 export { QueryString } from "./query-string";
 export { HttpResponse, HttpResponseOfT } from "./http-response";
-export { HttpBuilder, HttpBuilderOfT } from "./http-builder";
+export { HttpBuilder, HttpBuilderOfT, Message } from "./http-builder";
 export { HttpError } from "./http-error";
 export { TimeoutError } from "./timeout-error";
+export { events } from "./events";
 export * from "./helpers";
 export { Fetch } from "./http";
 export { Subscription } from "./event-aggregator";

package/dist/esm/index.js

@@ -4,5 +4,6 @@ export { HttpResponse, HttpResponseOfT } from "./http-response";
 export { HttpBuilder, HttpBuilderOfT } from "./http-builder";
 export { HttpError } from "./http-error";
 export { TimeoutError } from "./timeout-error";
+export { events } from "./events";
 export * from "./helpers";
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAQ9B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAQ9B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAW,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,cAAc,WAAW,CAAC"}

package/dist/esm/msgpack.d.ts

@@ -2,6 +2,7 @@ import { Mapper, Type } from "./mapping";
 declare type TypeOrMapper<T> = Type<T> | Mapper<T>;
 declare module "@utiliread/http" {
     interface HttpBuilder {
+        expectMessagePack<T>(typeOrMapper?: TypeOrMapper<T>): HttpBuilderOfT<T>;
         expectMessagePackArray<T>(typeOrMapper?: TypeOrMapper<T>): HttpBuilderOfT<T[]>;
         streamMessagePackArray<T>(typeOrMapper?: TypeOrMapper<T>): HttpBuilderOfT<AsyncGenerator<T, void, unknown>>;
     }

package/dist/esm/msgpack.js

@@ -55,8 +55,25 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
 };
 import { deserialize } from "@utiliread/msgpack";
 import { HttpBuilder } from "./http-builder";
-import { decodeArrayStream } from "@msgpack/msgpack";
+import { decodeArrayStream, decodeAsync } from "@msgpack/msgpack";
 import { getMapper } from "./mapping";
+HttpBuilder.prototype.expectMessagePack = function (typeOrMapper) {
+    var _this = this;
+    this.message.headers.set("Accept", "application/x-msgpack");
+    return this.useHandler(function (response) { return __awaiter(_this, void 0, void 0, function () {
+        var itemFactory, decoded;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    itemFactory = getMapper(deserialize, typeOrMapper);
+                    return [4 /*yield*/, decodeAsync(response.body)];
+                case 1:
+                    decoded = _a.sent();
+                    return [2 /*return*/, itemFactory(decoded)];
+            }
+        });
+    }); });
+};
 HttpBuilder.prototype.expectMessagePackArray = function (typeOrMapper) {
     var _this = this;
     this.message.headers.set("Accept", "application/x-msgpack");

package/dist/esm/msgpack.js.map

@@ -1 +1 @@
-{"version":3,"file":"msgpack.js","sourceRoot":"","sources":["../../src/msgpack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,SAAS,EAAgB,MAAM,WAAW,CAAC;AAepD,WAAW,CAAC,SAAS,CAAC,sBAAsB,GAAG,UAE7C,YAA8B;IAFe,iBAa9C;IATC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC,UAAU,CAAC,UAAO,QAAQ;;;;;;oBAC9B,KAAK,GAAQ,EAAE,CAAC;oBAChB,WAAW,GAAG,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;;;;oBAChC,KAAA,cAAA,iBAAiB,CAAC,QAAQ,CAAC,IAAK,CAAC,CAAA;;;;;oBAAzC,IAAI,WAAA,CAAA;oBACnB,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;yBAEhC,sBAAO,KAAK,EAAC;;;SACd,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,WAAW,CAAC,SAAS,CAAC,sBAAsB,GAAG,UAE7C,YAA8B;IAE9B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAE5D,SAAgB,OAAO,CAAC,QAAkB;;;;;;;wBAClC,WAAW,GAAG,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;;;;wBAChC,KAAA,cAAA,iBAAiB,CAAC,QAAQ,CAAC,IAAK,CAAC,CAAA;;;;;wBAAzC,IAAI,WAAA,CAAA;qDACb,WAAW,CAAC,IAAI,CAAC;4BAAvB,gCAAuB;;wBAAvB,SAAuB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;KAE3B;IAED,OAAO,IAAI,CAAC,UAAU,CAAC,UAAC,QAAQ,IAAK,OAAA,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAlC,CAAkC,CAAC,CAAC;AAC3E,CAAC,CAAC"}
+{"version":3,"file":"msgpack.js","sourceRoot":"","sources":["../../src/msgpack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,SAAS,EAAgB,MAAM,WAAW,CAAC;AAkBpD,WAAW,CAAC,SAAS,CAAC,iBAAiB,GAAG,UAExC,YAA8B;IAFU,iBAUzC;IANC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC,UAAU,CAAC,UAAO,QAAQ;;;;;oBAC9B,WAAW,GAAG,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;oBACzC,qBAAM,WAAW,CAAC,QAAQ,CAAC,IAAK,CAAC,EAAA;;oBAA3C,OAAO,GAAG,SAAiC;oBACjD,sBAAO,WAAW,CAAC,OAAO,CAAC,EAAC;;;SAC7B,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,WAAW,CAAC,SAAS,CAAC,sBAAsB,GAAG,UAE7C,YAA8B;IAFe,iBAa9C;IATC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC,UAAU,CAAC,UAAO,QAAQ;;;;;;oBAC9B,KAAK,GAAQ,EAAE,CAAC;oBAChB,WAAW,GAAG,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;;;;oBAChC,KAAA,cAAA,iBAAiB,CAAC,QAAQ,CAAC,IAAK,CAAC,CAAA;;;;;oBAAzC,IAAI,WAAA,CAAA;oBACnB,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;yBAEhC,sBAAO,KAAK,EAAC;;;SACd,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,WAAW,CAAC,SAAS,CAAC,sBAAsB,GAAG,UAE7C,YAA8B;IAE9B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAE5D,SAAgB,OAAO,CAAC,QAAkB;;;;;;;wBAClC,WAAW,GAAG,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;;;;wBAChC,KAAA,cAAA,iBAAiB,CAAC,QAAQ,CAAC,IAAK,CAAC,CAAA;;;;;wBAAzC,IAAI,WAAA,CAAA;qDACb,WAAW,CAAC,IAAI,CAAC;4BAAvB,gCAAuB;;wBAAvB,SAAuB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;KAE3B;IAED,OAAO,IAAI,CAAC,UAAU,CAAC,UAAC,QAAQ,IAAK,OAAA,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAlC,CAAkC,CAAC,CAAC;AAC3E,CAAC,CAAC"}

package/karma.config.js

@@ -1,31 +1,31 @@
-const tsconfig = require('./tsconfig.json');
-
-module.exports = function (config) {
-    config.set({
-        frameworks: ['mocha', 'chai', 'karma-typescript'],
-        files: [
-            'src/**/*.ts'
-        ],
-        preprocessors: {
-            'src/**/*.ts': ['karma-typescript']
-        },
-        reporters: ['progress', 'karma-typescript'],
-        browsers: ['ChromeHeadless', 'ChromeDebugging'],
-        customLaunchers: {
-            ChromeDebugging: {
-                base: 'Chrome',
-                flags: ['--remote-debugging-port=9222']
-            }
-        },
-        karmaTypescriptConfig: {
-            bundlerOptions: {
-                entrypoints: /\.spec\.ts$/,
-                sourceMap: tsconfig.compilerOptions.sourceMap
-            },
-            coverageOptions: {
-                instrumentation: false
-            },
-            tsconfig: './tsconfig.cjs.json'
-        }
-    })
+const tsconfig = require('./tsconfig.json');
+
+module.exports = function (config) {
+    config.set({
+        frameworks: ['mocha', 'chai', 'karma-typescript'],
+        files: [
+            'src/**/*.ts'
+        ],
+        preprocessors: {
+            'src/**/*.ts': ['karma-typescript']
+        },
+        reporters: ['progress', 'karma-typescript'],
+        browsers: ['ChromeHeadless', 'ChromeDebugging'],
+        customLaunchers: {
+            ChromeDebugging: {
+                base: 'Chrome',
+                flags: ['--remote-debugging-port=9222']
+            }
+        },
+        karmaTypescriptConfig: {
+            bundlerOptions: {
+                entrypoints: /\.spec\.ts$/,
+                sourceMap: tsconfig.compilerOptions.sourceMap
+            },
+            coverageOptions: {
+                instrumentation: false
+            },
+            tsconfig: './tsconfig.cjs.json'
+        }
+    })
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utiliread/http",
-  "version": "1.11.0",
+  "version": "1.13.1",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",

package/src/event-aggregator.ts

@@ -1,32 +1,32 @@
-type Callback<P extends any[] = any[]> = (...params: P) => void | Promise<void>;
-
-export class EventAggregator<P extends any[]> {
-    private callbacks: Function[] = [];
-
-    get any() {
-        return this.callbacks.length > 0;
-    }
-
-    subscribe(callback: Callback<P>): Subscription {
-        this.callbacks.push(callback);
-        return {
-            dispose: () => {
-                const index = this.callbacks.indexOf(callback);
-                if (index >= 0) {
-                    this.callbacks.splice(index, 1);
-                }
-            }
-        }
-    }
-
-    async publish(...params: P) {
-        const callbacks = this.callbacks.slice();
-        for (const callback of callbacks) {
-            await Promise.resolve(callback.apply(this, params));
-        }
-    }
-}
-
-export interface Subscription {
-    dispose(): void;
+type Callback<P extends any[] = any[]> = (...params: P) => void | Promise<void>;
+
+export class EventAggregator<P extends any[]> {
+    private callbacks: Function[] = [];
+
+    get any() {
+        return this.callbacks.length > 0;
+    }
+
+    subscribe(callback: Callback<P>): Subscription {
+        this.callbacks.push(callback);
+        return {
+            dispose: () => {
+                const index = this.callbacks.indexOf(callback);
+                if (index >= 0) {
+                    this.callbacks.splice(index, 1);
+                }
+            }
+        }
+    }
+
+    async publish(...params: P) {
+        const callbacks = this.callbacks.slice();
+        for (const callback of callbacks) {
+            await Promise.resolve(callback.apply(this, params));
+        }
+    }
+}
+
+export interface Subscription {
+    dispose(): void;
 }

package/src/events.ts

@@ -0,0 +1,39 @@
+import { HttpBuilder, HttpBuilderOfT, Message } from "./http-builder";
+import { HttpResponse } from "./http-response";
+
+interface Events {
+  sent: (response: HttpResponse, request: Message) => void | Promise<void>;
+}
+
+interface EventsOfT<T> extends Events {
+  received: (
+    response: HttpResponse,
+    request: Message,
+    value: T
+  ) => void | Promise<void>;
+}
+
+export function events<B extends HttpBuilder, P extends any[]>(
+  action: (...params: P) => B,
+  configure: (...params: P) => Partial<Events>
+): (...params: P) => B;
+export function events<B extends HttpBuilderOfT<T>, P extends any[], T>(
+  action: (...params: P) => B,
+  configure: (...params: P) => Partial<EventsOfT<T>>
+): (...params: P) => B;
+export function events<B extends HttpBuilderOfT<T>, P extends any[], T>(
+    action: (...params: P) => B,
+    configure: (...params: P) => Partial<EventsOfT<T>>
+  ): (...params: P) => B {
+  return function (...params: P) {
+    const builder = action(...params);
+    const events = configure(...params);
+    if (events.sent) {
+      builder.onSent(events.sent);
+    }
+    if (builder instanceof HttpBuilderOfT && events.received) {
+      builder.onReceived(events.received);
+    }
+    return builder;
+  };
+}

package/src/helpers.ts

@@ -1,14 +1,14 @@
-import { HttpError } from './http-error';
-import { TimeoutError } from './timeout-error';
-
-export function isHttpError(error: Error): error is HttpError {
-    return error.name === "HttpError";
-}
-
-export function isAbortError(error: Error): boolean {
-    return error.name === "AbortError";
-}
-
-export function isTimeoutError(error: Error): error is TimeoutError {
-    return error.name === "TimeoutError";
+import { HttpError } from './http-error';
+import { TimeoutError } from './timeout-error';
+
+export function isHttpError(error: Error): error is HttpError {
+    return error.name === "HttpError";
+}
+
+export function isAbortError(error: Error): boolean {
+    return error.name === "AbortError";
+}
+
+export function isTimeoutError(error: Error): error is TimeoutError {
+    return error.name === "TimeoutError";
 }