@dotenvx/dotenvx-ops 0.20.1 → 0.21.0

package/CHANGELOG.md

@@ -2,7 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-[Unreleased](https://github.com/dotenvx/dotenvx-ops/compare/v0.20.1...main)
+[Unreleased](https://github.com/dotenvx/dotenvx-ops/compare/v0.21.0...main)
+
+## [0.21.0](https://github.com/dotenvx/dotenvx-ops/compare/v0.20.2...v0.21.0) (2025-10-11)
+
+### Added
+
+* Send `DOTENVX_PROJECT_ID` along with `observe` call ([#5](https://github.com/dotenvx/dotenvx-ops/pull/5))
+
+## [0.20.2](https://github.com/dotenvx/dotenvx-ops/compare/v0.20.1...v0.20.2) (2025-10-07)
+
+### Added
+
+* Send `DOTENVX_PROJECT_ID` along with login request for redirect convenience when present
 
 ## [0.20.1](https://github.com/dotenvx/dotenvx-ops/compare/v0.20.0...v0.20.1) (2025-10-07)
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.20.1",
+  "version": "0.21.0",
   "name": "@dotenvx/dotenvx-ops",
   "description": "Dotenvx Ops",
   "author": "@motdotla",

package/src/cli/actions/login.js

@@ -8,6 +8,7 @@ const { createSpinner } = require('./../../lib/helpers/createSpinner')
 const confirm = require('./../../lib/helpers/confirm')
 const truncate = require('./../../lib/helpers/truncate')
 const formatCode = require('./../../lib/helpers/formatCode')
+const dotenvxProjectId = require('./../../lib/helpers/dotenvxProjectId')
 
 const spinner = createSpinner('waiting on browser authorization')
 
@@ -73,7 +74,8 @@ async function login () {
     const sesh = new Session()
     const devicePublicKey = sesh.devicePublicKey()
     const systemInformation = await sesh.systemInformation()
-    const data = await new PostOauthDeviceCode(hostname, devicePublicKey, systemInformation).run()
+    const _dotenvxProjectId = dotenvxProjectId(process.cwd(), false)
+    const data = await new PostOauthDeviceCode(hostname, devicePublicKey, systemInformation, _dotenvxProjectId).run()
 
     const deviceCode = data.device_code
     const userCode = data.user_code

package/src/cli/actions/observe.js

@@ -11,9 +11,10 @@ async function observe (base64) {
 
   const hostname = options.hostname
   const token = options.token
+  const dotenvxProjectId = options.dotenvxProjectId
 
   try {
-    await main.observe(base64, { hostname, token })
+    await main.observe(base64, { hostname, token, dotenvxProjectId })
   } catch (error) {
     if (error.message) {
       logger.error(error.message)

package/src/cli/dotenvx-ops.js

@@ -39,6 +39,7 @@ program.command('observe')
   .argument('BASE64', 'BASE64')
   .option('--hostname <url>', 'set hostname', sesh.hostname())
   .option('--token <token>', 'set token')
+  .option('--dotenvxProjectId <identifier>', 'set DOTENVX_PROJECT_ID')
   .action(function (...args) {
     observeAction.apply(this, args)
   })

package/src/lib/api/postOauthDeviceCode.js

@@ -6,16 +6,18 @@ const buildOauthError = require('../../lib/helpers/buildOauthError')
 const OAUTH_CLIENT_ID = 'oac_dotenvxcli'
 
 class PostOauthDeviceCode {
-  constructor (hostname, devicePublicKey, systemInformation) {
+  constructor (hostname, devicePublicKey, systemInformation, dotenvxProjectId = null) {
     this.hostname = hostname
     this.devicePublicKey = devicePublicKey
     this.systemInformation = systemInformation
+    this.dotenvxProjectId = dotenvxProjectId
   }
 
   async run () {
     const url = `${this.hostname}/oauth/device/code`
     const devicePublicKey = this.devicePublicKey
     const systemInformation = this.systemInformation
+    const dotenvxProjectId = this.dotenvxProjectId
 
     const resp = await http(url, {
       method: 'POST',
@@ -25,7 +27,8 @@ class PostOauthDeviceCode {
       body: JSON.stringify({
         client_id: OAUTH_CLIENT_ID,
         device_public_key: devicePublicKey,
-        system_information: systemInformation
+        system_information: systemInformation,
+        dotenvx_project_id: dotenvxProjectId
       })
     })
 

package/src/lib/api/postObserve.js

@@ -3,7 +3,7 @@ const buildApiError = require('../../lib/helpers/buildApiError')
 const packageJson = require('../../lib/helpers/packageJson')
 
 class PostObserve {
-  constructor (hostname, token, encoded, pwd = null, gitUrl = null, gitBranch = null, systemUuid = null, osPlatform = null, osArch = null) {
+  constructor (hostname, token, encoded, pwd = null, gitUrl = null, gitBranch = null, systemUuid = null, osPlatform = null, osArch = null, dotenvxProjectId = null) {
     this.hostname = hostname || 'https://ops.dotenvx.com'
     this.token = token
     this.encoded = encoded
@@ -13,6 +13,7 @@ class PostObserve {
     this.systemUuid = systemUuid
     this.osPlatform = osPlatform
     this.osArch = osArch
+    this.dotenvxProjectId = dotenvxProjectId
   }
 
   async run () {
@@ -26,6 +27,7 @@ class PostObserve {
     const systemUuid = this.systemUuid
     const osPlatform = this.osPlatform
     const osArch = this.osArch
+    const dotenvxProjectId = this.dotenvxProjectId
 
     const resp = await http(url, {
       method: 'POST',
@@ -42,7 +44,8 @@ class PostObserve {
         system_uuid: systemUuid,
         os_platform: osPlatform,
         os_arch: osArch,
-        cli_version: packageJson.version
+        cli_version: packageJson.version,
+        dotenvx_project_id: dotenvxProjectId
       })
     })
 

package/src/lib/helpers/dotenvxProjectId.js

@@ -0,0 +1,36 @@
+const fs = require('fs')
+const path = require('path')
+const dotenvx = require('@dotenvx/dotenvx')
+const Errors = require('./errors')
+
+function dotenvxProjectId (cwd = process.cwd(), raiseErrors = true) {
+  // 1. Prefer environment variable
+  if (process.env.DOTENVX_PROJECT_ID && process.env.DOTENVX_PROJECT_ID.trim()) {
+    return process.env.DOTENVX_PROJECT_ID.trim()
+  }
+
+  // 2. Otherwise, parse .env.x contents
+  const filepath = path.join(cwd, '.env.x')
+  // file must exist
+  if (!fs.existsSync(filepath)) {
+    const filename = path.basename(filepath)
+    if (raiseErrors) {
+      throw new Errors({ filename, filepath }).envXFileMissing()
+    } else {
+      return null
+    }
+  }
+
+  if (fs.existsSync(filepath)) {
+    const src = fs.readFileSync(filepath, 'utf8')
+    const parsed = dotenvx.parse(src)
+    if (parsed.DOTENVX_PROJECT_ID && parsed.DOTENVX_PROJECT_ID.trim()) {
+      return parsed.DOTENVX_PROJECT_ID.trim()
+    }
+  }
+
+  // 3. Nothing found
+  return null
+}
+
+module.exports = dotenvxProjectId

package/src/lib/main.js

@@ -6,6 +6,7 @@ const PostObserve = require('./api/postObserve')
 
 const gitUrl = require('./helpers/gitUrl')
 const gitBranch = require('./helpers/gitBranch')
+const dotenvxProjectId = require('./helpers/dotenvxProjectId')
 
 const observe = async function (encoded, options = {}) {
   const sesh = new Session() // TODO: handle scenario where constructor fails
@@ -21,6 +22,8 @@ const observe = async function (encoded, options = {}) {
   }
 
   const _pwd = process.cwd()
+  const _dotenvxProjectId = process.env.DOTENVX_PROJECT_ID || options.dotenvxProjectId || dotenvxProjectId(_pwd, false)
+
   const _gitUrl = gitUrl()
   const _gitBranch = gitBranch()
 
@@ -31,7 +34,7 @@ const observe = async function (encoded, options = {}) {
   const _osPlatform = osInfo.platform
   const _osArch = osInfo.arch
 
-  const json = await new PostObserve(hostname, token, encoded, _pwd, _gitUrl, _gitBranch, _systemUuid, _osPlatform, _osArch).run()
+  const json = await new PostObserve(hostname, token, encoded, _pwd, _gitUrl, _gitBranch, _systemUuid, _osPlatform, _osArch, _dotenvxProjectId).run()
 
   return json
 }

package/src/lib/services/sync.js

@@ -7,7 +7,7 @@ const Session = require('./../../db/session')
 
 const gitUrl = require('./../helpers/gitUrl')
 const gitBranch = require('./../helpers/gitBranch')
-const Errors = require('./../helpers/errors')
+const dotenvxProjectId = require('./../helpers/dotenvxProjectId')
 
 // api calls
 const PostSync = require('./../api/postSync')
@@ -29,7 +29,7 @@ class Sync {
     const files = this._files()
     const payload = { files }
     const encoded = Buffer.from(JSON.stringify(payload)).toString('base64')
-    const dotenvxProjectId = this._dotenvxProjectId()
+    const _dotenvxProjectId = dotenvxProjectId(this.cwd)
 
     // optional
     const _pwd = this.cwd
@@ -43,7 +43,7 @@ class Sync {
     const _osPlatform = osInfo.platform
     const _osArch = osInfo.arch
 
-    const data = await new PostSync(this.hostname, token, devicePublicKey, encoded, dotenvxProjectId, _pwd, _gitUrl, _gitBranch, _systemUuid, _osPlatform, _osArch, this.force).run()
+    const data = await new PostSync(this.hostname, token, devicePublicKey, encoded, _dotenvxProjectId, _pwd, _gitUrl, _gitBranch, _systemUuid, _osPlatform, _osArch, this.force).run()
 
     return {
       id: data.id,
@@ -53,32 +53,6 @@ class Sync {
     }
   }
 
-  _dotenvxProjectId () {
-    // 1. Prefer environment variable
-    if (process.env.DOTENVX_PROJECT_ID && process.env.DOTENVX_PROJECT_ID.trim()) {
-      return process.env.DOTENVX_PROJECT_ID.trim()
-    }
-
-    // 2. Otherwise, parse .env.x contents
-    const filepath = path.join(this.cwd, '.env.x')
-    // file must exist
-    if (!fs.existsSync(filepath)) {
-      const filename = path.basename(filepath)
-      throw new Errors({ filename, filepath }).envXFileMissing()
-    }
-
-    if (fs.existsSync(filepath)) {
-      const src = fs.readFileSync(filepath, 'utf8')
-      const parsed = dotenvx.parse(src)
-      if (parsed.DOTENVX_PROJECT_ID && parsed.DOTENVX_PROJECT_ID.trim()) {
-        return parsed.DOTENVX_PROJECT_ID.trim()
-      }
-    }
-
-    // 3. Nothing found
-    return null
-  }
-
   _files () {
     const out = []
     const filepaths = dotenvx.ls(this.cwd)