Skip to content

Commit d52ae96

Browse files
janzhengjanzheng
committed
cache and rate fix
1 parent 012b2c5 commit d52ae96

File tree

5 files changed

+106
-44
lines changed

5 files changed

+106
-44
lines changed

‎src/api/notion.ts‎

Lines changed: 54 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
import {
23
JSONData,
34
NotionUserType,
@@ -22,23 +23,34 @@ const loadPageChunkBody = {
2223
verticalColumns: false,
2324
};
2425

26+
let ctr=0
27+
28+
const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
29+
2530
const fetchNotionData = async <T extends any>({
2631
resource,
2732
body,
2833
notionToken,
2934
}: INotionParams): Promise<T> => {
30-
const res = await fetch(`${NOTION_API}/${resource}`, {
31-
method: "POST",
32-
headers: {
33-
"content-type": "application/json",
34-
...(notionToken && { cookie: `token_v2=${notionToken}` }),
35-
},
36-
37-
body: JSON.stringify(body),
38-
});
35+
try {
36+
console.log('------ fetching notion data?', resource, body, ctr++)
37+
const res = await fetch(`${NOTION_API}/${resource}`, {
38+
method: "POST",
39+
headers: {
40+
"content-type": "application/json",
41+
...(notionToken && { cookie: `token_v2=${notionToken}` }),
42+
},
3943

40-
let json = await res.json()
41-
return json;
44+
body: JSON.stringify(body),
45+
});
46+
47+
let json = await res.json()
48+
// await delay(1000);
49+
return json;
50+
} catch(e) {
51+
console.error('fetchNotionData error:', e, e.message)
52+
throw new Error('Failed to pull data from Notion')
53+
}
4254
};
4355

4456
export const fetchPageById = async (pageId: string, notionToken?: string) => {
@@ -102,25 +114,25 @@ export const fetchNotionUsers = async (
102114
userIds: string[],
103115
notionToken?: string
104116
) => {
105-
const users = await fetchNotionData<{ results: NotionUserType[] }>({
106-
resource: "getRecordValues",
107-
body: {
108-
requests: userIds.map((id) => ({ id, table: "notion_user" })),
109-
},
110-
notionToken,
111-
});
112-
if (users && users.results) {
113-
return users.results.map((u) => {
114-
const user = {
115-
id: u.value.id,
116-
firstName: u.value.given_name,
117-
lastLame: u.value.family_name,
118-
fullName: u.value.given_name + " " + u.value.family_name,
119-
profilePhoto: u.value.profile_photo,
120-
};
121-
return user;
122-
});
123-
}
117+
// const users = await fetchNotionData<{ results: NotionUserType[] }>({
118+
// resource: "getRecordValues",
119+
// body: {
120+
// requests: userIds.map((id) => ({ id, table: "notion_user" })),
121+
// },
122+
// notionToken,
123+
// });
124+
// if (users && users.results) {
125+
// return users.results.map((u) => {
126+
// const user = {
127+
// id: u.value.id,
128+
// firstName: u.value.given_name,
129+
// lastLame: u.value.family_name,
130+
// fullName: u.value.given_name + " " + u.value.family_name,
131+
// profilePhoto: u.value.profile_photo,
132+
// };
133+
// return user;
134+
// });
135+
// }
124136
return [];
125137
};
126138

@@ -131,12 +143,18 @@ export const fetchBlocks = async (
131143
return await fetchNotionData<LoadPageChunkData>({
132144
resource: "syncRecordValues",
133145
body: {
134-
recordVersionMap: {
135-
block: blockList.reduce((obj, blockId) => {
136-
obj[blockId] = -1;
137-
return obj;
138-
}, {} as { [key: string]: -1 }),
139-
},
146+
// recordVersionMap: {
147+
// block: blockList.reduce((obj, blockId) => {
148+
// obj[blockId] = -1;
149+
// return obj;
150+
// }, {} as { [key: string]: -1 }),
151+
// },
152+
153+
requests: blockList.map((id) => ({
154+
id,
155+
table: "block",
156+
version: -1,
157+
})),
140158
},
141159
notionToken,
142160
});

‎src/index.ts‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {} from "@cloudflare/workers-types";
1+
// import {} from "@cloudflare/workers-types";
22
import { Router, Method } from "tiny-request-router";
33

44
import { pageRoute } from "./routes/page";
@@ -48,9 +48,22 @@ router.get("*", async () =>
4848
)
4949
);
5050

51-
const cache = (caches as any).default;
52-
const NOTION_API_TOKEN =
53-
typeof NOTION_TOKEN !== "undefined" ? NOTION_TOKEN : undefined;
51+
52+
53+
54+
// const match = router.match('GET' as Method, '/foobar')
55+
// if (match) {
56+
// // Call the async function of that match
57+
// const response = await match.handler()
58+
// console.log(response) // => Response('Hello')
59+
// }
60+
61+
62+
63+
//cf-only cache
64+
const cache = undefined; // (caches as any).default;
65+
const NOTION_API_TOKEN = process.env.NOTION_TOKEN // not implemented yet — use .env later
66+
// typeof env.NOTION_TOKEN !== "undefined" ? NOTION_TOKEN : undefined;
5467

5568
const handleRequest = async (fetchEvent: FetchEvent): Promise<Response> => {
5669
const request = fetchEvent.request;
@@ -83,7 +96,7 @@ const handleRequest = async (fetchEvent: FetchEvent): Promise<Response> => {
8396
notionToken,
8497
});
8598

86-
if (cacheKey) {
99+
if (cache && cacheKey) {
87100
await cache.put(cacheKey, res.clone());
88101
}
89102

‎src/routes/collection.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export async function collectionRoute(req: HandlerRequest) {
143143
let _op = filter.operator // "string_contains" etc.
144144
let _type = filter.value && filter.value.type // "exact"
145145
let _text = filter.value && filter.value.value // text matching against; "filter text"
146-
let column = tableProps.find(c=>c.property==property)
146+
let column = tableProps.find((c: any)=>c.property==property)
147147

148148
switch (_op) {
149149
case 'string_contains':
@@ -177,7 +177,7 @@ export async function collectionRoute(req: HandlerRequest) {
177177
tableData.rows = tableData.rows.filter((row:any)=> row[column.name] && row[column.name].includes(_text))
178178
break;
179179
case 'enum_does_not_contain':
180-
tableData.rows = tableData.rows.filter(row=> {
180+
tableData.rows = tableData.rows.filter((row: any)=> {
181181
return !row[column.name] || (!row[column.name].includes(_text))
182182
})
183183
break;

‎webpack.config.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ module.exports = {
2323
transpileOnly: true,
2424
},
2525
},
26-
{ enforce: "pre", test: /\.js$/, loader: "source-map-loader" },
2726
],
2827
},
2928
optimization: {

‎webpack.config_old.js‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/* eslint-disable @typescript-eslint/no-var-requires */
2+
const path = require("path");
3+
4+
const mode = process.env.NODE_ENV || "production";
5+
6+
module.exports = {
7+
output: {
8+
filename: `worker.${mode}.js`,
9+
path: path.join(__dirname, "dist"),
10+
},
11+
target: "webworker",
12+
devtool: "source-map",
13+
mode,
14+
resolve: {
15+
extensions: [".ts", ".js"],
16+
},
17+
module: {
18+
rules: [
19+
{
20+
test: /\.tsx?$/,
21+
loader: "ts-loader",
22+
options: {
23+
transpileOnly: true,
24+
},
25+
},
26+
{ enforce: "pre", test: /\.js$/, loader: "source-map-loader" },
27+
],
28+
},
29+
optimization: {
30+
usedExports: true,
31+
},
32+
};

0 commit comments

Comments
 (0)