LBRYCommunity/lbry-redux
1
0
Fork 0
Code Issues 5 Pull requests 6 Projects Releases Packages Wiki Activity

maint: support 0.31 SDK (#113)

Browse source 
* maint: support 0.31 SDK

resolve param changed from uri/uris, to urls.

* feat: stop daemon sdk call

* fix: ffffffffff webpack bug

https://github.com/nulogy/design-system/pull/132
This commit is contained in:
Thomas Zarebczan 2019-02-18 09:11:32 -05:00 committed by Sean Yesmunt
parent e94de32487
commit ec1d5bd41a
4 changed files with 184 additions and 186 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

357
dist/bundle.js vendored
View file

@ -7,7 +7,7 @@
var a = factory(); var a = factory();
for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i]; for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];
} }
})(window, function() { })((typeof self !== 'undefined' ? self : this), function() {
return /******/ (function(modules) { // webpackBootstrap return /******/ (function(modules) { // webpackBootstrap
/******/ // The module cache /******/ // The module cache
/******/ var installedModules = {}; /******/ var installedModules = {};
@ -1279,96 +1279,96 @@ var ACTIONS = _interopRequireWildcard(_action_types);
function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
/* /*
Toasts: Toasts:
- First-in, first-out queue - First-in, first-out queue
- Simple messages that are shown in response to user interactions - Simple messages that are shown in response to user interactions
- Never saved - Never saved
- If they are the result of errors, use the isError flag when creating - If they are the result of errors, use the isError flag when creating
- For errors that should interrupt user behavior, use Error - For errors that should interrupt user behavior, use Error
*/ */
/*:: export type ToastParams = { /*:: export type ToastParams = {
message: string, message: string,
title?: string, title?: string,
linkText?: string, linkText?: string,
linkTarget?: string, linkTarget?: string,
isError?: boolean, isError?: boolean,
};*/ // @flow };*/ // @flow
/*:: export type Toast = { /*:: export type Toast = {
id: string, id: string,
params: ToastParams, params: ToastParams,
};*/ };*/
/* /*
Notifications: Notifications:
- List of notifications based on user interactions/app notifications - List of notifications based on user interactions/app notifications
- Always saved, but can be manually deleted - Always saved, but can be manually deleted
- Can happen in the background, or because of user interaction (ex: publish confirmed) - Can happen in the background, or because of user interaction (ex: publish confirmed)
*/ */
/*:: export type DoToast = { /*:: export type DoToast = {
type: ACTIONS.CREATE_TOAST, type: ACTIONS.CREATE_TOAST,
data: Toast, data: Toast,
};*/ };*/
/*:: export type Notification = { /*:: export type Notification = {
id: string, // Unique id id: string, // Unique id
dateCreated: number, dateCreated: number,
isRead: boolean, // Used to display "new" notifications that a user hasn't seen yet isRead: boolean, // Used to display "new" notifications that a user hasn't seen yet
source?: string, // The type/area an notification is from. Used for sorting (ex: publishes, transactions) source?: string, // The type/area an notification is from. Used for sorting (ex: publishes, transactions)
// We may want to use priority/isDismissed in the future to specify how urgent a notification is // We may want to use priority/isDismissed in the future to specify how urgent a notification is
// and if the user should see it immediately // and if the user should see it immediately
// isDissmied: boolean, // isDissmied: boolean,
// priority?: number // priority?: number
};*/ };*/
/*:: export type DoNotification = { /*:: export type DoNotification = {
type: ACTIONS.CREATE_NOTIFICATION, type: ACTIONS.CREATE_NOTIFICATION,
data: Notification, data: Notification,
};*/ };*/
/*:: export type DoEditNotification = { /*:: export type DoEditNotification = {
type: ACTIONS.EDIT_NOTIFICATION, type: ACTIONS.EDIT_NOTIFICATION,
data: { data: {
id: string, id: string,
isRead: boolean, isRead: boolean,
// In the future we can add `isDismissed` if we decide to show notifications as they come in // In the future we can add `isDismissed` if we decide to show notifications as they come in
// Similar to Facebook's notifications in the corner of the screen // Similar to Facebook's notifications in the corner of the screen
// isDismissed: boolean, // isDismissed: boolean,
}, },
};*/ };*/
/* /*
Errors: Errors:
- First-in, first-out queue - First-in, first-out queue
- Errors that should interupt user behavior - Errors that should interupt user behavior
- For errors that can be shown without interrupting a user, use Toast with the isError flag - For errors that can be shown without interrupting a user, use Toast with the isError flag
*/ */
/*:: export type DoDeleteNotification = { /*:: export type DoDeleteNotification = {
type: ACTIONS.DELETE_NOTIFICATION, type: ACTIONS.DELETE_NOTIFICATION,
data: { data: {
id: string, // The id to delete id: string, // The id to delete
}, },
};*/ };*/
/*:: export type Error = { /*:: export type Error = {
title: string, title: string,
text: string, text: string,
};*/ };*/
/*:: export type DoError = { /*:: export type DoError = {
type: ACTIONS.CREATE_ERROR, type: ACTIONS.CREATE_ERROR,
data: Error, data: Error,
};*/ };*/
/* /*
NotificationState NotificationState
*/ */
/*:: export type DoDismissError = { /*:: export type DoDismissError = {
type: ACTIONS.DISMISS_ERROR, type: ACTIONS.DISMISS_ERROR,
};*/ };*/
/*:: export type NotificationState = { /*:: export type NotificationState = {
notifications: Array<Notification>, notifications: Array<Notification>,
errors: Array<Error>, errors: Array<Error>,
toasts: Array<Toast>, toasts: Array<Toast>,
};*/ };*/
/***/ }), /***/ }),
@ -1630,27 +1630,27 @@ var claimIdMaxLength = 40;
var regexInvalidURI = exports.regexInvalidURI = /[^A-Za-z0-9-]/g; var regexInvalidURI = exports.regexInvalidURI = /[^A-Za-z0-9-]/g;
var regexAddress = exports.regexAddress = /^b(?=[^0OIl]{32,33})[0-9A-Za-z]{32,33}$/; var regexAddress = exports.regexAddress = /^b(?=[^0OIl]{32,33})[0-9A-Za-z]{32,33}$/;
/** /**
* Parses a LBRY name into its component parts. Throws errors with user-friendly * Parses a LBRY name into its component parts. Throws errors with user-friendly
* messages for invalid names. * messages for invalid names.
* *
* N.B. that "name" indicates the value in the name position of the URI. For * N.B. that "name" indicates the value in the name position of the URI. For
* claims for channel content, this will actually be the channel name, and * claims for channel content, this will actually be the channel name, and
* the content name is in the path (e.g. lbry://@channel/content) * the content name is in the path (e.g. lbry://@channel/content)
* *
* In most situations, you'll want to use the contentName and channelName keys * In most situations, you'll want to use the contentName and channelName keys
* and ignore the name key. * and ignore the name key.
* *
* Returns a dictionary with keys: * Returns a dictionary with keys:
* - name (string): The value in the "name" position in the URI. Note that this * - name (string): The value in the "name" position in the URI. Note that this
* could be either content name or channel name; see above. * could be either content name or channel name; see above.
* - path (string, if persent) * - path (string, if persent)
* - claimSequence (int, if present) * - claimSequence (int, if present)
* - bidPosition (int, if present) * - bidPosition (int, if present)
* - claimId (string, if present) * - claimId (string, if present)
* - isChannel (boolean) * - isChannel (boolean)
* - contentName (string): For anon claims, the name; for channel claims, the path * - contentName (string): For anon claims, the name; for channel claims, the path
* - channelName (string, if present): Channel name without @ * - channelName (string, if present): Channel name without @
*/ */
function parseURI(URI) { function parseURI(URI) {
var requireProto = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false; var requireProto = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@ -1758,10 +1758,10 @@ function parseURI(URI) {
}, contentName ? { contentName: contentName } : {}, channelName ? { channelName: channelName } : {}, claimSequence ? { claimSequence: parseInt(claimSequence, 10) } : {}, bidPosition ? { bidPosition: parseInt(bidPosition, 10) } : {}, claimId ? { claimId: claimId } : {}, path ? { path: path } : {}); }, contentName ? { contentName: contentName } : {}, channelName ? { channelName: channelName } : {}, claimSequence ? { claimSequence: parseInt(claimSequence, 10) } : {}, bidPosition ? { bidPosition: parseInt(bidPosition, 10) } : {}, claimId ? { claimId: claimId } : {}, path ? { path: path } : {});
} }
/** /**
* Takes an object in the same format returned by parse() and builds a URI. * Takes an object in the same format returned by parse() and builds a URI.
* *
* The channelName key will accept names with or without the @ prefix. * The channelName key will accept names with or without the @ prefix.
*/ */
function buildURI(URIObj) { function buildURI(URIObj) {
var includeProto = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true; var includeProto = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
@ -1956,9 +1956,11 @@ module.exports = v4;
// and inconsistent support for the `crypto` API. We do the best we can via // and inconsistent support for the `crypto` API. We do the best we can via
// feature-detection // feature-detection
// getRandomValues needs to be invoked in a context where "this" is a Crypto implementation. // getRandomValues needs to be invoked in a context where "this" is a Crypto
var getRandomValues = (typeof(crypto) != 'undefined' && crypto.getRandomValues.bind(crypto)) || // implementation. Also, find the complete implementation of crypto on IE11.
(typeof(msCrypto) != 'undefined' && msCrypto.getRandomValues.bind(msCrypto)); var getRandomValues = (typeof(crypto) != 'undefined' && crypto.getRandomValues && crypto.getRandomValues.bind(crypto)) ||
(typeof(msCrypto) != 'undefined' && typeof window.msCrypto.getRandomValues == 'function' && msCrypto.getRandomValues.bind(msCrypto));
if (getRandomValues) { if (getRandomValues) {
// WHATWG crypto RNG - http://wiki.whatwg.org/wiki/Crypto // WHATWG crypto RNG - http://wiki.whatwg.org/wiki/Crypto
var rnds8 = new Uint8Array(16); // eslint-disable-line no-undef var rnds8 = new Uint8Array(16); // eslint-disable-line no-undef
@ -2001,14 +2003,15 @@ for (var i = 0; i < 256; ++i) {
function bytesToUuid(buf, offset) { function bytesToUuid(buf, offset) {
var i = offset || 0; var i = offset || 0;
var bth = byteToHex; var bth = byteToHex;
return bth[buf[i++]] + bth[buf[i++]] + // join used to fix memory issue caused by concatenation: https://bugs.chromium.org/p/v8/issues/detail?id=3175#c4
bth[buf[i++]] + bth[buf[i++]] + '-' + return ([bth[buf[i++]], bth[buf[i++]],
bth[buf[i++]] + bth[buf[i++]] + '-' + bth[buf[i++]], bth[buf[i++]], '-',
bth[buf[i++]] + bth[buf[i++]] + '-' + bth[buf[i++]], bth[buf[i++]], '-',
bth[buf[i++]] + bth[buf[i++]] + '-' + bth[buf[i++]], bth[buf[i++]], '-',
bth[buf[i++]] + bth[buf[i++]] + bth[buf[i++]], bth[buf[i++]], '-',
bth[buf[i++]] + bth[buf[i++]] + bth[buf[i++]], bth[buf[i++]],
bth[buf[i++]] + bth[buf[i++]]; bth[buf[i++]], bth[buf[i++]],
bth[buf[i++]], bth[buf[i++]]]).join('');
} }
module.exports = bytesToUuid; module.exports = bytesToUuid;
@ -2091,7 +2094,7 @@ function doResolveUris(uris) {
}); });
var resolveInfo = {}; var resolveInfo = {};
_lbry2.default.resolve({ uris: urisToResolve }).then(function (result) { _lbry2.default.resolve({ urls: urisToResolve }).then(function (result) {
Object.entries(result).forEach(function (_ref) { Object.entries(result).forEach(function (_ref) {
var _ref2 = _slicedToArray(_ref, 2), var _ref2 = _slicedToArray(_ref, 2),
uri = _ref2[0], uri = _ref2[0],
@ -2412,6 +2415,9 @@ Lbry.file_set_status = function () {
var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
return daemonCallWithResult('file_set_status', params); return daemonCallWithResult('file_set_status', params);
}; };
Lbry.stop = function () {
return daemonCallWithResult('stop', {});
};
// claims // claims
Lbry.claim_list_by_channel = function () { Lbry.claim_list_by_channel = function () {
@ -2547,12 +2553,7 @@ Lbry.resolve = function () {
var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
apiCall('resolve', params, function (data) { apiCall('resolve', params, function (data) {
if ('uri' in params) { resolve(data || {});
// If only a single URI was requested, don't nest the results in an object
resolve(data && data[params.uri] ? data[params.uri] : {});
} else {
resolve(data || {});
}
}, reject); }, reject);
}); });
}; };
@ -6175,12 +6176,12 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
// @flow // @flow
/*:: import type { /*:: import type {
NotificationState, NotificationState,
DoToast, DoToast,
DoNotification, DoNotification,
DoEditNotification, DoEditNotification,
DoDeleteNotification, DoDeleteNotification,
} from 'types/Notification';*/ } from 'types/Notification';*/
@ -6315,44 +6316,44 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
/*:: type SearchSuccess = { /*:: type SearchSuccess = {
type: ACTIONS.SEARCH_SUCCESS, type: ACTIONS.SEARCH_SUCCESS,
data: { data: {
query: string, query: string,
uris: Array<string>, uris: Array<string>,
}, },
};*/ };*/
/*:: type UpdateSearchQuery = { /*:: type UpdateSearchQuery = {
type: ACTIONS.UPDATE_SEARCH_QUERY, type: ACTIONS.UPDATE_SEARCH_QUERY,
data: { data: {
query: string, query: string,
}, },
};*/ };*/
/*:: type SearchSuggestion = { /*:: type SearchSuggestion = {
value: string, value: string,
shorthand: string, shorthand: string,
type: string, type: string,
};*/ };*/
/*:: type UpdateSearchSuggestions = { /*:: type UpdateSearchSuggestions = {
type: ACTIONS.UPDATE_SEARCH_SUGGESTIONS, type: ACTIONS.UPDATE_SEARCH_SUGGESTIONS,
data: { data: {
query: string, query: string,
suggestions: Array<SearchSuggestion>, suggestions: Array<SearchSuggestion>,
}, },
};*/ };*/
/*:: type SearchState = { /*:: type SearchState = {
isActive: boolean, isActive: boolean,
searchQuery: string, searchQuery: string,
suggestions: Array<SearchSuggestion>, suggestions: Array<SearchSuggestion>,
urisByQuery: {}, urisByQuery: {},
};*/ };*/
/*:: type HistoryNavigate = { /*:: type HistoryNavigate = {
type: ACTIONS.HISTORY_NAVIGATE, type: ACTIONS.HISTORY_NAVIGATE,
data: { data: {
url: string, url: string,
index?: number, index?: number,
scrollY?: number, scrollY?: number,
}, },
};*/ };*/
@ -6442,32 +6443,32 @@ var buildDraftTransaction = function buildDraftTransaction() {
// TODO: Split into common success and failure types // TODO: Split into common success and failure types
// See details in https://github.com/lbryio/lbry/issues/1307 // See details in https://github.com/lbryio/lbry/issues/1307
/*:: type ActionResult = { /*:: type ActionResult = {
type: any, type: any,
result: any, result: any,
};*/ };*/
/*:: type WalletState = { /*:: type WalletState = {
balance: any, balance: any,
blocks: any, blocks: any,
latestBlock: number, latestBlock: number,
transactions: any, transactions: any,
fetchingTransactions: boolean, fetchingTransactions: boolean,
gettingNewAddress: boolean, gettingNewAddress: boolean,
draftTransaction: any, draftTransaction: any,
sendingSupport: boolean, sendingSupport: boolean,
walletIsEncrypted: boolean, walletIsEncrypted: boolean,
walletEncryptPending: boolean, walletEncryptPending: boolean,
walletEncryptSucceded: ?boolean, walletEncryptSucceded: ?boolean,
walletEncryptResult: ?boolean, walletEncryptResult: ?boolean,
walletDecryptPending: boolean, walletDecryptPending: boolean,
walletDecryptSucceded: ?boolean, walletDecryptSucceded: ?boolean,
walletDecryptResult: ?boolean, walletDecryptResult: ?boolean,
walletUnlockPending: boolean, walletUnlockPending: boolean,
walletUnlockSucceded: ?boolean, walletUnlockSucceded: ?boolean,
walletUnlockResult: ?boolean, walletUnlockResult: ?boolean,
walletLockPending: boolean, walletLockPending: boolean,
walletLockSucceded: ?boolean, walletLockSucceded: ?boolean,
walletLockResult: ?boolean, walletLockResult: ?boolean,
};*/ };*/
@ -6954,7 +6955,7 @@ Object.defineProperty(exports, "__esModule", {
value: true value: true
}); });
/* hardcoded names still exist for these in reducers/settings.js - only discovered when debugging */ /* hardcoded names still exist for these in reducers/settings.js - only discovered when debugging */
/* Many SETTINGS are stored in the localStorage by their name - /* Many SETTINGS are stored in the localStorage by their name -
be careful about changing the value of a SETTINGS constant, as doing so can invalidate existing SETTINGS */ be careful about changing the value of a SETTINGS constant, as doing so can invalidate existing SETTINGS */
var CREDIT_REQUIRED_ACKNOWLEDGED = exports.CREDIT_REQUIRED_ACKNOWLEDGED = 'credit_required_acknowledged'; var CREDIT_REQUIRED_ACKNOWLEDGED = exports.CREDIT_REQUIRED_ACKNOWLEDGED = 'credit_required_acknowledged';
var NEW_USER_ACKNOWLEDGED = exports.NEW_USER_ACKNOWLEDGED = 'welcome_acknowledged'; var NEW_USER_ACKNOWLEDGED = exports.NEW_USER_ACKNOWLEDGED = 'welcome_acknowledged';

8
src/lbry.js
View file

@ -70,6 +70,7 @@ Lbry.status = (params = {}) => daemonCallWithResult('status', params);
Lbry.version = () => daemonCallWithResult('version', {}); Lbry.version = () => daemonCallWithResult('version', {});
Lbry.file_delete = (params = {}) => daemonCallWithResult('file_delete', params); Lbry.file_delete = (params = {}) => daemonCallWithResult('file_delete', params);
Lbry.file_set_status = (params = {}) => daemonCallWithResult('file_set_status', params); Lbry.file_set_status = (params = {}) => daemonCallWithResult('file_set_status', params);
Lbry.stop = () => daemonCallWithResult('stop', {});
// claims // claims
Lbry.claim_list_by_channel = (params = {}) => daemonCallWithResult('claim_list_by_channel', params); Lbry.claim_list_by_channel = (params = {}) => daemonCallWithResult('claim_list_by_channel', params);
@ -189,12 +190,7 @@ Lbry.resolve = (params = {}) =>
'resolve', 'resolve',
params, params,
data => { data => {
if ('uri' in params) { resolve(data || {});
// If only a single URI was requested, don't nest the results in an object
resolve(data && data[params.uri] ? data[params.uri] : {});
} else {
resolve(data || {});
}
}, },
reject reject
); );

2
src/redux/actions/claims.js
View file

@ -32,7 +32,7 @@ export function doResolveUris(uris, returnCachedClaims = false) {
}); });
const resolveInfo = {}; const resolveInfo = {};
Lbry.resolve({ uris: urisToResolve }).then(result => { Lbry.resolve({ urls: urisToResolve }).then(result => {
Object.entries(result).forEach(([uri, uriResolveInfo]) => { Object.entries(result).forEach(([uri, uriResolveInfo]) => {
const fallbackResolveInfo = { const fallbackResolveInfo = {
claim: null, claim: null,

3
webpack.config.js
View file

@ -8,7 +8,8 @@ module.exports = {
output: { output: {
filename: 'bundle.js', filename: 'bundle.js',
path: path.resolve(__dirname, 'dist'), path: path.resolve(__dirname, 'dist'),
libraryTarget: 'umd' libraryTarget: 'umd',
globalObject: `(typeof self !== 'undefined' ? self : this)`
}, },
module: { module: {
rules: [ rules: [