wenay-common 1.0.229 → 1.0.231

package/lib/Common/WebHook2.d.ts

@@ -29,7 +29,7 @@ export declare const createWebhookServer: (params: params) => {
 export declare const createWebhookClient: (options: WebhookClientOptions) => {
     connect: (tag: string, handler: (payload: any) => void) => Promise<void>;
     unsubscribe: (...tags: string[]) => Promise<void>;
-    status: (tag: string) => Promise<import("axios").AxiosResponse<any, any>>;
+    status: (tag: string) => Promise<import("axios").AxiosResponse<any, any, {}>>;
     tags: () => string[];
     getMySubscriptions: () => Promise<Subscriber[]>;
     getAvailableTags: () => Promise<string[]>;

package/lib/Exchange/CParams.d.ts

@@ -200,6 +200,7 @@ export type IParamsExpandable = {
 export type IParamsExpandableReadonly = ReadonlyFull<IParamsExpandable>;
 export declare function isParamGroupOrArray<TParam extends IParamReadonly>(param: TParam): param is Extract<TParam, ReadonlyFull<IParamGroup | IParamArr<any>>>;
 export declare function isParamGroup<TParam extends IParamReadonly>(param: TParam): param is Extract<TParam, ReadonlyFull<IParamGroup>>;
+export declare function isSimpleParams2<TParams extends IParamsReadonly>(params: TParams | SimpleParams): boolean;
 export declare function isSimpleParams<TParams extends IParamsReadonly>(params: TParams | SimpleParams): boolean;
 type ObjectKeyPath<TObject extends object = object, TValue = unknown> = readonly string[];
 export declare function iterateParams<TObj extends IParamsReadonly, TVal extends IParamReadonly = TObj[string]>(obj: TObj, currentPath?: ObjectKeyPath<TObj, TVal>): Generator<[key: string, value: TVal, path: ObjectKeyPath<TObj, TVal>]>;

package/lib/Exchange/CParams.js

@@ -4,6 +4,7 @@ exports.CParamsReadonly = exports.CParams = void 0;
 exports.isParamBase = isParamBase;
 exports.isParamGroupOrArray = isParamGroupOrArray;
 exports.isParamGroup = isParamGroup;
+exports.isSimpleParams2 = isSimpleParams2;
 exports.isSimpleParams = isSimpleParams;
 exports.iterateParams = iterateParams;
 exports.enableAllParams = enableAllParams;
@@ -32,7 +33,7 @@ function isParamGroupOrArray(param) {
 function isParamGroup(param) {
     return isParamGroupOrArray(param) && !Array.isArray(param.value);
 }
-function isSimpleParams(params) {
+function isSimpleParams2(params) {
     let t = false;
     for (let key in params) {
         const tr = params[key]["value"];
@@ -48,6 +49,24 @@ function isSimpleParams(params) {
     }
     return false;
 }
+function isSimpleParams(params) {
+    for (let key in params) {
+        const param = params[key];
+        if (param == null || typeof param !== "object") {
+            return true;
+        }
+        if (!("value" in param)) {
+            return true;
+        }
+        const val = param.value;
+        if (typeof val === "object" && val !== null && !(val instanceof Date) && !Array.isArray(val)) {
+            const r = isSimpleParams(val);
+            if (r)
+                return true;
+        }
+    }
+    return false;
+}
 function* iterateParams(obj, currentPath = []) {
     for (let [key, param] of Object.entries(obj)) {
         let keyPath = currentPath.concat(key);
@@ -164,6 +183,48 @@ let p0 = p.p1;
 let p3 = p.p3;
 let p4 = p.p4;
 let p5 = p.p5?.p1;
+function test22() {
+    const base = {
+        kBorrow: {
+            value: 1,
+            name: 'borrow step',
+            range: { max: 3, min: 1, step: 0.1 }
+        },
+        checkBorrow: { value: false, name: 'check borrow' },
+        checkBorrowFutures: { value: false, name: 'check borrow for futures' },
+        depoMulti: {
+            value: 1,
+            name: 'koef depoMulti',
+            range: { min: 0.01, max: 4, step: 0.01 }
+        },
+        depoMulti2: {
+            value: 2,
+            name: 'koef depoMulti',
+            range: { min: 0.01, max: 4, step: 0.01 }
+        }
+    };
+    const r2 = {
+        kBorrow: {
+            value: 1,
+            name: 'borrow step',
+            range: { max: 3, min: 1, step: 0.1 }
+        },
+        checkBorrow: { value: false, name: 'check borrow' },
+        checkBorrowFutures: { value: true, name: 'check borrow for futures' },
+        depoMulti: {
+            value: 1.32,
+            name: 'koef depoMulti',
+            range: { min: 0.01, max: 4, step: 0.01 }
+        },
+        depoMulti3: {
+            value: 1,
+            name: 'koef depoMulti',
+            range: { min: 0.01, max: 4, step: 0.01 }
+        }
+    };
+    const i = mergeParamValuesToInfos(base, r2);
+    console.log(i);
+}
 function convert_(valuesObj, srcObj) {
     let resObj = {};
     if (srcObj instanceof Array)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wenay-common",
-  "version": "1.0.229",
+  "version": "1.0.231",
   "description": "Common library",
   "strict": true,
   "main": "lib/index.js",
@@ -19,7 +19,7 @@
     "url": "https://github.com/wenayr/math.git"
   },
   "dependencies": {
-    "axios": "^1.10.0",
+    "axios": "^1.12.2",
     "create-hmac": "^1.1.7",
     "express": "^4.21.2",
     "socket.io": "^4.8.1",