@actdim/dynstruct 0.9.0 → 0.9.3

package/dist/componentModel/scope.es.js

@@ -1,32 +1,29 @@
-var c = Object.defineProperty;
-var d = (n, e, s) => e in n ? c(n, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : n[e] = s;
-var l = (n, e, s) => d(n, typeof e != "symbol" ? e + "" : e, s);
-import { observable as p, autorun as y, observe as u, reaction as f, transaction as h } from "mobx";
-import { deepObserve as v } from "mobx-utils";
-var z = Object.defineProperty, b = (n, e, s, i) => {
-  for (var r = void 0, t = n.length - 1, o; t >= 0; t--)
-    (o = n[t]) && (r = o(e, s, r) || r);
-  return r && z(e, s, r), r;
+import { observable as f, autorun as c, observe as h, reaction as u, transaction as l } from "mobx";
+import { deepObserve as d } from "mobx-utils";
+var p = Object.defineProperty, y = (o, e, r, i) => {
+  for (var s = void 0, t = o.length - 1, a; t >= 0; t--)
+    (a = o[t]) && (s = a(e, r, s) || s);
+  return s && p(e, r, s), s;
 };
-class g {
+class v {
+  // finalizers
+  finalizers;
+  isDisposed;
+  handlers;
   constructor() {
-    // finalizers
-    l(this, "finalizers");
-    l(this, "isDisposed");
-    l(this, "handlers");
     this.isDisposed = !1, this.finalizers = [], this.handlers = /* @__PURE__ */ new Set();
   }
-  deepObserve(e, s) {
-    const i = v(e, s);
+  deepObserve(e, r) {
+    const i = d(e, r);
     return this.registerFinalizers(i), i;
   }
-  autorun(e, s) {
-    const i = y(e, s);
+  autorun(e, r) {
+    const i = c(e, r);
     return this.registerFinalizers(i), i;
   }
-  observe(e, s, i = !0) {
-    const r = u(e, s);
-    return i && this.registerFinalizers(r), r;
+  observe(e, r, i = !0) {
+    const s = h(e, r);
+    return i && this.registerFinalizers(s), s;
   }
   async allHandlersAsync() {
     await Promise.all(this.handlers);
@@ -35,38 +32,38 @@ class g {
     if (this.isDisposed)
       throw new Error("Cannot access a disposed object");
   }
-  observeAsync(e, s, i = !0, r = this.handlers) {
+  observeAsync(e, r, i = !0, s = this.handlers) {
     this.validateState();
-    const t = u(e, (o) => {
-      let a = null;
-      a = (async () => {
-        await s(o), r.delete(a);
-      })(), r.add(a);
+    const t = h(e, (a) => {
+      let n = null;
+      n = (async () => {
+        await r(a), s.delete(n);
+      })(), s.add(n);
     });
     return i && this.registerFinalizers(t), t;
   }
-  multiObserve(e, s, i, r = (t) => {
+  multiObserve(e, r, i, s = (t) => {
     this.registerFinalizer(t);
   }) {
     const t = [];
-    for (const o of e) {
-      const a = u(o, s, i);
-      t.push(a), r && r(a);
+    for (const a of e) {
+      const n = h(a, r, i);
+      t.push(n), s && s(n);
     }
     return t;
   }
-  reaction(e, s, i) {
-    const r = f(e, s, i);
-    return this.registerFinalizers(r), r;
+  reaction(e, r, i) {
+    const s = u(e, r, i);
+    return this.registerFinalizers(s), s;
   }
-  multiReaction(e, s, i = void 0, r = (t) => {
+  multiReaction(e, r, i = void 0, s = (t) => {
     this.registerFinalizer(t);
   }) {
     const t = [];
     i || (i = void 0);
-    for (const o of e) {
-      const a = f(o, s, i);
-      t.push(a), r && r(a);
+    for (const a of e) {
+      const n = u(a, r, i);
+      t.push(n), s && s(n);
     }
     return t;
   }
@@ -86,39 +83,36 @@ class g {
       for (const e of this.finalizers)
         try {
           e && e();
-        } catch (s) {
-          throw s;
+        } catch (r) {
+          throw r;
         }
       this.finalizers.length = 0, this.isDisposed = !0;
     }
   }
 }
-class F extends g {
-  constructor() {
-    super(...arguments);
-    l(this, "isBusy", !0);
-  }
+class z extends v {
+  isBusy = !0;
   // isLoading
-  async withBusyAsync(s) {
-    h(() => {
+  async withBusyAsync(e) {
+    l(() => {
       this.isBusy = !0;
     });
     try {
-      return await s();
+      return await e();
     } finally {
-      h(() => {
+      l(() => {
         this.isBusy = !1;
       });
     }
   }
-  withBusy(s) {
-    h(() => {
+  withBusy(e) {
+    l(() => {
       this.isBusy = !0;
     });
     try {
-      return s();
+      return e();
     } finally {
-      h(() => {
+      l(() => {
         this.isBusy = !1;
       });
     }
@@ -129,11 +123,11 @@ class F extends g {
   //     return vm;
   // };
 }
-b([
-  p.ref
-], F.prototype, "isBusy");
+y([
+  f.ref
+], z.prototype, "isBusy");
 export {
-  g as DisposableComponent,
-  F as DisposableModel
+  v as DisposableComponent,
+  z as DisposableModel
 };
 //# sourceMappingURL=scope.es.js.map

package/dist/componentModel/scope.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"scope.es.js","sources":["../../src/componentModel/scope.ts"],"sourcesContent":["// import { createViewModel } from \"@/componentModel\";\r\nimport {\r\n    reaction,\r\n    observe,\r\n    Lambda,\r\n    IReactionPublic,\r\n    IReactionOptions,\r\n    IReactionDisposer,\r\n    IObjectDidChange,\r\n    // IArrayChange,\r\n    IArraySplice,\r\n    IMapDidChange,\r\n    autorun,\r\n    IAutorunOptions\r\n} from \"mobx\";\r\nimport { deepObserve, IDisposer } from \"mobx-utils\";\r\nimport { observable, transaction } from \"mobx\";\r\n\r\nexport type IObjectChange<T> = IObjectDidChange & {\r\n    name: keyof T;\r\n    object: T;\r\n};\r\n\r\nexport interface IDisposable {\r\n    dispose: () => void;\r\n}\r\n\r\nexport class DisposableComponent implements IDisposable {\r\n    // finalizers\r\n    protected readonly finalizers: IDisposer[];\r\n\r\n    protected isDisposed: boolean;\r\n\r\n    public handlers: Set<Promise<any>>;\r\n\r\n    constructor() {\r\n        this.isDisposed = false;\r\n        this.finalizers = [];\r\n        this.handlers = new Set<Promise<any>>();\r\n    }\r\n\r\n    protected deepObserve<T = any>(\r\n        target: T,\r\n        // | IArrayChange\r\n        listener: (change: IObjectDidChange | IArraySplice | IMapDidChange, path: string, root: T) => void\r\n    ): IDisposer {\r\n        const releaser = deepObserve(target, listener);\r\n        this.registerFinalizers(releaser);\r\n        return releaser;\r\n    }\r\n\r\n    protected autorun(view: (r: IReactionPublic) => any, opts?: IAutorunOptions): IReactionDisposer {\r\n        const releaser = autorun(view, opts);\r\n        this.registerFinalizers(releaser);\r\n        return releaser;\r\n    }\r\n\r\n    protected observe<T = Object>(object: T, listener: (change: IObjectChange<T>) => void, registerDisposer = true): Lambda {\r\n        const releaser = observe(object, listener);\r\n        if (registerDisposer) {\r\n            this.registerFinalizers(releaser);\r\n        }\r\n        return releaser;\r\n    }\r\n\r\n    public async allHandlersAsync(): Promise<void> {\r\n        await Promise.all(this.handlers);\r\n    }\r\n\r\n    protected validateState() {\r\n        if (this.isDisposed) {\r\n            throw new Error(\"Cannot access a disposed object\");\r\n        }\r\n    }\r\n    \r\n    protected observeAsync<T = Object>(\r\n        object: T,\r\n        listener: (change: IObjectChange<T>) => Promise<any>,\r\n        registerDisposer = true,\r\n        handlers = this.handlers\r\n    ): Lambda {\r\n        this.validateState();        \r\n        const releaser = observe(object, (change) => {\r\n            let task: Promise<any> = null;\r\n            task = (async () => {\r\n                await listener(change as IObjectChange<T>);\r\n                handlers.delete(task);\r\n            })();\r\n            handlers.add(task);\r\n        });\r\n        if (registerDisposer) {\r\n            this.registerFinalizers(releaser);\r\n        }\r\n        return releaser;\r\n    }\r\n\r\n    protected multiObserve(\r\n        objects: Object[],\r\n        listener: (change: IObjectDidChange) => void,\r\n        fireImmediately?: boolean,\r\n        registerDisposer = (d: () => void) => {\r\n            this.registerFinalizer(d);\r\n        }\r\n    ): Lambda[] {\r\n        const releasers: Lambda[] = [];\r\n        for (const object of objects) {\r\n            const releaser = observe(object, listener, fireImmediately);\r\n            releasers.push(releaser);\r\n            if (registerDisposer) {\r\n                registerDisposer(releaser);\r\n            }\r\n        }\r\n        return releasers;\r\n    }\r\n\r\n    protected reaction<T>(\r\n        expression: (r: IReactionPublic) => T,\r\n        effect: (arg: T, prev: T, r: IReactionPublic) => void,\r\n        opts?: IReactionOptions<T, boolean>\r\n    ): IReactionDisposer {\r\n        const releaser = reaction(expression, effect, opts);\r\n        this.registerFinalizers(releaser);\r\n        return releaser;\r\n    }\r\n\r\n    protected multiReaction<T>(\r\n        expressions: ((r: IReactionPublic) => T)[],\r\n        effect: (arg: T, prev: T, r: IReactionPublic) => void,\r\n        opts: IReactionOptions<T, boolean> = undefined,\r\n        registerDisposer = (d: () => void) => {\r\n            this.registerFinalizer(d);\r\n        }\r\n    ): IReactionDisposer[] {\r\n        const releasers: IReactionDisposer[] = [];\r\n        if (!opts) {\r\n            opts = undefined;\r\n        }\r\n        for (const expression of expressions) {\r\n            const releaser = reaction(expression, effect, opts);\r\n            releasers.push(releaser);\r\n            if (registerDisposer) {\r\n                registerDisposer(releaser);\r\n            }\r\n        }\r\n\r\n        return releasers;\r\n    }\r\n\r\n    // registerDisposers\r\n    protected registerFinalizers(...actions: (() => void)[]) {\r\n        this.finalizers.push(...actions);\r\n    }\r\n\r\n    // registerDisposer\r\n    protected registerFinalizer(action: () => void) {\r\n        this.registerFinalizers(action);\r\n        return action;\r\n    }\r\n\r\n    protected registerDisposable(disposable: IDisposable) {\r\n        return this.registerFinalizer(disposable.dispose.bind(disposable));\r\n    }\r\n\r\n    public dispose() {\r\n        if (this === undefined) {\r\n            console.error('undefined \"this\"');\r\n        }\r\n        if (!this.isDisposed) {\r\n            for (const d of this.finalizers) {\r\n                try {\r\n                    d && d();\r\n                } catch (err) {\r\n                    throw err; // for debug\r\n                }\r\n            }\r\n            this.finalizers.length = 0;\r\n            // while (this.finalizers.length) {\r\n            //     const d = this.finalizers.pop();\r\n            //     d && d();\r\n            // }\r\n            this.isDisposed = true;\r\n        }\r\n    }\r\n}\r\n\r\nexport class DisposableModel extends DisposableComponent {\r\n    @observable.ref\r\n    public isBusy: boolean = true; // isLoading\r\n\r\n    protected async withBusyAsync<T>(asyncAction: () => Promise<T>) {\r\n        transaction(() => {\r\n            this.isBusy = true;\r\n        });\r\n        try {\r\n            return await asyncAction();\r\n        } finally {\r\n            transaction(() => {\r\n                this.isBusy = false;\r\n            });\r\n        }\r\n    }\r\n\r\n    protected withBusy<T>(action: () => T) {\r\n        transaction(() => {\r\n            this.isBusy = true;\r\n        });\r\n        try {\r\n            return action();\r\n        } finally {\r\n            transaction(() => {\r\n                this.isBusy = false;\r\n            });\r\n        }\r\n    }\r\n\r\n    // createViewModel = <T = any>(model: T, options?: IViewModelOptions<T>): T & IRootViewModel<T> => {\r\n    //     const vm = createViewModel(model, options);\r\n    //     this.registerFinalizer(vm.$().dispose);\r\n    //     return vm;\r\n    // };\r\n}\r\n"],"names":["DisposableComponent","__publicField","target","listener","releaser","deepObserve","view","opts","autorun","object","registerDisposer","observe","handlers","change","task","objects","fireImmediately","d","releasers","expression","effect","reaction","expressions","actions","action","disposable","err","DisposableModel","asyncAction","transaction","__decorateClass","observable"],"mappings":"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"}
+{"version":3,"file":"scope.es.js","sources":["../../src/componentModel/scope.ts"],"sourcesContent":["// import { createViewModel } from \"@/componentModel\";\r\nimport {\r\n    reaction,\r\n    observe,\r\n    Lambda,\r\n    IReactionPublic,\r\n    IReactionOptions,\r\n    IReactionDisposer,\r\n    IObjectDidChange,\r\n    // IArrayChange,\r\n    IArraySplice,\r\n    IMapDidChange,\r\n    autorun,\r\n    IAutorunOptions\r\n} from \"mobx\";\r\nimport { deepObserve, IDisposer } from \"mobx-utils\";\r\nimport { observable, transaction } from \"mobx\";\r\n\r\nexport type IObjectChange<T> = IObjectDidChange & {\r\n    name: keyof T;\r\n    object: T;\r\n};\r\n\r\nexport interface IDisposable {\r\n    dispose: () => void;\r\n}\r\n\r\nexport class DisposableComponent implements IDisposable {\r\n    // finalizers\r\n    protected readonly finalizers: IDisposer[];\r\n\r\n    protected isDisposed: boolean;\r\n\r\n    public handlers: Set<Promise<any>>;\r\n\r\n    constructor() {\r\n        this.isDisposed = false;\r\n        this.finalizers = [];\r\n        this.handlers = new Set<Promise<any>>();\r\n    }\r\n\r\n    protected deepObserve<T = any>(\r\n        target: T,\r\n        // | IArrayChange\r\n        listener: (change: IObjectDidChange | IArraySplice | IMapDidChange, path: string, root: T) => void\r\n    ): IDisposer {\r\n        const releaser = deepObserve(target, listener);\r\n        this.registerFinalizers(releaser);\r\n        return releaser;\r\n    }\r\n\r\n    protected autorun(view: (r: IReactionPublic) => any, opts?: IAutorunOptions): IReactionDisposer {\r\n        const releaser = autorun(view, opts);\r\n        this.registerFinalizers(releaser);\r\n        return releaser;\r\n    }\r\n\r\n    protected observe<T = Object>(object: T, listener: (change: IObjectChange<T>) => void, registerDisposer = true): Lambda {\r\n        const releaser = observe(object, listener);\r\n        if (registerDisposer) {\r\n            this.registerFinalizers(releaser);\r\n        }\r\n        return releaser;\r\n    }\r\n\r\n    public async allHandlersAsync(): Promise<void> {\r\n        await Promise.all(this.handlers);\r\n    }\r\n\r\n    protected validateState() {\r\n        if (this.isDisposed) {\r\n            throw new Error(\"Cannot access a disposed object\");\r\n        }\r\n    }\r\n    \r\n    protected observeAsync<T = Object>(\r\n        object: T,\r\n        listener: (change: IObjectChange<T>) => Promise<any>,\r\n        registerDisposer = true,\r\n        handlers = this.handlers\r\n    ): Lambda {\r\n        this.validateState();        \r\n        const releaser = observe(object, (change) => {\r\n            let task: Promise<any> = null;\r\n            task = (async () => {\r\n                await listener(change as IObjectChange<T>);\r\n                handlers.delete(task);\r\n            })();\r\n            handlers.add(task);\r\n        });\r\n        if (registerDisposer) {\r\n            this.registerFinalizers(releaser);\r\n        }\r\n        return releaser;\r\n    }\r\n\r\n    protected multiObserve(\r\n        objects: Object[],\r\n        listener: (change: IObjectDidChange) => void,\r\n        fireImmediately?: boolean,\r\n        registerDisposer = (d: () => void) => {\r\n            this.registerFinalizer(d);\r\n        }\r\n    ): Lambda[] {\r\n        const releasers: Lambda[] = [];\r\n        for (const object of objects) {\r\n            const releaser = observe(object, listener, fireImmediately);\r\n            releasers.push(releaser);\r\n            if (registerDisposer) {\r\n                registerDisposer(releaser);\r\n            }\r\n        }\r\n        return releasers;\r\n    }\r\n\r\n    protected reaction<T>(\r\n        expression: (r: IReactionPublic) => T,\r\n        effect: (arg: T, prev: T, r: IReactionPublic) => void,\r\n        opts?: IReactionOptions<T, boolean>\r\n    ): IReactionDisposer {\r\n        const releaser = reaction(expression, effect, opts);\r\n        this.registerFinalizers(releaser);\r\n        return releaser;\r\n    }\r\n\r\n    protected multiReaction<T>(\r\n        expressions: ((r: IReactionPublic) => T)[],\r\n        effect: (arg: T, prev: T, r: IReactionPublic) => void,\r\n        opts: IReactionOptions<T, boolean> = undefined,\r\n        registerDisposer = (d: () => void) => {\r\n            this.registerFinalizer(d);\r\n        }\r\n    ): IReactionDisposer[] {\r\n        const releasers: IReactionDisposer[] = [];\r\n        if (!opts) {\r\n            opts = undefined;\r\n        }\r\n        for (const expression of expressions) {\r\n            const releaser = reaction(expression, effect, opts);\r\n            releasers.push(releaser);\r\n            if (registerDisposer) {\r\n                registerDisposer(releaser);\r\n            }\r\n        }\r\n\r\n        return releasers;\r\n    }\r\n\r\n    // registerDisposers\r\n    protected registerFinalizers(...actions: (() => void)[]) {\r\n        this.finalizers.push(...actions);\r\n    }\r\n\r\n    // registerDisposer\r\n    protected registerFinalizer(action: () => void) {\r\n        this.registerFinalizers(action);\r\n        return action;\r\n    }\r\n\r\n    protected registerDisposable(disposable: IDisposable) {\r\n        return this.registerFinalizer(disposable.dispose.bind(disposable));\r\n    }\r\n\r\n    public dispose() {\r\n        if (this === undefined) {\r\n            console.error('undefined \"this\"');\r\n        }\r\n        if (!this.isDisposed) {\r\n            for (const d of this.finalizers) {\r\n                try {\r\n                    d && d();\r\n                } catch (err) {\r\n                    throw err; // for debug\r\n                }\r\n            }\r\n            this.finalizers.length = 0;\r\n            // while (this.finalizers.length) {\r\n            //     const d = this.finalizers.pop();\r\n            //     d && d();\r\n            // }\r\n            this.isDisposed = true;\r\n        }\r\n    }\r\n}\r\n\r\nexport class DisposableModel extends DisposableComponent {\r\n    @observable.ref\r\n    public isBusy: boolean = true; // isLoading\r\n\r\n    protected async withBusyAsync<T>(asyncAction: () => Promise<T>) {\r\n        transaction(() => {\r\n            this.isBusy = true;\r\n        });\r\n        try {\r\n            return await asyncAction();\r\n        } finally {\r\n            transaction(() => {\r\n                this.isBusy = false;\r\n            });\r\n        }\r\n    }\r\n\r\n    protected withBusy<T>(action: () => T) {\r\n        transaction(() => {\r\n            this.isBusy = true;\r\n        });\r\n        try {\r\n            return action();\r\n        } finally {\r\n            transaction(() => {\r\n                this.isBusy = false;\r\n            });\r\n        }\r\n    }\r\n\r\n    // createViewModel = <T = any>(model: T, options?: IViewModelOptions<T>): T & IRootViewModel<T> => {\r\n    //     const vm = createViewModel(model, options);\r\n    //     this.registerFinalizer(vm.$().dispose);\r\n    //     return vm;\r\n    // };\r\n}\r\n"],"names":["DisposableComponent","target","listener","releaser","deepObserve","view","opts","autorun","object","registerDisposer","observe","handlers","change","task","objects","fireImmediately","d","releasers","expression","effect","reaction","expressions","actions","action","disposable","err","DisposableModel","asyncAction","transaction","__decorateClass","observable"],"mappings":"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"}

package/dist/net/apiError.es.js

@@ -1,47 +1,43 @@
-var o = Object.defineProperty;
-var m = (n, e, t) => e in n ? o(n, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : n[e] = t;
-var a = (n, e, t) => m(n, typeof e != "symbol" ? e + "" : e, t);
-import * as c from "http-status";
-const E = "API_ERROR_INTERNAL_ERROR";
-class u extends Error {
+import a from "http-status";
+const c = "API_ERROR_INTERNAL_ERROR";
+class r extends Error {
+  isApiError = !0;
+  name;
+  message;
+  request;
+  response;
+  status;
   // code/type
   constructor(t, s) {
-    super(t);
-    a(this, "isApiError", !0);
-    a(this, "name");
-    a(this, "message");
-    a(this, "request");
-    a(this, "response");
-    a(this, "status");
-    this.status = s.status, this.message = t || s.name, this.request = s.request, this.response = s.response, this.name = s.name || E, Object.setPrototypeOf(this, u.prototype);
+    super(t), this.status = s.status, this.message = t || s.name, this.request = s.request, this.response = s.response, this.name = s.name || c, Object.setPrototypeOf(this, r.prototype);
   }
   static create(t, s) {
     if (!t)
-      return new u("Invalid request", {
+      return new r("Invalid request", {
         request: s
       });
-    const r = t.status;
-    if (r === c.OK)
+    const e = t.status;
+    if (e === a.OK)
       return null;
-    const i = c[`${r}_MESSAGE`], R = `HTTP_STATUS_${r}`;
-    return new u(i, {
-      status: r,
+    const n = a[`${e}_MESSAGE`], u = `HTTP_STATUS_${e}`;
+    return new r(n, {
+      status: e,
       request: s,
       response: t,
-      name: R
+      name: u
     });
   }
   static async assert(t, s) {
-    const r = await u.create(t, s);
-    if (r)
-      throw r;
+    const e = await r.create(t, s);
+    if (e)
+      throw e;
   }
   static isApiError(t) {
     return t.isApiError === !0;
   }
 }
 export {
-  E as API_ERROR_INTERNAL_ERROR,
-  u as ApiError
+  c as API_ERROR_INTERNAL_ERROR,
+  r as ApiError
 };
 //# sourceMappingURL=apiError.es.js.map

package/dist/net/apiError.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"apiError.es.js","sources":["../../src/net/apiError.ts"],"sourcesContent":["import { IRequestState, IResponseState, getResponseResult } from \"@/net/request\";\r\nimport * as HttpStatus from \"http-status\";\r\n\r\n// UNKNOWN/UNRECOGNIZED\r\nexport const API_ERROR_INTERNAL_ERROR = \"API_ERROR_INTERNAL_ERROR\";\r\n\r\n// \"notmodified\", \"nocontent\", \"error\", \"timeout\", \"abort\", or \"parsererror\"\r\n\r\n// TODO: use http-problem-details or error-http-response (application/problem+json)\r\n\r\nexport interface IApiErrorOptions<TDetails = any> extends ErrorOptions {\r\n    cause?: TDetails;\r\n    // type/code\r\n    name?: string;\r\n    status?: number;\r\n    request: IRequestState;\r\n    response?: Partial<IResponseState>;\r\n}\r\n\r\n// RequestError\r\nexport class ApiError<TDetails = any> extends Error {\r\n    public isApiError = true;\r\n\r\n    readonly name: string;\r\n\r\n    readonly message: string;\r\n\r\n    readonly request: IRequestState;\r\n\r\n    readonly response: Partial<IResponseState>;\r\n\r\n    readonly status: number; // code/type\r\n\r\n    public constructor(message: string, options?: IApiErrorOptions<TDetails>) {\r\n        // status: number, request: IRequestState, response?: Partial<IResponseState>, name?: string\r\n        super(message);\r\n        this.status = options.status;\r\n        this.message = message || options.name; // message ?? options.name\r\n        this.request = options.request;\r\n        this.response = options.response;\r\n        this.name = options.name || API_ERROR_INTERNAL_ERROR;\r\n        Object.setPrototypeOf(this, ApiError.prototype);\r\n    }\r\n\r\n    static create(response: Partial<IResponseState>, request?: IRequestState) {\r\n        if (!response) {\r\n            return new ApiError(\"Invalid request\", {\r\n                request\r\n            });\r\n        }\r\n\r\n        const status = response.status;\r\n\r\n        if (status === HttpStatus.OK) {\r\n            return null;\r\n        }\r\n\r\n        // const statusClass = HttpStatus[`${status}_CLASS`] as HttpStatus.HttpStatusClasses;\r\n        // const statusClassName = HttpStatus.classes[String(statusClass)]; // HttpStatus.classes[`${statusClass}_NAME`]\r\n        // const statusClassMsg = HttpStatus.classes[`${statusClass}_MESSAGE`];\r\n        const msg = HttpStatus[`${status}_MESSAGE`] as string; // || \"An unexpected server error occurred.\"\r\n        const name = `HTTP_STATUS_${status}`;\r\n        // response.resolved\r\n        const error = new ApiError(msg, {\r\n            status,\r\n            request,\r\n            response,\r\n            name\r\n        });\r\n        return error;\r\n    }\r\n\r\n    static async assert(response: IResponseState, request: IRequestState) {\r\n        const err = await ApiError.create(response, request);\r\n        if (err) {\r\n            throw err;\r\n        }\r\n    }\r\n\r\n    static isApiError(obj: any): obj is ApiError {\r\n        return obj.isApiError === true;\r\n    }\r\n}\r\n"],"names":["API_ERROR_INTERNAL_ERROR","ApiError","message","options","__publicField","response","request","status","HttpStatus","msg","name","err","obj"],"mappings":";;;;AAIO,MAAMA,IAA2B;AAgBjC,MAAMC,UAAiC,MAAM;AAAA;AAAA,EAazC,YAAYC,GAAiBC,GAAsC;AAEtE,UAAMD,CAAO;AAdV,IAAAE,EAAA,oBAAa;AAEX,IAAAA,EAAA;AAEA,IAAAA,EAAA;AAEA,IAAAA,EAAA;AAEA,IAAAA,EAAA;AAEA,IAAAA,EAAA;AAKL,SAAK,SAASD,EAAQ,QACjB,KAAA,UAAUD,KAAWC,EAAQ,MAClC,KAAK,UAAUA,EAAQ,SACvB,KAAK,WAAWA,EAAQ,UACnB,KAAA,OAAOA,EAAQ,QAAQH,GACrB,OAAA,eAAe,MAAMC,EAAS,SAAS;AAAA,EAClD;AAAA,EAEA,OAAO,OAAOI,GAAmCC,GAAyB;AACtE,QAAI,CAACD;AACM,aAAA,IAAIJ,EAAS,mBAAmB;AAAA,QACnC,SAAAK;AAAA,MAAA,CACH;AAGL,UAAMC,IAASF,EAAS;AAEpB,QAAAE,MAAWC,EAAW;AACf,aAAA;AAMX,UAAMC,IAAMD,EAAW,GAAGD,CAAM,UAAU,GACpCG,IAAO,eAAeH,CAAM;AAQ3B,WANO,IAAIN,EAASQ,GAAK;AAAA,MAC5B,QAAAF;AAAA,MACA,SAAAD;AAAA,MACA,UAAAD;AAAA,MACA,MAAAK;AAAA,IAAA,CACH;AAAA,EAEL;AAAA,EAEA,aAAa,OAAOL,GAA0BC,GAAwB;AAClE,UAAMK,IAAM,MAAMV,EAAS,OAAOI,GAAUC,CAAO;AACnD,QAAIK;AACM,YAAAA;AAAA,EAEd;AAAA,EAEA,OAAO,WAAWC,GAA2B;AACzC,WAAOA,EAAI,eAAe;AAAA,EAC9B;AACJ;"}
+{"version":3,"file":"apiError.es.js","sources":["../../src/net/apiError.ts"],"sourcesContent":["import { IRequestState, IResponseState, getResponseResult } from \"@/net/request\";\r\nimport HttpStatus from \"http-status\";\r\n\r\n// UNKNOWN/UNRECOGNIZED\r\nexport const API_ERROR_INTERNAL_ERROR = \"API_ERROR_INTERNAL_ERROR\";\r\n\r\n// \"notmodified\", \"nocontent\", \"error\", \"timeout\", \"abort\", or \"parsererror\"\r\n\r\n// TODO: use http-problem-details or error-http-response (application/problem+json)\r\n\r\nexport interface IApiErrorOptions<TDetails = any> extends ErrorOptions {\r\n    cause?: TDetails;\r\n    // type/code\r\n    name?: string;\r\n    status?: number;\r\n    request: IRequestState;\r\n    response?: Partial<IResponseState>;\r\n}\r\n\r\n// RequestError\r\nexport class ApiError<TDetails = any> extends Error {\r\n    public isApiError = true;\r\n\r\n    readonly name: string;\r\n\r\n    readonly message: string;\r\n\r\n    readonly request: IRequestState;\r\n\r\n    readonly response: Partial<IResponseState>;\r\n\r\n    readonly status: number; // code/type\r\n\r\n    public constructor(message: string, options?: IApiErrorOptions<TDetails>) {\r\n        // status: number, request: IRequestState, response?: Partial<IResponseState>, name?: string\r\n        super(message);\r\n        this.status = options.status;\r\n        this.message = message || options.name; // message ?? options.name\r\n        this.request = options.request;\r\n        this.response = options.response;\r\n        this.name = options.name || API_ERROR_INTERNAL_ERROR;\r\n        Object.setPrototypeOf(this, ApiError.prototype);\r\n    }\r\n\r\n    static create(response: Partial<IResponseState>, request?: IRequestState) {\r\n        if (!response) {\r\n            return new ApiError(\"Invalid request\", {\r\n                request\r\n            });\r\n        }\r\n\r\n        const status = response.status;\r\n\r\n        if (status === HttpStatus.OK) {\r\n            return null;\r\n        }\r\n\r\n        // const statusClass = HttpStatus[`${status}_CLASS`] as HttpStatus.HttpStatusClasses;\r\n        // const statusClassName = HttpStatus.classes[String(statusClass)]; // HttpStatus.classes[`${statusClass}_NAME`]\r\n        // const statusClassMsg = HttpStatus.classes[`${statusClass}_MESSAGE`];\r\n        const msg = HttpStatus[`${status}_MESSAGE`] as string; // || \"An unexpected server error occurred.\"\r\n        const name = `HTTP_STATUS_${status}`;\r\n        // response.resolved\r\n        const error = new ApiError(msg, {\r\n            status,\r\n            request,\r\n            response,\r\n            name\r\n        });\r\n        return error;\r\n    }\r\n\r\n    static async assert(response: IResponseState, request: IRequestState) {\r\n        const err = await ApiError.create(response, request);\r\n        if (err) {\r\n            throw err;\r\n        }\r\n    }\r\n\r\n    static isApiError(obj: any): obj is ApiError {\r\n        return obj.isApiError === true;\r\n    }\r\n}\r\n"],"names":["API_ERROR_INTERNAL_ERROR","ApiError","message","options","response","request","status","HttpStatus","msg","name","err","obj"],"mappings":";AAIO,MAAMA,IAA2B;AAgBjC,MAAMC,UAAiC,MAAM;AAAA,EACzC,aAAa;AAAA,EAEX;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA;AAAA,EAEF,YAAYC,GAAiBC,GAAsC;AAEtE,UAAMD,CAAO,GACb,KAAK,SAASC,EAAQ,QACtB,KAAK,UAAUD,KAAWC,EAAQ,MAClC,KAAK,UAAUA,EAAQ,SACvB,KAAK,WAAWA,EAAQ,UACxB,KAAK,OAAOA,EAAQ,QAAQH,GAC5B,OAAO,eAAe,MAAMC,EAAS,SAAS;AAAA,EAClD;AAAA,EAEA,OAAO,OAAOG,GAAmCC,GAAyB;AACtE,QAAI,CAACD;AACD,aAAO,IAAIH,EAAS,mBAAmB;AAAA,QACnC,SAAAI;AAAA,MAAA,CACH;AAGL,UAAMC,IAASF,EAAS;AAExB,QAAIE,MAAWC,EAAW;AACtB,aAAO;AAMX,UAAMC,IAAMD,EAAW,GAAGD,CAAM,UAAU,GACpCG,IAAO,eAAeH,CAAM;AAQlC,WANc,IAAIL,EAASO,GAAK;AAAA,MAC5B,QAAAF;AAAA,MACA,SAAAD;AAAA,MACA,UAAAD;AAAA,MACA,MAAAK;AAAA,IAAA,CACH;AAAA,EAEL;AAAA,EAEA,aAAa,OAAOL,GAA0BC,GAAwB;AAClE,UAAMK,IAAM,MAAMT,EAAS,OAAOG,GAAUC,CAAO;AACnD,QAAIK;AACA,YAAMA;AAAA,EAEd;AAAA,EAEA,OAAO,WAAWC,GAA2B;AACzC,WAAOA,EAAI,eAAe;AAAA,EAC9B;AACJ;"}

package/dist/net/client.es.js

@@ -1,41 +1,38 @@
-var u = Object.defineProperty;
-var p = (c, e, t) => e in c ? u(c, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[e] = t;
-var i = (c, e, t) => p(c, typeof e != "symbol" ? e + "" : e, t);
-import { v4 as f } from "uuid";
-import r from "http-status";
-import { getResponseResult as y } from "./request.es.js";
-import { ApiError as l } from "./apiError.es.js";
-function A(c, e) {
+import { v4 as d } from "uuid";
+import o from "http-status";
+import { getResponseResult as p } from "./request.es.js";
+import { ApiError as r } from "./apiError.es.js";
+function u(c, e) {
   if (!c)
     return c;
-  const a = e.map((o) => o.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|"), s = new RegExp(`(_?(${a}))+?$`, "i");
-  let n = c.replace(s, "");
-  return n = n.trim(), n.length > 0 ? n : c;
+  const t = e.map((i) => i.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|"), n = new RegExp(`(_?(${t}))+?$`, "i");
+  let a = c.replace(n, "");
+  return a = a.trim(), a.length > 0 ? a : c;
 }
-const w = ["api", "controller", "client", "fetcher"];
-class S {
-  constructor(e, t) {
-    i(this, "baseUrl");
-    i(this, "name");
-    // private requestStates
-    i(this, "requestStateMap");
-    i(this, "fetcher");
-    i(this, "msgBus");
-    i(this, "accessToken");
-    i(this, "init");
-    this.fetcher = t || window, this.requestStateMap = /* @__PURE__ */ new Map(), this.msgBus = e.msgBus, this.msgBus.on({
+const f = ["api", "controller", "client", "fetcher"];
+class R {
+  baseUrl;
+  name;
+  // private requestStates
+  requestStateMap;
+  fetcher;
+  msgBus;
+  accessToken;
+  init;
+  constructor(e, s) {
+    this.fetcher = s || window, this.requestStateMap = /* @__PURE__ */ new Map(), this.msgBus = e.msgBus, this.msgBus.on({
       channel: "APP-SECURITY-AUTH-SIGNIN",
       group: "out",
-      callback: (a) => {
-        this.accessToken = a.payload.accessToken;
+      callback: (t) => {
+        this.accessToken = t.payload.accessToken;
       }
     }), this.init = Promise.all([this.getBaseUrlAsync(), this.updateSecurityAsync()]);
   }
   async getBaseUrlAsync() {
-    const t = (await this.msgBus.dispatchAsync({
+    const s = (await this.msgBus.dispatchAsync({
       channel: "APP-CONFIG-GET"
-    })).payload, a = A(this.name, w), s = Object.entries(t.apis).find((n) => n[0].toLowerCase() === (a == null ? void 0 : a.toLowerCase()));
-    this.baseUrl = (s == null ? void 0 : s[1].url) || t.baseUrl;
+    })).payload, t = u(this.name, f), n = Object.entries(s.apis).find((a) => a[0].toLowerCase() === t?.toLowerCase());
+    this.baseUrl = n?.[1].url || s.baseUrl;
   }
   async updateSecurityAsync() {
     if (!this.accessToken) {
@@ -47,64 +44,63 @@ class S {
     return this.accessToken;
   }
   async addAuthorizationAsync(e) {
-    const t = await this.updateSecurityAsync();
-    if (!t)
-      throw l.create({
-        status: r.UNAUTHORIZED
+    const s = await this.updateSecurityAsync();
+    if (!s)
+      throw r.create({
+        status: o.UNAUTHORIZED
       });
-    const a = "Authorization", s = e.headers, n = `Bearer ${t}`;
-    if (s instanceof Headers)
-      s.set(a, n);
+    const t = "Authorization", n = e.headers, a = `Bearer ${s}`;
+    if (n instanceof Headers)
+      n.set(t, a);
     else
       throw new Error("Unsupported headers");
   }
   async executeRequestInternalAsync(e) {
     try {
-      let t = !0;
-      const a = e.callbacks && e.callbacks.onBeforeSendRequest;
-      if (a) {
-        const s = {
+      let s = !0;
+      const t = e.callbacks && e.callbacks.onBeforeSendRequest;
+      if (t) {
+        const n = {
           request: e,
           cancel: !1,
           handled: !1
         };
-        if (await a(s), s.cancel)
-          if (t = !1, e.status = "canceled", s.handled)
-            e.result = s.result;
+        if (await t(n), n.cancel)
+          if (s = !1, e.status = "canceled", n.handled)
+            e.result = n.result;
           else
             throw new Error("The request was aborted");
       }
-      if (t) {
+      if (s) {
         e.status = "executing";
-        const s = await this.fetcher.fetch(e.url, e);
-        l.assert(s, e);
-        let n = e.callbacks && e.callbacks.onResponseRead;
-        n || (n = async (h) => {
-          const d = await y(s, e);
-          h.result = d;
+        const n = await this.fetcher.fetch(e.url, e);
+        r.assert(n, e);
+        let a = e.callbacks && e.callbacks.onResponseRead;
+        a || (a = async (l) => {
+          const h = await p(n, e);
+          l.result = h;
         });
-        const o = {
-          response: s
+        const i = {
+          response: n
         };
-        await n(o), e.result = o.result, e.status = "succeeded";
+        await a(i), e.result = i.result, e.status = "succeeded";
       }
-    } catch (t) {
-      throw e.status = "failed", t;
+    } catch (s) {
+      throw e.status = "failed", s;
     }
     return e;
   }
   async executeRequestAsync(e) {
-    var a, s;
-    let t = 0;
+    let s = 0;
     do
       try {
         return e.useAuth && await this.addAuthorizationAsync(e), this.executeRequestInternalAsync(e);
-      } catch (n) {
-        if (n instanceof l) {
-          if (t > 0 || n.status === r.UPGRADE_REQUIRED)
-            throw n;
-          if (n.status === r.UNAUTHORIZED) {
-            (s = (a = n.response) == null ? void 0 : a.headers) != null && s.get("token-expired") ? await this.msgBus.dispatchAsync({
+      } catch (t) {
+        if (t instanceof r) {
+          if (s > 0 || t.status === o.UPGRADE_REQUIRED)
+            throw t;
+          if (t.status === o.UNAUTHORIZED) {
+            t.response?.headers?.get("token-expired") ? await this.msgBus.dispatchAsync({
               channel: "APP-SECURITY-AUTH-REFRESH"
             }) : await this.msgBus.dispatchAsync({
               channel: "APP-SECURITY-REQUEST-AUTH"
@@ -113,9 +109,9 @@ class S {
           }
           continue;
         }
-        throw n;
+        throw t;
       } finally {
-        t++;
+        s++;
       }
     while (!0);
   }
@@ -129,18 +125,18 @@ class S {
       cache: "default",
       credentials: "same-origin",
       mode: "cors"
-    }, ...e }, e.id || (e.id = f());
-    let a = {
+    }, ...e }, e.id || (e.id = d());
+    let t = {
       ...e,
       status: "queued",
       response: void 0,
       result: void 0
     };
-    return this.requestStateMap.set(e.id, a), e.headers instanceof Headers || (e.headers = new Headers(e.headers)), e.headers.append("Content-Type", e.contentType), e.method === "POST" && (e.body || (e.body = "")), await this.executeRequestAsync(a), a.result;
+    return this.requestStateMap.set(e.id, t), e.headers instanceof Headers || (e.headers = new Headers(e.headers)), e.headers.append("Content-Type", e.contentType), e.method === "POST" && (e.body || (e.body = "")), await this.executeRequestAsync(t), t.result;
   }
 }
 export {
-  S as ClientBase,
-  A as extractApiName
+  R as ClientBase,
+  u as extractApiName
 };
 //# sourceMappingURL=client.es.js.map

package/dist/net/client.es.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.es.js","sources":["../../src/net/client.ts"],"sourcesContent":["import { v4 as uuid } from \"uuid\";\r\nimport httpStatus from \"http-status\";\r\nimport { getResponseResult, IFetcher, IRequestCallbacks, IRequestParams, IRequestState } from \"./request\";\r\nimport { ApiError } from \"./apiError\";\r\nimport { BaseAppBusStruct, BaseAppContext } from \"@/appDomain/appContracts\";\r\nimport { MsgBus } from \"@actdim/msgmesh/msgBusCore\";\r\n\r\n// MLWEB-2172\r\n\r\n// TODO: support request cancellation\r\n// https://stackoverflow.com/questions/31061838/how-do-i-cancel-an-http-fetch-request\r\n// https://mukeshprajapati0251.medium.com/cancel-rest-api-pending-request-1af65e70366d\r\n\r\nexport function extractApiName(name: string, suffixes: string[]): string | null {\r\n    if (!name) {\r\n        return name;\r\n    }\r\n    const escaped = suffixes.map((s) => s.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\"));\r\n    const group = escaped.join(\"|\");\r\n    const pattern = new RegExp(`(_?(${group}))+?$`, \"i\");\r\n\r\n    let result = name.replace(pattern, \"\");\r\n\r\n    result = result.trim();\r\n    return result.length > 0 ? result : name;\r\n}\r\n\r\nconst API_SUFFIXES = [\"api\", \"controller\", \"client\", \"fetcher\"];\r\n// App(Api)ClientBase\r\nexport class ClientBase {\r\n    protected baseUrl: string;\r\n    protected name: string;\r\n    // private requestStates\r\n    private requestStateMap: Map<string, IRequestState>;\r\n\r\n    private fetcher: IFetcher;\r\n\r\n    private msgBus: MsgBus<BaseAppBusStruct>;\r\n\r\n    private accessToken: string;\r\n\r\n    private init: Promise<any>;\r\n\r\n    constructor(context: BaseAppContext, fetcher?: IFetcher) {\r\n        this.fetcher = fetcher || window;\r\n        this.requestStateMap = new Map<string, IRequestState>();\r\n        this.msgBus = context.msgBus;\r\n        // TODO: unsubscribe\r\n        this.msgBus.on({\r\n            channel: \"APP-SECURITY-AUTH-SIGNIN\",\r\n            group: \"out\",\r\n            callback: (msg) => {\r\n                this.accessToken = msg.payload.accessToken;\r\n            }\r\n        });\r\n        this.init = Promise.all([this.getBaseUrlAsync(), this.updateSecurityAsync()]);\r\n    }\r\n\r\n    protected async getBaseUrlAsync() {\r\n        const msg = await this.msgBus.dispatchAsync({\r\n            channel: \"APP-CONFIG-GET\"\r\n        });\r\n        const config = msg.payload;\r\n        const apiName = extractApiName(this.name, API_SUFFIXES);\r\n        const apiEntry = Object.entries(config.apis).find((entry) => entry[0].toLowerCase() === apiName?.toLowerCase());\r\n        this.baseUrl = apiEntry?.[1].url || config.baseUrl;\r\n    }\r\n\r\n    private async updateSecurityAsync() {\r\n        if (!this.accessToken) {\r\n            const msg = await this.msgBus.dispatchAsync({\r\n                channel: \"APP-SECURITY-GET-CONTEXT\"\r\n            });\r\n            this.accessToken = msg.payload.accessToken;\r\n        }\r\n        return this.accessToken;\r\n    }\r\n\r\n    private async addAuthorizationAsync(request: IRequestParams) {\r\n        const accessToken = await this.updateSecurityAsync();\r\n        if (!accessToken) {\r\n            throw ApiError.create({\r\n                status: httpStatus.UNAUTHORIZED\r\n            });\r\n        }\r\n        const authorizationHeader = \"Authorization\";\r\n        const headers = request.headers;\r\n        const headerValue = `Bearer ${accessToken}`;\r\n        if (headers instanceof Headers) {\r\n            // if (headers.has(authorizationHeader)) {\r\n            //     headers.delete(authorizationHeader)\r\n            // }\r\n            // headers.append(authorizationHeader, headerValue);\r\n            headers.set(authorizationHeader, headerValue);\r\n        } else {\r\n            throw new Error(\"Unsupported headers\"); // object type\r\n        }\r\n    }\r\n\r\n    private async executeRequestInternalAsync(request: IRequestState) {\r\n        try {\r\n            let proceed = true;\r\n            const onBeforeSendRequest = request.callbacks && request.callbacks.onBeforeSendRequest;\r\n            if (onBeforeSendRequest) {\r\n                const event = {\r\n                    request: request,\r\n                    cancel: false,\r\n                    handled: false\r\n                } as Parameters<IRequestCallbacks[\"onBeforeSendRequest\"]>[0];\r\n                await onBeforeSendRequest(event);\r\n                if (event.cancel) {\r\n                    // interrupt\r\n                    proceed = false;\r\n                    request.status = \"canceled\";\r\n                    if (event.handled) {\r\n                        request.result = event.result;\r\n                    } else {\r\n                        // ApiError?\r\n                        throw new Error(\"The request was aborted\"); // has been? canceled?\r\n                    }\r\n                }\r\n            }\r\n            if (proceed) {\r\n                request.status = \"executing\";\r\n                const response = await this.fetcher.fetch(request.url, request);\r\n                ApiError.assert(response, request);\r\n                let onResponseRead = request.callbacks && request.callbacks.onResponseRead;\r\n                if (!onResponseRead) {\r\n                    onResponseRead = async (event) => {\r\n                        const result = await getResponseResult(response, request);\r\n                        event.result = result;\r\n                    };\r\n                }\r\n                const event = {\r\n                    response: response\r\n                } as Parameters<IRequestCallbacks[\"onResponseRead\"]>[0];\r\n\r\n                await onResponseRead(event);\r\n                request.result = event.result;\r\n                request.status = \"succeeded\";\r\n            }\r\n        } catch (err) {\r\n            request.status = \"failed\";\r\n            // throw ApiError.create(undefined, request);\r\n            throw err;\r\n        }\r\n        return request;\r\n    }\r\n\r\n    private async executeRequestAsync(request: IRequestState): Promise<IRequestState> {\r\n        let attempt = 0;\r\n        do {\r\n            try {\r\n                if (request.useAuth) {\r\n                    await this.addAuthorizationAsync(request);\r\n                }\r\n                return this.executeRequestInternalAsync(request);\r\n            } catch (err) {\r\n                if (err instanceof ApiError) {\r\n                    if (attempt > 0) {\r\n                        throw err;\r\n                    }\r\n                    if (err.status === httpStatus.UPGRADE_REQUIRED) {\r\n                        // await this.context.msgBus.dispatchAsync({\r\n                        //     channel: \"APP_RELOAD\" // APP_REQUEST_UPDGRADE\r\n                        // });\r\n                        throw err;\r\n                    } else if (err.status === httpStatus.UNAUTHORIZED) {\r\n                        if (err.response?.headers?.get(\"token-expired\")) {\r\n                            // token expired or invalid\r\n                            await this.msgBus.dispatchAsync({\r\n                                channel: \"APP-SECURITY-AUTH-REFRESH\"\r\n                            });\r\n                        } else {\r\n                            await this.msgBus.dispatchAsync({\r\n                                channel: \"APP-SECURITY-REQUEST-AUTH\"\r\n                            });\r\n                        }\r\n                        // codes:\r\n                        // TOKEN_EXPIRED\r\n                        // TOKEN_INVALID\r\n                        // TOKEN_MISSING\r\n                        // AUTH_REQUIRED\r\n                        // header: WWW-Authenticate\r\n                        continue;\r\n                    }\r\n                    continue;\r\n                }\r\n                throw err;\r\n            } finally {\r\n                attempt++;\r\n            }\r\n        } while (true);\r\n    }\r\n\r\n    // T extends IApiResponse\r\n    public async fetchAsync<T>(requestParams: IRequestParams): Promise<T> {\r\n        await this.init;\r\n\r\n        const defaultParams: Partial<IRequestParams> = {\r\n            contentType: \"application/json\",\r\n            method: \"POST\",\r\n            body: null,\r\n            headers: {},\r\n            cache: \"default\",\r\n            credentials: \"same-origin\",\r\n            mode: \"cors\"\r\n        };\r\n\r\n        requestParams = { ...defaultParams, ...requestParams };\r\n        if (!requestParams.id) {\r\n            requestParams.id = uuid();\r\n        }\r\n\r\n        let request = {\r\n            ...requestParams,\r\n            status: \"queued\",\r\n            response: undefined,\r\n            result: undefined\r\n        } as IRequestState;\r\n\r\n        this.requestStateMap.set(requestParams.id, request);\r\n\r\n        if (!(requestParams.headers instanceof Headers)) {\r\n            requestParams.headers = new Headers(requestParams.headers);\r\n        }\r\n\r\n        requestParams.headers.append(\"Content-Type\", requestParams.contentType);\r\n        // \"api-version\"\r\n\r\n        if (requestParams.method === \"POST\") {\r\n            if (!requestParams.body) {\r\n                requestParams.body = \"\";\r\n            }\r\n        }\r\n\r\n        await this.executeRequestAsync(request);\r\n        return request.result;\r\n    }\r\n}\r\n/* \r\nif (status === 404) {\r\n      return response.text().then((_responseText) => {\r\n      let result404: any = null;\r\n      result404 = _responseText === \"\" ? null : JSON.parse(_responseText, this.jsonParseReviver) as __API__ProblemDetails;\r\n      return throwException(\"Not Found\", status, _responseText, _headers, result404);\r\n      });\r\n  } else if (status !== 200 && status !== 204) {\r\n      return response.text().then((_responseText) => {\r\n      return throwException(\"An unexpected server error occurred.\", status, _responseText, _headers);\r\n      });\r\n  }\r\n\r\nBLOB\r\nlet reader = new FileReader();\r\n        reader.onload = event => resolve((event.target as any).result);\r\n        reader.readAsText(blob);\r\n*/\r\n"],"names":["extractApiName","name","suffixes","group","s","pattern","result","API_SUFFIXES","ClientBase","context","fetcher","__publicField","msg","config","apiName","apiEntry","entry","request","accessToken","ApiError","httpStatus","authorizationHeader","headers","headerValue","proceed","onBeforeSendRequest","event","response","onResponseRead","getResponseResult","err","attempt","_b","_a","requestParams","uuid"],"mappings":"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"}
+{"version":3,"file":"client.es.js","sources":["../../src/net/client.ts"],"sourcesContent":["import { v4 as uuid } from \"uuid\";\r\nimport httpStatus from \"http-status\";\r\nimport { getResponseResult, IFetcher, IRequestCallbacks, IRequestParams, IRequestState } from \"./request\";\r\nimport { ApiError } from \"./apiError\";\r\nimport { BaseAppBusStruct, BaseAppContext } from \"@/appDomain/appContracts\";\r\nimport { MsgBus } from \"@actdim/msgmesh/msgBusCore\";\r\n\r\n// MLWEB-2172\r\n\r\n// TODO: support request cancellation\r\n// https://stackoverflow.com/questions/31061838/how-do-i-cancel-an-http-fetch-request\r\n// https://mukeshprajapati0251.medium.com/cancel-rest-api-pending-request-1af65e70366d\r\n\r\nexport function extractApiName(name: string, suffixes: string[]): string | null {\r\n    if (!name) {\r\n        return name;\r\n    }\r\n    const escaped = suffixes.map((s) => s.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\"));\r\n    const group = escaped.join(\"|\");\r\n    const pattern = new RegExp(`(_?(${group}))+?$`, \"i\");\r\n\r\n    let result = name.replace(pattern, \"\");\r\n\r\n    result = result.trim();\r\n    return result.length > 0 ? result : name;\r\n}\r\n\r\nconst API_SUFFIXES = [\"api\", \"controller\", \"client\", \"fetcher\"];\r\n// App(Api)ClientBase\r\nexport class ClientBase {\r\n    protected baseUrl: string;\r\n    protected name: string;\r\n    // private requestStates\r\n    private requestStateMap: Map<string, IRequestState>;\r\n\r\n    private fetcher: IFetcher;\r\n\r\n    private msgBus: MsgBus<BaseAppBusStruct>;\r\n\r\n    private accessToken: string;\r\n\r\n    private init: Promise<any>;\r\n\r\n    constructor(context: BaseAppContext, fetcher?: IFetcher) {\r\n        this.fetcher = fetcher || window;\r\n        this.requestStateMap = new Map<string, IRequestState>();\r\n        this.msgBus = context.msgBus;\r\n        // TODO: unsubscribe\r\n        this.msgBus.on({\r\n            channel: \"APP-SECURITY-AUTH-SIGNIN\",\r\n            group: \"out\",\r\n            callback: (msg) => {\r\n                this.accessToken = msg.payload.accessToken;\r\n            }\r\n        });\r\n        this.init = Promise.all([this.getBaseUrlAsync(), this.updateSecurityAsync()]);\r\n    }\r\n\r\n    protected async getBaseUrlAsync() {\r\n        const msg = await this.msgBus.dispatchAsync({\r\n            channel: \"APP-CONFIG-GET\"\r\n        });\r\n        const config = msg.payload;\r\n        const apiName = extractApiName(this.name, API_SUFFIXES);\r\n        const apiEntry = Object.entries(config.apis).find((entry) => entry[0].toLowerCase() === apiName?.toLowerCase());\r\n        this.baseUrl = apiEntry?.[1].url || config.baseUrl;\r\n    }\r\n\r\n    private async updateSecurityAsync() {\r\n        if (!this.accessToken) {\r\n            const msg = await this.msgBus.dispatchAsync({\r\n                channel: \"APP-SECURITY-GET-CONTEXT\"\r\n            });\r\n            this.accessToken = msg.payload.accessToken;\r\n        }\r\n        return this.accessToken;\r\n    }\r\n\r\n    private async addAuthorizationAsync(request: IRequestParams) {\r\n        const accessToken = await this.updateSecurityAsync();\r\n        if (!accessToken) {\r\n            throw ApiError.create({\r\n                status: httpStatus.UNAUTHORIZED\r\n            });\r\n        }\r\n        const authorizationHeader = \"Authorization\";\r\n        const headers = request.headers;\r\n        const headerValue = `Bearer ${accessToken}`;\r\n        if (headers instanceof Headers) {\r\n            // if (headers.has(authorizationHeader)) {\r\n            //     headers.delete(authorizationHeader)\r\n            // }\r\n            // headers.append(authorizationHeader, headerValue);\r\n            headers.set(authorizationHeader, headerValue);\r\n        } else {\r\n            throw new Error(\"Unsupported headers\"); // object type\r\n        }\r\n    }\r\n\r\n    private async executeRequestInternalAsync(request: IRequestState) {\r\n        try {\r\n            let proceed = true;\r\n            const onBeforeSendRequest = request.callbacks && request.callbacks.onBeforeSendRequest;\r\n            if (onBeforeSendRequest) {\r\n                const event = {\r\n                    request: request,\r\n                    cancel: false,\r\n                    handled: false\r\n                } as Parameters<IRequestCallbacks[\"onBeforeSendRequest\"]>[0];\r\n                await onBeforeSendRequest(event);\r\n                if (event.cancel) {\r\n                    // interrupt\r\n                    proceed = false;\r\n                    request.status = \"canceled\";\r\n                    if (event.handled) {\r\n                        request.result = event.result;\r\n                    } else {\r\n                        // ApiError?\r\n                        throw new Error(\"The request was aborted\"); // has been? canceled?\r\n                    }\r\n                }\r\n            }\r\n            if (proceed) {\r\n                request.status = \"executing\";\r\n                const response = await this.fetcher.fetch(request.url, request);\r\n                ApiError.assert(response, request);\r\n                let onResponseRead = request.callbacks && request.callbacks.onResponseRead;\r\n                if (!onResponseRead) {\r\n                    onResponseRead = async (event) => {\r\n                        const result = await getResponseResult(response, request);\r\n                        event.result = result;\r\n                    };\r\n                }\r\n                const event = {\r\n                    response: response\r\n                } as Parameters<IRequestCallbacks[\"onResponseRead\"]>[0];\r\n\r\n                await onResponseRead(event);\r\n                request.result = event.result;\r\n                request.status = \"succeeded\";\r\n            }\r\n        } catch (err) {\r\n            request.status = \"failed\";\r\n            // throw ApiError.create(undefined, request);\r\n            throw err;\r\n        }\r\n        return request;\r\n    }\r\n\r\n    private async executeRequestAsync(request: IRequestState): Promise<IRequestState> {\r\n        let attempt = 0;\r\n        do {\r\n            try {\r\n                if (request.useAuth) {\r\n                    await this.addAuthorizationAsync(request);\r\n                }\r\n                return this.executeRequestInternalAsync(request);\r\n            } catch (err) {\r\n                if (err instanceof ApiError) {\r\n                    if (attempt > 0) {\r\n                        throw err;\r\n                    }\r\n                    if (err.status === httpStatus.UPGRADE_REQUIRED) {\r\n                        // await this.context.msgBus.dispatchAsync({\r\n                        //     channel: \"APP_RELOAD\" // APP_REQUEST_UPDGRADE\r\n                        // });\r\n                        throw err;\r\n                    } else if (err.status === httpStatus.UNAUTHORIZED) {\r\n                        if (err.response?.headers?.get(\"token-expired\")) {\r\n                            // token expired or invalid\r\n                            await this.msgBus.dispatchAsync({\r\n                                channel: \"APP-SECURITY-AUTH-REFRESH\"\r\n                            });\r\n                        } else {\r\n                            await this.msgBus.dispatchAsync({\r\n                                channel: \"APP-SECURITY-REQUEST-AUTH\"\r\n                            });\r\n                        }\r\n                        // codes:\r\n                        // TOKEN_EXPIRED\r\n                        // TOKEN_INVALID\r\n                        // TOKEN_MISSING\r\n                        // AUTH_REQUIRED\r\n                        // header: WWW-Authenticate\r\n                        continue;\r\n                    }\r\n                    continue;\r\n                }\r\n                throw err;\r\n            } finally {\r\n                attempt++;\r\n            }\r\n        } while (true);\r\n    }\r\n\r\n    // T extends IApiResponse\r\n    public async fetchAsync<T>(requestParams: IRequestParams): Promise<T> {\r\n        await this.init;\r\n\r\n        const defaultParams: Partial<IRequestParams> = {\r\n            contentType: \"application/json\",\r\n            method: \"POST\",\r\n            body: null,\r\n            headers: {},\r\n            cache: \"default\",\r\n            credentials: \"same-origin\",\r\n            mode: \"cors\"\r\n        };\r\n\r\n        requestParams = { ...defaultParams, ...requestParams };\r\n        if (!requestParams.id) {\r\n            requestParams.id = uuid();\r\n        }\r\n\r\n        let request = {\r\n            ...requestParams,\r\n            status: \"queued\",\r\n            response: undefined,\r\n            result: undefined\r\n        } as IRequestState;\r\n\r\n        this.requestStateMap.set(requestParams.id, request);\r\n\r\n        if (!(requestParams.headers instanceof Headers)) {\r\n            requestParams.headers = new Headers(requestParams.headers);\r\n        }\r\n\r\n        requestParams.headers.append(\"Content-Type\", requestParams.contentType);\r\n        // \"api-version\"\r\n\r\n        if (requestParams.method === \"POST\") {\r\n            if (!requestParams.body) {\r\n                requestParams.body = \"\";\r\n            }\r\n        }\r\n\r\n        await this.executeRequestAsync(request);\r\n        return request.result;\r\n    }\r\n}\r\n/* \r\nif (status === 404) {\r\n      return response.text().then((_responseText) => {\r\n      let result404: any = null;\r\n      result404 = _responseText === \"\" ? null : JSON.parse(_responseText, this.jsonParseReviver) as __API__ProblemDetails;\r\n      return throwException(\"Not Found\", status, _responseText, _headers, result404);\r\n      });\r\n  } else if (status !== 200 && status !== 204) {\r\n      return response.text().then((_responseText) => {\r\n      return throwException(\"An unexpected server error occurred.\", status, _responseText, _headers);\r\n      });\r\n  }\r\n\r\nBLOB\r\nlet reader = new FileReader();\r\n        reader.onload = event => resolve((event.target as any).result);\r\n        reader.readAsText(blob);\r\n*/\r\n"],"names":["extractApiName","name","suffixes","group","s","pattern","result","API_SUFFIXES","ClientBase","context","fetcher","msg","config","apiName","apiEntry","entry","request","accessToken","ApiError","httpStatus","authorizationHeader","headers","headerValue","proceed","onBeforeSendRequest","event","response","onResponseRead","getResponseResult","err","attempt","requestParams","uuid"],"mappings":"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"}

package/dist/net/request.es.js

@@ -1,5 +1,5 @@
 import n from "http-status";
-const l = (t) => t.blob(), d = (t) => t.json(), c = (t) => t.text(), f = (t) => t.arrayBuffer();
+const l = (t) => t.blob(), c = (t) => t.json(), d = (t) => t.text(), f = (t) => t.arrayBuffer();
 async function h(t, s) {
   let e = s.contentType || (s.headers && s.headers instanceof Headers ? s.headers.get("content-type") : s.headers["Content-Type"]);
   t.headers && (e = t.headers instanceof Headers ? t.headers.get("content-type") : t.headers["content-type"]);
@@ -26,8 +26,8 @@ async function h(t, s) {
 export {
   f as getResponseArrayBuffer,
   l as getResponseBlob,
-  d as getResponseJson,
+  c as getResponseJson,
   h as getResponseResult,
-  c as getResponseText
+  d as getResponseText
 };
 //# sourceMappingURL=request.es.js.map