@widget-js/core 0.1.14 → 0.1.16

package/dist/esm/api/DialogApi.js

@@ -6,7 +6,8 @@ export class DialogApi {
      * @param extensions 允许的文件后缀格式，如：["txt","docx","gif"]
      */
     static async pickFile(extensions) {
-        return await ElectronUtils.getAPI().invoke(Channel.DIALOG, this.PICK_FILE, extensions);
+        var _a;
+        return await ((_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.DIALOG, this.PICK_FILE, extensions));
     }
 }
 DialogApi.PICK_FILE = "pick-file";

package/dist/esm/api/ElectronApi.js

@@ -1,9 +1,11 @@
 import { ElectronUtils } from "../utils/ElectronUtils";
 export class ElectronApi {
     static async addIpcListener(key, f) {
-        await ElectronUtils.getAPI().addIpcListener(key, f);
+        var _a;
+        await ((_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.addIpcListener(key, f));
     }
     static async removeIpcListener(key) {
-        await ElectronUtils.getAPI().removeIpcListener(key);
+        var _a;
+        await ((_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.removeIpcListener(key));
     }
 }

package/dist/esm/api/NotificationApi.js

@@ -1,17 +1,37 @@
-import { Notification } from "../model/Notification";
+import { AppNotification } from "../model/AppNotification";
 import { Channel } from "./Channel";
 import { ElectronUtils } from "../utils/ElectronUtils";
 export class NotificationApi {
-    static async call(duration = 5000) {
-        ElectronUtils.getAPI().invoke(Channel.NOTIFICATION, new Notification({
-            title: "章鱼哥",
+    // static async url(url: string, duration: number = -1) {
+    //     ElectronUtils.getAPI()?.invoke(Channel.NOTIFICATION, new AppNotification({
+    //         url, message: "",
+    //         duration,
+    //         type: "url",
+    //     }));
+    // }
+    /**
+     * 来电
+     * @param avatar    头像地址
+     * @param audio     音频地址
+     * @param title     标题文件
+     * @param message   初始消息
+     * @param lyric     歌词字符串
+     */
+    static async call(avatar, audio, title, message, lyric) {
+        var _a;
+        (_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.NOTIFICATION, new AppNotification({
+            avatar,
+            audio,
+            message,
+            title,
+            duration: -1,
+            lyric,
             type: "call",
-            message: "下班提醒",
-            duration: duration
         }));
     }
     static async advanceCountdown(message, targetTime, title) {
-        ElectronUtils.getAPI().invoke(Channel.NOTIFICATION, new Notification({
+        var _a;
+        (_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.NOTIFICATION, new AppNotification({
             title,
             message,
             targetTime,
@@ -19,17 +39,22 @@ export class NotificationApi {
         }));
     }
     static async countdown(message, targetTime) {
-        ElectronUtils.getAPI().invoke(Channel.NOTIFICATION, new Notification({
+        var _a;
+        (_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.NOTIFICATION, new AppNotification({
             message,
             targetTime,
+            backgroundColor: 'rgba(0,0,0,0.5)',
+            duration: -1,
             type: "countdown"
         }));
     }
     static async success(message, duration = 5000) {
+        var _a;
         if (ElectronUtils.hasElectronApi()) {
-            ElectronUtils.getAPI().invoke(Channel.NOTIFICATION, new Notification({
+            (_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.NOTIFICATION, new AppNotification({
                 message,
                 type: "success",
+                icon: "check_circle_line",
                 duration
             }));
         }
@@ -38,10 +63,12 @@ export class NotificationApi {
         }
     }
     static async error(message, duration = 5000) {
+        var _a;
         if (ElectronUtils.hasElectronApi()) {
-            ElectronUtils.getAPI().invoke(Channel.NOTIFICATION, new Notification({
+            (_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.NOTIFICATION, new AppNotification({
                 message,
                 type: "error",
+                icon: "close_circle_line",
                 duration
             }));
         }
@@ -50,10 +77,12 @@ export class NotificationApi {
         }
     }
     static async warning(message, duration = 5000) {
+        var _a;
         if (ElectronUtils.hasElectronApi()) {
-            ElectronUtils.getAPI().invoke(Channel.NOTIFICATION, new Notification({
+            (_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.NOTIFICATION, new AppNotification({
                 message,
                 type: "warning",
+                icon: "warning_line",
                 duration
             }));
         }
@@ -61,16 +90,27 @@ export class NotificationApi {
             this.callback("warning", message, duration);
         }
     }
-    static async message(message, duration = 5000) {
+    static async info(message, duration = 5000) {
+        var _a;
         if (ElectronUtils.hasElectronApi()) {
-            ElectronUtils.getAPI().invoke(Channel.NOTIFICATION, new Notification({
+            (_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.NOTIFICATION, new AppNotification({
                 message,
-                type: "message",
+                type: "info",
+                icon: "information_line",
                 duration
             }));
         }
         else {
-            this.callback("message", message, duration);
+            this.callback("info", message, duration);
+        }
+    }
+    /**
+     * 隐藏通知
+     */
+    static async hide() {
+        var _a;
+        if (ElectronUtils.hasElectronApi()) {
+            (_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.NOTIFICATION, null);
         }
     }
     static setDebugNotification(callback) {

package/dist/esm/api/WidgetApi.js

@@ -8,13 +8,16 @@ import { BroadcastApi } from "./BroadcastApi";
 import localforage from "localforage";
 export class WidgetApi {
     static async registerWidgets(widgets) {
-        await ElectronUtils.getAPI().invoke(Channel.WIDGET, this.REGISTER_WIDGETS, JSON.stringify(widgets));
+        var _a;
+        await ((_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.WIDGET, this.REGISTER_WIDGETS, JSON.stringify(widgets)));
     }
     static async registerWidgetPackage(widgetPackage) {
-        await ElectronUtils.getAPI().invoke(Channel.WIDGET, this.REGISTER_WIDGET_PACKAGE, JSON.stringify(widgetPackage));
+        var _a;
+        await ((_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.WIDGET, this.REGISTER_WIDGET_PACKAGE, JSON.stringify(widgetPackage)));
     }
     static async getWidgets() {
-        const data = await ElectronUtils.getAPI().invoke(Channel.WIDGET, this.GET_WIDGETS);
+        var _a;
+        const data = await ((_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.WIDGET, this.GET_WIDGETS));
         const widgets = [];
         if (data) {
             const arr = JSON.parse(data);
@@ -25,28 +28,32 @@ export class WidgetApi {
         return widgets;
     }
     static async getWidgetPackages() {
-        return await ElectronUtils.getAPI().invoke(Channel.WIDGET, this.GET_WIDGET_PACKAGES);
+        var _a;
+        return await ((_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.WIDGET, this.GET_WIDGET_PACKAGES));
     }
     /**
      *
      * @param name package name
      */
     static async getWidget(name) {
-        return Widget.parseObject(await ElectronUtils.getAPI().invoke(Channel.WIDGET, this.GET_WIDGET, name));
+        var _a;
+        return Widget.parseObject(await ((_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.WIDGET, this.GET_WIDGET, name)));
     }
     /**
      *
      * @param name package name
      */
     static async getWidgetPackage(name) {
-        return WidgetPackage.parseObject(await ElectronUtils.getAPI().invoke(Channel.WIDGET, this.GET_WIDGET_PACKAGE, name));
+        var _a;
+        return WidgetPackage.parseObject(await ((_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.WIDGET, this.GET_WIDGET_PACKAGE, name)));
     }
     /**
      * 移除组件
      * @param id
      */
     static async removeHostedWidget(id) {
-        return ElectronUtils.getAPI().invoke(Channel.WIDGET, this.REMOVE_HOSTED_WIDGET, id);
+        var _a;
+        return (_a = ElectronUtils.getAPI()) === null || _a === void 0 ? void 0 : _a.invoke(Channel.WIDGET, this.REMOVE_HOSTED_WIDGET, id);
     }
     /**
      * 获取组件配置地址
@@ -61,6 +68,21 @@ export class WidgetApi {
             return null;
         return UrlUtils.getWidgetUrl(widget.configUrl, widgetPackage, widgetParams);
     }
+    static async getWidgetUrl(widgetName, widgetParams) {
+        const widget = await this.getWidget(widgetName);
+        if (!widget || widget.configUrl == null)
+            return null;
+        const widgetPackage = await this.getWidgetPackage(widget.packageName);
+        if (!widgetPackage)
+            return null;
+        return UrlUtils.getWidgetUrl(widget.url, widgetPackage, widgetParams);
+    }
+    static async getWidgetPackageUrl(packageName, hash) {
+        const widgetPackage = await this.getWidgetPackage(packageName);
+        if (!widgetPackage)
+            return null;
+        return widgetPackage.getFullUrl(hash);
+    }
     /**
      * 通过组件名保存组件信息，通常用于存储可以在同类组件中共用的数据
      * @param data

package/dist/esm/index.js

@@ -3,9 +3,11 @@ export * from "./model/event/BroadcastEvent";
 export * from "./model/event/WebSocketEvent";
 export * from "./model/WidgetData";
 export * from "./model/WidgetParams";
-export * from "./model/Notification";
+export * from "./model/AppNotification";
 export * from "./model/HostedMode";
 export * from "./model/interface/Rectangle";
+export * from "./model/event/AppKeyboardEvent";
+export * from "./model/event/AppMouseEvent";
 export * from "./model/WidgetPackage";
 export * from "./api/ElectronApi";
 export * from "./repository/WidgetDataRepository";

package/dist/esm/model/AppNotification.js

@@ -0,0 +1,28 @@
+export var NotificationSize;
+(function (NotificationSize) {
+    NotificationSize["SMALL"] = "small";
+    NotificationSize["NORMAL"] = "normal";
+    NotificationSize["LARGE"] = "large";
+})(NotificationSize || (NotificationSize = {}));
+export class AppNotification {
+    constructor(option) {
+        var _a, _b, _c, _d, _e;
+        this.type = "info";
+        this.type = (_a = option.type) !== null && _a !== void 0 ? _a : "info";
+        this.title = option.title;
+        this.message = option.message;
+        this.targetTime = option.targetTime;
+        this.duration = (_b = option.duration) !== null && _b !== void 0 ? _b : 5000;
+        this.icon = option.icon;
+        this.color = (_c = option.color) !== null && _c !== void 0 ? _c : "#5D8AC8";
+        this.confirmButtonText = option.confirmButtonText;
+        this.cancelButtonText = option.cancelButtonText;
+        this.cancelBroadcast = option.cancelBroadcast;
+        this.confirmBroadcast = option.confirmBroadcast;
+        this.size = (_d = option.size) !== null && _d !== void 0 ? _d : NotificationSize.NORMAL;
+        this.audio = option.audio;
+        this.avatar = option.avatar;
+        this.lyric = option.lyric;
+        this.backgroundColor = (_e = option.backgroundColor) !== null && _e !== void 0 ? _e : '#000000';
+    }
+}

package/dist/esm/model/WidgetPackage.js

@@ -1,3 +1,4 @@
+import { UrlUtils } from "../utils/UrlUtils";
 export class WidgetPackage {
     constructor() {
         /**
@@ -19,10 +20,7 @@ export class WidgetPackage {
      * 如果url是http链接，直接返回链接
      * 如果是本地组件：file://链接，则返回 url+entry,e.g. file://C:\users\neo\desktop\index.html#
      */
-    getFullUrl() {
-        if (this.url.startsWith("http")) {
-            return this.url;
-        }
-        return this.url + (this.entry.startsWith("/") ? this.entry : `/${this.entry}`);
+    getFullUrl(hash) {
+        return UrlUtils.getWidgetPackageUrl(this.url, this.entry, hash == null ? this.hash : hash);
     }
 }

package/dist/esm/model/WidgetParams.js

@@ -32,8 +32,12 @@ export class WidgetParams {
      */
     static fromCurrentLocation() {
         const href = window.location.href;
-        let queryString = href.split("?")[1];
-        return this.fromObject(parseQuery(queryString));
+        let strings = href.split("?");
+        if (strings.length > 1) {
+            let queryString = strings[1];
+            return this.fromObject(parseQuery(queryString));
+        }
+        return new WidgetParams();
     }
     static setValue(widgetEnv, key, value) {
         const keyWithoutPrefix = key.replace(this.PARAM_PREFIX, "");

package/dist/esm/model/event/AppKeyboardEvent.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/model/event/AppMouseEvent.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/utils/UrlUtils.js

@@ -14,4 +14,19 @@ export class UrlUtils {
             return url + "?" + widgetParams.toUrlParams().toString();
         }
     }
+    static getWidgetPackageUrl(url, entry, hash) {
+        const arr = [url];
+        if (url.startsWith("http")) {
+            if (hash) {
+                arr.push(url.endsWith("/") ? "#" : "/#");
+            }
+        }
+        else {
+            arr.push(entry.startsWith("/") ? entry : `/${entry}`);
+            if (hash) {
+                arr.push(url.endsWith("#") ? "" : "#");
+            }
+        }
+        return arr.join("");
+    }
 }

package/dist/types/api/BrowserWindowApi.d.ts

@@ -16,7 +16,14 @@ export declare class BrowserWindowApi {
     static readonly SET_RESIZABLE = "set-resizable";
     static readonly GET_BOUNDS = "get-bounds";
     static readonly SET_BOUNDS = "set-bounds";
+    static readonly SHOW = "show";
     static setIgnoreMouseEvent(ignore: boolean): Promise<void>;
+    static show(): Promise<void>;
+    static hide(): Promise<void>;
+    /**
+     * @deprecated
+     * @param show
+     */
     static setWindowVisibility(show: boolean): Promise<void>;
     static setAlwaysOnTop(alwaysOnTop: boolean): Promise<void>;
     static isAlwaysOnTop(): Promise<boolean>;

package/dist/types/api/Channel.d.ts

@@ -4,5 +4,7 @@ export declare enum Channel {
     BROADCAST = "channel::cn.widgetjs.core.broadcast",
     WIDGET = "channel::cn.widgetjs.core.widget",
     APP = "channel::cn.widgetjs.core.app",
+    MOUSE_EVENT = "channel::cn.widgetjs.core.mouse_event",
+    KEYBOARD_EVENT = "channel::cn.widgetjs.core.keyboard_event",
     DIALOG = "channel::cn.widgetjs.core.dialog"
 }

package/dist/types/api/NotificationApi.d.ts

@@ -1,13 +1,25 @@
-import { NotificationType } from "../model/Notification";
+import { NotificationType } from "../model/AppNotification";
 type NotificationCallback = (type: NotificationType, message: string, duration: number) => void;
 export declare class NotificationApi {
-    static call(duration?: number): Promise<void>;
+    /**
+     * 来电
+     * @param avatar    头像地址
+     * @param audio     音频地址
+     * @param title     标题文件
+     * @param message   初始消息
+     * @param lyric     歌词字符串
+     */
+    static call(avatar: string, audio: string, title: string, message: string, lyric: string): Promise<void>;
     static advanceCountdown(message: string, targetTime: string, title?: string): Promise<void>;
     static countdown(message: string, targetTime: string): Promise<void>;
     static success(message: string, duration?: number): Promise<void>;
     static error(message: string, duration?: number): Promise<void>;
     static warning(message: string, duration?: number): Promise<void>;
-    static message(message: string, duration?: number): Promise<void>;
+    static info(message: string, duration?: number): Promise<void>;
+    /**
+     * 隐藏通知
+     */
+    static hide(): Promise<void>;
     private static callback;
     static setDebugNotification(callback: NotificationCallback): void;
 }

package/dist/types/api/WidgetApi.d.ts

@@ -38,6 +38,8 @@ export declare class WidgetApi {
      * @param widgetName
      */
     static getWidgetConfigUrl(widgetName: string, widgetParams: WidgetParams): Promise<string | null>;
+    static getWidgetUrl(widgetName: string, widgetParams: WidgetParams): Promise<string | null>;
+    static getWidgetPackageUrl(packageName: string, hash?: boolean): Promise<string | null>;
     /**
      * 通过组件名保存组件信息，通常用于存储可以在同类组件中共用的数据
      * @param data

package/dist/types/index.d.ts

@@ -3,9 +3,11 @@ export * from "./model/event/BroadcastEvent";
 export * from "./model/event/WebSocketEvent";
 export * from "./model/WidgetData";
 export * from "./model/WidgetParams";
-export * from "./model/Notification";
+export * from "./model/AppNotification";
 export * from "./model/HostedMode";
 export * from "./model/interface/Rectangle";
+export * from "./model/event/AppKeyboardEvent";
+export * from "./model/event/AppMouseEvent";
 export * from "./model/WidgetPackage";
 export * from "./api/ElectronApi";
 export * from "./repository/WidgetDataRepository";

package/dist/types/model/AppNotification.d.ts

@@ -0,0 +1,49 @@
+export type NotificationType = "countdown" | "advance-countdown" | "error" | "success" | "warning" | "info" | "reminder" | "url" | "call";
+export declare enum NotificationSize {
+    SMALL = "small",
+    NORMAL = "normal",
+    LARGE = "large"
+}
+export interface NotificationOption {
+    type?: NotificationType;
+    title?: string;
+    message: string;
+    targetTime?: string;
+    duration?: number;
+    /**
+     * 图片名，目前只支持mingcute图标。
+     * https://www.mingcute.com/
+     */
+    icon?: string;
+    color?: string;
+    confirmButtonText?: string;
+    cancelButtonText?: string;
+    cancelBroadcast?: string;
+    confirmBroadcast?: string;
+    size?: NotificationSize;
+    url?: string;
+    avatar?: string;
+    audio?: string;
+    lyric?: string;
+    backgroundColor?: string;
+}
+export declare class AppNotification {
+    type: NotificationType;
+    message: string;
+    title?: string;
+    targetTime?: string;
+    duration: number;
+    icon?: string;
+    color?: string;
+    backgroundColor?: string;
+    confirmButtonText?: string;
+    cancelButtonText?: string;
+    cancelBroadcast?: string;
+    confirmBroadcast?: string;
+    size: NotificationSize;
+    url?: string;
+    avatar?: string;
+    audio?: string;
+    lyric?: string;
+    constructor(option: NotificationOption);
+}

package/dist/types/model/WidgetPackage.d.ts

@@ -48,5 +48,5 @@ export declare class WidgetPackage {
      * 如果url是http链接，直接返回链接
      * 如果是本地组件：file://链接，则返回 url+entry,e.g. file://C:\users\neo\desktop\index.html#
      */
-    getFullUrl(): string;
+    getFullUrl(hash?: boolean): string;
 }

package/dist/types/model/event/AppKeyboardEvent.d.ts

@@ -0,0 +1,16 @@
+export interface AppKeyboardEvent {
+    scanCode: number;
+    timestamp: number;
+    isKeyDown: boolean;
+    isKeyUp: boolean;
+    isExtendedKey: boolean;
+    alt: boolean;
+    control: boolean;
+    handled: boolean;
+    keyCode: number;
+    keyValue: number;
+    keyData: number;
+    modifiers: number;
+    shift: boolean;
+    suppressKeyPress: boolean;
+}

package/dist/types/model/event/AppMouseEvent.d.ts

@@ -0,0 +1,14 @@
+export interface AppMouseEvent {
+    handled: boolean;
+    wheelScrolled: boolean;
+    clicked: boolean;
+    isMouseButtonDown: boolean;
+    isMouseButtonUp: boolean;
+    timestamp: number;
+    button: number;
+    clicks: number;
+    x: number;
+    y: number;
+    delta: number;
+    location: string;
+}

package/dist/types/utils/UrlUtils.d.ts

@@ -2,4 +2,5 @@ import { WidgetPackage } from "../model/WidgetPackage";
 import { WidgetParams } from "../model/WidgetParams";
 export declare class UrlUtils {
     static getWidgetUrl(widgetUrl: string, widgetPackage: WidgetPackage, widgetParams: WidgetParams): string;
+    static getWidgetPackageUrl(url: string, entry: string, hash: boolean): string;
 }