@futdevpro/fsm-dynamo 1.11.8 → 1.11.10
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/.github/workflows/main.yml +88 -0
- package/build/_collections/utils/log.util.js +2 -2
- package/build/_collections/utils/log.util.spec.js +1 -1
- package/build/_collections/utils/stack.util.d.ts.map +1 -1
- package/build/_collections/utils/stack.util.js +6 -3
- package/build/_collections/utils/stack.util.js.map +1 -1
- package/futdevpro-fsm-dynamo-01.11.10.tgz +0 -0
- package/package.json +1 -1
- package/src/_collections/utils/log.util.spec.ts +1 -1
- package/src/_collections/utils/log.util.ts +2 -2
- package/src/_collections/utils/stack.util.ts +8 -3
- package/futdevpro-fsm-dynamo-01.11.8.tgz +0 -0
|
@@ -21,6 +21,7 @@ jobs:
|
|
|
21
21
|
notification0:
|
|
22
22
|
name: Discord start Notification
|
|
23
23
|
runs-on: ubuntu-latest
|
|
24
|
+
timeout-minutes: 20
|
|
24
25
|
outputs:
|
|
25
26
|
start: ${{ steps.mark_start.outputs.started }}
|
|
26
27
|
steps:
|
|
@@ -40,9 +41,41 @@ jobs:
|
|
|
40
41
|
https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})\n\
|
|
41
42
|
:brick: (${{ github.run_number }})"
|
|
42
43
|
|
|
44
|
+
check_secrets:
|
|
45
|
+
name: Check Required Secrets
|
|
46
|
+
runs-on: ubuntu-latest
|
|
47
|
+
timeout-minutes: 20
|
|
48
|
+
steps:
|
|
49
|
+
- name: Check Required Secrets and Variables
|
|
50
|
+
run: |
|
|
51
|
+
# Check Secrets
|
|
52
|
+
if [ -z "${{ secrets.NPM_TOKEN }}" ]; then
|
|
53
|
+
echo "::error::NPM_TOKEN secret is missing. Please add it to the repository secrets."
|
|
54
|
+
exit 1
|
|
55
|
+
fi
|
|
56
|
+
if [ -z "${{ secrets.DISCORD_WEBHOOK_ID }}" ]; then
|
|
57
|
+
echo "::error::DISCORD_WEBHOOK_ID secret is missing. Please add it to the repository secrets."
|
|
58
|
+
exit 1
|
|
59
|
+
fi
|
|
60
|
+
if [ -z "${{ secrets.DISCORD_WEBHOOK_TOKEN }}" ]; then
|
|
61
|
+
echo "::error::DISCORD_WEBHOOK_TOKEN secret is missing. Please add it to the repository secrets."
|
|
62
|
+
exit 1
|
|
63
|
+
fi
|
|
64
|
+
if [ -z "${{ secrets.OVERSEER_SECRET_KEY }}" ]; then
|
|
65
|
+
echo "::error::OVERSEER_SECRET_KEY secret is missing. Please add it to the repository secrets."
|
|
66
|
+
exit 1
|
|
67
|
+
fi
|
|
68
|
+
|
|
69
|
+
# Check Variables
|
|
70
|
+
if [ -z "${{ vars.OVERSEER_URL }}" ]; then
|
|
71
|
+
echo "::error::OVERSEER_URL variable is missing. Please add it to the repository variables."
|
|
72
|
+
exit 1
|
|
73
|
+
fi
|
|
74
|
+
|
|
43
75
|
pre_check:
|
|
44
76
|
name: Check Dev leftovers
|
|
45
77
|
runs-on: ubuntu-latest
|
|
78
|
+
timeout-minutes: 20
|
|
46
79
|
steps:
|
|
47
80
|
- name: Checkout code
|
|
48
81
|
uses: actions/checkout@v2
|
|
@@ -81,6 +114,7 @@ jobs:
|
|
|
81
114
|
name: Test Build
|
|
82
115
|
runs-on: ubuntu-latest
|
|
83
116
|
needs: [ pre_check ]
|
|
117
|
+
timeout-minutes: 20
|
|
84
118
|
steps:
|
|
85
119
|
- name: Checkout code
|
|
86
120
|
uses: actions/checkout@v2
|
|
@@ -118,6 +152,7 @@ jobs:
|
|
|
118
152
|
name: Check Version
|
|
119
153
|
needs: [ test ]
|
|
120
154
|
runs-on: ubuntu-latest
|
|
155
|
+
timeout-minutes: 20
|
|
121
156
|
outputs:
|
|
122
157
|
version_published: ${{ steps.version_check_results.outputs.version_published }}
|
|
123
158
|
steps:
|
|
@@ -167,6 +202,7 @@ jobs:
|
|
|
167
202
|
needs: [ check_version ]
|
|
168
203
|
name: Deploy to NPM
|
|
169
204
|
runs-on: ubuntu-latest
|
|
205
|
+
timeout-minutes: 20
|
|
170
206
|
if: ${{ needs.check_version.outputs.version_published != 'true' }}
|
|
171
207
|
steps:
|
|
172
208
|
- name: Checkout code
|
|
@@ -196,10 +232,62 @@ jobs:
|
|
|
196
232
|
run: |
|
|
197
233
|
npm publish
|
|
198
234
|
|
|
235
|
+
build-report:
|
|
236
|
+
name: Build Report
|
|
237
|
+
needs: [ notification0, pre_check, test, check_version, deploy ]
|
|
238
|
+
runs-on: ubuntu-latest
|
|
239
|
+
timeout-minutes: 20
|
|
240
|
+
if: always()
|
|
241
|
+
steps:
|
|
242
|
+
- name: Checkout code
|
|
243
|
+
uses: actions/checkout@v2
|
|
244
|
+
|
|
245
|
+
- name: Get This Version
|
|
246
|
+
run: |
|
|
247
|
+
RAW_THIS_VERSION=$(node -p -e "require('./package.json').version")
|
|
248
|
+
# replace ALL: 'v0' with '', '01' with '1', '.0' with '.'
|
|
249
|
+
RAW_THIS_VERSION=$(echo $RAW_THIS_VERSION | sed 's:v0::g' | sed 's:01:1:g' | sed -e 's:\.0:\.:g')
|
|
250
|
+
echo "THIS_VERSION=$RAW_THIS_VERSION" >> $GITHUB_ENV
|
|
251
|
+
|
|
252
|
+
- id: duration
|
|
253
|
+
run: |
|
|
254
|
+
START_TIME=${{ needs.notification0.outputs.start }}
|
|
255
|
+
END_TIME=$(date +%s)
|
|
256
|
+
DIFF=$((END_TIME - START_TIME))
|
|
257
|
+
echo "human=$(printf '%dm %ds' $((DIFF/60)) $((DIFF%60)))" >> "$GITHUB_OUTPUT"
|
|
258
|
+
|
|
259
|
+
- name: Send Build Report to Overseer
|
|
260
|
+
run: |
|
|
261
|
+
curl -X POST ${{ vars.OVERSEER_URL }}/api/build-report/new \
|
|
262
|
+
-H "Content-Type: application/json" \
|
|
263
|
+
-H "secret-key: ${{ secrets.OVERSEER_SECRET_KEY }}" \
|
|
264
|
+
-d '{
|
|
265
|
+
"packageName": "dynamo-fsm",
|
|
266
|
+
"repository": "${{ github.repository }}",
|
|
267
|
+
"branch": "${{ github.ref_name }}",
|
|
268
|
+
"commitMessage": "${{ github.event.head_commit.message }}",
|
|
269
|
+
"author": "${{ github.actor }}",
|
|
270
|
+
"runNumber": ${{ github.run_number }},
|
|
271
|
+
"runId": "${{ github.run_id }}",
|
|
272
|
+
"runUrl": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
|
|
273
|
+
"version": "${{ env.THIS_VERSION }}",
|
|
274
|
+
"duration": "${{ steps.duration.outputs.human }}",
|
|
275
|
+
"results": {
|
|
276
|
+
"preCheck": "${{ needs.pre_check.result }}",
|
|
277
|
+
"test": "${{ needs.test.result }}",
|
|
278
|
+
"checkVersion": "${{ needs.check_version.result }}",
|
|
279
|
+
"deploy": "${{ needs.deploy.result }}"
|
|
280
|
+
},
|
|
281
|
+
"eventName": "${{ github.event_name }}",
|
|
282
|
+
"timestamp": "$(date -u +%Y-%m-%dT%H:%M:%SZ)"
|
|
283
|
+
}'
|
|
284
|
+
|
|
285
|
+
|
|
199
286
|
end:
|
|
200
287
|
name: Discord Results
|
|
201
288
|
needs: [ notification0, pre_check, test, check_version, deploy ]
|
|
202
289
|
runs-on: ubuntu-latest
|
|
290
|
+
timeout-minutes: 20
|
|
203
291
|
if: always()
|
|
204
292
|
steps:
|
|
205
293
|
- name: Checkout code
|
|
@@ -111,10 +111,10 @@ class DyFM_Log {
|
|
|
111
111
|
*/
|
|
112
112
|
static info(message, ...optionalParams) {
|
|
113
113
|
if (0 < optionalParams.length) {
|
|
114
|
-
console.info(`${log_style_enum_1.DyFM_LogStyle.
|
|
114
|
+
console.info(`${log_style_enum_1.DyFM_LogStyle.cyan}${message}`, ...optionalParams, log_style_enum_1.DyFM_LogStyle.reset);
|
|
115
115
|
}
|
|
116
116
|
else {
|
|
117
|
-
console.info(`${log_style_enum_1.DyFM_LogStyle.
|
|
117
|
+
console.info(`${log_style_enum_1.DyFM_LogStyle.cyan}${message}${log_style_enum_1.DyFM_LogStyle.reset}`);
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
120
|
// ez azért nem egy sima "static readonly log = console.log;",
|
|
@@ -39,7 +39,7 @@ describe('| DyFM_Log', () => {
|
|
|
39
39
|
});
|
|
40
40
|
it('| should log info message with styles', () => {
|
|
41
41
|
log_util_1.DyFM_Log.info('Info message');
|
|
42
|
-
expect(console.info).toHaveBeenCalledWith(`${log_style_enum_1.DyFM_LogStyle.
|
|
42
|
+
expect(console.info).toHaveBeenCalledWith(`${log_style_enum_1.DyFM_LogStyle.cyan}Info message${log_style_enum_1.DyFM_LogStyle.reset}`);
|
|
43
43
|
});
|
|
44
44
|
it('| should log message without styles using log', () => {
|
|
45
45
|
log_util_1.DyFM_Log.log('Log message');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stack.util.d.ts","sourceRoot":"","sources":["../../../src/_collections/utils/stack.util.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,KAAK,GAAE,MAAU,GAAG,MAAM,CA8D3E;AAED,wBAAgB,0BAA0B,CAAC,KAAK,GAAE,MAAU,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"stack.util.d.ts","sourceRoot":"","sources":["../../../src/_collections/utils/stack.util.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,iCAAiC,CAAC,KAAK,GAAE,MAAU,GAAG,MAAM,CA8D3E;AAED,wBAAgB,0BAA0B,CAAC,KAAK,GAAE,MAAU,GAAG,MAAM,CA2DpE"}
|
|
@@ -61,7 +61,8 @@ function DyFM_getLocalStackLocation(level = 0) {
|
|
|
61
61
|
let stackLines = stack?.split('\n')?.slice(2);
|
|
62
62
|
// Find the line that contains the constructor call
|
|
63
63
|
// It will be the FIRST line that doesn't contain 'getStackLocation'
|
|
64
|
-
let constructorLine = stackLines?.find(line => !line.includes('node_modules')
|
|
64
|
+
let constructorLine = stackLines?.find(line => !line.includes('node_modules') &&
|
|
65
|
+
!line.includes('node:internal/process'));
|
|
65
66
|
if (level) {
|
|
66
67
|
if (isNaN(level)) {
|
|
67
68
|
throw new Error('level must be a number');
|
|
@@ -69,11 +70,13 @@ function DyFM_getLocalStackLocation(level = 0) {
|
|
|
69
70
|
while (level) {
|
|
70
71
|
stackLines = stackLines?.filter(line => line !== constructorLine);
|
|
71
72
|
level--;
|
|
72
|
-
constructorLine = stackLines?.find(line => !line.includes('node_modules')
|
|
73
|
+
constructorLine = stackLines?.find(line => !line.includes('node_modules') &&
|
|
74
|
+
!line.includes('node:internal/process'));
|
|
73
75
|
}
|
|
74
76
|
}
|
|
75
77
|
if (!constructorLine) {
|
|
76
|
-
let constructorLine = stack?.split(' at ')?.find(line => !line.includes('node_modules')
|
|
78
|
+
let constructorLine = stack?.split(' at ')?.find(line => !line.includes('node_modules') &&
|
|
79
|
+
!line.includes('node:internal/process'));
|
|
77
80
|
if (!constructorLine) {
|
|
78
81
|
log_util_1.DyFM_Log.warn(`No constructor line found (0)\n${typeof stack}\n${stack?.slice(0, 300)?.split('\n') + '...'}`, {
|
|
79
82
|
stack,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stack.util.js","sourceRoot":"","sources":["../../../src/_collections/utils/stack.util.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"stack.util.js","sourceRoot":"","sources":["../../../src/_collections/utils/stack.util.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@futdevpro/fsm-dynamo",
|
|
3
|
-
"version": "01.11.
|
|
3
|
+
"version": "01.11.10",
|
|
4
4
|
"description": "Full Stack Model Collection for Dynamic (NodeJS-Typescript) Framework called Dynamo, by Future Development Ltd.",
|
|
5
5
|
"DyBu_settings": {
|
|
6
6
|
"packageType": "full-stack-package",
|
|
@@ -48,7 +48,7 @@ describe('| DyFM_Log', () => {
|
|
|
48
48
|
|
|
49
49
|
it('| should log info message with styles', () => {
|
|
50
50
|
DyFM_Log.info('Info message');
|
|
51
|
-
expect(console.info).toHaveBeenCalledWith(`${DyFM_LogStyle.
|
|
51
|
+
expect(console.info).toHaveBeenCalledWith(`${DyFM_LogStyle.cyan}Info message${DyFM_LogStyle.reset}`);
|
|
52
52
|
});
|
|
53
53
|
|
|
54
54
|
it('| should log message without styles using log', () => {
|
|
@@ -133,11 +133,11 @@ export class DyFM_Log {
|
|
|
133
133
|
static info(message: string, ...optionalParams: any[]): void {
|
|
134
134
|
if (0 < optionalParams.length) {
|
|
135
135
|
console.info(
|
|
136
|
-
`${DyFM_LogStyle.
|
|
136
|
+
`${DyFM_LogStyle.cyan}${message}`,
|
|
137
137
|
...optionalParams, DyFM_LogStyle.reset
|
|
138
138
|
);
|
|
139
139
|
} else {
|
|
140
|
-
console.info(`${DyFM_LogStyle.
|
|
140
|
+
console.info(`${DyFM_LogStyle.cyan}${message}${DyFM_LogStyle.reset}`);
|
|
141
141
|
}
|
|
142
142
|
}
|
|
143
143
|
|
|
@@ -77,7 +77,10 @@ export function DyFM_getLocalStackLocation(level: number = 0): string {
|
|
|
77
77
|
|
|
78
78
|
// Find the line that contains the constructor call
|
|
79
79
|
// It will be the FIRST line that doesn't contain 'getStackLocation'
|
|
80
|
-
let constructorLine: string | undefined = stackLines?.find(line =>
|
|
80
|
+
let constructorLine: string | undefined = stackLines?.find(line =>
|
|
81
|
+
!line.includes('node_modules') &&
|
|
82
|
+
!line.includes('node:internal/process')
|
|
83
|
+
);
|
|
81
84
|
|
|
82
85
|
if (level) {
|
|
83
86
|
if (isNaN(level)) {
|
|
@@ -88,14 +91,16 @@ export function DyFM_getLocalStackLocation(level: number = 0): string {
|
|
|
88
91
|
stackLines = stackLines?.filter(line => line !== constructorLine);
|
|
89
92
|
level--;
|
|
90
93
|
constructorLine = stackLines?.find(line =>
|
|
91
|
-
!line.includes('node_modules')
|
|
94
|
+
!line.includes('node_modules') &&
|
|
95
|
+
!line.includes('node:internal/process')
|
|
92
96
|
);
|
|
93
97
|
}
|
|
94
98
|
}
|
|
95
99
|
|
|
96
100
|
if (!constructorLine) {
|
|
97
101
|
let constructorLine: string | undefined = stack?.split(' at ')?.find(line =>
|
|
98
|
-
!line.includes('node_modules')
|
|
102
|
+
!line.includes('node_modules') &&
|
|
103
|
+
!line.includes('node:internal/process')
|
|
99
104
|
);
|
|
100
105
|
|
|
101
106
|
if (!constructorLine) {
|
|
Binary file
|