release

.nvmrc

@@ -0,0 +1 @@
+v22

apps/web/src/reader/streamer/archives.shared.ts

@@ -53,11 +53,16 @@ export const isPdfFile = (
   )
 }
 
+const getEncodingFormat = (
+  file: NonNullable<PromiseReturnType<typeof getBookFile>>,
+) => (file.data.type.length > 0 ? file.data.type : undefined)
+
 export const getArchiveForZipFile = async (
   file: NonNullable<PromiseReturnType<typeof getBookFile>>,
 ): Promise<Archive> => {
   try {
     const normalizedName = file.data.name.toLowerCase()
+    const encodingFormat = getEncodingFormat(file)
 
     if (
       isPotentialZipFile({ name: file.data.name, mimeType: file.data.type })
@@ -68,6 +73,7 @@ export const getArchiveForZipFile = async (
         return createArchiveFromJszip(jszip, {
           orderByAlpha: true,
           name: file.data.name,
+          encodingFormat,
         })
       } catch (e) {
         Logger.error(
@@ -80,7 +86,9 @@ export const getArchiveForZipFile = async (
     }
 
     if (normalizedName.endsWith(`.txt`)) {
-      return createArchiveFromText(file.data)
+      return createArchiveFromText(file.data, {
+        mimeType: encodingFormat ?? "text/plain",
+      })
     }
 
     throw new StreamerFileNotSupportedError(`FileNotSupportedError`)
@@ -107,5 +115,6 @@ export const getArchiveForRarFile = async (
   return createArchiveFromLibArchive(archive, {
     orderByAlpha: true,
     name: file.data.name,
+    encodingFormat: getEncodingFormat(file),
   })
 }

apps/web/src/reader/streamer/manifestHooks.shared.test.ts

@@ -35,22 +35,26 @@ const createManifest = ({
 })
 
 describe("readingDirectionManifestHook", () => {
-  it("defaults CBZ archives to RTL before spine hooks run", async () => {
+  it("applies an explicit direction directive over the current manifest value", async () => {
     const manifest = await readingDirectionManifestHook({
-      archive: createArchive("Book.CBZ"),
+      archive: createArchive("Book [oboku~direction~ltr].cbz"),
       baseUrl: "",
-    })(createManifest())
+    })(createManifest({ readingDirection: "rtl" }))
 
-    expect(manifest.readingDirection).toBe("rtl")
+    expect(manifest.readingDirection).toBe("ltr")
   })
 
-  it("uses explicit direction directives before CBZ defaults", async () => {
+  it("returns the manifest unchanged when no direction directive is present", async () => {
+    const input = createManifest({
+      filename: "Book.cbz",
+      readingDirection: undefined,
+    })
     const manifest = await readingDirectionManifestHook({
-      archive: createArchive("Book [oboku~direction~ltr].cbz"),
+      archive: createArchive("Book.cbz"),
       baseUrl: "",
-    })(createManifest({ readingDirection: "rtl" }))
+    })(input)
 
-    expect(manifest.readingDirection).toBe("ltr")
+    expect(manifest).toBe(input)
   })
 
   it("preserves existing direction for non-CBZ archives without directives", async () => {
@@ -61,6 +65,16 @@ describe("readingDirectionManifestHook", () => {
 
     expect(manifest.readingDirection).toBe("rtl")
   })
+
+  it("returns the manifest unchanged when the directive matches the current value", async () => {
+    const input = createManifest({ readingDirection: "ltr" })
+    const manifest = await readingDirectionManifestHook({
+      archive: createArchive("Book [oboku~direction~ltr].cbz"),
+      baseUrl: "",
+    })(input)
+
+    expect(manifest).toBe(input)
+  })
 })
 
 describe("webtoonManifestHook", () => {

apps/web/src/reader/streamer/manifestHooks.shared.ts

@@ -1,29 +1,11 @@
 import { directives } from "@oboku/shared"
 import type {
-  Archive,
   Manifest,
   StreamerManifestHookFactory,
 } from "@prose-reader/streamer"
 
 type SpineItem = Manifest["spineItems"][number]
 
-const isCbzArchive = (archive: Archive) =>
-  archive.filename.toLowerCase().endsWith(".cbz")
-
-const getReadingDirection = ({
-  archive,
-  manifest,
-}: {
-  archive: Archive
-  manifest: Manifest
-}): Manifest["readingDirection"] => {
-  const { direction } = directives.extractDirectivesFromName(archive.filename)
-
-  return (
-    direction ?? (isCbzArchive(archive) ? "rtl" : manifest.readingDirection)
-  )
-}
-
 const setWebtoonRenditionLayout = (spineItem: SpineItem): SpineItem => ({
   ...spineItem,
   renditionLayout: "reflowable",
@@ -32,15 +14,14 @@ const setWebtoonRenditionLayout = (spineItem: SpineItem): SpineItem => ({
 export const readingDirectionManifestHook: StreamerManifestHookFactory =
   ({ archive }) =>
   (manifest) => {
-    const readingDirection = getReadingDirection({ archive, manifest })
+    const { direction } = directives.extractDirectivesFromName(archive.filename)
 
-    if (readingDirection === manifest.readingDirection) {
-      return manifest
-    }
+    if (direction === undefined) return manifest
+    if (direction === manifest.readingDirection) return manifest
 
     return {
       ...manifest,
-      readingDirection,
+      readingDirection: direction,
     }
   }
 

apps/web/src/reader/streamer/swStreamer.sw.ts

@@ -16,7 +16,10 @@ import {
 export const swStreamer = new ServiceWorkerStreamer({
   hooks: {
     manifest: {
-      content: [readingDirectionManifestHook],
+      content: [
+        readingDirectionManifestHook,
+        ...cbzStreamerHooks.manifest.content,
+      ],
       spine: cbzStreamerHooks.manifest.spine,
       presentation: [webtoonManifestHook],
     },

apps/web/src/reader/streamer/webStreamer.ts

@@ -25,7 +25,10 @@ pdfjsLib.GlobalWorkerOptions.workerSrc = new URL(
 export const webStreamer = new Streamer({
   hooks: {
     manifest: {
-      content: [readingDirectionManifestHook],
+      content: [
+        readingDirectionManifestHook,
+        ...cbzStreamerHooks.manifest.content,
+      ],
       spine: cbzStreamerHooks.manifest.spine,
       presentation: [webtoonManifestHook],
     },