@mtkruto/node 0.1.117 → 0.1.119

package/esm/4_constants.d.ts

@@ -5,7 +5,7 @@ export declare const PUBLIC_KEYS: PublicKeys;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const INITIAL_DC: DC;
 export declare const LAYER = 166;
-export declare const APP_VERSION = "MTKruto 0.1.117";
+export declare const APP_VERSION = "MTKruto 0.1.119";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/esm/4_constants.js

@@ -54,7 +54,7 @@ export const PUBLIC_KEYS = Object.freeze([
 export const VECTOR_CONSTRUCTOR = 0x1CB5C415;
 export const INITIAL_DC = "2";
 export const LAYER = 166;
-export const APP_VERSION = "MTKruto 0.1.117";
+export const APP_VERSION = "MTKruto 0.1.119";
 // @ts-ignore: lib
 export const DEVICE_MODEL = typeof dntShim.Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : dntShim.Deno.build.os + "-" + dntShim.Deno.build.arch;
 export const LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

package/esm/client/3_types.d.ts

@@ -44,6 +44,10 @@ export interface ClientParams extends ClientPlainParams {
      * Whether to ignore outgoing messages. Defaults to `true` for bots, and `false` for users.
      */
     ignoreOutgoing?: boolean;
+    /**
+     * Default command prefixes. Defaults to `"/"` for bots and `"\"` for users. This option must be set separately for nested composers.
+     */
+    prefixes?: string | string[];
 }
 export interface AnswerCallbackQueryParams {
     /** A text to be shown to the user. */

package/esm/client/4_composer.d.ts

@@ -15,6 +15,7 @@ export declare function concat<C extends Update = Update>(left: MiddlewareFn<C>,
 export declare const skip: MiddlewareFn;
 export declare class Composer<C extends Update> implements MiddlewareObj<C> {
     #private;
+    set prefixes(value: string | string[]);
     constructor(...middleware: Middleware<C>[]);
     middleware(): MiddlewareFn<C>;
     use(...middleware: Middleware<C>[]): Composer<C>;
@@ -22,6 +23,9 @@ export declare class Composer<C extends Update> implements MiddlewareObj<C> {
     filter<D extends C>(predicate: (ctx: C) => ctx is D, ...middleware: Middleware<D>[]): Composer<D>;
     filter(predicate: (ctx: C) => MaybePromise<boolean>, ...middleware: Middleware<C>[]): Composer<C>;
     on<T extends keyof Update_, F extends string>(filter: T extends FilterableUpdates ? T | [T, F, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F>>[]): Composer<FilterUpdate<C, T, F>>;
-    command(commands: string | RegExp | (string | RegExp)[], ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
+    command(commands: string | RegExp | (string | RegExp)[] | {
+        names: string | RegExp | (string | RegExp)[];
+        prefixes: string | string[];
+    }, ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
 }
 export {};

package/esm/client/4_composer.js

@@ -1,15 +1,15 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _Composer_handle;
+var _Composer_handle, _Composer_prefixes;
 export function flatten(mw) {
     return typeof mw === "function" ? mw : (ctx, next) => mw.middleware()(ctx, next);
 }
@@ -29,8 +29,15 @@ export function concat(left, right) {
 }
 export const skip = (_ctx, next) => next();
 export class Composer {
+    set prefixes(value) {
+        if (__classPrivateFieldGet(this, _Composer_prefixes, "f") !== undefined) {
+            throw new Error("Prefixes already set");
+        }
+        __classPrivateFieldSet(this, _Composer_prefixes, value, "f");
+    }
     constructor(...middleware) {
         _Composer_handle.set(this, void 0);
+        _Composer_prefixes.set(this, void 0);
         __classPrivateFieldSet(this, _Composer_handle, middleware.length == 0 ? skip : middleware.map(flatten).reduce(concat), "f");
     }
     middleware() {
@@ -80,20 +87,37 @@ export class Composer {
         }, ...middleawre);
     }
     command(commands, ...middleawre) {
-        const commands_ = Array.isArray(commands) ? commands : [commands];
+        const commands__ = typeof commands === "object" && "names" in commands ? commands.names : commands;
+        const commands_ = Array.isArray(commands__) ? commands__ : [commands__];
+        const prefixes_ = typeof commands === "object" && "prefixes" in commands ? commands.prefixes : (__classPrivateFieldGet(this, _Composer_prefixes, "f") ?? []);
+        const prefixes = Array.isArray(prefixes_) ? prefixes_ : [prefixes_];
+        for (const left of prefixes) {
+            for (const right of prefixes) {
+                if (left == right) {
+                    continue;
+                }
+                if (left.startsWith(right) || right.startsWith(left)) {
+                    throw new Error("Intersecting prefixes");
+                }
+            }
+        }
         return this.on(["message", "text"]).filter((ctx) => {
-            const botCommand = ctx.message.entities?.find((v) => v.type == "botCommand");
-            if (!botCommand) {
+            const prefixes_ = prefixes.length == 0 ? [!ctx.me?.isBot ? "\\" : "/"] : prefixes;
+            if (prefixes_.length == 0) {
+                return false;
+            }
+            const cmd = ctx.message.text.split(/\s/, 1)[0];
+            const prefix = prefixes_.find((v) => cmd.startsWith(v));
+            if (prefix === undefined) {
                 return false;
             }
-            const cmd = ctx.message.text.slice(botCommand.offset, botCommand.offset + botCommand.length);
             if (cmd.includes("@")) {
-                const username = cmd.split("@")[1];
+                const username = cmd.split("@", 2)[1];
                 if (username.toLowerCase() !== ctx.me.username?.toLowerCase()) {
                     return false;
                 }
             }
-            const command_ = cmd.split("@")[0].split("/")[1].toLowerCase();
+            const command_ = cmd.split("@", 1)[0].split(prefix, 2)[1].toLowerCase();
             for (const command of commands_) {
                 if (typeof command === "string" && (command.toLowerCase() == command_)) {
                     return true;
@@ -106,4 +130,4 @@ export class Composer {
         }, ...middleawre);
     }
 }
-_Composer_handle = new WeakMap();
+_Composer_handle = new WeakMap(), _Composer_prefixes = new WeakMap();

package/esm/client/5_client.d.ts

@@ -286,7 +286,10 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
     filter<D extends C>(predicate: (ctx: C) => ctx is D, ...middleware: Middleware<D>[]): Composer<D>;
     filter(predicate: (ctx: C) => MaybePromise<boolean>, ...middleware: Middleware<C>[]): Composer<C>;
     on<T extends keyof Update, F extends string>(filter: T extends FilterableUpdates ? T | [T, F, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F>>[]): Composer<FilterUpdate<C, T, F>>;
-    command(commands: string | RegExp | (string | RegExp)[], ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
+    command(commands: string | RegExp | (string | RegExp)[] | {
+        names: string | RegExp | (string | RegExp)[];
+        prefixes: string | string[];
+    }, ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
     /**
      * Set the bot's description in the given language. Bot-only.
      *

package/esm/client/5_client.js

@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Client_instances, _a, _Client_auth, _Client_sessionId, _Client_state, _Client_promises, _Client_toAcknowledge, _Client_updateState, _Client_publicKeys, _Client_autoStart, _Client_ignoreOutgoing, _Client_constructContext, _Client_propagateConnectionState, _Client_lastPropagatedConnectionState, _Client_storageInited, _Client_setAuth, _Client_authKeyWasCreated, _Client_connectMutex, _Client_assertUser, _Client_assertBot, _Client_fetchState, _Client_connectionInited, _Client_initConnection, _Client_lastPropagatedAuthorizationState, _Client_propagateAuthorizationState, _Client_selfId, _Client_getSelfId, _Client_receiveLoop, _Client_pingInterval, _Client_pingLoop, _Client_pingLoopStarted, _Client_autoStarted, _Client_lastMsgId, _Client_invoke, _Client_handleInvokeError, _Client_processChats, _Client_processUsers, _Client_handleUpdateQueue, _Client_processUpdatesQueue, _Client_checkChannelGap, _Client_processUpdates, _Client_setUpdateStateDate, _Client_getLocalState, _Client_recoverUpdateGap, _Client_recoverChannelUpdateGap, _Client_getChannelAccessHash, _Client_getInputPeerInner, _Client_updatesToMessages, _Client_resolveSendAs, _Client_parseText, _Client_getMessagesInner, _Client_downloadInner, _Client_lastGetMe, _Client_getMe, _Client_handleUpdate, _Client_usernameResolver, _Client_constructReplyMarkup, _Client_assertMsgHas, _Client_handle, _Client_setMyInfo, _Client_getMyInfo;
+var _Client_instances, _a, _Client_auth, _Client_sessionId, _Client_state, _Client_promises, _Client_toAcknowledge, _Client_updateState, _Client_publicKeys, _Client_autoStart, _Client_ignoreOutgoing, _Client_prefixes, _Client_constructContext, _Client_propagateConnectionState, _Client_lastPropagatedConnectionState, _Client_storageInited, _Client_setAuth, _Client_authKeyWasCreated, _Client_connectMutex, _Client_assertUser, _Client_assertBot, _Client_fetchState, _Client_connectionInited, _Client_initConnection, _Client_lastPropagatedAuthorizationState, _Client_propagateAuthorizationState, _Client_selfId, _Client_getSelfId, _Client_receiveLoop, _Client_pingInterval, _Client_pingLoop, _Client_pingLoopStarted, _Client_autoStarted, _Client_lastMsgId, _Client_invoke, _Client_handleInvokeError, _Client_processChats, _Client_processUsers, _Client_handleUpdateQueue, _Client_processUpdatesQueue, _Client_checkChannelGap, _Client_processUpdates, _Client_setUpdateStateDate, _Client_setUpdatePts, _Client_getLocalState, _Client_recoverUpdateGap, _Client_recoverChannelUpdateGap, _Client_getChannelAccessHash, _Client_getInputPeerInner, _Client_updatesToMessages, _Client_resolveSendAs, _Client_parseText, _Client_getMessagesInner, _Client_downloadInner, _Client_lastGetMe, _Client_getMe, _Client_handleUpdate, _Client_usernameResolver, _Client_constructReplyMarkup, _Client_assertMsgHas, _Client_handle, _Client_setMyInfo, _Client_getMyInfo;
 import { debug, gunzip, Mutex } from "../0_deps.js";
 import { bigIntFromBuffer, cleanObject, drop, getRandomBigInt, getRandomId, mod, mustPrompt, mustPromptOneOf, Queue, sha1, UNREACHABLE } from "../1_utilities.js";
 import { as, functions, getChannelChatId, Message_, MessageContainer, peerToChatId, RPCResult, TLError, TLReader, types } from "../2_tl.js";
@@ -120,6 +120,7 @@ export class Client extends ClientAbstract {
         _Client_publicKeys.set(this, void 0);
         _Client_autoStart.set(this, void 0);
         _Client_ignoreOutgoing.set(this, void 0);
+        _Client_prefixes.set(this, void 0);
         _Client_constructContext.set(this, async (update) => {
             const msg = update.message ?? update.editedMessage ?? update.callbackQuery?.message;
             const mustGetMsg = () => {
@@ -219,7 +220,7 @@ export class Client extends ClientAbstract {
                 get toJSON() {
                     return () => update;
                 },
-            });
+            }, false);
         });
         _Client_lastPropagatedConnectionState.set(this, null);
         Object.defineProperty(this, "stateChangeHandler", {
@@ -297,6 +298,7 @@ export class Client extends ClientAbstract {
         __classPrivateFieldSet(this, _Client_publicKeys, params?.publicKeys, "f");
         __classPrivateFieldSet(this, _Client_autoStart, params?.autoStart ?? true, "f");
         __classPrivateFieldSet(this, _Client_ignoreOutgoing, params?.ignoreOutgoing ?? null, "f");
+        __classPrivateFieldSet(this, _Client_prefixes, params?.prefixes, "f");
         if (params?.defaultHandlers ?? true) {
             this.on("connectionState", ({ connectionState }, next) => {
                 drop((async () => {
@@ -406,7 +408,7 @@ export class Client extends ClientAbstract {
             release();
         }
     }
-    async [(_Client_auth = new WeakMap(), _Client_sessionId = new WeakMap(), _Client_state = new WeakMap(), _Client_promises = new WeakMap(), _Client_toAcknowledge = new WeakMap(), _Client_updateState = new WeakMap(), _Client_publicKeys = new WeakMap(), _Client_autoStart = new WeakMap(), _Client_ignoreOutgoing = new WeakMap(), _Client_constructContext = new WeakMap(), _Client_lastPropagatedConnectionState = new WeakMap(), _Client_storageInited = new WeakMap(), _Client_authKeyWasCreated = new WeakMap(), _Client_connectMutex = new WeakMap(), _Client_connectionInited = new WeakMap(), _Client_lastPropagatedAuthorizationState = new WeakMap(), _Client_selfId = new WeakMap(), _Client_pingInterval = new WeakMap(), _Client_pingLoopStarted = new WeakMap(), _Client_autoStarted = new WeakMap(), _Client_lastMsgId = new WeakMap(), _Client_handleInvokeError = new WeakMap(), _Client_handleUpdateQueue = new WeakMap(), _Client_processUpdatesQueue = new WeakMap(), _Client_lastGetMe = new WeakMap(), _Client_usernameResolver = new WeakMap(), _Client_handle = new WeakMap(), _Client_instances = new WeakSet(), _Client_propagateConnectionState = function _Client_propagateConnectionState(connectionState) {
+    async [(_Client_auth = new WeakMap(), _Client_sessionId = new WeakMap(), _Client_state = new WeakMap(), _Client_promises = new WeakMap(), _Client_toAcknowledge = new WeakMap(), _Client_updateState = new WeakMap(), _Client_publicKeys = new WeakMap(), _Client_autoStart = new WeakMap(), _Client_ignoreOutgoing = new WeakMap(), _Client_prefixes = new WeakMap(), _Client_constructContext = new WeakMap(), _Client_lastPropagatedConnectionState = new WeakMap(), _Client_storageInited = new WeakMap(), _Client_authKeyWasCreated = new WeakMap(), _Client_connectMutex = new WeakMap(), _Client_connectionInited = new WeakMap(), _Client_lastPropagatedAuthorizationState = new WeakMap(), _Client_selfId = new WeakMap(), _Client_pingInterval = new WeakMap(), _Client_pingLoopStarted = new WeakMap(), _Client_autoStarted = new WeakMap(), _Client_lastMsgId = new WeakMap(), _Client_handleInvokeError = new WeakMap(), _Client_handleUpdateQueue = new WeakMap(), _Client_processUpdatesQueue = new WeakMap(), _Client_lastGetMe = new WeakMap(), _Client_usernameResolver = new WeakMap(), _Client_handle = new WeakMap(), _Client_instances = new WeakSet(), _Client_propagateConnectionState = function _Client_propagateConnectionState(connectionState) {
         __classPrivateFieldGet(this, _Client_handleUpdateQueue, "f").add(async () => {
             await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { connectionState }), resolve);
         });
@@ -594,7 +596,7 @@ export class Client extends ClientAbstract {
                         dAuth("authorized as user");
                         await __classPrivateFieldGet(this, _Client_instances, "m", _Client_propagateAuthorizationState).call(this, true);
                         await __classPrivateFieldGet(this, _Client_instances, "m", _Client_fetchState).call(this, "authorize");
-                        break password;
+                        return;
                     }
                     catch (err) {
                         if (err instanceof PasswordHashInvalid) {
@@ -930,6 +932,34 @@ export class Client extends ClientAbstract {
         let updates;
         if (updates_ instanceof types.UpdatesCombined || updates_ instanceof types.Updates) {
             updates = updates_.updates;
+            const seq = updates_.seq;
+            const seqStart = "seqStart" in updates_ ? updates_.seqStart : updates_.seq;
+            if (checkGap) {
+                if (seqStart == 0) {
+                    checkGap = false;
+                    d("seqStart=0");
+                }
+                else {
+                    const localState = await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getLocalState).call(this);
+                    const localSeq = localState.seq;
+                    if (localSeq + 1 == seqStart) {
+                        // The updates can be applied.
+                        localState.seq = seq;
+                        localState.date = updates_.date;
+                        await __classPrivateFieldGet(this, _Client_instances, "m", _Client_setUpdateStateDate).call(this, updates_.date);
+                        await this.storage.setState(localState);
+                    }
+                    else if (localSeq + 1 > seqStart) {
+                        // The updates were already applied, and must be ignored.
+                        d("localSeq + 1 > seqStart");
+                        return;
+                    }
+                    else if (localSeq + 1 < seqStart) {
+                        // There's an updates gap that must be filled.
+                        await __classPrivateFieldGet(this, _Client_instances, "m", _Client_recoverUpdateGap).call(this, "localSeq + 1 < seqStart");
+                    }
+                }
+            }
         }
         else if (updates_ instanceof types.UpdateShort) {
             updates = [updates_.update];
@@ -1029,6 +1059,21 @@ export class Client extends ClientAbstract {
                     UNREACHABLE();
                 }
             }
+            if (isPtsUpdate(update)) {
+                await __classPrivateFieldGet(this, _Client_instances, "m", _Client_setUpdatePts).call(this, update.pts);
+            }
+            else if (isChannelPtsUpdate(update)) {
+                let channelId = null;
+                if ("channelId" in update) {
+                    channelId = update.channelId;
+                }
+                else if ("peerId" in update.message && update.message.peerId !== undefined && "channelId" in update.message.peerId) {
+                    channelId = update.message.peerId.channelId;
+                }
+                if (channelId != null) {
+                    await this.storage.setChannelPts(channelId, update.pts);
+                }
+            }
             /// If there were any Update, they will be passed to the update handling queue.
             if (update instanceof types._TypeUpdate) {
                 updatesToHandle.push(update);
@@ -1043,6 +1088,10 @@ export class Client extends ClientAbstract {
         const localState = await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getLocalState).call(this);
         localState.date = date;
         await this.storage.setState(localState);
+    }, _Client_setUpdatePts = async function _Client_setUpdatePts(pts) {
+        const localState = await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getLocalState).call(this);
+        localState.pts = pts;
+        await this.storage.setState(localState);
     }, _Client_getLocalState = async function _Client_getLocalState() {
         let localState = await this.storage.getState();
         if (!localState) {
@@ -1879,20 +1928,37 @@ export class Client extends ClientAbstract {
         }, ...middleawre);
     }
     command(commands, ...middleawre) {
-        const commands_ = Array.isArray(commands) ? commands : [commands];
+        const commands__ = typeof commands === "object" && "names" in commands ? commands.names : commands;
+        const commands_ = Array.isArray(commands__) ? commands__ : [commands__];
+        const prefixes_ = typeof commands === "object" && "prefixes" in commands ? commands.prefixes : (__classPrivateFieldGet(this, _Client_prefixes, "f") ?? []);
+        const prefixes = Array.isArray(prefixes_) ? prefixes_ : [prefixes_];
+        for (const left of prefixes) {
+            for (const right of prefixes) {
+                if (left == right) {
+                    continue;
+                }
+                if (left.startsWith(right) || right.startsWith(left)) {
+                    throw new Error("Intersecting prefixes");
+                }
+            }
+        }
         return this.on(["message", "text"]).filter((ctx) => {
-            const botCommand = ctx.message.entities?.find((v) => v.type == "botCommand");
-            if (!botCommand) {
+            const prefixes_ = prefixes.length == 0 ? [!ctx.me?.isBot ? "\\" : "/"] : prefixes;
+            if (prefixes_.length == 0) {
+                return false;
+            }
+            const cmd = ctx.message.text.split(/\s/, 1)[0];
+            const prefix = prefixes_.find((v) => cmd.startsWith(v));
+            if (prefix === undefined) {
                 return false;
             }
-            const cmd = ctx.message.text.slice(botCommand.offset, botCommand.offset + botCommand.length);
             if (cmd.includes("@")) {
-                const username = cmd.split("@")[1];
+                const username = cmd.split("@", 2)[1];
                 if (username.toLowerCase() !== ctx.me.username?.toLowerCase()) {
                     return false;
                 }
             }
-            const command_ = cmd.split("@")[0].split("/")[1].toLowerCase();
+            const command_ = cmd.split("@", 1)[0].split(prefix, 2)[1].toLowerCase();
             for (const command of commands_) {
                 if (typeof command === "string" && (command.toLowerCase() == command_)) {
                     return true;

package/esm/utilities/0_object.d.ts

@@ -1 +1 @@
-export declare function cleanObject<T extends Record<string, any>>(object: T): T;
+export declare function cleanObject<T extends Record<string, any>>(object: T, recursive?: boolean): T;

package/esm/utilities/0_object.js

@@ -1,13 +1,15 @@
 // deno-lint-ignore no-explicit-any
-export function cleanObject(object) {
+export function cleanObject(object, recursive = true) {
     for (const [k, v] of Object.entries(object)) {
         switch (typeof v) {
             case "undefined":
                 delete object[k];
                 break;
             case "object":
-                // @ts-ignore: this works, no idea why it complains
-                object[k] = cleanObject(v);
+                if (recursive) {
+                    // @ts-ignore: this works, no idea why it complains
+                    object[k] = cleanObject(v);
+                }
         }
     }
     return object;

package/package.json

@@ -2,7 +2,7 @@
   "module": "./esm/mod.js",
   "main": "./script/mod.js",
   "name": "@mtkruto/node",
-  "version": "0.1.117",
+  "version": "0.1.119",
   "description": "MTKruto for Node.js",
   "author": "Roj <rojvv@icloud.com>",
   "license": "LGPL-3.0-or-later",

package/script/4_constants.d.ts

@@ -5,7 +5,7 @@ export declare const PUBLIC_KEYS: PublicKeys;
 export declare const VECTOR_CONSTRUCTOR = 481674261;
 export declare const INITIAL_DC: DC;
 export declare const LAYER = 166;
-export declare const APP_VERSION = "MTKruto 0.1.117";
+export declare const APP_VERSION = "MTKruto 0.1.119";
 export declare const DEVICE_MODEL: string;
 export declare const LANG_CODE: string;
 export declare const LANG_PACK = "";

package/script/4_constants.js

@@ -80,7 +80,7 @@ exports.PUBLIC_KEYS = Object.freeze([
 exports.VECTOR_CONSTRUCTOR = 0x1CB5C415;
 exports.INITIAL_DC = "2";
 exports.LAYER = 166;
-exports.APP_VERSION = "MTKruto 0.1.117";
+exports.APP_VERSION = "MTKruto 0.1.119";
 // @ts-ignore: lib
 exports.DEVICE_MODEL = typeof dntShim.Deno === "undefined" ? typeof navigator === "undefined" ? typeof process === "undefined" ? "Unknown" : process.platform + "-" + process.arch : navigator.userAgent.split(" ")[0] : dntShim.Deno.build.os + "-" + dntShim.Deno.build.arch;
 exports.LANG_CODE = typeof navigator === "undefined" ? "en" : navigator.language.split("-")[0];

package/script/client/3_types.d.ts

@@ -44,6 +44,10 @@ export interface ClientParams extends ClientPlainParams {
      * Whether to ignore outgoing messages. Defaults to `true` for bots, and `false` for users.
      */
     ignoreOutgoing?: boolean;
+    /**
+     * Default command prefixes. Defaults to `"/"` for bots and `"\"` for users. This option must be set separately for nested composers.
+     */
+    prefixes?: string | string[];
 }
 export interface AnswerCallbackQueryParams {
     /** A text to be shown to the user. */

package/script/client/4_composer.d.ts

@@ -15,6 +15,7 @@ export declare function concat<C extends Update = Update>(left: MiddlewareFn<C>,
 export declare const skip: MiddlewareFn;
 export declare class Composer<C extends Update> implements MiddlewareObj<C> {
     #private;
+    set prefixes(value: string | string[]);
     constructor(...middleware: Middleware<C>[]);
     middleware(): MiddlewareFn<C>;
     use(...middleware: Middleware<C>[]): Composer<C>;
@@ -22,6 +23,9 @@ export declare class Composer<C extends Update> implements MiddlewareObj<C> {
     filter<D extends C>(predicate: (ctx: C) => ctx is D, ...middleware: Middleware<D>[]): Composer<D>;
     filter(predicate: (ctx: C) => MaybePromise<boolean>, ...middleware: Middleware<C>[]): Composer<C>;
     on<T extends keyof Update_, F extends string>(filter: T extends FilterableUpdates ? T | [T, F, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F>>[]): Composer<FilterUpdate<C, T, F>>;
-    command(commands: string | RegExp | (string | RegExp)[], ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
+    command(commands: string | RegExp | (string | RegExp)[] | {
+        names: string | RegExp | (string | RegExp)[];
+        prefixes: string | string[];
+    }, ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
 }
 export {};

package/script/client/4_composer.js

@@ -1,16 +1,16 @@
 "use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _Composer_handle;
+var _Composer_handle, _Composer_prefixes;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Composer = exports.skip = exports.concat = exports.flatten = void 0;
 function flatten(mw) {
@@ -35,8 +35,15 @@ exports.concat = concat;
 const skip = (_ctx, next) => next();
 exports.skip = skip;
 class Composer {
+    set prefixes(value) {
+        if (__classPrivateFieldGet(this, _Composer_prefixes, "f") !== undefined) {
+            throw new Error("Prefixes already set");
+        }
+        __classPrivateFieldSet(this, _Composer_prefixes, value, "f");
+    }
     constructor(...middleware) {
         _Composer_handle.set(this, void 0);
+        _Composer_prefixes.set(this, void 0);
         __classPrivateFieldSet(this, _Composer_handle, middleware.length == 0 ? exports.skip : middleware.map(flatten).reduce(concat), "f");
     }
     middleware() {
@@ -86,20 +93,37 @@ class Composer {
         }, ...middleawre);
     }
     command(commands, ...middleawre) {
-        const commands_ = Array.isArray(commands) ? commands : [commands];
+        const commands__ = typeof commands === "object" && "names" in commands ? commands.names : commands;
+        const commands_ = Array.isArray(commands__) ? commands__ : [commands__];
+        const prefixes_ = typeof commands === "object" && "prefixes" in commands ? commands.prefixes : (__classPrivateFieldGet(this, _Composer_prefixes, "f") ?? []);
+        const prefixes = Array.isArray(prefixes_) ? prefixes_ : [prefixes_];
+        for (const left of prefixes) {
+            for (const right of prefixes) {
+                if (left == right) {
+                    continue;
+                }
+                if (left.startsWith(right) || right.startsWith(left)) {
+                    throw new Error("Intersecting prefixes");
+                }
+            }
+        }
         return this.on(["message", "text"]).filter((ctx) => {
-            const botCommand = ctx.message.entities?.find((v) => v.type == "botCommand");
-            if (!botCommand) {
+            const prefixes_ = prefixes.length == 0 ? [!ctx.me?.isBot ? "\\" : "/"] : prefixes;
+            if (prefixes_.length == 0) {
+                return false;
+            }
+            const cmd = ctx.message.text.split(/\s/, 1)[0];
+            const prefix = prefixes_.find((v) => cmd.startsWith(v));
+            if (prefix === undefined) {
                 return false;
             }
-            const cmd = ctx.message.text.slice(botCommand.offset, botCommand.offset + botCommand.length);
             if (cmd.includes("@")) {
-                const username = cmd.split("@")[1];
+                const username = cmd.split("@", 2)[1];
                 if (username.toLowerCase() !== ctx.me.username?.toLowerCase()) {
                     return false;
                 }
             }
-            const command_ = cmd.split("@")[0].split("/")[1].toLowerCase();
+            const command_ = cmd.split("@", 1)[0].split(prefix, 2)[1].toLowerCase();
             for (const command of commands_) {
                 if (typeof command === "string" && (command.toLowerCase() == command_)) {
                     return true;
@@ -113,4 +137,4 @@ class Composer {
     }
 }
 exports.Composer = Composer;
-_Composer_handle = new WeakMap();
+_Composer_handle = new WeakMap(), _Composer_prefixes = new WeakMap();

package/script/client/5_client.d.ts

@@ -286,7 +286,10 @@ export declare class Client<C extends Context = Context> extends ClientAbstract
     filter<D extends C>(predicate: (ctx: C) => ctx is D, ...middleware: Middleware<D>[]): Composer<D>;
     filter(predicate: (ctx: C) => MaybePromise<boolean>, ...middleware: Middleware<C>[]): Composer<C>;
     on<T extends keyof Update, F extends string>(filter: T extends FilterableUpdates ? T | [T, F, ...F[]] : T, ...middleawre: Middleware<FilterUpdate<C, T, F>>[]): Composer<FilterUpdate<C, T, F>>;
-    command(commands: string | RegExp | (string | RegExp)[], ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
+    command(commands: string | RegExp | (string | RegExp)[] | {
+        names: string | RegExp | (string | RegExp)[];
+        prefixes: string | string[];
+    }, ...middleawre: Middleware<FilterUpdate<C, "message", "text">>[]): Composer<FilterUpdate<C, "message", "text">>;
     /**
      * Set the bot's description in the given language. Bot-only.
      *

package/script/client/5_client.js

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Client_instances, _a, _Client_auth, _Client_sessionId, _Client_state, _Client_promises, _Client_toAcknowledge, _Client_updateState, _Client_publicKeys, _Client_autoStart, _Client_ignoreOutgoing, _Client_constructContext, _Client_propagateConnectionState, _Client_lastPropagatedConnectionState, _Client_storageInited, _Client_setAuth, _Client_authKeyWasCreated, _Client_connectMutex, _Client_assertUser, _Client_assertBot, _Client_fetchState, _Client_connectionInited, _Client_initConnection, _Client_lastPropagatedAuthorizationState, _Client_propagateAuthorizationState, _Client_selfId, _Client_getSelfId, _Client_receiveLoop, _Client_pingInterval, _Client_pingLoop, _Client_pingLoopStarted, _Client_autoStarted, _Client_lastMsgId, _Client_invoke, _Client_handleInvokeError, _Client_processChats, _Client_processUsers, _Client_handleUpdateQueue, _Client_processUpdatesQueue, _Client_checkChannelGap, _Client_processUpdates, _Client_setUpdateStateDate, _Client_getLocalState, _Client_recoverUpdateGap, _Client_recoverChannelUpdateGap, _Client_getChannelAccessHash, _Client_getInputPeerInner, _Client_updatesToMessages, _Client_resolveSendAs, _Client_parseText, _Client_getMessagesInner, _Client_downloadInner, _Client_lastGetMe, _Client_getMe, _Client_handleUpdate, _Client_usernameResolver, _Client_constructReplyMarkup, _Client_assertMsgHas, _Client_handle, _Client_setMyInfo, _Client_getMyInfo;
+var _Client_instances, _a, _Client_auth, _Client_sessionId, _Client_state, _Client_promises, _Client_toAcknowledge, _Client_updateState, _Client_publicKeys, _Client_autoStart, _Client_ignoreOutgoing, _Client_prefixes, _Client_constructContext, _Client_propagateConnectionState, _Client_lastPropagatedConnectionState, _Client_storageInited, _Client_setAuth, _Client_authKeyWasCreated, _Client_connectMutex, _Client_assertUser, _Client_assertBot, _Client_fetchState, _Client_connectionInited, _Client_initConnection, _Client_lastPropagatedAuthorizationState, _Client_propagateAuthorizationState, _Client_selfId, _Client_getSelfId, _Client_receiveLoop, _Client_pingInterval, _Client_pingLoop, _Client_pingLoopStarted, _Client_autoStarted, _Client_lastMsgId, _Client_invoke, _Client_handleInvokeError, _Client_processChats, _Client_processUsers, _Client_handleUpdateQueue, _Client_processUpdatesQueue, _Client_checkChannelGap, _Client_processUpdates, _Client_setUpdateStateDate, _Client_setUpdatePts, _Client_getLocalState, _Client_recoverUpdateGap, _Client_recoverChannelUpdateGap, _Client_getChannelAccessHash, _Client_getInputPeerInner, _Client_updatesToMessages, _Client_resolveSendAs, _Client_parseText, _Client_getMessagesInner, _Client_downloadInner, _Client_lastGetMe, _Client_getMe, _Client_handleUpdate, _Client_usernameResolver, _Client_constructReplyMarkup, _Client_assertMsgHas, _Client_handle, _Client_setMyInfo, _Client_getMyInfo;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Client = exports.ConnectionError = exports.restartAuth = exports.skipInvoke = exports.handleMigrationError = void 0;
 const _0_deps_js_1 = require("../0_deps.js");
@@ -125,6 +125,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         _Client_publicKeys.set(this, void 0);
         _Client_autoStart.set(this, void 0);
         _Client_ignoreOutgoing.set(this, void 0);
+        _Client_prefixes.set(this, void 0);
         _Client_constructContext.set(this, async (update) => {
             const msg = update.message ?? update.editedMessage ?? update.callbackQuery?.message;
             const mustGetMsg = () => {
@@ -224,7 +225,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                 get toJSON() {
                     return () => update;
                 },
-            });
+            }, false);
         });
         _Client_lastPropagatedConnectionState.set(this, null);
         Object.defineProperty(this, "stateChangeHandler", {
@@ -302,6 +303,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         __classPrivateFieldSet(this, _Client_publicKeys, params?.publicKeys, "f");
         __classPrivateFieldSet(this, _Client_autoStart, params?.autoStart ?? true, "f");
         __classPrivateFieldSet(this, _Client_ignoreOutgoing, params?.ignoreOutgoing ?? null, "f");
+        __classPrivateFieldSet(this, _Client_prefixes, params?.prefixes, "f");
         if (params?.defaultHandlers ?? true) {
             this.on("connectionState", ({ connectionState }, next) => {
                 (0, _1_utilities_js_1.drop)((async () => {
@@ -411,7 +413,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
             release();
         }
     }
-    async [(_Client_auth = new WeakMap(), _Client_sessionId = new WeakMap(), _Client_state = new WeakMap(), _Client_promises = new WeakMap(), _Client_toAcknowledge = new WeakMap(), _Client_updateState = new WeakMap(), _Client_publicKeys = new WeakMap(), _Client_autoStart = new WeakMap(), _Client_ignoreOutgoing = new WeakMap(), _Client_constructContext = new WeakMap(), _Client_lastPropagatedConnectionState = new WeakMap(), _Client_storageInited = new WeakMap(), _Client_authKeyWasCreated = new WeakMap(), _Client_connectMutex = new WeakMap(), _Client_connectionInited = new WeakMap(), _Client_lastPropagatedAuthorizationState = new WeakMap(), _Client_selfId = new WeakMap(), _Client_pingInterval = new WeakMap(), _Client_pingLoopStarted = new WeakMap(), _Client_autoStarted = new WeakMap(), _Client_lastMsgId = new WeakMap(), _Client_handleInvokeError = new WeakMap(), _Client_handleUpdateQueue = new WeakMap(), _Client_processUpdatesQueue = new WeakMap(), _Client_lastGetMe = new WeakMap(), _Client_usernameResolver = new WeakMap(), _Client_handle = new WeakMap(), _Client_instances = new WeakSet(), _Client_propagateConnectionState = function _Client_propagateConnectionState(connectionState) {
+    async [(_Client_auth = new WeakMap(), _Client_sessionId = new WeakMap(), _Client_state = new WeakMap(), _Client_promises = new WeakMap(), _Client_toAcknowledge = new WeakMap(), _Client_updateState = new WeakMap(), _Client_publicKeys = new WeakMap(), _Client_autoStart = new WeakMap(), _Client_ignoreOutgoing = new WeakMap(), _Client_prefixes = new WeakMap(), _Client_constructContext = new WeakMap(), _Client_lastPropagatedConnectionState = new WeakMap(), _Client_storageInited = new WeakMap(), _Client_authKeyWasCreated = new WeakMap(), _Client_connectMutex = new WeakMap(), _Client_connectionInited = new WeakMap(), _Client_lastPropagatedAuthorizationState = new WeakMap(), _Client_selfId = new WeakMap(), _Client_pingInterval = new WeakMap(), _Client_pingLoopStarted = new WeakMap(), _Client_autoStarted = new WeakMap(), _Client_lastMsgId = new WeakMap(), _Client_handleInvokeError = new WeakMap(), _Client_handleUpdateQueue = new WeakMap(), _Client_processUpdatesQueue = new WeakMap(), _Client_lastGetMe = new WeakMap(), _Client_usernameResolver = new WeakMap(), _Client_handle = new WeakMap(), _Client_instances = new WeakSet(), _Client_propagateConnectionState = function _Client_propagateConnectionState(connectionState) {
         __classPrivateFieldGet(this, _Client_handleUpdateQueue, "f").add(async () => {
             await __classPrivateFieldGet(this, _Client_handle, "f").call(this, await __classPrivateFieldGet(this, _Client_constructContext, "f").call(this, { connectionState }), _0_utilities_js_1.resolve);
         });
@@ -599,7 +601,7 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                         dAuth("authorized as user");
                         await __classPrivateFieldGet(this, _Client_instances, "m", _Client_propagateAuthorizationState).call(this, true);
                         await __classPrivateFieldGet(this, _Client_instances, "m", _Client_fetchState).call(this, "authorize");
-                        break password;
+                        return;
                     }
                     catch (err) {
                         if (err instanceof _4_errors_js_1.PasswordHashInvalid) {
@@ -935,6 +937,34 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         let updates;
         if (updates_ instanceof _2_tl_js_1.types.UpdatesCombined || updates_ instanceof _2_tl_js_1.types.Updates) {
             updates = updates_.updates;
+            const seq = updates_.seq;
+            const seqStart = "seqStart" in updates_ ? updates_.seqStart : updates_.seq;
+            if (checkGap) {
+                if (seqStart == 0) {
+                    checkGap = false;
+                    d("seqStart=0");
+                }
+                else {
+                    const localState = await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getLocalState).call(this);
+                    const localSeq = localState.seq;
+                    if (localSeq + 1 == seqStart) {
+                        // The updates can be applied.
+                        localState.seq = seq;
+                        localState.date = updates_.date;
+                        await __classPrivateFieldGet(this, _Client_instances, "m", _Client_setUpdateStateDate).call(this, updates_.date);
+                        await this.storage.setState(localState);
+                    }
+                    else if (localSeq + 1 > seqStart) {
+                        // The updates were already applied, and must be ignored.
+                        d("localSeq + 1 > seqStart");
+                        return;
+                    }
+                    else if (localSeq + 1 < seqStart) {
+                        // There's an updates gap that must be filled.
+                        await __classPrivateFieldGet(this, _Client_instances, "m", _Client_recoverUpdateGap).call(this, "localSeq + 1 < seqStart");
+                    }
+                }
+            }
         }
         else if (updates_ instanceof _2_tl_js_1.types.UpdateShort) {
             updates = [updates_.update];
@@ -1034,6 +1064,21 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
                     (0, _1_utilities_js_1.UNREACHABLE)();
                 }
             }
+            if ((0, _0_utilities_js_1.isPtsUpdate)(update)) {
+                await __classPrivateFieldGet(this, _Client_instances, "m", _Client_setUpdatePts).call(this, update.pts);
+            }
+            else if ((0, _0_utilities_js_1.isChannelPtsUpdate)(update)) {
+                let channelId = null;
+                if ("channelId" in update) {
+                    channelId = update.channelId;
+                }
+                else if ("peerId" in update.message && update.message.peerId !== undefined && "channelId" in update.message.peerId) {
+                    channelId = update.message.peerId.channelId;
+                }
+                if (channelId != null) {
+                    await this.storage.setChannelPts(channelId, update.pts);
+                }
+            }
             /// If there were any Update, they will be passed to the update handling queue.
             if (update instanceof _2_tl_js_1.types._TypeUpdate) {
                 updatesToHandle.push(update);
@@ -1048,6 +1093,10 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         const localState = await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getLocalState).call(this);
         localState.date = date;
         await this.storage.setState(localState);
+    }, _Client_setUpdatePts = async function _Client_setUpdatePts(pts) {
+        const localState = await __classPrivateFieldGet(this, _Client_instances, "m", _Client_getLocalState).call(this);
+        localState.pts = pts;
+        await this.storage.setState(localState);
     }, _Client_getLocalState = async function _Client_getLocalState() {
         let localState = await this.storage.getState();
         if (!localState) {
@@ -1884,20 +1933,37 @@ class Client extends _1_client_abstract_js_1.ClientAbstract {
         }, ...middleawre);
     }
     command(commands, ...middleawre) {
-        const commands_ = Array.isArray(commands) ? commands : [commands];
+        const commands__ = typeof commands === "object" && "names" in commands ? commands.names : commands;
+        const commands_ = Array.isArray(commands__) ? commands__ : [commands__];
+        const prefixes_ = typeof commands === "object" && "prefixes" in commands ? commands.prefixes : (__classPrivateFieldGet(this, _Client_prefixes, "f") ?? []);
+        const prefixes = Array.isArray(prefixes_) ? prefixes_ : [prefixes_];
+        for (const left of prefixes) {
+            for (const right of prefixes) {
+                if (left == right) {
+                    continue;
+                }
+                if (left.startsWith(right) || right.startsWith(left)) {
+                    throw new Error("Intersecting prefixes");
+                }
+            }
+        }
         return this.on(["message", "text"]).filter((ctx) => {
-            const botCommand = ctx.message.entities?.find((v) => v.type == "botCommand");
-            if (!botCommand) {
+            const prefixes_ = prefixes.length == 0 ? [!ctx.me?.isBot ? "\\" : "/"] : prefixes;
+            if (prefixes_.length == 0) {
+                return false;
+            }
+            const cmd = ctx.message.text.split(/\s/, 1)[0];
+            const prefix = prefixes_.find((v) => cmd.startsWith(v));
+            if (prefix === undefined) {
                 return false;
             }
-            const cmd = ctx.message.text.slice(botCommand.offset, botCommand.offset + botCommand.length);
             if (cmd.includes("@")) {
-                const username = cmd.split("@")[1];
+                const username = cmd.split("@", 2)[1];
                 if (username.toLowerCase() !== ctx.me.username?.toLowerCase()) {
                     return false;
                 }
             }
-            const command_ = cmd.split("@")[0].split("/")[1].toLowerCase();
+            const command_ = cmd.split("@", 1)[0].split(prefix, 2)[1].toLowerCase();
             for (const command of commands_) {
                 if (typeof command === "string" && (command.toLowerCase() == command_)) {
                     return true;

package/script/utilities/0_object.d.ts

@@ -1 +1 @@
-export declare function cleanObject<T extends Record<string, any>>(object: T): T;
+export declare function cleanObject<T extends Record<string, any>>(object: T, recursive?: boolean): T;

package/script/utilities/0_object.js

@@ -2,15 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cleanObject = void 0;
 // deno-lint-ignore no-explicit-any
-function cleanObject(object) {
+function cleanObject(object, recursive = true) {
     for (const [k, v] of Object.entries(object)) {
         switch (typeof v) {
             case "undefined":
                 delete object[k];
                 break;
             case "object":
-                // @ts-ignore: this works, no idea why it complains
-                object[k] = cleanObject(v);
+                if (recursive) {
+                    // @ts-ignore: this works, no idea why it complains
+                    object[k] = cleanObject(v);
+                }
         }
     }
     return object;