diff --git a/examples/v0.77.0/package.json b/examples/v0.77.0/package.json index c2ade3fb..56b50a21 100644 --- a/examples/v0.77.0/package.json +++ b/examples/v0.77.0/package.json @@ -19,7 +19,7 @@ "@babel/preset-env": "^7.25.3", "@babel/runtime": "^7.25.0", "@hot-updater/aws": "0.6.5", - "@hot-updater/cloudflare": "0.6.0", + "@hot-updater/cloudflare": "0.6.5", "@hot-updater/metro": "0.6.5", "@hot-updater/supabase": "0.6.5", "@react-native-community/cli": "15.0.1", diff --git a/plugins/cloudflare/package.json b/plugins/cloudflare/package.json index bd6d6139..4df71e06 100644 --- a/plugins/cloudflare/package.json +++ b/plugins/cloudflare/package.json @@ -48,7 +48,7 @@ "@hot-updater/core": "0.6.5", "@hot-updater/js": "0.6.5", "@hot-updater/plugin-core": "0.6.5", - "cloudflare": "^4.0.0" + "cloudflare": "4.1.0" }, "devDependencies": { "@cloudflare/vitest-pool-workers": "^0.6.4", diff --git a/plugins/cloudflare/src/d1Database.ts b/plugins/cloudflare/src/d1Database.ts index f0d020c6..102917e9 100644 --- a/plugins/cloudflare/src/d1Database.ts +++ b/plugins/cloudflare/src/d1Database.ts @@ -112,18 +112,19 @@ export const d1Database = /* sql */ ` SELECT * FROM bundles WHERE id = ? LIMIT 1`, ); - const [response] = await cf.d1.database.query(config.databaseId, { + const singlePage = await cf.d1.database.query(config.databaseId, { account_id: config.accountId, sql, params: [bundleId], }); - if (!response.success) { - return null; + const rows = [] as SnakeCaseBundle[]; + for await (const page of singlePage.iterPages()) { + const data = page.result.flatMap((r) => r.results); + rows.push(...(data as SnakeCaseBundle[])); } - const rows = response.results as SnakeCaseBundle[]; - if (!rows?.length) { + if (rows.length === 0) { return null; } @@ -163,19 +164,18 @@ export const d1Database = `, ); - const [response] = await cf.d1.database.query(config.databaseId, { + const singlePage = await cf.d1.database.query(config.databaseId, { account_id: config.accountId, sql, params: [], }); - - if (!response.success) { - bundles = []; - return bundles; + const rows = [] as SnakeCaseBundle[]; + for await (const page of singlePage.iterPages()) { + const data = page.result.flatMap((r) => r.results); + rows.push(...(data as SnakeCaseBundle[])); } - const rows = response.results as SnakeCaseBundle[]; - if (!rows?.length) { + if (rows.length === 0) { bundles = []; } else { bundles = rows.map((row) => ({ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 278ba8b9..585bfada 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -709,8 +709,8 @@ importers: specifier: workspace:* version: link:../plugin-core cloudflare: - specifier: ^4.0.0 - version: 4.0.0(encoding@0.1.13) + specifier: 4.1.0 + version: 4.1.0(encoding@0.1.13) devDependencies: '@cloudflare/vitest-pool-workers': specifier: ^0.6.4 @@ -5861,8 +5861,8 @@ packages: resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==} engines: {node: '>=0.8'} - cloudflare@4.0.0: - resolution: {integrity: sha512-0o3rUVLTZoHKcM+83UbkeeFdWdsaEaF2e8QA7e8hNwTku8EwO14JoYyeBF+DJZnRdnoJGPbAjA9lDKQ7f6ylUg==} + cloudflare@4.1.0: + resolution: {integrity: sha512-TySwSEGGQhuVHFVjKRUHkzZum0MSGJkgfVjep+KBJxuxScEvjoTckQFbxlYThPp5kLm8IUi4C7oJeVr5e9etVw==} clsx@2.0.0: resolution: {integrity: sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==} @@ -18438,7 +18438,7 @@ snapshots: clone@1.0.4: {} - cloudflare@4.0.0(encoding@0.1.13): + cloudflare@4.1.0(encoding@0.1.13): dependencies: '@types/node': 18.19.33 '@types/node-fetch': 2.6.12