diff --git a/.tagpr b/.tagpr index 3b6738f..91a8acd 100644 --- a/.tagpr +++ b/.tagpr @@ -19,4 +19,5 @@ releaseBranch = main versionFile = package.json majorLabels = major - minorLabels = enhancement,minor \ No newline at end of file + minorLabels = enhancement,minor + command = "make prerelease_for_tagpr" \ No newline at end of file diff --git a/Makefile b/Makefile index 73dac53..d2df742 100644 --- a/Makefile +++ b/Makefile @@ -67,3 +67,10 @@ clean: undeploy: ## all undeploy Google apps scripts undeploy: $(CLASP) undeploy --all + + +.PHONY: prerelease_for_tagpr +prerelease_for_tagpr: ## Pre release for tagpr +prerelease_for_tagpr: + npm update + git add package-lock.json diff --git a/package-lock.json b/package-lock.json index 1c03361..d4d184d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "apps-script-jobqueue", - "version": "v0.0.1", + "version": "v0.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "apps-script-jobqueue", - "version": "v0.0.1", + "version": "v0.1.2", "license": "MIT", "dependencies": { "@types/google-apps-script": "^1.0.57" diff --git a/src/JobBroker.ts b/src/JobBroker.ts index 15b23a1..fdab176 100644 --- a/src/JobBroker.ts +++ b/src/JobBroker.ts @@ -89,11 +89,12 @@ class JobBroker { scriptLock.releaseLock(); console.info( - `job starting. id: ${parameter.id}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, parameter: ${parameter.parameter}` + `job starting. id: ${parameter.id}, handler: ${parameter.handler}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, parameter: ${parameter.parameter}` ); try { - const result = this[parameter.handler]( + const foo = window; + const result = foo.eval(parameter.handler)( JSON.parse(parameter.parameter) ); if (!result) { @@ -104,14 +105,14 @@ class JobBroker { parameter.end_at = this.now; this.saveJob(popJob); console.info( - `job success. id: ${parameter.id}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, start_at: ${parameter.end_at}, parameter: ${parameter.parameter}` + `job success. id: ${parameter.id}, handler: ${parameter.handler}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, start_at: ${parameter.end_at}, parameter: ${parameter.parameter}` ); } catch (e) { parameter.state = "failed"; parameter.end_at = this.now; this.saveJob(popJob); console.warn( - `job failed. message: ${e.message}, stack: ${e.stack}, id: ${parameter.id}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, start_at: ${parameter.end_at}, parameter: ${parameter.parameter}` + `job failed. message: ${e.message}, stack: ${e.stack}, id: ${parameter.id}, handler: ${parameter.handler}, created_at: ${parameter.created_at}, start_at: ${parameter.start_at}, start_at: ${parameter.end_at}, parameter: ${parameter.parameter}` ); this.purgeTimeoutQueue();