ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix terminating session when signing out (#2039)

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-09-20 14:59:11 +02:00
parent cd2e2a4928
commit 58d8242d17
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/gramjs/worker/provider.ts
View File

@ -135,7 +135,9 @@ function makeRequest(message: OriginRequest) {
Object.assign(requestState, { resolve, reject }); Object.assign(requestState, { resolve, reject });
}); });
if (('args' in payload) && typeof payload.args[1] === 'function') { if ('args' in payload && 'name' in payload && typeof payload.args[1] === 'function') {
payload.withCallback = true;
const callback = payload.args.pop() as AnyToVoidFunction; const callback = payload.args.pop() as AnyToVoidFunction;
requestState.callback = callback; requestState.callback = callback;
requestStatesByCallback.set(callback, requestState); requestStatesByCallback.set(callback, requestState);

1
src/api/gramjs/worker/types.ts
View File

@ -33,6 +33,7 @@ export type OriginRequest = {
messageId?: string; messageId?: string;
name: keyof Methods; name: keyof Methods;
args: MethodArgs<keyof Methods>; args: MethodArgs<keyof Methods>;
withCallback?: boolean;
} | { } | {
type: 'ping'; type: 'ping';
messageId?: string; messageId?: string;

6
src/api/gramjs/worker/worker.ts
View File

@ -24,9 +24,11 @@ onmessage = async (message: OriginMessageEvent) => {
break; break;
} }
case 'callMethod': { case 'callMethod': {
const { messageId, name, args } = data; const {
messageId, name, args, withCallback,
} = data;
try { try {
if (messageId) { if (messageId && withCallback) {
const callback = (...callbackArgs: any[]) => { const callback = (...callbackArgs: any[]) => {
const lastArg = callbackArgs[callbackArgs.length - 1]; const lastArg = callbackArgs[callbackArgs.length - 1];

3
src/util/WorkerConnector.ts
View File

@ -14,6 +14,7 @@ type CallMethodData = {
messageId?: string; messageId?: string;
name: string; name: string;
args: any; args: any;
withCallback?: boolean;
}; };
type OriginMessageData = CallMethodData | { type OriginMessageData = CallMethodData | {
@ -78,6 +79,8 @@ export default class WorkerConnector {
}); });
if (typeof payload.args[payload.args.length - 1] === 'function') { if (typeof payload.args[payload.args.length - 1] === 'function') {
payload.withCallback = true;
const callback = payload.args.pop() as AnyToVoidFunction; const callback = payload.args.pop() as AnyToVoidFunction;
requestState.callback = callback; requestState.callback = callback;
requestStatesByCallback.set(callback, requestState); requestStatesByCallback.set(callback, requestState);

6
src/util/createWorkerInterface.ts
View File

@ -13,9 +13,11 @@ export default function createInterface(api: Record<string, Function>) {
switch (data.type) { switch (data.type) {
case 'callMethod': { case 'callMethod': {
const { messageId, name, args } = data; const {
messageId, name, args, withCallback,
} = data;
try { try {
if (messageId) { if (messageId && withCallback) {
const callback = (...callbackArgs: any[]) => { const callback = (...callbackArgs: any[]) => {
const lastArg = callbackArgs[callbackArgs.length - 1]; const lastArg = callbackArgs[callbackArgs.length - 1];