Commit Graph

148 Commits

Author SHA1 Message Date
Ben Newman
61ee90ef2d Begin garbage directory names with a '.' character. 2019-02-28 14:34:37 -05:00
Ben Newman
a96241911a Address review feedback from @glasser. 2019-02-04 14:22:29 -05:00
Ben Newman
312d06a90a Add gitRevision property to star.json and __meteor_runtime_config__.
This information is useful when you need a unique identifier for the
current version of the application (and you're using Git).

If the current Git HEAD revision can't be found for any reason, the
gitRevision property simply will not appear in star.json or
__meteor_runtime_config__.
2019-02-04 11:51:38 -05:00
zodern
285e1b50c3 Clean up code 2019-01-16 22:16:51 -06:00
zodern
ca3d3911a9 Clean up watch code 2019-01-05 07:55:02 -06:00
zodern
70772dcae7 Reduce duplicate fs calls in watcher
Most directories are in the WatchSet at least twice, and the directory is read and each item is stat each time. In addition, when the watcher is not created by isUpToDate, each item in watchSet.directories and watchSet.files is checked twice.

With these changes, isUpToDate finishes in less than 1/2 the time on Windows, and creating a watcher takes around 1/4 the time.
2019-01-04 22:47:08 -06:00
zodern
5c86db22a7 Fix files.readdir and files.realpath not being cached
enableCache was called before readdir and realpath was added to "files".
2019-01-04 18:40:39 -06:00
zodern
21f976d6f0 Fix delay between server starting and showing "=> Server restarted"
Creating the watcher can take up to 12+ seconds in small - medium apps, and uses sync fs calls.
The server would start right away, but the tool process wouldn't know about it until the watcher finished setting up. Also, the proxy doesn't forward requests until "=> Server restarted" is shown.
A new async option is added to Watcher which prevents it from blocking the event loop too long.
Also, the watcher and legacy bundle are only created after the server has started, or 3 seconds has passed.
2019-01-01 11:47:20 -06:00
zodern
9c3385f542 Normalize paths before comparing them in symlinkWithOverwrite
In windows, source is in posix format and missing a trailing slash, causing the symlink to always be recreated.
2018-12-31 21:29:19 -06:00
zodern
c2ef3776a8 Delete garbage directory async 2018-12-31 21:27:20 -06:00
Ben Newman
46396a1156 Instrument build/bundle/deploy commands for METEOR_PROFILE.
https://github.com/meteor/meteor-feature-requests/issues/239
2018-09-18 09:59:14 -04:00
Ben Newman
cacace3bcb Avoid nested Profile.run calls in watch.sha{1,512} functions. 2018-07-11 10:08:57 -04:00
Ben Newman
cad8151151 Improve File hashing logic in bundler.js. (#10050)
Follow-up to https://github.com/meteor/meteor/pull/9933.

As recommended by @abernix, the sha1 hash of every file is now computed
from the file's sha512 hash, so we don't have to hash the entire contents
of the file twice with two different algorithms.

Other changes/improvements:

* Invalidate the hashes when/if `File#setContents` is called.

* Ignore `options.hash` and just compute hashes from actual file contents.
  Disagreement here would be worse than any performance benefits from
  precomputing the hash.
2018-07-03 14:02:08 -04:00
Timo Horstschaefer
ef3af685ab Enable Sub-Resource Integrity hashes for JS and CSS files (#9933) 2018-07-03 12:30:22 -04:00
Ben Newman
ad4f30c684 Lift process.env access to module scope.
https://github.com/meteor/meteor/pull/9911#pullrequestreview-123587003
2018-05-27 11:13:47 -04:00
Christian Klaussner
797f9ce78e Allow METEOR_FILE_WATCH_COALESCE to override file watcher delay (#9911) 2018-05-27 11:11:36 -04:00
Ben Newman
8273eb84e3 Avoid calling files.readlink if target not a symbolic link. 2018-05-14 14:17:46 -04:00
zodern
903cd3c8b9 Fix creating symlinks on Windows April 2018 Update (#9887) 2018-05-14 11:20:56 -04:00
Ben Newman
1892633dba Avoid unnecessary files.{rm_recursive,symlink} in symlinkWithOverwrite.
When we copy node_modules directories during rebuilds, we try to create
symlinks instead of doing a full recursive copy. Very often, however, the
symlinks already exist, and they point to the right location already, so
we can avoid recreating them for even better performance.

Another optimization identified by using the qualia:profile package
created by @veered: https://atmospherejs.com/qualia/profile
2018-05-10 14:27:44 -04:00
Ben Newman
105bdd8fd7 Start marking some optimistic functions as disposable. 2018-04-18 16:32:01 -04:00
Ben Newman
970d58409f Move realpathOrNull into tools/fs/files.js. 2018-03-26 12:04:13 -04:00
Ben Newman
e7ad5d2a42 Call files.cp_r with { preserveSymlinks: true } in more places.
Now that symlinks can be used to enable selective compilation of
node_modules, it's important to preserve them.
2018-03-26 12:04:12 -04:00
Ben Newman
9e60539f11 Fall back to async for EPERM errors in files.rm_recursive.
Previously, the async fallback was only used in case of ENOTEMPTY errors,
but Windows appears to throw temporary EPERM errors as well. If the errors
are actually robust/non-temporary, the async version will fail, too.

Should help with #9540.
2018-01-16 11:05:40 -05:00
Hugh Willson
7c48bb5a73 Prevent Tool crash when settings file contains BOM (#9459)
* Prevent Tool crash when settings file contains BOM

The use of a byte order mark in a `--settings` file
crashes the Meteor Tool, when it attempts to JSON parse
the loaded settings data. Since a BOM is not required
(or recommended) when using UTF-8, this commit removes
it from the loaded settings data, before it is parsed.

Fixes #5180.

* Add PR link to History.md

* Update History.md
2017-12-13 12:05:42 -05:00
Andrew Mao
25a7439769 Update URL for information about file watchers (#9460)
The documentation itself could benefit from an update to describe the new polling/watcher priority system, but that's a task for another PR.
2017-12-13 11:50:50 -05:00
Ben Newman
b499ad8c45 Another small improvement to temp directory removal logic. 2017-10-17 10:21:01 -04:00
Ben Newman
3739677140 Use files.rm_recursive_async to implement files.freeTempDir. 2017-10-16 17:59:52 -04:00
Ben Newman
e6e5d427b4 Allow files.rm_recursive to yield whenever possible.
A while back, for performance reasons, we disabled yielding for all
files.* operations unless METEOR_DISABLE_FS_FIBERS was set to false.

This was safe for almost all files.* operations, because most of them have
a synchronous fs.*Sync version available.

For a more complicated operation like files.rm_recursive, however, there
is no synchronous or asynchronous counterpart in the fs.* namespace, so
the safety of disabling fibers is not guaranteed.

Lately, files.rm_recursive has become a major source of uncaught ENOTEMPTY
errors on Windows, because rimraf.sync fails with that error, and we don't
give files.rm_recursive_async a chance to delete the directory in a more
persistent, forgiving manner.

The only reason we haven't been falling back to files.rm_recursive_async
is that YIELD_ALLOWED is false by default, so canYield() returns false.

This commit distinguishes between canYield() and mayYield(), and uses
canYield() in files.rm_recursive to determine whether it is technically
safe to yield, regardless of YIELD_ALLOWED.

Anyone who ever asked "Can I go to the bathroom?" in elementary school,
only to be mercilessly rebuked with "I don't know, CAN YOU?" should
understand the difference between these two functions.
2017-10-16 13:58:49 -04:00
Ben Newman
11ea9aef58 Stop wasting time making extracted tarball trees read-only.
Whatever benefits this may have had, a general purpose function like
files.extractTarGz is definitely not the place for such an aggressive
safety measure, and the performance penalty is significant, especially on
Windows.
2017-10-16 13:58:49 -04:00
Ben Newman
0679e7a8bf Enable native file watching on Windows unless explicitly disabled.
Native file watching is notoriously unreliable on several Windows file
systems (e.g. NTFS, since network file systems have trouble supporting
change notifications).

However, disabling native file watching for all Windows developers was
probably a step too far, since it *could* work just fine, and we still
have the fs.watchFile-based safety net, which no longer hogs idle CPU
cycles for unchanged files.

You can explicitly disable native file watching and use polling instead by
setting METEOR_WATCH_FORCE_POLLING to a truthy value.

Should help with #9175.
2017-10-09 12:19:49 -04:00
Ben Newman
da9dac4bfc Continue polling changed files at the higher watch frequency.
Meteor attempts to use native file watchers to detect changes as soon as
possible, but we also employ an fs.watchFile-based safety net to detect
changes by polling, which adds reliability on platforms with poor (or
nonexistent) support for native file watching.

However, fs.watchFile tends to consume more idle CPU cycles when many
files are watched, so we use a relatively long (5000ms) polling interval
to watch files that have not yet been changed. After we detect the first
change to a file, we promote it to a much shorter (500ms) interval and
attempt to start a native file watcher.

Even if we were able to create a native file watcher using the pathwatcher
library, it may not fire notifications reliably on some file systems, so
this commit keeps polling changed files at the higher frequency, rather
than lowering the polling interval back to 5000ms.

The number of files the developer has changed by hand should never come
close to the total number of files watched by Meteor, so keeping them at
the elevated polling interval should pose no problem for idle CPU (#9175).
2017-10-09 12:19:15 -04:00
Ben Newman
b8ee80e1fc Remove target directory in files.rename to avoid Windows EPERM errors.
These errors are especially harmful because they cause files.rename to
fall back to copying rather than atomically renaming, which is both much
slower and not even remotely atomic.
2017-10-08 20:00:01 -04:00
Ben Newman
f52125d777 Merge branch 'devel' into release-1.6 2017-09-22 16:35:59 -04:00
Ben Newman
022f87c5b1 Avoid stopping fs.watchFile pollers when rewatching.
Calling unwatchFile may result in stopping the watcher before watchFile is
called, which then restarts it. This temporary stoppage appears to cause
change events to be missed sometimes. In particular, preventing this
stop/start with the acrobatics in this commit seems to fix recent
compiler-plugins.js test failures.
2017-09-22 15:00:17 -04:00
Ben Newman
7fd4fd559b Support .meteorignore files.
Closes https://github.com/meteor/meteor-feature-requests/issues/5.
2017-09-22 08:47:37 -04:00
Ben Newman
f4f4fd9994 Optimistically depend on parent directory when file does not exist.
With any luck, this will solve a host of problems related to undetected
changes when new files are created.
2017-09-22 08:47:36 -04:00
Ben Newman
7ebf9b3497 Merge branch 'devel' into release-1.6 2017-09-18 12:45:34 -04:00
Ben Newman
971d2b1272 Standardize Npm.require exceptions and limit lookup paths. (#9095)
Ever since Meteor 1.3 first introduced a module system based on something
other than `Npm.require`, we've continued throwing missing module
exceptions that refer to `Npm.depends` and/or `Npm.require`, even if the
developer called `require` or used an `import` declaration. This commit
fixes that, so that all missing module exceptions look like 'Cannot find
module "module/name"'.

I also noticed recently that `Npm.require` is capable of returning modules
installed in `node_modules` directories completely outside the app, which
is bad news for development/production reproducibility. Fixed that too.

CC @hwillson who has spoken of deprecating `Npm.require` entirely, and
just using `require` everywhere, instead.
2017-09-18 11:39:45 -04:00
Ben Newman
dd5d7e2786 Merge branch 'release-1.5.2' into release-1.6 2017-08-22 22:04:03 -04:00
Ben Newman
00ff851352 Avoid calling files.statOrNull(absPath) in readAndWatchFileWithHash.
This is performance-sensitive code, and I think this extra (uncached) call
to files.statOrNull could be contributing to test timeouts on Circle CI.

Follow-up to #9030.
2017-08-22 13:40:19 -04:00
Hugh Willson
b498c41401 Avoid creating a watcher when --settings is set to a directory (#9030)
As outlined in #3854, if `meteor --settings` points to a
directory instead of a file, an application gets caught up
in an infinite rebuild loop. Since it was assumed only a
file would be configured via `--settings`, a file watcher
is created for the specified directory, and that watcher
is then triggered ad infinitum.

These changes prevent a file watcher from being created
on a `--settings` directory.
2017-08-21 16:25:15 -04:00
Ben Newman
0b9ea6e2c5 Merge branch 'release-1.5.2' into release-1.6 2017-08-11 15:52:26 -04:00
Ben Newman
0e723593a6 Merge branch 'devel' into release-1.5.2 2017-08-11 15:23:39 -04:00
Ben Newman
0f9c58d6b9 Immediately dirty optimistic functions when relevant paths modified.
Should fix #8988 and #8942.

Now that #8866 is the default behavior, it can take up to 5000ms for
changes to files modified during the build process to be noticed.

Before #8866, when we called e.g. files.writeFile(path), a native file
watcher would notice the change immediately, almost always before the
build process read the file again. This was definitely racy, but we were
getting away with it consistently... until #8866.

I was able to reproduce the problem in #8988 by running

  echo some-local-package-name >> .meteor/packages

in an app with a local package of the given name. After debugging the
endless rebuild cycle, I found that .meteor/versions was being rewritten
by files.writeFile during the build process, but the file watching system
was not noticing the change in time to prevent watch.isUpToDate from
returning true. The change was finally detected when restarting the
Watcher responsible for .meteor/versions, which of course triggered
another rebuild, so the same problem kept happening again and again.
2017-08-11 13:57:16 -04:00
Ben Newman
0bf08a5f99 Merge branch 'release-1.5.2' into release-1.6 2017-08-08 18:40:46 -04:00
Ben Newman
868ba7ceff Merge branch 'devel' into release-1.5.2 2017-07-28 18:50:20 -04:00
Hugh Willson
f3440c9a9c Adjust the previous watcher check to handle moved files.
When checking the `entriesByIno` Map to see if an `entry` already exists for
the specified inode, also check to make sure the found `entry` is only
re-used if the current file watcher path matches the returned path. This
makes sure new file watchers are created for moved files (so files with the
same inode), instead of attempting to re-use a file watcher that's watching
an invalid path.
2017-07-25 08:19:19 -04:00
Ben Newman
dd124410f3 Avoid multiple warnings about raising the ulimit. 2017-07-19 18:05:51 -04:00
Ben Newman
53e23671e3 Make sure maybeSuggestRaisingWatchLimit runs in a Fiber.
Should fix recent test failures:
https://circleci.com/gh/meteor/meteor/4570#tests/containers/5
https://circleci.com/gh/meteor/meteor/4570#tests/containers/6
2017-07-14 13:34:34 -04:00
Ben Newman
4ae5c54685 Make sure maybeSuggestRaisingWatchLimit runs in a Fiber.
Should fix recent test failures:
https://circleci.com/gh/meteor/meteor/4570#tests/containers/5
https://circleci.com/gh/meteor/meteor/4570#tests/containers/6
2017-07-14 12:17:38 -04:00