Skip to content

Commit 0ab5c9a

Browse files
luxassluxass
authored
Merge pull request #145 from mojisdev/change-proxy-endpoints
2 parents a626a79 + d9062ba commit 0ab5c9a

12 files changed

Lines changed: 61 additions & 54 deletions

File tree

‎.changeset/wicked-rivers-move.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@mojis/adapters": patch
3+
"@mojis/versions": patch
4+
"@mojis/parsers": patch
5+
---
6+
7+
switch proxy endpoint

‎packages/adapters/src/handlers/source/metadata.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const handler = builder
6161
return builder
6262
.urls((ctx) => {
6363
return {
64-
url: `https://unicode-proxy.ucdjs.dev/proxy/emoji/${ctx.emoji_version}/emoji-test.txt`,
64+
url: `https://unicode-proxy.ucdjs.dev/emoji/${ctx.emoji_version}/emoji-test.txt`,
6565
cacheKey: `v${ctx.emoji_version}/metadata`,
6666
};
6767
})

‎packages/adapters/src/handlers/source/sequences.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ export const handler = builder
7272
return [
7373
{
7474
key: "sequences",
75-
url: `https://unicode-proxy.ucdjs.dev/proxy/emoji/${emoji_version}/emoji-sequences.txt`,
75+
url: `https://unicode-proxy.ucdjs.dev/emoji/${emoji_version}/emoji-sequences.txt`,
7676
cacheKey: `v${emoji_version}/sequences`,
7777
},
7878
{
7979
key: "zwj",
80-
url: `https://unicode-proxy.ucdjs.dev/proxy/emoji/${emoji_version}/emoji-zwj-sequences.txt`,
80+
url: `https://unicode-proxy.ucdjs.dev/emoji/${emoji_version}/emoji-zwj-sequences.txt`,
8181
cacheKey: `v${emoji_version}/zwj-sequences`,
8282
},
8383
];

‎packages/adapters/src/handlers/source/unicode-names.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { createSourceAdapter } from "../../builders/source-builder/builder";
33
import { joinPath } from "../../utils";
44

55
const MAPPINGS = {
6-
"1.0": "https://unicode-proxy.ucdjs.dev/proxy/1.1-Update/UnicodeData-1.1.5.txt",
7-
"2.0": "https://unicode-proxy.ucdjs.dev/proxy/2.0-Update/UnicodeData-2.0.14.txt",
8-
"3.0": "https://unicode-proxy.ucdjs.dev/proxy/3.0-Update1/UnicodeData-3.0.1.txt",
9-
"4.0": "https://unicode-proxy.ucdjs.dev/proxy/4.0-Update1/UnicodeData-4.0.1.txt",
10-
"13.1": "https://unicode-proxy.ucdjs.dev/proxy/13.0.0/ucd/UnicodeData.txt",
6+
"1.0": "https://unicode-proxy.ucdjs.dev/1.1-Update/UnicodeData-1.1.5.txt",
7+
"2.0": "https://unicode-proxy.ucdjs.dev/2.0-Update/UnicodeData-2.0.14.txt",
8+
"3.0": "https://unicode-proxy.ucdjs.dev/3.0-Update1/UnicodeData-3.0.1.txt",
9+
"4.0": "https://unicode-proxy.ucdjs.dev/4.0-Update1/UnicodeData-4.0.1.txt",
10+
"13.1": "https://unicode-proxy.ucdjs.dev/13.0.0/ucd/UnicodeData.txt",
1111
} as Record<string, string>;
1212

1313
const builder = createSourceAdapter({
@@ -38,7 +38,7 @@ export const handler = builder
3838
(builder) => builder
3939
.urls((ctx) => {
4040
return {
41-
url: MAPPINGS[ctx.emoji_version] || `https://unicode-proxy.ucdjs.dev/proxy/${ctx.emoji_version}.0/ucd/UnicodeData.txt`,
41+
url: MAPPINGS[ctx.emoji_version] || `https://unicode-proxy.ucdjs.dev/${ctx.emoji_version}.0/ucd/UnicodeData.txt`,
4242
cacheKey: `v${ctx.emoji_version}/unicode-names`,
4343
};
4444
})

‎packages/adapters/src/handlers/source/variations.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ export const handler = builder
3131
.urls((ctx) => {
3232
if (lte(ctx.unicode_version, "12.1")) {
3333
return {
34-
url: `https://unicode-proxy.ucdjs.dev/proxy/emoji/${ctx.emoji_version}/emoji-variation-sequences.txt`,
34+
url: `https://unicode-proxy.ucdjs.dev/emoji/${ctx.emoji_version}/emoji-variation-sequences.txt`,
3535
cacheKey: `v${ctx.emoji_version}/variations`,
3636
};
3737
}
3838

3939
return {
40-
url: `https://unicode-proxy.ucdjs.dev/proxy/${ctx.unicode_version}.0/ucd/emoji/emoji-variation-sequences.txt`,
40+
url: `https://unicode-proxy.ucdjs.dev/${ctx.unicode_version}.0/ucd/emoji/emoji-variation-sequences.txt`,
4141
cacheKey: `v${ctx.emoji_version}/variations`,
4242
};
4343
})

‎packages/adapters/test/handlers/source/metadata.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe("metadata adapter handler", () => {
2222
});
2323

2424
mockFetch([
25-
["GET https://unicode-proxy.ucdjs.dev/proxy/emoji/15.0/emoji-test.txt", () => HttpResponse.text(mockEmojiTest)],
25+
["GET https://unicode-proxy.ucdjs.dev/emoji/15.0/emoji-test.txt", () => HttpResponse.text(mockEmojiTest)],
2626
]);
2727

2828
const result = await runSourceAdapter(metadataHandler, mockContext);
@@ -143,7 +143,7 @@ describe("metadata adapter handler", () => {
143143
`;
144144

145145
mockFetch([
146-
["GET https://unicode-proxy.ucdjs.dev/proxy/emoji/15.0/emoji-test.txt", () => HttpResponse.text(mockEmojiTest)],
146+
["GET https://unicode-proxy.ucdjs.dev/emoji/15.0/emoji-test.txt", () => HttpResponse.text(mockEmojiTest)],
147147
]);
148148

149149
const result = await runSourceAdapter(metadataHandler, mockContext);
@@ -166,7 +166,7 @@ describe("metadata adapter handler", () => {
166166
const { runSourceAdapter } = await setupAdapterTest();
167167

168168
mockFetch([
169-
["GET https://unicode-proxy.ucdjs.dev/proxy/emoji/15.0/emoji-test.txt", () => HttpResponse.text("")],
169+
["GET https://unicode-proxy.ucdjs.dev/emoji/15.0/emoji-test.txt", () => HttpResponse.text("")],
170170
]);
171171

172172
const result = await runSourceAdapter(metadataHandler, mockContext);
@@ -179,7 +179,7 @@ describe("metadata adapter handler", () => {
179179
it("should handle network errors", async () => {
180180
const { runSourceAdapter } = await setupAdapterTest();
181181

182-
mockFetch(`GET https://unicode-proxy.ucdjs.dev/proxy/emoji/${mockContext.emoji_version}/emoji-test.txt`, () => {
182+
mockFetch(`GET https://unicode-proxy.ucdjs.dev/emoji/${mockContext.emoji_version}/emoji-test.txt`, () => {
183183
return HttpResponse.error();
184184
});
185185

@@ -200,7 +200,7 @@ describe("metadata adapter handler", () => {
200200

201201
let fetchCount = 0;
202202
mockFetch([
203-
["GET https://unicode-proxy.ucdjs.dev/proxy/emoji/15.0/emoji-test.txt", () => {
203+
["GET https://unicode-proxy.ucdjs.dev/emoji/15.0/emoji-test.txt", () => {
204204
fetchCount++;
205205
return HttpResponse.text(mockEmojiTest);
206206
}],
@@ -225,7 +225,7 @@ describe("metadata adapter handler", () => {
225225
});
226226

227227
mockFetch([
228-
["GET https://unicode-proxy.ucdjs.dev/proxy/emoji/15.0/emoji-test.txt", () => HttpResponse.text(mockEmojiTest)],
228+
["GET https://unicode-proxy.ucdjs.dev/emoji/15.0/emoji-test.txt", () => HttpResponse.text(mockEmojiTest)],
229229
]);
230230

231231
await expect(runSourceAdapter(metadataHandler, mockContext))
@@ -242,7 +242,7 @@ describe("metadata adapter handler", () => {
242242
`;
243243

244244
mockFetch([
245-
["GET https://unicode-proxy.ucdjs.dev/proxy/emoji/15.0/emoji-test.txt", () => HttpResponse.text(mockEmojiTest)],
245+
["GET https://unicode-proxy.ucdjs.dev/emoji/15.0/emoji-test.txt", () => HttpResponse.text(mockEmojiTest)],
246246
]);
247247

248248
await expect(runSourceAdapter(metadataHandler, mockContext))

‎packages/adapters/test/handlers/source/sequences.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ describe("sequences adapter handler", () => {
4848

4949
mockFetch([
5050
[
51-
"GET https://unicode-proxy.ucdjs.dev/proxy/emoji/15.0/emoji-sequences.txt",
51+
"GET https://unicode-proxy.ucdjs.dev/emoji/15.0/emoji-sequences.txt",
5252
() => HttpResponse.text(mockedSequences),
5353
],
5454
[
55-
"GET https://unicode-proxy.ucdjs.dev/proxy/emoji/15.0/emoji-zwj-sequences.txt",
55+
"GET https://unicode-proxy.ucdjs.dev/emoji/15.0/emoji-zwj-sequences.txt",
5656
() => HttpResponse.text(),
5757
],
5858
]);
@@ -128,11 +128,11 @@ describe("sequences adapter handler", () => {
128128

129129
mockFetch([
130130
[
131-
"GET https://unicode-proxy.ucdjs.dev/proxy/emoji/15.0/emoji-sequences.txt",
131+
"GET https://unicode-proxy.ucdjs.dev/emoji/15.0/emoji-sequences.txt",
132132
() => HttpResponse.text(),
133133
],
134134
[
135-
"GET https://unicode-proxy.ucdjs.dev/proxy/emoji/15.0/emoji-zwj-sequences.txt",
135+
"GET https://unicode-proxy.ucdjs.dev/emoji/15.0/emoji-zwj-sequences.txt",
136136
() => HttpResponse.text(mockedSequences),
137137
],
138138
]);

‎packages/adapters/test/handlers/source/unicode-names.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ describe("unicode-names adapter handler", () => {
1515
const { runSourceAdapter } = await setupAdapterTest();
1616

1717
mockFetch([
18-
["GET https://unicode-proxy.ucdjs.dev/proxy/15.0.0/ucd/UnicodeData.txt", () => HttpResponse.text("1F600;GRINNING FACE")],
18+
["GET https://unicode-proxy.ucdjs.dev/15.0.0/ucd/UnicodeData.txt", () => HttpResponse.text("1F600;GRINNING FACE")],
1919
]);
2020

2121
const result = await runSourceAdapter(unicodeNamesHandler, mockContext);
@@ -28,7 +28,7 @@ describe("unicode-names adapter handler", () => {
2828
const { runSourceAdapter } = await setupAdapterTest();
2929

3030
mockFetch([
31-
["GET https://unicode-proxy.ucdjs.dev/proxy/1.1-Update/UnicodeData-1.1.5.txt", () => HttpResponse.text("1F600;GRINNING FACE")],
31+
["GET https://unicode-proxy.ucdjs.dev/1.1-Update/UnicodeData-1.1.5.txt", () => HttpResponse.text("1F600;GRINNING FACE")],
3232
]);
3333

3434
const result = await runSourceAdapter(unicodeNamesHandler, { ...mockContext, emoji_version: "1.0" });
@@ -41,7 +41,7 @@ describe("unicode-names adapter handler", () => {
4141
const { runSourceAdapter } = await setupAdapterTest();
4242

4343
mockFetch([
44-
["GET https://unicode-proxy.ucdjs.dev/proxy/15.0.0/ucd/UnicodeData.txt", () => HttpResponse.text(
44+
["GET https://unicode-proxy.ucdjs.dev/15.0.0/ucd/UnicodeData.txt", () => HttpResponse.text(
4545
"1F600;GRINNING FACE\n"
4646
+ "1F601;GRINNING FACE WITH SMILING EYES\n"
4747
+ "1F602;FACE WITH TEARS OF JOY",
@@ -60,7 +60,7 @@ describe("unicode-names adapter handler", () => {
6060
const { runSourceAdapter } = await setupAdapterTest();
6161

6262
mockFetch([
63-
["GET https://unicode-proxy.ucdjs.dev/proxy/15.0.0/ucd/UnicodeData.txt", () => HttpResponse.text("1F600")],
63+
["GET https://unicode-proxy.ucdjs.dev/15.0.0/ucd/UnicodeData.txt", () => HttpResponse.text("1F600")],
6464
]);
6565

6666
await expect(runSourceAdapter(unicodeNamesHandler, mockContext))
@@ -72,7 +72,7 @@ describe("unicode-names adapter handler", () => {
7272
const { runSourceAdapter } = await setupAdapterTest();
7373

7474
mockFetch([
75-
["GET https://unicode-proxy.ucdjs.dev/proxy/15.0.0/ucd/UnicodeData.txt", () => HttpResponse.text("")],
75+
["GET https://unicode-proxy.ucdjs.dev/15.0.0/ucd/UnicodeData.txt", () => HttpResponse.text("")],
7676
]);
7777

7878
const result = await runSourceAdapter(unicodeNamesHandler, mockContext);
@@ -82,7 +82,7 @@ describe("unicode-names adapter handler", () => {
8282
it("should handle network errors", async () => {
8383
const { runSourceAdapter } = await setupAdapterTest();
8484

85-
mockFetch(`GET https://unicode-proxy.ucdjs.dev/proxy/${mockContext.emoji_version}.0/ucd/UnicodeData.txt`, () => {
85+
mockFetch(`GET https://unicode-proxy.ucdjs.dev/${mockContext.emoji_version}.0/ucd/UnicodeData.txt`, () => {
8686
return HttpResponse.error();
8787
});
8888

@@ -97,7 +97,7 @@ describe("unicode-names adapter handler", () => {
9797

9898
let fetchCount = 0;
9999
mockFetch([
100-
["GET https://unicode-proxy.ucdjs.dev/proxy/15.0.0/ucd/UnicodeData.txt", () => {
100+
["GET https://unicode-proxy.ucdjs.dev/15.0.0/ucd/UnicodeData.txt", () => {
101101
fetchCount++;
102102
return HttpResponse.text("1F600;GRINNING FACE");
103103
}],

‎packages/adapters/test/handlers/source/variations.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe("variations adapter handler", () => {
2222
});
2323

2424
mockFetch([
25-
["GET https://unicode-proxy.ucdjs.dev/proxy/15.0.0/ucd/emoji/emoji-variation-sequences.txt", () => HttpResponse.text(mockVariations)],
25+
["GET https://unicode-proxy.ucdjs.dev/15.0.0/ucd/emoji/emoji-variation-sequences.txt", () => HttpResponse.text(mockVariations)],
2626
]);
2727

2828
const result = await runSourceAdapter(variationsHandler, mockContext);
@@ -66,7 +66,7 @@ FE0E ; text style # VS-15
6666
`;
6767

6868
mockFetch([
69-
["GET https://unicode-proxy.ucdjs.dev/proxy/emoji/12.1/emoji-variation-sequences.txt", () => HttpResponse.text(mockVariations)],
69+
["GET https://unicode-proxy.ucdjs.dev/emoji/12.1/emoji-variation-sequences.txt", () => HttpResponse.text(mockVariations)],
7070
]);
7171

7272
const result = await runSourceAdapter(variationsHandler, {
@@ -100,7 +100,7 @@ FE0E ; text style # VS-15
100100
const { runSourceAdapter } = await setupAdapterTest();
101101

102102
mockFetch([
103-
["GET https://unicode-proxy.ucdjs.dev/proxy/15.0.0/ucd/emoji/emoji-variation-sequences.txt", () => HttpResponse.text("")],
103+
["GET https://unicode-proxy.ucdjs.dev/15.0.0/ucd/emoji/emoji-variation-sequences.txt", () => HttpResponse.text("")],
104104
]);
105105

106106
const result = await runSourceAdapter(variationsHandler, mockContext);
@@ -110,7 +110,7 @@ FE0E ; text style # VS-15
110110
it("should handle network errors", async () => {
111111
const { runSourceAdapter } = await setupAdapterTest();
112112

113-
mockFetch(`GET https://unicode-proxy.ucdjs.dev/proxy/15.0.0/ucd/emoji/emoji-variation-sequences.txt`, () => {
113+
mockFetch(`GET https://unicode-proxy.ucdjs.dev/15.0.0/ucd/emoji/emoji-variation-sequences.txt`, () => {
114114
return HttpResponse.error();
115115
});
116116

@@ -125,7 +125,7 @@ FE0E ; text style # VS-15
125125

126126
let fetchCount = 0;
127127
mockFetch([
128-
["GET https://unicode-proxy.ucdjs.dev/proxy/15.0.0/ucd/emoji/emoji-variation-sequences.txt", () => {
128+
["GET https://unicode-proxy.ucdjs.dev/15.0.0/ucd/emoji/emoji-variation-sequences.txt", () => {
129129
fetchCount++;
130130
return HttpResponse.text("FE0E ; text style # VS-15");
131131
}],
@@ -148,7 +148,7 @@ invalid-line
148148
`;
149149

150150
mockFetch([
151-
["GET https://unicode-proxy.ucdjs.dev/proxy/15.0.0/ucd/emoji/emoji-variation-sequences.txt", () => HttpResponse.text(mockVariations)],
151+
["GET https://unicode-proxy.ucdjs.dev/15.0.0/ucd/emoji/emoji-variation-sequences.txt", () => HttpResponse.text(mockVariations)],
152152
]);
153153

154154
await expect(runSourceAdapter(variationsHandler, mockContext))
@@ -166,7 +166,7 @@ invalid-line
166166
});
167167

168168
mockFetch([
169-
["GET https://unicode-proxy.ucdjs.dev/proxy/15.0.0/ucd/emoji/emoji-variation-sequences.txt", () => HttpResponse.text(mockVariations)],
169+
["GET https://unicode-proxy.ucdjs.dev/15.0.0/ucd/emoji/emoji-variation-sequences.txt", () => HttpResponse.text(mockVariations)],
170170
]);
171171

172172
await expect(runSourceAdapter(variationsHandler, mockContext))

‎packages/parsers/scripts/update-parser-fixtures.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interface Entry {
1111
}
1212

1313
async function run() {
14-
const rootResponse = await fetch("https://unicode-proxy.ucdjs.dev/proxy/emoji/");
14+
const rootResponse = await fetch("https://unicode-proxy.ucdjs.dev/emoji/");
1515

1616
if (!rootResponse.ok) {
1717
throw new Error("failed to fetch root entry");
@@ -21,7 +21,7 @@ async function run() {
2121
await mkdir(root, { recursive: true });
2222

2323
async function processDirectory(entry: Entry, basePath: string) {
24-
const dirResponse = await fetch(`https://unicode-proxy.ucdjs.dev/proxy${entry.path}`);
24+
const dirResponse = await fetch(`https://unicode-proxy.ucdjs.dev${entry.path}`);
2525
const dirEntries: Entry[] = await dirResponse.json();
2626

2727
const fileEntries = dirEntries.filter(
@@ -41,7 +41,7 @@ async function run() {
4141

4242
await mkdir(new URL(type, root), { recursive: true });
4343

44-
const content = await fetch(`https://unicode-proxy.ucdjs.dev/proxy${fullPath}`).then((res) => res.text());
44+
const content = await fetch(`https://unicode-proxy.ucdjs.dev${fullPath}`).then((res) => res.text());
4545
await writeFile(
4646
new URL(`${type}/v${version.toString()}${fileExt}`, root),
4747
content,

0 commit comments

Comments
 (0)