@hhfenpm/micro-app 1.0.2 → 1.0.3

package/dist/index.esm.js

@@ -1,7 +1,62 @@
-const BRIDGE$1 = {
-  INVOKE: 'bridge-invoke',
-  CALLBACK: 'bridge-callback',
-};
+var uiHandler = vm => ({
+  $message: vm.$message,
+  $success: msg => vm.$message.success(msg),
+  $warning: msg => vm.$message.warning(msg),
+  $error: msg => vm.$message.error(msg),
+  $notify: options => vm.$notify(options),
+  $confirm: (...args) => vm.$confirm(...args).then(() => true).catch(() => false),
+  $alert: (...args) => vm.$alert(...args).then(() => true).catch(() => false),
+  $prompt: (...args) => vm.$prompt(...args).then(res => res.value).catch(() => null),
+  $loading: options => {
+    const loading = vm.$loading(options);
+    return () => loading.close()
+  },
+});
+
+const noop = () => console.warn('[bridge] electron 不可用');
+
+const KEYS = [
+  'renderer_listen',
+  'web_send',
+  'web_send_path',
+  'show',
+  'hide',
+  'quit',
+  'showAlertDialog',
+  'closeAlertDialog',
+  'closeAlertDialogAndJump',
+  'set_bounds',
+  'get_bounds',
+  'workarea',
+  'center',
+  'maximize',
+  'unmaximize',
+  'is_maximized',
+  'minimize',
+  'open_top',
+  'close_top',
+  'update',
+  'collapse',
+  'unfold',
+  'unfoldMax',
+  'get_version',
+];
+
+function createCs(electron = {}) {
+  const base = Object.fromEntries(
+    KEYS.map(k => [k, typeof electron[k] === 'function' ? electron[k] : noop])
+  );
+  return {
+    ...electron,
+    ...base,
+    is_app:
+      typeof electron.is_app === 'function'
+        ? electron.is_app()
+        : !!electron.is_app,
+  }
+}
+
+const BRIDGE$1 = { INVOKE: 'bridge-invoke', CALLBACK: 'bridge-callback' };
 
 const post = (target, message) =>
   target?.postMessage(message, window.location.origin);
@@ -19,6 +74,17 @@ const safeClone = value => {
   }
 };
 
+function createRegisterHandlers(getElectron) {
+  const electron = (() => {
+    try {
+      return typeof getElectron === 'function' ? getElectron() : {}
+    } catch {
+      return {}
+    }
+  })();
+  return vm => ({ ui: uiHandler(vm), cs: createCs(electron) })
+}
+
 const initBridge = ({
   isParent = false,
   vm,
@@ -79,7 +145,7 @@ const initBridge = ({
           result: safeClone(payload),
         });
 
-      result?.then ? result.then(done).catch(done) : done(result);
+      Promise.resolve(result).then(done).catch(done);
     } catch (err) {
       post(iframeWindow, {
         type: BRIDGE$1.CALLBACK,
@@ -106,88 +172,6 @@ const initBridge = ({
   });
 };
 
-var uiHandler = vm => ({
-  $message: (...args) => vm.$message(...args),
-  $success: msg => vm.$message.success(msg),
-  $warning: msg => vm.$message.warning(msg),
-  $error: msg => vm.$message.error(msg),
-  $notify: options => vm.$notify(options),
-  $confirm: (...args) =>
-    vm
-      .$confirm(...args)
-      .then(() => true)
-      .catch(() => false),
-  $alert: (...args) =>
-    vm
-      .$alert(...args)
-      .then(() => true)
-      .catch(() => false),
-  $prompt: (...args) =>
-    vm
-      .$prompt(...args)
-      .then(res => res.value)
-      .catch(() => null),
-  $loading: options => {
-    const loading = vm.$loading(options);
-    return () => loading.close()
-  },
-});
-
-const noop = () => console.warn('[bridge] electron 不可用');
-
-const KEYS = [
-  'renderer_listen',
-  'web_send',
-  'web_send_path',
-  'show',
-  'hide',
-  'quit',
-  'showAlertDialog',
-  'closeAlertDialog',
-  'closeAlertDialogAndJump',
-  'set_bounds',
-  'get_bounds',
-  'workarea',
-  'center',
-  'maximize',
-  'unmaximize',
-  'is_maximized',
-  'minimize',
-  'open_top',
-  'close_top',
-  'update',
-  'collapse',
-  'unfold',
-  'unfoldMax',
-  'get_version',
-];
-
-function createCs(electron = {}) {
-  const base = Object.fromEntries(
-    KEYS.map(k => [k, typeof electron[k] === 'function' ? electron[k] : noop])
-  );
-  return {
-    ...electron,
-    ...base,
-    is_app:
-      typeof electron.is_app === 'function'
-        ? electron.is_app()
-        : !!electron.is_app,
-  }
-}
-
-function createRegisterHandlers(getElectron) {
-  let electron = {};
-  try {
-    if (typeof getElectron === 'function') electron = getElectron();
-  } catch {}
-
-  return vm => ({
-    ui: uiHandler(vm),
-    cs: createCs(electron),
-  })
-}
-
 function createMicroAppCore({
   modelMap,
   enabledModules,
@@ -213,9 +197,9 @@ function createMicroAppCore({
 
   const microAppModule = path => {
     const value = path.split('?')[0];
-    const key = Object.keys(MAP).find(key => MAP[key].includes(value));
-    const DATA = getEnabledModules();
-    return DATA?.includes(key) ? key : null
+    const key = Object.keys(MAP).find(k => MAP[k].includes(value));
+    const mods = getEnabledModules();
+    return mods?.includes(key) ? key : null
   };
 
   const microAppSrc = path => {
@@ -226,12 +210,9 @@ function createMicroAppCore({
 
   const microAppDeployed = async module => {
     try {
-      const result = await fetch(`/${module}`, {
-        method: 'GET',
-        cache: 'no-store',
-      });
-      return result.ok
-    } catch (error) {
+      const res = await fetch(`/${module}`, { method: 'GET', cache: 'no-store' });
+      return res.ok
+    } catch {
       return false
     }
   };
@@ -261,11 +242,11 @@ const BRIDGE = { INVOKE: 'bridge-invoke', CALLBACK: 'bridge-callback' };
 const LIFE_CYCLE_TYPES = Object.values(LIFE_CYCLE);
 const BRIDGE_TYPES = Object.values(BRIDGE);
 
-const getIframe = selector => document.querySelector(selector);
-
 const postToChild = (iframeSelector, message) => {
-  const iframe = getIframe(iframeSelector);
-  iframe?.contentWindow?.postMessage(message, window.location.origin);
+  document.querySelector(iframeSelector)?.contentWindow?.postMessage(
+    message,
+    window.location.origin
+  );
 };
 
 const postToParent = message => {

package/dist/index.js

@@ -2,10 +2,65 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const BRIDGE$1 = {
-  INVOKE: 'bridge-invoke',
-  CALLBACK: 'bridge-callback',
-};
+var uiHandler = vm => ({
+  $message: vm.$message,
+  $success: msg => vm.$message.success(msg),
+  $warning: msg => vm.$message.warning(msg),
+  $error: msg => vm.$message.error(msg),
+  $notify: options => vm.$notify(options),
+  $confirm: (...args) => vm.$confirm(...args).then(() => true).catch(() => false),
+  $alert: (...args) => vm.$alert(...args).then(() => true).catch(() => false),
+  $prompt: (...args) => vm.$prompt(...args).then(res => res.value).catch(() => null),
+  $loading: options => {
+    const loading = vm.$loading(options);
+    return () => loading.close()
+  },
+});
+
+const noop = () => console.warn('[bridge] electron 不可用');
+
+const KEYS = [
+  'renderer_listen',
+  'web_send',
+  'web_send_path',
+  'show',
+  'hide',
+  'quit',
+  'showAlertDialog',
+  'closeAlertDialog',
+  'closeAlertDialogAndJump',
+  'set_bounds',
+  'get_bounds',
+  'workarea',
+  'center',
+  'maximize',
+  'unmaximize',
+  'is_maximized',
+  'minimize',
+  'open_top',
+  'close_top',
+  'update',
+  'collapse',
+  'unfold',
+  'unfoldMax',
+  'get_version',
+];
+
+function createCs(electron = {}) {
+  const base = Object.fromEntries(
+    KEYS.map(k => [k, typeof electron[k] === 'function' ? electron[k] : noop])
+  );
+  return {
+    ...electron,
+    ...base,
+    is_app:
+      typeof electron.is_app === 'function'
+        ? electron.is_app()
+        : !!electron.is_app,
+  }
+}
+
+const BRIDGE$1 = { INVOKE: 'bridge-invoke', CALLBACK: 'bridge-callback' };
 
 const post = (target, message) =>
   target?.postMessage(message, window.location.origin);
@@ -23,6 +78,17 @@ const safeClone = value => {
   }
 };
 
+function createRegisterHandlers(getElectron) {
+  const electron = (() => {
+    try {
+      return typeof getElectron === 'function' ? getElectron() : {}
+    } catch {
+      return {}
+    }
+  })();
+  return vm => ({ ui: uiHandler(vm), cs: createCs(electron) })
+}
+
 const initBridge = ({
   isParent = false,
   vm,
@@ -83,7 +149,7 @@ const initBridge = ({
           result: safeClone(payload),
         });
 
-      result?.then ? result.then(done).catch(done) : done(result);
+      Promise.resolve(result).then(done).catch(done);
     } catch (err) {
       post(iframeWindow, {
         type: BRIDGE$1.CALLBACK,
@@ -110,88 +176,6 @@ const initBridge = ({
   });
 };
 
-var uiHandler = vm => ({
-  $message: (...args) => vm.$message(...args),
-  $success: msg => vm.$message.success(msg),
-  $warning: msg => vm.$message.warning(msg),
-  $error: msg => vm.$message.error(msg),
-  $notify: options => vm.$notify(options),
-  $confirm: (...args) =>
-    vm
-      .$confirm(...args)
-      .then(() => true)
-      .catch(() => false),
-  $alert: (...args) =>
-    vm
-      .$alert(...args)
-      .then(() => true)
-      .catch(() => false),
-  $prompt: (...args) =>
-    vm
-      .$prompt(...args)
-      .then(res => res.value)
-      .catch(() => null),
-  $loading: options => {
-    const loading = vm.$loading(options);
-    return () => loading.close()
-  },
-});
-
-const noop = () => console.warn('[bridge] electron 不可用');
-
-const KEYS = [
-  'renderer_listen',
-  'web_send',
-  'web_send_path',
-  'show',
-  'hide',
-  'quit',
-  'showAlertDialog',
-  'closeAlertDialog',
-  'closeAlertDialogAndJump',
-  'set_bounds',
-  'get_bounds',
-  'workarea',
-  'center',
-  'maximize',
-  'unmaximize',
-  'is_maximized',
-  'minimize',
-  'open_top',
-  'close_top',
-  'update',
-  'collapse',
-  'unfold',
-  'unfoldMax',
-  'get_version',
-];
-
-function createCs(electron = {}) {
-  const base = Object.fromEntries(
-    KEYS.map(k => [k, typeof electron[k] === 'function' ? electron[k] : noop])
-  );
-  return {
-    ...electron,
-    ...base,
-    is_app:
-      typeof electron.is_app === 'function'
-        ? electron.is_app()
-        : !!electron.is_app,
-  }
-}
-
-function createRegisterHandlers(getElectron) {
-  let electron = {};
-  try {
-    if (typeof getElectron === 'function') electron = getElectron();
-  } catch {}
-
-  return vm => ({
-    ui: uiHandler(vm),
-    cs: createCs(electron),
-  })
-}
-
 function createMicroAppCore({
   modelMap,
   enabledModules,
@@ -217,9 +201,9 @@ function createMicroAppCore({
 
   const microAppModule = path => {
     const value = path.split('?')[0];
-    const key = Object.keys(MAP).find(key => MAP[key].includes(value));
-    const DATA = getEnabledModules();
-    return DATA?.includes(key) ? key : null
+    const key = Object.keys(MAP).find(k => MAP[k].includes(value));
+    const mods = getEnabledModules();
+    return mods?.includes(key) ? key : null
   };
 
   const microAppSrc = path => {
@@ -230,12 +214,9 @@ function createMicroAppCore({
 
   const microAppDeployed = async module => {
     try {
-      const result = await fetch(`/${module}`, {
-        method: 'GET',
-        cache: 'no-store',
-      });
-      return result.ok
-    } catch (error) {
+      const res = await fetch(`/${module}`, { method: 'GET', cache: 'no-store' });
+      return res.ok
+    } catch {
       return false
     }
   };
@@ -265,11 +246,11 @@ const BRIDGE = { INVOKE: 'bridge-invoke', CALLBACK: 'bridge-callback' };
 const LIFE_CYCLE_TYPES = Object.values(LIFE_CYCLE);
 const BRIDGE_TYPES = Object.values(BRIDGE);
 
-const getIframe = selector => document.querySelector(selector);
-
 const postToChild = (iframeSelector, message) => {
-  const iframe = getIframe(iframeSelector);
-  iframe?.contentWindow?.postMessage(message, window.location.origin);
+  document.querySelector(iframeSelector)?.contentWindow?.postMessage(
+    message,
+    window.location.origin
+  );
 };
 
 const postToParent = message => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hhfenpm/micro-app",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "微前端通信桥接和状态同步工具，支持父子应用通信、状态同步、生命周期管理",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",