Let's use AI to Earn!
TypeScript auto-publishdouyindouyin-apielectron-appelectron-reactkuaishoukwaipublishedshipinhaotoolxiaohongshu
fix(publish): youtobe publish format (#390)
nevin54e02ca19e5b
diff --git a/project/backend/apps/aitoearn-channel/src/core/platforms/meta/linkedin.service.ts b/project/backend/apps/aitoearn-channel/src/core/platforms/meta/linkedin.service.tsindex 54849dff..edf75dc8 100644--- a/project/backend/apps/aitoearn-channel/src/core/platforms/meta/linkedin.service.ts+++ b/project/backend/apps/aitoearn-channel/src/core/platforms/meta/linkedin.service.ts@@ -79,10 +79,7 @@ export class LinkedinService extends MetaBaseService {],},}- this.logger.log(`Init upload request: ${JSON.stringify(initMediaUploadReq)}, accessToken: ${credential.access_token}`)-const initUploadResp = await this.linkedinAPIService.initMediaUpload(credential.access_token, initMediaUploadReq)- this.logger.log(`Init upload response: ${JSON.stringify(initUploadResp)}`)const dest = initUploadResp.value.uploadMechanism['com.linkedin.digitalmedia.uploading.MediaUploadHttpRequest'].uploadUrlawait this.linkedinAPIService.streamUpload(credential.access_token, src, dest)return initUploadResp.value.asset@@ -122,10 +119,7 @@ export class LinkedinService extends MetaBaseService {],},}- this.logger.log(`Init upload request: ${JSON.stringify(initMediaUploadReq)}, accessToken: ${credential.access_token}`)-const initUploadResp = await this.linkedinAPIService.initMediaUpload(credential.access_token, initMediaUploadReq)- this.logger.log(`Init upload response: ${JSON.stringify(initUploadResp)}`)const uploadURL = initUploadResp.value.uploadMechanism['com.linkedin.digitalmedia.uploading.MediaUploadHttpRequest'].uploadUrlawait this.linkedinAPIService.streamUpload(credential.access_token, uploadURL, 'https://aitoearn.s3.ap-southeast-1.amazonaws.com/production/temp/uploads/9287ddb9-2180-4a3a-9cb2-91fadc1e50be.mp4')@@ -148,7 +142,6 @@ export class LinkedinService extends MetaBaseService {},visibility: { 'com.linkedin.ugc.MemberNetworkVisibility': MemberNetworkVisibility.PUBLIC },}- this.logger.log(`Create share request: ${JSON.stringify(createShareReq)}`)return await this.linkedinAPIService.createShare(credential.access_token, createShareReq)}diff --git a/project/backend/apps/aitoearn-channel/src/core/platforms/youtube/youtube.controller.ts b/project/backend/apps/aitoearn-channel/src/core/platforms/youtube/youtube.controller.tsindex ef952b94..81fb51d3 100644--- a/project/backend/apps/aitoearn-channel/src/core/platforms/youtube/youtube.controller.ts+++ b/project/backend/apps/aitoearn-channel/src/core/platforms/youtube/youtube.controller.ts@@ -204,16 +204,12 @@ export class YoutubeController {return res}- // 视频上传(20M以下小视频)- // @NatsMessagePattern('plat.youtube.uploadVideo')@ApiDoc({summary: 'Upload Small Video',body: UploadVideoDto.schema,})@Post('plat/youtube/uploadVideo')async uploadVideo(@Body() data: UploadVideoDto) {- this.logger.log('接收到上传视频请求:', data.accountId, data.fileName)-const res = this.youtubeService.uploadVideo(data.accountId,data.fileBuffer,diff --git a/project/backend/apps/aitoearn-channel/src/core/platforms/youtube/youtube.service.ts b/project/backend/apps/aitoearn-channel/src/core/platforms/youtube/youtube.service.tsindex 9e6f64bc..761464ba 100644--- a/project/backend/apps/aitoearn-channel/src/core/platforms/youtube/youtube.service.ts+++ b/project/backend/apps/aitoearn-channel/src/core/platforms/youtube/youtube.service.ts@@ -210,13 +210,11 @@ export class YoutubeService extends PlatformBaseService {let credential = await this.redisService.getJson<any>(`youtube:accessToken:${accountId}`,)- this.logger.log(`getOAuth2Credential from redis: ${JSON.stringify(credential)}`)if (!credential || !credential.refresh_token) {const oauth2Credential = await this.OAuth2CredentialModel.findOne({accountId,platform: this.platform,})- this.logger.log(`getOAuth2Credential from db: ${JSON.stringify(oauth2Credential)}`)if (!oauth2Credential) {return null}@@ -241,31 +239,15 @@ export class YoutubeService extends PlatformBaseService {`youtube:authTask:${taskId}`,)if (!authTaskState || authTaskState.state !== taskId)- return null+ return { status: 0, message: '无效的任务ID' }try {// 使用授权码获取访问令牌和刷新令牌- const params = new URLSearchParams({- code,- redirect_uri: `${this.webRenderBaseUrl}`,- client_id: this.webClientId,- grant_type: 'authorization_code',- client_secret: this.webClientSecret,- })-- const response = await axios.post(- 'https://oauth2.googleapis.com/token',- params.toString(),- {- headers: { 'Content-Type': 'application/x-www-form-urlencoded' },- },- )-- const accessTokenInfo = response.data- const access_token = accessTokenInfo.access_token- const refresh_token = accessTokenInfo.refresh_token- const expires_in = accessTokenInfo.expires_in- const id_token = accessTokenInfo.id_token+ const accessTokenInfo = await this.youtubeApiService.getAccessToken(code, `${this.webRenderBaseUrl}`)+ if (!accessTokenInfo) {+ return { status: 0, message: '获取访问令牌失败' }+ }+ const { access_token, refresh_token, expires_in, id_token } = accessTokenInfo// 验证ID令牌以获取用户信息this.initializeYouTubeClient(access_token)const ticket = await this.oauth2Client.verifyIdToken({@@ -275,7 +257,7 @@ export class YoutubeService extends PlatformBaseService {const payload = ticket.getPayload()if (!payload) {- throw new Error('Invalid ID token')+ return { status: 0, message: '验证ID令牌失败' }}const googleId = payload.subconst email = payload.email || ''@@ -319,8 +301,7 @@ export class YoutubeService extends PlatformBaseService {this.logger.error(`处理授权码失败: ${error}`)return {status: 0,- message: '处理授权码失败',- accountId: error,+ message: `处理授权码失败: ${error.message}`,}}}@@ -357,22 +338,15 @@ export class YoutubeService extends PlatformBaseService {if (!response.data.items || response.data.items.length === 0) {this.logger.log(`无法获取YouTube频道信息,将从Google用户信息获取`)try {- const responseGoogle = await axios.get(- 'https://www.googleapis.com/oauth2/v3/userinfo',- {- headers: {- Authorization: `Bearer ${accessToken}`,- },- },- )-- const userInfoData = responseGoogle.data+ const userInfoData = await this.youtubeApiService.getUserInfoFromGoogle(accessToken)+ if (!userInfoData) {+ throw new Error('获取Google用户信息失败')+ }// 使用Google用户信息更新账号数据newAccount = googleId || userInfoData.emailnewNickname = userInfoData.name || ''newAvatar = userInfoData.picture || ''- this.logger.log('成功获取Google用户信息:', userInfoData)}catch (error) {this.logger.error('获取Google用户信息失败:', error)@@ -386,7 +360,6 @@ export class YoutubeService extends PlatformBaseService {newAccount = channel.id || ''newNickname = channel.snippet?.title || ''newAvatar = channel.snippet?.thumbnails?.default?.url || ''- this.logger.log(`成功获取YouTube频道信息: ${channel.snippet?.title}`)}const channelInfo = new NewAccount({@@ -455,8 +428,6 @@ export class YoutubeService extends PlatformBaseService {* @returns 访问令牌*/async getUserAccessToken(accountId: string) {- this.logger.log(`getUserAccessToken accountId: ${accountId}`)-const credential = await this.getOAuth2Credential(accountId)if (!credential || !credential.access_token) {this.logger.error(`youtube credential not found for accountId: ${accountId}`)@@ -511,14 +482,12 @@ export class YoutubeService extends PlatformBaseService {* 获取授权URL* @param userId* @param mail- * @param type* @param prefix* @returns*/async getAuthUrl(userId: string,mail: string,- // type: 'h5' | 'pc',prefix?: string,spaceId?: string,) {@@ -593,22 +562,17 @@ export class YoutubeService extends PlatformBaseService {id?: string,regionCode?: string,) {- this.logger.log(`youtubeService getVideoCategoriesList: ${accountId}, ${id}, ${regionCode}}`)// 使用封装的辅助方法if (!(await this.ensureValidAccessToken(accountId))) {- this.logger.log(`get youtube access token error. accountId" ${accountId}`)throw new AppException(ResponseCode.ChannelAccessTokenFailed)}try {- // this.logger.log(requestBody)const response = await this.youtubeClient.videoCategories.list({part: ['snippet'],...(id && { id: [id] }),...(regionCode && { regionCode }),auth: this.oauth2Client,})-- // this.logger.log(response.data)return response}catch (err) {@@ -619,11 +583,6 @@ export class YoutubeService extends PlatformBaseService {/*** 获取视频列表。- * @param id 视频ID- * @param chart 图表类型- * @param maxResults 最大结果数- * @param pageToken 分页令牌- * @returns 视频列表*/async getVideosList(accountId: string,@@ -632,11 +591,9 @@ export class YoutubeService extends PlatformBaseService {myRating?: boolean,maxResults?: number,pageToken?: string,- // params: GetVideosListParams,) {// 使用封装的辅助方法if (!(await this.ensureValidAccessToken(accountId))) {- this.logger.log(`get youtube access token error. accountId" ${accountId}`)return new AppException(ResponseCode.ChannelAccessTokenFailed)}@@ -667,10 +624,8 @@ export class YoutubeService extends PlatformBaseService {requestParams.pageToken = pageToken // 如果提供了 handle, 使用 handle}- this.logger.log(requestParams)try {const response = await this.youtubeClient.videos.list(requestParams)- // const response = await this.youtubeApiService.getVideosList(requestParams)return response}catch (err) {@@ -724,10 +679,8 @@ export class YoutubeService extends PlatformBaseService {bufferInstance = Buffer.from(Object.values(fileBuffer))}else {- this.logger.log('无效的文件Buffer格式')return '无效的文件Buffer格式'}- this.logger.log('文件大小:', bufferInstance.length, '字节')// 客户端已经在 ensureValidAccessToken 中初始化了diff --git a/project/backend/apps/aitoearn-channel/src/core/publishing/providers/linkedin.service.ts b/project/backend/apps/aitoearn-channel/src/core/publishing/providers/linkedin.service.tsindex 9bfa5fc8..744238c0 100644--- a/project/backend/apps/aitoearn-channel/src/core/publishing/providers/linkedin.service.ts+++ b/project/backend/apps/aitoearn-channel/src/core/publishing/providers/linkedin.service.ts@@ -134,7 +134,7 @@ export class LinkedinPublishService extends PublishService {specificContent: {'com.linkedin.ugc.ShareContent': {shareCommentary: { text: this.generatePostMessage(publishTask) || '' },- shareMediaCategory: ShareMediaCategory.IMAGE,+ shareMediaCategory: ShareMediaCategory.VIDEO,media: [{status: 'READY',diff --git a/project/backend/apps/aitoearn-channel/src/libs/linkedin/linkedin.interface.ts b/project/backend/apps/aitoearn-channel/src/libs/linkedin/linkedin.interface.tsindex 84fdeebf..ad8b7069 100644--- a/project/backend/apps/aitoearn-channel/src/libs/linkedin/linkedin.interface.ts+++ b/project/backend/apps/aitoearn-channel/src/libs/linkedin/linkedin.interface.ts@@ -11,6 +11,7 @@ export enum ShareMediaCategory {NONE = 'NONE',IMAGE = 'IMAGE',ARTICLE = 'ARTICLE',+ VIDEO = 'VIDEO',}export enum MemberNetworkVisibility {diff --git a/project/backend/apps/aitoearn-channel/src/libs/youtube/youtubeApi.service.ts b/project/backend/apps/aitoearn-channel/src/libs/youtube/youtubeApi.service.tsindex 8b6df1b9..ec58aacf 100644--- a/project/backend/apps/aitoearn-channel/src/libs/youtube/youtubeApi.service.ts+++ b/project/backend/apps/aitoearn-channel/src/libs/youtube/youtubeApi.service.ts@@ -70,13 +70,10 @@ export class YoutubeApiService {client_secret: this.webClientSecret,})- const response = await axios.post('https://oauth2.googleapis.com/token', params.toString(), {+ const response = await axios.post<AccessToken>('https://oauth2.googleapis.com/token', params.toString(), {headers: { 'Content-Type': 'application/x-www-form-urlencoded' },})- const { access_token, refresh_token, expires_in, id_token }- = response.data-- return { access_token, refresh_token, expires_in, id_token }+ return response.data}catch (err) {this.logger.error(err)@@ -111,6 +108,7 @@ export class YoutubeApiService {catch (err) {// this.logger.error('Failed to refresh access token')this.logger.error(err)+ return null}}diff --git a/project/backend/apps/aitoearn-server/src/transports/channel/api/youtube.natsApi.ts b/project/backend/apps/aitoearn-server/src/transports/channel/api/youtube.natsApi.tsindex 9758807f..04e49420 100644--- a/project/backend/apps/aitoearn-server/src/transports/channel/api/youtube.natsApi.ts+++ b/project/backend/apps/aitoearn-server/src/transports/channel/api/youtube.natsApi.ts@@ -30,12 +30,6 @@ export class PlatYoutubeNatsApi extends ChannelBaseApi {return res}- /**- * 创建账号- * @param data- * @param prefix- * @returns- */async setAccessToken(data: {taskId: string@@ -46,7 +40,7 @@ export class PlatYoutubeNatsApi extends ChannelBaseApi {const res = await this.sendMessage<{status: numbermessage: string- accountId: any+ accountId: string}>(`plat/youtube/setAccessToken`,data,