Tv publish api #209

Merged
jessopb merged 2 commits from tvPublishAPI into master 2019-10-22 22:33:57 +02:00
8 changed files with 55 additions and 10 deletions
Showing only changes of commit 5ee22d42d6 - Show all commits

38
dist/bundle.es.js vendored
View file

@ -652,6 +652,12 @@ var transaction_list = /*#__PURE__*/Object.freeze({
PAGE_SIZE: PAGE_SIZE$1 PAGE_SIZE: PAGE_SIZE$1
}); });
const AUTH_TOKEN = 'X-Lbry-Auth-Token';
var headers = /*#__PURE__*/Object.freeze({
AUTH_TOKEN: AUTH_TOKEN
});
const SEARCH_TYPES = { const SEARCH_TYPES = {
FILE: 'file', FILE: 'file',
CHANNEL: 'channel', CHANNEL: 'channel',
@ -709,6 +715,7 @@ const Lbry = {
setOverride: (methodName, newMethod) => { setOverride: (methodName, newMethod) => {
Lbry.overrides[methodName] = newMethod; Lbry.overrides[methodName] = newMethod;
}, },
getApiRequestHeaders: () => Lbry.apiRequestHeaders,
// Returns a human readable media type based on the content type or extension of a file that is returned by the sdk // Returns a human readable media type based on the content type or extension of a file that is returned by the sdk
getMediaType: (contentType, fileName) => { getMediaType: (contentType, fileName) => {
@ -744,7 +751,6 @@ const Lbry = {
// Claim fetching and manipulation // Claim fetching and manipulation
resolve: params => daemonCallWithResult('resolve', params), resolve: params => daemonCallWithResult('resolve', params),
get: params => daemonCallWithResult('get', params), get: params => daemonCallWithResult('get', params),
publish: params => daemonCallWithResult('publish', params),
claim_search: params => daemonCallWithResult('claim_search', params), claim_search: params => daemonCallWithResult('claim_search', params),
claim_list: params => daemonCallWithResult('claim_list', params), claim_list: params => daemonCallWithResult('claim_list', params),
channel_create: params => daemonCallWithResult('channel_create', params), channel_create: params => daemonCallWithResult('channel_create', params),
@ -814,6 +820,14 @@ const Lbry = {
} }
}; };
Lbry.publish = (params = {}) => new Promise((resolve, reject) => {
if (Lbry.overrides.publish) {
Lbry.overrides.publish(params).then(resolve, reject);
} else {
apiCall('publish', params, resolve, reject);
}
});
function checkAndParse(response) { function checkAndParse(response) {
if (response.status >= 200 && response.status < 300) { if (response.status >= 200 && response.status < 300) {
return response.json(); return response.json();
@ -1079,6 +1093,18 @@ function buildURI(UrlObj, includeProto = true, protoDefault = 'lbry://') {
deprecatedParts = _objectWithoutProperties(UrlObj, ['streamName', 'streamClaimId', 'channelName', 'channelClaimId', 'primaryClaimSequence', 'primaryBidPosition', 'secondaryClaimSequence', 'secondaryBidPosition']); deprecatedParts = _objectWithoutProperties(UrlObj, ['streamName', 'streamClaimId', 'channelName', 'channelClaimId', 'primaryClaimSequence', 'primaryBidPosition', 'secondaryClaimSequence', 'secondaryBidPosition']);
const { claimId, claimName, contentName } = deprecatedParts; const { claimId, claimName, contentName } = deprecatedParts;
{
if (claimId) {
console.error(__("'claimId' should no longer be used. Use 'streamClaimId' or 'channelClaimId' instead"));
}
if (claimName) {
console.error(__("'claimName' should no longer be used. Use 'streamClaimName' or 'channelClaimName' instead"));
}
if (contentName) {
console.error(__("'contentName' should no longer be used. Use 'streamName' instead"));
}
}
if (!claimName && !channelName && !streamName) { if (!claimName && !channelName && !streamName) {
console.error(__("'claimName', 'channelName', and 'streamName' are all empty. One must be present to build a url.")); console.error(__("'claimName', 'channelName', and 'streamName' are all empty. One must be present to build a url."));
} }
@ -3192,6 +3218,9 @@ function doSetFileListSort(page, value) {
}; };
} }
const SPEECH_STATUS = 'https://spee.ch/api/config/site/publishing';
const SPEECH_PUBLISH = 'https://spee.ch/api/claim/publish';
function _objectWithoutProperties$2(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; } function _objectWithoutProperties$2(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
const selectState$5 = state => state.publish || {}; const selectState$5 = state => state.publish || {};
@ -3289,7 +3318,7 @@ const doResetThumbnailStatus = () => dispatch => {
} }
}); });
return fetch('https://spee.ch/api/config/site/publishing').then(res => res.json()).then(status => { return fetch(SPEECH_STATUS).then(res => res.json()).then(status => {
if (status.disabled) { if (status.disabled) {
throw Error(); throw Error();
} }
@ -3358,7 +3387,7 @@ const doUploadThumbnail = (filePath, thumbnailBuffer, fsAdapter, fs, path) => di
// $FlowFixMe // $FlowFixMe
data.append('file', { uri: 'file://' + filePath, type: fileType, name: fileName }); data.append('file', { uri: 'file://' + filePath, type: fileType, name: fileName });
return fetch('https://spee.ch/api/claim/publish', { return fetch(SPEECH_PUBLISH, {
method: 'POST', method: 'POST',
body: data body: data
}).then(response => response.json()).then(json => json.success ? dispatch({ }).then(response => response.json()).then(json => json.success ? dispatch({
@ -3390,7 +3419,7 @@ const doUploadThumbnail = (filePath, thumbnailBuffer, fsAdapter, fs, path) => di
data.append('name', name); data.append('name', name);
data.append('file', file); data.append('file', file);
return fetch('https://spee.ch/api/claim/publish', { return fetch(SPEECH_PUBLISH, {
method: 'POST', method: 'POST',
body: data body: data
}).then(response => response.json()).then(json => json.success ? dispatch({ }).then(response => response.json()).then(json => json.success ? dispatch({
@ -5260,6 +5289,7 @@ exports.ACTIONS = action_types;
exports.CLAIM_VALUES = claim; exports.CLAIM_VALUES = claim;
exports.DEFAULT_FOLLOWED_TAGS = DEFAULT_FOLLOWED_TAGS; exports.DEFAULT_FOLLOWED_TAGS = DEFAULT_FOLLOWED_TAGS;
exports.DEFAULT_KNOWN_TAGS = DEFAULT_KNOWN_TAGS; exports.DEFAULT_KNOWN_TAGS = DEFAULT_KNOWN_TAGS;
exports.HEADERS = headers;
exports.LICENSES = licenses; exports.LICENSES = licenses;
exports.Lbry = lbryProxy; exports.Lbry = lbryProxy;
exports.MATURE_TAGS = MATURE_TAGS; exports.MATURE_TAGS = MATURE_TAGS;

View file

@ -168,7 +168,7 @@ declare type LbryTypes = {
version: () => Promise<VersionResponse>, version: () => Promise<VersionResponse>,
resolve: (params: {}) => Promise<ResolveResponse>, resolve: (params: {}) => Promise<ResolveResponse>,
get: (params: {}) => Promise<GetResponse>, get: (params: {}) => Promise<GetResponse>,
publish: (params: {}) => Promise<PublishResponse>, publish?: (params: {}) => Promise<PublishResponse>,
claim_search: (params: {}) => Promise<ClaimSearchResponse>, claim_search: (params: {}) => Promise<ClaimSearchResponse>,
claim_list: (params?: {}) => Promise<ClaimListResponse>, claim_list: (params?: {}) => Promise<ClaimListResponse>,

2
flow-typed/Lbry.js vendored
View file

@ -168,7 +168,7 @@ declare type LbryTypes = {
version: () => Promise<VersionResponse>, version: () => Promise<VersionResponse>,
resolve: (params: {}) => Promise<ResolveResponse>, resolve: (params: {}) => Promise<ResolveResponse>,
get: (params: {}) => Promise<GetResponse>, get: (params: {}) => Promise<GetResponse>,
publish: (params: {}) => Promise<PublishResponse>, publish?: (params: {}) => Promise<PublishResponse>,
claim_search: (params: {}) => Promise<ClaimSearchResponse>, claim_search: (params: {}) => Promise<ClaimSearchResponse>,
claim_list: (params?: {}) => Promise<ClaimListResponse>, claim_list: (params?: {}) => Promise<ClaimListResponse>,

1
src/constants/headers.js Normal file
View file

@ -0,0 +1 @@
kauffj commented 2019-09-30 23:11:14 +02:00 (Migrated from github.com)
Review

does this have to be in lbry-redux?

does this have to be in `lbry-redux`?
kauffj commented 2019-09-30 23:11:14 +02:00 (Migrated from github.com)
Review

does this have to be in lbry-redux?

does this have to be in `lbry-redux`?
export const AUTH_TOKEN = 'X-Lbry-Auth-Token';
kauffj commented 2019-09-30 23:11:14 +02:00 (Migrated from github.com)
Review

does this have to be in lbry-redux?

does this have to be in `lbry-redux`?

View file

@ -0,0 +1,2 @@
export const SPEECH_STATUS = 'https://spee.ch/api/config/site/publishing';
export const SPEECH_PUBLISH = 'https://spee.ch/api/claim/publish';
kauffj commented 2019-09-27 19:20:32 +02:00 (Migrated from github.com)
Review

👏 good change

:clap: good change

View file

@ -7,6 +7,7 @@ import * as SORT_OPTIONS from 'constants/sort_options';
import * as THUMBNAIL_STATUSES from 'constants/thumbnail_upload_statuses'; import * as THUMBNAIL_STATUSES from 'constants/thumbnail_upload_statuses';
import * as TRANSACTIONS from 'constants/transaction_types'; import * as TRANSACTIONS from 'constants/transaction_types';
import * as TX_LIST from 'constants/transaction_list'; import * as TX_LIST from 'constants/transaction_list';
import * as HEADERS from 'constants/headers';
import { SEARCH_TYPES, SEARCH_OPTIONS } from 'constants/search'; import { SEARCH_TYPES, SEARCH_OPTIONS } from 'constants/search';
import { DEFAULT_KNOWN_TAGS, DEFAULT_FOLLOWED_TAGS, MATURE_TAGS } from 'constants/tags'; import { DEFAULT_KNOWN_TAGS, DEFAULT_FOLLOWED_TAGS, MATURE_TAGS } from 'constants/tags';
import Lbry from 'lbry'; import Lbry from 'lbry';
@ -28,6 +29,7 @@ export {
DEFAULT_KNOWN_TAGS, DEFAULT_KNOWN_TAGS,
DEFAULT_FOLLOWED_TAGS, DEFAULT_FOLLOWED_TAGS,
MATURE_TAGS, MATURE_TAGS,
HEADERS,
}; };
// common // common

View file

@ -30,6 +30,7 @@ const Lbry: LbryTypes = {
setOverride: (methodName, newMethod) => { setOverride: (methodName, newMethod) => {
Lbry.overrides[methodName] = newMethod; Lbry.overrides[methodName] = newMethod;
}, },
getApiRequestHeaders: () => Lbry.apiRequestHeaders,
// Returns a human readable media type based on the content type or extension of a file that is returned by the sdk // Returns a human readable media type based on the content type or extension of a file that is returned by the sdk
getMediaType: (contentType?: string, fileName: ?string) => { getMediaType: (contentType?: string, fileName: ?string) => {
@ -74,7 +75,6 @@ const Lbry: LbryTypes = {
// Claim fetching and manipulation // Claim fetching and manipulation
resolve: params => daemonCallWithResult('resolve', params), resolve: params => daemonCallWithResult('resolve', params),
get: params => daemonCallWithResult('get', params), get: params => daemonCallWithResult('get', params),
publish: params => daemonCallWithResult('publish', params),
claim_search: params => daemonCallWithResult('claim_search', params), claim_search: params => daemonCallWithResult('claim_search', params),
claim_list: params => daemonCallWithResult('claim_list', params), claim_list: params => daemonCallWithResult('claim_list', params),
channel_create: params => daemonCallWithResult('channel_create', params), channel_create: params => daemonCallWithResult('channel_create', params),
@ -146,6 +146,15 @@ const Lbry: LbryTypes = {
}, },
}; };
Lbry.publish = (params = {}) =>
new Promise((resolve, reject) => {
if (Lbry.overrides.publish) {
Lbry.overrides.publish(params).then(resolve, reject);
} else {
apiCall('publish', params, resolve, reject);
}
});
function checkAndParse(response) { function checkAndParse(response) {
if (response.status >= 200 && response.status < 300) { if (response.status >= 200 && response.status < 300) {
kauffj commented 2019-09-27 19:24:49 +02:00 (Migrated from github.com)
Review

lbry-redux should not know about lbry.tv

I would find any of the following preferable:

  • A distinct method call for publishing, separate from apiCall, that has a parameter for local vs. remote (or a boolean for whether to post the file, or equivalent).
  • An @if TARGET statement by-passing the traditional publish call to so something special for lbry.tv directly in lbry-desktop
lbry-redux should not know about lbry.tv I would find any of the following preferable: - A distinct method call for publishing, separate from `apiCall`, that has a parameter for local vs. remote (or a boolean for whether to post the file, or equivalent). - An `@if TARGET` statement by-passing the traditional publish call to so something special for lbry.tv directly in `lbry-desktop`
kauffj commented 2019-09-27 19:25:20 +02:00 (Migrated from github.com)
Review

this is a magic condition

this is a magic condition
kauffj commented 2019-09-27 19:25:41 +02:00 (Migrated from github.com)
Review

I believe x-lbry-auth-token should not be allowed in lbry-redux

I believe `x-lbry-auth-token` should not be allowed in lbry-redux
return response.json(); return response.json();

View file

@ -1,5 +1,6 @@
// @flow // @flow
import { CC_LICENSES, COPYRIGHT, OTHER, NONE, PUBLIC_DOMAIN } from 'constants/licenses'; import { CC_LICENSES, COPYRIGHT, OTHER, NONE, PUBLIC_DOMAIN } from 'constants/licenses';
import { SPEECH_STATUS, SPEECH_PUBLISH } from 'constants/speech_urls';
import * as ACTIONS from 'constants/action_types'; import * as ACTIONS from 'constants/action_types';
import * as THUMBNAIL_STATUSES from 'constants/thumbnail_upload_statuses'; import * as THUMBNAIL_STATUSES from 'constants/thumbnail_upload_statuses';
import Lbry from 'lbry'; import Lbry from 'lbry';
@ -22,7 +23,7 @@ export const doResetThumbnailStatus = () => (dispatch: Dispatch) => {
}, },
}); });
return fetch('https://spee.ch/api/config/site/publishing') return fetch(SPEECH_STATUS)
.then(res => res.json()) .then(res => res.json())
.then(status => { .then(status => {
if (status.disabled) { if (status.disabled) {
@ -110,7 +111,7 @@ export const doUploadThumbnail = (
// $FlowFixMe // $FlowFixMe
data.append('file', { uri: 'file://' + filePath, type: fileType, name: fileName }); data.append('file', { uri: 'file://' + filePath, type: fileType, name: fileName });
return fetch('https://spee.ch/api/claim/publish', { return fetch(SPEECH_PUBLISH, {
method: 'POST', method: 'POST',
body: data, body: data,
}) })
@ -149,7 +150,7 @@ export const doUploadThumbnail = (
data.append('name', name); data.append('name', name);
data.append('file', file); data.append('file', file);
return fetch('https://spee.ch/api/claim/publish', { return fetch(SPEECH_PUBLISH, {
method: 'POST', method: 'POST',
body: data, body: data,
}) })