@tinywork/glass 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinywork/glass",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/index.ts

@@ -291,10 +291,6 @@ declare global {
       response?: any;
       rule?: RuleSchema;
     };
-    interface IProgress {
-      update: (option: { percent: number; text?: string }) => Promise<void>;
-      destroy: () => Promise<void>;
-    }
 
     interface IGlassExtension {
       install?: IGlassExtensionEvent<void>;
@@ -304,7 +300,8 @@ declare global {
       /** 要修改url时，直接在params.url = new URL方式修改 */
       onRequest?: IGlassExtensionEvent<{
         /** url为null时表示break了请求 */
-        url: URL | null;
+        url: string | null;
+        originUrl?: string | null;
         isLocal?: boolean;
       }>;
       /** 在执行请求用例时触发，用于修改config */
@@ -333,7 +330,6 @@ declare global {
 
       /** 在postMessage到页面之前 */
       onMessagePost?: IGlassExtensionEvent<{ log: Partial<NetLog> }>;
-      onResponse?: IGlassExtensionEvent<{ url: URL }>;
       deactivate?: IGlassExtensionEvent<void>;
       uninstall?: IGlassExtensionEvent<void>;
 
@@ -375,118 +371,122 @@ declare global {
       }>;
     }
 
-    type writeText = (text: string) => Promise<void>;
-    type openExternal = (url: string) => Promise<void>;
-    type getItem = <T>(key: string) => Promise<T>;
-    type setItem = <T>(key: string, value: T) => Promise<void>;
-    /** 保存cookie */
-    type setCookie = (params: {
-      name: string;
-      origin?: string;
-      path?: string;
-      value: string;
-    }) => IGlassExtensionInvokeResponse<void>;
-    /** 获取cookie */
-    type getCookie = (params: {
-      name: string;
-      origin?: string;
-      path?: string;
-    }) => IGlassExtensionInvokeResponse<string>;
-    /** 保存文档组 */
-    type saveGroup = (
-      group: GroupSchema
-    ) => IGlassExtensionInvokeResponse<void>;
-    /** 批量保存文档组 */
-    type saveGroups = (
-      groups: GroupSchema[]
-    ) => IGlassExtensionInvokeResponse<void>;
-    /** 保存文档 */
-    type saveDoc = (
-      doc: DocSchema,
-      options?: {
-        /** 是否触发缓存更新 */
-        hooks?: boolean;
-        /** 是否根据文档自动生成rule规则 */
-        defaultRule?: Partial<{
-          name: string;
-          origin: string;
-          pathname: string;
-          params: { key: string; value?: string }[];
-        }>;
-      }
-    ) => IGlassExtensionInvokeResponse<{
-      apiId: string;
-      ruleId?: string;
-    }>;
-    /** 批量保存文档 */
-    type saveDocs = (
-      docs: DocSchema[],
-      options?: {
-        /** 是否根据文档自动生成rule规则 */
-        defaultRules?: {
-          name: string;
-          origin: string;
-          pathname: string;
-          apiId: string;
-          params?: { key: string; value?: string }[] | null;
-        }[];
-      }
-    ) => IGlassExtensionInvokeResponse<void>;
-    /** 批量更新rule的本地数据 */
-    type saveExamples = (
-      ruleId: string,
-      examples: {
-        id: string;
-        contentType?: string;
-        example?: string;
-        name?: string;
-        statusCode?: number;
-        status?: boolean;
-      }[]
-    ) => IGlassExtensionInvokeResponse<void>;
-    /** 注册菜单项 */
-    type registerMenu = (
-      id: string,
-      options: MenuItem
-    ) => IGlassExtensionInvokeResponse<void>;
-    /** 移除菜单 */
-    type unregisterMenu = (id: string) => IGlassExtensionInvokeResponse<void>;
-
-    type showInputBox = (option: {
-      title?: string;
-      placeholder?: string;
-      value?: string;
-    }) => IGlassExtensionInvokeResponse<string>;
-    type showMessage = (options: {
-      message: string;
-      title?: string;
-      type?: "success" | "info" | "error";
-    }) => IGlassExtensionInvokeResponse<void>;
-    type showProgress = () => IProgress;
-
-    type transformDocToJsonSchema = (
-      doc: DocFullSchema
-    ) => IGlassExtensionInvokeResponse<JSONSchema>;
-    type genDataFromDocSchema = (
-      doc: DocFullSchema
-    ) => IGlassExtensionInvokeResponse<Record<string, any>>;
-
-    type postMessage = (
-      message: Partial<NetLog>
-    ) => IGlassExtensionInvokeResponse<void>;
-    type openBrowserWindow = (browserWindowOptions: {
-      width?: number;
-      height?: number;
-      minHeight?: number;
-      minWidth?: number;
-      show?: boolean;
-      alwaysOnTop?: boolean;
-      url: string;
-      until?: {
-        mode: "cookie";
-        type: "added" | "removed";
-        info: Glass.Cookie;
-      };
-    }) => IGlassExtensionInvokeResponse<Glass.Cookie>;
+    interface IGlassBridge {
+      writeText(text: string): IGlassExtensionInvokeResponse<void>;
+      openExternal(url: string): IGlassExtensionInvokeResponse<void>;
+
+      getItem<T>(key: string): IGlassExtensionInvokeResponse<T>;
+      setItem<T>(key: string, value: T): IGlassExtensionInvokeResponse<void>;
+
+      /** 保存cookie */
+      setCookie(params: {
+        name: string;
+        origin?: string;
+        path?: string;
+        value: string;
+      }): IGlassExtensionInvokeResponse<void>;
+
+      /** 获取cookie */
+      getCookie(params: {
+        name: string;
+        origin?: string;
+        path?: string;
+      }): IGlassExtensionInvokeResponse<string>;
+      /** 保存文档组 */
+      saveGroup(group: GroupSchema): IGlassExtensionInvokeResponse<void>;
+      /** 批量保存文档组 */
+      saveGroups(groups: GroupSchema[]): IGlassExtensionInvokeResponse<void>;
+      /** 保存文档 */
+      saveDoc(
+        doc: DocSchema,
+        options?: {
+          /** 是否触发缓存更新 */
+          hooks?: boolean;
+          /** 是否根据文档自动生成rule规则 */
+          defaultRule?: Partial<{
+            name: string;
+            origin: string;
+            pathname: string;
+            params: { key: string; value?: string }[];
+          }>;
+        }
+      ): IGlassExtensionInvokeResponse<{
+        apiId: string;
+        ruleId?: string;
+      }>;
+      /** 批量保存文档 */
+      saveDocs(
+        docs: DocSchema[],
+        options?: {
+          /** 是否根据文档自动生成rule规则 */
+          defaultRules?: {
+            name: string;
+            origin: string;
+            pathname: string;
+            apiId: string;
+            params?: { key: string; value?: string }[] | null;
+          }[];
+        }
+      ): IGlassExtensionInvokeResponse<void>;
+      /** 批量更新rule的本地数据 */
+      saveExamples(
+        ruleId: string,
+        examples: {
+          id: string;
+          contentType?: string;
+          example?: string;
+          name?: string;
+          statusCode?: number;
+          status?: boolean;
+        }[]
+      ): IGlassExtensionInvokeResponse<void>;
+      /** 注册菜单项 */
+      registerMenu(
+        id: string,
+        options: MenuItem
+      ): IGlassExtensionInvokeResponse<void>;
+      /** 移除菜单 */
+      unregisterMenu(id: string): IGlassExtensionInvokeResponse<void>;
+
+      showInputBox(option: {
+        title?: string;
+        placeholder?: string;
+        value?: string;
+      }): IGlassExtensionInvokeResponse<string>;
+      showMessage(options: {
+        message: string;
+        title?: string;
+        type?: "success" | "info" | "error";
+      }): IGlassExtensionInvokeResponse<void>;
+      showProgress(option: {
+        percent: number;
+        text?: string;
+      }): IGlassExtensionInvokeResponse<void>;
+
+      transformDocToJsonSchema(
+        doc: DocFullSchema
+      ): IGlassExtensionInvokeResponse<JSONSchema>;
+      genDataFromDocSchema(
+        doc: DocFullSchema
+      ): IGlassExtensionInvokeResponse<Record<string, any>>;
+
+      postMessage(
+        message: Partial<NetLog>
+      ): IGlassExtensionInvokeResponse<void>;
+      openBrowserWindow(browserWindowOptions: {
+        width?: number;
+        height?: number;
+        minHeight?: number;
+        minWidth?: number;
+        show?: boolean;
+        alwaysOnTop?: boolean;
+        url: string;
+        until?: {
+          mode: "cookie";
+          type: "added" | "removed";
+          info: Glass.Cookie;
+        };
+      }): IGlassExtensionInvokeResponse<Glass.Cookie>;
+    }
   }
 }