Misc

Author: cmdcolin

eslint.config.mjs

@@ -47,8 +47,9 @@ export default defineConfig(
       ],
       'no-underscore-dangle': 'off',
       curly: 'error',
+      eqeqeq: 'error',
       '@typescript-eslint/consistent-type-imports': 'error',
-      '@typescript-eslint/no-explicit-any': 'warn',
+      '@typescript-eslint/no-explicit-any': 'error',
       '@typescript-eslint/ban-ts-comment': [
         'error',
         { 'ts-expect-error': 'allow-with-description', 'ts-ignore': true },
@@ -61,7 +62,6 @@ export default defineConfig(
       'unicorn/prefer-node-protocol': 'off',
       'unicorn/no-unreadable-array-destructuring': 'off',
       'unicorn/text-encoding-identifier-case': 'off',
-      'unicorn/no-abusive-eslint-disable': 'off',
       'unicorn/no-array-callback-reference': 'off',
       'unicorn/number-literal-case': 'off',
       'unicorn/prefer-add-event-listener': 'off',
@@ -71,7 +71,6 @@ export default defineConfig(
       'unicorn/no-lonely-if': 'off',
       'unicorn/consistent-destructuring': 'off',
       'unicorn/prefer-module': 'off',
-      'unicorn/prefer-optional-catch-binding': 'off',
       'unicorn/no-useless-undefined': 'off',
       'unicorn/no-null': 'off',
       'unicorn/no-nested-ternary': 'off',
@@ -80,7 +79,6 @@ export default defineConfig(
       'unicorn/prevent-abbreviations': 'off',
       'unicorn/prefer-code-point': 'off',
       'unicorn/numeric-separators-style': 'off',
-      'unicorn/no-array-for-each': 'off',
       'unicorn/prefer-spread': 'off',
       'unicorn/explicit-length-check': 'off',
       'unicorn/prefer-regexp-test': 'off',
@@ -97,13 +95,7 @@ export default defineConfig(
       'unicorn/no-process-exit': 'off',
       'unicorn/prefer-at': 'off',
       'unicorn/prefer-blob-reading-methods': 'off',
-      '@typescript-eslint/no-unsafe-member-access': 'off',
-      '@typescript-eslint/no-unsafe-argument': 'off',
-      '@typescript-eslint/no-unsafe-assignment': 'off',
-      '@typescript-eslint/no-unsafe-call': 'off',
-      '@typescript-eslint/no-unsafe-return': 'off',
-      '@typescript-eslint/prefer-nullish-coalescing': 'off',
-      '@typescript-eslint/require-await': 'off',
+      '@typescript-eslint/prefer-nullish-coalescing': 'error',
       '@typescript-eslint/restrict-template-expressions': 'off',
       '@typescript-eslint/no-base-to-string': 'off',
       '@typescript-eslint/no-unnecessary-type-parameters': 'off',

src/blobFile.ts

@@ -64,11 +64,11 @@ export default class BlobFile implements GenericFilehandle {
     }
   }
 
-  public async stat(): Promise<Stats> {
-    return { size: this.blob.size }
+  public stat(): Promise<Stats> {
+    return Promise.resolve({ size: this.blob.size })
   }
 
-  public async close(): Promise<void> {
-    return
+  public close(): Promise<void> {
+    return Promise.resolve()
   }
 }

src/filehandle.ts

@@ -18,23 +18,10 @@ export type Fetcher = (
   init?: RequestInit,
 ) => Promise<Response>
 
-export type RequestOverrides = Omit<RequestInit, 'headers'> & {
-  headers?: Record<string, string>
-}
-
 export interface FilehandleOptions {
-  /**
-   * optional AbortSignal object for aborting the request
-   */
   signal?: AbortSignal
   headers?: Record<string, string>
-  overrides?: RequestOverrides
   encoding?: BufferEncoding
-  /**
-   * fetch function to use for HTTP requests. defaults to environment's
-   * global fetch. if there is no global fetch, and a fetch function is not provided,
-   * throws an error.
-   */
   fetch?: Fetcher
 }
 

src/remoteFile.ts

@@ -3,14 +3,16 @@ import type {
   Fetcher,
   FilehandleOptions,
   GenericFilehandle,
-  RequestOverrides,
   Stats,
 } from './filehandle.ts'
 
 function getMessage(e: unknown) {
   const r =
-    typeof e === 'object' && e !== null && 'message' in e
-      ? (e.message as string)
+    typeof e === 'object' &&
+    e !== null &&
+    'message' in e &&
+    typeof e.message === 'string'
+      ? e.message
       : `${e}`
   return r.replace(/\.$/, '')
 }
@@ -19,15 +21,15 @@ export default class RemoteFile implements GenericFilehandle {
   protected url: string
   private _stat?: Stats
   private fetchImplementation: Fetcher
-  private baseOverrides: RequestOverrides = {}
+  private baseHeaders: Record<string, string>
 
   public constructor(source: string, opts: FilehandleOptions = {}) {
     this.url = source
-    const fetch = opts.fetch || globalThis.fetch.bind(globalThis)
-    if (opts.overrides) {
-      this.baseOverrides = opts.overrides
-    }
-    this.fetchImplementation = fetch
+    this.baseHeaders = opts.headers ?? {}
+    this.fetchImplementation =
+      opts.fetch ??
+      ((input: RequestInfo, init?: RequestInit) =>
+        globalThis.fetch(input, init))
   }
 
   public async fetch(
@@ -77,20 +79,14 @@ export default class RemoteFile implements GenericFilehandle {
         `read() called with NaN length or position (length=${length}, position=${position}). The index file may be corrupt.`,
       )
     }
-    const { headers = {}, signal, overrides = {} } = opts
+    const { headers = {}, signal } = opts
     if (length < Infinity) {
       headers.range = `bytes=${position}-${position + length - 1}`
     } else if (length === Infinity && position !== 0) {
       headers.range = `bytes=${position}-`
     }
     const res = await this.fetch(this.url, {
-      ...this.baseOverrides,
-      ...overrides,
-      headers: {
-        ...this.baseOverrides.headers,
-        ...overrides.headers,
-        ...headers,
-      },
+      headers: { ...this.baseHeaders, ...headers },
       method: 'GET',
       redirect: 'follow',
       mode: 'cors',
@@ -104,7 +100,7 @@ export default class RemoteFile implements GenericFilehandle {
     if ((res.status === 200 && position === 0) || res.status === 206) {
       // try to parse out the size of the remote file
       const contentRange = res.headers.get('content-range')
-      const sizeMatch = /\/(\d+)$/.exec(contentRange || '')
+      const sizeMatch = /\/(\d+)$/.exec(contentRange ?? '')
       if (sizeMatch?.[1]) {
         this._stat = {
           size: parseInt(sizeMatch[1], 10),
@@ -145,25 +141,11 @@ export default class RemoteFile implements GenericFilehandle {
   public async readFile(
     options: FilehandleOptions | BufferEncoding = {},
   ): Promise<Uint8Array<ArrayBuffer> | string> {
-    let encoding
-    let opts
-    if (typeof options === 'string') {
-      encoding = options
-      opts = {}
-    } else {
-      encoding = options.encoding
-      const { encoding: _, ...rest } = options
-      opts = rest
-    }
-    const { headers = {}, signal, overrides = {} } = opts
+    const encoding = typeof options === 'string' ? options : options.encoding
+    const opts = typeof options === 'string' ? {} : options
+    const { headers = {}, signal } = opts
     const res = await this.fetch(this.url, {
-      ...this.baseOverrides,
-      ...overrides,
-      headers: {
-        ...this.baseOverrides.headers,
-        ...overrides.headers,
-        ...headers,
-      },
+      headers: { ...this.baseHeaders, ...headers },
       method: 'GET',
       redirect: 'follow',
       mode: 'cors',
@@ -193,7 +175,7 @@ export default class RemoteFile implements GenericFilehandle {
     return this._stat
   }
 
-  public async close(): Promise<void> {
-    return
+  public close(): Promise<void> {
+    return Promise.resolve()
   }
 }

test/auth.test.ts

@@ -19,21 +19,21 @@ function createResponse(
     status,
     headers: {
       get(name: string) {
-        return headers[name] || null
+        return headers[name] ?? null
       },
     },
-    arrayBuffer: async () => {
+    arrayBuffer: () => {
       if (typeof body === 'string') {
         const encoder = new TextEncoder()
-        return encoder.encode(body).buffer
+        return Promise.resolve(encoder.encode(body).buffer)
       }
-      return body.buffer
+      return Promise.resolve(body.buffer)
     },
-    text: async () => {
+    text: () => {
       if (typeof body === 'string') {
-        return body
+        return Promise.resolve(body)
       }
-      return toString(body)
+      return Promise.resolve(toString(body))
     },
   }
 }
@@ -43,7 +43,7 @@ let mockFetch: (input: RequestInfo, init?: RequestInit) => Promise<Response>
 
 beforeEach(() => {
   // Reset the mock fetch implementation before each test
-  mockFetch = vi.fn().mockImplementation(async (url: string) => {
+  mockFetch = vi.fn().mockImplementation((url: string) => {
     throw new Error(`Unhandled fetch request to ${url}`)
   })
 })
@@ -56,7 +56,7 @@ test('auth token', async () => {
   mockFetch = vi
     .fn()
     .mockImplementation(
-      async (_url: string, args: { headers: Record<string, string> }) => {
+      (_url: string, args: { headers: Record<string, string> }) => {
         return args.headers.Authorization
           ? createResponse('hello world', 200)
           : createResponse('Unauthorized', 403)
@@ -65,10 +65,8 @@ test('auth token', async () => {
 
   const f = new RemoteFile('http://fakehost/test.txt', {
     fetch: mockFetch,
-    overrides: {
-      headers: {
-        Authorization: 'Basic YWxhZGRpbjpvcGVuc2VzYW1l',
-      },
+    headers: {
+      Authorization: 'Basic YWxhZGRpbjpvcGVuc2VzYW1l',
     },
   })
   const stat = await f.readFile('utf8')
@@ -79,7 +77,7 @@ test('auth token with range request', async () => {
   mockFetch = vi
     .fn()
     .mockImplementation(
-      async (_url: string, args: { headers: Record<string, string> }) => {
+      (_url: string, args: { headers: Record<string, string> }) => {
         if (args.headers.Authorization && args.headers.range) {
           return createResponse('hello', 206)
         } else if (!args.headers.Authorization) {
@@ -93,10 +91,8 @@ test('auth token with range request', async () => {
 
   const f = new RemoteFile('http://fakehost/test.txt', {
     fetch: mockFetch,
-    overrides: {
-      headers: {
-        Authorization: 'Basic YWxhZGRpbjpvcGVuc2VzYW1l',
-      },
+    headers: {
+      Authorization: 'Basic YWxhZGRpbjpvcGVuc2VzYW1l',
     },
   })
   const buffer = await f.read(5, 0)