-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* navigate and download only for the browser window that requests it (#1336) * navigate and download only for the browser window that requests it resolves #1145 * linter --------- Co-authored-by: Fred Lefévère-Laoide <[email protected]> * Get Routes with type frontend decouple (#1370) * Feature/wsadapter (#1423) (#1391) * WS adapter * revert bundle * add taipy designer entry * extract bundle * use ws adapter properly * export wssendmessage * dont export main app -> reduce bundle size * ws message type to include string in d.ts * manage external ws message * add msg_type * export correctly * per Fred * per Fabien * root page decouple (#1443) * root page decouple * fix resource_handler id * fix decouple metadata (#1446) * fix decouple metadata * per Fred + refactor * per Fred * fix decouple metadata (#1446) * fix decouple metadata * per Fred + refactor * per Fred * Fix linter --------- Co-authored-by: Fred Lefévère-Laoide <[email protected]> Co-authored-by: Fred Lefévère-Laoide <[email protected]>
- Loading branch information
1 parent
5c2eaba
commit e02d4d1
Showing
22 changed files
with
531 additions
and
205 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
import { WsAdapter } from "./wsAdapter"; | ||
import { sendWsMessage } from "../../src/context/wsUtils"; | ||
// import { TaipyApp } from "./app"; | ||
|
||
export { | ||
WsAdapter, | ||
sendWsMessage, | ||
// TaipyApp, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"name": "taipy-gui-base", | ||
"version": "3.2.0", | ||
"private": true, | ||
"main": "./taipy-gui-base.js", | ||
"types": "./taipy-gui-base.d.ts" | ||
} |
113 changes: 113 additions & 0 deletions
113
frontend/taipy-gui/base/src/packaging/taipy-gui-base.d.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
import { Socket } from "socket.io-client"; | ||
|
||
export type ModuleData = Record<string, VarName>; | ||
export type VarName = Record<string, VarData>; | ||
export interface VarData { | ||
type: string; | ||
value: unknown; | ||
encoded_name: string; | ||
} | ||
declare class DataManager { | ||
_data: Record<string, unknown>; | ||
_init_data: ModuleData; | ||
constructor(variableModuleData: ModuleData); | ||
init(variableModuleData: ModuleData): ModuleData; | ||
getEncodedName(varName: string, module: string): string | undefined; | ||
getName(encodedName: string): [string, string] | undefined; | ||
get(encodedName: string): unknown; | ||
getInfo(encodedName: string): VarData | undefined; | ||
getDataTree(): ModuleData; | ||
getAllData(): Record<string, unknown>; | ||
update(encodedName: string, value: unknown): void; | ||
} | ||
export type OnInitHandler = (taipyApp: TaipyApp) => void; | ||
export type OnChangeHandler = (taipyApp: TaipyApp, encodedName: string, value: unknown) => void; | ||
export type OnNotifyHandler = (taipyApp: TaipyApp, type: string, message: string) => void; | ||
export type OnReloadHandler = (taipyApp: TaipyApp, removedChanges: ModuleData) => void; | ||
export type Route = [string, string]; | ||
export declare class TaipyApp { | ||
socket: Socket; | ||
_onInit: OnInitHandler | undefined; | ||
_onChange: OnChangeHandler | undefined; | ||
_onNotify: OnNotifyHandler | undefined; | ||
_onReload: OnReloadHandler | undefined; | ||
variableData: DataManager | undefined; | ||
functionData: DataManager | undefined; | ||
appId: string; | ||
clientId: string; | ||
context: string; | ||
path: string | undefined; | ||
routes: Route[] | undefined; | ||
wsAdapters: WsAdapter[]; | ||
constructor( | ||
onInit?: OnInitHandler | undefined, | ||
onChange?: OnChangeHandler | undefined, | ||
path?: string | undefined, | ||
socket?: Socket | undefined | ||
); | ||
get onInit(): OnInitHandler | undefined; | ||
set onInit(handler: OnInitHandler | undefined); | ||
get onChange(): OnChangeHandler | undefined; | ||
set onChange(handler: OnChangeHandler | undefined); | ||
get onNotify(): OnNotifyHandler | undefined; | ||
set onNotify(handler: OnNotifyHandler | undefined); | ||
get onReload(): OnReloadHandler | undefined; | ||
set onReload(handler: OnReloadHandler | undefined); | ||
init(): void; | ||
registerWsAdapter(wsAdapter: WsAdapter): void; | ||
getEncodedName(varName: string, module: string): string | undefined; | ||
getName(encodedName: string): [string, string] | undefined; | ||
get(encodedName: string): unknown; | ||
getInfo(encodedName: string): VarData | undefined; | ||
getDataTree(): ModuleData | undefined; | ||
getAllData(): Record<string, unknown> | undefined; | ||
getFunctionList(): string[]; | ||
getRoutes(): Route[] | undefined; | ||
update(encodedName: string, value: unknown): void; | ||
getContext(): string; | ||
updateContext(path?: string | undefined): void; | ||
trigger(actionName: string, triggerId: string, payload?: Record<string, unknown>): void; | ||
upload(encodedName: string, files: FileList, progressCallback: (val: number) => void): Promise<string>; | ||
getPageMetadata(): any; | ||
} | ||
export type WsMessageType = | ||
| "A" | ||
| "U" | ||
| "DU" | ||
| "MU" | ||
| "RU" | ||
| "AL" | ||
| "BL" | ||
| "NA" | ||
| "ID" | ||
| "MS" | ||
| "DF" | ||
| "PR" | ||
| "ACK" | ||
| "GMC" | ||
| "GDT" | ||
| "AID" | ||
| "GR"; | ||
export interface WsMessage { | ||
type: WsMessageType | str; | ||
name: string; | ||
payload: Record<string, unknown> | unknown; | ||
propagate: boolean; | ||
client_id: string; | ||
module_context: string; | ||
ack_id?: string; | ||
} | ||
export declare const sendWsMessage: ( | ||
socket: Socket | undefined, | ||
type: WsMessageType | str, | ||
name: string, | ||
payload: Record<string, unknown> | unknown, | ||
id: string, | ||
moduleContext?: string, | ||
propagate?: boolean, | ||
serverAck?: (val: unknown) => void | ||
) => string; | ||
export declare abstract class WsAdapter { | ||
abstract supportedMessageTypes: string[]; | ||
abstract handleWsMessage(message: WsMessage, app: TaipyApp): boolean; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
import { Socket } from "socket.io-client"; | ||
import { WsMessage, sendWsMessage } from "../../src/context/wsUtils"; | ||
import { TaipyApp } from "./app"; | ||
|
||
export const initSocket = (socket: Socket, taipyApp: TaipyApp) => { | ||
socket.on("connect", () => { | ||
if (taipyApp.clientId === "" || taipyApp.appId === "") { | ||
taipyApp.init(); | ||
} | ||
}); | ||
// Send a request to get App ID to verify that the app has not been reloaded | ||
socket.io.on("reconnect", () => { | ||
console.log("WebSocket reconnected"); | ||
sendWsMessage(socket, "AID", "reconnect", taipyApp.appId, taipyApp.clientId, taipyApp.context); | ||
}); | ||
// try to reconnect on connect_error | ||
socket.on("connect_error", (err) => { | ||
console.log("Error connecting WebSocket: ", err); | ||
setTimeout(() => { | ||
socket && socket.connect(); | ||
}, 500); | ||
}); | ||
// try to reconnect on server disconnection | ||
socket.on("disconnect", (reason, details) => { | ||
console.log("WebSocket disconnected due to: ", reason, details); | ||
if (reason === "io server disconnect") { | ||
socket && socket.connect(); | ||
} | ||
}); | ||
// handle message data from backend | ||
socket.on("message", (message: WsMessage) => { | ||
// handle messages with registered websocket adapters | ||
for (const adapter of taipyApp.wsAdapters) { | ||
if (adapter.supportedMessageTypes.includes(message.type)) { | ||
const messageResolved = adapter.handleWsMessage(message, taipyApp); | ||
if (messageResolved) { | ||
return; | ||
} | ||
} | ||
} | ||
}); | ||
// only now does the socket tries to open/connect | ||
if (!socket.connected) { | ||
socket.connect(); | ||
} | ||
}; |
Oops, something went wrong.