Compare commits

..

5 Commits

Author SHA1 Message Date
af38fdea64 Add stream type to get videos
All checks were successful
Tests / Tests (pull_request) Successful in 7s
2024-08-26 06:56:40 -06:00
72b451d322 remove stream from getUploadLink 2024-08-16 18:47:08 -07:00
5350c46e0a Merge pull request 'Adds proper error return to stuff involving upload links' (#39) from mk/add-error-return-to-upload-links into master
Reviewed-on: #39
Reviewed-by: loewy <loewymalkov@gmail.com>
2024-08-16 19:02:31 -06:00
1f5c5774e1 Merge branch 'master' into mk/add-error-return-to-upload-links
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-08-16 17:29:18 -06:00
3b29502e7e Adds proper error return to stuff involving upload links
All checks were successful
Tests / Tests (pull_request) Successful in 10s
2024-08-16 16:28:45 -07:00
5 changed files with 292 additions and 56 deletions

View File

@@ -1102,11 +1102,15 @@ export type GetShotsPagination = {
startFrameAfter: Scalars["Int"]["input"];
};
export type GetUploadLinkErrors = {
__typename?: "GetUploadLinkErrors";
error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr;
};
export type GetUploadLinkReturn = {
__typename?: "GetUploadLinkReturn";
headers: Array<Maybe<Header>>;
uploadCompletionCursor?: Maybe<Scalars["Int"]["output"]>;
uploadUrl: Scalars["String"]["output"];
stream?: Maybe<UploadStreamGql>;
value: UploadLinkGetUploadLinkErrors;
};
export type HlsPlaylistGql = {
@@ -1149,6 +1153,20 @@ export type MakePercentageIntervalGql = {
makePercentage: Scalars["Float"]["output"];
};
export type MustHaveSetForUploadLinkErr = {
__typename?: "MustHaveSetForUploadLinkErr";
framesPerSecond?: Maybe<Scalars["Boolean"]["output"]>;
resolution?: Maybe<Scalars["Boolean"]["output"]>;
};
export type MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
| MustHaveSetForUploadLinkErr
| NoInitForChunkedUploadErr
| ProcessingFailedErr
| SegmentAlreadyUploadedErr
| TooManyProfileImageUploadsErr;
export type Mutation = {
__typename?: "Mutation";
addAnnotationToShot: Scalars["Boolean"]["output"];
@@ -1214,6 +1232,11 @@ export type MutationSetSegmentDurationArgs = {
videoId: Scalars["Int"]["input"];
};
export type NoInitForChunkedUploadErr = {
__typename?: "NoInitForChunkedUploadErr";
segmentType: StreamSegmentTypeEnum;
};
export type PageInfoGql = {
__typename?: "PageInfoGQL";
endCursor?: Maybe<Scalars["String"]["output"]>;
@@ -1243,6 +1266,11 @@ export type PocketingIntentionFeaturesGql = {
targetPocketDistance?: Maybe<Scalars["Float"]["output"]>;
};
export type ProcessingFailedErr = {
__typename?: "ProcessingFailedErr";
processing: VideoProcessingGql;
};
export enum ProcessingStatusEnum {
Created = "CREATED",
Failed = "FAILED",
@@ -1335,6 +1363,11 @@ export type RangeFilter = {
lessThanInclusive?: Scalars["Boolean"]["input"];
};
export type SegmentAlreadyUploadedErr = {
__typename?: "SegmentAlreadyUploadedErr";
segmentId: Scalars["Int"]["output"];
};
export type SerializedShotPathsGql = {
__typename?: "SerializedShotPathsGQL";
b64EncodedBuffer?: Maybe<Scalars["String"]["output"]>;
@@ -1408,6 +1441,19 @@ export type TargetMetricsGql = {
makePercentage?: Maybe<Scalars["Float"]["output"]>;
};
export type TooManyProfileImageUploadsErr = {
__typename?: "TooManyProfileImageUploadsErr";
linksRequested: Scalars["Int"]["output"];
};
export type UploadLink = {
__typename?: "UploadLink";
headers: Array<Maybe<Header>>;
uploadUrl: Scalars["String"]["output"];
};
export type UploadLinkGetUploadLinkErrors = GetUploadLinkErrors | UploadLink;
export type UploadSegmentGql = {
__typename?: "UploadSegmentGQL";
durationInSeconds?: Maybe<Scalars["Float"]["output"]>;
@@ -1732,12 +1778,28 @@ export type GetProfileImageUploadLinkMutation = {
__typename?: "Mutation";
getProfileImageUploadLink: {
__typename?: "GetUploadLinkReturn";
uploadUrl: string;
headers: Array<{
__typename?: "Header";
key: string;
value: string;
} | null>;
value:
| {
__typename?: "GetUploadLinkErrors";
error:
| { __typename?: "MustHaveSetForUploadLinkErr" }
| { __typename?: "NoInitForChunkedUploadErr" }
| { __typename?: "ProcessingFailedErr" }
| { __typename?: "SegmentAlreadyUploadedErr" }
| {
__typename?: "TooManyProfileImageUploadsErr";
linksRequested: number;
};
}
| {
__typename?: "UploadLink";
uploadUrl: string;
headers: Array<{
__typename?: "Header";
key: string;
value: string;
} | null>;
};
};
};
@@ -1933,13 +1995,10 @@ export type GetVideosQuery = {
getVideos: Array<{
__typename?: "VideoGQL";
id: number;
playlist?: {
__typename?: "HLSPlaylistGQL";
segmentDurations: Array<number>;
} | null;
stream?: {
__typename?: "UploadStreamGQL";
id: string;
streamSegmentType: StreamSegmentTypeEnum;
segments: Array<{
__typename?: "UploadSegmentGQL";
uploaded: boolean;
@@ -1949,6 +2008,10 @@ export type GetVideosQuery = {
framesPerSecond?: number | null;
}>;
} | null;
playlist?: {
__typename?: "HLSPlaylistGQL";
segmentDurations: Array<number>;
} | null;
}>;
};
@@ -2096,12 +2159,39 @@ export type GetUploadLinkMutation = {
__typename?: "Mutation";
getUploadLink: {
__typename?: "GetUploadLinkReturn";
uploadUrl: string;
headers: Array<{
__typename?: "Header";
key: string;
value: string;
} | null>;
value:
| {
__typename?: "GetUploadLinkErrors";
error:
| {
__typename?: "MustHaveSetForUploadLinkErr";
resolution?: boolean | null;
framesPerSecond?: boolean | null;
}
| { __typename?: "NoInitForChunkedUploadErr" }
| {
__typename?: "ProcessingFailedErr";
processing: {
__typename?: "VideoProcessingGQL";
status: ProcessingStatusEnum;
errors: Array<{
__typename?: "VideoProcessingErrorGQL";
message: string;
}>;
};
}
| { __typename?: "SegmentAlreadyUploadedErr"; segmentId: number }
| { __typename?: "TooManyProfileImageUploadsErr" };
}
| {
__typename?: "UploadLink";
uploadUrl: string;
headers: Array<{
__typename?: "Header";
key: string;
value: string;
} | null>;
};
};
};
@@ -2113,12 +2203,28 @@ export type GetHlsInitUploadLinkMutation = {
__typename?: "Mutation";
getHlsInitUploadLink: {
__typename?: "GetUploadLinkReturn";
uploadUrl: string;
headers: Array<{
__typename?: "Header";
key: string;
value: string;
} | null>;
value:
| {
__typename?: "GetUploadLinkErrors";
error:
| { __typename?: "MustHaveSetForUploadLinkErr" }
| {
__typename?: "NoInitForChunkedUploadErr";
segmentType: StreamSegmentTypeEnum;
}
| { __typename?: "ProcessingFailedErr" }
| { __typename?: "SegmentAlreadyUploadedErr" }
| { __typename?: "TooManyProfileImageUploadsErr" };
}
| {
__typename?: "UploadLink";
uploadUrl: string;
headers: Array<{
__typename?: "Header";
key: string;
value: string;
} | null>;
};
};
};
@@ -2729,10 +2835,21 @@ export type GetShotAnnotationTypesQueryResult = Apollo.QueryResult<
export const GetProfileImageUploadLinkDocument = gql`
mutation getProfileImageUploadLink($fileExt: String = ".png") {
getProfileImageUploadLink(fileExt: $fileExt) {
uploadUrl
headers {
key
value
value {
... on UploadLink {
uploadUrl
headers {
key
value
}
}
... on GetUploadLinkErrors {
error {
... on TooManyProfileImageUploadsErr {
linksRequested
}
}
}
}
}
}
@@ -3432,11 +3549,9 @@ export const GetVideosDocument = gql`
query GetVideos($videoIds: [Int!]!) {
getVideos(videoIds: $videoIds) {
id
playlist {
segmentDurations
}
stream {
id
streamSegmentType
segments {
uploaded
valid
@@ -3445,6 +3560,9 @@ export const GetVideosDocument = gql`
framesPerSecond
}
}
playlist {
segmentDurations
}
}
}
`;
@@ -3996,10 +4114,33 @@ export type CreateUploadStreamMutationOptions = Apollo.BaseMutationOptions<
export const GetUploadLinkDocument = gql`
mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
uploadUrl
headers {
key
value
value {
... on UploadLink {
uploadUrl
headers {
key
value
}
}
... on GetUploadLinkErrors {
error {
... on MustHaveSetForUploadLinkErr {
resolution
framesPerSecond
}
... on SegmentAlreadyUploadedErr {
segmentId
}
... on ProcessingFailedErr {
processing {
status
errors {
message
}
}
}
}
}
}
}
}
@@ -4051,10 +4192,21 @@ export type GetUploadLinkMutationOptions = Apollo.BaseMutationOptions<
export const GetHlsInitUploadLinkDocument = gql`
mutation GetHlsInitUploadLink($videoId: Int!) {
getHlsInitUploadLink(videoId: $videoId) {
uploadUrl
headers {
key
value
value {
... on UploadLink {
uploadUrl
headers {
key
value
}
}
... on GetUploadLinkErrors {
error {
... on NoInitForChunkedUploadErr {
segmentType
}
}
}
}
}
}

View File

@@ -1,9 +1,20 @@
mutation getProfileImageUploadLink($fileExt: String = ".png") {
getProfileImageUploadLink(fileExt: $fileExt) {
uploadUrl
headers {
key
value
value {
... on UploadLink {
uploadUrl
headers {
key
value
}
}
... on GetUploadLinkErrors {
error {
... on TooManyProfileImageUploadsErr {
linksRequested
}
}
}
}
}
}

View File

@@ -118,11 +118,9 @@ query GetVideoDetails($videoId: Int!) {
query GetVideos($videoIds: [Int!]!) {
getVideos(videoIds: $videoIds) {
id
playlist {
segmentDurations
}
stream {
id
streamSegmentType
segments {
uploaded
valid
@@ -131,6 +129,9 @@ query GetVideos($videoIds: [Int!]!) {
framesPerSecond
}
}
playlist {
segmentDurations
}
}
}

View File

@@ -6,20 +6,54 @@ mutation CreateUploadStream($videoMetadataInput: VideoMetadataInput!) {
mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
uploadUrl
headers {
key
value
value {
... on UploadLink {
uploadUrl
headers {
key
value
}
}
... on GetUploadLinkErrors {
error {
... on MustHaveSetForUploadLinkErr {
resolution
framesPerSecond
}
... on SegmentAlreadyUploadedErr {
segmentId
}
... on ProcessingFailedErr {
processing {
status
errors {
message
}
}
}
}
}
}
}
}
mutation GetHlsInitUploadLink($videoId: Int!) {
getHlsInitUploadLink(videoId: $videoId) {
uploadUrl
headers {
key
value
value {
... on UploadLink {
uploadUrl
headers {
key
value
}
}
... on GetUploadLinkErrors {
error {
... on NoInitForChunkedUploadErr {
segmentType
}
}
}
}
}
}

View File

@@ -458,9 +458,15 @@ input CreateBucketSetInput {
}
type GetUploadLinkReturn {
value: UploadLinkGetUploadLinkErrors!
stream: UploadStreamGQL
}
union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
type UploadLink {
uploadUrl: String!
headers: [Header]!
uploadCompletionCursor: Int
}
type Header {
@@ -468,6 +474,38 @@ type Header {
value: String!
}
type GetUploadLinkErrors {
error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr!
}
union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
MustHaveSetForUploadLinkErr
| SegmentAlreadyUploadedErr
| ProcessingFailedErr
| NoInitForChunkedUploadErr
| TooManyProfileImageUploadsErr
type MustHaveSetForUploadLinkErr {
resolution: Boolean
framesPerSecond: Boolean
}
type SegmentAlreadyUploadedErr {
segmentId: Int!
}
type ProcessingFailedErr {
processing: VideoProcessingGQL!
}
type NoInitForChunkedUploadErr {
segmentType: StreamSegmentTypeEnum!
}
type TooManyProfileImageUploadsErr {
linksRequested: Int!
}
type CreateUploadStreamReturn {
videoId: Int!
}