Skip to content

Commit

Permalink
Merge branch 'feat/json-data-copy'
Browse files Browse the repository at this point in the history
  • Loading branch information
nytamin committed Jan 11, 2024
2 parents 561e0ab + 3436f65 commit 484a832
Show file tree
Hide file tree
Showing 58 changed files with 1,003 additions and 175 deletions.
36 changes: 36 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,42 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.43.0-alpha.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.0-alpha.1...v1.43.0-alpha.2) (2023-12-20)


### Bug Fixes

* better handling of when source isStable ([2198266](https://github.com/nrkno/tv-automation-package-manager/commit/2198266457e283062ec849a70740b892b33f555e))
* bug fix: wrong PackageIntoType ([312f401](https://github.com/nrkno/tv-automation-package-manager/commit/312f4010017350638462fd88faa77805b45b2b80))
* cache header http queries, to reduce external load ([8a64005](https://github.com/nrkno/tv-automation-package-manager/commit/8a640058eb2b8cb982e9a33cccd44573d444afd1))
* json-data-copy: properly store metadata for files ([b6a5212](https://github.com/nrkno/tv-automation-package-manager/commit/b6a5212d599cbd2b2f23bc0915a2e43fa8c27edc))





# [1.43.0-alpha.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.0-alpha.0...v1.43.0-alpha.1) (2023-12-05)


### Bug Fixes

* json data copying ([6ce0b05](https://github.com/nrkno/tv-automation-package-manager/commit/6ce0b0505d7b0bb18821cd2f8e4cc97820de6d96))





# [1.43.0-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.2...v1.43.0-alpha.0) (2023-11-30)


### Features

* make json data copy work ([ba050d5](https://github.com/nrkno/tv-automation-package-manager/commit/ba050d504d28584c0d7085bfac78a0afc025ecb2))





## [1.42.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.1...v1.42.2) (2023-10-12)


Expand Down
24 changes: 24 additions & 0 deletions apps/appcontainer-node/app/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.43.0-alpha.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.0-alpha.1...v1.43.0-alpha.2) (2023-12-20)

**Note:** Version bump only for package @appcontainer-node/app





# [1.43.0-alpha.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.0-alpha.0...v1.43.0-alpha.1) (2023-12-05)

**Note:** Version bump only for package @appcontainer-node/app





# [1.43.0-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.2...v1.43.0-alpha.0) (2023-11-30)

**Note:** Version bump only for package @appcontainer-node/app





## [1.42.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.1...v1.42.2) (2023-10-12)

**Note:** Version bump only for package @appcontainer-node/app
Expand Down
4 changes: 2 additions & 2 deletions apps/appcontainer-node/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@appcontainer-node/app",
"version": "1.42.2",
"version": "1.43.0-alpha.2",
"description": "AppContainer-Node.js",
"private": true,
"scripts": {
Expand All @@ -14,7 +14,7 @@
"nexe": "^3.3.7"
},
"dependencies": {
"@appcontainer-node/generic": "1.42.2"
"@appcontainer-node/generic": "1.43.0-alpha.2"
},
"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
"engines": {
Expand Down
24 changes: 24 additions & 0 deletions apps/appcontainer-node/packages/generic/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.43.0-alpha.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.0-alpha.1...v1.43.0-alpha.2) (2023-12-20)

**Note:** Version bump only for package @appcontainer-node/generic





# [1.43.0-alpha.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.0-alpha.0...v1.43.0-alpha.1) (2023-12-05)

**Note:** Version bump only for package @appcontainer-node/generic





# [1.43.0-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.2...v1.43.0-alpha.0) (2023-11-30)

**Note:** Version bump only for package @appcontainer-node/generic





## [1.42.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.1...v1.42.2) (2023-10-12)


Expand Down
6 changes: 3 additions & 3 deletions apps/appcontainer-node/packages/generic/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@appcontainer-node/generic",
"version": "1.42.2",
"version": "1.43.0-alpha.2",
"private": true,
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand All @@ -10,8 +10,8 @@
"__test": "jest"
},
"dependencies": {
"@sofie-package-manager/api": "1.42.2",
"@sofie-package-manager/worker": "1.42.2",
"@sofie-package-manager/api": "1.43.0-alpha.0",
"@sofie-package-manager/worker": "1.43.0-alpha.2",
"underscore": "^1.12.0"
},
"devDependencies": {
Expand Down
8 changes: 8 additions & 0 deletions apps/http-server/app/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.43.0-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.2...v1.43.0-alpha.0) (2023-11-30)

**Note:** Version bump only for package @http-server/app





## [1.42.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.1...v1.42.2) (2023-10-12)

**Note:** Version bump only for package @http-server/app
Expand Down
4 changes: 2 additions & 2 deletions apps/http-server/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@http-server/app",
"version": "1.42.2",
"version": "1.43.0-alpha.0",
"description": "Upload to and serve proxies of packages",
"private": true,
"scripts": {
Expand All @@ -14,7 +14,7 @@
"nexe": "^3.3.7"
},
"dependencies": {
"@http-server/generic": "1.42.2"
"@http-server/generic": "1.43.0-alpha.0"
},
"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
"engines": {
Expand Down
8 changes: 8 additions & 0 deletions apps/http-server/packages/generic/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.43.0-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.2...v1.43.0-alpha.0) (2023-11-30)

**Note:** Version bump only for package @http-server/generic





## [1.42.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.1...v1.42.2) (2023-10-12)

**Note:** Version bump only for package @http-server/generic
Expand Down
6 changes: 3 additions & 3 deletions apps/http-server/packages/generic/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@http-server/generic",
"version": "1.42.2",
"version": "1.43.0-alpha.0",
"private": true,
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand All @@ -11,13 +11,13 @@
},
"dependencies": {
"@koa/cors": "^4.0.0",
"@sofie-package-manager/api": "1.42.2",
"@sofie-package-manager/api": "1.43.0-alpha.0",
"koa": "^2.14.1",
"koa-bodyparser": "^4.3.0",
"koa-range": "^0.3.0",
"koa-router": "^8.0.8",
"mime-types": "^2.1.28",
"mkdirp": "^1.0.4",
"mkdirp": "^2.1.3",
"pechkin": "^1.0.1",
"pretty-bytes": "^5.5.0",
"tslib": "^2.1.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import fs from 'fs'
import path from 'path'
import { promisify } from 'util'
import mime from 'mime-types'
import mkdirp from 'mkdirp'
import { mkdirp } from 'mkdirp'
import prettyBytes from 'pretty-bytes'
import { asyncPipe, CTX, CTXPost } from '../lib'
import { HTTPServerConfig, LoggerInstance } from '@sofie-package-manager/api'
Expand Down
24 changes: 24 additions & 0 deletions apps/package-manager/app/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.43.0-alpha.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.0-alpha.1...v1.43.0-alpha.2) (2023-12-20)

**Note:** Version bump only for package @package-manager/app





# [1.43.0-alpha.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.0-alpha.0...v1.43.0-alpha.1) (2023-12-05)

**Note:** Version bump only for package @package-manager/app





# [1.43.0-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.2...v1.43.0-alpha.0) (2023-11-30)

**Note:** Version bump only for package @package-manager/app





## [1.42.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.1...v1.42.2) (2023-10-12)

**Note:** Version bump only for package @package-manager/app
Expand Down
4 changes: 2 additions & 2 deletions apps/package-manager/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@package-manager/app",
"version": "1.42.2",
"version": "1.43.0-alpha.2",
"private": true,
"scripts": {
"build": "yarn rimraf dist && yarn build:main",
Expand All @@ -13,7 +13,7 @@
"nexe": "^3.3.7"
},
"dependencies": {
"@package-manager/generic": "1.42.2"
"@package-manager/generic": "1.43.0-alpha.2"
},
"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
"engines": {
Expand Down
24 changes: 24 additions & 0 deletions apps/package-manager/packages/generic/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [1.43.0-alpha.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.0-alpha.1...v1.43.0-alpha.2) (2023-12-20)

**Note:** Version bump only for package @package-manager/generic





# [1.43.0-alpha.1](https://github.com/nrkno/tv-automation-package-manager/compare/v1.43.0-alpha.0...v1.43.0-alpha.1) (2023-12-05)

**Note:** Version bump only for package @package-manager/generic





# [1.43.0-alpha.0](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.2...v1.43.0-alpha.0) (2023-11-30)

**Note:** Version bump only for package @package-manager/generic





## [1.42.2](https://github.com/nrkno/tv-automation-package-manager/compare/v1.42.1...v1.42.2) (2023-10-12)


Expand Down
8 changes: 4 additions & 4 deletions apps/package-manager/packages/generic/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@package-manager/generic",
"version": "1.42.2",
"version": "1.43.0-alpha.2",
"private": true,
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand All @@ -14,9 +14,9 @@
},
"dependencies": {
"@parcel/watcher": "^2.3.0",
"@sofie-package-manager/api": "1.42.2",
"@sofie-package-manager/expectation-manager": "1.42.2",
"@sofie-package-manager/worker": "1.42.2",
"@sofie-package-manager/api": "1.43.0-alpha.0",
"@sofie-package-manager/expectation-manager": "1.43.0-alpha.2",
"@sofie-package-manager/worker": "1.43.0-alpha.2",
"data-store": "^4.0.3",
"deep-extend": "^0.6.0",
"fast-clone": "^1.5.13",
Expand Down
4 changes: 4 additions & 0 deletions apps/package-manager/packages/generic/src/coreHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import { PackageManagerHandler } from './packageManager'
import { ExternalPeripheralDeviceAPI } from '@sofie-automation/server-core-integration/dist/lib/methods'
import { PeripheralDeviceCommand } from '@sofie-automation/shared-lib/dist/core/model/PeripheralDeviceCommand'
import { getCredentials } from './credentials'
import { FakeCore } from './fakeCore'

let packageJson: any
try {
Expand All @@ -69,6 +70,7 @@ export class CoreHandler {
public delayRemovalPackageInfo = 0
public useTemporaryFilePath = false
public notUsingCore = false
public fakeCore: FakeCore

private core!: CoreConnection

Expand All @@ -87,6 +89,8 @@ export class CoreHandler {
constructor(logger: LoggerInstance, deviceOptions: DeviceConfig) {
this.logger = logger.category('CoreHandler')
this._deviceOptions = deviceOptions

this.fakeCore = new FakeCore(this.logger)
}

async init(config: PackageManagerConfig, processHandler: ProcessHandler): Promise<void> {
Expand Down
Loading

0 comments on commit 484a832

Please sign in to comment.