20 Commits

Author SHA1 Message Date
3a2d174c19 2.0.4 2023-07-25 18:57:39 +02:00
323648a3f7 fix(core): update 2023-07-25 18:57:38 +02:00
0a48d9a12d switch to new org scheme 2023-07-11 00:29:11 +02:00
7bf11122f8 switch to new org scheme 2023-07-10 02:42:56 +02:00
1466725b54 2.0.3 2022-10-19 19:42:07 +02:00
9fdc686671 fix(core): update 2022-10-19 19:42:07 +02:00
4cca23cffa 2.0.2 2022-10-19 19:39:33 +02:00
f683fc1fa7 fix(core): update 2022-10-19 19:39:33 +02:00
d25665519a 2.0.1 2022-10-19 19:35:06 +02:00
e54e0b4ee3 fix(core): update 2022-10-19 19:35:06 +02:00
6cfa9aba87 2.0.0 2022-10-19 19:27:43 +02:00
451daec7b4 BREAKING CHANGE(core): switch to esm 2022-10-19 19:27:42 +02:00
7067826a4e 1.0.22 2021-01-30 00:45:48 +00:00
16abdc6f12 fix(core): update 2021-01-30 00:45:47 +00:00
09b598f7bf 1.0.21 2021-01-30 00:41:41 +00:00
060f635989 fix(core): update 2021-01-30 00:41:40 +00:00
769d7d6419 1.0.20 2019-09-19 19:37:35 +02:00
49dd65af05 fix(core): update 2019-09-19 19:37:34 +02:00
d550318331 1.0.19 2019-09-19 15:58:44 +02:00
9fc71fcfee fix(core): update 2019-09-19 15:58:43 +02:00
24 changed files with 5195 additions and 1953 deletions

View File

@ -0,0 +1,66 @@
name: Default (not tags)
on:
push:
tags-ignore:
- '**'
env:
IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
jobs:
security:
runs-on: ubuntu-latest
continue-on-error: true
container:
image: ${{ env.IMAGE }}
steps:
- uses: actions/checkout@v3
- name: Install pnpm and npmci
run: |
pnpm install -g pnpm
pnpm install -g @shipzone/npmci
- name: Run npm prepare
run: npmci npm prepare
- name: Audit production dependencies
run: |
npmci command npm config set registry https://registry.npmjs.org
npmci command pnpm audit --audit-level=high --prod
continue-on-error: true
- name: Audit development dependencies
run: |
npmci command npm config set registry https://registry.npmjs.org
npmci command pnpm audit --audit-level=high --dev
continue-on-error: true
test:
if: ${{ always() }}
needs: security
runs-on: ubuntu-latest
container:
image: ${{ env.IMAGE }}
steps:
- uses: actions/checkout@v3
- name: Test stable
run: |
npmci node install stable
npmci npm install
npmci npm test
- name: Test build
run: |
npmci node install stable
npmci npm install
npmci npm build

View File

@ -0,0 +1,124 @@
name: Default (tags)
on:
push:
tags:
- '*'
env:
IMAGE: registry.gitlab.com/hosttoday/ht-docker-node:npmci
NPMCI_COMPUTED_REPOURL: https://${{gitea.repository_owner}}:${{secrets.GITEA_TOKEN}}@gitea.lossless.digital/${{gitea.repository}}.git
NPMCI_TOKEN_NPM: ${{secrets.NPMCI_TOKEN_NPM}}
NPMCI_TOKEN_NPM2: ${{secrets.NPMCI_TOKEN_NPM2}}
NPMCI_GIT_GITHUBTOKEN: ${{secrets.NPMCI_GIT_GITHUBTOKEN}}
NPMCI_URL_CLOUDLY: ${{secrets.NPMCI_URL_CLOUDLY}}
jobs:
security:
runs-on: ubuntu-latest
continue-on-error: true
container:
image: ${{ env.IMAGE }}
steps:
- uses: actions/checkout@v3
- name: Prepare
run: |
pnpm install -g pnpm
pnpm install -g @shipzone/npmci
npmci npm prepare
- name: Audit production dependencies
run: |
npmci command npm config set registry https://registry.npmjs.org
npmci command pnpm audit --audit-level=high --prod
continue-on-error: true
- name: Audit development dependencies
run: |
npmci command npm config set registry https://registry.npmjs.org
npmci command pnpm audit --audit-level=high --dev
continue-on-error: true
test:
if: ${{ always() }}
needs: security
runs-on: ubuntu-latest
container:
image: ${{ env.IMAGE }}
steps:
- uses: actions/checkout@v3
- name: Prepare
run: |
pnpm install -g pnpm
pnpm install -g @shipzone/npmci
npmci npm prepare
- name: Test stable
run: |
npmci node install stable
npmci npm install
npmci npm test
- name: Test build
run: |
npmci node install stable
npmci npm install
npmci npm build
release:
needs: test
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
container:
image: ${{ env.IMAGE }}
steps:
- uses: actions/checkout@v3
- name: Prepare
run: |
pnpm install -g pnpm
pnpm install -g @shipzone/npmci
npmci npm prepare
- name: Release
run: |
npmci node install stable
npmci npm publish
metadata:
needs: test
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
container:
image: ${{ env.IMAGE }}
continue-on-error: true
steps:
- uses: actions/checkout@v3
- name: Prepare
run: |
pnpm install -g pnpm
pnpm install -g @shipzone/npmci
npmci npm prepare
- name: Code quality
run: |
npmci command npm install -g typescript
npmci npm install
- name: Trigger
run: npmci trigger
- name: Build docs and upload artifacts
run: |
npmci node install stable
npmci npm install
pnpm install -g @gitzone/tsdoc
npmci command tsdoc
continue-on-error: true

4
.gitignore vendored
View File

@ -15,8 +15,6 @@ node_modules/
# builds # builds
dist/ dist/
dist_web/ dist_*/
dist_serve/
dist_ts_web/
# custom # custom

View File

@ -1,105 +0,0 @@
# gitzone ci_default
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
cache:
paths:
- .npmci_cache/
key: "$CI_BUILD_STAGE"
stages:
- security
- test
- release
- metadata
# ====================
# security stage
# ====================
mirror:
stage: security
script:
- npmci git mirror
tags:
- docker
- notpriv
snyk:
stage: security
script:
- npmci npm prepare
- npmci command npm install -g snyk
- npmci command npm install --ignore-scripts
- npmci command snyk test
tags:
- docker
- notpriv
# ====================
# test stage
# ====================
testLTS:
stage: test
script:
- npmci npm prepare
- npmci node install lts
- npmci npm install
- npmci npm test
coverage: /\d+.?\d+?\%\s*coverage/
tags:
- docker
- notpriv
release:
stage: release
script:
- npmci node install lts
- npmci npm publish
only:
- tags
tags:
- docker
- notpriv
# ====================
# metadata stage
# ====================
codequality:
stage: metadata
allow_failure: true
script:
- npmci command npm install -g tslint typescript
- npmci npm install
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
tags:
- docker
- priv
trigger:
stage: metadata
script:
- npmci trigger
only:
- tags
tags:
- docker
- notpriv
pages:
image: hosttoday/ht-docker-node:npmci
stage: metadata
script:
- npmci command npm install -g @gitzone/tsdoc
- npmci npm prepare
- npmci npm install
- npmci command tsdoc
tags:
- docker
- notpriv
only:
- tags
artifacts:
expire_in: 1 week
paths:
- public
allow_failure: true

24
.vscode/launch.json vendored
View File

@ -2,28 +2,10 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"name": "current file", "command": "npm test",
"type": "node", "name": "Run npm test",
"request": "launch", "request": "launch",
"args": [ "type": "node-terminal"
"${relativeFile}"
],
"runtimeArgs": ["-r", "@gitzone/tsrun"],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "test.ts",
"type": "node",
"request": "launch",
"args": [
"test/test.ts"
],
"runtimeArgs": ["-r", "@gitzone/tsrun"],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"internalConsoleOptions": "openOnSessionStart"
} }
] ]
} }

26
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,26 @@
{
"json.schemas": [
{
"fileMatch": ["/npmextra.json"],
"schema": {
"type": "object",
"properties": {
"npmci": {
"type": "object",
"description": "settings for npmci"
},
"gitzone": {
"type": "object",
"description": "settings for gitzone",
"properties": {
"projectType": {
"type": "string",
"enum": ["website", "element", "service", "npm", "wcc"]
}
}
}
}
}
}
]
}

View File

@ -1,11 +1,12 @@
{ {
"gitzone": { "gitzone": {
"projectType": "npm",
"module": { "module": {
"githost": "gitlab.com", "githost": "gitlab.com",
"gitscope": "pushrocks", "gitscope": "push.rocks",
"gitrepo": "smartdaemon", "gitrepo": "smartdaemon",
"shortDescription": "start scripts as long running daemons and manage them", "description": "start scripts as long running daemons and manage them",
"npmPackagename": "@pushrocks/smartdaemon", "npmPackagename": "@push.rocks/smartdaemon",
"license": "MIT", "license": "MIT",
"projectDomain": "push.rocks" "projectDomain": "push.rocks"
} }

1704
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,42 +1,48 @@
{ {
"name": "@pushrocks/smartdaemon", "name": "@push.rocks/smartdaemon",
"version": "1.0.18", "version": "2.0.4",
"private": false, "private": false,
"description": "start scripts as long running daemons and manage them", "description": "start scripts as long running daemons and manage them",
"main": "dist/index.js", "main": "dist_ts/index.js",
"typings": "dist/index.d.ts", "typings": "dist_ts/index.d.ts",
"author": "Lossless GmbH", "author": "Lossless GmbH",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"test": "(tstest test/)", "test": "(tstest test/ --web)",
"build": "(tsbuild)", "build": "(tsbuild --web --allowimplicitany)",
"format": "(gitzone format)" "buildDocs": "tsdoc"
}, },
"devDependencies": { "devDependencies": {
"@gitzone/tsbuild": "^2.1.17", "@gitzone/tsbuild": "^2.1.25",
"@gitzone/tstest": "^1.0.15", "@gitzone/tsrun": "^1.2.38",
"@pushrocks/tapbundle": "^3.0.13", "@gitzone/tstest": "^1.0.52",
"@types/node": "^10.11.7", "@push.rocks/tapbundle": "^5.0.4",
"tslint": "^5.11.0", "@types/node": "^18.11.2"
"tslint-config-prettier": "^1.15.0"
}, },
"dependencies": { "dependencies": {
"@pushrocks/lik": "^3.0.11", "@push.rocks/lik": "^6.0.0",
"@pushrocks/smartfile": "^7.0.4", "@push.rocks/smartfile": "^10.0.5",
"@pushrocks/smartfm": "^2.0.4", "@push.rocks/smartfm": "^2.0.4",
"@pushrocks/smartlog": "^2.0.19", "@push.rocks/smartlog": "^3.0.1",
"@pushrocks/smartlog-destination-local": "^8.0.2", "@push.rocks/smartlog-destination-local": "^9.0.1",
"@pushrocks/smartshell": "^2.0.25", "@push.rocks/smartpath": "^5.0.5",
"@pushrocks/smartsystem": "^2.0.8" "@push.rocks/smartshell": "^3.0.3",
"@push.rocks/smartsystem": "^3.0.1"
}, },
"files": [ "files": [
"ts/*", "ts/**/*",
"ts_web/*", "ts_web/**/*",
"dist/*", "dist/**/*",
"dist_web/*", "dist_*/**/*",
"assets/*", "dist_ts/**/*",
"dist_ts_web/**/*",
"assets/**/*",
"cli.js", "cli.js",
"npmextra.json", "npmextra.json",
"readme.md" "readme.md"
] ],
"browserslist": [
"last 1 chrome versions"
],
"type": "module"
} }

4811
pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,26 +1,39 @@
# @pushrocks/smartdaemon # @push.rocks/smartdaemon
start scripts as long running daemons and manage them start scripts as long running daemons and manage them
## Availabililty and Links ## Availabililty and Links
* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/smartdaemon) * [npmjs.org (npm package)](https://www.npmjs.com/package/@push.rocks/smartdaemon)
* [gitlab.com (source)](https://gitlab.com/pushrocks/smartdaemon) * [gitlab.com (source)](https://gitlab.com/push.rocks/smartdaemon)
* [github.com (source mirror)](https://github.com/pushrocks/smartdaemon) * [github.com (source mirror)](https://github.com/push.rocks/smartdaemon)
* [docs (typedoc)](https://pushrocks.gitlab.io/smartdaemon/) * [docs (typedoc)](https://push.rocks.gitlab.io/smartdaemon/)
## Status for master ## Status for master
[![build status](https://gitlab.com/pushrocks/smartdaemon/badges/master/build.svg)](https://gitlab.com/pushrocks/smartdaemon/commits/master)
[![coverage report](https://gitlab.com/pushrocks/smartdaemon/badges/master/coverage.svg)](https://gitlab.com/pushrocks/smartdaemon/commits/master) Status Category | Status Badge
[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/smartdaemon.svg)](https://www.npmjs.com/package/@pushrocks/smartdaemon) -- | --
[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/smartdaemon/badge.svg)](https://snyk.io/test/npm/@pushrocks/smartdaemon) GitLab Pipelines | [![pipeline status](https://gitlab.com/push.rocks/smartdaemon/badges/master/pipeline.svg)](https://lossless.cloud)
[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) GitLab Pipline Test Coverage | [![coverage report](https://gitlab.com/push.rocks/smartdaemon/badges/master/coverage.svg)](https://lossless.cloud)
[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/) npm | [![npm downloads per month](https://badgen.net/npm/dy/@push.rocks/smartdaemon)](https://lossless.cloud)
[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/) Snyk | [![Known Vulnerabilities](https://badgen.net/snyk/push.rocks/smartdaemon)](https://lossless.cloud)
TypeScript Support | [![TypeScript](https://badgen.net/badge/TypeScript/>=%203.x/blue?icon=typescript)](https://lossless.cloud)
node Support | [![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
Code Style | [![Code Style](https://badgen.net/badge/style/prettier/purple)](https://lossless.cloud)
PackagePhobia (total standalone install weight) | [![PackagePhobia](https://badgen.net/packagephobia/install/@push.rocks/smartdaemon)](https://lossless.cloud)
PackagePhobia (package size on registry) | [![PackagePhobia](https://badgen.net/packagephobia/publish/@push.rocks/smartdaemon)](https://lossless.cloud)
BundlePhobia (total size when bundled) | [![BundlePhobia](https://badgen.net/bundlephobia/minzip/@push.rocks/smartdaemon)](https://lossless.cloud)
## Usage ## Usage
## Contribution
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
## Contribution
We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
For further information read the linked docs at the top of this readme. For further information read the linked docs at the top of this readme.
> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh) ## Legal
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html) > MIT licensed | **©** [Task Venture Capital GmbH](https://task.vc)
| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)

3
test/plugins.ts Normal file
View File

@ -0,0 +1,3 @@
import * as smartpath from '@push.rocks/smartpath';
export { smartpath };

View File

@ -1,11 +1,14 @@
import { expect, tap } from '@pushrocks/tapbundle'; import { expect, tap } from '@push.rocks/tapbundle';
import * as smartdaemon from '../ts/index';
import * as plugins from './plugins.js';
import * as smartdaemon from '../ts/index.js';
let testSmartdaemon: smartdaemon.SmartDaemon; let testSmartdaemon: smartdaemon.SmartDaemon;
tap.test('should create an instance of smartdaemon', async () => { tap.test('should create an instance of smartdaemon', async () => {
testSmartdaemon = new smartdaemon.SmartDaemon(); testSmartdaemon = new smartdaemon.SmartDaemon();
expect(testSmartdaemon).to.be.instanceOf(smartdaemon.SmartDaemon); expect(testSmartdaemon).toBeInstanceOf(smartdaemon.SmartDaemon);
}); });
tap.test('should create a service', async () => { tap.test('should create a service', async () => {
@ -14,7 +17,7 @@ tap.test('should create a service', async () => {
version: 'x.x.x', version: 'x.x.x',
command: 'npm -v', command: 'npm -v',
description: 'displays the npm version', description: 'displays the npm version',
workingDir: __dirname workingDir: plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
}); });
}); });

8
ts/00_commitinfo_data.ts Normal file
View File

@ -0,0 +1,8 @@
/**
* autocreated commitinfo by @pushrocks/commitinfo
*/
export const commitinfo = {
name: '@push.rocks/smartdaemon',
version: '2.0.4',
description: 'start scripts as long running daemons and manage them'
}

View File

@ -1 +1 @@
export * from './smartdaemon.classes.smartdaemon'; export * from './smartdaemon.classes.smartdaemon.js';

View File

@ -1,6 +1,6 @@
import * as plugins from './smartdaemon.plugins'; import * as plugins from './smartdaemon.plugins.js';
import * as paths from './smartdaemon.paths'; import * as paths from './smartdaemon.paths.js';
import { SmartDaemon } from './smartdaemon.classes.smartdaemon'; import { SmartDaemon } from './smartdaemon.classes.smartdaemon.js';
export interface ISmartDaemonServiceConstructorOptions { export interface ISmartDaemonServiceConstructorOptions {
name: string; name: string;
@ -14,7 +14,10 @@ export interface ISmartDaemonServiceConstructorOptions {
* represents a service that is being spawned by SmartDaemon * represents a service that is being spawned by SmartDaemon
*/ */
export class SmartDaemonService implements ISmartDaemonServiceConstructorOptions { export class SmartDaemonService implements ISmartDaemonServiceConstructorOptions {
public static async createFromOptions(smartdaemonRef: SmartDaemon, optionsArg: ISmartDaemonServiceConstructorOptions) { public static async createFromOptions(
smartdaemonRef: SmartDaemon,
optionsArg: ISmartDaemonServiceConstructorOptions
) {
const service = new SmartDaemonService(smartdaemonRef); const service = new SmartDaemonService(smartdaemonRef);
for (const key of Object.keys(optionsArg)) { for (const key of Object.keys(optionsArg)) {
service[key] = optionsArg[key]; service[key] = optionsArg[key];
@ -65,7 +68,6 @@ export class SmartDaemonService implements ISmartDaemonServiceConstructorOptions
await this.smartdaemonRef.systemdManager.stopService(this); await this.smartdaemonRef.systemdManager.stopService(this);
} }
// Save and Delete // Save and Delete
public async save() { public async save() {
await this.smartdaemonRef.systemdManager.saveService(this); await this.smartdaemonRef.systemdManager.saveService(this);

View File

@ -1,9 +1,10 @@
import * as plugins from './smartdaemon.plugins'; import * as plugins from './smartdaemon.plugins.js';
import { SmartDaemonTemplateManager } from './smartdaemon.classes.templatemanager'; import { SmartDaemonTemplateManager } from './smartdaemon.classes.templatemanager.js';
import { SmartDaemonService, ISmartDaemonServiceConstructorOptions } from './smartdaemon.classes.service'; import {
import { SmartDaemonSystemdManager } from './smartdaemon.classes.systemdmanager'; SmartDaemonService,
ISmartDaemonServiceConstructorOptions,
} from './smartdaemon.classes.service.js';
import { SmartDaemonSystemdManager } from './smartdaemon.classes.systemdmanager.js';
export class SmartDaemon { export class SmartDaemon {
public templateManager: SmartDaemonTemplateManager; public templateManager: SmartDaemonTemplateManager;
@ -20,10 +21,12 @@ export class SmartDaemon {
* @param commandArg * @param commandArg
* @param workingDirectoryArg * @param workingDirectoryArg
*/ */
public async addService(optionsArg: ISmartDaemonServiceConstructorOptions): Promise<SmartDaemonService> { public async addService(
optionsArg: ISmartDaemonServiceConstructorOptions
): Promise<SmartDaemonService> {
let serviceToAdd: SmartDaemonService; let serviceToAdd: SmartDaemonService;
const existingServices = await this.systemdManager.getServices(); const existingServices = await this.systemdManager.getServices();
const existingService = existingServices.find(serviceArg => { const existingService = existingServices.find((serviceArg) => {
return serviceArg.name === optionsArg.name; return serviceArg.name === optionsArg.name;
}); });
if (!existingService) { if (!existingService) {

View File

@ -1,7 +1,10 @@
import * as plugins from './smartdaemon.plugins'; import * as plugins from './smartdaemon.plugins.js';
import * as paths from './smartdaemon.paths'; import * as paths from './smartdaemon.paths.js';
import { SmartDaemon } from './smartdaemon.classes.smartdaemon'; import { SmartDaemon } from './smartdaemon.classes.smartdaemon.js';
import { ISmartDaemonServiceConstructorOptions, SmartDaemonService } from './smartdaemon.classes.service'; import {
ISmartDaemonServiceConstructorOptions,
SmartDaemonService,
} from './smartdaemon.classes.service.js';
export class SmartDaemonSystemdManager { export class SmartDaemonSystemdManager {
// STATIC // STATIC
@ -13,7 +16,7 @@ export class SmartDaemonSystemdManager {
public static createFileNameFromServiceName(serviceNameArg: string) { public static createFileNameFromServiceName(serviceNameArg: string) {
return `${SmartDaemonSystemdManager.createServiceNameFromServiceName(serviceNameArg)}.service`; return `${SmartDaemonSystemdManager.createServiceNameFromServiceName(serviceNameArg)}.service`;
}; }
public static createFilePathFromServiceName(serviceNameArg: string) { public static createFilePathFromServiceName(serviceNameArg: string) {
return plugins.path.join( return plugins.path.join(
@ -32,7 +35,7 @@ export class SmartDaemonSystemdManager {
constructor(smartdaemonRefArg: SmartDaemon) { constructor(smartdaemonRefArg: SmartDaemon) {
this.smartdaemonRef = smartdaemonRefArg; this.smartdaemonRef = smartdaemonRefArg;
this.smartshellInstance = new plugins.smartshell.Smartshell({ this.smartshellInstance = new plugins.smartshell.Smartshell({
executor: 'bash' executor: 'bash',
}); });
this.smartsystem = new plugins.smartsystem.Smartsystem(); this.smartsystem = new plugins.smartsystem.Smartsystem();
} }
@ -60,7 +63,7 @@ export class SmartDaemonSystemdManager {
const existingServices: SmartDaemonService[] = []; const existingServices: SmartDaemonService[] = [];
if (await this.checkElegibility()) { if (await this.checkElegibility()) {
const smartfmInstance = new plugins.smartfm.Smartfm({ const smartfmInstance = new plugins.smartfm.Smartfm({
fmType: 'yaml' fmType: 'yaml',
}); });
const availableServices = await plugins.smartfile.fs.fileTreeToObject( const availableServices = await plugins.smartfile.fs.fileTreeToObject(
paths.systemdDir, paths.systemdDir,
@ -80,14 +83,18 @@ export class SmartDaemonSystemdManager {
public async startService(serviceArg: SmartDaemonService) { public async startService(serviceArg: SmartDaemonService) {
if (await this.checkElegibility()) { if (await this.checkElegibility()) {
await this.execute( await this.execute(
`systemctl start ${SmartDaemonSystemdManager.createServiceNameFromServiceName(serviceArg.name)}` `systemctl start ${SmartDaemonSystemdManager.createServiceNameFromServiceName(
serviceArg.name
)}`
); );
} }
} }
public async stopService(serviceArg: SmartDaemonService) { public async stopService(serviceArg: SmartDaemonService) {
if (await this.checkElegibility()) { if (await this.checkElegibility()) {
await this.execute( await this.execute(
`systemctl stop ${SmartDaemonSystemdManager.createServiceNameFromServiceName(serviceArg.name)}` `systemctl stop ${SmartDaemonSystemdManager.createServiceNameFromServiceName(
serviceArg.name
)}`
); );
} }
} }
@ -116,23 +123,25 @@ export class SmartDaemonSystemdManager {
await this.execute(`systemctl daemon-reload`); await this.execute(`systemctl daemon-reload`);
} }
await this.execute( await this.execute(
`systemctl enable ${SmartDaemonSystemdManager.createServiceNameFromServiceName(serviceArg.name)}` `systemctl enable ${SmartDaemonSystemdManager.createServiceNameFromServiceName(
serviceArg.name
)}`
); );
} }
} }
public async disableService(serviceArg: SmartDaemonService) { public async disableService(serviceArg: SmartDaemonService) {
if (await this.checkElegibility()) { if (await this.checkElegibility()) {
await this.execute( await this.execute(
`systemctl disable ${SmartDaemonSystemdManager.createServiceNameFromServiceName(serviceArg.name)}` `systemctl disable ${SmartDaemonSystemdManager.createServiceNameFromServiceName(
serviceArg.name
)}`
); );
} }
} }
public async reload() { public async reload() {
if (await this.checkElegibility()) { if (await this.checkElegibility()) {
await this.execute( await this.execute(`systemctl daemon-reload`);
`systemctl daemon-reload`
);
} }
} }
} }

View File

@ -1,6 +1,6 @@
import * as plugins from './smartdaemon.plugins'; import * as plugins from './smartdaemon.plugins.js';
import { SmartDaemon } from './smartdaemon.classes.smartdaemon'; import { SmartDaemon } from './smartdaemon.classes.smartdaemon.js';
import { SmartDaemonService } from './smartdaemon.classes.service'; import { SmartDaemonService } from './smartdaemon.classes.service.js';
export class SmartDaemonTemplateManager { export class SmartDaemonTemplateManager {
public smartdaemonRef: SmartDaemon; public smartdaemonRef: SmartDaemon;
@ -24,6 +24,7 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
Environment=NODE_OPTIONS="--max_old_space_size=100"
ExecStart=/bin/bash -c "cd ${serviceArg.workingDir} && ${serviceArg.command}" ExecStart=/bin/bash -c "cd ${serviceArg.workingDir} && ${serviceArg.command}"
WorkingDirectory=${serviceArg.workingDir} WorkingDirectory=${serviceArg.workingDir}
Restart=on-failure Restart=on-failure
@ -36,5 +37,5 @@ Restart=always
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
`; `;
} };
} }

View File

@ -1,4 +1,7 @@
import * as plugins from './smartdaemon.plugins'; import * as plugins from './smartdaemon.plugins.js';
export const packageDir = plugins.path.join(__dirname, '../'); export const packageDir = plugins.path.join(
plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url),
'../'
);
export const systemdDir = plugins.path.join('/lib/systemd/system/'); export const systemdDir = plugins.path.join('/lib/systemd/system/');

View File

@ -1,19 +1,17 @@
// node native scope // node native scope
import * as path from 'path'; import * as path from 'path';
export { path };
export {
path
};
// @pushrocks scope // @pushrocks scope
import * as lik from '@pushrocks/lik'; import * as lik from '@push.rocks/lik';
import * as smartfile from '@pushrocks/smartfile'; import * as smartfile from '@push.rocks/smartfile';
import * as smartfm from '@pushrocks/smartfm'; import * as smartfm from '@push.rocks/smartfm';
import * as smartlog from '@pushrocks/smartlog'; import * as smartlog from '@push.rocks/smartlog';
import * as smartlogDestinationLocal from '@pushrocks/smartlog-destination-local'; import * as smartlogDestinationLocal from '@push.rocks/smartlog-destination-local';
import * as smartshell from '@pushrocks/smartshell'; import * as smartpath from '@push.rocks/smartpath';
import * as smartsystem from '@pushrocks/smartsystem'; import * as smartshell from '@push.rocks/smartshell';
import * as smartsystem from '@push.rocks/smartsystem';
export { export {
lik, lik,
@ -21,8 +19,9 @@ export {
smartfm, smartfm,
smartlog, smartlog,
smartlogDestinationLocal, smartlogDestinationLocal,
smartpath,
smartshell, smartshell,
smartsystem smartsystem,
}; };
// third party // third party

View File

@ -1,4 +1,4 @@
import * as plugins from './smartdaemon.plugins'; import * as plugins from './smartdaemon.plugins.js';
export const logger = new plugins.smartlog.Smartlog({ export const logger = new plugins.smartlog.Smartlog({
logContext: { logContext: {
@ -7,9 +7,9 @@ export const logger = new plugins.smartlog.Smartlog({
containerName: 'Some Containername', containerName: 'Some Containername',
environment: 'local', environment: 'local',
runtime: 'node', runtime: 'node',
zone: 'gitzone' zone: 'gitzone',
}, },
minimumLogLevel: 'silly' minimumLogLevel: 'silly',
}); });
logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal()); logger.addLogDestination(new plugins.smartlogDestinationLocal.DestinationLocal());

10
tsconfig.json Normal file
View File

@ -0,0 +1,10 @@
{
"compilerOptions": {
"experimentalDecorators": true,
"useDefineForClassFields": false,
"target": "ES2022",
"module": "ES2022",
"moduleResolution": "nodenext",
"esModuleInterop": true
}
}

View File

@ -1,17 +0,0 @@
{
"extends": ["tslint:latest", "tslint-config-prettier"],
"rules": {
"semicolon": [true, "always"],
"no-console": false,
"ordered-imports": false,
"object-literal-sort-keys": false,
"member-ordering": {
"options":{
"order": [
"static-method"
]
}
}
},
"defaultSeverity": "warning"
}