data-of-loathing 4.3.0 → 4.3.1

package/dist/browser.js

@@ -220,14 +220,22 @@ var Client = class extends BaseClient {
           })
         );
         const { force = false } = strategy;
-        const remoteEtag = (await fetch(url, { method: "HEAD" })).headers.get(
-          "etag"
-        );
-        const storedEtag = force ? null : await getOpfsEtag();
-        if (force || storedEtag !== remoteEtag) {
-          const buffer = await this.fetchDb(url);
-          await writeToOpfs("dol.sqlite", buffer);
-          if (remoteEtag) await setOpfsEtag(remoteEtag);
+        const storedEtag = await getOpfsEtag();
+        try {
+          const remoteEtag = (await fetch(url, { method: "HEAD" })).headers.get("etag");
+          const effectiveStored = force ? null : storedEtag;
+          if (force || effectiveStored !== remoteEtag) {
+            const buffer = await this.fetchDb(url);
+            await writeToOpfs("dol.sqlite", buffer);
+            if (remoteEtag) await setOpfsEtag(remoteEtag);
+          }
+        } catch (e) {
+          if (!storedEtag)
+            throw new Error(`Failed to fetch database and no cached version exists. ${e}`);
+          console.warn(
+            "data-of-loathing: could not contact server to check for updates. Serving cached database which may be outdated.",
+            e
+          );
         }
         await this.#dialect.loadOpfs("/dol.sqlite");
         break;

package/dist/browser.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/browser.ts","../src/SqliteWorkerDialect.ts"],"sourcesContent":["import { SqlMikroORM, SqliteDriver } from \"@mikro-orm/sql\";\nimport { entities } from \"./schema.js\";\nimport { SqliteWorkerDialect } from \"./SqliteWorkerDialect.js\";\nimport { BaseClient, DEFAULT_URL, ETAG_KEY } from \"./BaseClient.js\";\n\nexport type Strategy =\n  | { strategy?: \"memory\"; url?: string; force?: boolean }\n  | { strategy: \"opfs\"; url?: string; force?: boolean }\n  | { strategy: \"ranged\"; url?: string };\n\nasync function getOpfsEtag(): Promise<string | null> {\n  try {\n    const root = await navigator.storage.getDirectory();\n    const handle = await root.getFileHandle(\".dol-etag\");\n    return (await handle.getFile()).text();\n  } catch {\n    return null;\n  }\n}\n\nasync function setOpfsEtag(etag: string): Promise<void> {\n  const root = await navigator.storage.getDirectory();\n  const handle = await root.getFileHandle(\".dol-etag\", { create: true });\n  const writable = await handle.createWritable();\n  await writable.write(etag);\n  await writable.close();\n}\n\nasync function writeToOpfs(\n  filename: string,\n  buffer: ArrayBuffer,\n): Promise<void> {\n  const root = await navigator.storage.getDirectory();\n  const handle = await root.getFileHandle(filename, { create: true });\n  const writable = await handle.createWritable();\n  await writable.write(buffer);\n  await writable.close();\n}\n\nexport class Client extends BaseClient<Strategy> {\n  #dialect?: SqliteWorkerDialect;\n\n  constructor(strategy: Strategy = {}) {\n    super(strategy);\n  }\n\n  protected async getStoredEtag(_key: string): Promise<string | null> {\n    return localStorage.getItem(ETAG_KEY);\n  }\n\n  protected async storeEtag(_key: string, etag: string): Promise<void> {\n    localStorage.setItem(ETAG_KEY, etag);\n  }\n\n  async load(): Promise<void> {\n    await this._orm?.close();\n    this.#dialect?.createDriver().destroy();\n\n    const strategy = this._strategy;\n    const url = this._strategy.url ?? DEFAULT_URL;\n\n    switch (strategy.strategy) {\n      case \"ranged\": {\n        this.#dialect = new SqliteWorkerDialect(\n          new Worker(new URL(\"./workers/ranged.js\", import.meta.url), {\n            type: \"module\",\n          }),\n        );\n        await this.#dialect.loadRanged(url);\n        break;\n      }\n      case \"opfs\": {\n        this.#dialect = new SqliteWorkerDialect(\n          new Worker(new URL(\"./workers/opfs.js\", import.meta.url), {\n            type: \"module\",\n          }),\n        );\n        const { force = false } = strategy;\n        const remoteEtag = (await fetch(url, { method: \"HEAD\" })).headers.get(\n          \"etag\",\n        );\n        const storedEtag = force ? null : await getOpfsEtag();\n\n        if (force || storedEtag !== remoteEtag) {\n          const buffer = await this.fetchDb(url);\n          await writeToOpfs(\"dol.sqlite\", buffer);\n          if (remoteEtag) await setOpfsEtag(remoteEtag);\n        }\n\n        await this.#dialect.loadOpfs(\"/dol.sqlite\");\n        break;\n      }\n      case \"memory\":\n      default: {\n        this.#dialect = new SqliteWorkerDialect(\n          new Worker(new URL(\"./workers/memory.js\", import.meta.url), {\n            type: \"module\",\n          }),\n        );\n        const { force = false } = strategy;\n        const response = await fetch(url, {\n          cache: force ? \"reload\" : \"default\",\n        });\n        if (!response.ok)\n          throw new Error(`Failed to fetch database: ${response.status}`);\n        const buffer = await response.arrayBuffer();\n        await this.#dialect.loadMemory(buffer);\n      }\n    }\n\n    this._orm = await SqlMikroORM.init({\n      driver: SqliteDriver,\n      driverOptions: this.#dialect,\n      dbName: \"dol.sqlite\",\n      entities,\n      allowGlobalContext: true,\n    });\n  }\n}\n\nexport function createClient(strategy: Strategy = {}): Client {\n  return new Client(strategy);\n}\n\nexport * from \"./schema.js\";\n","import { type SqlValue } from \"@sqlite.org/sqlite-wasm\";\nimport {\n  SqliteAdapter,\n  SqliteIntrospector,\n  SqliteQueryCompiler,\n  type CompiledQuery,\n  type DatabaseConnection,\n  type DatabaseIntrospector,\n  type Dialect,\n  type DialectAdapter,\n  type Driver,\n  type Kysely,\n  type QueryCompiler,\n  type QueryResult,\n} from \"kysely\";\n\ntype WorkerResponse =\n  | { id: string; type: \"loaded\" }\n  | { id: string; type: \"exec\"; rows: Record<string, SqlValue>[] }\n  | { id: string; type: \"error\"; error: string };\n\nexport class SqliteWorkerDialect implements Dialect {\n  readonly #worker: Worker;\n  readonly #pending = new Map<\n    string,\n    {\n      resolve: (value: Record<string, SqlValue>[] | undefined) => void;\n      reject: (err: Error) => void;\n    }\n  >();\n  #nextId = 0;\n\n  constructor(worker: Worker) {\n    this.#worker = worker;\n    this.#worker.onmessage = (event: MessageEvent<WorkerResponse>) => {\n      const pending = this.#pending.get(event.data.id);\n      if (!pending) return;\n      this.#pending.delete(event.data.id);\n      if (event.data.type === \"error\") {\n        pending.reject(new Error(event.data.error));\n      } else if (event.data.type === \"exec\") {\n        pending.resolve(event.data.rows);\n      } else {\n        pending.resolve(undefined);\n      }\n    };\n  }\n\n  #send<T>(message: object, transfer?: Transferable[]): Promise<T> {\n    const id = String(++this.#nextId);\n    const promise = new Promise<T>((resolve, reject) => {\n      this.#pending.set(id, { resolve: (v) => resolve(v as T), reject });\n    });\n    this.#worker.postMessage({ ...message, id }, transfer ?? []);\n    return promise;\n  }\n\n  loadMemory(buffer: ArrayBuffer): Promise<void> {\n    return this.#send<void>({ type: \"load\", buffer }, [buffer]);\n  }\n\n  loadOpfs(filename: string): Promise<void> {\n    return this.#send<void>({ type: \"load\", filename });\n  }\n\n  loadRanged(url: string): Promise<void> {\n    return this.#send<void>({ type: \"load\", url });\n  }\n\n  createDriver(): Driver {\n    const dialect = this;\n    const connection: DatabaseConnection = {\n      executeQuery<O>(query: CompiledQuery): Promise<QueryResult<O>> {\n        return dialect\n          .#send<\n            O[]\n          >({ type: \"exec\", sql: query.sql, bind: [...query.parameters] })\n          .then((rows) => ({ rows }));\n      },\n      async *streamQuery() {\n        throw new Error(\"Streaming not supported\");\n      },\n    };\n    return {\n      async init() {},\n      async acquireConnection() {\n        return connection;\n      },\n      async beginTransaction() {},\n      async commitTransaction() {},\n      async rollbackTransaction() {},\n      async releaseConnection() {},\n      async destroy() {\n        dialect.#worker.terminate();\n      },\n    };\n  }\n\n  createQueryCompiler(): QueryCompiler {\n    return new SqliteQueryCompiler();\n  }\n\n  createAdapter(): DialectAdapter {\n    return new SqliteAdapter();\n  }\n\n  createIntrospector(db: Kysely<any>): DatabaseIntrospector {\n    return new SqliteIntrospector(db);\n  }\n}\n"],"mappings":"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","names":[]}
+{"version":3,"sources":["../src/browser.ts","../src/SqliteWorkerDialect.ts"],"sourcesContent":["import { SqlMikroORM, SqliteDriver } from \"@mikro-orm/sql\";\nimport { entities } from \"./schema.js\";\nimport { SqliteWorkerDialect } from \"./SqliteWorkerDialect.js\";\nimport { BaseClient, DEFAULT_URL, ETAG_KEY } from \"./BaseClient.js\";\n\nexport type Strategy =\n  | { strategy?: \"memory\"; url?: string; force?: boolean }\n  | { strategy: \"opfs\"; url?: string; force?: boolean }\n  | { strategy: \"ranged\"; url?: string };\n\nasync function getOpfsEtag(): Promise<string | null> {\n  try {\n    const root = await navigator.storage.getDirectory();\n    const handle = await root.getFileHandle(\".dol-etag\");\n    return (await handle.getFile()).text();\n  } catch {\n    return null;\n  }\n}\n\nasync function setOpfsEtag(etag: string): Promise<void> {\n  const root = await navigator.storage.getDirectory();\n  const handle = await root.getFileHandle(\".dol-etag\", { create: true });\n  const writable = await handle.createWritable();\n  await writable.write(etag);\n  await writable.close();\n}\n\nasync function writeToOpfs(\n  filename: string,\n  buffer: ArrayBuffer,\n): Promise<void> {\n  const root = await navigator.storage.getDirectory();\n  const handle = await root.getFileHandle(filename, { create: true });\n  const writable = await handle.createWritable();\n  await writable.write(buffer);\n  await writable.close();\n}\n\nexport class Client extends BaseClient<Strategy> {\n  #dialect?: SqliteWorkerDialect;\n\n  constructor(strategy: Strategy = {}) {\n    super(strategy);\n  }\n\n  protected async getStoredEtag(_key: string): Promise<string | null> {\n    return localStorage.getItem(ETAG_KEY);\n  }\n\n  protected async storeEtag(_key: string, etag: string): Promise<void> {\n    localStorage.setItem(ETAG_KEY, etag);\n  }\n\n  async load(): Promise<void> {\n    await this._orm?.close();\n    this.#dialect?.createDriver().destroy();\n\n    const strategy = this._strategy;\n    const url = this._strategy.url ?? DEFAULT_URL;\n\n    switch (strategy.strategy) {\n      case \"ranged\": {\n        this.#dialect = new SqliteWorkerDialect(\n          new Worker(new URL(\"./workers/ranged.js\", import.meta.url), {\n            type: \"module\",\n          }),\n        );\n        await this.#dialect.loadRanged(url);\n        break;\n      }\n      case \"opfs\": {\n        this.#dialect = new SqliteWorkerDialect(\n          new Worker(new URL(\"./workers/opfs.js\", import.meta.url), {\n            type: \"module\",\n          }),\n        );\n        const { force = false } = strategy;\n        const storedEtag = await getOpfsEtag();\n\n        try {\n          const remoteEtag = (await fetch(url, { method: \"HEAD\" })).headers.get(\"etag\");\n          const effectiveStored = force ? null : storedEtag;\n\n          if (force || effectiveStored !== remoteEtag) {\n            const buffer = await this.fetchDb(url);\n            await writeToOpfs(\"dol.sqlite\", buffer);\n            if (remoteEtag) await setOpfsEtag(remoteEtag);\n          }\n        } catch (e) {\n          if (!storedEtag)\n            throw new Error(`Failed to fetch database and no cached version exists. ${e}`);\n          console.warn(\n            \"data-of-loathing: could not contact server to check for updates. Serving cached database which may be outdated.\",\n            e,\n          );\n        }\n\n        await this.#dialect.loadOpfs(\"/dol.sqlite\");\n        break;\n      }\n      case \"memory\":\n      default: {\n        this.#dialect = new SqliteWorkerDialect(\n          new Worker(new URL(\"./workers/memory.js\", import.meta.url), {\n            type: \"module\",\n          }),\n        );\n        const { force = false } = strategy;\n        const response = await fetch(url, {\n          cache: force ? \"reload\" : \"default\",\n        });\n        if (!response.ok)\n          throw new Error(`Failed to fetch database: ${response.status}`);\n        const buffer = await response.arrayBuffer();\n        await this.#dialect.loadMemory(buffer);\n      }\n    }\n\n    this._orm = await SqlMikroORM.init({\n      driver: SqliteDriver,\n      driverOptions: this.#dialect,\n      dbName: \"dol.sqlite\",\n      entities,\n      allowGlobalContext: true,\n    });\n  }\n}\n\nexport function createClient(strategy: Strategy = {}): Client {\n  return new Client(strategy);\n}\n\nexport * from \"./schema.js\";\n","import { type SqlValue } from \"@sqlite.org/sqlite-wasm\";\nimport {\n  SqliteAdapter,\n  SqliteIntrospector,\n  SqliteQueryCompiler,\n  type CompiledQuery,\n  type DatabaseConnection,\n  type DatabaseIntrospector,\n  type Dialect,\n  type DialectAdapter,\n  type Driver,\n  type Kysely,\n  type QueryCompiler,\n  type QueryResult,\n} from \"kysely\";\n\ntype WorkerResponse =\n  | { id: string; type: \"loaded\" }\n  | { id: string; type: \"exec\"; rows: Record<string, SqlValue>[] }\n  | { id: string; type: \"error\"; error: string };\n\nexport class SqliteWorkerDialect implements Dialect {\n  readonly #worker: Worker;\n  readonly #pending = new Map<\n    string,\n    {\n      resolve: (value: Record<string, SqlValue>[] | undefined) => void;\n      reject: (err: Error) => void;\n    }\n  >();\n  #nextId = 0;\n\n  constructor(worker: Worker) {\n    this.#worker = worker;\n    this.#worker.onmessage = (event: MessageEvent<WorkerResponse>) => {\n      const pending = this.#pending.get(event.data.id);\n      if (!pending) return;\n      this.#pending.delete(event.data.id);\n      if (event.data.type === \"error\") {\n        pending.reject(new Error(event.data.error));\n      } else if (event.data.type === \"exec\") {\n        pending.resolve(event.data.rows);\n      } else {\n        pending.resolve(undefined);\n      }\n    };\n  }\n\n  #send<T>(message: object, transfer?: Transferable[]): Promise<T> {\n    const id = String(++this.#nextId);\n    const promise = new Promise<T>((resolve, reject) => {\n      this.#pending.set(id, { resolve: (v) => resolve(v as T), reject });\n    });\n    this.#worker.postMessage({ ...message, id }, transfer ?? []);\n    return promise;\n  }\n\n  loadMemory(buffer: ArrayBuffer): Promise<void> {\n    return this.#send<void>({ type: \"load\", buffer }, [buffer]);\n  }\n\n  loadOpfs(filename: string): Promise<void> {\n    return this.#send<void>({ type: \"load\", filename });\n  }\n\n  loadRanged(url: string): Promise<void> {\n    return this.#send<void>({ type: \"load\", url });\n  }\n\n  createDriver(): Driver {\n    const dialect = this;\n    const connection: DatabaseConnection = {\n      executeQuery<O>(query: CompiledQuery): Promise<QueryResult<O>> {\n        return dialect\n          .#send<\n            O[]\n          >({ type: \"exec\", sql: query.sql, bind: [...query.parameters] })\n          .then((rows) => ({ rows }));\n      },\n      async *streamQuery() {\n        throw new Error(\"Streaming not supported\");\n      },\n    };\n    return {\n      async init() {},\n      async acquireConnection() {\n        return connection;\n      },\n      async beginTransaction() {},\n      async commitTransaction() {},\n      async rollbackTransaction() {},\n      async releaseConnection() {},\n      async destroy() {\n        dialect.#worker.terminate();\n      },\n    };\n  }\n\n  createQueryCompiler(): QueryCompiler {\n    return new SqliteQueryCompiler();\n  }\n\n  createAdapter(): DialectAdapter {\n    return new SqliteAdapter();\n  }\n\n  createIntrospector(db: Kysely<any>): DatabaseIntrospector {\n    return new SqliteIntrospector(db);\n  }\n}\n"],"mappings":"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","names":[]}

package/dist/node.js

@@ -105,14 +105,23 @@ var Client = class extends BaseClient {
         const dbPath = join(cacheDir, "dol.sqlite");
         const etagPath = join(cacheDir, "etag");
         await mkdir(cacheDir, { recursive: true });
-        await this.syncIfNeeded(
-          url,
-          etagPath,
-          async (data) => {
-            await writeFile(dbPath, Buffer.from(data));
-          },
-          force
-        );
+        try {
+          await this.syncIfNeeded(
+            url,
+            etagPath,
+            async (data) => {
+              await writeFile(dbPath, Buffer.from(data));
+            },
+            force
+          );
+        } catch (e) {
+          if (!existsSync(dbPath))
+            throw new Error(`Failed to fetch database and no cached version exists. ${e}`);
+          console.warn(
+            "data-of-loathing: could not contact server to check for updates. Serving cached database which may be outdated.",
+            e
+          );
+        }
         return dbPath;
       }
     }

package/dist/node.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/node.ts"],"sourcesContent":["import { existsSync } from \"node:fs\";\nimport { mkdir, readFile, writeFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport envPaths from \"env-paths\";\nimport { SqlMikroORM, SqliteDriver, NodeSqliteDialect } from \"@mikro-orm/sql\";\nimport { entities } from \"./schema.js\";\nimport { BaseClient, DEFAULT_URL } from \"./BaseClient.js\";\n\nexport type Strategy =\n  | { strategy?: \"url\"; url?: string; force?: boolean }\n  | { strategy: \"local\"; path: string };\n\nexport class Client extends BaseClient<Strategy> {\n  constructor(strategy: Strategy = {}) {\n    super(strategy);\n  }\n\n  protected async getStoredEtag(key: string): Promise<string | null> {\n    return existsSync(key) ? readFile(key, \"utf-8\") : null;\n  }\n\n  protected async storeEtag(key: string, etag: string): Promise<void> {\n    await writeFile(key, etag, \"utf-8\");\n  }\n\n  private async resolveDbPath(): Promise<string> {\n    const strategy = this._strategy;\n    switch (strategy.strategy) {\n      case \"local\":\n        return strategy.path;\n\n      default:\n      case \"url\": {\n        const { url = DEFAULT_URL, force = false } = strategy;\n\n        const cacheDir = envPaths(\"data-of-loathing\").cache;\n        const dbPath = join(cacheDir, \"dol.sqlite\");\n        const etagPath = join(cacheDir, \"etag\");\n        await mkdir(cacheDir, { recursive: true });\n\n        await this.syncIfNeeded(\n          url,\n          etagPath,\n          async (data) => {\n            await writeFile(dbPath, Buffer.from(data));\n          },\n          force,\n        );\n\n        return dbPath;\n      }\n    }\n  }\n\n  async load(): Promise<void> {\n    await this._orm?.close();\n    const path = await this.resolveDbPath();\n    this._orm = await SqlMikroORM.init({\n      driver: SqliteDriver,\n      driverOptions: new NodeSqliteDialect(path),\n      dbName: path,\n      entities,\n      allowGlobalContext: true,\n    });\n  }\n}\n\nexport function createClient(strategy: Strategy = {}): Client {\n  return new Client(strategy);\n}\n\nexport * from \"./schema.js\";\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAS,kBAAkB;AAC3B,SAAS,OAAO,UAAU,iBAAiB;AAC3C,SAAS,YAAY;AACrB,OAAO,cAAc;AACrB,SAAS,aAAa,cAAc,yBAAyB;AAQtD,IAAM,SAAN,cAAqB,WAAqB;AAAA,EAC/C,YAAY,WAAqB,CAAC,GAAG;AACnC,UAAM,QAAQ;AAAA,EAChB;AAAA,EAEA,MAAgB,cAAc,KAAqC;AACjE,WAAO,WAAW,GAAG,IAAI,SAAS,KAAK,OAAO,IAAI;AAAA,EACpD;AAAA,EAEA,MAAgB,UAAU,KAAa,MAA6B;AAClE,UAAM,UAAU,KAAK,MAAM,OAAO;AAAA,EACpC;AAAA,EAEA,MAAc,gBAAiC;AAC7C,UAAM,WAAW,KAAK;AACtB,YAAQ,SAAS,UAAU;AAAA,MACzB,KAAK;AACH,eAAO,SAAS;AAAA,MAElB;AAAA,MACA,KAAK,OAAO;AACV,cAAM,EAAE,MAAM,aAAa,QAAQ,MAAM,IAAI;AAE7C,cAAM,WAAW,SAAS,kBAAkB,EAAE;AAC9C,cAAM,SAAS,KAAK,UAAU,YAAY;AAC1C,cAAM,WAAW,KAAK,UAAU,MAAM;AACtC,cAAM,MAAM,UAAU,EAAE,WAAW,KAAK,CAAC;AAEzC,cAAM,KAAK;AAAA,UACT;AAAA,UACA;AAAA,UACA,OAAO,SAAS;AACd,kBAAM,UAAU,QAAQ,OAAO,KAAK,IAAI,CAAC;AAAA,UAC3C;AAAA,UACA;AAAA,QACF;AAEA,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,OAAsB;AAC1B,UAAM,KAAK,MAAM,MAAM;AACvB,UAAM,OAAO,MAAM,KAAK,cAAc;AACtC,SAAK,OAAO,MAAM,YAAY,KAAK;AAAA,MACjC,QAAQ;AAAA,MACR,eAAe,IAAI,kBAAkB,IAAI;AAAA,MACzC,QAAQ;AAAA,MACR;AAAA,MACA,oBAAoB;AAAA,IACtB,CAAC;AAAA,EACH;AACF;AAEO,SAAS,aAAa,WAAqB,CAAC,GAAW;AAC5D,SAAO,IAAI,OAAO,QAAQ;AAC5B;","names":[]}
+{"version":3,"sources":["../src/node.ts"],"sourcesContent":["import { existsSync } from \"node:fs\";\nimport { mkdir, readFile, writeFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport envPaths from \"env-paths\";\nimport { SqlMikroORM, SqliteDriver, NodeSqliteDialect } from \"@mikro-orm/sql\";\nimport { entities } from \"./schema.js\";\nimport { BaseClient, DEFAULT_URL } from \"./BaseClient.js\";\n\nexport type Strategy =\n  | { strategy?: \"url\"; url?: string; force?: boolean }\n  | { strategy: \"local\"; path: string };\n\nexport class Client extends BaseClient<Strategy> {\n  constructor(strategy: Strategy = {}) {\n    super(strategy);\n  }\n\n  protected async getStoredEtag(key: string): Promise<string | null> {\n    return existsSync(key) ? readFile(key, \"utf-8\") : null;\n  }\n\n  protected async storeEtag(key: string, etag: string): Promise<void> {\n    await writeFile(key, etag, \"utf-8\");\n  }\n\n  private async resolveDbPath(): Promise<string> {\n    const strategy = this._strategy;\n    switch (strategy.strategy) {\n      case \"local\":\n        return strategy.path;\n\n      default:\n      case \"url\": {\n        const { url = DEFAULT_URL, force = false } = strategy;\n\n        const cacheDir = envPaths(\"data-of-loathing\").cache;\n        const dbPath = join(cacheDir, \"dol.sqlite\");\n        const etagPath = join(cacheDir, \"etag\");\n        await mkdir(cacheDir, { recursive: true });\n\n        try {\n          await this.syncIfNeeded(\n            url,\n            etagPath,\n            async (data) => {\n              await writeFile(dbPath, Buffer.from(data));\n            },\n            force,\n          );\n        } catch (e) {\n          if (!existsSync(dbPath))\n            throw new Error(`Failed to fetch database and no cached version exists. ${e}`);\n          console.warn(\n            \"data-of-loathing: could not contact server to check for updates. Serving cached database which may be outdated.\",\n            e,\n          );\n        }\n\n        return dbPath;\n      }\n    }\n  }\n\n  async load(): Promise<void> {\n    await this._orm?.close();\n    const path = await this.resolveDbPath();\n    this._orm = await SqlMikroORM.init({\n      driver: SqliteDriver,\n      driverOptions: new NodeSqliteDialect(path),\n      dbName: path,\n      entities,\n      allowGlobalContext: true,\n    });\n  }\n}\n\nexport function createClient(strategy: Strategy = {}): Client {\n  return new Client(strategy);\n}\n\nexport * from \"./schema.js\";\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,SAAS,kBAAkB;AAC3B,SAAS,OAAO,UAAU,iBAAiB;AAC3C,SAAS,YAAY;AACrB,OAAO,cAAc;AACrB,SAAS,aAAa,cAAc,yBAAyB;AAQtD,IAAM,SAAN,cAAqB,WAAqB;AAAA,EAC/C,YAAY,WAAqB,CAAC,GAAG;AACnC,UAAM,QAAQ;AAAA,EAChB;AAAA,EAEA,MAAgB,cAAc,KAAqC;AACjE,WAAO,WAAW,GAAG,IAAI,SAAS,KAAK,OAAO,IAAI;AAAA,EACpD;AAAA,EAEA,MAAgB,UAAU,KAAa,MAA6B;AAClE,UAAM,UAAU,KAAK,MAAM,OAAO;AAAA,EACpC;AAAA,EAEA,MAAc,gBAAiC;AAC7C,UAAM,WAAW,KAAK;AACtB,YAAQ,SAAS,UAAU;AAAA,MACzB,KAAK;AACH,eAAO,SAAS;AAAA,MAElB;AAAA,MACA,KAAK,OAAO;AACV,cAAM,EAAE,MAAM,aAAa,QAAQ,MAAM,IAAI;AAE7C,cAAM,WAAW,SAAS,kBAAkB,EAAE;AAC9C,cAAM,SAAS,KAAK,UAAU,YAAY;AAC1C,cAAM,WAAW,KAAK,UAAU,MAAM;AACtC,cAAM,MAAM,UAAU,EAAE,WAAW,KAAK,CAAC;AAEzC,YAAI;AACF,gBAAM,KAAK;AAAA,YACT;AAAA,YACA;AAAA,YACA,OAAO,SAAS;AACd,oBAAM,UAAU,QAAQ,OAAO,KAAK,IAAI,CAAC;AAAA,YAC3C;AAAA,YACA;AAAA,UACF;AAAA,QACF,SAAS,GAAG;AACV,cAAI,CAAC,WAAW,MAAM;AACpB,kBAAM,IAAI,MAAM,0DAA0D,CAAC,EAAE;AAC/E,kBAAQ;AAAA,YACN;AAAA,YACA;AAAA,UACF;AAAA,QACF;AAEA,eAAO;AAAA,MACT;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAM,OAAsB;AAC1B,UAAM,KAAK,MAAM,MAAM;AACvB,UAAM,OAAO,MAAM,KAAK,cAAc;AACtC,SAAK,OAAO,MAAM,YAAY,KAAK;AAAA,MACjC,QAAQ;AAAA,MACR,eAAe,IAAI,kBAAkB,IAAI;AAAA,MACzC,QAAQ;AAAA,MACR;AAAA,MACA,oBAAoB;AAAA,IACtB,CAAC;AAAA,EACH;AACF;AAEO,SAAS,aAAa,WAAqB,CAAC,GAAW;AAC5D,SAAO,IAAI,OAAO,QAAQ;AAC5B;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-of-loathing",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "type": "module",
   "packageManager": "yarn@4.6.0",
   "repository": {