core/application.mjs

@@ -26,8 +26,7 @@ export default class Application extends EventEmitter {
         getLog: getLog,
         HttpServer: HttpServer,
         request: request,
-      },
+      }
-      version: '',
     }
     this.config = defaults({}, this.ctx.db.config[name])
     this.provider = provider
@@ -35,6 +34,7 @@ export default class Application extends EventEmitter {
     this.updating = false
     this.http = new HttpServer(this.config)
     this.module = null
+    this.running = ''
     this.workers = {}
 
     // Fresh is used to indicate that when we run the application and it fails,
@@ -390,14 +390,14 @@ export default class Application extends EventEmitter {
 
   runVersion(version) {
     this.ctx.db.data.core[this.name].active = version
-    this.ctx.version = version
+    this.running = version
-    this.emit('running', this.ctx.version)
+    this.emit('running', this.running)
 
     return this.ctx.db.write().then(() => {
       return this._runVersion(version)
         .catch((err) => {
-          this.ctx.version = ''
+          this.running = ''
-          this.emit('running', this.ctx.version)
+          this.emit('running', this.running)
           return Promise.reject(err)
         })
     })
@@ -477,8 +477,8 @@ export default class Application extends EventEmitter {
   }
 
   closeServer() {
-    this.ctx.version = ''
+    this.running = ''
-    this.emit('running', this.ctx.version)
+    this.emit('running', this.running)
     if (this.config.cluster && !this.isSlave) {
       if (this.__clusterWorkerDied) {
         this.cluster.off('exit', this.__clusterWorkerDied)

core/providers/git.mjs

@@ -29,7 +29,7 @@ export default class GitProvider {
         if (this.config.git_required_prefix && !asset.name.startsWith(this.config.git_required_prefix)) continue
 
         return {
-          version: item.name.replace(/ /g, '_'),
+          version: item.name,
           link: asset.browser_download_url,
           filename: asset.name,
           description: item.body,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "service-core",
-  "version": "3.0.2",
+  "version": "3.0.0",
   "description": "Core boiler plate code to install node server as windows service",
   "main": "index.mjs",
   "scripts": {

test/application.run.test.mjs

@@ -48,11 +48,11 @@ t.describe('#runVersion("static")', function() {
       assert.strictEqual(checkCtx.app, app)
     })
 
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     assert.strictEqual(app.fresh, true)
     let err = await assert.isRejected(app.runVersion('static'))
     assert.strictEqual(app.fresh, false)
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
 
     assert.match(err.message, /http/i)
     assert.match(err.message, /createServer/i)
@@ -64,11 +64,11 @@ t.describe('#runVersion("static")', function() {
     app.config.startWaitUntilFail = 50
     app.registerModule(function() { return new Promise(function() {}) })
     
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     assert.strictEqual(app.fresh, true)
     let err = await assert.isRejected(app.runVersion('static'))
     assert.strictEqual(app.fresh, false)
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
 
     assert.match(err.message, /time/i)
     assert.match(err.message, /out/i)
@@ -87,11 +87,11 @@ t.describe('#runVersion("static")', function() {
       })
     })
     
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     assert.strictEqual(app.fresh, true)
     await app.runVersion('static')
     assert.strictEqual(app.fresh, false)
-    assert.strictEqual(app.ctx.version, 'static')
+    assert.strictEqual(app.running, 'static')
 
     assert.strictEqual(ctx.db.data.core.testapp.active, 'static')
   })
@@ -107,11 +107,11 @@ t.describe('#runVersion("static")', function() {
     app.config.heartbeatAttemptsWait = 5
     app.registerModule(defaultHandler(handler))
 
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     assert.strictEqual(app.fresh, true)
     let err = await assert.isRejected(app.runVersion('static'))
     assert.strictEqual(app.fresh, false)
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
 
     assert.match(err.message, /failed/i)
     assert.match(err.message, /400/i)
@@ -129,13 +129,13 @@ t.describe('#runVersion("static")', function() {
     app.config.heartbeatAttemptsWait = 10
     app.registerModule(defaultHandler(handler))
 
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     assert.strictEqual(app.fresh, true)
     let start = performance.now()
     let err = await assert.isRejected(app.runVersion('static'))
     let end = performance.now()
     assert.strictEqual(app.fresh, false)
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
 
     assert.match(err.message, /failed/i)
     assert.match(err.message, /time/i)
@@ -160,11 +160,11 @@ t.describe('#runVersion("static")', function() {
     app.config.heartbeatAttemptsWait = 5
     app.registerModule(defaultHandler(handler))
 
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     let err = await assert.isRejected(app.runVersion('static'))
     assert.match(err.message, /failed/i)
     assert.match(err.message, /400/i)
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
 
     await app.closeServer()
     app.registerModule(defaultHandler(handler))
@@ -185,11 +185,11 @@ t.describe('#runVersion("static")', function() {
     app.registerModule(defaultHandler(handler))
     app.isSlave = true
 
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     assert.strictEqual(app.fresh, true)
     await app.runVersion('static')
     assert.strictEqual(app.fresh, false)
-    assert.strictEqual(app.ctx.version, 'static')
+    assert.strictEqual(app.running, 'static')
 
     assert.strictEqual(called, 0)
     assert.strictEqual(ctx.db.data.core.testapp.active, 'static')
@@ -240,11 +240,11 @@ t.describe('#runVersion("version")', function() {
     app.config.port = assertPort
     stubFsStat.rejects(assertNotError)
 
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     assert.strictEqual(app.fresh, true)
     let err = await assert.isRejected(app.runVersion('v100'))
     assert.strictEqual(app.fresh, true)
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
 
     assert.notStrictEqual(err, assertNotError)
     assert.match(err.message, new RegExp(assertNotError.message))
@@ -262,11 +262,11 @@ t.describe('#runVersion("version")', function() {
     await fs.mkdir(util.getPathFromRoot('./testnoexisting/v99'), { recursive: true })
     await fs.writeFile(util.getPathFromRoot('./testnoexisting/v99/index.mjs'), `throw new Error('${assertError.message}')`)
 
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     assert.strictEqual(app.fresh, true)
     let err = await assert.isRejected(app.runVersion('v99'))
     assert.strictEqual(app.fresh, false)
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
 
     assert.notStrictEqual(err, assertError)
     assert.strictEqual(err.message, assertError.message)
@@ -280,12 +280,12 @@ t.describe('#runVersion("version")', function() {
     await fs.mkdir(util.getPathFromRoot('./testnoexisting/v98'), { recursive: true })
     await fs.writeFile(util.getPathFromRoot('./testnoexisting/v98/index.mjs'), ``)
 
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     assert.strictEqual(app.fresh, true)
     let err = await assert.isRejected(app.runVersion('v98'))
     assert.strictEqual(app.fresh, false)
     assert.match(err.message, /start/i)
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
 
     assert.strictEqual(app.ctx.db.data.core.testnoexisting.active, 'v98')
     let checkDb = await lowdb({}, ctx.log, assertConfig)
@@ -302,11 +302,11 @@ t.describe('#runVersion("version")', function() {
     app.ctx.log.info.reset()
     app.ctx.log.event.info.reset()
 
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     assert.strictEqual(app.fresh, true)
     await app.runVersion('v97')
     assert.strictEqual(app.fresh, false)
-    assert.strictEqual(app.ctx.version, 'v97')
+    assert.strictEqual(app.running, 'v97')
 
     assert.ok(app.ctx.log.info.called)
     assert.ok(app.ctx.log.event.info.called)

test/application.test.mjs

@@ -74,7 +74,7 @@ t.describe('constructor()', function() {
     assert.strictEqual(app.ctx.sc.getLog, getLog)
     assert.strictEqual(app.name, assertName)
     assert.strictEqual(app.fresh, true)
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
     assert.strictEqual(app.monitoringCluster, false)
     assert.deepStrictEqual(app.workers, {})
     assert.strictEqual(app.isSlave, false)
@@ -333,9 +333,9 @@ t.describe('#closeServer()', function() {
     const assertError = new Error('Moonlight Fiesta')
     stubCloseServer.rejects(assertError)
 
-    app.ctx.version = assertNotVersion
+    app.running = assertNotVersion
     let err = await assert.isRejected(app.closeServer())
-    assert.strictEqual(app.ctx.version, '')
+    assert.strictEqual(app.running, '')
 
     assert.strictEqual(err, assertError)
   })

test/providers/git.test.integration.mjs

@@ -16,7 +16,7 @@ t.timeout(5000).describe('#getLatestVersion()', function() {
     assert.ok(version.version)
     assert.ok(version.description)
     assert.ok(version.link)
-    assert.match(version.link, /\/download\//)
+    assert.match(version.link, /\/attachments\//)
   })
 
   t.test('should fail if link does not return json repository object', async function() {

test/providers/git.test.mjs

@@ -20,25 +20,6 @@ t.describe('#getLatestVersion()', function() {
     assert.strictEqual(version.log, '')
   })
 
-  t.test('should auto replace spaces with underscores result', async function() {
-    const assertOriginalName = 'The Smell Of Sea'
-    const assertCorrectName = 'The_Smell_Of_Sea'
-    const assertLink = 'Over The Future'
-    const assertFilename = 'test-sc.7z'
-    let stubber = stub()
-    let provider = new GitProvider({}, stubber)
-
-    stubber.resolves({ body: [
-      { name: assertOriginalName, assets: [{ name: assertFilename, browser_download_url: assertLink }] },
-    ]})
-
-    let version = await provider.getLatestVersion()
-    assert.strictEqual(version.version, assertCorrectName)
-    assert.strictEqual(version.link, assertLink)
-    assert.strictEqual(version.filename, assertFilename)
-    assert.strictEqual(version.log, '')
-  })
-
   t.test('should skip zip files for now', async function() {
     const assertName = 'Karen'
     const assertLink = 'My Wings'