Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update cdn url #1123

Merged
merged 8 commits into from
Jan 10, 2025
Merged

chore: update cdn url #1123

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
11c7aed
update cdn url
juliusmarminge Jan 9, 2025
ce28ebf
don't always blcok
juliusmarminge Jan 9, 2025
0757a05
last doc page
juliusmarminge Jan 9, 2025
e0f0bc2
add deprecation notes
juliusmarminge Jan 9, 2025
b0c4a0a
Update docs/src/app/(docs)/concepts/regions-acl/page.mdx
juliusmarminge Jan 10, 2025
5bc8966
fmt
juliusmarminge Jan 10, 2025
b12b618
do these match?
juliusmarminge Jan 10, 2025
d1dea5c
fix test
juliusmarminge Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/next.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ const nextConfig = {
images: {
remotePatterns: [
{
hostname: "utfs.io",
pathname: "/a/s40vlb3kca/*",
hostname: "s40vlb3kca.ufs.sh",
pathname: "/f/*",
},
],
},
Expand Down
2 changes: 1 addition & 1 deletion docs/src/app/(api)/api/og/blog/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const GET = async (req: Request) => {
tw="bg-zinc-900 h-full w-full flex flex-col p-14"
style={{
backgroundImage:
"url(https://utfs.io/f/656e69ef-2800-45fd-87ac-b9f88346348c-hi270o.png)",
"url(https://s40vlb3kca.ufs.sh/f/656e69ef-2800-45fd-87ac-b9f88346348c-hi270o.png)",
backgroundPosition: "cover",
}}
>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/app/(api)/api/og/docs/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const GET = async (req: Request) => {
tw="bg-zinc-900 h-full w-full flex flex-col p-14"
style={{
backgroundImage:
"url(https://utfs.io/f/656e69ef-2800-45fd-87ac-b9f88346348c-hi270o.png)",
"url(https://s40vlb3kca.ufs.sh/f/656e69ef-2800-45fd-87ac-b9f88346348c-hi270o.png)",
backgroundPosition: "cover",
}}
>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/app/(docs)/concepts/regions-acl/page.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ you can select the region you want to upload your files to. Once changed, all
## Access Controls

By default every file uploaded to UploadThing is accessible simply by it's URL
(`utfs.io/f/FILE_KEY`). Although this hard-to-guess URL is fine for many
(`APP_ID.ufs.sh/f/FILE_KEY`). Although this hard-to-guess URL is fine for many
juliusmarminge marked this conversation as resolved.
Show resolved Hide resolved
applications, some applications require a more secure way to store their files.

You can configure your app's access control list (ACL) to restrict access to
Expand Down
2 changes: 2 additions & 0 deletions docs/src/app/(docs)/working-with-files/page.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ with them. This page shows how to work with your uploaded files.
Do not use the raw file URL from the storage provider, e.g. `https://bucket.s3.region.amazonaws.com/<FILE_KEY>`. We reserve the right to move objects between different storage providers and/or buckets, so this URL is not guaranteed to remain valid.
</Warning>

# TODO: REWRITE THIS ENTIRE SECTION
markflorkowski marked this conversation as resolved.
Show resolved Hide resolved

There are multiple ways to access your files. The most generic way is to
construct the URL from the `fileKey` you get back after the file has been
uploaded:
Expand Down
3 changes: 2 additions & 1 deletion examples/minimal-expo/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# Go to https://uploadthing.com/dashboard to get your token
UPLOADTHING_TOKEN='...'
UPLOADTHING_TOKEN='...'
EXPO_PUBLIC_UPLOADTHING_APP_ID='...'
2 changes: 1 addition & 1 deletion examples/minimal-expo/app/f/[key].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { isImage } from "~/lib/utils";
export default function FileScreen() {
const searchParams = useGlobalSearchParams<{ key: string; name?: string }>();
const { key, name = "Untitled" } = searchParams;
const fileUrl = `https://utfs.io/f/${key}`;
const fileUrl = `https://${process.env.EXPO_PUBLIC_UPLOADTHING_APP_ID}.ufs.sh/f/${key}`;

return (
<>
Expand Down
2 changes: 1 addition & 1 deletion packages/react/test/upload-button.browser.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const worker = setupWorker(
http.all<{ key: string }>(
"https://fra1.ingest.uploadthing.com/:key",
({ params }) => {
return HttpResponse.json({ url: "https://utfs.io/f/" + params.key });
return HttpResponse.json({ url: "https://app-1.ufs.sh/f/" + params.key });
},
),
);
Expand Down
2 changes: 1 addition & 1 deletion packages/react/test/upload-dropzone.browser.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const worker = setupWorker(
http.all<{ key: string }>(
"https://fra1.ingest.uploadthing.com/:key",
({ params }) => {
return HttpResponse.json({ url: "https://utfs.io/f/" + params.key });
return HttpResponse.json({ url: "https://app-1.ufs.sh/f/" + params.key });
},
),
);
Expand Down
19 changes: 9 additions & 10 deletions packages/uploadthing/test/__test-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,17 @@ export const API_URL =
typeof process !== "undefined" && process.env.UPLOADTHING_API_URL
? process.env.UPLOADTHING_API_URL
: "https://api.uploadthing.com";
export const UTFS_IO_URL =
export const UFS_HOST =
typeof process !== "undefined" && process.env.UPLOADTHING_API_URL
? "https://staging.utfs.io"
: "https://utfs.io";
? "utf-staging.com"
: "ufs.sh";
export const INGEST_URL =
typeof process !== "undefined" && process.env.UPLOADTHING_API_URL
? "https://fra1.ingest.ut-staging.com"
: "https://fra1.ingest.uploadthing.com";

export const fileUrlPattern = new RegExp(`^${UTFS_IO_URL}/f/.+$`);
export const appUrlPattern = (appId = testToken.decoded.appId) =>
new RegExp(`^${UTFS_IO_URL}/a/${appId}/.+$`);
export const fileUrlPattern = (appId = testToken.decoded.appId) =>
new RegExp(`^https://${appId}.${UFS_HOST}/f/.+$`);

export const createApiUrl = (slug: string, action?: typeof ActionType.Type) => {
const url = new URL("http://localhost:3000");
Expand Down Expand Up @@ -86,7 +85,7 @@ export const handlers = [
await callRequestSpy(request);
return HttpResponse.text("Lorem ipsum doler sit amet");
}),
http.get(`${UTFS_IO_URL}/f/:key`, async ({ request }) => {
http.get(`https://(.+).${UFS_HOST}/f/:key`, async ({ request }) => {
await callRequestSpy(request);
return HttpResponse.text("Lorem ipsum doler sit amet");
}),
Expand All @@ -99,8 +98,8 @@ export const handlers = [
await callRequestSpy(request);
const appId = new URLSearchParams(request.url).get("x-ut-identifier");
return HttpResponse.json<UploadPutResult>({
url: `${UTFS_IO_URL}/f/${params.key}`,
appUrl: `${UTFS_IO_URL}/a/${appId}/${params.key}`,
url: `https://${appId}.${UFS_HOST}/f/${params.key}`,
appUrl: `https://${appId}.${UFS_HOST}/f/${params.key}`,
serverData: null,
fileHash: Array.from(new Uint8Array(await request.arrayBuffer()))
.map((b) => b.toString(16).padStart(2, "0"))
Expand All @@ -114,7 +113,7 @@ export const handlers = [
http.post(`${API_URL}/v6/requestFileAccess`, async ({ request }) => {
await callRequestSpy(request);
return HttpResponse.json({
url: `${UTFS_IO_URL}/f/someFileKey?x-some-amz=query-param`,
url: `https://{APP_ID}.${UFS_HOST}/f/someFileKey?x-some-amz=query-param`,
});
}),
http.post(`${API_URL}/v6/updateACL`, async ({ request }) => {
Expand Down
15 changes: 7 additions & 8 deletions packages/uploadthing/test/client.browser.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import type {
GenerateUploaderOptions,
} from "../src/types";
import {
appUrlPattern,
doNotExecute,
fileUrlPattern,
handlers,
Expand Down Expand Up @@ -141,8 +140,8 @@ describe("uploadFiles", () => {
serverData: null,
lastModified: expect.any(Number),
key: expect.stringMatching(/.+/),
url: expect.stringMatching(fileUrlPattern),
appUrl: expect.stringMatching(appUrlPattern()),
url: expect.stringMatching(fileUrlPattern()),
appUrl: expect.stringMatching(fileUrlPattern()),
fileHash: expect.any(String),
},
]);
Expand Down Expand Up @@ -185,8 +184,8 @@ describe("uploadFiles", () => {
serverData: null,
lastModified: expect.any(Number),
key: expect.stringMatching(/.+/),
url: expect.stringMatching(fileUrlPattern),
appUrl: expect.stringMatching(appUrlPattern()),
url: expect.stringMatching(fileUrlPattern()),
appUrl: expect.stringMatching(fileUrlPattern()),
fileHash: expect.any(String),
},
]);
Expand Down Expand Up @@ -220,8 +219,8 @@ describe("uploadFiles", () => {
serverData: null,
lastModified: expect.any(Number),
key: expect.stringMatching(/.+/),
url: expect.stringMatching(fileUrlPattern),
appUrl: expect.stringMatching(appUrlPattern()),
url: expect.stringMatching(fileUrlPattern()),
appUrl: expect.stringMatching(fileUrlPattern()),
fileHash: expect.any(String),
},
]);
Expand Down Expand Up @@ -268,7 +267,7 @@ describe("uploadFiles", () => {
// customId: null,
// serverData: null,
// key: "abc-123.txt",
// url: "https://utfs.io/f/abc-123.txt",
// url: "https://app-1.ufs.sh/f/abc-123.txt",
// },
// ]);
// expect(onErrorMock).not.toHaveBeenCalled();
Expand Down
17 changes: 9 additions & 8 deletions packages/uploadthing/test/request-handler.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
middlewareMock,
requestSpy,
testToken,
UFS_HOST,
uploadCompleteMock,
} from "./__test-helpers";

Expand Down Expand Up @@ -409,8 +410,8 @@ describe(".onUploadComplete()", () => {
status: "uploaded",
metadata: {},
file: new UploadedFileData({
url: "https://utfs.io/f/some-random-key.png",
appUrl: `https://utfs.io/a/${testToken.decoded.appId}/some-random-key.png`,
url: `https://${testToken.decoded.appId}.${UFS_HOST}/f/some-random-key.png`,
appUrl: `https://${testToken.decoded.appId}.${UFS_HOST}/f/some-random-key.png`,
name: "foo.png",
key: "some-random-key.png",
size: 48,
Expand Down Expand Up @@ -446,8 +447,8 @@ describe(".onUploadComplete()", () => {
name: "foo.png",
size: 48,
type: "image/png",
url: "https://utfs.io/f/some-random-key.png",
appUrl: `https://utfs.io/a/${testToken.decoded.appId}/some-random-key.png`,
url: `https://${testToken.decoded.appId}.${UFS_HOST}/f/some-random-key.png`,
appUrl: `https://${testToken.decoded.appId}.${UFS_HOST}/f/some-random-key.png`,
fileHash: "some-md5-hash",
},
metadata: {},
Expand All @@ -459,8 +460,8 @@ describe(".onUploadComplete()", () => {
status: "uploaded",
metadata: {},
file: new UploadedFileData({
url: "https://utfs.io/f/some-random-key.png",
appUrl: `https://utfs.io/a/${testToken.decoded.appId}/some-random-key.png`,
url: `https://${testToken.decoded.appId}.${UFS_HOST}/f/some-random-key.png`,
appUrl: `https://${testToken.decoded.appId}.${UFS_HOST}/f/some-random-key.png`,
name: "foo.png",
key: "some-random-key.png",
size: 48,
Expand Down Expand Up @@ -492,8 +493,8 @@ describe(".onUploadComplete()", () => {
status: "uploaded",
metadata: {},
file: new UploadedFileData({
url: "https://utfs.io/f/some-random-key.png",
appUrl: `https://utfs.io/a/${testToken.decoded.appId}/some-random-key.png`,
url: `https://${testToken.decoded.appId}.${UFS_HOST}/f/some-random-key.png`,
appUrl: `https://${testToken.decoded.appId}.${UFS_HOST}/f/some-random-key.png`,
name: "foo.png",
key: "some-random-key.png",
size: 48,
Expand Down
35 changes: 16 additions & 19 deletions packages/uploadthing/test/sdk.live.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@

import { UTApi, UTFile } from "../src/sdk";
import { UploadThingToken } from "../src/types";
import {
appUrlPattern,
fileUrlPattern,
testToken,
UTFS_IO_URL,
} from "./__test-helpers";
import { fileUrlPattern, testToken, UFS_HOST } from "./__test-helpers";

const shouldRun =
typeof process.env.UPLOADTHING_TEST_TOKEN === "string" &&
Expand Down Expand Up @@ -61,7 +56,7 @@
it("should upload a file", async () => {
const file = new File(["foo"], "foo.txt", { type: "text/plain" });
const result = await utapi.uploadFiles(file);
expect(result).toEqual({

Check failure on line 59 in packages/uploadthing/test/sdk.live.test.ts

View workflow job for this annotation

GitHub Actions / build

packages/uploadthing/test/sdk.live.test.ts > smoke test with live api > should upload a file 

AssertionError: expected { data: { …(9) }, error: null } to deeply equal { Object (data, error) }

- Expected
+ Received

  Object {
    "data": Object {
-     "appUrl": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "appUrl": "https://utfs.io/a/fr0hfwpst1/zIptSc0cA89ItLVVakW0bNhT9QlMrFK2ViWa5L6UsGjo3Jwm",
      "customId": null,
      "fileHash": Any<String>,
      "key": StringMatching /.+/,
      "lastModified": 1736389419938,
      "name": "foo.txt",
      "size": 3,
      "type": "text/plain",
-     "url": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "url": "https://utfs.io/f/zIptSc0cA89ItLVVakW0bNhT9QlMrFK2ViWa5L6UsGjo3Jwm",
    },
    "error": null,
  }

 ❯ packages/uploadthing/test/sdk.live.test.ts:59:22
data: {
customId: null,
key: expect.stringMatching(/.+/),
Expand All @@ -69,8 +64,8 @@
name: "foo.txt",
size: 3,
type: "text/plain",
url: expect.stringMatching(fileUrlPattern),
appUrl: expect.stringMatching(appUrlPattern(appId)),
url: expect.stringMatching(fileUrlPattern(appId)),
appUrl: expect.stringMatching(fileUrlPattern(appId)),
juliusmarminge marked this conversation as resolved.
Show resolved Hide resolved
fileHash: expect.any(String),
},
error: null,
Expand All @@ -96,7 +91,7 @@
const result = await utapi.uploadFiles(file, {
acl: "private",
});
expect(result).toEqual({

Check failure on line 94 in packages/uploadthing/test/sdk.live.test.ts

View workflow job for this annotation

GitHub Actions / build

packages/uploadthing/test/sdk.live.test.ts > smoke test with live api > should upload a private file 

AssertionError: expected { data: { …(9) }, error: null } to deeply equal { Object (data, error) }

- Expected
+ Received

  Object {
    "data": Object {
-     "appUrl": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "appUrl": "https://utfs.io/a/fr0hfwpst1/zIptSc0cA89IW9F1tjKMfV684uOHZ1czkRhvdlS9GnKtNLg5",
      "customId": null,
      "fileHash": Any<String>,
      "key": StringMatching /.+/,
      "lastModified": 1736389422255,
      "name": "foo.txt",
      "size": 3,
      "type": "text/plain",
-     "url": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "url": "https://utfs.io/f/zIptSc0cA89IW9F1tjKMfV684uOHZ1czkRhvdlS9GnKtNLg5",
    },
    "error": null,
  }

 ❯ packages/uploadthing/test/sdk.live.test.ts:94:22
data: {
customId: null,
key: expect.stringMatching(/.+/),
Expand All @@ -104,8 +99,8 @@
name: "foo.txt",
size: 3,
type: "text/plain",
url: expect.stringMatching(fileUrlPattern),
appUrl: expect.stringMatching(appUrlPattern(appId)),
url: expect.stringMatching(fileUrlPattern(appId)),
appUrl: expect.stringMatching(fileUrlPattern(appId)),
Comment on lines +102 to +103
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix the failing test for private file upload.

The test is failing due to URL pattern mismatch according to the pipeline failure.

fileHash: expect.any(String),
},
error: null,
Expand All @@ -126,7 +121,7 @@
const result = await utapi.uploadFilesFromUrl(
"https://uploadthing.com/favicon.ico",
);
expect(result).toEqual({

Check failure on line 124 in packages/uploadthing/test/sdk.live.test.ts

View workflow job for this annotation

GitHub Actions / build

packages/uploadthing/test/sdk.live.test.ts > smoke test with live api > should upload a file from a url 

AssertionError: expected { data: { …(9) }, error: null } to deeply equal { Object (data, error) }

- Expected
+ Received

  Object {
    "data": Object {
-     "appUrl": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "appUrl": "https://utfs.io/a/fr0hfwpst1/zIptSc0cA89IZNMms7wk9M34QoTEe5BKl8hicRWDmzIOwXud",
      "customId": null,
      "fileHash": Any<String>,
      "key": StringMatching /.+/,
      "lastModified": Any<Number>,
      "name": "favicon.ico",
      "size": Any<Number>,
      "type": "image/vnd.microsoft.icon",
-     "url": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "url": "https://utfs.io/f/zIptSc0cA89IZNMms7wk9M34QoTEe5BKl8hicRWDmzIOwXud",
    },
    "error": null,
  }

 ❯ packages/uploadthing/test/sdk.live.test.ts:124:22
data: {
customId: null,
key: expect.stringMatching(/.+/),
Expand All @@ -134,8 +129,8 @@
name: "favicon.ico",
size: expect.any(Number),
type: "image/vnd.microsoft.icon",
url: expect.stringMatching(fileUrlPattern),
appUrl: expect.stringMatching(appUrlPattern(appId)),
url: expect.stringMatching(fileUrlPattern(appId)),
appUrl: expect.stringMatching(fileUrlPattern(appId)),
Comment on lines +132 to +133
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix the failing test for URL upload.

The test is failing due to incorrect URL format in response according to the pipeline failure.

fileHash: expect.any(String),
},
error: null,
Expand All @@ -149,7 +144,7 @@
const file = new UTFile(["foo"], "bar.txt");
const result = await utapi.uploadFiles(file);
const fileKey = result.data!.key;
expect(result).toEqual({

Check failure on line 147 in packages/uploadthing/test/sdk.live.test.ts

View workflow job for this annotation

GitHub Actions / build

packages/uploadthing/test/sdk.live.test.ts > smoke test with live api > should rename a file with fileKey 

AssertionError: expected { data: { …(9) }, error: null } to deeply equal { Object (data, error) }

- Expected
+ Received

  Object {
    "data": Object {
-     "appUrl": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "appUrl": "https://utfs.io/a/fr0hfwpst1/zIptSc0cA89IMu14ObhlCe9xLZQq0OVdwIXoya4jSYcRgmtv",
      "customId": null,
      "fileHash": Any<String>,
      "key": StringMatching /.+/,
      "lastModified": Any<Number>,
      "name": "bar.txt",
      "size": 3,
      "type": "text/plain",
-     "url": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "url": "https://utfs.io/f/zIptSc0cA89IMu14ObhlCe9xLZQq0OVdwIXoya4jSYcRgmtv",
    },
    "error": null,
  }

 ❯ packages/uploadthing/test/sdk.live.test.ts:147:22
data: {
customId: null,
key: expect.stringMatching(/.+/),
Expand All @@ -158,8 +153,8 @@
name: "bar.txt",
size: 3,
type: "text/plain",
url: expect.stringMatching(fileUrlPattern),
appUrl: expect.stringMatching(appUrlPattern(appId)),
url: expect.stringMatching(fileUrlPattern(appId)),
appUrl: expect.stringMatching(fileUrlPattern(appId)),
Comment on lines +156 to +157
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix the failing test for file rename.

The test is failing due to URL pattern mismatch according to the pipeline failure.

fileHash: expect.any(String),
},
error: null,
Expand Down Expand Up @@ -192,7 +187,7 @@

const file = new UTFile(["foo"], "bar.txt", { customId });
const result = await utapi.uploadFiles(file);
expect(result).toEqual({

Check failure on line 190 in packages/uploadthing/test/sdk.live.test.ts

View workflow job for this annotation

GitHub Actions / build

packages/uploadthing/test/sdk.live.test.ts > smoke test with live api > should rename a file with customId 

AssertionError: expected { data: { …(9) }, error: null } to deeply equal { data: { …(9) }, error: null }

- Expected
+ Received

  Object {
    "data": Object {
-     "appUrl": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "appUrl": "https://utfs.io/a/fr0hfwpst1/zIptSc0cA89I5WphgPUlVkevf5bcZGNoLy26pw7XI3ODmjRW",
      "customId": "f501490c-fedb-4fd0-b986-b7fab9210f33",
      "fileHash": Any<String>,
      "key": StringMatching /.+/,
      "lastModified": 1736389428226,
      "name": "bar.txt",
      "size": 3,
      "type": "text/plain",
-     "url": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "url": "https://utfs.io/f/zIptSc0cA89I5WphgPUlVkevf5bcZGNoLy26pw7XI3ODmjRW",
    },
    "error": null,
  }

 ❯ packages/uploadthing/test/sdk.live.test.ts:190:22
data: {
customId: customId,
key: expect.stringMatching(/.+/),
Expand All @@ -200,8 +195,8 @@
name: "bar.txt",
size: 3,
type: "text/plain",
url: expect.stringMatching(fileUrlPattern),
appUrl: expect.stringMatching(appUrlPattern(appId)),
url: expect.stringMatching(fileUrlPattern(appId)),
appUrl: expect.stringMatching(fileUrlPattern(appId)),
Comment on lines +198 to +199
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix the failing test for custom ID.

The test is failing due to incorrect URL format according to the pipeline failure.

fileHash: expect.any(String),
},
error: null,
Expand Down Expand Up @@ -233,7 +228,7 @@
const file = new File(["foo"], "foo.txt", { type: "text/plain" });
const result = await utapi.uploadFiles(file);
const { key, url } = result.data!;
expect(result).toEqual({

Check failure on line 231 in packages/uploadthing/test/sdk.live.test.ts

View workflow job for this annotation

GitHub Actions / build

packages/uploadthing/test/sdk.live.test.ts > smoke test with live api > should update ACL 

AssertionError: expected { data: { …(9) }, error: null } to deeply equal { Object (data, error) }

- Expected
+ Received

  Object {
    "data": Object {
-     "appUrl": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "appUrl": "https://utfs.io/a/fr0hfwpst1/zIptSc0cA89IH9Yhrd3HAoascbpDMfBR5Q7L8O4PWqZThji0",
      "customId": null,
      "fileHash": Any<String>,
      "key": StringMatching /.+/,
      "lastModified": 1736389430180,
      "name": "foo.txt",
      "size": 3,
      "type": "text/plain",
-     "url": StringMatching /^https:\/\/fr0hfwpst1.ufs.sh\/f\/.+$/,
+     "url": "https://utfs.io/f/zIptSc0cA89IH9Yhrd3HAoascbpDMfBR5Q7L8O4PWqZThji0",
    },
    "error": null,
  }

 ❯ packages/uploadthing/test/sdk.live.test.ts:231:22
data: {
customId: null,
key: expect.stringMatching(/.+/),
Expand All @@ -241,8 +236,8 @@
name: "foo.txt",
size: 3,
type: "text/plain",
url: expect.stringMatching(fileUrlPattern),
appUrl: expect.stringMatching(appUrlPattern(appId)),
url: expect.stringMatching(fileUrlPattern(appId)),
appUrl: expect.stringMatching(fileUrlPattern(appId)),
Comment on lines +239 to +240
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix the failing test for ACL update.

The test is failing due to URL pattern mismatch according to the pipeline failure.

fileHash: expect.any(String),
},
error: null,
Expand All @@ -264,7 +259,9 @@
const { files } = await utapi.listFiles();
const someFile = files[0]!;

const response = await fetch(`${UTFS_IO_URL}/f/${someFile.key}`);
const response = await fetch(
`https://${testToken.decoded.appId}.${UFS_HOST}/f/${someFile.key}`,
);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix the failing test for file deletion.

The test is failing. The usage info test indicates incorrect values for totalBytes and filesUploaded according to the pipeline failure.

const size = Number(response.headers.get("Content-Length"));

const result = await utapi.deleteFiles(someFile.key);
Expand All @@ -279,7 +276,7 @@

it("should have correct usage info", async () => {
const usageInfo = await utapi.getUsageInfo();
expect(usageInfo).toEqual({

Check failure on line 279 in packages/uploadthing/test/sdk.live.test.ts

View workflow job for this annotation

GitHub Actions / build

packages/uploadthing/test/sdk.live.test.ts > smoke test with live api > should have correct usage info 

AssertionError: expected GetUsageInfoResponse{ …(4) } to deeply equal { totalBytes: +0, …(3) }

- Expected
+ Received

- Object {
-   "appTotalBytes": 0,
-   "filesUploaded": -1,
+ GetUsageInfoResponse {
+   "appTotalBytes": 15418,
+   "filesUploaded": 5,
    "limitBytes": 2147483648,
-   "totalBytes": 0,
+   "totalBytes": 15418,
  }

 ❯ packages/uploadthing/test/sdk.live.test.ts:279:25
totalBytes: localInfo.totalBytes,
appTotalBytes: localInfo.totalBytes,
filesUploaded: localInfo.filesUploaded,
Expand Down
22 changes: 11 additions & 11 deletions packages/uploadthing/test/sdk.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
INGEST_URL,
requestSpy,
testToken,
UTFS_IO_URL,
UFS_HOST,
} from "./__test-helpers";

const msw = setupServer(...handlers);
Expand Down Expand Up @@ -50,8 +50,8 @@ describe("uploadFiles", () => {
name: "foo.txt",
size: 3,
lastModified: fooFile.lastModified,
url: `${UTFS_IO_URL}/f/${key}`,
appUrl: `${UTFS_IO_URL}/a/${testToken.decoded.appId}/${key}`,
url: `https://${testToken.decoded.appId}.${UFS_HOST}/f/${key}`,
appUrl: `https://${testToken.decoded.appId}.${UFS_HOST}/f/${key}`,
customId: null,
type: "text/plain",
fileHash: expect.any(String),
Expand Down Expand Up @@ -126,8 +126,8 @@ describe("uploadFilesFromUrl", () => {
name: "foo.txt",
size: 26,
lastModified: expect.any(Number),
url: `${UTFS_IO_URL}/f/${key}`,
appUrl: `${UTFS_IO_URL}/a/${testToken.decoded.appId}/${key}`,
url: `https://${testToken.decoded.appId}.${UFS_HOST}/f/${key}`,
appUrl: `https://${testToken.decoded.appId}.${UFS_HOST}/f/${key}`,
customId: null,
type: "text/plain",
fileHash: expect.any(String),
Expand Down Expand Up @@ -260,8 +260,8 @@ describe("uploadFilesFromUrl", () => {
name: "exists.txt",
size: 26,
type: "text/plain",
url: `${UTFS_IO_URL}/f/${key1}`,
appUrl: `${UTFS_IO_URL}/a/${testToken.decoded.appId}/${key1}`,
url: `https://${testToken.decoded.appId}.${UFS_HOST}/f/${key1}`,
appUrl: `https://${testToken.decoded.appId}.${UFS_HOST}/f/${key1}`,
},
error: null,
},
Expand Down Expand Up @@ -298,8 +298,8 @@ describe("uploadFilesFromUrl", () => {
name: "foo.txt",
size: 26,
type: "text/plain",
url: `${UTFS_IO_URL}/f/${key1}`,
appUrl: `${UTFS_IO_URL}/a/${testToken.decoded.appId}/${key1}`,
url: `https://${testToken.decoded.appId}.${UFS_HOST}/f/${key1}`,
appUrl: `https://${testToken.decoded.appId}.${UFS_HOST}/f/${key1}`,
fileHash: expect.any(String),
},
error: null,
Expand All @@ -321,8 +321,8 @@ describe("uploadFilesFromUrl", () => {
name: "bar.txt",
size: 26,
type: "text/plain",
url: `${UTFS_IO_URL}/f/${key2}`,
appUrl: `${UTFS_IO_URL}/a/${testToken.decoded.appId}/${key2}`,
url: `https://${testToken.decoded.appId}.${UFS_HOST}/f/${key2}`,
appUrl: `https://${testToken.decoded.appId}.${UFS_HOST}/f/${key2}`,
fileHash: expect.any(String),
},
error: null,
Expand Down
Loading