@prose-reader/react-native 8.0.0 → 9.0.0

package/dist/native/ReaderProvider.d.ts

@@ -11,7 +11,7 @@ export declare const ReaderContext: import('react').Context<{
     };
     ReaderWebView: import('react').ForwardRefExoticComponent<import('react-native-webview/lib/WebViewTypes').IOSWebViewProps & import('react-native-webview/lib/WebViewTypes').AndroidWebViewProps & import('react-native-webview/lib/WebViewTypes').WindowsWebViewProps & import('react').RefAttributes<import('@webview-bridge/react-native').BridgeWebView>>;
     appBridge: import('@webview-bridge/web').BridgeStore<import('.').BridgeState & import('.').BridgeMethods> & import('@webview-bridge/react-native').BridgeMiddlewareBuilder<import('.').BridgeState & import('.').BridgeMethods, object>;
-    load: (manifest: import('@prose-reader/shared').Manifest) => void;
+    load: (loadOptions: import('.').ReaderLoadOptions) => void;
 } | null | undefined>;
 export declare const useProseReaderContext: () => {
     webviewBridge: {
@@ -25,7 +25,7 @@ export declare const useProseReaderContext: () => {
     };
     ReaderWebView: import('react').ForwardRefExoticComponent<import('react-native-webview/lib/WebViewTypes').IOSWebViewProps & import('react-native-webview/lib/WebViewTypes').AndroidWebViewProps & import('react-native-webview/lib/WebViewTypes').WindowsWebViewProps & import('react').RefAttributes<import('@webview-bridge/react-native').BridgeWebView>>;
     appBridge: import('@webview-bridge/web').BridgeStore<import('.').BridgeState & import('.').BridgeMethods> & import('@webview-bridge/react-native').BridgeMiddlewareBuilder<import('.').BridgeState & import('.').BridgeMethods, object>;
-    load: (manifest: import('@prose-reader/shared').Manifest) => void;
+    load: (loadOptions: import('.').ReaderLoadOptions) => void;
 };
 export declare const ReaderProvider: ({ children, reader, }: {
     children: React.ReactNode;

package/dist/native/index.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../shared-C6TEX07M.cjs");let t=require("react"),n=require("@prose-reader/archive-reader"),r=require("expo-file-system"),i=require("@prose-reader/streamer"),a=require("react/jsx-runtime"),o=require("@webview-bridge/react-native");var s=e=>e.list().flatMap(e=>e instanceof r.Directory?[e,...s(e)]:[e]),c=async(e,{orderByAlpha:t,name:i}={})=>(0,n.createArchiveFromEntries)(s(e),e=>{let t=e.uri.replace(`file://`,``);return e instanceof r.Directory?{dir:!0,uri:t}:{dir:!1,uri:t,size:e.info().size??0,...(0,n.blobFileAccessors)(async()=>new Blob([await e.arrayBuffer()]))}},{orderByAlpha:t,name:i,close:()=>Promise.resolve()}),l=class extends i.Streamer{async fetchResourceAsData({key:e,resourcePath:t}){let n=await super.fetchResource({key:e,resourcePath:t});return{data:await n.text(),headers:Object.fromEntries(n.headers.entries())}}},u=(0,t.createContext)(void 0),d=()=>{let e=(0,t.useContext)(u);if(!e)throw Error(`useProseReader must be used within a ProseReaderProvider`);return e},f=({children:e,reader:t})=>(0,a.jsx)(u.Provider,{value:t,children:e}),p=n=>{let r=e.t(n),[i]=(0,t.useState)(()=>(0,o.bridge)(({set:e})=>({pagination:void 0,setPagination:async t=>{e({pagination:t})},context:void 0,setContext:async t=>{e({context:t})},async getResource(e){return r.current.getResource(e)}})));return i},m=(0,o.postMessageSchema)({load:{validate:e=>e},turnRight:{validate:()=>{}},turnLeft:{validate:()=>{}}}),h=e=>{let[n,r]=(0,t.useState)(void 0),i=p(e),a=n?.postMessage;(0,t.useEffect)(()=>{i&&r((0,o.createWebView)({bridge:i,debug:!0,postMessageSchema:m}))},[i]);let s=(0,t.useCallback)(e=>{a?.(`load`,{manifest:e})},[a]);return n?{webviewBridge:n,ReaderWebView:n.WebView,appBridge:i,load:s}:null},g=()=>{let{webviewBridge:e}=d(),{postMessage:t}=e;return{turnRight:()=>{t(`turnRight`,void 0)},turnLeft:()=>{t(`turnLeft`,void 0)}}},_=e=>{let{appBridge:t}=d();return(0,o.useBridge)(t,e)};exports.ReactNativeStreamer=l,exports.ReaderProvider=f,exports.createArchiveFromExpoFileSystemNext=c,exports.useCreateReader=h,exports.useLiveRef=e.t,exports.useReader=g,exports.useReaderState=_;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});const e=require("../shared-C6TEX07M.cjs");let t=require("react"),n=require("@prose-reader/archive-reader"),r=require("expo-file-system"),i=require("@prose-reader/streamer"),a=require("react/jsx-runtime"),o=require("@webview-bridge/react-native");var s=e=>e.list().flatMap(e=>e instanceof r.Directory?[e,...s(e)]:[e]),c=async(e,{orderByAlpha:t,name:i}={})=>(0,n.createArchiveFromEntries)(s(e),e=>{let t=e.uri.replace(`file://`,``);return e instanceof r.Directory?{dir:!0,uri:t}:{dir:!1,uri:t,size:e.info().size??0,...(0,n.blobFileAccessors)(async()=>new Blob([await e.arrayBuffer()]))}},{orderByAlpha:t,name:i,close:()=>Promise.resolve()}),l=class extends i.Streamer{async fetchResourceAsData({key:e,resourcePath:t}){let n=await super.fetchResource({key:e,resourcePath:t});return{data:await n.text(),headers:Object.fromEntries(n.headers.entries())}}},u=(0,t.createContext)(void 0),d=()=>{let e=(0,t.useContext)(u);if(!e)throw Error(`useProseReader must be used within a ProseReaderProvider`);return e},f=({children:e,reader:t})=>(0,a.jsx)(u.Provider,{value:t,children:e}),p={pagination:null,context:null,readingPosition:null},m=e=>{let t=0,n=(0,o.bridge)(({set:n})=>({...p,report:async(e,r)=>{e===t&&n(r)},getResource:e}));return{appBridge:n,startLoad:()=>(t+=1,n.setState(p),t)}},h=n=>{let r=e.t(n),[i]=(0,t.useState)(()=>m(e=>r.current.getResource(e)));return i},g=(0,o.postMessageSchema)({load:{validate:e=>e},turnRight:{validate:()=>{}},turnLeft:{validate:()=>{}}}),_=e=>{let[n,r]=(0,t.useState)(void 0),{appBridge:i,startLoad:a}=h(e),s=n?.postMessage;(0,t.useEffect)(()=>{i&&r((0,o.createWebView)({bridge:i,debug:!0,postMessageSchema:g}))},[i]);let c=(0,t.useCallback)(e=>{s&&s(`load`,{load:a(),options:e})},[s,a]);return n?{webviewBridge:n,ReaderWebView:n.WebView,appBridge:i,load:c}:null},v=()=>{let{webviewBridge:e}=d(),{postMessage:t}=e;return{turnRight:()=>{t(`turnRight`,void 0)},turnLeft:()=>{t(`turnLeft`,void 0)}}},y=e=>{let{appBridge:t}=d();return(0,o.useBridge)(t,e)};exports.ReactNativeStreamer=l,exports.ReaderProvider=f,exports.createArchiveFromExpoFileSystemNext=c,exports.useCreateReader=_,exports.useLiveRef=e.t,exports.useReader=v,exports.useReaderState=y;

package/dist/native/index.js

@@ -39,44 +39,51 @@ var h = (e) => e.list().flatMap((e) => e instanceof c ? [e, ...h(e)] : [e]), g =
 }, b = ({ children: e, reader: t }) => /* @__PURE__ */ u(v.Provider, {
 	value: t,
 	children: e
-}), x = (t) => {
-	let n = e(t), [r] = a(() => d(({ set: e }) => ({
-		pagination: void 0,
-		setPagination: async (t) => {
-			e({ pagination: t });
+}), x = {
+	pagination: null,
+	context: null,
+	readingPosition: null
+}, S = (e) => {
+	let t = 0, n = d(({ set: n }) => ({
+		...x,
+		report: async (e, r) => {
+			e === t && n(r);
 		},
-		context: void 0,
-		setContext: async (t) => {
-			e({ context: t });
-		},
-		async getResource(e) {
-			return n.current.getResource(e);
-		}
-	})));
+		getResource: e
+	}));
+	return {
+		appBridge: n,
+		startLoad: () => (t += 1, n.setState(x), t)
+	};
+}, C = (t) => {
+	let n = e(t), [r] = a(() => S((e) => n.current.getResource(e)));
 	return r;
-}, S = p({
+}, w = p({
 	load: { validate: (e) => e },
 	turnRight: { validate: () => {} },
 	turnLeft: { validate: () => {} }
-}), C = (e) => {
-	let [t, r] = a(void 0), o = x(e), s = t?.postMessage;
+}), T = (e) => {
+	let [t, r] = a(void 0), { appBridge: o, startLoad: s } = C(e), c = t?.postMessage;
 	i(() => {
 		o && r(f({
 			bridge: o,
 			debug: !0,
-			postMessageSchema: S
+			postMessageSchema: w
 		}));
 	}, [o]);
-	let c = n((e) => {
-		s?.("load", { manifest: e });
-	}, [s]);
+	let l = n((e) => {
+		c && c("load", {
+			load: s(),
+			options: e
+		});
+	}, [c, s]);
 	return t ? {
 		webviewBridge: t,
 		ReaderWebView: t.WebView,
 		appBridge: o,
-		load: c
+		load: l
 	} : null;
-}, w = () => {
+}, E = () => {
 	let { webviewBridge: e } = y(), { postMessage: t } = e;
 	return {
 		turnRight: () => {
@@ -86,9 +93,9 @@ var h = (e) => e.list().flatMap((e) => e instanceof c ? [e, ...h(e)] : [e]), g =
 			t("turnLeft", void 0);
 		}
 	};
-}, T = (e) => {
+}, D = (e) => {
 	let { appBridge: t } = y();
 	return m(t, e);
 };
 //#endregion
-export { _ as ReactNativeStreamer, b as ReaderProvider, g as createArchiveFromExpoFileSystemNext, C as useCreateReader, e as useLiveRef, w as useReader, T as useReaderState };
+export { _ as ReactNativeStreamer, b as ReaderProvider, g as createArchiveFromExpoFileSystemNext, T as useCreateReader, e as useLiveRef, E as useReader, D as useReaderState };

package/dist/native/useCreateReader.d.ts

@@ -1,5 +1,4 @@
-import { Manifest } from '@prose-reader/streamer';
-import { BridgeMethods, ProsePostMessageSchema } from '../shared';
+import { BridgeMethods, ProsePostMessageSchema, ReaderLoadOptions } from '../shared';
 export declare const appPostMessageSchema: ProsePostMessageSchema;
 export declare const useCreateReader: (options: BridgeMethods) => {
     webviewBridge: {
@@ -13,5 +12,5 @@ export declare const useCreateReader: (options: BridgeMethods) => {
     };
     ReaderWebView: import('react').ForwardRefExoticComponent<import('react-native-webview/lib/WebViewTypes').IOSWebViewProps & import('react-native-webview/lib/WebViewTypes').AndroidWebViewProps & import('react-native-webview/lib/WebViewTypes').WindowsWebViewProps & import('react').RefAttributes<import('@webview-bridge/react-native').BridgeWebView>>;
     appBridge: import('@webview-bridge/web').BridgeStore<import('.').BridgeState & BridgeMethods> & import('@webview-bridge/react-native').BridgeMiddlewareBuilder<import('.').BridgeState & BridgeMethods, object>;
-    load: (manifest: Manifest) => void;
+    load: (loadOptions: ReaderLoadOptions) => void;
 } | null;

package/dist/native/useProseBridge.d.ts

@@ -1,2 +1,13 @@
 import { BridgeMethods, BridgeState } from '../shared';
-export declare const useProseBridge: (options: BridgeMethods) => import('@webview-bridge/web').BridgeStore<BridgeState & BridgeMethods> & import('@webview-bridge/react-native').BridgeMiddlewareBuilder<BridgeState & BridgeMethods, object>;
+/**
+ * The native end of the bridge: the store the web side reports its reader's
+ * state into, and `startLoad`, which every `load` goes through.
+ */
+export declare const createProseBridge: (getResource: BridgeMethods["getResource"]) => {
+    appBridge: import('@webview-bridge/web').BridgeStore<BridgeState & BridgeMethods> & import('@webview-bridge/react-native').BridgeMiddlewareBuilder<BridgeState & BridgeMethods, object>;
+    startLoad: () => number;
+};
+export declare const useProseBridge: (options: BridgeMethods) => {
+    appBridge: import('@webview-bridge/web').BridgeStore<BridgeState & BridgeMethods> & import('@webview-bridge/react-native').BridgeMiddlewareBuilder<BridgeState & BridgeMethods, object>;
+    startLoad: () => number;
+};

package/dist/shared/index.d.ts

@@ -1,12 +1,33 @@
-import { ContextState, createReader, EnhancerPaginationInfo, Manifest } from '@prose-reader/core';
+import { ContextState, createReader, EnhancerPaginationInfo } from '@prose-reader/core';
 import { Bridge, BridgeStore } from '@webview-bridge/react-native';
 type ReaderOptions = Parameters<typeof createReader>[0];
 type RnContextState = Omit<ContextState, "rootElement">;
-export interface BridgeState extends Bridge {
-    pagination: EnhancerPaginationInfo | undefined;
-    setPagination: (pagination: EnhancerPaginationInfo) => Promise<void>;
-    context: RnContextState | undefined;
-    setContext: (context: RnContextState) => Promise<void>;
+/**
+ * What the native side decides about the reader a `load` creates: the book,
+ * and where to open it. They are the reader options that cross the bridge,
+ * named as the reader names them, so the web side's factory spreads them into
+ * the rest.
+ */
+export type ReaderLoadOptions = Pick<ReaderOptions, "manifest" | "cfi">;
+/**
+ * What the web side reports of the reader of the book last loaded. Each value
+ * is `null` until that reader has reported it: `null` rather than `undefined`
+ * because the bridge store drops `undefined` values, so a `load` could not
+ * clear the previous book's otherwise.
+ */
+export type ReaderState = {
+    pagination: EnhancerPaginationInfo | null;
+    context: RnContextState | null;
+    readingPosition: string | null;
+};
+export interface BridgeState extends Bridge, ReaderState {
+    /**
+     * Called by the web side with part of its reader's state, and the `load`
+     * that reader was created for. A report for any `load` but the latest is
+     * dropped: the previous reader's can still be crossing the bridge when the
+     * next `load` starts.
+     */
+    report: (load: number, state: Partial<ReaderState>) => Promise<void>;
 }
 export type BridgeMethods = {
     getResource: (resource: Parameters<NonNullable<ReaderOptions["getResource"]>>[0]) => Promise<{
@@ -15,11 +36,17 @@ export type BridgeMethods = {
     }>;
 };
 export type ProseBridgeStore = BridgeStore<BridgeMethods & BridgeState>;
+/**
+ * A `load` as it crosses the bridge: the options of the reader to create, and
+ * which load it is, for the web side to tag that reader's reports with.
+ */
+export type ReaderLoadMessage = {
+    load: number;
+    options: ReaderLoadOptions;
+};
 export type ProsePostMessageSchema = {
     load: {
-        validate: (data: unknown) => {
-            manifest: Manifest;
-        };
+        validate: (data: unknown) => ReaderLoadMessage;
     };
     turnRight: {
         validate: () => void;

package/dist/web/index.cjs

@@ -1 +1 @@
-Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});let e=require("@webview-bridge/web"),t=require("rxjs");var n=()=>(0,e.linkBridge)({onReady:async()=>{}}),r=({bridge:e,createReader:n,containerElement:r})=>{let i;return e.addEventListener(`load`,a=>{i?.subscription.unsubscribe(),i?.reader.destroy(),i=void 0;let o=n(a.manifest),s=new t.Subscription;s.add(o.pagination.state$.subscribe(t=>{e.setPagination(t)})),s.add(o.context.subscribe(({rootElement:t,...n})=>{e.setContext(n)})),i={reader:o,subscription:s},o.mount(r)}),e.addEventListener(`turnRight`,()=>{i?.reader.navigation.turnRight()}),e.addEventListener(`turnLeft`,()=>{i?.reader.navigation.turnLeft()}),{getReader:()=>i?.reader}};exports.bridgeReader=r,exports.createReaderBridge=n;
+Object.defineProperty(exports,Symbol.toStringTag,{value:`Module`});let e=require("@webview-bridge/web"),t=require("rxjs");var n=()=>(0,e.linkBridge)({onReady:async()=>{}}),r=({bridge:e,createReader:n,containerElement:r})=>{let i;return e.addEventListener(`load`,({load:a,options:{manifest:o,cfi:s}})=>{i?.subscription.unsubscribe(),i?.reader.destroy(),i=void 0;let c=n({manifest:o,cfi:s}),l=new t.Subscription;i={reader:c,subscription:l},c.mount(r);let u=(0,t.merge)(c.pagination.state$.pipe((0,t.map)(e=>({pagination:e}))),c.context.pipe((0,t.map)(({rootElement:e,...t})=>({context:t}))),c.navigation.readingPosition$.pipe((0,t.map)(e=>({readingPosition:e}))));l.add(u.subscribe(t=>{e.report(a,t)}))}),e.addEventListener(`turnRight`,()=>{i?.reader.navigation.turnRight()}),e.addEventListener(`turnLeft`,()=>{i?.reader.navigation.turnLeft()}),{getReader:()=>i?.reader}};exports.bridgeReader=r,exports.createReaderBridge=n;

package/dist/web/index.d.ts

@@ -1,5 +1,5 @@
-import { Manifest, Reader } from '@prose-reader/core';
-import { ProseBridgeStore, ProsePostMessageSchema } from '../shared';
+import { Reader } from '@prose-reader/core';
+import { ProseBridgeStore, ProsePostMessageSchema, ReaderLoadOptions } from '../shared';
 export type ReaderBridgeController = {
     /**
      * The reader currently rendering, or `undefined` before the first `load`
@@ -10,11 +10,12 @@ export type ReaderBridgeController = {
 export declare const createReaderBridge: () => import('@webview-bridge/web').LinkBridge<import('@webview-bridge/web').ExcludePrimitive<import('../shared').BridgeMethods & import('../shared').BridgeState>, Omit<ProseBridgeStore, "setState">, ProsePostMessageSchema>;
 export declare const bridgeReader: ({ bridge, createReader, containerElement, }: {
     /**
-     * Factory invoked for every `load` event coming from the native side.
+     * Factory invoked for every `load` event coming from the native side, with
+     * the options that event carries: the manifest, and the cfi to open at.
      * A reader renders a single book: a subsequent `load` destroys the
-     * previous reader and creates a fresh one from the new manifest.
+     * previous reader and creates a fresh one from the new options.
      */
-    createReader: (manifest: Manifest) => Reader;
+    createReader: (options: ReaderLoadOptions) => Reader;
     bridge: ReturnType<typeof createReaderBridge>;
     containerElement: HTMLElement;
 }) => ReaderBridgeController;

package/dist/web/index.js

@@ -1,24 +1,27 @@
 import { linkBridge as e } from "@webview-bridge/web";
-import { Subscription as t } from "rxjs";
+import { Subscription as t, map as n, merge as r } from "rxjs";
 //#region src/web/index.ts
-var n = () => e({ onReady: async () => {} }), r = ({ bridge: e, createReader: n, containerElement: r }) => {
-	let i;
-	return e.addEventListener("load", (a) => {
-		i?.subscription.unsubscribe(), i?.reader.destroy(), i = void 0;
-		let o = n(a.manifest), s = new t();
-		s.add(o.pagination.state$.subscribe((t) => {
-			e.setPagination(t);
-		})), s.add(o.context.subscribe(({ rootElement: t, ...n }) => {
-			e.setContext(n);
-		})), i = {
-			reader: o,
-			subscription: s
-		}, o.mount(r);
+var i = () => e({ onReady: async () => {} }), a = ({ bridge: e, createReader: i, containerElement: a }) => {
+	let o;
+	return e.addEventListener("load", ({ load: s, options: { manifest: c, cfi: l } }) => {
+		o?.subscription.unsubscribe(), o?.reader.destroy(), o = void 0;
+		let u = i({
+			manifest: c,
+			cfi: l
+		}), d = new t();
+		o = {
+			reader: u,
+			subscription: d
+		}, u.mount(a);
+		let f = r(u.pagination.state$.pipe(n((e) => ({ pagination: e }))), u.context.pipe(n(({ rootElement: e, ...t }) => ({ context: t }))), u.navigation.readingPosition$.pipe(n((e) => ({ readingPosition: e }))));
+		d.add(f.subscribe((t) => {
+			e.report(s, t);
+		}));
 	}), e.addEventListener("turnRight", () => {
-		i?.reader.navigation.turnRight();
+		o?.reader.navigation.turnRight();
 	}), e.addEventListener("turnLeft", () => {
-		i?.reader.navigation.turnLeft();
-	}), { getReader: () => i?.reader };
+		o?.reader.navigation.turnLeft();
+	}), { getReader: () => o?.reader };
 };
 //#endregion
-export { r as bridgeReader, n as createReaderBridge };
+export { a as bridgeReader, i as createReaderBridge };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prose-reader/react-native",
-  "version": "8.0.0",
+  "version": "9.0.0",
   "type": "module",
   "main": "./dist/native/index.cjs",
   "module": "./dist/native/index.js",
@@ -43,10 +43,10 @@
     "react-native-webview": "13.16.1"
   },
   "peerDependencies": {
-    "@prose-reader/archive-reader": "^8.0.0",
-    "@prose-reader/core": "^8.0.0",
-    "@prose-reader/shared": "^8.0.0",
-    "@prose-reader/streamer": "^8.0.0",
+    "@prose-reader/archive-reader": "^9.0.0",
+    "@prose-reader/core": "^9.0.0",
+    "@prose-reader/shared": "^9.0.0",
+    "@prose-reader/streamer": "^9.0.0",
     "@webview-bridge/react-native": "^1.7.7",
     "@webview-bridge/web": "^1.7.7",
     "expo-file-system": "^57.0.0",
@@ -54,5 +54,5 @@
     "react-native-webview": "*",
     "rxjs": "*"
   },
-  "gitHead": "cfc670ec834d430705ef883f594462b46163f822"
+  "gitHead": "a6468f8544e71e5b7be80bcc5b657ec3a30da16c"
 }