Merge branch 'master' into fix/HTTPS

Author: damieng

docs/apm-rest-api.md

@@ -1,285 +1,3 @@
 # Atom.io package and update API
 
-This guide describes the web API used by [apm](https://github.com/atom/apm) and
-Atom. The vast majority of use cases are met by the `apm` command-line tool,
-which does other useful things like incrementing your version in `package.json`
-and making sure you have pushed your git tag. In fact, Atom itself shells out to
-`apm` rather than hitting the API directly. If you're curious about how Atom
-uses `apm`, see the [PackageManager class](https://github.com/atom/settings-view/blob/master/lib/package-manager.coffee)
-in the `settings-view` package.
-
-*This API should be considered pre-release and is subject to change (though significant breaking changes are unlikely).*
-
-### Authorization
-
-For calls to the API that require authentication, provide a valid token from your
-[Atom.io account page](https://atom.io/account) in the `Authorization` header.
-
-### Media type
-
-All requests that take parameters require `application/json`.
-
-# API Resources
-
-## Packages
-
-### Listing packages
-
-#### GET /api/packages
-
-Parameters:
-
-- **page** (optional)
-- **sort** (optional) - One of `downloads`, `created_at`, `updated_at`, `stars`. Defaults to `downloads`
-- **direction** (optional) - `asc` or `desc`. Defaults to `desc`. `stars` can only be ordered `desc`
-
-Returns a list of all packages in the following format:
-```json
-  [
-    {
-      "releases": {
-        "latest": "0.6.0"
-      },
-      "name": "thedaniel-test-package",
-      "repository": {
-        "type": "git",
-        "url": "https://github.com/thedaniel/test-package"
-      }
-    },
-    ...
-  ]
-```
-
-Results are paginated 30 at a time, and links to the next and last pages are
-provided in the `Link` header:
-
-```
-Link: <https://www.atom.io/api/packages?page=1>; rel="self",
-      <https://www.atom.io/api/packages?page=41>; rel="last",
-      <https://www.atom.io/api/packages?page=2>; rel="next"
-```
-
-By default, results are sorted by download count, descending.
-
-### Searching packages
-
-#### GET /api/packages/search
-
-Parameters:
-
-- **q** (required) - Search query
-- **page** (optional)
-- **sort** (optional) - One of `downloads`, `created_at`, `updated_at`, `stars`. Defaults to the relevance of the search query.
-- **direction** (optional) - `asc` or `desc`. Defaults to `desc`.
-
-Returns results in the same format as [listing packages](#listing-packages).
-
-### Showing package details
-
-#### GET /api/packages/:package_name
-
-Returns package details and versions for a single package
-
-Parameters:
-
-- **engine** (optional) - Only show packages with versions compatible with this
-  Atom version. Must be valid [SemVer](https://semver.org).
-
-Returns:
-
-```json
-  {
-    "releases": {
-      "latest": "0.6.0"
-    },
-    "name": "thedaniel-test-package",
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/thedaniel/test-package"
-    },
-    "versions": [
-      (see single version output below)
-      ...,
-    ]
-  }
-```
-
-### Creating a package
-
-#### POST /api/packages
-
-Create a new package; requires authentication.
-
-The name and version will be fetched from the `package.json`
-file in the specified repository. The authenticating user *must* have access
-to the indicated repository.
-
-Parameters:
-
-- **repository** - String. The repository containing the plugin, in the form "owner/repo"
-
-Returns:
-
-- **201** - Successfully created, returns created package.
-- **400** - Repository is inaccessible, nonexistent, not an atom package. Possible
-  error messages include:
-  - That repo does not exist, isn't an atom package, or atombot does not have access
-  - The package.json at owner/repo isn't valid
-- **409** - A package by that name already exists
-
-### Deleting a package
-
-#### DELETE /api/packages/:package_name
-
-Delete a package; requires authentication.
-
-Returns:
-
-- **204** - Success
-- **400** - Repository is inaccessible
-- **401** - Unauthorized
-
-### Renaming a package
-
-Packages are renamed by publishing a new version with the name changed in `package.json`
-See [Creating a new package version](#creating-a-new-package-version) for details.
-
-Requests made to the previous name will forward to the new name.
-
-### Package Versions
-
-#### GET /api/packages/:package_name/versions/:version_name
-
-Returns `package.json` with `dist` key added for e.g. tarball download:
-
-```json
-  {
-    "bugs": {
-      "url": "https://github.com/thedaniel/test-package/issues"
-    },
-    "dependencies": {
-      "async": "~0.2.6",
-      "pegjs": "~0.7.0",
-      "season": "~0.13.0"
-    },
-    "description": "Expand snippets matching the current prefix with `tab`.",
-    "dist": {
-      "tarball": "https://codeload.github.com/..."
-    },
-    "engines": {
-      "atom": "*"
-    },
-    "main": "./lib/snippets",
-    "name": "thedaniel-test-package",
-    "publishConfig": {
-      "registry": "https://...",
-    },
-    "repository": {
-      "type": "git",
-      "url": "https://github.com/thedaniel/test-package.git"
-    },
-    "version": "0.6.0"
-  }
-```
-
-
-### Creating a new package version
-
-#### POST /api/packages/:package_name/versions
-
-Creates a new package version from a git tag; requires authentication. If `rename`
-is not `true`, the `name` field in `package.json` *must* match the current package
-name.
-
-#### Parameters
-
-- **tag** - A git tag for the version you'd like to create. It's important to note
-  that the version name will not be taken from the tag, but from the `version`
-  key in the `package.json` file at that ref. The authenticating user *must* have
-  access to the package repository.
-- **rename** - Boolean indicating whether this version contains a new name for the package.
-
-#### Returns
-
-- **201** - Successfully created. Returns created version.
-- **400** - Git tag not found / Repository inaccessible / package.json invalid
-- **409** - Version exists
-
-### Deleting a version
-
-#### DELETE /api/packages/:package_name/versions/:version_name
-
-Deletes a package version; requires authentication.
-
-Note that a version cannot be republished with a different tag if it is deleted.
-If you need to delete the latest version of a package for e.g. security reasons,
-you'll need to increment the version when republishing.
-
-Returns 204 No Content
-
-
-## Stars
-
-### Listing user stars
-
-#### GET /api/users/:login/stars
-
-List a user's starred packages.
-
-Return value is similar to **GET /api/packages**
-
-#### GET /api/stars
-
-List the authenticated user's starred packages; requires authentication.
-
-Return value is similar to **GET /api/packages**
-
-### Starring a package
-
-#### POST /api/packages/:name/star
-
-Star a package; requires authentication.
-
-Returns a package.
-
-### Unstarring a package
-
-#### DELETE /api/packages/:name/star
-
-Unstar a package; requires authentication.
-
-Returns 204 No Content.
-
-### Listing a package's stargazers
-
-#### GET /api/packages/:name/stargazers
-
-List the users that have starred a package.
-
-Returns a list of user objects:
-
-```json
-[
-  {"login":"aperson"},
-  {"login":"anotherperson"},
-]
-```
-
-## Atom updates
-
-### Listing Atom updates
-
-#### GET /api/updates
-
-Atom update feed, following the format expected by [Squirrel](https://github.com/Squirrel/).
-
-Returns:
-
-```json
-{
-    "name": "0.96.0",
-    "notes": "[HTML release notes]",
-    "pub_date": "2014-05-19T15:52:06.000Z",
-    "url": "https://www.atom.io/api/updates/download"
-}
-```
+The information that was here has been moved to [a permanent home inside Atom's Flight Manual.](https://flight-manual.atom.io/atom-server-side-apis/)

spec/text-editor-spec.js

@@ -20,6 +20,17 @@ describe('TextEditor', () => {
     await atom.packages.activatePackage('language-javascript')
   })
 
+  it('generates unique ids for each editor', async () => {
+    // Deserialized editors are initialized with the serialized id. We can
+    // initialize an editor with what we expect to be the next id:
+    const deserialized = new TextEditor({id: editor.id+1})
+    expect(deserialized.id).toEqual(editor.id+1)
+
+    // The id generator should skip the id used up by the deserialized one:
+    const fresh = new TextEditor()
+    expect(fresh.id).toNotEqual(deserialized.id)
+  })
+
   describe('when the editor is deserialized', () => {
     it('restores selections and folds based on markers in the buffer', async () => {
       editor.setSelectedBufferRange([[1, 2], [3, 4]])

src/main-process/atom-application.coffee

@@ -38,12 +38,15 @@ class AtomApplication
       # Lowercasing the ATOM_HOME to make sure that we don't get multiple sockets
       # on case-insensitive filesystems due to arbitrary case differences in paths.
       atomHomeUnique = path.resolve(process.env.ATOM_HOME).toLowerCase()
-      hash = crypto.createHash('sha1').update(username).update('|').update(atomHomeUnique)
-      atomInstanceDigest = hash.digest('hex').substring(0, 32)
+      hash = crypto.createHash('sha1').update(options.version).update('|').update(process.arch).update('|').update(username).update('|').update(atomHomeUnique)
+      # We only keep the first 12 characters of the hash as not to have excessively long
+      # socket file. Note that macOS/BSD limit the length of socket file paths (see #15081).
+      # The replace calls convert the digest into "URL and Filename Safe" encoding (see RFC 4648).
+      atomInstanceDigest = hash.digest('base64').substring(0, 12).replace(/\+/g, '-').replace(/\//g, '_')
       if process.platform is 'win32'
-        options.socketPath = "\\\\.\\pipe\\atom-#{options.version}-#{process.arch}-#{atomInstanceDigest}-sock"
+        options.socketPath = "\\\\.\\pipe\\atom-#{atomInstanceDigest}-sock"
       else
-        options.socketPath = path.join(os.tmpdir(), "atom-#{options.version}-#{process.arch}-#{atomInstanceDigest}.sock")
+        options.socketPath = path.join(os.tmpdir(), "atom-#{atomInstanceDigest}.sock")
 
     # FIXME: Sometimes when socketPath doesn't exist, net.connect would strangely
     # take a few seconds to trigger 'error' event, it could be a bug of node

src/text-editor.js

@@ -119,6 +119,10 @@ class TextEditor {
     }
 
     this.id = params.id != null ? params.id : nextId++
+    if (this.id >= nextId) {
+      // Ensure that new editors get unique ids:
+      nextId = this.id + 1
+    }
     this.initialScrollTopRow = params.initialScrollTopRow
     this.initialScrollLeftColumn = params.initialScrollLeftColumn
     this.decorationManager = params.decorationManager