mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-18 09:35:20 +02:00
cb3e1cf1e9
commit2fb6cee901
Merge:4e303be85f
db509955f6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:24:07 2020 +0100 Merge branch 'dev' into rn_63 commit4e303be85f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 16:14:39 2020 +0100 Clean up commite3a37ec2d6
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:57:55 2020 +0100 Use different script for pre-commit and manual start commitbd236648fc
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:56:45 2020 +0100 Removed RN eslint config commite7feda41c9
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 15:27:08 2020 +0100 Revert "Disable git hook for now" This reverts commit89263ac742
. commitcfd63fe46f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 13:02:32 2020 +0100 Ask permission to use geo-location commit66059939a3
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 12:26:20 2020 +0100 Fixed WebView race condition commit1e0d2b7b86
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:56:21 2020 +0100 Fixed webview issues commitf537d22d7f
Author: Laurent Cozic <laurent@cozic.net> Date: Fri Oct 16 11:08:29 2020 +0100 Improve resource file watching commiteec32cf70a
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 18:40:13 2020 +0100 Removed cache package dependency and implemented one more suitable for React Native commitefa346fea4
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:57:21 2020 +0100 iOS: Added fonts to Info.plist although it was working without it commit572b647bc0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 14:56:49 2020 +0100 Specify content-type header for OneDrive to prevent network error commitbcedf6c7f0
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:45:01 2020 +0100 iOS: Disable long press menu since it is already built-in commit7359dd61d1
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:37:40 2020 +0100 Removed unused react-native-device-info commit2d63ab36d3
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:35:54 2020 +0100 iOS: Fixed taking a picture commit8e2875a91c
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 12:11:13 2020 +0100 iOS: Restored camera roll functionality commit75f5edf2ad
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:13 2020 +0100 iOS: Fixed build settings commitb220c98419
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 11:40:03 2020 +0100 iOS: Got images to work with WebKit commitc34b43e841
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:24:52 2020 +0100 iOS: Restore more settings commit32997611e6
Author: Laurent Cozic <laurent@cozic.net> Date: Thu Oct 15 10:15:14 2020 +0100 iOS: Added back icons and other properties commitb5811d7f7c
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 23:53:14 2020 +0100 Got iOS build to work commitdc6d7c00e0
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:40:06 2020 +0100 Imported old settings in gradle build commitdff59f5603
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 18:20:00 2020 +0100 Restored sharing commit0bdb449e72
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 17:25:40 2020 +0100 Updated NoteBodyViewer commit0c0d228815
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 16:54:42 2020 +0100 Fixed networking commit6ff45ce485
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 13:11:00 2020 +0100 Fixed document picker commitcc889182b6
Author: Laurent Cozic <laurent@cozic.net> Date: Wed Oct 14 12:56:27 2020 +0100 Added back support for alarms commit040261abfa
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 22:04:49 2020 +0100 Fixed Clipboard and remove image-picker package commit1077ad8f16
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:54:52 2020 +0100 Fixed Select Alarm dialog and PoorManIntervals class commit8296676fd5
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 21:32:52 2020 +0100 Fixed icons and warnings commit3b0e3f6f43
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 17:02:59 2020 +0100 Got app to build again commit89263ac742
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:41:17 2020 +0100 Disable git hook for now commitd6da162f67
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:39:12 2020 +0100 Restored back all RN packages commit7f8ce3732c
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:13:12 2020 +0100 Restored base packages commitea59726eb3
Author: Laurent Cozic <laurent@cozic.net> Date: Tue Oct 13 15:05:17 2020 +0100 Started over from scratch
225 lines
7.1 KiB
JavaScript
225 lines
7.1 KiB
JavaScript
const shim = require('lib/shim').default;
|
|
const { GeolocationReact } = require('lib/geolocation-react.js');
|
|
const PoorManIntervals = require('lib/PoorManIntervals').default;
|
|
const RNFetchBlob = require('rn-fetch-blob').default;
|
|
const { generateSecureRandom } = require('react-native-securerandom');
|
|
const FsDriverRN = require('lib/fs-driver-rn.js').FsDriverRN;
|
|
const urlValidator = require('valid-url');
|
|
const { Buffer } = require('buffer');
|
|
const { Linking, Platform } = require('react-native');
|
|
const mimeUtils = require('lib/mime-utils.js').mime;
|
|
const { basename, fileExtension } = require('lib/path-utils.js');
|
|
const uuid = require('lib/uuid').default;
|
|
const Resource = require('lib/models/Resource');
|
|
|
|
const injectedJs = {
|
|
webviewLib: require('lib/rnInjectedJs/webviewLib'),
|
|
};
|
|
|
|
function shimInit() {
|
|
shim.Geolocation = GeolocationReact;
|
|
shim.sjclModule = require('lib/vendor/sjcl-rn.js');
|
|
|
|
shim.fsDriver = () => {
|
|
if (!shim.fsDriver_) shim.fsDriver_ = new FsDriverRN();
|
|
return shim.fsDriver_;
|
|
};
|
|
|
|
shim.randomBytes = async count => {
|
|
const randomBytes = await generateSecureRandom(count);
|
|
const temp = [];
|
|
for (const n in randomBytes) {
|
|
if (!randomBytes.hasOwnProperty(n)) continue;
|
|
temp.push(randomBytes[n]);
|
|
}
|
|
return temp;
|
|
};
|
|
|
|
shim.fetch = async function(url, options = null) {
|
|
// The native fetch() throws an uncatable error that crashes the app if calling it with an
|
|
// invalid URL such as '//.resource' or "http://ocloud. de" so detect if the URL is valid beforehand
|
|
// and throw a catchable error.
|
|
// Bug: https://github.com/facebook/react-native/issues/7436
|
|
const validatedUrl = urlValidator.isUri(url);
|
|
if (!validatedUrl) throw new Error(`Not a valid URL: ${url}`);
|
|
|
|
return shim.fetchWithRetry(() => {
|
|
// If the request has a body and it's not a GET call, and it doesn't have a Content-Type header
|
|
// we display a warning, because it could trigger a "Network request failed" error.
|
|
// https://github.com/facebook/react-native/issues/30176
|
|
if (options?.body && options?.method && options.method !== 'GET' && !options?.headers?.['Content-Type']) {
|
|
console.warn('Done a non-GET fetch call without a Content-Type header. It may make the request fail.', url, options);
|
|
}
|
|
|
|
return fetch(validatedUrl, options);
|
|
}, options);
|
|
};
|
|
|
|
shim.fetchBlob = async function(url, options) {
|
|
if (!options || !options.path) throw new Error('fetchBlob: target file path is missing');
|
|
|
|
const headers = options.headers ? options.headers : {};
|
|
const method = options.method ? options.method : 'GET';
|
|
const overwrite = 'overwrite' in options ? options.overwrite : true;
|
|
|
|
const dirs = RNFetchBlob.fs.dirs;
|
|
let localFilePath = options.path;
|
|
if (localFilePath.indexOf('/') !== 0) localFilePath = `${dirs.DocumentDir}/${localFilePath}`;
|
|
|
|
if (!overwrite) {
|
|
if (await shim.fsDriver().exists(localFilePath)) {
|
|
return { ok: true };
|
|
}
|
|
}
|
|
|
|
delete options.path;
|
|
delete options.overwrite;
|
|
|
|
const doFetchBlob = () => {
|
|
return RNFetchBlob.config({
|
|
path: localFilePath,
|
|
}).fetch(method, url, headers);
|
|
};
|
|
|
|
try {
|
|
const response = await shim.fetchWithRetry(doFetchBlob, options);
|
|
|
|
// Returns an object that's roughtly compatible with a standard Response object
|
|
const output = {
|
|
ok: response.respInfo.status < 400,
|
|
path: response.data,
|
|
status: response.respInfo.status,
|
|
headers: response.respInfo.headers,
|
|
// If response type is 'path' then calling text() or json() (or base64())
|
|
// on RNFetchBlob response object will make it read the file on the native thread,
|
|
// serialize it, and send over the RN bridge.
|
|
// For larger files this can cause the app to crash.
|
|
// For these type of responses we're not using the response text anyway
|
|
// so can override it here to return empty values
|
|
text: response.type === 'path' ? () => '' : response.text,
|
|
json: response.type === 'path' ? () => {} : response.json,
|
|
};
|
|
|
|
return output;
|
|
} catch (error) {
|
|
throw new Error(`fetchBlob: ${method} ${url}: ${error.toString()}`);
|
|
}
|
|
};
|
|
|
|
shim.uploadBlob = async function(url, options) {
|
|
if (!options || !options.path) throw new Error('uploadBlob: source file path is missing');
|
|
|
|
const headers = options.headers ? options.headers : {};
|
|
const method = options.method ? options.method : 'POST';
|
|
|
|
try {
|
|
const response = await RNFetchBlob.fetch(method, url, headers, RNFetchBlob.wrap(options.path));
|
|
|
|
// Returns an object that's roughtly compatible with a standard Response object
|
|
return {
|
|
ok: response.respInfo.status < 400,
|
|
data: response.data,
|
|
text: response.text,
|
|
json: response.json,
|
|
status: response.respInfo.status,
|
|
headers: response.respInfo.headers,
|
|
};
|
|
} catch (error) {
|
|
throw new Error(`uploadBlob: ${method} ${url}: ${error.toString()}`);
|
|
}
|
|
};
|
|
|
|
shim.readLocalFileBase64 = async function(path) {
|
|
return RNFetchBlob.fs.readFile(path, 'base64');
|
|
};
|
|
|
|
shim.stringByteLength = function(string) {
|
|
return Buffer.byteLength(string, 'utf-8');
|
|
};
|
|
|
|
shim.Buffer = Buffer;
|
|
|
|
shim.openUrl = url => {
|
|
Linking.openURL(url);
|
|
};
|
|
|
|
shim.httpAgent = () => {
|
|
return null;
|
|
};
|
|
|
|
shim.waitForFrame = () => {
|
|
return new Promise(function(resolve) {
|
|
requestAnimationFrame(function() {
|
|
resolve();
|
|
});
|
|
});
|
|
};
|
|
|
|
shim.mobilePlatform = () => {
|
|
return Platform.OS;
|
|
};
|
|
|
|
shim.appVersion = () => {
|
|
const p = require('react-native-version-info').default;
|
|
return p.appVersion;
|
|
};
|
|
|
|
// NOTE: This is a limited version of createResourceFromPath - unlike the Node version, it
|
|
// only really works with images. It does not resize the image either.
|
|
shim.createResourceFromPath = async function(filePath, defaultProps = null) {
|
|
defaultProps = defaultProps ? defaultProps : {};
|
|
const resourceId = defaultProps.id ? defaultProps.id : uuid.create();
|
|
|
|
const ext = fileExtension(filePath);
|
|
let mimeType = mimeUtils.fromFileExtension(ext);
|
|
if (!mimeType) mimeType = 'image/jpeg';
|
|
|
|
let resource = Resource.new();
|
|
resource.id = resourceId;
|
|
resource.mime = mimeType;
|
|
resource.title = basename(filePath);
|
|
resource.file_extension = ext;
|
|
|
|
const targetPath = Resource.fullPath(resource);
|
|
await shim.fsDriver().copy(filePath, targetPath);
|
|
|
|
if (defaultProps) {
|
|
resource = Object.assign({}, resource, defaultProps);
|
|
}
|
|
|
|
const itDoes = await shim.fsDriver().waitTillExists(targetPath);
|
|
if (!itDoes) throw new Error(`Resource file was not created: ${targetPath}`);
|
|
|
|
const fileStat = await shim.fsDriver().stat(targetPath);
|
|
resource.size = fileStat.size;
|
|
|
|
resource = await Resource.save(resource, { isNew: true });
|
|
|
|
return resource;
|
|
};
|
|
|
|
shim.injectedJs = function(name) {
|
|
if (!(name in injectedJs)) throw new Error(`Cannot find injectedJs file (add it to "injectedJs" object): ${name}`);
|
|
return injectedJs[name];
|
|
};
|
|
|
|
shim.setTimeout = (fn, interval) => {
|
|
return PoorManIntervals.setTimeout(fn, interval);
|
|
};
|
|
|
|
shim.setInterval = (fn, interval) => {
|
|
return PoorManIntervals.setInterval(fn, interval);
|
|
};
|
|
|
|
shim.clearTimeout = (id) => {
|
|
return PoorManIntervals.clearTimeout(id);
|
|
};
|
|
|
|
shim.clearInterval = (id) => {
|
|
return PoorManIntervals.clearInterval(id);
|
|
};
|
|
|
|
}
|
|
|
|
module.exports = { shimInit };
|