Skip to content

Commit b399cde

Browse files
authored
Issue 72 linux support (#203)
* Add custom package for better linux support
1 parent 7a4071b commit b399cde

6 files changed

Lines changed: 66 additions & 18 deletions

File tree

package-lock.json

Lines changed: 45 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "codeclimbers",
33
"productName": "Code Climbers",
4-
"version": "0.1.33",
4+
"version": "0.1.34",
55
"description": "The Code Climbers CLI",
66
"licenses": [
77
{
@@ -69,7 +69,7 @@
6969
"ws": "^8.18.0"
7070
},
7171
"optionalDependencies": {
72-
"node-linux": "^0.1.7",
72+
"@codeclimbers/node-linux": "^0.1.14",
7373
"node-mac": "^1.0.1",
7474
"node-windows": "^1.0.0-beta.8"
7575
},

packages/server/src/v1/startup/darwinStartup.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ export class DarwinStartupService implements CodeClimbers.StartupService {
1414
private service: typeof Service
1515

1616
constructor() {
17+
const scriptPath = path.join(BIN_PATH, 'startup.js')
1718
this.service = new Service({
1819
name: 'CodeClimbers',
1920
description: 'CodeClimbers service',
20-
script: `${path.join(BIN_PATH, 'startup.js')}`,
21+
script: scriptPath,
2122
logpath: CODE_CLIMBER_META_DIR,
2223
env: [
2324
{

packages/server/src/v1/startup/linuxStartup.service.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import { Injectable, Logger } from '@nestjs/common'
2-
// eslint-disable-next-line import/no-unresolved
32
import * as path from 'node:path'
4-
import { BIN_PATH, CODE_CLIMBER_META_DIR } from '../../../utils/node.util'
3+
import {
4+
BIN_PATH,
5+
CODE_CLIMBER_META_DIR,
6+
NODE_PATH,
7+
} from '../../../utils/node.util'
58
import startupUtil from './startup.util'
69
import { isDev } from '../../../utils/environment.util'
710
const { Service } = startupUtil.getServiceLib()
@@ -25,9 +28,11 @@ export class LinuxStartupService implements CodeClimbers.StartupService {
2528
name: 'CODE_CLIMBER_BIN_PATH',
2629
value: BIN_PATH,
2730
},
31+
{
32+
name: 'NODE_PATH',
33+
value: NODE_PATH(),
34+
},
2835
],
29-
logOnAsUser: true,
30-
runAsAgent: true,
3136
wait: 5,
3237
grow: 0,
3338
maxRestarts: 10,

packages/server/src/v1/startup/startup.util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function getServiceLib() {
88
case 'darwin':
99
return require('node-mac')
1010
case 'linux':
11-
return require('node-linux')
11+
return require('@codeclimbers/node-linux')
1212
case 'win32':
1313
return require('node-windows')
1414
default:

packages/server/utils/node.util.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ export const initDBDir = nodeUtil.initDBDir
122122

123123
const logPaths = () => {
124124
if (isProd()) return
125-
Logger.debug('NODE_PATH', NODE_PATH())
126-
Logger.debug('PROJECT_ROOT', PROJECT_ROOT)
127-
Logger.debug('BIN_PATH', BIN_PATH)
128-
Logger.debug('CODE_CLIMBER_META_DIR', CODE_CLIMBER_META_DIR)
129-
Logger.debug('DB_PATH', DB_PATH)
130-
Logger.debug('HOME_DIR', HOME_DIR)
131-
Logger.debug('APP_DIST_PATH', APP_DIST_PATH)
125+
Logger.debug(NODE_PATH(), 'NODE_PATH')
126+
Logger.debug(PROJECT_ROOT, 'PROJECT_ROOT')
127+
Logger.debug(BIN_PATH, 'BIN_PATH')
128+
Logger.debug(CODE_CLIMBER_META_DIR, 'CODE_CLIMBER_META_DIR')
129+
Logger.debug(DB_PATH, 'DB_PATH')
130+
Logger.debug(HOME_DIR, 'HOME_DIR')
131+
Logger.debug(APP_DIST_PATH, 'APP_DIST_PATH')
132132
}
133133

134134
logPaths()

0 commit comments

Comments
 (0)