@wocker/ws 1.0.26 → 1.0.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/AppModule.js +38 -4
- package/lib/modules/dns/index.js +5 -2
- package/lib/modules/dns/services/DnsService.d.ts +1 -1
- package/lib/modules/dns/services/DnsService.js +2 -2
- package/lib/modules/index.d.ts +0 -1
- package/lib/modules/index.js +0 -1
- package/lib/modules/preset/controllers/PresetController.d.ts +1 -1
- package/lib/modules/preset/controllers/PresetController.js +2 -2
- package/lib/modules/preset/controllers/PresetListener.d.ts +1 -1
- package/lib/modules/preset/controllers/PresetListener.js +2 -2
- package/lib/modules/preset/index.js +5 -2
- package/lib/modules/preset/repositories/PresetRepository.d.ts +3 -2
- package/lib/modules/preset/repositories/PresetRepository.js +9 -4
- package/lib/modules/preset/services/PresetService.js +1 -1
- package/lib/modules/project/index.js +6 -3
- package/lib/modules/project/services/ProjectService.d.ts +1 -1
- package/lib/modules/project/services/ProjectService.js +6 -4
- package/lib/modules/proxy/index.js +5 -2
- package/lib/modules/proxy/services/CertService.d.ts +1 -1
- package/lib/modules/proxy/services/CertService.js +2 -2
- package/lib/modules/proxy/services/ProxyService.d.ts +1 -1
- package/lib/modules/proxy/services/ProxyService.js +2 -2
- package/package.json +6 -4
- package/lib/modules/docker/index.d.ts +0 -9
- package/lib/modules/docker/index.js +0 -45
- package/lib/modules/docker/services/ComposeService.d.ts +0 -32
- package/lib/modules/docker/services/ComposeService.js +0 -127
- package/lib/modules/docker/services/ContainerService.d.ts +0 -14
- package/lib/modules/docker/services/ContainerService.js +0 -115
- package/lib/modules/docker/services/DockerService.d.ts +0 -31
- package/lib/modules/docker/services/DockerService.js +0 -245
- package/lib/modules/docker/services/ImageService.d.ts +0 -12
- package/lib/modules/docker/services/ImageService.js +0 -80
- package/lib/modules/docker/services/ModemService.d.ts +0 -15
- package/lib/modules/docker/services/ModemService.js +0 -156
- package/lib/modules/docker/services/ProtoService.d.ts +0 -6
- package/lib/modules/docker/services/ProtoService.js +0 -20
- package/lib/modules/docker/type/ComposeConfig.d.ts +0 -12
- package/lib/modules/docker/type/ComposeConfig.js +0 -2
- package/lib/modules/docker/utils/formatSizeUnits.d.ts +0 -1
- package/lib/modules/docker/utils/formatSizeUnits.js +0 -19
- package/proto/buildkit.proto +0 -55
- package/proto/solver/pb/ops.proto +0 -443
package/lib/AppModule.js
CHANGED
|
@@ -1,13 +1,47 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
2
18
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
19
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
20
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
21
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
22
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
23
|
};
|
|
24
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
25
|
+
var ownKeys = function(o) {
|
|
26
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
27
|
+
var ar = [];
|
|
28
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
29
|
+
return ar;
|
|
30
|
+
};
|
|
31
|
+
return ownKeys(o);
|
|
32
|
+
};
|
|
33
|
+
return function (mod) {
|
|
34
|
+
if (mod && mod.__esModule) return mod;
|
|
35
|
+
var result = {};
|
|
36
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
37
|
+
__setModuleDefault(result, mod);
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
40
|
+
})();
|
|
8
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
42
|
exports.AppModule = void 0;
|
|
10
43
|
const core_1 = require("@wocker/core");
|
|
44
|
+
const docker_module_1 = __importStar(require("@wocker/docker-module"));
|
|
11
45
|
const modules_1 = require("./modules");
|
|
12
46
|
let AppModule = class AppModule {
|
|
13
47
|
};
|
|
@@ -21,15 +55,15 @@ exports.AppModule = AppModule = __decorate([
|
|
|
21
55
|
modules_1.PluginModule.register(),
|
|
22
56
|
modules_1.ProjectModule,
|
|
23
57
|
modules_1.PresetModule,
|
|
24
|
-
|
|
58
|
+
docker_module_1.default,
|
|
25
59
|
modules_1.KeystoreModule,
|
|
26
60
|
modules_1.ProxyModule
|
|
27
61
|
],
|
|
28
62
|
exports: [
|
|
29
|
-
|
|
63
|
+
docker_module_1.DockerService,
|
|
30
64
|
modules_1.CertService,
|
|
31
|
-
|
|
32
|
-
|
|
65
|
+
docker_module_1.ContainerService,
|
|
66
|
+
docker_module_1.ImageService,
|
|
33
67
|
modules_1.ProxyService,
|
|
34
68
|
modules_1.KeystoreService,
|
|
35
69
|
modules_1.PresetRepository,
|
package/lib/modules/dns/index.js
CHANGED
|
@@ -5,12 +5,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
+
};
|
|
8
11
|
var DnsModule_1;
|
|
9
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
13
|
exports.DnsModule = void 0;
|
|
11
14
|
const core_1 = require("@wocker/core");
|
|
15
|
+
const docker_module_1 = __importDefault(require("@wocker/docker-module"));
|
|
12
16
|
const core_2 = require("../core");
|
|
13
|
-
const docker_1 = require("../docker");
|
|
14
17
|
const DnsController_1 = require("./controllers/DnsController");
|
|
15
18
|
const DnsService_1 = require("./services/DnsService");
|
|
16
19
|
let DnsModule = DnsModule_1 = class DnsModule {
|
|
@@ -23,7 +26,7 @@ let DnsModule = DnsModule_1 = class DnsModule {
|
|
|
23
26
|
return {};
|
|
24
27
|
}
|
|
25
28
|
return {
|
|
26
|
-
imports: [
|
|
29
|
+
imports: [docker_module_1.default],
|
|
27
30
|
controllers: [DnsController_1.DnsController],
|
|
28
31
|
providers: [DnsService_1.DnsService]
|
|
29
32
|
};
|
|
@@ -14,8 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.DnsService = void 0;
|
|
16
16
|
const core_1 = require("@wocker/core");
|
|
17
|
+
const docker_module_1 = require("@wocker/docker-module");
|
|
17
18
|
const path_1 = __importDefault(require("path"));
|
|
18
|
-
const docker_1 = require("../../docker");
|
|
19
19
|
const env_1 = require("../../../env");
|
|
20
20
|
let DnsService = class DnsService {
|
|
21
21
|
constructor(dockerService) {
|
|
@@ -73,5 +73,5 @@ let DnsService = class DnsService {
|
|
|
73
73
|
exports.DnsService = DnsService;
|
|
74
74
|
exports.DnsService = DnsService = __decorate([
|
|
75
75
|
(0, core_1.Injectable)(),
|
|
76
|
-
__metadata("design:paramtypes", [
|
|
76
|
+
__metadata("design:paramtypes", [docker_module_1.DockerService])
|
|
77
77
|
], DnsService);
|
package/lib/modules/index.d.ts
CHANGED
package/lib/modules/index.js
CHANGED
|
@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./core"), exports);
|
|
18
18
|
__exportStar(require("./dns"), exports);
|
|
19
|
-
__exportStar(require("./docker"), exports);
|
|
20
19
|
__exportStar(require("./keystore"), exports);
|
|
21
20
|
__exportStar(require("./package-manager"), exports);
|
|
22
21
|
__exportStar(require("./plugin"), exports);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AppConfigService } from "@wocker/core";
|
|
2
|
-
import { DockerService } from "
|
|
2
|
+
import { DockerService } from "@wocker/docker-module";
|
|
3
3
|
import { PresetRepository } from "../repositories/PresetRepository";
|
|
4
4
|
import { PresetService } from "../services/PresetService";
|
|
5
5
|
export declare class PresetController {
|
|
@@ -17,9 +17,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.PresetController = void 0;
|
|
19
19
|
const core_1 = require("@wocker/core");
|
|
20
|
+
const docker_module_1 = require("@wocker/docker-module");
|
|
20
21
|
const cli_table3_1 = __importDefault(require("cli-table3"));
|
|
21
22
|
const utils_1 = require("@wocker/utils");
|
|
22
|
-
const docker_1 = require("../../docker");
|
|
23
23
|
const PresetRepository_1 = require("../repositories/PresetRepository");
|
|
24
24
|
const PresetService_1 = require("../services/PresetService");
|
|
25
25
|
let PresetController = class PresetController {
|
|
@@ -158,7 +158,7 @@ exports.PresetController = PresetController = __decorate([
|
|
|
158
158
|
(0, core_1.Controller)(),
|
|
159
159
|
(0, core_1.Description)("Preset commands"),
|
|
160
160
|
__metadata("design:paramtypes", [core_1.AppConfigService,
|
|
161
|
-
|
|
161
|
+
docker_module_1.DockerService,
|
|
162
162
|
PresetRepository_1.PresetRepository,
|
|
163
163
|
PresetService_1.PresetService])
|
|
164
164
|
], PresetController);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { EventService, Project, AppConfigService } from "@wocker/core";
|
|
2
|
-
import { DockerService } from "
|
|
2
|
+
import { DockerService } from "@wocker/docker-module";
|
|
3
3
|
import { PresetRepository } from "../repositories/PresetRepository";
|
|
4
4
|
import { PresetService } from "../services/PresetService";
|
|
5
5
|
export declare class PresetListener {
|
|
@@ -11,8 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.PresetListener = void 0;
|
|
13
13
|
const core_1 = require("@wocker/core");
|
|
14
|
+
const docker_module_1 = require("@wocker/docker-module");
|
|
14
15
|
const utils_1 = require("@wocker/utils");
|
|
15
|
-
const docker_1 = require("../../docker");
|
|
16
16
|
const PresetRepository_1 = require("../repositories/PresetRepository");
|
|
17
17
|
const PresetService_1 = require("../services/PresetService");
|
|
18
18
|
const utils_2 = require("../../../utils");
|
|
@@ -137,7 +137,7 @@ exports.PresetListener = PresetListener = __decorate([
|
|
|
137
137
|
(0, core_1.Controller)(),
|
|
138
138
|
__metadata("design:paramtypes", [core_1.AppConfigService,
|
|
139
139
|
core_1.EventService,
|
|
140
|
-
|
|
140
|
+
docker_module_1.DockerService,
|
|
141
141
|
PresetRepository_1.PresetRepository,
|
|
142
142
|
PresetService_1.PresetService])
|
|
143
143
|
], PresetListener);
|
|
@@ -5,10 +5,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
+
};
|
|
8
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
12
|
exports.PresetService = exports.PresetRepository = exports.PresetModule = void 0;
|
|
10
13
|
const core_1 = require("@wocker/core");
|
|
11
|
-
const
|
|
14
|
+
const docker_module_1 = __importDefault(require("@wocker/docker-module"));
|
|
12
15
|
const PresetController_1 = require("./controllers/PresetController");
|
|
13
16
|
const PresetListener_1 = require("./controllers/PresetListener");
|
|
14
17
|
const PresetRepository_1 = require("./repositories/PresetRepository");
|
|
@@ -21,7 +24,7 @@ exports.PresetModule = PresetModule;
|
|
|
21
24
|
exports.PresetModule = PresetModule = __decorate([
|
|
22
25
|
(0, core_1.Module)({
|
|
23
26
|
imports: [
|
|
24
|
-
|
|
27
|
+
docker_module_1.default
|
|
25
28
|
],
|
|
26
29
|
controllers: [
|
|
27
30
|
PresetController_1.PresetController,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AppConfig, PresetServiceSearchOptions as SearchOptions, Preset, PresetSource, AppConfigService, LogService } from "@wocker/core";
|
|
1
|
+
import { AppConfig, PresetServiceSearchOptions as SearchOptions, Preset, PresetSource, AppConfigService, LogService, FileSystemDriver } from "@wocker/core";
|
|
2
2
|
type PresetData = {
|
|
3
3
|
name: string;
|
|
4
4
|
source: PresetSource;
|
|
@@ -7,7 +7,8 @@ type PresetData = {
|
|
|
7
7
|
export declare class PresetRepository {
|
|
8
8
|
protected readonly appConfigService: AppConfigService;
|
|
9
9
|
protected readonly logService: LogService;
|
|
10
|
-
|
|
10
|
+
protected readonly driver: FileSystemDriver;
|
|
11
|
+
constructor(appConfigService: AppConfigService, logService: LogService, driver: FileSystemDriver);
|
|
11
12
|
protected load(data: PresetData): Preset;
|
|
12
13
|
protected configs(): AppConfig["presets"];
|
|
13
14
|
search(options?: SearchOptions): Preset[];
|
|
@@ -8,17 +8,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.PresetRepository = void 0;
|
|
13
16
|
const core_1 = require("@wocker/core");
|
|
14
17
|
const env_1 = require("../../../env");
|
|
15
18
|
let PresetRepository = class PresetRepository {
|
|
16
|
-
constructor(appConfigService, logService) {
|
|
19
|
+
constructor(appConfigService, logService, driver) {
|
|
17
20
|
this.appConfigService = appConfigService;
|
|
18
21
|
this.logService = logService;
|
|
22
|
+
this.driver = driver;
|
|
19
23
|
}
|
|
20
24
|
load(data) {
|
|
21
|
-
const _this = this, fs = new core_1.FileSystem(data.path);
|
|
25
|
+
const _this = this, fs = new core_1.FileSystem(data.path, this.driver);
|
|
22
26
|
const config = {
|
|
23
27
|
...fs.readJSON("config.json"),
|
|
24
28
|
name: data.name,
|
|
@@ -52,7 +56,7 @@ let PresetRepository = class PresetRepository {
|
|
|
52
56
|
}(config);
|
|
53
57
|
}
|
|
54
58
|
configs() {
|
|
55
|
-
const fs = new core_1.FileSystem(env_1.PRESETS_DIR), dirs = fs.exists("") ? fs.readdir("") : [];
|
|
59
|
+
const fs = new core_1.FileSystem(env_1.PRESETS_DIR, this.driver), dirs = fs.exists("") ? fs.readdir("") : [];
|
|
56
60
|
const { presets = [] } = this.appConfigService.config;
|
|
57
61
|
return [
|
|
58
62
|
...dirs.map((name) => {
|
|
@@ -108,6 +112,7 @@ let PresetRepository = class PresetRepository {
|
|
|
108
112
|
exports.PresetRepository = PresetRepository;
|
|
109
113
|
exports.PresetRepository = PresetRepository = __decorate([
|
|
110
114
|
(0, core_1.Injectable)(),
|
|
115
|
+
__param(2, (0, core_1.Inject)(core_1.FILE_SYSTEM_DRIVER_KEY)),
|
|
111
116
|
__metadata("design:paramtypes", [core_1.AppConfigService,
|
|
112
|
-
core_1.LogService])
|
|
117
|
+
core_1.LogService, Object])
|
|
113
118
|
], PresetRepository);
|
|
@@ -136,7 +136,7 @@ let PresetService = class PresetService {
|
|
|
136
136
|
return preset;
|
|
137
137
|
}
|
|
138
138
|
async init() {
|
|
139
|
-
const fs =
|
|
139
|
+
const fs = this.fs.cd(this.appConfigService.pwd());
|
|
140
140
|
let preset = this.presetRepository.searchOne({
|
|
141
141
|
path: this.appConfigService.pwd()
|
|
142
142
|
});
|
|
@@ -5,11 +5,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
+
};
|
|
8
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
12
|
exports.ProjectService = exports.ProjectRepository = exports.ProjectModule = void 0;
|
|
10
13
|
const core_1 = require("@wocker/core");
|
|
14
|
+
const docker_module_1 = __importDefault(require("@wocker/docker-module"));
|
|
11
15
|
const keystore_1 = require("../keystore");
|
|
12
|
-
const docker_1 = require("../docker");
|
|
13
16
|
const preset_1 = require("../preset");
|
|
14
17
|
const ProjectController_1 = require("./controllers/ProjectController");
|
|
15
18
|
const SecretsController_1 = require("./controllers/SecretsController");
|
|
@@ -23,9 +26,9 @@ exports.ProjectModule = ProjectModule;
|
|
|
23
26
|
exports.ProjectModule = ProjectModule = __decorate([
|
|
24
27
|
(0, core_1.Module)({
|
|
25
28
|
imports: [
|
|
26
|
-
|
|
29
|
+
docker_module_1.default,
|
|
27
30
|
keystore_1.KeystoreModule,
|
|
28
|
-
|
|
31
|
+
preset_1.PresetModule
|
|
29
32
|
],
|
|
30
33
|
controllers: [
|
|
31
34
|
ProjectController_1.ProjectController,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AppConfigService, EventService, LogService, ProcessService, Project, ProjectService as CoreProjectService, ProjectRepositorySearchParams as SearchParams } from "@wocker/core";
|
|
2
|
-
import { ComposeService, DockerService } from "
|
|
2
|
+
import { ComposeService, DockerService } from "@wocker/docker-module";
|
|
3
3
|
import { PresetRepository, PresetService } from "../../preset";
|
|
4
4
|
import { ProjectRepository } from "../repositories/ProjectRepository";
|
|
5
5
|
export declare class ProjectService extends CoreProjectService {
|
|
@@ -11,8 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ProjectService = void 0;
|
|
13
13
|
const core_1 = require("@wocker/core");
|
|
14
|
+
const docker_module_1 = require("@wocker/docker-module");
|
|
14
15
|
const cli_1 = require("@kearisp/cli");
|
|
15
|
-
const docker_1 = require("../../docker");
|
|
16
16
|
const preset_1 = require("../../preset");
|
|
17
17
|
const ProjectRepository_1 = require("../repositories/ProjectRepository");
|
|
18
18
|
class PublicCli extends cli_1.Cli {
|
|
@@ -182,7 +182,9 @@ let ProjectService = class ProjectService extends core_1.ProjectService {
|
|
|
182
182
|
"org.wocker.preset": preset.name
|
|
183
183
|
},
|
|
184
184
|
buildArgs: project.buildArgs,
|
|
185
|
-
context:
|
|
185
|
+
context: project.presetMode === "project"
|
|
186
|
+
? [preset.path, project.path]
|
|
187
|
+
: preset.path,
|
|
186
188
|
dockerfile: preset.dockerfile
|
|
187
189
|
});
|
|
188
190
|
}
|
|
@@ -297,8 +299,8 @@ exports.ProjectService = ProjectService = __decorate([
|
|
|
297
299
|
__metadata("design:paramtypes", [core_1.AppConfigService,
|
|
298
300
|
core_1.ProcessService,
|
|
299
301
|
core_1.EventService,
|
|
300
|
-
|
|
301
|
-
|
|
302
|
+
docker_module_1.DockerService,
|
|
303
|
+
docker_module_1.ComposeService,
|
|
302
304
|
ProjectRepository_1.ProjectRepository,
|
|
303
305
|
preset_1.PresetService,
|
|
304
306
|
preset_1.PresetRepository,
|
|
@@ -5,10 +5,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
10
|
+
};
|
|
8
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
12
|
exports.CertService = exports.ProxyService = exports.ProxyModule = void 0;
|
|
10
13
|
const core_1 = require("@wocker/core");
|
|
11
|
-
const
|
|
14
|
+
const docker_module_1 = __importDefault(require("@wocker/docker-module"));
|
|
12
15
|
const project_1 = require("../project");
|
|
13
16
|
const CertController_1 = require("./controllers/CertController");
|
|
14
17
|
const ProxyController_1 = require("./controllers/ProxyController");
|
|
@@ -22,7 +25,7 @@ exports.ProxyModule = ProxyModule;
|
|
|
22
25
|
exports.ProxyModule = ProxyModule = __decorate([
|
|
23
26
|
(0, core_1.Module)({
|
|
24
27
|
imports: [
|
|
25
|
-
|
|
28
|
+
docker_module_1.default,
|
|
26
29
|
project_1.ProjectModule
|
|
27
30
|
],
|
|
28
31
|
controllers: [
|
|
@@ -47,9 +47,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
47
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
48
|
exports.CertService = void 0;
|
|
49
49
|
const core_1 = require("@wocker/core");
|
|
50
|
+
const docker_module_1 = require("@wocker/docker-module");
|
|
50
51
|
const Path = __importStar(require("path"));
|
|
51
52
|
const cli_table3_1 = __importDefault(require("cli-table3"));
|
|
52
|
-
const docker_1 = require("../../docker");
|
|
53
53
|
const ProxyService_1 = require("./ProxyService");
|
|
54
54
|
let CertService = class CertService {
|
|
55
55
|
constructor(fs, proxyService, dockerService) {
|
|
@@ -146,5 +146,5 @@ exports.CertService = CertService = __decorate([
|
|
|
146
146
|
(0, core_1.Injectable)(),
|
|
147
147
|
__metadata("design:paramtypes", [core_1.AppFileSystemService,
|
|
148
148
|
ProxyService_1.ProxyService,
|
|
149
|
-
|
|
149
|
+
docker_module_1.DockerService])
|
|
150
150
|
], CertService);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Project, AppConfigService, AppFileSystemService, ProxyService as CoreProxyService } from "@wocker/core";
|
|
2
|
-
import { DockerService } from "
|
|
2
|
+
import { DockerService } from "@wocker/docker-module";
|
|
3
3
|
export declare class ProxyService extends CoreProxyService {
|
|
4
4
|
protected readonly appConfigService: AppConfigService;
|
|
5
5
|
protected readonly fs: AppFileSystemService;
|
|
@@ -44,10 +44,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
44
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
45
|
exports.ProxyService = void 0;
|
|
46
46
|
const core_1 = require("@wocker/core");
|
|
47
|
+
const docker_module_1 = require("@wocker/docker-module");
|
|
47
48
|
const utils_1 = require("@wocker/utils");
|
|
48
49
|
const Path = __importStar(require("path"));
|
|
49
50
|
const env_1 = require("../../../env");
|
|
50
|
-
const docker_1 = require("../../docker");
|
|
51
51
|
let ProxyService = class ProxyService extends core_1.ProxyService {
|
|
52
52
|
constructor(appConfigService, fs, dockerService) {
|
|
53
53
|
super();
|
|
@@ -167,5 +167,5 @@ exports.ProxyService = ProxyService = __decorate([
|
|
|
167
167
|
(0, core_1.Injectable)("PROXY_SERVICE"),
|
|
168
168
|
__metadata("design:paramtypes", [core_1.AppConfigService,
|
|
169
169
|
core_1.AppFileSystemService,
|
|
170
|
-
|
|
170
|
+
docker_module_1.DockerService])
|
|
171
171
|
], ProxyService);
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wocker/ws",
|
|
3
3
|
"type": "commonjs",
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.27",
|
|
5
5
|
"author": "Kris Papercut <krispcut@gmail.com>",
|
|
6
6
|
"description": "Docker workspace for web projects",
|
|
7
7
|
"license": "MIT",
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"devops"
|
|
15
15
|
],
|
|
16
16
|
"bin": {
|
|
17
|
-
"ws": "
|
|
17
|
+
"ws": "lib/main.js"
|
|
18
18
|
},
|
|
19
19
|
"homepage": "https://kearisp.github.io/wocker",
|
|
20
20
|
"repository": {
|
|
@@ -35,7 +35,8 @@
|
|
|
35
35
|
"make-coverage-badge": "make-coverage-badge"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@wocker/core": "1.0.
|
|
38
|
+
"@wocker/core": "1.0.27",
|
|
39
|
+
"@wocker/docker-module": "^0.0.1",
|
|
39
40
|
"@wocker/utils": "^2.0.6",
|
|
40
41
|
"async-mutex": "^0.4.0",
|
|
41
42
|
"axios": "^1.6.7",
|
|
@@ -56,7 +57,8 @@
|
|
|
56
57
|
"@types/mute-stream": "^0.0.4",
|
|
57
58
|
"@types/node": "^24.5.2",
|
|
58
59
|
"@types/unzipper": "^0.10.10",
|
|
59
|
-
"@wocker/
|
|
60
|
+
"@wocker/docker-mock-module": "^0.0.1",
|
|
61
|
+
"@wocker/testing": "^1.0.4",
|
|
60
62
|
"jest": "^30.1.3",
|
|
61
63
|
"make-coverage-badge": "^1.2.0",
|
|
62
64
|
"memfs": "^4.49.0",
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import { ComposeService } from "./services/ComposeService";
|
|
2
|
-
import { ContainerService } from "./services/ContainerService";
|
|
3
|
-
import { DockerService } from "./services/DockerService";
|
|
4
|
-
import { ImageService } from "./services/ImageService";
|
|
5
|
-
import { ModemService } from "./services/ModemService";
|
|
6
|
-
import { ProtoService } from "./services/ProtoService";
|
|
7
|
-
export declare class DockerModule {
|
|
8
|
-
}
|
|
9
|
-
export { ComposeService, ContainerService, DockerService, ImageService, ModemService, ProtoService };
|
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.ProtoService = exports.ModemService = exports.ImageService = exports.DockerService = exports.ContainerService = exports.ComposeService = exports.DockerModule = void 0;
|
|
10
|
-
const core_1 = require("@wocker/core");
|
|
11
|
-
const ComposeService_1 = require("./services/ComposeService");
|
|
12
|
-
Object.defineProperty(exports, "ComposeService", { enumerable: true, get: function () { return ComposeService_1.ComposeService; } });
|
|
13
|
-
const ContainerService_1 = require("./services/ContainerService");
|
|
14
|
-
Object.defineProperty(exports, "ContainerService", { enumerable: true, get: function () { return ContainerService_1.ContainerService; } });
|
|
15
|
-
const DockerService_1 = require("./services/DockerService");
|
|
16
|
-
Object.defineProperty(exports, "DockerService", { enumerable: true, get: function () { return DockerService_1.DockerService; } });
|
|
17
|
-
const ImageService_1 = require("./services/ImageService");
|
|
18
|
-
Object.defineProperty(exports, "ImageService", { enumerable: true, get: function () { return ImageService_1.ImageService; } });
|
|
19
|
-
const ModemService_1 = require("./services/ModemService");
|
|
20
|
-
Object.defineProperty(exports, "ModemService", { enumerable: true, get: function () { return ModemService_1.ModemService; } });
|
|
21
|
-
const ProtoService_1 = require("./services/ProtoService");
|
|
22
|
-
Object.defineProperty(exports, "ProtoService", { enumerable: true, get: function () { return ProtoService_1.ProtoService; } });
|
|
23
|
-
let DockerModule = class DockerModule {
|
|
24
|
-
};
|
|
25
|
-
exports.DockerModule = DockerModule;
|
|
26
|
-
exports.DockerModule = DockerModule = __decorate([
|
|
27
|
-
(0, core_1.Module)({
|
|
28
|
-
providers: [
|
|
29
|
-
ComposeService_1.ComposeService,
|
|
30
|
-
ContainerService_1.ContainerService,
|
|
31
|
-
DockerService_1.DockerService,
|
|
32
|
-
ImageService_1.ImageService,
|
|
33
|
-
ModemService_1.ModemService,
|
|
34
|
-
ProtoService_1.ProtoService
|
|
35
|
-
],
|
|
36
|
-
exports: [
|
|
37
|
-
ComposeService_1.ComposeService,
|
|
38
|
-
ContainerService_1.ContainerService,
|
|
39
|
-
DockerService_1.DockerService,
|
|
40
|
-
ImageService_1.ImageService,
|
|
41
|
-
ModemService_1.ModemService,
|
|
42
|
-
ProtoService_1.ProtoService
|
|
43
|
-
]
|
|
44
|
-
})
|
|
45
|
-
], DockerModule);
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
import { LogService } from "@wocker/core";
|
|
2
|
-
import { ComposeConfig } from "../type/ComposeConfig";
|
|
3
|
-
type UpOptions = {
|
|
4
|
-
composefile: string;
|
|
5
|
-
context: string;
|
|
6
|
-
};
|
|
7
|
-
type DownOptions = {
|
|
8
|
-
composefile: string;
|
|
9
|
-
context: string;
|
|
10
|
-
};
|
|
11
|
-
type BuildOptions = {
|
|
12
|
-
composefile: string;
|
|
13
|
-
context: string;
|
|
14
|
-
};
|
|
15
|
-
type ExecOptions = {
|
|
16
|
-
service: string;
|
|
17
|
-
args: string[];
|
|
18
|
-
composefile: string;
|
|
19
|
-
context: string;
|
|
20
|
-
};
|
|
21
|
-
export declare class ComposeService {
|
|
22
|
-
protected readonly logService: LogService;
|
|
23
|
-
constructor(logService: LogService);
|
|
24
|
-
up(options: UpOptions): Promise<void>;
|
|
25
|
-
down(options: DownOptions): Promise<void>;
|
|
26
|
-
build(options: BuildOptions): Promise<void>;
|
|
27
|
-
exec(options: ExecOptions): Promise<void>;
|
|
28
|
-
protected getConfig(context: string, composefile: string): ComposeConfig;
|
|
29
|
-
protected getConfigAsString(context: string, composefile: string): string;
|
|
30
|
-
protected processChunk(chunk: Buffer<ArrayBufferLike>, streamSource?: "stdout" | "stderr"): void;
|
|
31
|
-
}
|
|
32
|
-
export {};
|