@zeltjs/adapter-electron 0.8.2-canary.2 → 0.9.0

package/dist/main/index.cjs

@@ -176,7 +176,7 @@ const isTextContentType = (contentType) => TEXT_CONTENT_TYPE_PREFIXES.some((pref
 const toBody = (body) => (0, ts_pattern.match)(body).with({ kind: "none" }, () => null).with({ kind: "text" }, ({ value }) => value).with({ kind: "arrayBuffer" }, ({ value }) => value).exhaustive();
 const toRequest = (payload, baseUrl) => {
 	const headers = payload.headers.map(([k, v]) => [k, v]);
-	return new Request(baseUrl + payload.path, {
+	return new Request(baseUrl.replace(/\/+$/, "") + payload.path, {
 		method: payload.method,
 		headers,
 		body: BODY_FORBIDDEN_METHODS.has(payload.method) ? null : toBody(payload.body)

package/dist/main/index.js

@@ -175,7 +175,7 @@ const isTextContentType = (contentType) => TEXT_CONTENT_TYPE_PREFIXES.some((pref
 const toBody = (body) => match(body).with({ kind: "none" }, () => null).with({ kind: "text" }, ({ value }) => value).with({ kind: "arrayBuffer" }, ({ value }) => value).exhaustive();
 const toRequest = (payload, baseUrl) => {
 	const headers = payload.headers.map(([k, v]) => [k, v]);
-	return new Request(baseUrl + payload.path, {
+	return new Request(baseUrl.replace(/\/+$/, "") + payload.path, {
 		method: payload.method,
 		headers,
 		body: BODY_FORBIDDEN_METHODS.has(payload.method) ? null : toBody(payload.body)

package/dist/main/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["Injectable","inject","LifecycleManager","ElectronAdaptor","startup","app","BrowserWindow","BW","dialog","ipcMain","Menu","protocol","screen","shell","whenReady","createBrowserWindow","options","getAllWindows","fromWebContents","wc","fromId","id","getFocusedWindow","shutdown","ready","quit","lifecycleManager","register","Config","EnvAdaptor","ElectronEnvAdaptor","get","key","process","env","Injectable","inject","match","ElectronAdaptor","ElectronWindowRuntimeService","open","definition","handle","createWindowHandle","electronApp","ready","createBrowserWindow","options","loadTarget","type","loadURL","url","loadFile","path","win","id","native","close","focus","show","isDestroyed","getTitle","getBounds","setBounds","bounds","on","event","handler","with","e","exhaustive","removeListener","webContents","send","channel","args","setWindowOpenHandler","Injectable","inject","ElectronWindowRuntimeService","ElectronWindowRegistryService","open","definition","existing","windows","get","id","isDestroyed","focus","handle","runtime","set","on","delete","close","closeAll","values","count","size","Map","getContext","runInContext","setContext","match","BODY_FORBIDDEN_METHODS","Set","NO_BODY_STATUSES","TEXT_CONTENT_TYPE_PREFIXES","isTextContentType","contentType","some","prefix","startsWith","toBody","body","with","kind","value","exhaustive","toRequest","payload","baseUrl","headers","map","k","v","Request","path","method","has","toIpcResponse","response","forEach","key","push","status","get","text","arrayBuffer","statusText","ipcEvent","setupIpcBridge","ipcMain","fetch","channel","handle","event","request","removeHandler","ElectronAdaptor","ElectronEnvAdaptor","setupIpcBridge","DEFAULT_IPC_CHANNEL","onElectron","app","options","readyApp","createRuntime","fallbackConfigs","warmup","electronApp","get","channel","ipcChannel","removeIpcHandler","ready","ipcMain","http","fetch","shutdown"],"sources":["../../src/main/electron.adaptor.ts","../../src/main/electron-env.adaptor.ts","../../src/main/electron-window-runtime.service.ts","../../src/main/electron-window-registry.service.ts","../../src/main/ipc-bridge.ts","../../src/main/on-electron.ts"],"sourcesContent":["import type { Lifecycle, ReadyValue } from '@zeltjs/core';\nimport { Injectable, inject, LifecycleManager } from '@zeltjs/core';\nimport type {\n  App,\n  BrowserWindow,\n  BrowserWindowConstructorOptions,\n  Dialog,\n  IpcMain,\n  Menu,\n  Protocol,\n  Screen,\n  Shell,\n  WebContents,\n} from 'electron';\n\nexport type ElectronReady = {\n  readonly app: App;\n  readonly ipcMain: IpcMain;\n  readonly protocol: Protocol;\n  readonly shell: Shell;\n  readonly screen: Screen;\n  readonly dialog: Dialog;\n  readonly Menu: typeof Menu;\n  readonly createBrowserWindow: (options: BrowserWindowConstructorOptions) => BrowserWindow;\n  readonly getAllWindows: () => BrowserWindow[];\n  readonly fromWebContents: (webContents: WebContents) => BrowserWindow | null;\n  readonly fromId: (id: number) => BrowserWindow | null;\n  readonly getFocusedWindow: () => BrowserWindow | null;\n};\n\n@Injectable()\nexport class ElectronAdaptor implements Lifecycle<ElectronReady> {\n  readonly ready: ReadyValue<ElectronReady>;\n\n  constructor(lifecycleManager = inject(LifecycleManager)) {\n    this.ready = lifecycleManager.register(this);\n  }\n\n  async startup(): Promise<ElectronReady> {\n    const {\n      app,\n      BrowserWindow: BW,\n      dialog,\n      ipcMain,\n      Menu,\n      protocol,\n      screen,\n      shell,\n    } = await import('electron');\n\n    await app.whenReady();\n\n    return {\n      app,\n      ipcMain,\n      protocol,\n      shell,\n      screen,\n      dialog,\n      Menu,\n      createBrowserWindow: (options: BrowserWindowConstructorOptions) => new BW(options),\n      getAllWindows: () => BW.getAllWindows(),\n      fromWebContents: (wc: WebContents) => BW.fromWebContents(wc),\n      fromId: (id: number) => BW.fromId(id),\n      getFocusedWindow: () => BW.getFocusedWindow(),\n    };\n  }\n\n  shutdown(): void {\n    this.ready.app.quit();\n  }\n}\n","import { Config, EnvAdaptor } from '@zeltjs/core';\n\n@Config\nexport class ElectronEnvAdaptor extends EnvAdaptor {\n  override get(key: string): string | undefined {\n    return process.env[key];\n  }\n}\n","import { Injectable, inject } from '@zeltjs/core';\nimport type { BrowserWindow } from 'electron';\nimport { match } from 'ts-pattern';\nimport { ElectronAdaptor } from './electron.adaptor';\nimport type { WindowDefinition, WindowHandle, WindowRuntime } from './window.types';\n\n@Injectable()\nexport class ElectronWindowRuntimeService implements WindowRuntime {\n  constructor(private readonly electronApp: ElectronAdaptor = inject(ElectronAdaptor)) {}\n\n  open(definition: WindowDefinition): WindowHandle {\n    const handle = this.createWindowHandle(\n      this.electronApp.ready.createBrowserWindow(definition.options),\n    );\n\n    if (definition.loadTarget.type === 'url') {\n      handle.loadURL(definition.loadTarget.url);\n    } else {\n      handle.loadFile(definition.loadTarget.path);\n    }\n\n    return handle;\n  }\n\n  createWindowHandle(win: BrowserWindow): WindowHandle {\n    return {\n      id: win.id,\n      native: win,\n      close: () => win.close(),\n      focus: () => win.focus(),\n      show: () => win.show(),\n      isDestroyed: () => win.isDestroyed(),\n      getTitle: () => win.getTitle(),\n      getBounds: () => win.getBounds(),\n      setBounds: (bounds) => win.setBounds(bounds),\n      loadFile: (path) => {\n        void win.loadFile(path);\n      },\n      loadURL: (url) => {\n        void win.loadURL(url);\n      },\n      on: (event, handler) => {\n        match(event)\n          .with('closed', (e) => win.on(e, handler))\n          .with('ready-to-show', (e) => win.on(e, handler))\n          .exhaustive();\n      },\n      removeListener: (event, handler) => {\n        match(event)\n          .with('closed', (e) => win.removeListener(e, handler))\n          .with('ready-to-show', (e) => win.removeListener(e, handler))\n          .exhaustive();\n      },\n      webContents: {\n        send: (channel, ...args) => win.webContents.send(channel, ...args),\n        setWindowOpenHandler: (handler) => win.webContents.setWindowOpenHandler(handler),\n      },\n    };\n  }\n}\n","import { Injectable, inject } from '@zeltjs/core';\nimport { ElectronWindowRuntimeService } from './electron-window-runtime.service';\nimport type { WindowDefinition, WindowHandle, WindowId } from './window.types';\n\n@Injectable()\nexport class ElectronWindowRegistryService {\n  private readonly windows = new Map<WindowId, WindowHandle>();\n\n  constructor(private readonly runtime = inject(ElectronWindowRuntimeService)) {}\n\n  open(definition: WindowDefinition): WindowHandle {\n    const existing = this.windows.get(definition.id);\n    if (existing && !existing.isDestroyed()) {\n      existing.focus();\n      return existing;\n    }\n\n    const handle = this.runtime.open(definition);\n    this.windows.set(definition.id, handle);\n\n    handle.on('closed', () => {\n      this.windows.delete(definition.id);\n    });\n\n    return handle;\n  }\n\n  close(id: WindowId): void {\n    const handle = this.windows.get(id);\n    if (handle && !handle.isDestroyed()) {\n      handle.close();\n    }\n  }\n\n  closeAll(): void {\n    for (const handle of this.windows.values()) {\n      if (!handle.isDestroyed()) {\n        handle.close();\n      }\n    }\n  }\n\n  count(): number {\n    return this.windows.size;\n  }\n}\n","import { getContext, runInContext, setContext } from '@zeltjs/core';\nimport type { IpcMainInvokeEvent } from 'electron';\nimport { match } from 'ts-pattern';\n\nimport type { IpcBody, IpcFetchRequest, IpcFetchResponse } from '../shared/ipc.types';\n\nconst BODY_FORBIDDEN_METHODS = new Set(['GET', 'HEAD']);\nconst NO_BODY_STATUSES = new Set([204, 205, 304]);\nconst TEXT_CONTENT_TYPE_PREFIXES = [\n  'text/',\n  'application/json',\n  'application/xml',\n  'application/javascript',\n  'application/x-www-form-urlencoded',\n];\n\nconst isTextContentType = (contentType: string): boolean =>\n  TEXT_CONTENT_TYPE_PREFIXES.some((prefix) => contentType.startsWith(prefix));\n\nconst toBody = (body: IpcBody): BodyInit | null =>\n  match(body)\n    .with({ kind: 'none' }, () => null)\n    .with({ kind: 'text' }, ({ value }) => value)\n    .with({ kind: 'arrayBuffer' }, ({ value }) => value)\n    .exhaustive();\n\nexport const toRequest = (payload: IpcFetchRequest, baseUrl: string): Request => {\n  const headers: [string, string][] = payload.headers.map(([k, v]) => [k, v]);\n  return new Request(baseUrl + payload.path, {\n    method: payload.method,\n    headers,\n    body: BODY_FORBIDDEN_METHODS.has(payload.method) ? null : toBody(payload.body),\n  });\n};\n\nexport const toIpcResponse = async (\n  response: Response,\n  method: string,\n): Promise<IpcFetchResponse> => {\n  const headers: [string, string][] = [];\n  response.headers.forEach((value, key) => {\n    headers.push([key, value]);\n  });\n\n  let body: IpcBody;\n  if (NO_BODY_STATUSES.has(response.status) || method === 'HEAD') {\n    body = { kind: 'none' };\n  } else {\n    const contentType = response.headers.get('content-type');\n    if (contentType && isTextContentType(contentType)) {\n      body = { kind: 'text', value: await response.text() };\n    } else {\n      body = { kind: 'arrayBuffer', value: await response.arrayBuffer() };\n    }\n  }\n\n  return {\n    status: response.status,\n    statusText: response.statusText,\n    headers,\n    body,\n  };\n};\n\ndeclare module '@zeltjs/core' {\n  interface RequestContextSchema {\n    ipcEvent: IpcMainInvokeEvent;\n  }\n}\n\ntype IpcMainLike = {\n  handle(\n    channel: string,\n    listener: (event: IpcMainInvokeEvent, payload: IpcFetchRequest) => unknown,\n  ): void;\n  removeHandler(channel: string): void;\n};\n\n/** @throws {ZeltContextNotAvailableError} */\nexport const ipcEvent = (): IpcMainInvokeEvent | undefined => getContext('ipcEvent');\n\n/** @throws {ZeltContextNotAvailableError} */\nexport const setupIpcBridge = (\n  ipcMain: IpcMainLike,\n  fetch: (request: Request) => Promise<Response>,\n  channel: string,\n): (() => void) => {\n  ipcMain.handle(channel, async (event, payload) =>\n    runInContext(async () => {\n      setContext('ipcEvent', event);\n      const request = toRequest(payload, channel);\n      const response = await fetch(request);\n      return toIpcResponse(response, payload.method);\n    }),\n  );\n\n  return () => {\n    ipcMain.removeHandler(channel);\n  };\n};\n","import type {\n  ConfiguredFeature,\n  CreateRuntimeOptions,\n  HttpCapabilities,\n  RuntimeApp,\n} from '@zeltjs/core';\nimport { ElectronAdaptor } from './electron.adaptor';\nimport { ElectronEnvAdaptor } from './electron-env.adaptor';\nimport { setupIpcBridge } from './ipc-bridge';\n\ntype IpcChannel = `http://${string}` | `https://${string}`;\n\nexport type ElectronAppOptions = {\n  readonly warmup?: boolean;\n  readonly ipcChannel?: IpcChannel;\n};\n\ntype HttpRuntimeApp = RuntimeApp<readonly ConfiguredFeature[]> & {\n  readonly http: HttpCapabilities;\n};\n\ntype HttpApp = {\n  readonly createRuntime: (options?: CreateRuntimeOptions) => Promise<HttpRuntimeApp>;\n};\n\nexport type OnElectronApp = {\n  readonly get: HttpRuntimeApp['get'];\n  readonly fetch: (request: Request) => Promise<Response>;\n  readonly shutdown: () => Promise<void>;\n};\n\nconst DEFAULT_IPC_CHANNEL = 'http://zelt-ipc';\n\n/** @throws {ZeltContextNotAvailableError} */\nexport const onElectron = async (\n  app: HttpApp,\n  options: ElectronAppOptions = {},\n): Promise<OnElectronApp> => {\n  const readyApp = await app.createRuntime({\n    fallbackConfigs: [ElectronEnvAdaptor],\n    warmup: options.warmup ?? true,\n  });\n\n  const electronApp = await readyApp.get(ElectronAdaptor);\n  const channel = options.ipcChannel ?? DEFAULT_IPC_CHANNEL;\n\n  const removeIpcHandler = setupIpcBridge(electronApp.ready.ipcMain, readyApp.http.fetch, channel);\n\n  return {\n    get: readyApp.get,\n    fetch: readyApp.http.fetch,\n    shutdown: async () => {\n      removeIpcHandler();\n      await readyApp.shutdown();\n    },\n  };\n};\n"],"mappings":";;;;;;;;;;;;AA+BA,IAAaG,kBAAb,MAAaA;CAOX,MAAMC,UAAkC;EACtC,MAAM,EACJC,KACAC,eAAeC,IACfC,QACAC,SACAC,MACAC,UACAC,QACAC,UACE,MAAM,OAAO;AAEjB,QAAMR,IAAIS,WAAS;AAEnB,SAAO;GACLT;GACAI;GACAE;GACAE;GACAD;GACAJ;GACAE;GACAK,sBAAsBC,YAA6C,IAAIT,GAAGS,QAAAA;GAC1EC,qBAAqBV,GAAGU,eAAa;GACrCC,kBAAkBC,OAAoBZ,GAAGW,gBAAgBC,GAAAA;GACzDC,SAASC,OAAed,GAAGa,OAAOC,GAAAA;GAClCC,wBAAwBf,GAAGe,kBAAgB;GAC7C;;CAGFC,WAAiB;AACf,OAAKC,MAAMnB,IAAIoB,MAAI;;CAnCrB,YAAYC,mBAAmBzB,OAAOC,iBAAiB,EAAE;AACvD,OAAKsB,QAAQE,iBAAiBC,SAAS,KAAI;;;;;;;;;;;;;;;;AChC/C,IAAaG,qBAAb,cAAwCD,WAAAA;CAC7BE,IAAIC,KAAiC;AAC5C,SAAOC,QAAQC,IAAIF;;;;;;;;;;;;;;;ACEvB,IAAaO,+BAAb,MAAaA;CAGXC,KAAKC,YAA4C;EAC/C,MAAMC,SAAS,KAAKC,mBAClB,KAAKC,YAAYC,MAAMC,oBAAoBL,WAAWM,QAAO,CAAA;AAG/D,MAAIN,WAAWO,WAAWC,SAAS,MACjCP,QAAOQ,QAAQT,WAAWO,WAAWG,IAAG;MAExCT,QAAOU,SAASX,WAAWO,WAAWK,KAAI;AAG5C,SAAOX;;CAGTC,mBAAmBW,KAAkC;AACnD,SAAO;GACLC,IAAID,IAAIC;GACRC,QAAQF;GACRG,aAAaH,IAAIG,OAAK;GACtBC,aAAaJ,IAAII,OAAK;GACtBC,YAAYL,IAAIK,MAAI;GACpBC,mBAAmBN,IAAIM,aAAW;GAClCC,gBAAgBP,IAAIO,UAAQ;GAC5BC,iBAAiBR,IAAIQ,WAAS;GAC9BC,YAAYC,WAAWV,IAAIS,UAAUC,OAAAA;GACrCZ,WAAWC,SAAAA;AACJC,QAAIF,SAASC,KAAAA;;GAEpBH,UAAUC,QAAAA;AACHG,QAAIJ,QAAQC,IAAAA;;GAEnBc,KAAKC,OAAOC,YAAAA;AACV9B,UAAM6B,MAAAA,CACHE,KAAK,WAAWC,MAAMf,IAAIW,GAAGI,GAAGF,QAAAA,CAAAA,CAChCC,KAAK,kBAAkBC,MAAMf,IAAIW,GAAGI,GAAGF,QAAAA,CAAAA,CACvCG,YAAU;;GAEfC,iBAAiBL,OAAOC,YAAAA;AACtB9B,UAAM6B,MAAAA,CACHE,KAAK,WAAWC,MAAMf,IAAIiB,eAAeF,GAAGF,QAAAA,CAAAA,CAC5CC,KAAK,kBAAkBC,MAAMf,IAAIiB,eAAeF,GAAGF,QAAAA,CAAAA,CACnDG,YAAU;;GAEfE,aAAa;IACXC,OAAOC,SAAS,GAAGC,SAASrB,IAAIkB,YAAYC,KAAKC,SAAAA,GAAYC,KAAAA;IAC7DC,uBAAuBT,YAAYb,IAAIkB,YAAYI,qBAAqBT,QAAAA;IAC1E;GACF;;CAjDF,YAAY,cAAgD/B,OAAOE,gBAAgB,EAAE;OAAxDM,cAAAA;;;;;;;;;;;;;;;;;;;ACH/B,IAAaoC,gCAAb,MAAaA;CAKXC,KAAKC,YAA4C;EAC/C,MAAMC,WAAW,KAAKC,QAAQC,IAAIH,WAAWI,GAAE;AAC/C,MAAIH,YAAY,CAACA,SAASI,aAAW,EAAI;AACvCJ,YAASK,OAAK;AACd,UAAOL;;EAGT,MAAMM,SAAS,KAAKC,QAAQT,KAAKC,WAAAA;AACjC,OAAKE,QAAQO,IAAIT,WAAWI,IAAIG,OAAAA;AAEhCA,SAAOG,GAAG,gBAAU;AAClB,QAAKR,QAAQS,OAAOX,WAAWI,GAAE;IACnC;AAEA,SAAOG;;CAGTK,MAAMR,IAAoB;EACxB,MAAMG,SAAS,KAAKL,QAAQC,IAAIC,GAAAA;AAChC,MAAIG,UAAU,CAACA,OAAOF,aAAW,CAC/BE,QAAOK,OAAK;;CAIhBC,WAAiB;AACf,OAAK,MAAMN,UAAU,KAAKL,QAAQY,QAAM,CACtC,KAAI,CAACP,OAAOF,aAAW,CACrBE,QAAOK,OAAK;;CAKlBG,QAAgB;AACd,SAAO,KAAKb,QAAQc;;CAnCtB,YAAY,UAA2BpB,OAAOC,6BAA6B,EAAE;OAAhDW,UAAAA;OAFZN,0BAAU,IAAIe,KAAAA;;;;;;;;;;ACAjC,MAAMK,yBAAyB,IAAIC,IAAI,CAAC,OAAO,OAAO,CAAA;AACtD,MAAMC,mBAAmB,IAAID,IAAI;CAAC;CAAK;CAAK;CAAI,CAAA;AAChD,MAAME,6BAA6B;CACjC;CACA;CACA;CACA;CACA;CACD;AAED,MAAMC,qBAAqBC,gBACzBF,2BAA2BG,MAAMC,WAAWF,YAAYG,WAAWD,OAAAA,CAAAA;AAErE,MAAME,UAAUC,SACdX,MAAMW,KAAAA,CACHC,KAAK,EAAEC,MAAM,QAAO,QAAS,KAAA,CAC7BD,KAAK,EAAEC,MAAM,QAAO,GAAI,EAAEC,YAAYA,MAAAA,CACtCF,KAAK,EAAEC,MAAM,eAAc,GAAI,EAAEC,YAAYA,MAAAA,CAC7CC,YAAU;AAEf,MAAaC,aAAaC,SAA0BC,YAAAA;CAClD,MAAMC,UAA8BF,QAAQE,QAAQC,KAAK,CAACC,GAAGC,OAAO,CAACD,GAAGC,EAAE,CAAA;AAC1E,QAAO,IAAIC,QAAQL,UAAUD,QAAQO,MAAM;EACzCC,QAAQR,QAAQQ;EAChBN;EACAR,MAAMV,uBAAuByB,IAAIT,QAAQQ,OAAM,GAAI,OAAOf,OAAOO,QAAQN,KAAI;EAC/E,CAAA;;AAGF,MAAagB,gBAAgB,OAC3BC,UACAH,WAAAA;CAEA,MAAMN,UAA8B,EAAE;AACtCS,UAAST,QAAQU,SAASf,OAAOgB,QAAAA;AAC/BX,UAAQY,KAAK,CAACD,KAAKhB,MAAM,CAAA;GAC3B;CAEA,IAAIH;AACJ,KAAIR,iBAAiBuB,IAAIE,SAASI,OAAM,IAAKP,WAAW,OACtDd,QAAO,EAAEE,MAAM,QAAO;MACjB;EACL,MAAMP,cAAcsB,SAAST,QAAQc,IAAI,eAAA;AACzC,MAAI3B,eAAeD,kBAAkBC,YAAAA,CACnCK,QAAO;GAAEE,MAAM;GAAQC,OAAO,MAAMc,SAASM,MAAI;GAAG;MAEpDvB,QAAO;GAAEE,MAAM;GAAeC,OAAO,MAAMc,SAASO,aAAW;GAAG;;AAItE,QAAO;EACLH,QAAQJ,SAASI;EACjBI,YAAYR,SAASQ;EACrBjB;EACAR;EACF;;8CAkBF,MAAa0B,iBAAiDxC,WAAW,WAAA;8CAGzE,MAAayC,kBACXC,SACAC,OACAC,YAAAA;AAEAF,SAAQG,OAAOD,SAAS,OAAOE,OAAO1B,YACpCnB,aAAa,YAAA;AACXC,aAAW,YAAY4C,MAAAA;AAGvB,SAAOhB,cAAcC,MADEY,MADPxB,UAAUC,SAASwB,QACNG,CAAAA,EACE3B,QAAQQ,OAAM;GAC/C,CAAA;AAGF,cAAO;AACLc,UAAQM,cAAcJ,QAAAA;;;;;AClE1B,MAAMQ,sBAAsB;8CAG5B,MAAaC,aAAa,OACxBC,KACAC,UAA8B,EAAE,KAAA;CAEhC,MAAMC,WAAW,MAAMF,IAAIG,cAAc;EACvCC,iBAAiB,CAACR,mBAAmB;EACrCS,QAAQJ,QAAQI,UAAU;EAC5B,CAAA;CAEA,MAAMC,cAAc,MAAMJ,SAASK,IAAIZ,gBAAAA;CACvC,MAAMa,UAAUP,QAAQQ,cAAcX;CAEtC,MAAMY,mBAAmBb,eAAeS,YAAYK,MAAMC,SAASV,SAASW,KAAKC,OAAON,QAAAA;AAExF,QAAO;EACLD,KAAKL,SAASK;EACdO,OAAOZ,SAASW,KAAKC;EACrBC,UAAU,YAAA;AACRL,qBAAAA;AACA,SAAMR,SAASa,UAAQ;;EAE3B"}
+{"version":3,"file":"index.js","names":["Injectable","inject","LifecycleManager","ElectronAdaptor","startup","app","BrowserWindow","BW","dialog","ipcMain","Menu","protocol","screen","shell","whenReady","createBrowserWindow","options","getAllWindows","fromWebContents","wc","fromId","id","getFocusedWindow","shutdown","ready","quit","lifecycleManager","register","Config","EnvAdaptor","ElectronEnvAdaptor","get","key","process","env","Injectable","inject","match","ElectronAdaptor","ElectronWindowRuntimeService","open","definition","handle","createWindowHandle","electronApp","ready","createBrowserWindow","options","loadTarget","type","loadURL","url","loadFile","path","win","id","native","close","focus","show","isDestroyed","getTitle","getBounds","setBounds","bounds","on","event","handler","with","e","exhaustive","removeListener","webContents","send","channel","args","setWindowOpenHandler","Injectable","inject","ElectronWindowRuntimeService","ElectronWindowRegistryService","open","definition","existing","windows","get","id","isDestroyed","focus","handle","runtime","set","on","delete","close","closeAll","values","count","size","Map","getContext","runInContext","setContext","match","BODY_FORBIDDEN_METHODS","Set","NO_BODY_STATUSES","TEXT_CONTENT_TYPE_PREFIXES","isTextContentType","contentType","some","prefix","startsWith","toBody","body","with","kind","value","exhaustive","toRequest","payload","baseUrl","headers","map","k","v","Request","replace","path","method","has","toIpcResponse","response","forEach","key","push","status","get","text","arrayBuffer","statusText","ipcEvent","setupIpcBridge","ipcMain","fetch","channel","handle","event","request","removeHandler","ElectronAdaptor","ElectronEnvAdaptor","setupIpcBridge","DEFAULT_IPC_CHANNEL","onElectron","app","options","readyApp","createRuntime","fallbackConfigs","warmup","electronApp","get","channel","ipcChannel","removeIpcHandler","ready","ipcMain","http","fetch","shutdown"],"sources":["../../src/main/electron.adaptor.ts","../../src/main/electron-env.adaptor.ts","../../src/main/electron-window-runtime.service.ts","../../src/main/electron-window-registry.service.ts","../../src/main/ipc-bridge.ts","../../src/main/on-electron.ts"],"sourcesContent":["import type { Lifecycle, ReadyValue } from '@zeltjs/core';\nimport { Injectable, inject, LifecycleManager } from '@zeltjs/core';\nimport type {\n  App,\n  BrowserWindow,\n  BrowserWindowConstructorOptions,\n  Dialog,\n  IpcMain,\n  Menu,\n  Protocol,\n  Screen,\n  Shell,\n  WebContents,\n} from 'electron';\n\nexport type ElectronReady = {\n  readonly app: App;\n  readonly ipcMain: IpcMain;\n  readonly protocol: Protocol;\n  readonly shell: Shell;\n  readonly screen: Screen;\n  readonly dialog: Dialog;\n  readonly Menu: typeof Menu;\n  readonly createBrowserWindow: (options: BrowserWindowConstructorOptions) => BrowserWindow;\n  readonly getAllWindows: () => BrowserWindow[];\n  readonly fromWebContents: (webContents: WebContents) => BrowserWindow | null;\n  readonly fromId: (id: number) => BrowserWindow | null;\n  readonly getFocusedWindow: () => BrowserWindow | null;\n};\n\n@Injectable()\nexport class ElectronAdaptor implements Lifecycle<ElectronReady> {\n  readonly ready: ReadyValue<ElectronReady>;\n\n  constructor(lifecycleManager = inject(LifecycleManager)) {\n    this.ready = lifecycleManager.register(this);\n  }\n\n  async startup(): Promise<ElectronReady> {\n    const {\n      app,\n      BrowserWindow: BW,\n      dialog,\n      ipcMain,\n      Menu,\n      protocol,\n      screen,\n      shell,\n    } = await import('electron');\n\n    await app.whenReady();\n\n    return {\n      app,\n      ipcMain,\n      protocol,\n      shell,\n      screen,\n      dialog,\n      Menu,\n      createBrowserWindow: (options: BrowserWindowConstructorOptions) => new BW(options),\n      getAllWindows: () => BW.getAllWindows(),\n      fromWebContents: (wc: WebContents) => BW.fromWebContents(wc),\n      fromId: (id: number) => BW.fromId(id),\n      getFocusedWindow: () => BW.getFocusedWindow(),\n    };\n  }\n\n  shutdown(): void {\n    this.ready.app.quit();\n  }\n}\n","import { Config, EnvAdaptor } from '@zeltjs/core';\n\n@Config\nexport class ElectronEnvAdaptor extends EnvAdaptor {\n  override get(key: string): string | undefined {\n    return process.env[key];\n  }\n}\n","import { Injectable, inject } from '@zeltjs/core';\nimport type { BrowserWindow } from 'electron';\nimport { match } from 'ts-pattern';\nimport { ElectronAdaptor } from './electron.adaptor';\nimport type { WindowDefinition, WindowHandle, WindowRuntime } from './window.types';\n\n@Injectable()\nexport class ElectronWindowRuntimeService implements WindowRuntime {\n  constructor(private readonly electronApp: ElectronAdaptor = inject(ElectronAdaptor)) {}\n\n  open(definition: WindowDefinition): WindowHandle {\n    const handle = this.createWindowHandle(\n      this.electronApp.ready.createBrowserWindow(definition.options),\n    );\n\n    if (definition.loadTarget.type === 'url') {\n      handle.loadURL(definition.loadTarget.url);\n    } else {\n      handle.loadFile(definition.loadTarget.path);\n    }\n\n    return handle;\n  }\n\n  createWindowHandle(win: BrowserWindow): WindowHandle {\n    return {\n      id: win.id,\n      native: win,\n      close: () => win.close(),\n      focus: () => win.focus(),\n      show: () => win.show(),\n      isDestroyed: () => win.isDestroyed(),\n      getTitle: () => win.getTitle(),\n      getBounds: () => win.getBounds(),\n      setBounds: (bounds) => win.setBounds(bounds),\n      loadFile: (path) => {\n        void win.loadFile(path);\n      },\n      loadURL: (url) => {\n        void win.loadURL(url);\n      },\n      on: (event, handler) => {\n        match(event)\n          .with('closed', (e) => win.on(e, handler))\n          .with('ready-to-show', (e) => win.on(e, handler))\n          .exhaustive();\n      },\n      removeListener: (event, handler) => {\n        match(event)\n          .with('closed', (e) => win.removeListener(e, handler))\n          .with('ready-to-show', (e) => win.removeListener(e, handler))\n          .exhaustive();\n      },\n      webContents: {\n        send: (channel, ...args) => win.webContents.send(channel, ...args),\n        setWindowOpenHandler: (handler) => win.webContents.setWindowOpenHandler(handler),\n      },\n    };\n  }\n}\n","import { Injectable, inject } from '@zeltjs/core';\nimport { ElectronWindowRuntimeService } from './electron-window-runtime.service';\nimport type { WindowDefinition, WindowHandle, WindowId } from './window.types';\n\n@Injectable()\nexport class ElectronWindowRegistryService {\n  private readonly windows = new Map<WindowId, WindowHandle>();\n\n  constructor(private readonly runtime = inject(ElectronWindowRuntimeService)) {}\n\n  open(definition: WindowDefinition): WindowHandle {\n    const existing = this.windows.get(definition.id);\n    if (existing && !existing.isDestroyed()) {\n      existing.focus();\n      return existing;\n    }\n\n    const handle = this.runtime.open(definition);\n    this.windows.set(definition.id, handle);\n\n    handle.on('closed', () => {\n      this.windows.delete(definition.id);\n    });\n\n    return handle;\n  }\n\n  close(id: WindowId): void {\n    const handle = this.windows.get(id);\n    if (handle && !handle.isDestroyed()) {\n      handle.close();\n    }\n  }\n\n  closeAll(): void {\n    for (const handle of this.windows.values()) {\n      if (!handle.isDestroyed()) {\n        handle.close();\n      }\n    }\n  }\n\n  count(): number {\n    return this.windows.size;\n  }\n}\n","import { getContext, runInContext, setContext } from '@zeltjs/core';\nimport type { IpcMainInvokeEvent } from 'electron';\nimport { match } from 'ts-pattern';\n\nimport type { IpcBody, IpcFetchRequest, IpcFetchResponse } from '../shared/ipc.types';\n\nconst BODY_FORBIDDEN_METHODS = new Set(['GET', 'HEAD']);\nconst NO_BODY_STATUSES = new Set([204, 205, 304]);\nconst TEXT_CONTENT_TYPE_PREFIXES = [\n  'text/',\n  'application/json',\n  'application/xml',\n  'application/javascript',\n  'application/x-www-form-urlencoded',\n];\n\nconst isTextContentType = (contentType: string): boolean =>\n  TEXT_CONTENT_TYPE_PREFIXES.some((prefix) => contentType.startsWith(prefix));\n\nconst toBody = (body: IpcBody): BodyInit | null =>\n  match(body)\n    .with({ kind: 'none' }, () => null)\n    .with({ kind: 'text' }, ({ value }) => value)\n    .with({ kind: 'arrayBuffer' }, ({ value }) => value)\n    .exhaustive();\n\nexport const toRequest = (payload: IpcFetchRequest, baseUrl: string): Request => {\n  const headers: [string, string][] = payload.headers.map(([k, v]) => [k, v]);\n  return new Request(baseUrl.replace(/\\/+$/, '') + payload.path, {\n    method: payload.method,\n    headers,\n    body: BODY_FORBIDDEN_METHODS.has(payload.method) ? null : toBody(payload.body),\n  });\n};\n\nexport const toIpcResponse = async (\n  response: Response,\n  method: string,\n): Promise<IpcFetchResponse> => {\n  const headers: [string, string][] = [];\n  response.headers.forEach((value, key) => {\n    headers.push([key, value]);\n  });\n\n  let body: IpcBody;\n  if (NO_BODY_STATUSES.has(response.status) || method === 'HEAD') {\n    body = { kind: 'none' };\n  } else {\n    const contentType = response.headers.get('content-type');\n    if (contentType && isTextContentType(contentType)) {\n      body = { kind: 'text', value: await response.text() };\n    } else {\n      body = { kind: 'arrayBuffer', value: await response.arrayBuffer() };\n    }\n  }\n\n  return {\n    status: response.status,\n    statusText: response.statusText,\n    headers,\n    body,\n  };\n};\n\ndeclare module '@zeltjs/core' {\n  interface RequestContextSchema {\n    ipcEvent: IpcMainInvokeEvent;\n  }\n}\n\ntype IpcMainLike = {\n  handle(\n    channel: string,\n    listener: (event: IpcMainInvokeEvent, payload: IpcFetchRequest) => unknown,\n  ): void;\n  removeHandler(channel: string): void;\n};\n\n/** @throws {ZeltContextNotAvailableError} */\nexport const ipcEvent = (): IpcMainInvokeEvent | undefined => getContext('ipcEvent');\n\n/** @throws {ZeltContextNotAvailableError} */\nexport const setupIpcBridge = (\n  ipcMain: IpcMainLike,\n  fetch: (request: Request) => Promise<Response>,\n  channel: string,\n): (() => void) => {\n  ipcMain.handle(channel, async (event, payload) =>\n    runInContext(async () => {\n      setContext('ipcEvent', event);\n      const request = toRequest(payload, channel);\n      const response = await fetch(request);\n      return toIpcResponse(response, payload.method);\n    }),\n  );\n\n  return () => {\n    ipcMain.removeHandler(channel);\n  };\n};\n","import type {\n  ConfiguredFeature,\n  CreateRuntimeOptions,\n  HttpCapabilities,\n  RuntimeApp,\n} from '@zeltjs/core';\nimport { ElectronAdaptor } from './electron.adaptor';\nimport { ElectronEnvAdaptor } from './electron-env.adaptor';\nimport { setupIpcBridge } from './ipc-bridge';\n\ntype IpcChannel = `http://${string}` | `https://${string}`;\n\nexport type ElectronAppOptions = {\n  readonly warmup?: boolean;\n  readonly ipcChannel?: IpcChannel;\n};\n\ntype HttpRuntimeApp = RuntimeApp<readonly ConfiguredFeature[]> & {\n  readonly http: HttpCapabilities;\n};\n\ntype HttpApp = {\n  readonly createRuntime: (options?: CreateRuntimeOptions) => Promise<HttpRuntimeApp>;\n};\n\nexport type OnElectronApp = {\n  readonly get: HttpRuntimeApp['get'];\n  readonly fetch: (request: Request) => Promise<Response>;\n  readonly shutdown: () => Promise<void>;\n};\n\nconst DEFAULT_IPC_CHANNEL = 'http://zelt-ipc';\n\n/** @throws {ZeltContextNotAvailableError} */\nexport const onElectron = async (\n  app: HttpApp,\n  options: ElectronAppOptions = {},\n): Promise<OnElectronApp> => {\n  const readyApp = await app.createRuntime({\n    fallbackConfigs: [ElectronEnvAdaptor],\n    warmup: options.warmup ?? true,\n  });\n\n  const electronApp = await readyApp.get(ElectronAdaptor);\n  const channel = options.ipcChannel ?? DEFAULT_IPC_CHANNEL;\n\n  const removeIpcHandler = setupIpcBridge(electronApp.ready.ipcMain, readyApp.http.fetch, channel);\n\n  return {\n    get: readyApp.get,\n    fetch: readyApp.http.fetch,\n    shutdown: async () => {\n      removeIpcHandler();\n      await readyApp.shutdown();\n    },\n  };\n};\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeltjs/adapter-electron",
-  "version": "0.8.2-canary.2",
+  "version": "0.9.0",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -49,7 +49,7 @@
   ],
   "dependencies": {
     "ts-pattern": "5.7.1",
-    "@zeltjs/core": "0.8.2-canary.2"
+    "@zeltjs/core": "0.9.0"
   },
   "devDependencies": {
     "@types/node": "22.19.17"